refactor(@angular/cli): simplify ember-cli promise usage

Charles Lyding · filipesilva · commit cfbeb3d05213 · 2017-06-29T19:55:59.000+01:00
diff --git a/packages/@angular/cli/ember-cli/lib/ext/promise.js b/packages/@angular/cli/ember-cli/lib/ext/promise.js
diff --git a/packages/@angular/cli/ember-cli/lib/models/blueprint.js b/packages/@angular/cli/ember-cli/lib/models/blueprint.js
@@ -4,7 +4,8 @@
 @module ember-cli
 */
 var FileInfo            = require('./file-info');
-var Promise             = require('../ext/promise');
+var RSVP                = require('rsvp');
+var Promise             = RSVP.Promise;
 var chalk               = require('chalk');
 var printableProperties = require('../utilities/printable-properties').blueprint;
 var sequence            = require('../utilities/sequence');
@@ -13,7 +14,7 @@ var fs                  = require('fs-extra');
 var inflector           = require('inflection');
 var minimatch           = require('minimatch');
 var path                = require('path');
-var stat                = Promise.denodeify(fs.stat);
+var stat                = RSVP.denodeify(fs.stat);
 var stringUtils         = require('ember-cli-string-utils');
 var compact             = require('lodash/compact');
 var intersect           = require('lodash/intersection');
@@ -26,8 +27,8 @@ var keys                = require('lodash/keys');
 var merge               = require('lodash/merge');
 var values              = require('lodash/values');
 var walkSync            = require('walk-sync');
-var writeFile           = Promise.denodeify(fs.outputFile);
-var removeFile          = Promise.denodeify(fs.remove);
+var writeFile           = RSVP.denodeify(fs.outputFile);
+var removeFile          = RSVP.denodeify(fs.remove);
 var SilentError         = require('silent-error');
 var CoreObject          = require('core-object');
 var EOL                 = require('os').EOL;
@@ -493,7 +494,8 @@ Blueprint.prototype._process = function(options, beforeHook, process, afterHook)
   return this._locals(options).then(function (locals) {
     return Promise.resolve()
       .then(beforeHook.bind(self, options, locals))
-      .then(process.bind(self, intoDir, locals)).map(self._commit.bind(self))
+      .then(process.bind(self, intoDir, locals))
+      .then(promises => RSVP.map(promises, self._commit.bind(self)))
       .then(afterHook.bind(self, options));
   });
 };
