yeoman-environment 3.5.1 → 3.8.1

package/cli/index.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 const {YeomanCommand} = require('../lib/util/command');
-const {printGroupedGenerator, environmentAction} = require('./utils');
 const packageJson = require('../package.json');
 const Env = require('..');
+const {printGroupedGenerator, environmentAction} = require('./utils');
 
 const program = new YeomanCommand();
 

package/cli/utils.js

@@ -5,15 +5,15 @@ const Env = require('..');
 
 const printGroupedGenerator = (generators, env) => {
   const grouped = groupBy(generators, 'packagePath');
-  Object.entries(grouped).forEach(([packagePath, group]) => {
+  for (const [packagePath, group] of Object.entries(grouped)) {
     const namespace = env.toNamespace(group[0].namespace);
     console.log(`  ${namespace.packageNamespace} at ${packagePath}`);
-    group.forEach(generator => {
+    for (const generator of group) {
       const generatorNamespace = env.toNamespace(generator.namespace);
       console.log(`    :${generatorNamespace.generator || 'app'}`);
-    });
+    }
     console.log('');
-  });
+  }
   console.log(`${generators.length} generators`);
 };
 

package/lib/adapter.js

@@ -1,4 +1,3 @@
-'use strict';
 const inquirer = require('inquirer');
 const diff = require('diff');
 const chalk = require('chalk');

package/lib/command.js

@@ -1,4 +1,3 @@
-'use strict';
 const debug = require('debug')('yeoman:environment:command');
 const {Option} = require('commander');
 

package/lib/composability.js

@@ -1,4 +1,3 @@
-'use strict';
 const assert = require('assert');
 const semver = require('semver');
 const pacote = require('pacote');
@@ -32,9 +31,9 @@ composability.installLocalGenerators = async function (packages) {
     return true;
   }
   const toInstall = {};
