yeoman-environment 3.7.0 → 3.9.1

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

@@ -13,7 +13,9 @@ const debug = require('debug')('yeoman:environment');
 const isScoped = require('is-scoped');
 const npmlog = require('npmlog');
 const semver = require('semver');
+const slash = require('slash');
 const {TrackerGroup} = require('are-we-there-yet');
+const {pipeline, transform} = require('p-transform');
 
 const ENVIRONMENT_VERSION = require('../package.json').version;
 const Store = require('./store');
@@ -31,7 +33,6 @@ const {
   createYoRcTransform,
   createYoResolveTransform
 } = require('./util/transform');
-const {pipeline, transform} = require('p-transform');
 
 /**
  * Two-step argument splitting function that first splits arguments in quotes,
@@ -146,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);
@@ -760,16 +764,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);
@@ -812,6 +810,10 @@ class Environment extends Base {
       ...environmentOptions
     };
 
+    if (!options.help && generator._postConstruct) {
+      return Promise.resolve(generator._postConstruct()).then(() => generator);
+    }
+
     return generator;
   }
 
@@ -1119,28 +1121,39 @@ class Environment extends Base {
       throw new Error('Missing namespace');
     }
 
+    // Normalize path
+    let ns = slash(filepath);
+
+    // Ignore path before latest node_modules
+    const REPOSITORY_PATH = '/node_modules/';
+    if (ns.includes(REPOSITORY_PATH)) {
+      ns = ns.slice(ns.lastIndexOf(REPOSITORY_PATH) + REPOSITORY_PATH.length, ns.length);
+    }
+
     // Cleanup extension and normalize path for differents OS
-    let ns = path.normalize(filepath.replace(new RegExp(escapeStrRe(path.extname(filepath)) + '$'), ''));
+    const parsed = path.parse(ns);
+    ns = parsed.dir ? `${parsed.dir}/${parsed.name}` : parsed.name;
 
     // Sort lookups by length so biggest are removed first
-    const nsLookups = _([...lookups, '..']).map(found => path.normalize(found)).sortBy('length').value().reverse();
+    const nsLookups = _([...lookups, '..']).map(found => slash(found)).sortBy('length').value().reverse();
 
     // If `ns` contains a lookup dir in its path, remove it.
-    ns = nsLookups.reduce((ns, lookup) => {
+    for (let lookup of nsLookups) {
       // Only match full directory (begin with leading slash or start of input, end with trailing slash)
-      lookup = new RegExp(`(?:\\\\|/|^)${escapeStrRe(lookup)}(?=\\\\|/)`, 'g');
-      return ns.replace(lookup, '');
-    }, ns);
+      lookup = new RegExp(`(?:/|^)${escapeStrRe(lookup)}(?=/)`, 'g');
+      ns = ns.replace(lookup, '');
+    }
 
-    const folders = ns.split(path.sep);
+    const folders = ns.split('/');
     const scope = _.findLast(folders, folder => folder.indexOf('@') === 0);
 
     // Cleanup `ns` from unwanted parts and then normalize slashes to `:`
     ns = ns
+      .replace(/\/\//g, '') // Remove double `/`
       .replace(/(.*generator-)/, '') // Remove before `generator-`
-      .replace(/[/\\](index|main)$/, '') // Remove `/index` or `/main`
-      .replace(/^[/\\]+/, '') // Remove leading `/`
-      .replace(/[/\\]+/g, ':'); // Replace slashes by `:`
+      .replace(/\/(index|main)$/, '') // Remove `/index` or `/main`
+      .replace(/^\//, '') // Remove leading `/`
+      .replace(/\/+/g, ':'); // Replace slashes by `:`
 
     if (scope) {
       ns = `${scope}/${ns}`;

package/lib/util/conflicter.js

@@ -194,9 +194,9 @@ class Conflicter {
       file.conflicterLog = 'create';
       return Promise.resolve(file);
     }
-    const force = this.force || (conflicterStatus && conflicterStatus.force);
+    const isForce = () => this.force || (conflicterStatus && conflicterStatus.force);
 
-    if (force) {
+    if (isForce()) {
       this._log('force', rfilepath);
       file.conflicter = 'force';
       return Promise.resolve(file);
@@ -222,7 +222,7 @@ class Conflicter {
 
       return new Promise((resolve, reject) => {
         this.queue.add('conflicts', next => {
-          if (force) {
+          if (isForce()) {
             file.conflicter = 'force';
             this.adapter.log.force(rfilepath);
             resolve(file);

package/lib/util/transform.js

@@ -3,9 +3,11 @@ const path = require('path');
 const {WError} = require('error');
 const findUp = require('find-up');
 const minimatch = require('minimatch');
-const {transform, passthrough} = require('p-transform');
+const {transform, passthrough, filter} = require('p-transform');
 const OOOTransform = require('./out-of-order-transform');
 
+const {Minimatch} = minimatch;
+
 class YoResolveError extends WError {}
 
 /**
@@ -168,12 +170,10 @@ function createYoResolveTransform(conflicter, yoResolveFileName) {
  * @return {Transform} A Transform https://nodejs.org/api/stream.html#stream_class_stream_transform
  */
 function createYoRcTransform() {
-  return passthrough(file => {
-    // Config files should not be processed by the conflicter. Force override.
-    if (['.yo-rc.json', '.yo-resolve', '.yo-rc-global.json'].includes(path.basename(file.path))) {
-      file.conflicter = 'force';
-    }
-  }, 'environment:yo-rc');
+  // Config files should not be processed by the conflicter. Force override.
+  return patternSpy(file => {
+    file.conflicter = 'force';
+  }, '**/{.yo-rc.json,.yo-resolve,.yo-rc-global.json}', 'environment:yo-rc');
 }
 
 /**
@@ -211,7 +211,7 @@ function createConflicterStatusTransform() {
  * May break between major yo versions.
  */
 function createModifiedTransform() {
-  return createEachFileTransform({forwardUmodified: false, logName: 'environment:modified'});
+  return filter(file => fileIsModified(file), 'environment:modified');
 }
 
 /**
@@ -222,6 +222,29 @@ function createCommitTransform(memFsEditor) {
   return transform(file => memFsEditor.commitFileAsync(file), 'environment:commit');
 }
 
+/**
+ * Conditional filter on pattern.
+ *
+ * @param {String} pattern - Minimatch pattern.
+ * @param {Object} options - Minimatch options.
+ */
+function patternFilter(pattern, options) {
+  const minimatch = new Minimatch(pattern, options);
+  return filter(file => minimatch.match(file.path));
+}
+
+/**
+ * Conditional spy on pattern.
+ *
+ * @param {Function} spy.
+ * @param {String} pattern - Minimatch pattern.
+ * @param {Object} options - Minimatch options.
+ */
+function patternSpy(spy, pattern, options) {
+  const minimatch = new Minimatch(pattern, options);
+  return passthrough(file => (minimatch.match(file.path) ? spy(file) : undefined));
+}
+
 module.exports = {
   createFileTransform,
   fileIsModified,
@@ -232,5 +255,7 @@ module.exports = {
   createModifiedTransform,
   createCommitTransform,
   createConflicterCheckTransform,
-  createConflicterStatusTransform
+  createConflicterStatusTransform,
+  patternFilter,
+  patternSpy
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-environment",
-  "version": "3.7.0",
+  "version": "3.9.1",
   "description": "Handles the lifecyle and bootstrapping of generators in a specific environment",
   "homepage": "http://yeoman.io",
   "author": "Yeoman",
@@ -12,6 +12,17 @@
     "lib"
   ],
   "main": "lib/environment.js",
+  "exports": {
+    ".": "./lib/environment.js",
+    "./cli/": "./cli/",
+    "./lib/": "./lib/",
+    "./lib/util/": "./lib/util/",
+    "./adapter": "./lib/adapter.js",
+    "./conflicter": "./lib/util/conflicter.js",
+    "./log": "./lib/util/log.js",
+    "./transform": "./lib/util/transform.js",
+    "./package.json": "./package.json"
+  },
   "keywords": [
     "development",
     "dev",
@@ -75,7 +86,7 @@
     "minimatch": "^3.0.4",
     "npmlog": "^5.0.1",
     "p-queue": "^6.6.2",
-    "p-transform": "^1.2.0",
+    "p-transform": "^1.3.0",
     "pacote": "^12.0.2",
     "preferred-pm": "^3.0.3",
     "pretty-bytes": "^5.3.0",
@@ -99,10 +110,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"
@@ -115,6 +126,7 @@
     ],
     "rules": {
       "import/no-dynamic-require": "off",
+      "import/extensions": "off",
       "prefer-spread": "off",
       "padding-line-between-statements": "off",
       "unicorn/no-hex-escape": "off",