yeoman-generator 5.5.0 → 5.6.1

package/lib/index.js

@@ -191,13 +191,15 @@ class Generator extends Base {
 
     this.env = this.options.env;
 
-    this.resolved = this.options.resolved || __dirname;
+    this.resolved = this.options.resolved || __filename;
     this.description = this.description || '';
 
     if (this.env) {
       // Determine the app root
       this.contextRoot = this.env.cwd;
       this.destinationRoot(this.options.destinationRoot || this.env.cwd);
+      // Clear destionationRoot, _destinationRoot will take priority when composing, but not override passed options.
+      delete this.options.destinationRoot;
 
       // Ensure source/destination path, can be configured from subclasses
       this.sourceRoot(path.join(path.dirname(this.resolved), 'templates'));
@@ -335,10 +337,27 @@ class Generator extends Base {
    *
    * @param  {Object[]} priorities - Priorities
    * @param  {String} priorities.priorityName - Priority name
-   * @param  {String} priorities.before - The new priority will be queued before the `before` priority.
+   * @param  {String} [priorities.before] - The new priority will be queued before the `before` priority. Required for new priorities.
    * @param  {String} [priorities.queueName] - Name to be used at grouped-queue
+   * @param  {boolean} [priorities.edit] - Edit a priority
+   * @param  {boolean} [priorities.skip] - Queued manually only
+   * @param  {Object[]|function} [priorities.args] - Arguments to pass to tasks
    */
   registerPriorities(priorities) {
+    priorities = priorities.filter((priority) => {
+      if (priority.edit) {
+        const queue = this._queues[priority.priorityName];
+        if (!queue) {
+          throw new Error(
+            `Error editing priority ${priority.priorityName}, not found`
+          );
+        }
+
+        Object.assign(queue, {...priority, edit: undefined});
+      }
+
+      return !priority.edit;
+    });
     const customPriorities = priorities.map((customPriority) => {
       // Keep backward compatibility with name
       const newPriority = {
@@ -868,16 +887,6 @@ class Generator extends Base {
    * @param {TaskOptions} [taskOptions]: options.
    */
   extractTasksFromPriority(name, taskOptions = {}) {
-    const {taskPrefix} = this.features;
-    const propertyName = taskPrefix ? `${taskPrefix}${name}` : name;
-    const property = Object.getOwnPropertyDescriptor(
-      Object.getPrototypeOf(this),
-      propertyName
-    );
-    if (!property) return [];
-
-    const item = property.value ? property.value : property.get.call(this);
-
     const priority = this._queues[name];
     taskOptions = {
       ...priority,
@@ -886,19 +895,26 @@ class Generator extends Base {
       ...taskOptions
     };
 
-    if (!item || (taskOptions.auto && priority && priority.skip)) {
+    if (taskOptions.auto && priority && priority.skip) {
       return [];
     }
 
+    const {taskPrefix = this.features.taskPrefix || ''} = taskOptions;
+    const propertyName = taskPrefix ? `${taskPrefix}${name}` : name;
+    const property = Object.getOwnPropertyDescriptor(
+      taskOptions.taskOrigin || Object.getPrototypeOf(this),
+      propertyName
+    );
+    if (!property) return [];
+
+    const item = property.value ? property.value : property.get.call(this);
+
     // Name points to a function; single task
     if (typeof item === 'function') {
-      taskOptions.taskName = name;
-      taskOptions.method = item;
-      return [taskOptions];
+      return [{...taskOptions, taskName: name, method: item}];
     }
 
-    // Not a queue hash; stop
-    if (!priority) {
+    if (!item || !priority) {
       return [];
     }
 
@@ -1058,7 +1074,6 @@ class Generator extends Base {
         method
       } = task;
       const {namespace = ''} = this.options || {};
-      args = typeof args === 'function' ? args(this) : args;
 
       const priority = Object.entries(this._queues).find(
         ([_, options]) => options.queueName === queueName
@@ -1076,6 +1091,7 @@ class Generator extends Base {
       const generator = this;
 
       runAsync(function () {
+        args = typeof args === 'function' ? args(generator) : args;
         generator.async = () => this.async();
         generator.runningState = {namespace, queueName, methodName};
         return method.apply(generator, args);
@@ -1276,12 +1292,12 @@ class Generator extends Base {
 
     // Pass down the default options so they're correctly mirrored down the chain.
     options = {
+      destinationRoot: this._destinationRoot,
       ...options,
       skipInstall: this.options.skipInstall,
       skipCache: this.options.skipCache,
       forceInstall: this.options.forceInstall,
-      skipLocalCache: this.options.skipLocalCache,
-      destinationRoot: this._destinationRoot
+      skipLocalCache: this.options.skipLocalCache
     };
 
     const instantiate = (Generator, path) => {
@@ -1386,12 +1402,19 @@ this.composeWith({
    * Return a storage instance.
    * @param  {String} storePath  The path of the json file
    * @param  {String} [path] The name in which is stored inside the json
-   * @param  {String} [lodashPath] Treat path as an lodash path
+   * @param  {boolean|Object} [options] Treat path as an lodash path
    * @return {Storage} json storage
    */
-  createStorage(storePath, path, lodashPath = false) {
+  createStorage(storePath, path, options) {
+    if (typeof path === 'object') {
+      options = path;
+      path = undefined;
+    } else if (typeof options === 'boolean') {
+      options = {lodashPath: options};
+    }
+
     storePath = this.destinationPath(storePath);
-    return new Storage(path, this.fs, storePath, lodashPath);
+    return new Storage(path, this.fs, storePath, options);
   }
 
   /**

package/lib/util/storage.js

@@ -64,7 +64,7 @@ class Storage {
     }
 
     _.defaults(options, {
-      lodash: false,
+      lodashPath: false,
       disableCache: false,
       disableCacheByFile: false,
       sorted: false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-generator",
-  "version": "5.5.0",
+  "version": "5.6.1",
   "description": "Rails-inspired generator system that provides scaffolding for your apps",
   "homepage": "http://yeoman.io",
   "author": "Yeoman",
@@ -71,7 +71,7 @@
     "read-pkg-up": "^7.0.1",
     "run-async": "^2.0.0",
     "semver": "^7.2.1",
-    "shelljs": "^0.8.4",
+    "shelljs": "^0.8.5",
     "sort-keys": "^4.2.0",
     "text-table": "^0.2.0"
   },