refactor out fileExists service for package

Author: ShMcK

lib/modules/editor/actions/file.js

@@ -1,6 +1,6 @@
 "use strict";
 var fs_1 = require('fs');
-var exists_1 = require('../../../services/exists');
+var node_file_exists_1 = require('node-file-exists');
 var editor_1 = require('./editor');
 var openTimeout = 200;
 function openFolder() {
@@ -14,13 +14,11 @@ exports.save = save;
 function open(filePath, options) {
     if (options === void 0) { options = {}; }
     return new Promise(function (resolve, reject) {
-        if (exists_1.fileExists(filePath)) {
+        if (node_file_exists_1.default(filePath)) {
             fs_1.unlink(filePath);
         }
         atom.workspace.open(filePath, options);
-        setTimeout(function () {
-            resolve();
-        }, openTimeout);
+        setTimeout(function () { return resolve(); }, openTimeout);
     });
 }
 exports.open = open;

lib/modules/setup/package-json/index.js

@@ -1,14 +1,14 @@
 "use strict";
 var path_1 = require('path');
 var fs_1 = require('fs');
-var exists_1 = require('../../../services/exists');
+var node_file_exists_1 = require('node-file-exists');
 function packageJson(pj, action) {
     if (pj === void 0) { pj = null; }
     switch (action.type) {
         case 'SETUP_PACKAGE':
             var dir = action.payload.dir;
             var pathToPackageJson = path_1.join(dir, 'package.json');
-            if (exists_1.fileExists(pathToPackageJson)) {
+            if (node_file_exists_1.default(pathToPackageJson)) {
                 return JSON.parse(fs_1.readFileSync(pathToPackageJson, 'utf8'));
             }
             return null;

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

@@ -1,6 +1,6 @@
 "use strict";
 var path_1 = require('path');
-var system_1 = require('../../../services/system');
+var system_1 = require('./system');
 function configTestString(dir, name, config, testPath) {
     if (system_1.isWindows) {
         testPath = testPath.split('/').join('\\');

lib/services/system.js renamed to lib/modules/tutorial/utils/system.js

@@ -1,7 +1,7 @@
 "use strict";
 var path_1 = require('path');
-var exists_1 = require('../../../services/exists');
-var system_1 = require('../../../services/system');
+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);
@@ -28,11 +28,11 @@ function loadRunner(name, runner, dir) {
     var treeDep = path_1.join(dir, 'node_modules', name, 'node_modules', runner, 'package.json');
     var runnerMain;
     var runnerRoot;
-    if (exists_1.fileExists(flatDep)) {
+    if (node_file_exists_1.default(flatDep)) {
         runnerMain = require(flatDep).main;
         runnerRoot = flatDep;
     }
-    else if (exists_1.fileExists(treeDep)) {
+    else if (node_file_exists_1.default(treeDep)) {
         runnerMain = require(treeDep).main;
         runnerRoot = treeDep;
     }

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

@@ -1,7 +1,7 @@
 "use strict";
 var path_1 = require('path');
 var fs_1 = require('fs');
-var exists_1 = require('../../../services/exists');
+var node_file_exists_1 = require('node-file-exists');
 var is_tutorial_1 = require('./is-tutorial');
 var update_1 = require('./update');
 function searchForTutorials(dir, deps) {
@@ -10,7 +10,7 @@ function searchForTutorials(dir, deps) {
             .filter(function (name) { return is_tutorial_1.isTutorial(dir, name); })
             .map(function (name) {
             var pathToTutorialPackageJson = path_1.join(dir, 'node_modules', name, 'package.json');
-            if (!exists_1.fileExists(pathToTutorialPackageJson)) {
+            if (!node_file_exists_1.default(pathToTutorialPackageJson)) {
                 console.log("Error with " + name + ": no package.json file found. " + is_tutorial_1.tutorialError);
                 return {
                     name: name,

lib/modules/tutorials/utils/check.js

@@ -1,11 +1,11 @@
 "use strict";
 var path_1 = require('path');
 var fs_1 = require('fs');
-var exists_1 = require('../../../services/exists');
+var node_file_exists_1 = require('node-file-exists');
 exports.tutorialError = 'This is an error with the tutorial itself';
 function isTutorial(dir, name) {
     var pathToTutorialPackageJson = path_1.join(dir, 'node_modules', name, 'package.json');
-    if (!exists_1.fileExists(pathToTutorialPackageJson)) {
+    if (!node_file_exists_1.default(pathToTutorialPackageJson)) {
         console.log("Error with " + name + ": no package.json file found. " + exports.tutorialError);
         return false;
     }
@@ -15,7 +15,7 @@ function isTutorial(dir, name) {
         return false;
     }
     var pathToCoderoadJson = path_1.join(dir, 'node_modules', name, packageJson.main);
-    if (!exists_1.fileExists(pathToCoderoadJson)) {
+    if (!node_file_exists_1.default(pathToCoderoadJson)) {
         console.log("Error with " + name + ": no coderoad.json file. " + exports.tutorialError);
         return false;
     }

lib/modules/tutorials/utils/is-tutorial.js

@@ -1,14 +1,14 @@
 "use strict";
-var exists_1 = require('./exists');
+var node_file_exists_1 = require('node-file-exists');
 var child_process_1 = require('child_process');
 function commandLine(root, commands) {
     if (process.platform === 'darwin' && process.resourcesPath) {
         var localPath = '/usr/local/bin/' + root;
         var globalPath = '/usr/bin/' + root;
-        if (exists_1.fileExists(localPath)) {
+        if (node_file_exists_1.default(localPath)) {
             root = localPath;
         }
-        else if (exists_1.fileExists(globalPath)) {
+        else if (node_file_exists_1.default(globalPath)) {
             root = globalPath;
         }
         else {

lib/services/command-line.js

@@ -41,6 +41,7 @@
     "highlights": "1.3.1",
     "marked": "0.3.5",
     "material-ui": "0.15.0",
+    "node-file-exists": "^1.0.0",
     "react": "15.0.2",
     "react-dom": "15.0.2",
     "react-redux": "4.4.5",

lib/services/exists.js

@@ -1,5 +1,5 @@
 import {unlink} from 'fs';
-import {fileExists} from '../../../services/exists';
+import fileExists from 'node-file-exists';
 import {getEditor} from './editor';
 
 // delay necessary since opening a file is slow
@@ -19,9 +19,8 @@ export function open(filePath: string, options = {}): Promise<any> {
     if (fileExists(filePath)) {
       unlink(filePath);
     }
+
     atom.workspace.open(filePath, options);
-    setTimeout(() => {
-      resolve();
-    }, openTimeout);
+    setTimeout(() => resolve(), openTimeout);
   });
 }

package.json

@@ -2,6 +2,7 @@ components: ContentCard
 
 atom
 
-services: commandLine, exists
+services: commandLine
 
 tutorials/searchForTutorials
+editor/{open, set, openFolder, openTerminal}

src/modules/editor/actions/file.ts

@@ -1,6 +1,6 @@
 import {join} from 'path';
 import {readFileSync} from 'fs';
-import {fileExists} from '../../../services/exists';
+import fileExists from 'node-file-exists';
 
 export default function packageJson(
   pj = null, action: Action

src/modules/setup/deps.md

@@ -1,4 +1 @@
-services/system
-services/exists
-
 actions: progressLoad, routeSet

src/modules/setup/package-json/index.ts

@@ -1,5 +1,5 @@
 import {join} from 'path';
-import {isWindows} from '../../../services/system';
+import {isWindows} from './system';
 
 function configTestString(
   dir: string, name: string, config: Tutorial.Config, testPath: string

src/modules/tutorial/deps.md

@@ -1,6 +1,6 @@
 import {join} from 'path';
-import {fileExists} from '../../../services/exists';
-import {isWindows} from '../../../services/system';
+import fileExists from 'node-file-exists';
+import {isWindows} from './system';
 
 export function tutorialConfig(
   tutorialPj: PackageJson, dir: string

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

@@ -1,4 +1,3 @@
-services/exists
 services/commandLine
 
 actions: alertOpen, tutorialSet

src/services/system.ts renamed to src/modules/tutorial/utils/system.ts

@@ -1,6 +1,6 @@
 import {join} from 'path';
 import {readFileSync} from 'fs';
-import {fileExists} from '../../../services/exists';
+import fileExists from 'node-file-exists';
 import {isTutorial, tutorialError} from './is-tutorial';
 import {canUpdateTutorial} from './update';
 

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

@@ -1,6 +1,6 @@
 import {join} from 'path';
 import {readFileSync} from 'fs';
-import {fileExists} from '../../../services/exists';
+import fileExists from 'node-file-exists';
 
 export const tutorialError = 'This is an error with the tutorial itself';
 

src/modules/tutorials/deps.md

@@ -1,4 +1,4 @@
-import {fileExists} from './exists';
+import fileExists from 'node-file-exists';
 import {exec} from 'child_process';
 
 export default function commandLine(root: string,

src/modules/tutorials/utils/check.ts

@@ -119,6 +119,7 @@
         "src/modules/tutorial/reducer.ts",
         "src/modules/tutorial/types.ts",
         "src/modules/tutorial/utils/config-paths.ts",
+        "src/modules/tutorial/utils/system.ts",
         "src/modules/tutorial/utils/tutorial-config.ts",
         "src/modules/tutorials/actions.ts",
         "src/modules/tutorials/index.ts",
@@ -133,9 +134,7 @@
         "src/modules/window/types.ts",
         "src/reducers.ts",
         "src/services/command-line.ts",
-        "src/services/exists.ts",
         "src/services/polyfills.ts",
-        "src/services/system.ts",
         "src/store.ts",
         "src/subscriptions.ts",
         "src/components/App.tsx",