@@ -774,9 +776,9 @@ Blueprint.prototype.processFiles = function(intoDir, templateVariables) {
 
   this._ignoreUpdateFiles();
 
-  return Promise.filter(fileInfos, isValidFile).
-    map(prepareConfirm).
-    then(finishProcessingForInstall);
+  return RSVP.filter(fileInfos, isValidFile)
+    .then(promises => RSVP.map(promises, prepareConfirm))
+    .then(finishProcessingForInstall);
 };
 
 /**
@@ -789,7 +791,7 @@ Blueprint.prototype.processFilesForUninstall = function(intoDir, templateVariabl
 
   this._ignoreUpdateFiles();
 
-  return Promise.filter(fileInfos, isValidFile).
+  return RSVP.filter(fileInfos, isValidFile).
     then(finishProcessingForUninstall);
 };
 
@@ -1374,7 +1376,7 @@ function gatherConfirmationMessages(collection, info) {
   @return {Boolean}
 */
 function isFile(info) {
-  return stat(info.inputPath).invoke('isFile');
+  return stat(info.inputPath).then(it => it.isFile());
 }
 
 /**
diff --git a/packages/@angular/cli/ember-cli/lib/models/command.js b/packages/@angular/cli/ember-cli/lib/models/command.js
@@ -6,7 +6,6 @@ const path = require('path');
 const camelize = require('ember-cli-string-utils').camelize;
 const getCallerFile = require('get-caller-file');
 const printCommand = require('../utilities/print-command');
-const Promise = require('rsvp').Promise;
 const _ = require('lodash');
 const EOL = require('os').EOL;
 const CoreObject = require('core-object');
diff --git a/packages/@angular/cli/ember-cli/lib/models/edit-file-diff.js b/packages/@angular/cli/ember-cli/lib/models/edit-file-diff.js
@@ -1,16 +1,13 @@
 'use strict';
 
-const fs = require('fs');
+const fs = require('fs-extra');
 const RSVP = require('rsvp');
 const jsdiff = require('diff');
 const temp = require('temp').track();
 const path = require('path');
 const SilentError = require('silent-error');
 const openEditor = require('../utilities/open-editor');
 
-const readFile = RSVP.denodeify(fs.readFile);
-const writeFile = RSVP.denodeify(fs.writeFile);
-
 class EditFileDiff {
   constructor(options) {
     this.info = options.info;
@@ -19,7 +16,7 @@ class EditFileDiff {
   edit() {
     return RSVP.hash({
       input: this.info.render(),
-      output: readFile(this.info.outputPath),
+      output: fs.readFile(this.info.outputPath),
     })
       .then(this.invokeEditor.bind(this))
       .then(this.applyPatch.bind(this))
@@ -32,8 +29,8 @@ class EditFileDiff {
 
   applyPatch(resultHash) {
     return RSVP.hash({
-      diffString: readFile(resultHash.diffPath),
-      currentString: readFile(resultHash.outputPath),
+      diffString: fs.readFile(resultHash.diffPath),
+      currentString: fs.readFile(resultHash.outputPath),
     }).then(result => {
       let appliedDiff = jsdiff.applyPatch(result.currentString.toString(), result.diffString.toString());
 
@@ -43,7 +40,7 @@ class EditFileDiff {
         throw new SilentError(message);
       }
 
-      return writeFile(resultHash.outputPath, appliedDiff);
+      return fs.writeFile(resultHash.outputPath, appliedDiff);
     });
   }
 
@@ -52,7 +49,7 @@ class EditFileDiff {
     let diff = jsdiff.createPatch(info.outputPath, result.output.toString(), result.input);
     let diffPath = path.join(temp.mkdirSync(), 'currentDiff.diff');
 
-    return writeFile(diffPath, diff)
+    return fs.writeFile(diffPath, diff)
       .then(() => openEditor(diffPath))
       .then(() => ({ outputPath: info.outputPath, diffPath }));
   }
diff --git a/packages/@angular/cli/ember-cli/lib/models/file-info.js b/packages/@angular/cli/ember-cli/lib/models/file-info.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const fs = require('fs');
+const fs = require('fs-extra');
 const RSVP = require('rsvp');
 const chalk = require('chalk');
 const EditFileDiff = require('./edit-file-diff');
@@ -9,10 +9,6 @@ const rxEOL = new RegExp(EOL, 'g');
 const isBinaryFile = require('isbinaryfile').sync;
 const canEdit = require('../utilities/open-editor').canEdit;
 
-const Promise = RSVP.Promise;
-const readFile = RSVP.denodeify(fs.readFile);
-const lstat = RSVP.denodeify(fs.stat);
-
 function processTemplate(content, context) {
   let options = {
     evaluate: /<%([\s\S]+?)%>/g,
@@ -84,7 +80,7 @@ class FileInfo {
         jsdiff = require('diff');
     return RSVP.hash({
       input: this.render(),
-      output: readFile(info.outputPath),
+      output: fs.readFile(info.outputPath),
     }).then(result => {
       let diff = jsdiff.createPatch(
         info.outputPath, result.output.toString().replace(rxEOL, '\n'), result.input.replace(rxEOL, '\n')
@@ -103,8 +99,8 @@ class FileInfo {
     let path = this.inputPath,
         context = this.templateVariables;
     if (!this.rendered) {
-      this.rendered = readFile(path)
-        .then(content => lstat(path)
+      this.rendered = fs.readFile(path)
+        .then(content => fs.stat(path)
           .then(fileStat => {
             if (isBinaryFile(content, fileStat.size)) {
               return content;
@@ -133,7 +129,7 @@ class FileInfo {
         if (doesExist) {
           result = RSVP.hash({
             input: this.render(),
-            output: readFile(this.outputPath),
+            output: fs.readFile(this.outputPath),
           }).then(result => {
             let type;
             if (result.input.toString().replace(rxEOL, '\n') === result.output.toString().replace(rxEOL, '\n')) {
diff --git a/packages/@angular/cli/ember-cli/lib/tasks/install-blueprint.js b/packages/@angular/cli/ember-cli/lib/tasks/install-blueprint.js
@@ -2,15 +2,9 @@
 
 var Blueprint     = require('../models/blueprint');
 var Task          = require('../models/task');
-var Promise       = require('../ext/promise');
-var temp          = require('temp');
-var childProcess  = require('child_process');
 var path          = require('path');
 var merge         = require('lodash/merge');
 
-var mkdir = Promise.denodeify(temp.mkdir);
-var exec = Promise.denodeify(childProcess.exec);
-
 module.exports = Task.extend({
   run: function(options) {
     var cwd             = process.cwd();
diff --git a/packages/@angular/cli/ember-cli/lib/tasks/npm-task.js b/packages/@angular/cli/ember-cli/lib/tasks/npm-task.js
@@ -4,9 +4,9 @@
 
 var chalk = require('chalk');
 var Task  = require('../models/task');
-var Promise = require('../ext/promise');
+var RSVP = require('rsvp');
 
-var spawn = Promise.denodeify(require('child_process').spawn);
+var spawn = RSVP.denodeify(require('child_process').spawn);
 
 
 module.exports = Task.extend({
diff --git a/packages/@angular/cli/ember-cli/lib/ui/index.js b/packages/@angular/cli/ember-cli/lib/ui/index.js
@@ -1,6 +1,5 @@
 'use strict';
 
-var Promise          = require('../ext/promise');
 var EOL              = require('os').EOL;
 var chalk            = require('chalk');
 var writeError       = require('./write-error');
diff --git a/packages/@angular/cli/ember-cli/lib/utilities/insert-into-file.js b/packages/@angular/cli/ember-cli/lib/utilities/insert-into-file.js
@@ -2,10 +2,6 @@
 
 const fs = require('fs-extra');
 const EOL = require('os').EOL;
-const RSVP = require('rsvp');
-
-const Promise = RSVP.Promise;
-const writeFile = RSVP.denodeify(fs.outputFile);
 
 /**
   Inserts the given content into a file. If the `contentsToInsert` string is already
@@ -88,7 +84,7 @@ function insertIntoFile(fullPath, contentsToInsert, providedOptions) {
   if (contentsToWrite !== originalContents) {
     returnValue.inserted = true;
 
-    return writeFile(fullPath, contentsToWrite)
+    return fs.writeFile(fullPath, contentsToWrite)
       .then(() => returnValue);
 
   } else {
diff --git a/packages/@angular/cli/ember-cli/lib/utilities/mk-tmp-dir-in.js b/packages/@angular/cli/ember-cli/lib/utilities/mk-tmp-dir-in.js
@@ -2,22 +2,14 @@
 
 const fs = require('fs-extra');
 const temp = require('temp');
-const RSVP = require('rsvp');
+const denodeify = require('denodeify');
 
-const Promise = RSVP.Promise;
-const mkdir = RSVP.denodeify(fs.mkdir);
-const mkdirTemp = RSVP.denodeify(temp.mkdir);
-
-function exists(dir) {
-  return new Promise(resolve => {
-    fs.exists(dir, resolve);
-  });
-}
+const mkdirTemp = denodeify(temp.mkdir);
 
 function mkTmpDirIn(dir) {
-  return exists(dir).then(doesExist => {
+  return fs.pathExists(dir).then(doesExist => {
     if (!doesExist) {
-      return mkdir(dir);
+      return fs.mkdir(dir);
     }
   }).then(() => mkdirTemp({ dir }));
 }
diff --git a/packages/@angular/cli/ember-cli/lib/utilities/open-editor.js b/packages/@angular/cli/ember-cli/lib/utilities/open-editor.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const Promise = require('rsvp').Promise;
 const spawn = require('child_process').spawn;
 
 function openEditor(file) {
diff --git a/packages/@angular/cli/ember-cli/lib/utilities/sequence.js b/packages/@angular/cli/ember-cli/lib/utilities/sequence.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const Promise = require('rsvp').Promise;
 /*
  *
  * given an array of functions, that may or may not return promises sequence
diff --git a/packages/@angular/cli/package.json b/packages/@angular/cli/package.json
@@ -43,7 +43,7 @@
     "exports-loader": "^0.6.3",
     "extract-text-webpack-plugin": "^2.1.0",
     "file-loader": "^0.10.0",
-    "fs-extra": "^2.0.0",
+    "fs-extra": "^3.0.1",
     "get-caller-file": "^1.0.0",
     "glob": "^7.0.3",
     "heimdalljs": "^0.2.4",
