fix(nestjs-generators): Add time options for change date time of migration generated for new entity

Author: EndyKaufman

.travis/push-generators-outputs.sh

@@ -19,12 +19,8 @@ upload_files() {
   git push --quiet --set-upstream origin generators-outputs 
 }
 
-clear_fixtures(){
-  rimraf ./test/fixtures
-  mkdir ./test/fixtures
-}
-
 run_generators(){
+  npm run clear-generators-outputs
   npm run run-generators
 }
 
@@ -45,9 +41,9 @@ then
     | sed 's/[",]//g')
   export PACKAGE_VERSION=$PACKAGE_VERSION
 
-  clear_fixtures
   move_down
   setup_git
+  move_up
   run_generators
   move_down
   commit_files

package.json

@@ -103,13 +103,13 @@
     "run-new:angular": "node ./bin/run new:angular test/fixtures/angular-new -n demo -u demo -e demo@demo.demo",
     "run-entity:angular": "node ./bin/run entity:angular test/fixtures/angular-entity -n demo -u demo -e demo@demo.demo -f [name,title]",
     "run-new:nestjs": "node ./bin/run new:nestjs test/fixtures/nestjs-new -n demo -u demo -e demo@demo.demo",
-    "run-entity:nestjs": "node ./bin/run entity:nestjs test/fixtures/nestjs-entity -n demo -u demo -e demo@demo.demo -f [name,title]",
+    "run-entity:nestjs": "node ./bin/run entity:nestjs test/fixtures/nestjs-entity -n demo -u demo -e demo@demo.demo -f [name,title] --time=1533634559618",
     "run-new": "node ./bin/run new test/fixtures/new -n demo -u demo -e demo@demo.demo",
     "run-entity:create-app": "node ./bin/run new test/fixtures/entity -n demo -u demo -e demo@demo.demo",
-    "run-entity:create-entity": "node ./bin/run entity test/fixtures/entity -n demo -u demo -e demo@demo.demo -f [name,title]",
+    "run-entity:create-entity": "node ./bin/run entity test/fixtures/entity -n demo -u demo -e demo@demo.demo -f [name,title] --time=1533634559618",
     "run-entity": "run-s run-entity:create-app run-entity:create-entity",
-    "clear-generators-outputs": "run-s run-new:angular run-entity:angular run-new:nestjs run-entity:nestjs run-new run-entity",
-    "run-generators":"run-s run-new:angular run-entity:angular run-new:nestjs run-entity:nestjs run-new run-entity"
+    "run-generators": "run-s run-new:angular run-entity:angular run-new:nestjs run-entity:nestjs run-new run-entity",
+    "clear-generators-outputs": "rimraf test/fixtures/angular-new test/fixtures/angular-entity test/fixtures/nestjs-new test/fixtures/nestjs-entity test/fixtures/new test/fixtures/entity"
   },
   "greenkeeper": {
     "ignore": [

src/commands/entity.ts

@@ -14,7 +14,8 @@ export class Entity extends Command {
     email: flags.string({ char: 'e', description: 'email' }),
     app: flags.string({ char: 'a', description: 'application name in angular.json and .nestcli.json' }),
     core: flags.string({ char: 'c', description: 'core library name in angular.json and .nestcli.json' }),
-    web: flags.string({ char: 'w', description: 'web library name in angular.json' })
+    web: flags.string({ char: 'w', description: 'web library name in angular.json' }),
+    time: flags.string({ description: 'timestamp for create migration (default: current datetime)' })
   };
   static args = [{ name: 'folder' }];
   async run() {
@@ -28,6 +29,7 @@ export class Entity extends Command {
     const app = flags.app;
     const core = flags.core;
     const web = flags.web;
+    const time = flags.time;
     const errorMessage = 'Before create entity, you must create project: rucken new -n demo -u demo -e demo@demo.demo';
     let templateBackend = '';
     let templateFrontend = '';
@@ -65,7 +67,8 @@ export class Entity extends Command {
         username,
         email,
         app,
-        core
+        core,
+        time
       );
     } catch (error) {
       console.error(error);
@@ -94,7 +97,8 @@ export class Entity extends Command {
     username?: string,
     email?: string,
     app?: string,
-    core?: string
+    core?: string,
+    time?: string
   ) {
     return new Promise(async (resolve, reject) => {
       try {
@@ -119,6 +123,10 @@ export class Entity extends Command {
           args.push('--core');
           args.push(core);
         }
+        if (time) {
+          args.push('--time');
+          args.push(time);
+        }
         await NestJSEntity.run(args);
         resolve();
       } catch (error) {

src/commands/nestjs-entity.ts

@@ -15,6 +15,7 @@ export class NestJSEntity extends Command {
     email: flags.string({ char: 'e', description: 'email' }),
     app: flags.string({ char: 'a', description: 'application name in .nestcli.json' }),
     core: flags.string({ char: 'c', description: 'core library name in .nestcli.json' }),
+    time: flags.string({ description: 'timestamp for create migration (default: current datetime)' })
   };
   static args = [{ name: 'folder' }];
   async run() {
@@ -27,6 +28,7 @@ export class NestJSEntity extends Command {
     const email = flags.email;
     const app = flags.app;
     const core = flags.core;
+    const time = flags.time;
 
     try {
       await this.runEntity(
@@ -37,7 +39,8 @@ export class NestJSEntity extends Command {
         username,
         email,
         app,
-        core
+        core,
+        time
       );
     } catch (error) {
       console.error(error);
@@ -51,7 +54,8 @@ export class NestJSEntity extends Command {
     username?: string,
     email?: string,
     app?: string,
-    core?: string
+    core?: string,
+    time?: string
   ) {
     this.debug('Start', {
       template: template,
@@ -61,7 +65,8 @@ export class NestJSEntity extends Command {
       username: username,
       email: email,
       app: app,
-      core: core
+      core: core,
+      time: time
     });
     return new Promise((resolve, reject) => {
       const inputFolder = folder ? folder.replace(new RegExp('\\' + sep, 'g'), '/').split(sep).join('/') : undefined;
@@ -75,7 +80,8 @@ export class NestJSEntity extends Command {
           username: username,
           email: email,
           app: app,
-          core: core
+          core: core,
+          time: time
         }
       );
       this.debug('command', command);

src/utils/schematics-command-builder.ts

@@ -58,22 +58,22 @@ export function schematicsCommandBuilder(
       projectSchematicsCli +
       ' ' + templateFolder + ':' + templateName + ' ' +
       argsArray.join(' ') +
-      '--dry-run=false --force';
+      ' --dry-run=false --force';
   }
   if (projectNodeModulesCollections['schematics'] && projectNodeModulesCollections['schematics'][templateName]) {
     console.log('Founded and used schematics template from project node_modules');
     return 'node ' +
       projectSchematicsCli +
       ' ' + templateFolder + ':' + templateName + ' ' +
       argsArray.join(' ') +
-      '--dry-run=false --force';
+      ' --dry-run=false --force';
   }
   if (localNodeModulesCollections['schematics'] && localNodeModulesCollections['schematics'][templateName]) {
     return 'node ' +
       localSchematicsCli +
       ' ' + templateFolder + ':' + templateName + ' ' +
       argsArray.join(' ') +
-      '--dry-run=false --force';
+      ' --dry-run=false --force';
   }
   throw new Error(`Template with name ${template} not founded`);
 }