@rxdi/schematics 0.7.124 → 0.7.128

package/lib/configuration/configuration.factory.js

@@ -5,7 +5,7 @@ const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const defaults_1 = require("../defaults");
 function main(options) {
-    return schematics_1.mergeWith(generate(transform(options)));
+    return (0, schematics_1.mergeWith)(generate(transform(options)));
 }
 exports.main = main;
 function transform(options) {
@@ -17,8 +17,8 @@ function transform(options) {
     return target;
 }
 function generate(options) {
-    return schematics_1.apply(schematics_1.url(core_1.join('./files', options.language)), [
-        schematics_1.template(Object.assign(Object.assign({}, core_1.strings), options)),
-        schematics_1.move(options.project),
+    return (0, schematics_1.apply)((0, schematics_1.url)((0, core_1.join)('./files', options.language)), [
+        (0, schematics_1.template)(Object.assign(Object.assign({}, core_1.strings), options)),
+        (0, schematics_1.move)(options.project),
     ]);
 }

package/lib/configuration/configuration.factory.test.ts

@@ -0,0 +1,60 @@
+import {
+  SchematicTestRunner,
+  UnitTestTree,
+} from '@angular-devkit/schematics/testing';
+import * as path from 'path';
+import { ConfigurationOptions } from './configuration.schema';
+
+describe('Configuration Factory', () => {
+  const runner: SchematicTestRunner = new SchematicTestRunner(
+    '.',
+    path.join(process.cwd(), 'src/collection.json'),
+  );
+  it('should manage a default configuation', () => {
+    const options: ConfigurationOptions = {
+      project: 'project',
+    };
+    const tree: UnitTestTree = runner.runSchematic('configuration', options);
+    const files: string[] = tree.files;
+    expect(
+      files.find(filename => filename === '/project/nest-cli.json'),
+    ).not.toBeUndefined();
+    expect(JSON.parse(tree.readContent('/project/nest-cli.json'))).toEqual({
+      language: 'ts',
+      collection: '@nestjs/schematics',
+      sourceRoot: 'src',
+    });
+  });
+  it('should manage provided language input', () => {
+    const options: ConfigurationOptions = {
+      project: 'project',
+      language: 'js',
+    };
+    const tree: UnitTestTree = runner.runSchematic('configuration', options);
+    const files: string[] = tree.files;
+    expect(
+      files.find(filename => filename === '/project/nest-cli.json'),
+    ).not.toBeUndefined();
+    expect(JSON.parse(tree.readContent('/project/nest-cli.json'))).toEqual({
+      language: 'js',
+      collection: '@nestjs/schematics',
+      sourceRoot: 'src',
+    });
+  });
+  it('should manage provided collection input', () => {
+    const options: ConfigurationOptions = {
+      project: 'project',
+      collection: 'foo',
+    };
+    const tree: UnitTestTree = runner.runSchematic('configuration', options);
+    const files: string[] = tree.files;
+    expect(
+      files.find(filename => filename === '/project/nest-cli.json'),
+    ).not.toBeUndefined();
+    expect(JSON.parse(tree.readContent('/project/nest-cli.json'))).toEqual({
+      language: 'ts',
+      collection: 'foo',
+      sourceRoot: 'src',
+    });
+  });
+});

package/lib/configuration/configuration.factory.ts

@@ -0,0 +1,35 @@
+import { join, Path, strings } from '@angular-devkit/core';
+import {
+  apply,
+  mergeWith,
+  move,
+  Rule,
+  Source,
+  template,
+  url,
+} from '@angular-devkit/schematics';
+import { DEFAULT_LANGUAGE } from '../defaults';
+import { ConfigurationOptions } from './configuration.schema';
+
+export function main(options: ConfigurationOptions): Rule {
+  return mergeWith(generate(transform(options)));
+}
+
+function transform(options: ConfigurationOptions): ConfigurationOptions {
+  const target: ConfigurationOptions = Object.assign({}, options);
+  target.language =
+    target.language !== undefined ? target.language : DEFAULT_LANGUAGE;
+  target.collection =
+    target.collection !== undefined ? target.collection : '@nestjs/schematics';
+  return target;
+}
+
+function generate(options: ConfigurationOptions): Source {
+  return apply(url(join('./files' as Path, options.language)), [
+    template({
+      ...strings,
+      ...options,
+    }),
+    move(options.project),
+  ]);
+}

package/lib/configuration/configuration.schema.d.ts

@@ -0,0 +1,18 @@
+export interface ConfigurationOptions {
+  /**
+   * The project where generate the configuration.
+   */
+  project: string;
+  /**
+   * The language to use in configuration (ts | js).
+   */
+  language?: string;
+  /**
+   * The collection to use in the configuration
+   */
+  collection?: string;
+  /**
+   * The source root directory
+   */
+  sourceRoot?: string;
+}

package/lib/configuration/files/js/nest-cli.json

@@ -0,0 +1,5 @@
+{
+  "language": "<%= language %>",
+  "collection": "<%= collection %>",
+  "sourceRoot": "src"
+}

package/lib/configuration/files/ts/nest-cli.json

@@ -0,0 +1,5 @@
+{
+  "language": "<%= language %>",
+  "collection": "<%= collection %>",
+  "sourceRoot": "src"
+}

package/lib/controller/controller.factory.js

@@ -13,9 +13,9 @@ const ELEMENT_TYPE = 'controller';
 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/controller/controller.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 './controller.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 { Controller } from '@nestjs/common';\n" +
+        '\n' +
+        "@Controller('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/controller/controller.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 './controller.schema';
+
+const ELEMENT_METADATA = 'controllers';
+const ELEMENT_TYPE = 'controller';
+
+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/controller/controller.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/controller/files/js/__name__.controller.js

@@ -0,0 +1,24 @@
+import { Controller, GraphQLControllerOptions, Query, Type } from '@gapi/core';
+import { GraphQLObjectType, GraphQLString } from 'graphql';
+
+export const <%= classify(name) %>Type = new GraphQLObjectType({
+    name: '<%= classify(name) %>Type',
+    fields: {
+        init: {
+            type: GraphQLString
+        }
+    }
+});
+
+@Controller<GraphQLControllerOptions>({
+    guards: [],
+    type: []
+})
+export class <%= classify(name) %>Controller {
+
+    @Type(<%= classify(name) %>Type)
+    @Query()
+    initQuery() {
+        return {};
+    }
+}

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

@@ -0,0 +1,61 @@
+import 'jest';
+import { map } from 'rxjs/operators';
+import {
+  Container,
+  sendRequest,
+  createTestBed,
+  HapiModule,
+  GraphQLModule,
+  HAPI_SERVER,
+  setConfigServer,
+  setConfigGraphql
+} from '@gapi/core';
+import { Server } from 'hapi';
+import { from } from 'rxjs';
+import { <%= classify(name) %>Controller } from './<%= name %>.controller';
+
+describe('<%= classify(name) %> Controller', () => {
+  let server: Server;
+  beforeAll(async () => {
+    await createTestBed({
+      imports: [],
+      controllers: [<%= classify(name) %>Controller]
+    }, [
+        HapiModule.forRoot(setConfigServer()),
+        GraphQLModule.forRoot(setConfigGraphql())
+      ])
+      .toPromise();
+      server = Container.get<Server>(HAPI_SERVER);
+  });
+
+  afterAll(async () => await Container.get<Server>(HAPI_SERVER).stop());
+
+  it('e2e: queries => (initQuery) : Should sucessfully ....', async done => {
+    from(sendRequest<any>({
+      query: `
+        query initQuery {
+          initQuery {
+            init
+          }
+        }
+    `,
+      variables: {},
+      signiture: {
+        token: ''
+      }
+    })).pipe(
+      map(res => {
+        expect(res.success).toBeTruthy();
+        return res.data.initQuery;
+      }),
+    )
+      .subscribe(async res => {
+        expect(res.init).toBeFalsy();
+        done();
+      }, err => {
+        console.error(err);
+        expect(err).toBe(null);
+        done();
+      });
+  });
+});

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

@@ -0,0 +1,61 @@
+import 'jest';
+import { map } from 'rxjs/operators';
+import {
+  Container,
+  sendRequest,
+  createTestBed,
+  HapiModule,
+  GraphQLModule,
+  HAPI_SERVER,
+  setConfigServer,
+  setConfigGraphql
+} from '@gapi/core';
+import { Server } from 'hapi';
+import { from } from 'rxjs';
+import { <%= classify(name) %>Controller } from './<%= name %>.controller';
+
+describe('<%= classify(name) %> Controller', () => {
+  let server: Server;
+  beforeAll(async () => {
+    await createTestBed({
+      imports: [],
+      controllers: [<%= classify(name) %>Controller]
+    }, [
+        HapiModule.forRoot(setConfigServer()),
+        GraphQLModule.forRoot(setConfigGraphql())
+      ])
+      .toPromise();
+      server = Container.get<Server>(HAPI_SERVER);
+  });
+
+  afterAll(async () => await Container.get<Server>(HAPI_SERVER).stop());
+
+  it('e2e: queries => (initQuery) : Should sucessfully ....', async done => {
+    from(sendRequest<any>({
+      query: `
+        query initQuery {
+          initQuery {
+            init
+          }
+        }
+    `,
+      variables: {},
+      signiture: {
+        token: ''
+      }
+    })).pipe(
+      map(res => {
+        expect(res.success).toBeTruthy();
+        return res.data.initQuery;
+      }),
+    )
+      .subscribe(async res => {
+        expect(res.init).toBeFalsy();
+        done();
+      }, err => {
+        console.error(err);
+        expect(err).toBe(null);
+        done();
+      });
+  });
+});

package/lib/controller/files/ts/__name__.controller.ts

@@ -0,0 +1,24 @@
+import { Controller, GraphQLControllerOptions, Query, Type } from '@gapi/core';
+import { GraphQLObjectType, GraphQLString } from 'graphql';
+
+export const <%= classify(name) %>Type = new GraphQLObjectType({
+    name: '<%= classify(name) %>Type',
+    fields: {
+        init: {
+            type: GraphQLString
+        }
+    }
+});
+
+@Controller<GraphQLControllerOptions>({
+    guards: [],
+    type: []
+})
+export class <%= classify(name) %>Controller {
+
+    @Type(<%= classify(name) %>Type)
+    @Query()
+    initQuery() {
+        return {};
+    }
+}