yeoman-environment 3.18.3 → 3.19.0

package/lib/environment.js

@@ -15,7 +15,10 @@ 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 {transform} = require('p-transform');
+const readableStream = require('readable-stream');
+
+const {pipeline} = readableStream.promises;
 
 const ENVIRONMENT_VERSION = require('../package.json').version;
 const Store = require('./store');
@@ -49,7 +52,7 @@ function splitArgsFromString(argsString) {
   if (!argsString) {
     return result;
   }
-  const quoteSeparatedArgs = argsString.split(/("[^"]*")/).filter(x => x);
+  const quoteSeparatedArgs = argsString.split(/("[^"]*")/).filter(Boolean);
   for (const arg of quoteSeparatedArgs) {
     if (arg.match('\x22')) {
       result.push(arg.replace(/"/g, ''));
@@ -850,15 +853,6 @@ class Environment extends Base {
   create(namespaceOrPath, args, options) {
     const namespace = this.toNamespace ? this.toNamespace(namespaceOrPath) : undefined;
 
-    let maybeGenerator;
-    if (namespace && this.getByNamespace) {
-      maybeGenerator = this.getByNamespace(namespace);
-      if (!maybeGenerator) {
-        this.lookupLocalNamespaces(namespace);
-        maybeGenerator = this.getByNamespace(namespace);
-      }
-    }
-
     const checkGenerator = Generator => {
       if (namespace && Generator && Generator.namespace && Generator.namespace !== namespace.namespace && Generator.namespace !== Environment.UNKNOWN_NAMESPACE) {
         // Update namespace object in case of aliased namespace.
@@ -886,6 +880,19 @@ class Environment extends Base {
       return Generator;
     };
 
+    if (typeof namespaceOrPath !== 'string') {
+      return this.instantiate(checkGenerator(namespaceOrPath), args, options);
+    }
+
+    let maybeGenerator;
+    if (namespace && this.getByNamespace) {
+      maybeGenerator = this.getByNamespace(namespace);
+      if (!maybeGenerator) {
+        this.lookupLocalNamespaces(namespace);
+        maybeGenerator = this.getByNamespace(namespace);
+      }
+    }
+
     maybeGenerator = maybeGenerator || this.get(namespaceOrPath);
     if (maybeGenerator && maybeGenerator.then) {
       return Promise.resolve(maybeGenerator)
@@ -1309,31 +1316,41 @@ class Environment extends Base {
 
     let {log = true} = options;
 
-    if (log) {
-      npmlog.tracker = new TrackerGroup();
-      npmlog.enableProgress();
-      log = npmlog.newItem(name);
-    }
-
     if (!Array.isArray(transformStreams)) {
       transformStreams = [transformStreams];
     }
-    return pipeline(
+
+    const progress = this.adapter.progress ? this.adapter.progress.bind(this.adapter) : (async callback => {
+      if (log) {
+        npmlog.tracker = new TrackerGroup();
+        npmlog.enableProgress();
+        log = npmlog.newItem(name);
+      }
+      try {
+        await callback({
+          step(prefix, message, ...args) {
+            if (log) {
+              log.completeWork(10);
+              npmlog.info(prefix, message, ...args);
+            }
+          }
+        });
+      } finally {
+        if (log) {
+          log.finish();
+          npmlog.disableProgress();
+        }
+      }
+    });
+
+    return progress(({step}) => pipeline(
       stream,
       createModifiedTransform(),
       ...transformStreams,
       transform(file => {
-        if (log) {
-          log.completeWork(10);
-          npmlog.info('Completed', path.relative(this.logCwd, file.path));
-        }
+        step('Completed', path.relative(this.logCwd, file.path));
       }, 'environment:log')
-    ).then(() => {
-      if (log) {
-        log.finish();
-        npmlog.disableProgress();
-      }
-    });
+    ));
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-environment",
-  "version": "3.18.3",
+  "version": "3.19.0",
   "description": "Handles the lifecyle and bootstrapping of generators in a specific environment",
   "homepage": "http://yeoman.io",
   "author": "Yeoman",
@@ -91,6 +91,7 @@
     "pacote": "^12.0.2",
     "preferred-pm": "^3.0.3",
     "pretty-bytes": "^5.3.0",
+    "readable-stream": "^4.3.0",
     "semver": "^7.1.3",
     "slash": "^3.0.0",
     "strip-ansi": "^6.0.0",