yeoman-environment 2.2.0 → 2.3.3

package/lib/environment.js

@@ -31,6 +31,25 @@ function splitArgsFromString(argsString) {
   return result;
 }
 
+/**
+ * Wrap callback so it can't get called twice
+ */
+const callbackWrapper = (generator, done) => {
+  if (!done) {
+    return _.noop();
+  }
+  let callbackHandled = false;
+  const callback = err => {
+    if (!callbackHandled) {
+      callbackHandled = true;
+      done(err);
+    }
+  };
+  // If error was thrown, make sure it is handled and only once
+  generator.on('error', callback);
+  return callback;
+};
+
 /**
  * `Environment` object is responsible of handling the lifecyle and bootstrap
  * of generators in a specific environment (your app).
@@ -242,11 +261,12 @@ class Environment extends EventEmitter {
    * functions under the provided namespace. `registerStub` will enforce the function passed
    * to extend the Base generator automatically.
    *
-   * @param  {Function} Generator - A Generator constructor or a simple function
-   * @param  {String}   namespace - Namespace under which register the generator
+   * @param  {Function} Generator  - A Generator constructor or a simple function
+   * @param  {String}   namespace  - Namespace under which register the generator
+   * @param  {String}   [resolved] - The file path to the generator
    * @return {this}
    */
-  registerStub(Generator, namespace) {
+  registerStub(Generator, namespace, resolved) {
     if (typeof Generator !== 'function') {
       return this.error(new Error('You must provide a stub function to register.'));
     }
@@ -255,7 +275,7 @@ class Environment extends EventEmitter {
       return this.error(new Error('You must provide a namespace to register.'));
     }
 
-    this.store.add(namespace, Generator);
+    this.store.add(namespace, Generator, resolved);
 
     return this;
   }
@@ -452,7 +472,9 @@ class Environment extends EventEmitter {
       return console.log(generator.help());
     }
 
-    return generator.run(done);
+    const _callbackWrapper = callbackWrapper(generator, done);
+
+    return generator.run(_callbackWrapper);
   }
 
   /**

package/lib/resolver.js

@@ -42,7 +42,7 @@ resolver.lookup = function (cb) {
   }
 
   for (const pattern of patterns) {
-    for (const filename of globby.sync('*/index.js', {cwd: pattern, absolute: true})) {
+    for (const filename of globby.sync('*/index.js', {cwd: pattern, absolute: true, deep: 1})) {
       this._tryRegistering(filename);
     }
   }
@@ -73,9 +73,24 @@ resolver.findGeneratorsIn = function (searchPaths) {
     // restricted folders.
     try {
       modules = modules.concat(globby.sync(
-        ['generator-*', '@*/generator-*'],
-        {cwd: root, onlyFiles: false, absolute: true}
+        ['generator-*'],
+        {cwd: root, onlyFiles: false, absolute: true, deep: 0}
       ));
+
+      // To limit recursive lookups into non-namespace folders within globby,
+      // fetch all namespaces in root, then search each namespace separately
+      // for generator modules
+      const namespaces = globby.sync(
+        ['@*'],
+        {cwd: root, onlyFiles: false, absolute: true, deep: 0}
+      );
+
+      for (const namespace of namespaces) {
+        modules = modules.concat(globby.sync(
+          ['generator-*'],
+          {cwd: namespace, onlyFiles: false, absolute: true, deep: 0}
+        ));
+      }
     } catch (err) {
       debug('Could not access %s (%s)', root, err);
     }

package/lib/store.js

@@ -15,16 +15,17 @@ class Store {
 
   /**
    * Store a module under the namespace key
-   * @param {String}          namespace - The key under which the generator can be retrieved
-   * @param {String|Function} generator - A generator module or a module path
+   * @param {String}          namespace  - The key under which the generator can be retrieved
+   * @param {String|Function} generator  - A generator module or a module path
+   * @param {String}          [resolved] - The file path to the generator (used only if generator is a module)
    */
-  add(namespace, generator) {
+  add(namespace, generator, resolved) {
     if (typeof generator === 'string') {
       this._storeAsPath(namespace, generator);
       return;
     }
 
-    this._storeAsModule(namespace, generator);
+    this._storeAsModule(namespace, generator, resolved);
   }
 
   _storeAsPath(namespace, path) {
@@ -43,9 +44,9 @@ class Store {
     });
   }
 
-  _storeAsModule(namespace, Generator) {
+  _storeAsModule(namespace, Generator, resolved = 'unknown') {
     this._meta[namespace] = {
-      resolved: 'unknown',
+      resolved,
       namespace
     };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-environment",
-  "version": "2.2.0",
+  "version": "2.3.3",
   "description": "Handles the lifecyle and bootstrapping of generators in a specific environment",
   "homepage": "http://yeoman.io",
   "author": "Yeoman",
@@ -28,37 +28,35 @@
     "test": "nyc mocha",
     "doc": "jsdoc -c ./jsdoc.json ./readme.md",
     "benchmark": "matcha benchmark/**",
-    "prepublish": "nsp check",
     "coverage": "nyc report --reporter=text-lcov | coveralls"
   },
   "dependencies": {
-    "chalk": "^2.1.0",
+    "chalk": "^2.4.1",
     "cross-spawn": "^6.0.5",
     "debug": "^3.1.0",
-    "diff": "^3.3.1",
+    "diff": "^3.5.0",
     "escape-string-regexp": "^1.0.2",
     "globby": "^8.0.1",
     "grouped-queue": "^0.3.3",
-    "inquirer": "^5.2.0",
+    "inquirer": "^6.0.0",
     "is-scoped": "^1.0.0",
     "lodash": "^4.17.10",
-    "log-symbols": "^2.1.0",
+    "log-symbols": "^2.2.0",
     "mem-fs": "^1.1.0",
     "strip-ansi": "^4.0.0",
     "text-table": "^0.2.0",
-    "untildify": "^3.0.2"
+    "untildify": "^3.0.3"
   },
   "devDependencies": {
-    "coveralls": "^3.0.1",
+    "coveralls": "^3.0.2",
     "jsdoc": "^3.5.5",
     "matcha": "^0.7.0",
-    "mocha": "^5.1.1",
-    "nsp": "^3.2.1",
-    "nyc": "^11.7.3",
-    "sinon": "^5.0.7",
-    "sinon-test": "^2.1.3",
-    "xo": "^0.18.1",
-    "yeoman-assert": "^3.0.0",
+    "mocha": "^5.2.0",
+    "nyc": "^11.9.0",
+    "sinon": "^5.1.1",
+    "sinon-test": "^2.2.1",
+    "xo": "^0.18.2",
+    "yeoman-assert": "^3.1.1",
     "yeoman-generator": "^2.0.5"
   },
   "xo": {