fix(generators): Fix small errors on application generator

Author: EndyKaufman

.gitignore

@@ -49,3 +49,4 @@ temp_*.json
 /test/fixture/**/src/app/index.ts
 /test/fixture/**/i18n/ru.i18n.ts
 /test/fixture/**/i18n/template.pot
+/test/fixture/ananas

package.json

@@ -14,7 +14,7 @@
 	"scripts": {
 		"clean": "del-cli dist",
 		"build": "npm run clean && tsc --pretty",
-		"test": "npm run build && mocha --timeout 300000 --require ts-node/register --recursive test/**/*-spec.ts",
+		"test": "npm run build && mocha --timeout 300000 --require ts-node/register --recursive test/**/*.spec.ts",
 		"watch": "npm run build -- --watch",
 		"watch:test": "npm run test -- --watch"
 	},

src/generators/app-empty.ts

@@ -35,7 +35,8 @@ export class AppEmptyGenerator extends Base {
                     'name': _.kebabCase(appName),
                     'classPrefix': _.upperFirst(_.camelCase(appName)),
                     'title': _.upperFirst(_.words(appName).join(' '))
-                }
+                },
+                'spec': 'spec'
             }
         );
         return await this.srcgen(

src/generators/frame.ts

@@ -50,7 +50,9 @@ export class FrameGenerator extends Base {
         const options = _.merge(
             {
                 'app': {
-                    'name': appName,
+                    'name': _.kebabCase(appName),
+                    'classPrefix': _.upperFirst(_.camelCase(appName)),
+                    'title': _.upperFirst(_.words(appName).join(' ')),
                     'folder': appFolder
                 },
                 'page': {

src/generators/grid.ts

@@ -101,7 +101,9 @@ export class GridGenerator extends Base {
         const options = _.merge(
             {
                 'app': {
-                    'name': appName
+                    'name': _.kebabCase(appName),
+                    'classPrefix': _.upperFirst(_.camelCase(appName)),
+                    'title': _.upperFirst(_.words(appName).join(' '))
                 },
                 'libs': {
                     'core': coreLib,

src/generators/page-and-frame.ts

@@ -50,7 +50,9 @@ export class PageAndFrameGenerator extends Base {
         const options = _.merge(
             {
                 'app': {
-                    'name': appName,
+                    'name': _.kebabCase(appName),
+                    'classPrefix': _.upperFirst(_.camelCase(appName)),
+                    'title': _.upperFirst(_.words(appName).join(' ')),
                     'folder': appFolder
                 },
                 'page': {

src/generators/page.ts

@@ -45,7 +45,9 @@ export class PageGenerator extends Base {
         const options = _.merge(
             {
                 'app': {
-                    'name': appName,
+                    'name': _.kebabCase(appName),
+                    'classPrefix': _.upperFirst(_.camelCase(appName)),
+                    'title': _.upperFirst(_.words(appName).join(' ')),
                     'folder': appFolder
                 },
                 'page': {

srcgen/utils-make.list.ts.files/loader#.js

@@ -97,7 +97,7 @@ recursive(scanPath, ['!*.ts', '*node_modules*'], function (err, files) {
               founded = true;
             }
           }
-          if (!founded && '/index' !== classFile) {
+          if (!founded && '/index' !== classFile && className.indexOf('AppModule') === -1) {
             var importLine = 'import { ' + className + ' } from \'.' + classFile + '\';';
             exportArray.push(importLine);
             var exportLine = 'export { ' + className + ' } from \'.' + classFile + '\';';

srcgen/web-app-empty/README!.md

@@ -3,4 +3,5 @@
 <prompt name="app.name" message="Application name">app-name</prompt>
 <prompt name="app.classPrefix" message="Application class prefix">AppName</prompt>
 <prompt name="app.title" message="Application title">Frame title</prompt>
+<prompt name="spec" message="No change">spec</prompt>
 ```

srcgen/web-app-empty/apps/%app.name%/src/app/app.module.ts

@@ -14,6 +14,7 @@ import {
   TokenService,
 } from '@rucken/core';
 import { <%=app.classPrefix%>CoreServices } from '@<%=app.name%>/core';
+import { <%=app.classPrefix%>WebServices } from '@<%=app.name%>/web';
 import {
   AlertModalModule,
   AuthModalModule,
@@ -37,12 +38,15 @@ import {
   TooltipConfig,
 } from 'ngx-bootstrap';
 
-import { <%=app.classPrefix%>AppComponent } from './app.component';
-import { <%=app.classPrefix%>Routes } from './app.routes';
-import { <%=app.classPrefix%>NavbarModule } from './controls/navbar/navbar.module';
-import { <%=app.classPrefix%>HomeGuardService } from './shared/guards/home-guard.service';
-import { <%=app.classPrefix%>EndpointHelper } from './shared/helpers/endpoint.helper';
-import { <%=app.classPrefix%>HttpHelper } from './shared/helpers/http.helper';
+import { 
+  <%=app.classPrefix%>AppComponent,
+  <%=app.classPrefix%>Routes,
+  <%=app.classPrefix%>NavbarModule,
+  <%=app.classPrefix%>HomeGuardService,
+  <%=app.classPrefix%>EndpointHelper,
+  <%=app.classPrefix%>HttpHelper,
+  <%=app.classPrefix%>Services
+} from './index';
 
 @NgModule({
   declarations: [
@@ -75,6 +79,8 @@ import { <%=app.classPrefix%>HttpHelper } from './shared/helpers/http.helper';
     RuckenCoreServices,
     RuckenWebServices,
     <%=app.classPrefix%>CoreServices,
+    <%=app.classPrefix%>WebServices,
+    <%=app.classPrefix%>Services,
     BaseResourceSelectInputConfig,
     TextInputConfig,
     SelectInputConfig,