-  entries.forEach(([packageName, version]) => {
+  for (const [packageName, version] of entries) {
     toInstall[packageName] = version;
-  });
+  }
   if (await this.repository.installPackages(toInstall)) {
     const packagesToLookup = entries.map(([packageName, _]) => packageName);
     this.lookupLocalPackages(packagesToLookup);

package/lib/environment.js

@@ -1,7 +1,7 @@
-'use strict';
 const fs = require('fs');
 const path = require('path');
 const EventEmitter = require('events');
+const crypto = require('crypto');
 const chalk = require('chalk');
 const _ = require('lodash');
 const GroupedQueue = require('grouped-queue');
@@ -11,13 +11,11 @@ const memFs = require('mem-fs');
 const FileEditor = require('mem-fs-editor');
 const debug = require('debug')('yeoman:environment');
 const isScoped = require('is-scoped');
-const crypto = require('crypto');
 const npmlog = require('npmlog');
+const semver = require('semver');
+const slash = require('slash');
 const {TrackerGroup} = require('are-we-there-yet');
-
-const {promisify} = require('util');
-const {pipeline: _pipeline} = require('stream');
-const pipeline = promisify(_pipeline);
+const {pipeline, transform} = require('p-transform');
 
 const ENVIRONMENT_VERSION = require('../package.json').version;
 const Store = require('./store');
@@ -31,7 +29,6 @@ const {
   createCommitTransform,
   createConflicterCheckTransform,
   createConflicterStatusTransform,
-  createEachFileTransform,
   createModifiedTransform,
   createYoRcTransform,
   createYoResolveTransform
@@ -47,13 +44,13 @@ function splitArgsFromString(argsString) {
     return result;
   }
   const quoteSeparatedArgs = argsString.split(/("[^"]*")/).filter(x => x);
-  quoteSeparatedArgs.forEach(arg => {
+  for (const arg of quoteSeparatedArgs) {
     if (arg.match('\x22')) {
       result.push(arg.replace(/"/g, ''));
     } else {
       result = result.concat(arg.trim().split(' '));
     }
-  });
+  }
   return result;
 }
 
@@ -332,12 +329,12 @@ class Environment extends Base {
     this.repository = new YeomanRepository(this.options.yeomanRepository);
 
     if (!this.options.experimental) {
-      process.argv.forEach(value => {
+      for (const value of process.argv) {
         if (value === '--experimental') {
           this.options.experimental = true;
           debug('Set environment as experimental');
         }
-      });
+      }
     }
 
     this.loadSharedOptions(this.options);
@@ -351,6 +348,8 @@ class Environment extends Base {
 
     // Store the YeomanCompose by paths and uniqueBy feature.
     this._composeStore = {};
+
+    this.enableConflicterIgnore = semver.satisfies(this.getVersion('mem-fs-editor'), '>= 9.2.0');
   }
 
   /**
@@ -583,6 +582,9 @@ class Environment extends Base {
   getPackagePath(namespace) {
     if (namespace.includes(':')) {
       const generator = this.get(namespace) || {};
+      if (generator.then) {
+        return generator.then(generator => generator.packagePath);
+      }
       return generator.packagePath;
     }
     const packagePaths = this.getPackagePaths(namespace) || [];
@@ -750,7 +752,7 @@ class Environment extends Base {
           'You can see available generators via ' +
           chalk.yellow('npm search yeoman-generator') + ' or via ' + chalk.yellow('http://yeoman.io/generators/') + '. \n' +
           'Install them with ' + chalk.yellow(`npm install ${generatorHint}`) + '.\n\n' +
-          'To see all your installed generators run ' + chalk.yellow('yo') + ' without any arguments. ' +
+          'To see all your installed generators run ' + chalk.yellow('yo --generators') + '. ' +
           'Adding the ' + chalk.yellow('--help') + ' option will also show subgenerators. \n\n' +
           'If ' + chalk.yellow('yo') + ' cannot find the generator, run ' + chalk.yellow('yo doctor') + ' to troubleshoot your system.'
         );
@@ -759,8 +761,16 @@ class Environment extends Base {
     };
 
     maybeGenerator = maybeGenerator || this.get(namespaceOrPath);
-    if (maybeGenerator && maybeGenerator.then) {
-      return maybeGenerator.then(Generator => checkGenerator(Generator)).then(Generator => this.instantiate(Generator, args, options));
+    if (maybeGenerator && (maybeGenerator.then || maybeGenerator.prototype._postConstruct)) {
+      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;
+        });
     }
 
     return this.instantiate(checkGenerator(maybeGenerator), args, options);
@@ -855,9 +865,7 @@ class Environment extends Base {
   getAllGenerators() {
     return Object.fromEntries([
       ...Object.entries(this._generators),
-      ...Object.entries(this._generatorsForPath).map(([root, generatorStore]) => {
-        return Object.entries(generatorStore).map(([namespace, generator]) => ([`${root}#${namespace}`, generator]));
-      }).flat()
+      ...Object.entries(this._generatorsForPath).flatMap(([root, generatorStore]) => Object.entries(generatorStore).map(([namespace, generator]) => ([`${root}#${namespace}`, generator])))
     ]);
   }
 
@@ -1112,28 +1120,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.concat(['..'])).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}`;
@@ -1199,12 +1218,12 @@ class Environment extends Base {
       stream,
       createModifiedTransform(),
       ...transformStreams,
-      createEachFileTransform(file => {
+      transform(file => {
         if (log) {
           log.completeWork(10);
           npmlog.info('Completed', path.relative(this.logCwd, file.path));
         }
-      }, {autoForward: false, logName: 'environment:log'})
+      }, 'environment:log')
     ).then(() => {
       if (log) {
         log.finish();
@@ -1221,10 +1240,23 @@ class Environment extends Base {
   commitSharedFs(stream = this.sharedFs.stream()) {
     return new Promise((resolve, reject) => {
       debug('committing files');
+
+      const conflicterStatus = {};
+      if (this.enableConflicterIgnore) {
+        conflicterStatus.fileActions = [{
+          key: 'i',
+          name: 'ignore, do not overwrite and remember (experimental)',
+          value: ({relativeFilePath}) => {
+            this.fs.append(`${this.cwd}/.yo-resolve`, `${relativeFilePath} skip`, {create: true});
+            return 'skip';
+          }
+        }];
+      }
+
       this.fs.commit([
         createYoResolveTransform(this.conflicter),
         createYoRcTransform(),
-        createConflicterCheckTransform(this.conflicter),
+        createConflicterCheckTransform(this.conflicter, conflicterStatus),
         createConflicterStatusTransform(),
         // Use custom commit transform due to out of order transform.
         createCommitTransform(this.fs)
@@ -1236,10 +1268,7 @@ class Environment extends Base {
           reject(error);
           return;
         }
-
-        // Force to empty Conflicter queue.
-        this.conflicter.queue.once('end', () => resolve(value));
-        this.conflicter.queue.run();
+        resolve(value);
       });
     });
   }
@@ -1260,14 +1289,21 @@ class Environment extends Base {
         } else {
           customCommitTask = this.commitSharedFs.bind(this);
         }
+
+        if (this.enableConflicterIgnore) {
+          debug('Adding queueCommit event listener');
+          this.sharedFs.once('change', queueCommit);
+        }
         const result = customCommitTask();
         if (!result || !result.then) {
           done();
           return;
         }
         return result.then(() => {
-          debug('Adding queueCommit event listener');
-          this.sharedFs.once('change', queueCommit);
+          if (!this.enableConflicterIgnore) {
+            debug('Adding queueCommit event listener');
+            this.sharedFs.once('change', queueCommit);
+          }
           done();
         }
         , stop);

package/lib/generator-features.js

@@ -1,4 +1,3 @@
-'use strict';
 const debug = require('debug')('yeoman:environment:features');
 
 module.exports = cls => class extends cls {

package/lib/namespace-composability.js

@@ -1,4 +1,3 @@
-'use strict';
 const debug = require('debug')('yeoman:environment:compose');
 const EventEmitter = require('events');
 const path = require('path');
@@ -39,9 +38,7 @@ composability.lookupLocalNamespaces = function (namespacesToLookup) {
   namespacesToLookup = Array.isArray(namespacesToLookup) ? namespacesToLookup : [namespacesToLookup];
   namespacesToLookup = namespacesToLookup.map(ns => this.requireNamespace(ns));
   // Keep only those packages that has a compatible version.
-  namespacesToLookup = namespacesToLookup.filter(ns => {
-    return this.repository.verifyInstalledVersion(ns.generatorHint, ns.semver) !== undefined;
-  });
+  namespacesToLookup = namespacesToLookup.filter(ns => this.repository.verifyInstalledVersion(ns.generatorHint, ns.semver) !== undefined);
   return this.lookupLocalPackages(namespacesToLookup.map(ns => ns.generatorHint));
 };
 
@@ -66,18 +63,13 @@ composability.lookupNamespaces = function (namespaces, options = {}) {
       const genPath = ns.generator.split(':').join('/');
       let filePatterns = [`${genPath}/index.?s`, `${genPath}.?s`];
       const lookups = options.lookups || this.lookups;
-      filePatterns = lookups.map(prefix => {
-        return filePatterns.map(pattern => path.join(prefix, pattern));
-      }).reduce(
-        (accumulator, currentValue) => accumulator.concat(currentValue),
-        []
-      );
+      filePatterns = lookups.flatMap(prefix => filePatterns.map(pattern => path.join(prefix, pattern)));
       nsOptions.filePatterns = filePatterns;
       nsOptions.singleResult = true;
     }
     return nsOptions;
   });
-  return options_.map(opt => this.lookup({...opt, ...options})).reduce((acc, cur) => acc.concat(cur), []);
+  return options_.flatMap(opt => this.lookup({...opt, ...options}));
 };
 
 /**
@@ -100,7 +92,7 @@ composability.prepareEnvironment = async function (namespaces) {
 
   const assertMissing = missing => {
     if (missing.length > 0) {
-      throw new Error(`Error preparing environment for ${missing.map(ns => ns.complete).join()}`);
+      throw new Error(`Error preparing environment for ${missing.map(ns => ns.complete).join(',')}`);
     }
   };
 
@@ -143,7 +135,7 @@ composability.prepareEnvironment = async function (namespaces) {
     return true;
   }
   // At last, try to lookup if install failed.
-  this.lookupLocalNamespaces(missing.concat(toLookup));
+  this.lookupLocalNamespaces([...missing, ...toLookup]);
 
   assertMissing(updateMissing());
   return true;
@@ -276,18 +268,14 @@ class YeomanCompose extends EventEmitter {
    * @return {Promise} Promise YeomanWith
    */
   async with(namespace, generatorOptions, ...methodArgs) {
-    let namespaces = [].concat(namespace);
+    let namespaces = [namespace].flat();
     debug(`Compose with generator ${namespace} at ${this._destinationRoot}`);
     namespaces = namespaces.map(namespace => this.env.requireNamespace(namespace));
     const brokenNamespace = namespaces.find(namespace => !namespace.generator);
     if (brokenNamespace) {
       throw new Error(`Generator part in namespace is missing: ${brokenNamespace.id}`);
     }
-    const namespacesId = namespaces.map(namespace => {
-      return namespace.instanceId && namespace.instanceId === '*' ? this._getInstanceNames(namespace.namespace).map(instanceId => {
-        return namespace.with({instanceId}).id;
-      }) : [namespace.id];
-    }).flat();
+    const namespacesId = namespaces.flatMap(namespace => namespace.instanceId && namespace.instanceId === '*' ? this._getInstanceNames(namespace.namespace).map(instanceId => namespace.with({instanceId}).id) : [namespace.id]);
 
     const composedGenerators = await Promise.all(namespacesId.map(nsId => this.require(nsId, generatorOptions)));
     const composedProxy = new Proxy(composedGenerators, multipleGeneratorProxyHandler);

package/lib/namespace.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const YeomanNamespace = require('./util/namespace');
 
 module.exports = cls => class extends cls {

package/lib/package-manager.js

@@ -1,4 +1,3 @@
-'use strict';
 const path = require('path');
 const debug = require('debug')('yeoman:environment:package-manager');
 const preferredPm = require('preferred-pm');

package/lib/resolver.js

@@ -1,7 +1,6 @@
-'use strict';
-const arrify = require('arrify');
 const path = require('path');
 const fs = require('fs');
+const arrify = require('arrify');
 const _ = require('lodash');
 const globby = require('globby');
 const debug = require('debug')('yeoman:environment');
@@ -324,8 +323,7 @@ packageLookup._getGlobalNpmPaths = function (filterPaths = true) {
   } else if (win32) {
     paths.push(path.join(process.env.APPDATA, 'npm/node_modules'));
   } else {
-    paths.push('/usr/lib/node_modules');
-    paths.push('/usr/local/lib/node_modules');
+    paths.push('/usr/lib/node_modules', '/usr/local/lib/node_modules');
   }
 
   // Add NVM prefix directory
@@ -406,7 +404,7 @@ resolver.alias = function (match, value) {
     return this;
   }
 
-  const aliases = this.aliases.slice(0).reverse();
+  const aliases = [...this.aliases].reverse();
 
   return aliases.reduce((resolved, alias) => {
     if (!alias.match.test(resolved)) {

package/lib/spawn-command.js

@@ -1,4 +1,3 @@
-'use strict';
 const spawn = require('execa');
 
 /**

package/lib/store.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const debug = require('debug')('yeoman:environment:store');
 
 const {requireOrImport} = require('./util/esm');
@@ -76,9 +74,7 @@ class Store {
     }
 
     if (maybeGenerator.then) {
-      return maybeGenerator.then(esmGenerator => {
-        return [esmGenerator, {...this._meta[namespace]}];
-      });
+      return maybeGenerator.then(esmGenerator => [esmGenerator, {...this._meta[namespace]}]);
     }
 
     Object.assign(maybeGenerator, this._meta[namespace]);

package/lib/util/binary-diff.js

@@ -1,8 +1,7 @@
-'use strict';
-const Table = require('cli-table');
 const fs = require('fs');
-const dateFormat = require('dateformat');
 const path = require('path');
+const Table = require('cli-table');
+const dateFormat = require('dateformat');
 const prettyBytes = require('pretty-bytes');
 
 const {isBinaryFileSync} = require('isbinaryfile');

package/lib/util/command.js

@@ -54,9 +54,9 @@ class YeomanCommand extends Command {
    */
   addGeneratorOptions(options) {
     options = options || {};
-    Object.entries(options).forEach(([key, value]) => {
+    for (const [key, value] of Object.entries(options)) {
       this._addGeneratorOption(key, value);
-    });
+    }
     return this;
   }
 

package/lib/util/conflicter.js

@@ -1,4 +1,3 @@
-'use strict';
 const fs = require('fs');
 const path = require('path');
 const jsdiff = require('diff');
@@ -174,10 +173,10 @@ class Conflicter {
    *   4. If diverged, prepare and show up the file collision menu
    *
    * @param {Object} file - Vinyl file
-   * @return  {Promise} Promise a status string ('identical', 'create',
-   *                       'skip', 'force')
+   * @param {Object} [conflicterStatus] - Conflicter status
+   * @return  {Promise<Vinyl>} Promise the Vinyl file
    */
-  checkForCollision(file) {
+  checkForCollision(file, conflicterStatus) {
     const rfilepath = path.relative(this.cwd, file.path);
     if (file.conflicter) {
       this._log(file.conflicter, rfilepath);
@@ -195,8 +194,9 @@ class Conflicter {
       file.conflicterLog = 'create';
       return Promise.resolve(file);
     }
+    const isForce = () => this.force || (conflicterStatus && conflicterStatus.force);
 
-    if (this.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 (this.force) {
+          if (isForce()) {
             file.conflicter = 'force';
             this.adapter.log.force(rfilepath);
             resolve(file);
@@ -230,7 +230,7 @@ class Conflicter {
             return;
           }
           this.adapter.log.conflict(rfilepath);
-          return this._ask(file, 1).then(action => {
+          return this._ask(file, 1, conflicterStatus).then(action => {
             this.adapter.log[action || 'force'](rfilepath);
             file.conflicter = action;
             resolve(file);
@@ -257,7 +257,7 @@ class Conflicter {
    * @param {Object} file vinyl file object
    * @param {Number} counter prompts
    */
-  _ask(file, counter) {
+  _ask(file, counter, conflicterStatus) {
     if (file.conflicter) {
       return Promise.resolve(file.conflicter);
     }
@@ -266,6 +266,7 @@ class Conflicter {
       name: 'action',
       type: 'expand',
       message: `Overwrite ${rfilepath}?`,
+      pageSize: 20,
       choices: [
         {
           key: 'y',
@@ -309,9 +310,16 @@ class Conflicter {
           value: 'edit'
         }
       );
+      if (conflicterStatus && conflicterStatus.fileActions) {
+        prompt.choices.push(...conflicterStatus.fileActions);
+      }
     }
 
     return this.adapter.prompt([prompt]).then(result => {
+      if (typeof result.action === 'function') {
+        return result.action.call(this, {file, relativeFilePath: rfilepath});
+      }
+
       if (result.action === 'abort') {
         this.adapter.log.writeln('Aborting ...');
         throw AbortedError.create('Process aborted by user');
@@ -325,11 +333,15 @@ class Conflicter {
           throw new Error(`Recursive error ${prompt.message}`);
         }
 
-        return this._ask(file, counter);
+        return this._ask(file, counter, conflicterStatus);
       }
 
       if (result.action === 'force') {
-        this.force = true;
+        if (conflicterStatus) {
+          conflicterStatus.force = true;
+        } else {
+          this.force = true;
+        }
       }
 
       if (result.action === 'write') {
@@ -338,7 +350,7 @@ class Conflicter {
 
       if (result.action === 'reload') {
         if (this._detectConflict(file)) {
-          return this._ask(file, counter);
+          return this._ask(file, counter, conflicterStatus);
         }
         return 'identical';
       }
@@ -353,7 +365,7 @@ class Conflicter {
         }]).then(answers => {
           file.contents = Buffer.from(answers.content || '', 'utf8');
           if (this._detectConflict(file)) {
-            return this._ask(file, counter);
+            return this._ask(file, counter, conflicterStatus);
           }
           return 'skip';
         });

package/lib/util/log.js

@@ -1,5 +1,4 @@
 /** @module env/log */
-'use strict';
 const util = require('util');
 const EventEmitter = require('events');
 const _ = require('lodash');

package/lib/util/namespace.js

@@ -14,22 +14,18 @@ module.exports = class YeomanNamespace {
     this.generator = parsed.generator;
     this.instanceId = parsed.instanceId;
     this.semver = parsed.semver;
-    if (parsed.method) {
-      this.methods = parsed.method.split('+');
-    } else {
-      this.methods = parsed.methods;
-    }
+    this.methods = parsed.method ? parsed.method.split('+') : parsed.methods;
     this.flags = parsed.flags;
 
     // Populate flags
     if (this.flags) {
-      Object.entries(flags).forEach(([name, value]) => {
+      for (const [name, value] of Object.entries(flags)) {
         if (this.flags === value) {
           this[name] = true;
         } else {
           delete this[name];
         }
-      });
+      }
     }
 
     debug('Parsed namespace %o', this);
@@ -44,11 +40,11 @@ module.exports = class YeomanNamespace {
 
     const parsed = {complete};
     // Populate fields
-    Object.entries(groups).forEach(([name, value]) => {
+    for (const [name, value] of Object.entries(groups)) {
       if (result[value]) {
         parsed[name] = result[value];
       }
-    });
+    }
     return parsed;
   }
 

package/lib/util/out-of-order-transform.js

@@ -1,10 +1,11 @@
+const {Transform} = require('stream');
 const debug = require('debug');
 const {default: PQueue} = require('p-queue');
-const {Transform} = require('stream');
 
 module.exports = class OOOTransform extends Transform {
   /**
    * @private
+   * @deprecated
    * Out Of Order Transform
    */
   constructor(options) {

package/lib/util/repository.js

@@ -1,5 +1,4 @@
 /** @module env/repository */
-'use strict';
 const fs = require('fs');
 const path = require('path');
 const semver = require('semver');
@@ -92,9 +91,9 @@ class YeomanRepository {
       throw new Error(`Package ${packageName} already loaded`);
     }
 
-    toCleanup.forEach(cache => {
+    for (const cache of toCleanup) {
       delete require.cache[cache];
-    });
+    }
   }
 
   /**
@@ -177,14 +176,14 @@ class YeomanRepository {
     try {
       await this.reifyRepository({add: [...packagesArgs]});
     } catch (error) {
-      Object.keys(packages).forEach(packageName => {
+      for (const packageName of Object.keys(packages)) {
         this.log.error(`${packageName} cannot be installed. ${error}`);
-      });
+      }
       return false;
     }
-    Object.keys(packages).forEach(packageName => {
+    for (const packageName of Object.keys(packages)) {
       this.log.ok(`${packageName} installed.`);
-    });
+    }
     return true;
   }
 

package/lib/util/transform.js

@@ -1,15 +1,18 @@
-'use strict';
-
-const {WError} = require('error');
 const fs = require('fs');
 const path = require('path');
+const {WError} = require('error');
 const findUp = require('find-up');
 const minimatch = require('minimatch');
+const {transform, passthrough, filter} = require('p-transform');
 const OOOTransform = require('./out-of-order-transform');
 
+const {Minimatch} = minimatch;
+
 class YoResolveError extends WError {}
 
 /**
+ * @deprecated
+ *
  * Transform api should be avoided by generators without a executable.
  * May break between major yo versions.
  *
@@ -46,6 +49,8 @@ function fileIsModified(file) {
 }
 
 /**
+ * @deprecated
+ *
  * Transform api should be avoided by generators without a executable.
  * May break between major yo versions.
  *
@@ -103,8 +108,8 @@ function parseYoAttributesFile(yoAttributeFileName) {
  * Transform api should be avoided by generators without a executable.
  * May break between major yo versions.
  */
-function createConflicterCheckTransform(conflicter) {
-  return createEachFileTransform(file => conflicter.checkForCollision(file), {logName: 'environment:conflicter-check'});
+function createConflicterCheckTransform(conflicter, conflicterStatus) {
+  return passthrough(file => conflicter.checkForCollision(file, conflicterStatus), 'environment:conflicter-check');
 }
 
 /**
@@ -122,23 +127,21 @@ function getConflicterStatusForFile(conflicter, filePath, yoAttributeFileName =
 
   let fileStatus;
   if (yoResolveFiles) {
-    yoResolveFiles.forEach(yoResolveFile => {
+    for (const yoResolveFile of yoResolveFiles) {
       if (conflicter.yoResolveByFile[yoResolveFile] === undefined) {
         conflicter.yoResolveByFile[yoResolveFile] = parseYoAttributesFile(yoResolveFile);
       }
-    });
+    }
     yoResolveFiles
       .map(yoResolveFile => conflicter.yoResolveByFile[yoResolveFile])
       .map(attributes => attributes)
-      .find(yoResolve => {
-        return Object.entries(yoResolve).some(([pattern, status]) => {
-          if (minimatch(filePath, pattern)) {
-            fileStatus = status;
-            return true;
-          }
-          return false;
-        });
-      });
+      .find(yoResolve => Object.entries(yoResolve).some(([pattern, status]) => {
+        if (minimatch(filePath, pattern)) {
+          fileStatus = status;
+          return true;
+        }
+        return false;
+      }));
   }
   return fileStatus;
 }
@@ -154,9 +157,9 @@ function getConflicterStatusForFile(conflicter, filePath, yoAttributeFileName =
  * @return {Transform} A Transform https://nodejs.org/api/stream.html#stream_class_stream_transform
  */
 function createYoResolveTransform(conflicter, yoResolveFileName) {
-  return createEachFileTransform(file => {
+  return passthrough(file => {
     file.conflicter = file.conflicter || getConflicterStatusForFile(conflicter, file.path, yoResolveFileName);
-  }, {logName: 'environment:yo-resolve'});
+  }, 'environment:yo-resolve');
 }
 
 /**
@@ -167,13 +170,10 @@ function createYoResolveTransform(conflicter, yoResolveFileName) {
  * @return {Transform} A Transform https://nodejs.org/api/stream.html#stream_class_stream_transform
  */
 function createYoRcTransform() {
-  return createEachFileTransform(file => {
-    const filename = path.basename(file.path);
-    // Config file should not be processed by the conflicter. Force override.
-    if (filename === '.yo-rc.json' || filename === '.yo-rc-global.json') {
-      file.conflicter = 'force';
-    }
-  }, {logName: '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');
 }
 
 /**
@@ -185,7 +185,7 @@ function createYoRcTransform() {
  * @return {Transform} A Transform https://nodejs.org/api/stream.html#stream_class_stream_transform
  */
 function createConflicterStatusTransform() {
-  return createFileTransform(function (file) {
+  return transform(file => {
     const action = file.conflicter;
 
     delete file.conflicter;
@@ -194,17 +194,16 @@ function createConflicterStatusTransform() {
     delete file.conflicterLog;
 
     if (!action && file.state) {
-      this.push(file);
-      return;
+      return file;
     }
 
     if (action === 'skip') {
       delete file.state;
       delete file.isNew;
-    } else {
-      this.push(file);
+      return undefined;
     }
-  }, {logName: 'environment:conflicter-status'});
+    return file;
+  }, 'environment:conflicter-status');
 }
 
 /**
@@ -212,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');
 }
 
 /**
@@ -220,7 +219,30 @@ function createModifiedTransform() {
  * May break between major yo versions.
  */
 function createCommitTransform(memFsEditor) {
-  return createFileTransform(file => memFsEditor.commitFileAsync(file), {logName: 'environment:commit'});
+  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 = {
@@ -233,5 +255,7 @@ module.exports = {
   createModifiedTransform,
   createCommitTransform,
   createConflicterCheckTransform,
-  createConflicterStatusTransform
+  createConflicterStatusTransform,
+  patternFilter,
+  patternSpy
 };

package/lib/util/util.js

@@ -1,5 +1,4 @@
 /** @module env/util */
-'use strict';
 const execa = require('execa');
 const GroupedQueue = require('grouped-queue');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-environment",
-  "version": "3.5.1",
+  "version": "3.8.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",
@@ -50,8 +61,8 @@
     "coverage": "nyc report --reporter=text-lcov | coveralls"
   },
   "dependencies": {
-    "@npmcli/arborist": "^2.2.2",
-    "are-we-there-yet": "^1.1.5",
+    "@npmcli/arborist": "^4.0.4",
+    "are-we-there-yet": "^2.0.0",
     "arrify": "^2.0.1",
     "binaryextensions": "^4.15.0",
     "chalk": "^4.1.0",
@@ -73,9 +84,10 @@
     "mem-fs": "^1.2.0 || ^2.0.0",
     "mem-fs-editor": "^8.1.2 || ^9.0.0",
     "minimatch": "^3.0.4",
-    "npmlog": "^4.1.2",
+    "npmlog": "^5.0.1",
     "p-queue": "^6.6.2",
-    "pacote": "^11.2.6",
+    "p-transform": "^1.3.0",
+    "pacote": "^12.0.2",
     "preferred-pm": "^3.0.3",
     "pretty-bytes": "^5.3.0",
     "semver": "^7.1.3",
@@ -92,19 +104,19 @@
   "devDependencies": {
     "coveralls": "^3.0.2",
     "cross-spawn": "^7.0.1",
-    "fs-extra": "^9.0.1",
+    "fs-extra": "^10.0.0",
     "jsdoc": "^3.6.6",
-    "mocha": "^8.0.1",
+    "mocha": "^9.1.3",
     "nyc": "^15.0.0",
     "prettier": "^2.2.1",
     "proxyquire": "^2.1.3",
-    "sinon": "^9.0.2",
+    "sinon": "^12.0.1",
     "sinon-test": "^3.0.0",
     "tui-jsdoc-template": "^1.2.2",
     "xo": "^0.37.1",
     "yeoman-assert": "^3.1.1",
     "yeoman-generator": "^5.1.0",
-    "yeoman-test": "^5.1.0"
+    "yeoman-test": "^6.2.0"
   },
   "xo": {
     "space": true,