restructure typings

Author: ShMcK

lib/modules/route/actions.js

@@ -2,7 +2,7 @@
 var types_1 = require('./types');
 function routeSet(route) {
     return function (dispatch, getState) {
-        if (getState.route !== route) {
+        if (getState().route !== route) {
             dispatch({ type: types_1.ROUTE_SET, payload: { route: route } });
         }
         return;

src/modules/route/actions.ts

@@ -2,7 +2,7 @@ import {ROUTE_SET} from './types';
 
 export function routeSet(route: string): Redux.ThunkAction<any, any, {}> {
   return (dispatch, getState) => {
-    if (getState.route !== route) {
+    if (getState().route !== route) {
       dispatch({ type: ROUTE_SET, payload: { route } });
     }
     return;

src/typings/cr/cli.d.ts renamed to src/typings/cli/index.d.ts

@@ -0,0 +1,7 @@
+export interface Action {
+  type: string;
+  payload?;
+  error?: boolean;
+  meta?;
+  filter?: string;
+}

src/typings/cr/cr.d.ts renamed to src/typings/coderoad/index.d.ts

@@ -1,25 +1,5 @@
-interface Action {
-  type: string;
-  payload?;
-  error?: boolean;
-  meta?;
-  filter?: string;
-}
-
-interface PackageJson {
-  name: string;
-  main: string;
-  version: string;
-  dependencies?: Object;
-  devDependencies?: Object;
-  config: Tutorial.Config;
-  bugs?: {
-    url: string;
-  };
-  repo?: {
-    url: string;
-  };
-}
+import { Action } from './action.d.ts';
+import { PackageJson } from './package-json.d.ts';
 
 interface ObjectConstructor {
   assign(target: any, ...sources: any[]): any;

src/typings/common/action.d.ts

@@ -0,0 +1,14 @@
+export interface PackageJson {
+  name: string;
+  main: string;
+  version: string;
+  dependencies?: Object;
+  devDependencies?: Object;
+  config: Tutorial.Config;
+  bugs?: {
+    url: string;
+  };
+  repo?: {
+    url: string;
+  };
+}

src/typings/cr/globals.d.ts renamed to src/typings/common/index.d.ts

@@ -17,14 +17,13 @@
 /// <reference path="globals/text-buffer/index.d.ts" />
 
 // Custom
+/// <reference path="cli/index.d.ts" />
 /// <reference path="globals/node-file-exists/index.d.ts" />
 /// <reference path="globals/redux-throttle-actions/index.d.ts" />
 /// <reference path="globals/sort-package-json/index.d.ts" />
 
 // Local
-/// <reference path="cr/cli.d.ts" />
-/// <reference path="cr/core.d.ts" />
-/// <reference path="cr/cr.d.ts" />
-/// <reference path="cr/globals.d.ts" />
-/// <reference path="cr/test.d.ts" />
-/// <reference path="cr/tutorial.d.ts" />
+/// <reference path="common/index.d.ts" />
+/// <reference path="coderoad/index.d.ts" />
+/// <reference path="tests/index.d.ts" />
+/// <reference path="tutorial/index.d.ts" />

src/typings/common/package-json.d.ts

@@ -1,5 +1,5 @@
 declare namespace Test {
-  interface Result {
+  export interface Result {
     pass: boolean;
     taskPosition: number;
     msg?: string;
@@ -8,13 +8,13 @@ declare namespace Test {
     completed: boolean;
   }
 
-  interface Config {
+  export interface Config {
     dir: string;
     tutorialDir: string;
     taskPosition: number;
   }
 
-  interface Log {
+  export interface Log {
     type: string;
     output: any;
   }

src/typings/cr/core.d.ts

@@ -1,18 +1,18 @@
 declare namespace Tutorial {
-  interface Item {
+  export interface Item {
     name: string;
     version: string;
     latest?: boolean;
   }
 
-  interface Info {
+  export interface Info {
     title: string;
     description?: string;
     keywords?: string[];
     version?: string;
   }
 
-  interface Config {
+  export interface Config {
     language?: string;
     dir: string;
     runner: string;
@@ -25,12 +25,12 @@ declare namespace Tutorial {
     edit?: boolean;
   }
 
-  interface Output {
+  export interface Output {
     info: CR.Info;
     pages: CR.Page[];
   }
 
-  interface PJ {
+  export interface PJ {
     name: string;
     repository?: Object;
     bugs?: Object;
@@ -54,6 +54,6 @@ declare namespace Tutorial {
     contributers?: string[];
   }
 
-  interface RunnerOptions { }
+  export interface RunnerOptions { }
 
 }