@rxdi/schematics 0.7.124 → 0.7.128

package/lib/client-app/angular/files/loaders/express.loader.ts

@@ -0,0 +1,25 @@
+import { Injectable } from '@nestjs/common';
+import { AbstractHttpAdapter } from '@nestjs/core';
+import { loadPackage } from '../angular.utils';
+import { AngularModuleOptions } from '../interfaces/angular-options.interface';
+import { AbstractLoader } from './abstract.loader';
+
+@Injectable()
+export class ExpressLoader extends AbstractLoader {
+  public register(
+    httpAdapter: AbstractHttpAdapter,
+    options: AngularModuleOptions,
+  ) {
+    const app = httpAdapter.getInstance();
+    const express = loadPackage('express', 'AngularModule', () =>
+      require('express'),
+    );
+    const clientPath = options.rootPath;
+    const indexFilePath = this.getIndexFilePath(clientPath);
+
+    app.use(express.static(clientPath, options.serveStaticOptions));
+    app.get(options.renderPath, (req: any, res: any) =>
+      res.sendFile(indexFilePath),
+    );
+  }
+}

package/lib/client-app/angular/files/loaders/fastify.loader.ts

@@ -0,0 +1,34 @@
+import { Injectable } from '@nestjs/common';
+import { AbstractHttpAdapter } from '@nestjs/core';
+import * as fs from 'fs';
+import { loadPackage } from '../angular.utils';
+import { AngularModuleOptions } from '../interfaces/angular-options.interface';
+import { AbstractLoader } from './abstract.loader';
+
+@Injectable()
+export class FastifyLoader extends AbstractLoader {
+  public register(
+    httpAdapter: AbstractHttpAdapter,
+    options: AngularModuleOptions,
+  ) {
+    const app = httpAdapter.getInstance();
+    const fastifyStatic = loadPackage('fastify-static', 'AngularModule', () =>
+      require('fastify-static'),
+    );
+    const { setHeaders, redirect, ...send } =
+      options.serveStaticOptions || ({} as any);
+    const clientPath = options.rootPath;
+    const indexFilePath = this.getIndexFilePath(clientPath);
+
+    app.register(fastifyStatic, {
+      root: clientPath,
+      setHeaders,
+      redirect,
+      send,
+    });
+    app.get(options.renderPath, (req: any, res: any) => {
+      const stream = fs.createReadStream(indexFilePath);
+      res.type('text/html').send(stream);
+    });
+  }
+}

package/lib/client-app/angular/files/loaders/noop.loader.ts

@@ -0,0 +1,12 @@
+import { Injectable } from '@nestjs/common';
+import { AbstractHttpAdapter } from '@nestjs/core';
+import { AngularModuleOptions } from '../interfaces/angular-options.interface';
+import { AbstractLoader } from './abstract.loader';
+
+@Injectable()
+export class NoopLoader extends AbstractLoader {
+  public register(
+    httpAdapter: AbstractHttpAdapter,
+    options: AngularModuleOptions,
+  ) {}
+}

package/lib/client-app/angular/schema.json

@@ -0,0 +1,24 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "SchematicsNestModule",
+  "title": "Nest Module Options Schema",
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "The name of the application.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What name would you like to use for Angular application?"
+    },
+    "initApp": {
+      "type": "boolean",
+      "description": "Flag to skip the angular application generation.",
+      "default": false,
+      "x-prompt": "Would you like to initialize Angular application?"
+    }
+  },
+  "required": ["name"]
+}

package/lib/component/component.factory.js

