yeoman-environment 3.4.0 → 3.6.0

package/lib/environment.js

@@ -164,7 +164,7 @@ class Environment extends Base {
       rootCommand.emit('yeoman:environment', command.env);
 
       const generator = command.env.instantiate(GeneratorClass, this.args, this.opts());
-      command.env.queueGenerator(generator);
+      await command.env.queueGenerator(generator);
       return command.env.start().then(() => command.env);
     });
     return command;
@@ -759,8 +759,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);
@@ -812,14 +820,23 @@ class Environment extends Base {
    * @param {String} namespaceOrPath
    * @param {Array} [args]
    * @param {Object} [options]
+   * @param {Boolean} [schedule]
    * @return {Generator} The instantiated generator or the singleton instance.
    */
-  composeWith(generator, args, options) {
+  composeWith(generator, args, options, schedule = true) {
+    if (typeof args === 'boolean') {
+      schedule = args;
+      args = undefined;
+      options = undefined;
+    } else if (typeof options === 'boolean') {
+      schedule = options;
+      options = undefined;
+    }
     const generatorInstance = this.create(generator, args, options);
     if (generatorInstance.then) {
-      return generatorInstance.then(generatorInstance => this.queueGenerator(generatorInstance, true));
+      return generatorInstance.then(generatorInstance => this.queueGenerator(generatorInstance, schedule));
     }
-    return this.queueGenerator(generatorInstance, true);
+    return this.queueGenerator(generatorInstance, schedule);
   }
 
   /**
@@ -913,21 +930,20 @@ class Environment extends Base {
         // Generator > 5
         this.once('run', () => generator.emit('run'));
         this.once('end', () => generator.emit('end'));
-        generator.queueTasks();
-      } else {
-        if (!generator.options.forwardErrorToEnvironment) {
-          generator.on('error', error => this.emit('error', error));
-        }
-        generator.promise = generator.run();
+        return generator.queueTasks();
       }
+      if (!generator.options.forwardErrorToEnvironment) {
+        generator.on('error', error => this.emit('error', error));
+      }
+      generator.promise = generator.run();
     };
 
     if (schedule) {
       this.runLoop.add(
         'environment:run',
-        (done, stop) => {
+        async (done, stop) => {
           try {
-            runGenerator();
+            await runGenerator();
             done();
           } catch (error) {
             stop(error);
@@ -935,7 +951,10 @@ class Environment extends Base {
         }
       );
     } else {
-      runGenerator();
+      const maybePromise = runGenerator();
+      if (maybePromise && maybePromise.then) {
+        return maybePromise.then(() => generator);
+      }
     }
     return generator;
   }
@@ -950,7 +969,7 @@ class Environment extends Base {
    * @param {Object}       [options]
    */
   async run(args, options, done) {
-    if (done === 'function' || typeof options === 'function' || typeof args === 'function') {
+    if (done || typeof options === 'function' || typeof args === 'function') {
       throw new Error('Callback support have been removed.');
     }
 
@@ -1056,7 +1075,7 @@ class Environment extends Base {
   async runGenerator(generator) {
     try {
       generator = await generator;
-      generator = this.queueGenerator(generator);
+      generator = await this.queueGenerator(generator);
     } catch (error) {
       return Promise.reject(error);
     }

package/lib/spawn-command.js

@@ -15,7 +15,7 @@ const spawnCommand = module.exports;
  * @param {object} [opt] any execa options
  * @return {String} spawned process reference
  */
-spawnCommand.spawnCommand = (command, args, opt) => {
+spawnCommand.spawnCommand = function (command, args, opt) {
   return spawn(command, args, {stdio: 'inherit', cwd: this.cwd, ...opt});
 };
 
@@ -27,6 +27,6 @@ spawnCommand.spawnCommand = (command, args, opt) => {
  * @param {object} [opt] any execa options
  * @return {String} spawn.sync result
  */
-spawnCommand.spawnCommandSync = (command, args, opt) => {
+spawnCommand.spawnCommandSync = function (command, args, opt) {
   return spawn.sync(command, args, {stdio: 'inherit', cwd: this.cwd, ...opt});
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-environment",
-  "version": "3.4.0",
+  "version": "3.6.0",
   "description": "Handles the lifecyle and bootstrapping of generators in a specific environment",
   "homepage": "http://yeoman.io",
   "author": "Yeoman",