fix(generators): Add support custom username and email options

package.json

@@ -20,8 +20,9 @@
     "build:tsc": "tsc -p tsconfig.json",
     "build": "run-s build:tsc",
     "test": "npm run build && jasmine src/**/*_spec.js",
-    "run-entity": "npm run build && schematics .:entity --name=test-entity --root=fixtures/entity --dry-run=false --force",
-    "run-new": "npm run build && schematics .:new --name=demo --root=fixtures/new --dry-run=false --force"
+    "run-entity": "npm run build && schematics .:entity --name=test-entity --root=fixtures/entity --username=demo --email=demo@demo.demo --dry-run=false --force",
+    "run-new": "npm run build && schematics .:new --name=demo --root=fixtures/new --username=demo --email=demo@demo.demo --dry-run=false --force",
+    "manual-test": "npm run run-entity && npm run run-new && npm run test"
   },
   "keywords": [
     "schematics",
@@ -68,4 +69,4 @@
       "typescript"
     ]
   }
-}
+}

src/entity/index.ts

@@ -5,13 +5,16 @@ import { humanize, pluralize, underscore } from 'inflection';
 import { join, resolve } from 'path';
 
 const dot = require('dot-object');
+const gitEmail = require('git-user-email');
+const gitUsername = require('git-username');
 
 // Instead of `any`, it would make sense here to get a schema-to-dts package and output the
 // interfaces so you get type-safe options.
 export default function (options: any): Rule {
   const root = options.root;
   const name = options.name;
   const fields = options.fields;
+  const gitInfo = { username: options.username || gitUsername(), email: options.email || gitEmail() };
   const chains = [];
   let app = options.app;
   let core = options.core;
@@ -26,7 +29,7 @@ export default function (options: any): Rule {
   } catch (e) {
     angularConfigPath = resolve(__dirname, 'files', 'project', 'angular.json');
     chains.push(
-      schematic('new', { root: root, name: 'demo' })
+      schematic('new', { root: root, name: 'demo', username: gitInfo.username, email: gitInfo.email })
     )
   }
   try {
@@ -75,6 +78,8 @@ export default function (options: any): Rule {
     name: name,
     fields: fields,
     root: root,
+    gitInfo: gitInfo,
+    ...dot.dot({ gitInfo: gitInfo }),
     app: appConfig,
     core: coreConfig,
     web: webConfig,
@@ -115,8 +120,8 @@ export default function (options: any): Rule {
   } catch (error) {
     existsFrames = [
       'content-types',
-      'permissions',
       'groups',
+      'permissions',
       'users'
     ];
   }
@@ -125,6 +130,7 @@ export default function (options: any): Rule {
       data.pluralize(name)
     );
   }
+  existsFrames = existsFrames.sort();
   try {
     accessSync(entityPageModuleFile, constants.F_OK);
     const templatePageSource = apply(url('./files/page-only-routes'), [

src/entity/schema.json

@@ -15,6 +15,14 @@
       "type": "string",
       "description": "Entity singular name on ke-bab case"
     },
+    "username": {
+      "type": "string",
+      "description": "Username"
+    },
+    "email": {
+      "type": "string",
+      "description": "Email"
+    },
     "root": {
       "type": "string",
       "description": "Root folder",

src/new/index.ts

@@ -11,7 +11,7 @@ const gitUsername = require('git-username');
 export default function (options: any): Rule {
   const root = options.root;
   const name = options.name;
-  const gitInfo = { username: gitUsername(), email: gitEmail() };
+  const gitInfo = { username: options.username || gitUsername(), email: options.email || gitEmail() };
   const templateSource = apply(url('./files'), [
     template({
       ...strings,

src/new/schema.json

@@ -8,6 +8,14 @@
       "type": "string",
       "description": "Application name on ke-bab case"
     },
+    "username": {
+      "type": "string",
+      "description": "Username"
+    },
+    "email": {
+      "type": "string",
+      "description": "Email"
+    },
     "root": {
       "type": "string",
       "description": "Root folder",