yeoman-generator 5.8.0 → 5.10.0

package/lib/actions/package-json.js

@@ -1,4 +1,28 @@
 'use strict';
+const assert = require('assert');
+const pacote = require('pacote');
+
+const resolvePackage = async function (packageName, packageVersion) {
+  assert(packageName, 'Parameter packageName is required');
+  if (packageVersion) {
+    packageName = `${packageName}@${packageVersion}`;
+  }
+
+  const manifest = await pacote.manifest(packageName);
+  if (!manifest) {
+    return undefined;
+  }
+
+  const from = manifest._from;
+  const index = from.lastIndexOf('@');
+  if (index > 1) {
+    const resolvedVersion =
+      from.slice(index + 1, from.length) || manifest.version;
+    return [from.slice(0, Math.max(0, index)), resolvedVersion];
+  }
+
+  return [manifest.name, from || manifest.version];
+};
 
 module.exports = (cls) =>
   /**
@@ -25,7 +49,7 @@ module.exports = (cls) =>
           Object.entries(dependencies).map(([pkg, version]) =>
             version
               ? Promise.resolve([pkg, version])
-              : this.env.resolvePackage(pkg, version)
+              : resolvePackage(pkg, version)
           )
         );
         return Object.fromEntries(
@@ -34,7 +58,7 @@ module.exports = (cls) =>
       }
 
       const entries = await Promise.all(
-        dependencies.map((dependency) => this.env.resolvePackage(dependency))
+        dependencies.map((dependency) => resolvePackage(dependency))
       );
       return Object.fromEntries(entries);
     }

package/lib/index.js

@@ -190,6 +190,7 @@ class Generator extends Base {
       default: false
     });
 
+    /** @type {import('@yeoman/types').BaseEnvironment} */
     this.env = this.options.env;
 
     this.resolved = this.options.resolved || __filename;
@@ -250,13 +251,7 @@ class Generator extends Base {
     }
 
     // Ensure the environment support features this yeoman-generator version require.
-    if (
-      !this.env ||
-      !this.env.adapter ||
-      !this.env.runLoop ||
-      !this.env.sharedFs ||
-      !this.env.fs
-    ) {
+    if (!this.env || !this.env.adapter || !this.env.sharedFs) {
       throw new Error(
         "Current environment doesn't provides some necessary feature this generator needs."
       );
@@ -309,6 +304,10 @@ class Generator extends Base {
     }
 
     this.checkEnvironmentVersion('3.2.0', true);
+
+    if (this.env.getVersion) {
+      this.yeomanApi = semver.gte(this.env.getVersion(), '3.18.3');
+    }
   }
 
   /**
@@ -394,14 +393,19 @@ class Generator extends Base {
       debug(`Registering custom queue ${customQueue.queueName}`);
       this._queues[customQueue.priorityName] = customQueue;
 
-      if (this.env.runLoop.queueNames.includes(customQueue.queueName)) {
-        continue;
-      }
-
       const beforeQueue = customQueue.before
         ? this._queues[customQueue.before].queueName
         : undefined;
-      this.env.runLoop.addSubQueue(customQueue.queueName, beforeQueue);
+
+      if (this.yeomanApi) {
+        this.env.addPriority(customQueue.queueName, beforeQueue);
+      } else {
+        if (this.env.runLoop.queueNames.includes(customQueue.queueName)) {
+          continue;
+        }
+
+        this.env.runLoop.addSubQueue(customQueue.queueName, beforeQueue);
+      }
     }
   }
 
@@ -1230,11 +1234,13 @@ class Generator extends Base {
     );
     this.queueOwnTasks({auto: true});
 
+    const queueParameter = this.yeomanApi ? {schedule: false} : false;
+
     if (this._composedWith.some((generator) => generator.then)) {
       return Promise.all(this._composedWith).then(async (generators) => {
         for (const generator of generators) {
           // eslint-disable-next-line no-await-in-loop
-          await this.env.queueGenerator(await generator, false);
+          await this.env.queueGenerator(await generator, queueParameter);
         }
       });
     }
@@ -1242,9 +1248,9 @@ class Generator extends Base {
     let promise;
     for (const generator of this._composedWith) {
       if (promise) {
-        promise.then(() => this.env.queueGenerator(generator, false));
+        promise.then(() => this.env.queueGenerator(generator, queueParameter));
       } else {
-        const maybePromise = this.env.queueGenerator(generator, false);
+        const maybePromise = this.env.queueGenerator(generator, queueParameter);
         if (maybePromise.then) {
           promise = maybePromise;
         }
@@ -1307,6 +1313,13 @@ class Generator extends Base {
 
       Generator.namespace = this.env.namespace(path);
 
+      if (this.yeomanApi) {
+        return this.env.instantiate(Generator, {
+          generatorArgs: args,
+          generatorOptions: options
+        });
+      }
+
       return this.env.instantiate(Generator, args, options);
     };
 
@@ -1321,7 +1334,12 @@ class Generator extends Base {
 
         instantiatedGenerator = instantiate(Generator, generator);
       } catch {
-        instantiatedGenerator = this.env.create(generator, args, options);
+        instantiatedGenerator = this.yeomanApi
+          ? this.env.create(generator, {
+              generatorArgs: args,
+              generatorOptions: options
+            })
+          : this.env.create(generator, args, options);
       }
     } else {
       const {Generator, path} = generator;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-generator",
-  "version": "5.8.0",
+  "version": "5.10.0",
   "description": "Rails-inspired generator system that provides scaffolding for your apps",
   "homepage": "http://yeoman.io",
   "author": "Yeoman",
@@ -25,6 +25,7 @@
     "doc_path": "../yeoman-generator-doc/"
   },
   "devDependencies": {
+    "@yeoman/types": "1.0.1",
     "coveralls": "^3.0.3",
     "inquirer": "^8.2.4",
     "jsdoc": "^3.6.7",
@@ -68,6 +69,7 @@
     "lodash": "^4.17.11",
     "mem-fs-editor": "^9.0.0",
     "minimist": "^1.2.5",
+    "pacote": "^15.2.0",
     "read-pkg-up": "^7.0.1",
     "run-async": "^2.0.0",
     "semver": "^7.2.1",
@@ -75,6 +77,15 @@
     "sort-keys": "^4.2.0",
     "text-table": "^0.2.0"
   },
+  "overrides": {
+    "@yeoman/types": {
+      "mem-fs": "^2.0.0",
+      "mem-fs-editor": "^9.0.0"
+    }
+  },
+  "acceptDependencies": {
+    "yeoman-environment": "^4.0.0"
+  },
   "peerDependencies": {
     "yeoman-environment": "^3.2.0"
   },