@babel/cli - npm Package Compare versions

Comparing version 7.0.0-beta.37 to 7.0.0-beta.38

lib/babel/dir.js

@@ -23,5 +23,10 @@ "use strict";
 function _default(commander, filenames, opts) {
-  function write(src, relative, base) {
+  function write(src, relative, base, callback) {
+    if (typeof base === "function") {
+      callback = base;
+      base = undefined;
+    }
+
     if (!util.isCompilableExtension(relative, commander.extensions)) {
-      return false;
+      return callback();
     }
@@ -31,18 +36,20 @@
     var dest = getDest(commander, relative, base);
-    var data = util.compile(src, (0, _defaults.default)({
+    util.compile(src, (0, _defaults.default)({
       sourceFileName: (0, _slash.default)(_path.default.relative(dest + "/..", src)),
       sourceMapTarget: _path.default.basename(relative)
-    }, opts));
-    if (!data) return false;
+    }, opts), function (err, res) {
+      if (err) return callback(err);
+      if (!res) return callback();
 
-    if (data.map && commander.sourceMaps && commander.sourceMaps !== "inline") {
-      var mapLoc = dest + ".map";
-      data.code = util.addSourceMappingUrl(data.code, mapLoc);
-      (0, _outputFileSync.default)(mapLoc, JSON.stringify(data.map));
-    }
+      if (res.map && commander.sourceMaps && commander.sourceMaps !== "inline") {
+        var mapLoc = dest + ".map";
+        res.code = util.addSourceMappingUrl(res.code, mapLoc);
+        (0, _outputFileSync.default)(mapLoc, JSON.stringify(res.map));
+      }
 
-    (0, _outputFileSync.default)(dest, data.code);
-    util.chmod(src, dest);
-    util.log(src + " -> " + dest);
-    return true;
+      (0, _outputFileSync.default)(dest, res.code);
+      util.chmod(src, dest);
+      util.log(src + " -> " + dest);
+      return callback(null, true);
+    });
   }
@@ -55,13 +62,44 @@
 
-  function handleFile(src, filename, base) {
-    var didWrite = write(src, filename, base);
+  function handleFile(src, filename, base, callback) {
+    if (typeof base === "function") {
+      callback = base;
+      base = undefined;
+    }
 
-    if (!didWrite && commander.copyFiles) {
-      var dest = getDest(commander, filename, base);
-      (0, _outputFileSync.default)(dest, _fs.default.readFileSync(src));
-      util.chmod(src, dest);
+    write(src, filename, base, function (err, res) {
+      if (err) return callback(err);
+
+      if (!res && commander.copyFiles) {
+        var dest = getDest(commander, filename, base);
+        (0, _outputFileSync.default)(dest, _fs.default.readFileSync(src));
+        util.chmod(src, dest);
+      }
+
+      return callback();
+    });
+  }
+
+  function sequentialHandleFile(files, dirname, index, callback) {
+    if (typeof index === "function") {
+      callback = index;
+      index = 0;
     }
+
+    var filename = files[index];
+
+    var src = _path.default.join(dirname, filename);
+
+    handleFile(src, filename, dirname, function (err) {
+      if (err) return callback(err);
+      index++;
+
+      if (index !== files.length) {
+        sequentialHandleFile(files, dirname, index, callback);
+      } else {
+        callback();
+      }
+    });
   }
 
-  function handle(filename) {
+  function handle(filename, callback) {
     if (!_fs.default.existsSync(filename)) return;
@@ -78,14 +116,27 @@
 
-      util.readdir(dirname, commander.includeDotfiles).forEach(function (filename) {
-        var src = _path.default.join(dirname, filename);
-
-        handleFile(src, filename, dirname);
-      });
+      var files = util.readdir(dirname, commander.includeDotfiles);
+      sequentialHandleFile(files, dirname, callback);
     } else {
-      write(filename, _path.default.basename(filename), _path.default.dirname(filename));
+      write(filename, _path.default.basename(filename), _path.default.dirname(filename), callback);
     }
   }
 
+  function sequentialHandle(filenames, index) {
+    if (index === void 0) {
+      index = 0;
+    }
+
+    var filename = filenames[index];
+    handle(filename, function (err) {
+      if (err) throw err;
+      index++;
+
+      if (index !== filenames.length) {
+        sequentialHandle(filenames, index);
+      }
+    });
+  }
+
   if (!commander.skipInitialBuild) {
-    filenames.forEach(handle);
+    sequentialHandle(filenames);
   }
@@ -109,3 +160,5 @@
           try {
-            handleFile(filename, relative);
+            handleFile(filename, relative, function (err) {
+              if (err) throw err;
+            });
           } catch (err) {
@@ -112,0 +165,0 @@ console.error(err.stack);

lib/babel/file.js

@@ -104,6 +104,9 @@ "use strict";
     process.stdin.on("end", function () {
-      results.push(util.transform(commander.filename, code, (0, _defaults.default)({
+      util.transform(commander.filename, code, (0, _defaults.default)({
         sourceFileName: "stdin"
-      }, opts)));
-      output();
+      }, opts), function (err, res) {
+        if (err) throw err;
+        results.push(res);
+        output();
+      });
     });
@@ -129,4 +132,5 @@ };
     });
+    var filesProcessed = 0;
 
-    _filenames.forEach(function (filename) {
+    _filenames.forEach(function (filename, index) {
       var sourceFilename = filename;
@@ -139,10 +143,14 @@
       sourceFilename = (0, _slash.default)(sourceFilename);
-      var data = util.compile(filename, (0, _defaults.default)({
+      util.compile(filename, (0, _defaults.default)({
         sourceFileName: sourceFilename
-      }, opts));
-      if (!data) return;
-      results.push(data);
+      }, opts), function (err, res) {
+        if (err) throw err;
+        filesProcessed++;
+        if (res) results[index] = res;
+
+        if (filesProcessed === _filenames.length) {
+          output();
+        }
+      });
     });
-
-    output();
   };
@@ -149,0 +157,0 @@

lib/babel/util.js

@@ -62,22 +62,24 @@ "use strict";
 
-function transform(filename, code, opts) {
+function transform(filename, code, opts, callback) {
   opts = Object.assign({}, opts, {
     filename: filename
   });
-  return babel.transform(code, opts);
+  babel.transform(code, opts, callback);
 }
 
-function compile(filename, opts) {
-  try {
-    return babel.transformFileSync(filename, opts);
-  } catch (err) {
-    if (_commander.default.watch) {
-      console.error(err);
-      return {
-        ignored: true
-      };
-    } else {
-      throw err;
+function compile(filename, opts, callback) {
+  babel.transformFile(filename, opts, function (err, res) {
+    if (err) {
+      if (_commander.default.watch) {
+        console.error(err);
+        return callback(null, {
+          ignored: true
+        });
+      } else {
+        return callback(err);
+      }
     }
-  }
+
+    return callback(null, res);
+  });
 }
@@ -84,0 +86,0 @@

package.json

 {
   "name": "@babel/cli",
-  "version": "7.0.0-beta.37",
+  "version": "7.0.0-beta.38",
   "description": "Babel command line.",
@@ -32,7 +32,7 @@ "author": "Sebastian McKenzie <[e-mail]>",
   "peerDependencies": {
-    "@babel/core": "7.0.0-beta.37"
+    "@babel/core": "7.0.0-beta.38"
   },
   "devDependencies": {
-    "@babel/core": "7.0.0-beta.37",
-    "@babel/helper-fixtures": "7.0.0-beta.37"
+    "@babel/core": "7.0.0-beta.38",
+    "@babel/helper-fixtures": "7.0.0-beta.38"
   },
@@ -39,0 +39,0 @@ "bin": {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

23653

increased by7.09%

Lines of code

524

increased by11.02%

No dependency changes