yeoman-environment 3.8.1 → 3.10.0

package/lib/command.js

@@ -21,7 +21,7 @@ module.exports = cls => class EnvironmentCommand extends cls {
       .option('--skip-yo-resolve', 'Ignore .yo-resolve files', false)
       /* Hidden options, used for api */
       .addOption(new Option('--skip-local-cache', 'Skip local answers cache').default(true).hideHelp())
-      .addOption(new Option('--skip-parse-options', 'Skip legacy options parsing').default(true).hideHelp())
+      .addOption(new Option('--skip-parse-options', 'Skip legacy options parsing').default(false).hideHelp())
       .addOption(new Option('--experimental', 'Experimental features').default(false).hideHelp())
       .addOption(new Option('--log-cwd', 'Path for log purpose').hideHelp());
   }

package/lib/environment.js

@@ -147,19 +147,22 @@ class Environment extends Base {
    * @param {Class} GeneratorClass - Generator to create Command
    * @return {Command} return command
    */
-  static prepareGeneratorCommand(command, GeneratorClass) {
+  static prepareGeneratorCommand(command, GeneratorClass, namespace) {
     const generator = new GeneratorClass([], {help: true, env: {}});
     Base.addGeneratorOptions(command, generator);
 
     command.action(async function () {
-      command.env = Environment.createEnv(this.opts());
-
       let rootCommand = this;
       while (rootCommand.parent) {
         rootCommand = rootCommand.parent;
       }
+      command.env = Environment.createEnv(rootCommand.opts());
+
       rootCommand.emit('yeoman:environment', command.env);
 
+      if (namespace) {
+        return command.env.run([namespace, ...(this.args || [])], this.opts()).then(() => command.env);
+      }
       const generator = command.env.instantiate(GeneratorClass, this.args, this.opts());
       await command.env.queueGenerator(generator);
       return command.env.start().then(() => command.env);
@@ -561,7 +564,8 @@ class Environment extends Base {
    * @return {boolean} - true if any generator of the package has been registered
    */
   isPackageRegistered(packageNS) {
-    return this.getRegisteredPackages().includes(packageNS);
+    const registeredPackages = this.getRegisteredPackages();
+    return registeredPackages.includes(packageNS) || registeredPackages.includes(this.alias(packageNS).split(':', 2)[0]);
   }
 
   /**
@@ -738,9 +742,13 @@ class Environment extends Base {
     }
 
     const checkGenerator = Generator => {
-      if (namespace && Generator && Generator.namespace && Generator.namespace !== Environment.UNKNOWN_NAMESPACE) {
-      // Update namespace object in case of aliased namespace.
-        namespace.namespace = Generator.namespace;
+      if (namespace && Generator && Generator.namespace && Generator.namespace !== namespace.namespace && Generator.namespace !== Environment.UNKNOWN_NAMESPACE) {
+        // Update namespace object in case of aliased namespace.
+        try {
+          namespace.namespace = Generator.namespace;
+        } catch {
+          // Invalid namespace can be aliased to a valid one.
+        }
       }
 
       if (typeof Generator !== 'function') {
@@ -761,16 +769,10 @@ class Environment extends Base {
     };
 
     maybeGenerator = maybeGenerator || this.get(namespaceOrPath);
-    if (maybeGenerator && (maybeGenerator.then || maybeGenerator.prototype._postConstruct)) {
+    if (maybeGenerator && maybeGenerator.then) {
       return Promise.resolve(maybeGenerator)
         .then(Generator => checkGenerator(Generator))
-        .then(Generator => this.instantiate(Generator, args, options))
-        .then(async generator => {
-          if (!options.help && generator._postConstruct) {
-            await generator._postConstruct();
-          }
-          return generator;
-        });
+        .then(Generator => this.instantiate(Generator, args, options));
     }
 
     return this.instantiate(checkGenerator(maybeGenerator), args, options);
@@ -813,6 +815,10 @@ class Environment extends Base {
       ...environmentOptions
     };
 
+    if (!options.help && generator._postConstruct) {
+      return Promise.resolve(generator._postConstruct()).then(() => generator);
+    }
+
     return generator;
   }
 

package/lib/store.js

@@ -58,6 +58,9 @@ class Store {
       packagePath
     };
 
+    if (this._generators[namespace]) {
+      delete this._generators[namespace];
+    }
     this._generators[namespace] = Generator;
   }
 

package/lib/util/conflicter.js

@@ -115,15 +115,20 @@ class Conflicter {
    *
    * Based on detect-conflict module
    *
-   * @param  {Object}   file File object respecting this interface: { path, contents }
+   * @param  {import('vinyl')} file File object respecting this interface: { path, contents }
    * @return {Boolean} `true` if there's a conflict, `false` otherwise.
    */
   _detectConflict(file) {
-    let {contents} = file;
+    let {contents, stat = {}} = file;
     const filepath = path.resolve(file.path);
 
     // If file path point to a directory, then it's not safe to write
-    if (fs.statSync(filepath).isDirectory()) {
+    const diskStat = fs.statSync(filepath);
+    if (diskStat.isDirectory()) {
+      return true;
+    }
+
+    if (stat.mode && diskStat.mode !== stat.mode) {
       return true;
     }
 
@@ -172,7 +177,7 @@ class Conflicter {
    *   3. If identical, mark it as is and skip the check
    *   4. If diverged, prepare and show up the file collision menu
    *
-   * @param {Object} file - Vinyl file
+   * @param {import('vinyl')} file - Vinyl file
    * @param {Object} [conflicterStatus] - Conflicter status
    * @return  {Promise<Vinyl>} Promise the Vinyl file
    */
@@ -254,7 +259,7 @@ class Conflicter {
   /**
    * Actual prompting logic
    * @private
-   * @param {Object} file vinyl file object
+   * @param {import('vinyl')} file vinyl file object
    * @param {Number} counter prompts
    */
   _ask(file, counter, conflicterStatus) {

package/lib/util/namespace.js

@@ -97,7 +97,11 @@ module.exports = class YeomanNamespace {
   }
 
   set namespace(namespace) {
-    this._update(YeomanNamespace.parse(namespace));
+    const parsed = YeomanNamespace.parse(namespace);
+    if (!parsed) {
+      throw new Error(`Error parsing namespace ${namespace}`);
+    }
+    this._update(parsed);
   }
 
   get unscopedNamespace() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-environment",
-  "version": "3.8.1",
+  "version": "3.10.0",
   "description": "Handles the lifecyle and bootstrapping of generators in a specific environment",
   "homepage": "http://yeoman.io",
   "author": "Yeoman",
@@ -79,6 +79,7 @@
     "grouped-queue": "^2.0.0",
     "inquirer": "^8.0.0",
     "is-scoped": "^2.1.0",
+    "isbinaryfile": "^4.0.10",
     "lodash": "^4.17.10",
     "log-symbols": "^4.0.0",
     "mem-fs": "^1.2.0 || ^2.0.0",
@@ -110,10 +111,10 @@
     "nyc": "^15.0.0",
     "prettier": "^2.2.1",
     "proxyquire": "^2.1.3",
-    "sinon": "^12.0.1",
-    "sinon-test": "^3.0.0",
+    "sinon": "^11.1.2",
+    "sinon-test": "^3.1.1",
     "tui-jsdoc-template": "^1.2.2",
-    "xo": "^0.37.1",
+    "xo": "0.37.1",
     "yeoman-assert": "^3.1.1",
     "yeoman-generator": "^5.1.0",
     "yeoman-test": "^6.2.0"
@@ -126,6 +127,7 @@
     ],
     "rules": {
       "import/no-dynamic-require": "off",
+      "import/extensions": "off",
       "prefer-spread": "off",
       "padding-line-between-statements": "off",
       "unicorn/no-hex-escape": "off",