Merge pull request #1364 from driftyco/feature/generators

Feature/generators

Author: danbucholtz

lib/ionic/generate.js

@@ -3,6 +3,7 @@
 var extend = require('../utils/extend');
 var path = require('path');
 var ionicAppLib = require('ionic-app-lib');
+var appGenerator = require('@ionic/app-generators');
 var log = ionicAppLib.logging.logger;
 var Project =  ionicAppLib.project;
 var fail = ionicAppLib.utils.fail;
@@ -16,10 +17,6 @@ var settings = {
     '--list': {
       title: 'List available generators',
       boolean: true
-    },
-    '--typescript|--ts': {
-      boolean: true,
-      title: '(with --v2 only) Use TypeScript in generation'
     }
   },
   isProjectTask: true
@@ -48,28 +45,43 @@ function run(ionic, argv) {
     var name = argv._[2]; // TODO support multiple names
     var isTS = project.get('typescript') || argv.ts;
 
-    var ionicModule = loadToolingModule();
-
     if (argv.list) {
-      ionicModule.Generate.printAvailableGenerators();
+      appGenerator.printAvailableGenerators();
       return;
     }
 
-    var promise;
-    try {
-      promise = ionicModule.generate({ appDirectory: process.cwd(), generator: generator, name: name, isTS: isTS });
-    } catch (err) {
-      if (err.message.indexOf('no generator available') !== -1) {
+    var includeSpec = argv.includeSpec ? true : false;
+    var includeSass = argv.skipScss ? false : true;
+
+    var generatorOptions = {
+      generatorType: generator,
+      suppliedName: name,
+      includeSpec: includeSpec,
+      includeSass: includeSass
+    };
+
+    var projectStructureOptions = {
+      absoluteComponentDirPath: process.cwd() + '/src/components',
+      absoluteDirectiveDirPath: process.cwd() + '/src/components',
+      absolutePagesDirPath: process.cwd() + '/src/pages',
+      absolutePipeDirPath: process.cwd() + '/src/pipes',
+      absoluteProviderDirPath: process.cwd() + '/src/providers',
+      absolutePathTemplateBaseDir: process.cwd() + '/node_modules/ionic-angular/templates'
+    };
+
+    return appGenerator.generate(generatorOptions, projectStructureOptions).catch(function(err) {
+      if (err.message === 'Unknown Generator Type') {
         log.error(err.message);
-        ionicModule.Generate.printAvailableGenerators();
+        appGenerator.printAvailableGenerators();
         return;
+      } else {
+        return fail(err);
       }
-      return fail(err);
-    }
-    return promise;
+    });
+
 
   } catch (err) {
-    fail('There was an error generating your item:', err);
+    return fail('There was an error generating your item:', err);
   }
 }
 

package.json

@@ -60,6 +60,7 @@
   ],
   "license": "MIT",
   "dependencies": {
+    "@ionic/app-generators": "0.0.3",
     "cli-table": "0.3.1",
     "colors": "0.6.2",
     "expand-tilde": "1.2.0",