Merge branch 'auto-create-monorepo-name-convention' of https://github…

….com/SSCIsrael/schematics into SSCIsrael-auto-create-monorepo-name-convention

src/lib/defaults.ts

@@ -5,6 +5,7 @@ export const DEFAULT_VERSION = '0.0.1';
 export const DEFAULT_PATH_NAME = 'src';
 export const DEFAULT_LIB_PATH = 'libs';
 export const DEFAULT_APPS_PATH = 'apps';
+export const DEFAULT_APP_NAME = 'app';
 export const DEFAULT_DIR_ENTRY_APP = 'main';
 export const TEST_ENV = 'test';
 export const PROJECT_TYPE = {

src/lib/sub-app/files/ts/src/__name__.controller.spec.ts

@@ -0,0 +1,22 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { <%= classify(name) %>Controller } from './<%= name %>.controller';
+import { <%= classify(name) %>Service } from './<%= name %>.service';
+
+describe('AppController', () => {
+  let <%= camelize(name) %>Controller: <%= classify(name) %>Controller;
+
+  beforeEach(async () => {
+    const app: TestingModule = await Test.createTestingModule({
+      controllers: [<%= classify(name) %>Controller],
+      providers: [<%= classify(name) %>Service],
+    }).compile();
+
+    <%= camelize(name) %>Controller = app.get<<%= classify(name) %>Controller>(<%= classify(name) %>Controller);
+  });
+
+  describe('root', () => {
+    it('should return "Hello World!"', () => {
+      expect(<%= camelize(name) %>Controller.getHello()).toBe('Hello World!');
+    });
+  });
+});

src/lib/sub-app/files/ts/src/__name__.controller.ts

@@ -0,0 +1,12 @@
+import { Controller, Get } from '@nestjs/common';
+import { <%= classify(name) %>Service } from './<%= name %>.service';
+
+@Controller()
+export class <%= classify(name) %>Controller {
+  constructor(private readonly <%= camelize(name) %>Service: <%= classify(name) %>Service) {}
+
+  @Get()
+  getHello(): string {
+    return this.<%= camelize(name) %>Service.getHello();
+  }
+}

src/lib/sub-app/files/ts/src/__name__.module.ts

@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common';
+import { <%= classify(name) %>Controller } from './<%= name %>.controller';
+import { <%= classify(name) %>Service } from './<%= name %>.service';
+
+@Module({
+  imports: [],
+  controllers: [<%= classify(name) %>Controller],
+  providers: [<%= classify(name) %>Service],
+})
+export class <%= classify(name) %>Module {}

src/lib/sub-app/files/ts/src/app.service.ts → src/lib/sub-app/files/ts/src/__name__.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
 @Injectable()
-export class AppService {
+export class <%= classify(name)%>Service {
   getHello(): string {
     return 'Hello World!';
   }

src/lib/sub-app/files/ts/src/main.ts

@@ -1,8 +1,8 @@
 import { NestFactory } from '@nestjs/core';
-import { AppModule } from './app.module';
+import { <%= classify(name) %>Module } from './<%= name %>.module';
 
 async function bootstrap() {
-  const app = await NestFactory.create(AppModule);
+  const app = await NestFactory.create(<%= classify(name) %>Module);
   await app.listen(3000);
 }
 bootstrap();

src/lib/sub-app/files/ts/test/app.e2e-spec.ts

@@ -1,13 +1,13 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import * as request from 'supertest';
-import { AppModule } from './../src/app.module';
+import { <%= classify(name)%>Module } from './../src/<%= classify(name)%>.module';
 
 describe('AppController (e2e)', () => {
   let app;
 
   beforeEach(async () => {
     const moduleFixture: TestingModule = await Test.createTestingModule({
-      imports: [AppModule],
+      imports: [<%= classify(name)%>Module],
     }).compile();
 
     app = moduleFixture.createNestApplication();

src/lib/sub-app/schema.json

@@ -27,6 +27,5 @@
       "format": "path",
       "description": "Applications root directory."
     }
-  },
-  "required": ["name"]
+  }
 }

src/lib/sub-app/sub-app.factory.test.ts

@@ -20,11 +20,11 @@ describe('SubApp Factory', () => {
       '/nest-cli.json',
       '/apps/nestjs-schematics/tsconfig.app.json',
       '/apps/project/tsconfig.app.json',
-      '/apps/project/src/app.controller.spec.ts',
-      '/apps/project/src/app.controller.ts',
-      '/apps/project/src/app.module.ts',
-      '/apps/project/src/app.service.ts',
       '/apps/project/src/main.ts',
+      '/apps/project/src/project.controller.spec.ts',
+      '/apps/project/src/project.controller.ts',
+      '/apps/project/src/project.module.ts',
+      '/apps/project/src/project.service.ts',
       '/apps/project/test/app.e2e-spec.ts',
       '/apps/project/test/jest-e2e.json',
     ]);
@@ -39,11 +39,11 @@ describe('SubApp Factory', () => {
       '/nest-cli.json',
       '/apps/nestjs-schematics/tsconfig.app.json',
       '/apps/awesome-project/tsconfig.app.json',
-      '/apps/awesome-project/src/app.controller.spec.ts',
-      '/apps/awesome-project/src/app.controller.ts',
-      '/apps/awesome-project/src/app.module.ts',
-      '/apps/awesome-project/src/app.service.ts',
       '/apps/awesome-project/src/main.ts',
+      '/apps/awesome-project/src/awesome-project.controller.spec.ts',
+      '/apps/awesome-project/src/awesome-project.controller.ts',
+      '/apps/awesome-project/src/awesome-project.module.ts',
+      '/apps/awesome-project/src/awesome-project.service.ts',
       '/apps/awesome-project/test/app.e2e-spec.ts',
       '/apps/awesome-project/test/jest-e2e.json',
     ]);

src/lib/sub-app/sub-app.factory.ts

@@ -21,6 +21,7 @@ import {
 } from '@angular-devkit/schematics';
 import * as fse from 'fs-extra';
 import {
+  DEFAULT_APP_NAME,
   DEFAULT_APPS_PATH,
   DEFAULT_DIR_ENTRY_APP,
   DEFAULT_LANGUAGE,
@@ -82,7 +83,7 @@ function transform(options: SubAppOptions): SubAppOptions {
     options.rootDir !== undefined ? options.rootDir : DEFAULT_APPS_PATH;
 
   if (!target.name) {
-    throw new SchematicsException('Option (name) is required.');
+    target.name = DEFAULT_APP_NAME;
   }
   target.language = !!target.language ? target.language : DEFAULT_LANGUAGE;
   target.name = strings.dasherize(target.name);
@@ -343,7 +344,6 @@ function updateMainAppOptions(
 
 function generateWorkspace(options: SubAppOptions, appName: string): Source {
   const path = join(options.path as Path, appName);
-
   return apply(url(join('./workspace' as Path, options.language)), [
     template({
       ...strings,
@@ -356,7 +356,6 @@ function generateWorkspace(options: SubAppOptions, appName: string): Source {
 
 function generate(options: SubAppOptions): Source {
   const path = join(options.path as Path, options.name);
-
   return apply(url(join('./files' as Path, options.language)), [
     template({
       ...strings,