clean up typing issues in modules & config

Author: ShMcK

lib/modules/tutorial/reducer.js

@@ -1,6 +1,6 @@
 "use strict";
 var path_1 = require('path');
-var tutorial_config_1 = require('./utils/tutorial-config');
+var config_1 = require('./utils/config');
 var types_1 = require('./types');
 var config_paths_1 = require('./utils/config-paths');
 var _tutorial = {
@@ -17,7 +17,7 @@ function tutorialReducer(tutorial, action) {
             var _a = action.payload, name_1 = _a.name, dir = _a.dir;
             var packagePath = path_1.join(dir, 'node_modules', name_1);
             var packageJson = require(path_1.join(packagePath, 'package.json'));
-            var config = tutorial_config_1.tutorialConfig(packageJson, dir);
+            var config = config_1.tutorialConfig(packageJson, dir);
             var _b = require(path_1.join(packagePath, packageJson.main)), info = _b.info, pages = _b.pages;
             pages = config_paths_1.default(dir, name_1, config, pages || []);
             return {

lib/modules/tutorial/utils/config-repo.js

@@ -0,0 +1,16 @@
+"use strict";
+function configRepo(repo) {
+    if (repo && repo.url) {
+        var url = repo.url;
+        if (!!url.match(/\.git$/)) {
+            url = url.slice(0, url.length - 4);
+        }
+        return url;
+    }
+    return null;
+}
+exports.configRepo = configRepo;
+function configIssuesPath(bugs) {
+    return bugs && bugs.url ? bugs.url : null;
+}
+exports.configIssuesPath = configIssuesPath;

lib/modules/tutorial/utils/tutorial-config.js renamed to lib/modules/tutorial/utils/config-runner.js

@@ -2,28 +2,7 @@
 var path_1 = require('path');
 var node_file_exists_1 = require('node-file-exists');
 var system_1 = require('./system');
-function tutorialConfig(tutorialPj, dir) {
-    var config = tutorialPj.config, name = tutorialPj.name;
-    var repo = loadRepo(tutorialPj.repo);
-    var testSuffix = config.testSuffix;
-    return {
-        dir: path_1.join(dir, 'node_modules', name, config.dir),
-        testSuffix: testSuffix.length && testSuffix[0] === '.'
-            ? testSuffix
-            : '.' + testSuffix || null,
-        runner: config.runner,
-        runnerOptions: config.runnerOptions || {},
-        run: loadRunner(name, config.runner, dir),
-        repo: repo,
-        edit: tutorialPj.config.edit && repo || false,
-        issuesPath: getIssuesPath(tutorialPj.bugs)
-    };
-}
-exports.tutorialConfig = tutorialConfig;
-function getIssuesPath(bugs) {
-    return bugs && bugs.url ? bugs.url : null;
-}
-function loadRunner(name, runner, dir) {
+function configRunner(name, runner, dir) {
     var flatDep = path_1.join(dir, 'node_modules', runner, 'package.json');
     var treeDep = path_1.join(dir, 'node_modules', name, 'node_modules', runner, 'package.json');
     var runnerMain;
@@ -52,13 +31,5 @@ function loadRunner(name, runner, dir) {
         return require(pathToMain);
     }
 }
-function loadRepo(repo) {
-    if (repo && repo.url) {
-        var url = repo.url;
-        if (!!url.match(/\.git$/)) {
-            url = url.slice(0, url.length - 4);
-        }
-        return url;
-    }
-    return null;
-}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = configRunner;

lib/modules/tutorial/utils/config.js

@@ -0,0 +1,26 @@
+"use strict";
+var path_1 = require('path');
+var config_runner_1 = require('./config-runner');
+var config_repo_1 = require('./config-repo');
+function tutorialConfig(tutorialPj, dir) {
+    var config = tutorialPj.config, name = tutorialPj.name;
+    var repo = config_repo_1.configRepo(tutorialPj.repo);
+    var tutorialDir = path_1.join(dir, 'node_modules', name, config.dir);
+    var runner = config.runner;
+    var runnerOptions = config.runnerOptions || {};
+    var configEdit = tutorialPj.config.edit;
+    return {
+        dir: tutorialDir,
+        runner: runner,
+        runnerOptions: runnerOptions,
+        run: config_runner_1.default(name, config.runner, dir),
+        testSuffix: configTestSuffix(config.testSuffix),
+        issuesPath: config_repo_1.configIssuesPath(tutorialPj.bugs),
+        repo: repo,
+        edit: !!repo && configEdit || false,
+    };
+}
+exports.tutorialConfig = tutorialConfig;
+function configTestSuffix(suffix) {
+    return suffix.length && suffix[0] === '.' ? suffix : '.' + suffix || null;
+}

lib/typings/atom-plugin-command-line/index.js

@@ -43,8 +43,9 @@
     "marked": "0.3.5",
     "material-ui": "0.15.0",
     "node-file-exists": "^1.0.0",
-    "react": "15.0.2",
-    "react-dom": "15.0.2",
+    "process-console-log": "^0.1.0",
+    "react": "15.1.0",
+    "react-dom": "15.1.0",
     "react-redux": "4.4.5",
     "react-tap-event-plugin": "1.0.0",
     "redux": "3.5.2",

package.json

@@ -42,7 +42,7 @@ export default function alert(
       return setAlert(action.payload.alert);
 
     case ALERT_CLOSE:
-      return Object.assign({}, alert, {open: false});
+      return Object.assign({}, alert, { open: false });
 
     default:
       return alert;

src/modules/alert/reducer.ts

@@ -1,5 +1,5 @@
 import {join} from 'path';
-import {tutorialConfig} from './utils/tutorial-config';
+import {tutorialConfig} from './utils/config';
 import {TUTORIAL_SET} from './types';
 import configPaths from './utils/config-paths';
 

src/modules/tutorial/reducer.ts

@@ -0,0 +1,14 @@
+export function configRepo(repo?: { url: string }): string {
+  if (repo && repo.url) {
+    let url: string = repo.url;
+    if (!!url.match(/\.git$/)) {
+      url = url.slice(0, url.length - 4);
+    }
+    return url;
+  }
+  return null;
+}
+
+export function configIssuesPath(bugs?: { url: string }): string {
+  return bugs && bugs.url ? bugs.url : null;
+}

src/modules/tutorial/utils/config-repo.ts

@@ -2,31 +2,7 @@ import {join} from 'path';
 import fileExists from 'node-file-exists';
 import {isWindows} from './system';
 
-export function tutorialConfig(
-  tutorialPj: PackageJson, dir: string
-): Tutorial.Config {
-  const {config, name} = tutorialPj;
-  const repo: string = loadRepo(tutorialPj.repo);
-  const testSuffix: string = config.testSuffix;
-  return {
-    dir: join(dir, 'node_modules', name, config.dir),
-    testSuffix: testSuffix.length && testSuffix[0] === '.'
-      ? testSuffix
-      : '.' + testSuffix || null,
-    runner: config.runner,
-    runnerOptions: config.runnerOptions || {},
-    run: loadRunner(name, config.runner, dir),
-    repo,
-    edit: tutorialPj.config.edit && repo || false,
-    issuesPath: getIssuesPath(tutorialPj.bugs)
-  };
-}
-
-function getIssuesPath(bugs?: { url: string }) {
-  return bugs && bugs.url ? bugs.url : null;
-}
-
-function loadRunner(name: string, runner: string, dir: string): () => any {
+export default function configRunner(name: string, runner: string, dir: string): () => any {
   // test runner dir
   let flatDep = join(
     dir, 'node_modules', runner, 'package.json'
@@ -63,14 +39,3 @@ function loadRunner(name: string, runner: string, dir: string): () => any {
     return require(pathToMain);
   }
 }
-
-function loadRepo(repo?: { url: string }): string {
-  if (repo && repo.url) {
-    let url: string = repo.url;
-    if (!!url.match(/\.git$/)) {
-      url = url.slice(0, url.length - 4);
-    }
-    return url;
-  }
-  return null;
-}

src/modules/tutorial/utils/tutorial-config.ts renamed to src/modules/tutorial/utils/config-runner.ts

@@ -0,0 +1,32 @@
+import {join} from 'path';
+import fileExists from 'node-file-exists';
+import {isWindows} from './system';
+import configRunner from './config-runner';
+import {configRepo, configIssuesPath} from './config-repo';
+
+export function tutorialConfig(
+  tutorialPj: PackageJson, dir: string
+): Tutorial.Config {
+  // package.json: name, config
+  const {config, name} = tutorialPj;
+  const repo: string = configRepo(tutorialPj.repo);
+  const tutorialDir: string = join(dir, 'node_modules', name, config.dir);
+  const runner: string = config.runner;
+  const runnerOptions: Object = config.runnerOptions || {};
+  const configEdit: boolean = tutorialPj.config.edit;
+
+  return {
+    dir: tutorialDir,
+    runner,
+    runnerOptions,
+    run: configRunner(name, config.runner, dir),
+    testSuffix: configTestSuffix(config.testSuffix),
+    issuesPath: configIssuesPath(tutorialPj.bugs),
+    repo,
+    edit: !!repo && configEdit || false,
+  };
+}
+
+function configTestSuffix(suffix: string) {
+  return suffix.length && suffix[0] === '.' ? suffix : '.' + suffix || null;
+}

src/modules/tutorial/utils/config.ts

@@ -0,0 +1,3 @@
+declare module 'atom-plugin-command-line' {
+  export default function commandLine(root: string, commands?: string): Promise<string>;
+}

src/typings/atom-plugin-command-line/index.ts

@@ -0,0 +1,3 @@
+declare module 'node-file-exists' {
+  export default function fileExists(path: string): boolean;
+}

src/typings/node-file-exists/node-file-exists.d.ts

@@ -33,6 +33,7 @@
         "src/typings/marked/marked.d.ts",
         "src/typings/material-ui/material-ui.d.ts",
         "src/typings/mixto/mixto.d.ts",
+        "src/typings/node-file-exists/node-file-exists.d.ts",
         "src/typings/node/node.d.ts",
         "src/typings/pathwatcher/pathwatcher.d.ts",
         "src/typings/q/Q.d.ts",
@@ -119,8 +120,10 @@
         "src/modules/tutorial/reducer.ts",
         "src/modules/tutorial/types.ts",
         "src/modules/tutorial/utils/config-paths.ts",
+        "src/modules/tutorial/utils/config-repo.ts",
+        "src/modules/tutorial/utils/config-runner.ts",
+        "src/modules/tutorial/utils/config.ts",
         "src/modules/tutorial/utils/system.ts",
-        "src/modules/tutorial/utils/tutorial-config.ts",
         "src/modules/tutorials/actions.ts",
         "src/modules/tutorials/index.ts",
         "src/modules/tutorials/reducer.ts",
@@ -136,6 +139,7 @@
         "src/services/polyfills.ts",
         "src/store.ts",
         "src/subscriptions.ts",
+        "src/typings/atom-plugin-command-line/index.ts",
         "src/components/App.tsx",
         "src/components/AppMenu/CloseWindow.tsx",
         "src/components/AppMenu/index.tsx",