fix: rename subGenerator.from to subGenerator.generator

saojs · Nov 11, 2018 · d005ca6 · d005ca6
1 parent 8996b0b
commit d005ca6
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -82,15 +82,17 @@ class SAO {
     }
 
     if (generator.subGenerator) {
-      // TODO: remove config.generators support, you should use `subGenerators` instead
+      // TODO: remove `config.generators` support, you should use `subGenerators` instead
       const subGenerators = config.subGenerators || config.generators
       const subGenerator =
         subGenerators &&
         subGenerators.find(g => g.name === generator.subGenerator)
       if (subGenerator) {
-        const generatorPath = isLocalPath(subGenerator.from)
-          ? path.resolve(generator.path, subGenerator.from)
-          : resolveFrom(generator.path, subGenerator.from)
+        // TODO: remove `subGenerator.from` support, you should use `subGenerator.generator` instead
+        let generatorPath = subGenerator.generator || subGenerator.from
+        generatorPath = isLocalPath(generatorPath)
+          ? path.resolve(generator.path, generatorPath)
+          : resolveFrom(generator.path, generatorPath)
         return this.run(parseGenerator(generatorPath), generator)
       }
       throw new SAOError(`No such sub generator in generator ${generator.path}`)