fix(generators): Update resolve path for correct run schematics.js

Author: EndyKaufman

src/commands/angular-entity.ts

@@ -1,5 +1,5 @@
 import { flags, Command } from '@oclif/command';
-import { sep } from 'path';
+import { resolve as resolvePath, sep } from 'path';
 const npmRun = require('npm-run');
 
 export class AngularEntity extends Command {
@@ -64,8 +64,9 @@ export class AngularEntity extends Command {
     });
     return new Promise((resolve, reject) => {
       const inputFolder = folder ? folder.replace(new RegExp('\\' + sep, 'g'), '/').split(sep).join('/') : undefined;
-      const command =
-        'schematics @rucken/schematics:angular-entity ' +
+      const command = 'node ' +
+        resolvePath(__dirname, '../../node_modules/@angular-devkit/schematics-cli/bin/schematics.js') +
+        ' @rucken/schematics:angular-entity ' +
         (inputFolder ? ('--root=' + inputFolder + ' ') : ' ') +
         (name ? ('--name=' + name + ' ') : ' ') +
         (fields ? ('--fields=' + fields + ' ') : ' ') +

src/commands/angular-new.ts

@@ -1,13 +1,13 @@
 import { flags, Command } from '@oclif/command';
-import { sep } from 'path';
+import { resolve as resolvePath, sep } from 'path';
 const npmRun = require('npm-run');
 
 export class AngularNew extends Command {
   static aliases = ['new:angular', 'angular-new'];
   static description = 'generate frontend web empty Angular 6+ application based on Rucken template';
   static flags = {
     help: flags.help({ char: 'h' }),
-    name: flags.string({ char: 'n', description: 'application name on ke-bab case', required: true }),
+    name: flags.string({ char: 'n', description: 'application name on ke-bab case' }),
     username: flags.string({ char: 'u', description: 'username' }),
     email: flags.string({ char: 'e', description: 'email' })
   };
@@ -44,8 +44,12 @@ export class AngularNew extends Command {
     });
     return new Promise((resolve, reject) => {
       const inputFolder = folder ? folder.replace(new RegExp('\\' + sep, 'g'), '/').split(sep).join('/') : undefined;
-      const command =
-        'schematics @rucken/schematics:angular-new ' +
+      if (inputFolder && inputFolder.indexOf('/') === -1 && !name) {
+        name = inputFolder;
+      }
+      const command = 'node ' +
+        resolvePath(__dirname, '../../node_modules/@angular-devkit/schematics-cli/bin/schematics.js') +
+        ' @rucken/schematics:angular-new ' +
         (inputFolder ? ('--root=' + inputFolder + ' ') : ' ') +
         (name ? ('--name=' + name + ' ') : ' ') +
         (username ? ('--username=' + username + ' ') : ' ') +

src/commands/nestjs-entity.ts

@@ -1,5 +1,5 @@
 import { flags, Command } from '@oclif/command';
-import { sep } from 'path';
+import { resolve as resolvePath, sep } from 'path';
 const npmRun = require('npm-run');
 
 export class NestJSEntity extends Command {
@@ -59,8 +59,9 @@ export class NestJSEntity extends Command {
     });
     return new Promise((resolve, reject) => {
       const inputFolder = folder ? folder.replace(new RegExp('\\' + sep, 'g'), '/').split(sep).join('/') : undefined;
-      const command =
-        'schematics @rucken/schematics:nestjs-entity ' +
+      const command = 'node ' +
+        resolvePath(__dirname, '../../node_modules/@angular-devkit/schematics-cli/bin/schematics.js') +
+        ' @rucken/schematics:nestjs-entity ' +
         (inputFolder ? ('--root=' + inputFolder + ' ') : ' ') +
         (name ? ('--name=' + name + ' ') : ' ') +
         (fields ? ('--fields=' + fields + ' ') : ' ') +

src/commands/nestjs-new.ts

@@ -1,13 +1,13 @@
 import { flags, Command } from '@oclif/command';
-import { sep } from 'path';
+import { resolve as resolvePath, sep } from 'path';
 const npmRun = require('npm-run');
 
 export class NestJSNew extends Command {
   static aliases = ['new:nestjs', 'nestjs-new'];
   static description = 'generate empty NestJS backend application';
   static flags = {
     help: flags.help({ char: 'h' }),
-    name: flags.string({ char: 'n', description: 'application name on ke-bab case', required: true }),
+    name: flags.string({ char: 'n', description: 'application name on ke-bab case' }),
     username: flags.string({ char: 'u', description: 'username' }),
     email: flags.string({ char: 'e', description: 'email' })
   };
@@ -44,8 +44,12 @@ export class NestJSNew extends Command {
     });
     return new Promise((resolve, reject) => {
       const inputFolder = folder ? folder.replace(new RegExp('\\' + sep, 'g'), '/').split(sep).join('/') : undefined;
-      const command =
-        'schematics @rucken/schematics:nestjs-new ' +
+      if (inputFolder && inputFolder.indexOf('/') === -1 && !name) {
+        name = inputFolder;
+      }
+      const command = 'node ' +
+        resolvePath(__dirname, '../../node_modules/@angular-devkit/schematics-cli/bin/schematics.js') +
+        ' @rucken/schematics:nestjs-new ' +
         (inputFolder ? ('--root=' + inputFolder + ' ') : ' ') +
         (name ? ('--name=' + name + ' ') : ' ') +
         (username ? ('--username=' + username + ' ') : ' ') +