Get and run module generators (#98)

yeoman · May 31, 2018 · 98f2f87 · 98f2f87
1 parent bb3941a
commit 98f2f87
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 0 deletions.
diff --git a/lib/environment.js b/lib/environment.js
@@ -355,6 +355,10 @@ class Environment extends EventEmitter {
 
     const Generator = this.get(namespace);
 
+    if (typeof Generator !== 'undefined' && typeof Generator.default === 'function') {
+      return this.instantiate(Generator.default, options);
+    }
+
     if (typeof Generator !== 'function') {
       let generatorHint = '';
       if (isScoped(namespace)) {

diff --git a/test/environment.js b/test/environment.js
@@ -258,6 +258,12 @@ describe('Environment', () => {
       });
       this.env.run('@dummyscope/package');
     });
+
+    it('runs a module generator', function () {
+      this.env
+        .register(path.join(__dirname, './fixtures/generator-module/generators/app'), 'fixtures:generator-module');
+      this.env.run('fixtures:generator-module');
+    });
   });
 
   describe('#registerModulePath()', () => {
@@ -481,6 +487,13 @@ describe('Environment', () => {
       assert.equal(this.env.get('not:there'), undefined);
       assert.equal(this.env.get(), undefined);
     });
+
+    it('works with modules', function () {
+      const generator = require('./fixtures/generator-module/generators/app');
+      this.env
+        .register(path.join(__dirname, './fixtures/generator-module/generators/app'), 'fixtures:generator-module');
+      assert.equal(this.env.get('fixtures:generator-module'), generator);
+    });
   });
 
   describe('#error()', () => {

diff --git a/test/fixtures/generator-module/generators/app/index.js b/test/fixtures/generator-module/generators/app/index.js
@@ -0,0 +1,6 @@
+var Generator = require('yeoman-generator');
+exports.default = class extends Generator {
+  exec() {
+
+  }
+};
diff --git a/test/fixtures/generator-module/package.json b/test/fixtures/generator-module/package.json
@@ -0,0 +1,11 @@
+{
+  "author": "",
+  "name": "generator-module",
+  "version": "0.0.0",
+  "dependencies": {},
+  "devDependencies": {},
+  "optionalDependencies": {},
+  "engines": {
+    "node": "*"
+  }
+}