@@ -13,9 +13,9 @@ const ELEMENT_TYPE = 'component';
 function main(options) {
     options = transform(options);
     return (tree, context) => {
-        return schematics_1.branchAndMerge(schematics_1.chain([
-            source_root_helpers_1.mergeSourceRoot(options),
-            schematics_1.mergeWith(generate(options)),
+        return (0, schematics_1.branchAndMerge)((0, schematics_1.chain)([
+            (0, source_root_helpers_1.mergeSourceRoot)(options),
+            (0, schematics_1.mergeWith)(generate(options)),
             addDeclarationToModule(options),
         ]))(tree, context);
     };
@@ -32,14 +32,14 @@ function transform(source) {
         target.language !== undefined ? target.language : defaults_1.DEFAULT_LANGUAGE;
     target.path = target.flat
         ? target.path
-        : core_1.join(target.path, target.name);
+        : (0, core_1.join)(target.path, target.name);
     return target;
 }
 function generate(options) {
-    return (context) => schematics_1.apply(schematics_1.url(core_1.join('./files', options.language)), [
-        options.spec ? schematics_1.noop() : schematics_1.filter(path => !path.endsWith('.spec.ts')),
-        schematics_1.template(Object.assign(Object.assign({}, core_1.strings), options)),
-        schematics_1.move(options.path),
+    return (context) => (0, schematics_1.apply)((0, schematics_1.url)((0, core_1.join)('./files', options.language)), [
+        options.spec ? (0, schematics_1.noop)() : (0, schematics_1.filter)(path => !path.endsWith('.spec.ts')),
+        (0, schematics_1.template)(Object.assign(Object.assign({}, core_1.strings), options)),
+        (0, schematics_1.move)(options.path),
     ])(context);
 }
 function addDeclarationToModule(options) {

package/lib/component/component.factory.test.ts

@@ -0,0 +1,191 @@
+import { normalize } from '@angular-devkit/core';
+import {
+  SchematicTestRunner,
+  UnitTestTree,
+} from '@angular-devkit/schematics/testing';
+import * as path from 'path';
+import { ApplicationOptions } from '../application/application.schema';
+import { ModuleOptions } from '../module/module.schema';
+import { ControllerOptions } from './component.schema';
+
+describe('Controller Factory', () => {
+  const runner: SchematicTestRunner = new SchematicTestRunner(
+    '.',
+    path.join(process.cwd(), 'src/collection.json'),
+  );
+  it('should manage name only', () => {
+    const options: ControllerOptions = {
+      name: 'foo',
+      skipImport: true,
+      spec: false,
+      flat: false,
+    };
+    const tree: UnitTestTree = runner.runSchematic('controller', options);
+    const files: string[] = tree.files;
+
+    expect(
+      files.find(filename => filename === '/foo/foo.controller.ts'),
+    ).toBeDefined();
+    expect(
+      files.find(filename => filename === '/foo/foo.controller.spec.ts'),
+    ).not.toBeDefined();
+    expect(tree.readContent('/foo/foo.controller.ts')).toEqual(
+      "import { Component } from '@rxdi/core';\n" +
+        '\n' +
+        "@Component('foo')\n" +
+        'export class FooController {}\n',
+    );
+  });
+  it('should manage name has a path', () => {
+    const options: ControllerOptions = {
+      name: 'bar/foo',
+      skipImport: true,
+    };
+    const tree: UnitTestTree = runner.runSchematic('controller', options);
+    const files: string[] = tree.files;
+    expect(
+      files.find(filename => filename === '/bar/foo/foo.controller.ts'),
+    ).toBeDefined();
+    expect(
+      files.find(filename => filename === '/bar/foo/foo.controller.spec.ts'),
+    ).toBeDefined();
+    expect(tree.readContent('/bar/foo/foo.controller.ts')).toEqual(
+      "import { Controller } from '@nestjs/common';\n" +
+        '\n' +
+        "@Controller('foo')\n" +
+        'export class FooController {}\n',
+    );
+  });
+  it('should manage name and path', () => {
+    const options: ControllerOptions = {
+      name: 'foo',
+      path: 'bar',
+      skipImport: true,
+    };
+    const tree: UnitTestTree = runner.runSchematic('controller', options);
+    const files: string[] = tree.files;
+    expect(
+      files.find(filename => filename === '/bar/foo/foo.controller.ts'),
+    ).toBeDefined();
+    expect(
+      files.find(filename => filename === '/bar/foo/foo.controller.spec.ts'),
+    ).toBeDefined();
+    expect(tree.readContent('/bar/foo/foo.controller.ts')).toEqual(
+      "import { Controller } from '@nestjs/common';\n" +
+        '\n' +
+        "@Controller('foo')\n" +
+        'export class FooController {}\n',
+    );
+  });
+  it('should manage name to dasherize', () => {
+    const options: ControllerOptions = {
+      name: 'fooBar',
+      skipImport: true,
+    };
+    const tree: UnitTestTree = runner.runSchematic('controller', options);
+    const files: string[] = tree.files;
+    expect(
+      files.find(filename => filename === '/foo-bar/foo-bar.controller.ts'),
+    ).toBeDefined();
+    expect(
+      files.find(
+        filename => filename === '/foo-bar/foo-bar.controller.spec.ts',
+      ),
+    ).toBeDefined();
+    expect(tree.readContent('/foo-bar/foo-bar.controller.ts')).toEqual(
+      "import { Controller } from '@nestjs/common';\n" +
+        '\n' +
+        "@Controller('foo-bar')\n" +
+        'export class FooBarController {}\n',
+    );
+  });
+  it('should manage path to dasherize', () => {
+    const options: ControllerOptions = {
+      name: 'barBaz/foo',
+      skipImport: true,
+    };
+    const tree: UnitTestTree = runner.runSchematic('controller', options);
+    const files: string[] = tree.files;
+    expect(
+      files.find(filename => filename === '/bar-baz/foo/foo.controller.ts'),
+    ).toBeDefined();
+    expect(
+      files.find(
+        filename => filename === '/bar-baz/foo/foo.controller.spec.ts',
+      ),
+    ).toBeDefined();
+    expect(tree.readContent('/bar-baz/foo/foo.controller.ts')).toEqual(
+      "import { Controller } from '@nestjs/common';\n" +
+        '\n' +
+        "@Controller('foo')\n" +
+        'export class FooController {}\n',
+    );
+  });
+  it('should manage javascript file', () => {
+    const options: ControllerOptions = {
+      name: 'foo',
+      language: 'js',
+      skipImport: true,
+    };
+    const tree: UnitTestTree = runner.runSchematic('controller', options);
+    const files: string[] = tree.files;
+    expect(
+      files.find(filename => filename === '/foo/foo.controller.js'),
+    ).toBeDefined();
+    expect(
+      files.find(filename => filename === '/foo/foo.controller.spec.js'),
+    ).toBeDefined();
+    expect(tree.readContent('/foo/foo.controller.js')).toEqual(
+      "import { Controller } from '@nestjs/common';\n" +
+        '\n' +
+        "@Controller('foo')\n" +
+        'export class FooController {}\n',
+    );
+  });
+  it('should manage declaration in app module', () => {
+    const app: ApplicationOptions = {
+      name: '',
+    };
+    let tree: UnitTestTree = runner.runSchematic('application', app);
+    const options: ControllerOptions = {
+      name: 'foo',
+    };
+    tree = runner.runSchematic('controller', options, tree);
+    expect(tree.readContent(normalize('/src/app.module.ts'))).toEqual(
+      "import { Module } from '@nestjs/common';\n" +
+        "import { AppController } from './app.controller';\n" +
+        "import { AppService } from './app.service';\n" +
+        "import { FooController } from './foo/foo.controller';\n" +
+        '\n' +
+        '@Module({\n' +
+        '  imports: [],\n' +
+        '  controllers: [AppController, FooController],\n' +
+        '  providers: [AppService],\n' +
+        '})\n' +
+        'export class AppModule {}\n',
+    );
+  });
+  it('should manage declaration in foo module', () => {
+    const app: ApplicationOptions = {
+      name: '',
+    };
+    let tree: UnitTestTree = runner.runSchematic('application', app);
+    const module: ModuleOptions = {
+      name: 'foo',
+    };
+    tree = runner.runSchematic('module', module, tree);
+    const options: ControllerOptions = {
+      name: 'foo',
+    };
+    tree = runner.runSchematic('controller', options, tree);
+    expect(tree.readContent(normalize('/src/foo/foo.module.ts'))).toEqual(
+      "import { Module } from '@nestjs/common';\n" +
+        "import { FooController } from './foo.controller';\n" +
+        '\n' +
+        '@Module({\n' +
+        '  controllers: [FooController]\n' +
+        '})\n' +
+        'export class FooModule {}\n',
+    );
+  });
+});

package/lib/component/component.factory.ts

@@ -0,0 +1,91 @@
+import { join, Path, strings } from '@angular-devkit/core';
+import {
+  apply,
+  branchAndMerge,
+  chain,
+  filter,
+  mergeWith,
+  move,
+  noop,
+  Rule,
+  SchematicContext,
+  template,
+  Tree,
+  url,
+} from '@angular-devkit/schematics';
+import {
+  DeclarationOptions,
+  ModuleDeclarator,
+} from '../../utils/module.declarator';
+import { ModuleFinder } from '../../utils/module.finder';
+import { Location, NameParser } from '../../utils/name.parser';
+import { mergeSourceRoot } from '../../utils/source-root.helpers';
+import { DEFAULT_LANGUAGE } from '../defaults';
+import { ControllerOptions } from './component.schema';
+
+const ELEMENT_METADATA = 'components';
+const ELEMENT_TYPE = 'component';
+
+export function main(options: ControllerOptions): Rule {
+  options = transform(options);
+  return (tree: Tree, context: SchematicContext) => {
+    return branchAndMerge(
+      chain([
+        mergeSourceRoot(options),
+        mergeWith(generate(options)),
+        addDeclarationToModule(options),
+      ]),
+    )(tree, context);
+  };
+}
+
+function transform(source: ControllerOptions): ControllerOptions {
+  const target: ControllerOptions = Object.assign({}, source);
+  target.metadata = ELEMENT_METADATA;
+  target.type = ELEMENT_TYPE;
+
+  const location: Location = new NameParser().parse(target);
+  target.name = strings.dasherize(location.name);
+  target.path = strings.dasherize(location.path);
+  target.language =
+    target.language !== undefined ? target.language : DEFAULT_LANGUAGE;
+
+  target.path = target.flat
+    ? target.path
+    : join(target.path as Path, target.name);
+  return target;
+}
+
+function generate(options: ControllerOptions) {
+  return (context: SchematicContext) =>
+    apply(url(join('./files' as Path, options.language)), [
+      options.spec ? noop() : filter(path => !path.endsWith('.spec.ts')),
+      template({
+        ...strings,
+        ...options,
+      }),
+      move(options.path),
+    ])(context);
+}
+
+function addDeclarationToModule(options: ControllerOptions): Rule {
+  return (tree: Tree) => {
+    if (options.skipImport !== undefined && options.skipImport) {
+      return tree;
+    }
+    options.module = new ModuleFinder(tree).find({
+      name: options.name,
+      path: options.path as Path,
+    });
+    if (!options.module) {
+      return tree;
+    }
+    const content = tree.read(options.module).toString();
+    const declarator: ModuleDeclarator = new ModuleDeclarator();
+    tree.overwrite(
+      options.module,
+      declarator.declare(content, options as DeclarationOptions),
+    );
+    return tree;
+  };
+}

package/lib/component/component.schema.d.ts

@@ -0,0 +1,44 @@
+import { Path } from '@angular-devkit/core';
+
+export interface ControllerOptions {
+  /**
+   * The name of the controller.
+   */
+  name: string;
+  /**
+   * The path to create the controller.
+   */
+  path?: string | Path;
+  /**
+   * The path to insert the controller declaration.
+   */
+  module?: Path;
+  /**
+   * Directive to insert declaration in module.
+   */
+  skipImport?: boolean;
+  /**
+   * Metadata name affected by declaration insertion.
+   */
+  metadata?: string;
+  /**
+   * Nest element type name
+   */
+  type?: string;
+  /**
+   * Application language.
+   */
+  language?: string;
+  /**
+   * The source root path
+   */
+  sourceRoot?: string;
+  /**
+   * Specifies if a spec file is generated.
+   */
+  spec?: boolean;
+  /**
+   * Flag to indicate if a directory is created.
+   */
+  flat?: boolean;
+}

package/lib/component/files/js/__name__.component.js

@@ -0,0 +1,56 @@
+import {
+  html,
+  Component,
+  async,
+  LitElement,
+  property,
+  OnInit,
+  OnDestroy,
+  OnUpdate,
+  queryAll
+} from '@rxdi/lit-html';
+import { timer } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { RouteParams } from '@rxdi/router';
+
+/**
+ * @customElement '<%= dasherize(name) %>-component'
+ */
+@Component({
+  selector: '<%= dasherize(name) %>-component',
+  template(this: <%= classify(name) %>Component) {
+    return html`
+      <header>
+        <h1>${this.name}</h1>
+      </header>
+      ${async(this.timer)} ${JSON.stringify(this.params)}
+      <div>
+        1
+      </div>
+      <div>
+        2
+      </div>
+    `;
+  }
+})
+export class <%= classify(name) %>Component extends LitElement implements OnInit, OnDestroy, OnUpdate {
+  @property() private name: string;
+
+  @RouteParams() private params: any;
+
+  @queryAll('div') private divs: HTMLElement[];
+
+  private timer = timer(1, 1000).pipe(map(v => v));
+
+  OnInit() {
+    console.log('<%= classify(name) %>Component component init');
+  }
+
+  OnDestroy() {
+    console.log('<%= classify(name) %>Component component destroyed');
+  }
+
+  OnUpdate() {
+    console.log('<%= classify(name) %>Component component updated');
+  }
+}

package/lib/component/files/js/__name__.component.spec.js

@@ -0,0 +1,31 @@
+import { Container, createTestBed } from '@rxdi/core';
+import { <%= classify(name) %>Component } from './<%= name %>.component';
+
+
+describe('<%= classify(name) %>Component', () => {
+  beforeAll(async () => {
+    await createTestBed({
+      components: [<%= classify(name) %>Component]
+    }).toPromise();
+  });
+
+  afterEach(() => {
+    // The jsdom instance is shared across test cases in a single file so reset the DOM
+    while (document.body.firstChild) {
+      document.body.removeChild(document.body.firstChild);
+    }
+  });
+
+  it('should be defined', done => {
+    expect(Container.has(<%= classify(name) %>Component)).toBeTruthy();
+    done();
+  });
+
+  it('displays greeting', () => {
+    const element = Container.get(<%= classify(name) %>Component);
+    element['render']();
+    document.body.appendChild(element);
+    const div = document.querySelector('<%= dasherize(name) %>-component');
+    expect(div.textContent).toBe('');
+  });
+});

package/lib/component/files/ts/__name__.component.spec.ts

@@ -0,0 +1,31 @@
+import { Container, createTestBed } from '@rxdi/core';
+import { <%= classify(name) %>Component } from './<%= name %>.component';
+
+
+describe('<%= classify(name) %>Component', () => {
+  beforeAll(async () => {
+    await createTestBed({
+      components: [<%= classify(name) %>Component]
+    }).toPromise();
+  });
+
+  afterEach(() => {
+    // The jsdom instance is shared across test cases in a single file so reset the DOM
+    while (document.body.firstChild) {
+      document.body.removeChild(document.body.firstChild);
+    }
+  });
+
+  it('should be defined', done => {
+    expect(Container.has(<%= classify(name) %>Component)).toBeTruthy();
+    done();
+  });
+
+  it('displays greeting', () => {
+    const element = Container.get(<%= classify(name) %>Component);
+    element['render']();
+    document.body.appendChild(element);
+    const div = document.querySelector('<%= dasherize(name) %>-component');
+    expect(div.textContent).toBe('');
+  });
+});

package/lib/component/files/ts/__name__.component.ts

@@ -0,0 +1,56 @@
+import {
+  html,
+  Component,
+  async,
+  LitElement,
+  property,
+  OnInit,
+  OnDestroy,
+  OnUpdate,
+  queryAll
+} from '@rxdi/lit-html';
+import { timer } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { RouteParams } from '@rxdi/router';
+
+/**
+ * @customElement '<%= dasherize(name) %>-component'
+ */
+@Component({
+  selector: '<%= dasherize(name) %>-component',
+  template(this: <%= classify(name) %>Component) {
+    return html`
+      <header>
+        <h1>${this.name}</h1>
+      </header>
+      ${async(this.timer)} ${JSON.stringify(this.params)}
+      <div>
+        1
+      </div>
+      <div>
+        2
+      </div>
+    `;
+  }
+})
+export class <%= classify(name) %>Component extends LitElement implements OnInit, OnDestroy, OnUpdate {
+  @property() private name: string;
+
+  @RouteParams() private params: any;
+
+  @queryAll('div') private divs: HTMLElement[];
+
+  private timer = timer(1, 1000).pipe(map(v => v));
+
+  OnInit() {
+    console.log('<%= classify(name) %>Component component init');
+  }
+
+  OnDestroy() {
+    console.log('<%= classify(name) %>Component component destroyed');
+  }
+
+  OnUpdate() {
+    console.log('<%= classify(name) %>Component component updated');
+  }
+}

package/lib/component/schema.json

@@ -0,0 +1,47 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "SchematicsNestController",
+  "title": "@rxdi/core Component Options Schema",
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "The name of the controller.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What name would you like to use for the controller?"
+    },
+    "path": {
+      "type": "string",
+      "format": "path",
+      "description": "The path to create the controller."
+    },
+    "language": {
+      "type": "string",
+      "description": "Nest controller language (ts/js)."
+    },
+    "sourceRoot": {
+      "type": "string",
+      "description": "Nest controller source root directory."
+    },
+    "skipImport": {
+      "description": "Flag to skip the module import.",
+      "default": false
+    },
+    "module": {
+      "type": "string",
+      "description": "Allows specification of the declaring module."
+    },
+    "flat": {
+      "default": false,
+      "description": "Flag to indicate if a directory is created."
+    },
+    "spec": {
+      "default": true,
+      "description": "Specifies if a spec file is generated."
+    }
+  },
+  "required": ["name"]
+}