@rxdi/schematics 0.7.124 → 0.7.128

package/lib/resolver/resolver.factory.test.ts

@@ -0,0 +1,117 @@
+import {
+  SchematicTestRunner,
+  UnitTestTree,
+} from '@angular-devkit/schematics/testing';
+import * as path from 'path';
+import { ResolverOptions } from './resolver.schema';
+
+describe('Resolver Factory', () => {
+  const runner: SchematicTestRunner = new SchematicTestRunner(
+    '.',
+    path.join(process.cwd(), 'src/collection.json'),
+  );
+  it('should manage name only', () => {
+    const options: ResolverOptions = {
+      name: 'foo',
+      flat: false,
+    };
+    const tree: UnitTestTree = runner.runSchematic('resolver', options);
+    const files: string[] = tree.files;
+    expect(
+      files.find(filename => filename === '/foo/foo.resolver.ts'),
+    ).not.toBeUndefined();
+    expect(tree.readContent('/foo/foo.resolver.ts')).toEqual(
+      "import { Resolver } from '@nestjs/graphql';\n" +
+        '\n' +
+        '@Resolver(\'Foo\')\n' +
+        'export class FooResolver {}\n',
+    );
+  });
+  it('should manage name as a path', () => {
+    const options: ResolverOptions = {
+      name: 'bar/foo',
+      flat: false,
+    };
+    const tree: UnitTestTree = runner.runSchematic('resolver', options);
+    const files: string[] = tree.files;
+    expect(
+      files.find(filename => filename === '/bar/foo/foo.resolver.ts'),
+    ).not.toBeUndefined();
+    expect(tree.readContent('/bar/foo/foo.resolver.ts')).toEqual(
+      "import { Resolver } from '@nestjs/graphql';\n" +
+        '\n' +
+        '@Resolver(\'Foo\')\n' +
+        'export class FooResolver {}\n',
+    );
+  });
+  it('should manage name and path', () => {
+    const options: ResolverOptions = {
+      name: 'foo',
+      path: 'baz',
+      flat: false,
+    };
+    const tree: UnitTestTree = runner.runSchematic('resolver', options);
+    const files: string[] = tree.files;
+    expect(
+      files.find(filename => filename === '/baz/foo/foo.resolver.ts'),
+    ).not.toBeUndefined();
+    expect(tree.readContent('/baz/foo/foo.resolver.ts')).toEqual(
+      "import { Resolver } from '@nestjs/graphql';\n" +
+        '\n' +
+        '@Resolver(\'Foo\')\n' +
+        'export class FooResolver {}\n',
+    );
+  });
+  it('should manage name to dasherize', () => {
+    const options: ResolverOptions = {
+      name: 'fooBar',
+      flat: false,
+    };
+    const tree: UnitTestTree = runner.runSchematic('resolver', options);
+    const files: string[] = tree.files;
+    expect(
+      files.find(filename => filename === '/foo-bar/foo-bar.resolver.ts'),
+    ).not.toBeUndefined();
+    expect(tree.readContent('/foo-bar/foo-bar.resolver.ts')).toEqual(
+      "import { Resolver } from '@nestjs/graphql';\n" +
+        '\n' +
+        '@Resolver(\'FooBar\')\n' +
+        'export class FooBarResolver {}\n',
+    );
+  });
+  it('should manage path to dasherize', () => {
+    const options: ResolverOptions = {
+      name: 'barBaz/foo',
+      flat: false,
+    };
+    const tree: UnitTestTree = runner.runSchematic('resolver', options);
+    const files: string[] = tree.files;
+    expect(
+      files.find(filename => filename === '/bar-baz/foo/foo.resolver.ts'),
+    ).not.toBeUndefined();
+    expect(tree.readContent('/bar-baz/foo/foo.resolver.ts')).toEqual(
+      "import { Resolver } from '@nestjs/graphql';\n" +
+        '\n' +
+        '@Resolver(\'Foo\')\n' +
+        'export class FooResolver {}\n',
+    );
+  });
+  it('should manage javascript file', () => {
+    const options: ResolverOptions = {
+      name: 'foo',
+      language: 'js',
+      flat: false,
+    };
+    const tree: UnitTestTree = runner.runSchematic('resolver', options);
+    const files: string[] = tree.files;
+    expect(
+      files.find(filename => filename === '/foo/foo.resolver.js'),
+    ).not.toBeUndefined();
+    expect(tree.readContent('/foo/foo.resolver.js')).toEqual(
+      "import { Resolver } from '@nestjs/graphql';\n" +
+        '\n' +
+        '@Resolver(\'Foo\')\n' +
+        'export class FooResolver {}\n',
+    );
+  });
+});

package/lib/resolver/resolver.factory.ts

@@ -0,0 +1,92 @@
+import { join, Path, strings } from '@angular-devkit/core';
+import {
+  apply,
+  branchAndMerge,
+  chain,
+  filter,
+  mergeWith,
+  move,
+  noop,
+  Rule,
+  SchematicContext,
+  SchematicsException,
+  Source,
+  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 { ProviderOptions } from '../provider/provider.schema';
+import { ResolverOptions } from './resolver.schema';
+
+export function main(options: ResolverOptions): Rule {
+  options = transform(options);
+  return (tree: Tree, context: SchematicContext) => {
+    return branchAndMerge(
+      chain([
+        mergeSourceRoot(options),
+        addDeclarationToModule(options),
+        mergeWith(generate(options)),
+      ]),
+    )(tree, context);
+  };
+}
+
+function transform(options: ResolverOptions): ResolverOptions {
+  const target: ResolverOptions = Object.assign({}, options);
+  if (!target.name) {
+    throw new SchematicsException('Option (name) is required.');
+  }
+  target.metadata = 'providers';
+  target.type = 'resolver';
+
+  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 : 'ts';
+
+  target.path = target.flat
+    ? target.path
+    : join(target.path as Path, target.name);
+  return target;
+}
+
+function generate(options: ResolverOptions): Source {
+  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: ProviderOptions): 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/resolver/resolver.schema.d.ts

@@ -0,0 +1,36 @@
+import { Path } from '@angular-devkit/core';
+
+export interface ResolverOptions {
+  /**
+   * The name of the resolver.
+   */
+  name: string;
+  /**
+   * The path to create the resolver.
+   */
+  path?: string | Path;
+  /**
+   * 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;
+  /**
+   * Metadata name affected by declaration insertion.
+   */
+  metadata?: string;
+  /**
+   * Nest element type name
+   */
+  type?: string;
+}

package/lib/resolver/schema.json

@@ -0,0 +1,39 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "SchematicsNestResolver",
+  "title": "Nest Resolver Options Schema",
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "The name of the resolver.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What name would you like to use for the resolver?"
+    },
+    "path": {
+      "type": "string",
+      "format": "path",
+      "description": "The path to create the resolver."
+    },
+    "language": {
+      "type": "string",
+      "description": "Nest resolver language (ts/js)."
+    },
+    "sourceRoot": {
+      "type": "string",
+      "description": "Nest resolver source root directory."
+    },
+    "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"]
+}

package/lib/service/files/js/__name__.service.js

@@ -0,0 +1,4 @@
+import { Injectable } from '@rxdi/core';
+
+@Injectable()
+export class <%= classify(name) %>Service {}

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

@@ -0,0 +1,17 @@
+import 'jest';
+import { Container, createTestBed } from '@gapi/core';
+import { <%= classify(name) %>Service } from './<%= name %>.service';
+
+describe('<%= classify(name) %> Service', () => {
+  beforeAll(async () => {
+    await createTestBed({
+      imports: [],
+      providers: [<%= classify(name) %>Service]
+    }).toPromise();
+  });
+
+  it('should be defined', done => {
+    expect(Container.has(<%= classify(name) %>Service)).toBeTruthy();
+    done();
+  });
+});

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

@@ -0,0 +1,17 @@
+import 'jest';
+import { Container, createTestBed } from '@gapi/core';
+import { <%= classify(name) %>Service } from './<%= name %>.service';
+
+describe('<%= classify(name) %> Service', () => {
+  beforeAll(async () => {
+    await createTestBed({
+      imports: [],
+      providers: [<%= classify(name) %>Service]
+    }).toPromise();
+  });
+
+  it('should be defined', done => {
+    expect(Container.has(<%= classify(name) %>Service)).toBeTruthy();
+    done();
+  });
+});

package/lib/service/files/ts/__name__.service.ts

@@ -0,0 +1,4 @@
+import { Injectable } from '@rxdi/core';
+
+@Injectable()
+export class <%= classify(name) %>Service {}

package/lib/service/schema.json

@@ -0,0 +1,39 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "SchematicsNestService",
+  "title": "Nest Service Options Schema",
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "The name of the service.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What name would you like to use for the service?"
+    },
+    "path": {
+      "type": "string",
+      "format": "path",
+      "description": "The path to create the service."
+    },
+    "language": {
+      "type": "string",
+      "description": "Nest service language (ts/js)."
+    },
+    "sourceRoot": {
+      "type": "string",
+      "description": "Nest service source root directory."
+    },
+    "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"]
+}

package/lib/service/service.factory.js

@@ -11,10 +11,10 @@ const source_root_helpers_1 = require("../../utils/source-root.helpers");
 function main(options) {
     options = transform(options);
     return (tree, context) => {
-        return schematics_1.branchAndMerge(schematics_1.chain([
-            source_root_helpers_1.mergeSourceRoot(options),
+        return (0, schematics_1.branchAndMerge)((0, schematics_1.chain)([
+            (0, source_root_helpers_1.mergeSourceRoot)(options),
             addDeclarationToModule(options),
-            schematics_1.mergeWith(generate(options)),
+            (0, schematics_1.mergeWith)(generate(options)),
         ]))(tree, context);
     };
 }
@@ -23,7 +23,7 @@ function transform(source) {
     const target = Object.assign({}, source);
     target.metadata = 'providers';
     target.type = 'service';
-    if (util_1.isNullOrUndefined(target.name)) {
+    if ((0, util_1.isNullOrUndefined)(target.name)) {
         throw new schematics_1.SchematicsException('Option (name) is required.');
     }
     const location = new name_parser_1.NameParser().parse(target);
@@ -32,14 +32,14 @@ function transform(source) {
     target.language = target.language !== undefined ? target.language : 'ts';
     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/service/service.factory.test.ts

@@ -0,0 +1,190 @@
+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 { ServiceOptions } from './service.schema';
+
+describe('Service Factory', () => {
+  const runner: SchematicTestRunner = new SchematicTestRunner(
+    '.',
+    path.join(process.cwd(), 'src/collection.json'),
+  );
+  it('should manage name only', () => {
+    const options: ServiceOptions = {
+      name: 'foo',
+      skipImport: true,
+      flat: true,
+    };
+    const tree: UnitTestTree = runner.runSchematic('service', options);
+    const files: string[] = tree.files;
+    expect(
+      files.find(filename => filename === '/foo.service.ts'),
+    ).toBeDefined();
+    expect(
+      files.find(filename => filename === '/foo.service.spec.ts'),
+    ).toBeDefined();
+    expect(tree.readContent('/foo.service.ts')).toEqual(
+      "import { Injectable } from '@nestjs/common';\n" +
+        '\n' +
+        '@Injectable()\n' +
+        'export class FooService {}\n',
+    );
+  });
+  it('should manage name as a path', () => {
+    const options: ServiceOptions = {
+      name: 'bar/foo',
+      skipImport: true,
+      flat: true,
+    };
+    const tree: UnitTestTree = runner.runSchematic('service', options);
+    const files: string[] = tree.files;
+    expect(
+      files.find(filename => filename === '/bar/foo.service.ts'),
+    ).toBeDefined();
+    expect(
+      files.find(filename => filename === '/bar/foo.service.spec.ts'),
+    ).toBeDefined();
+    expect(tree.readContent('/bar/foo.service.ts')).toEqual(
+      "import { Injectable } from '@nestjs/common';\n" +
+        '\n' +
+        '@Injectable()\n' +
+        'export class FooService {}\n',
+    );
+  });
+  it('should manage name and path', () => {
+    const options: ServiceOptions = {
+      name: 'foo',
+      path: 'bar',
+      skipImport: true,
+      flat: true,
+    };
+    const tree: UnitTestTree = runner.runSchematic('service', options);
+    const files: string[] = tree.files;
+    expect(
+      files.find(filename => filename === '/bar/foo.service.ts'),
+    ).toBeDefined();
+    expect(
+      files.find(filename => filename === '/bar/foo.service.spec.ts'),
+    ).toBeDefined();
+    expect(tree.readContent('/bar/foo.service.ts')).toEqual(
+      "import { Injectable } from '@nestjs/common';\n" +
+        '\n' +
+        '@Injectable()\n' +
+        'export class FooService {}\n',
+    );
+  });
+  it('should manage name to dasherize', () => {
+    const options: ServiceOptions = {
+      name: 'fooBar',
+      skipImport: true,
+      flat: true,
+    };
+    const tree: UnitTestTree = runner.runSchematic('service', options);
+    const files: string[] = tree.files;
+    expect(
+      files.find(filename => filename === '/foo-bar.service.ts'),
+    ).toBeDefined();
+    expect(tree.readContent('/foo-bar.service.ts')).toEqual(
+      "import { Injectable } from '@nestjs/common';\n" +
+        '\n' +
+        '@Injectable()\n' +
+        'export class FooBarService {}\n',
+    );
+  });
+  it('should manage path to dasherize', () => {
+    const options: ServiceOptions = {
+      name: 'barBaz/foo',
+      skipImport: true,
+      flat: true,
+    };
+    const tree: UnitTestTree = runner.runSchematic('service', options);
+    const files: string[] = tree.files;
+    expect(
+      files.find(filename => filename === '/bar-baz/foo.service.ts'),
+    ).toBeDefined();
+    expect(
+      files.find(filename => filename === '/bar-baz/foo.service.spec.ts'),
+    ).toBeDefined();
+    expect(tree.readContent('/bar-baz/foo.service.ts')).toEqual(
+      "import { Injectable } from '@nestjs/common';\n" +
+        '\n' +
+        '@Injectable()\n' +
+        'export class FooService {}\n',
+    );
+  });
+  it('should manage javascript file', () => {
+    const options: ServiceOptions = {
+      name: 'foo',
+      skipImport: true,
+      language: 'js',
+      flat: true,
+    };
+    const tree: UnitTestTree = runner.runSchematic('service', options);
+    const files: string[] = tree.files;
+    expect(
+      files.find(filename => filename === '/foo.service.js'),
+    ).toBeDefined();
+    expect(
+      files.find(filename => filename === '/foo.service.spec.js'),
+    ).toBeDefined();
+    expect(tree.readContent('/foo.service.js')).toEqual(
+      "import { Injectable } from '@nestjs/common';\n" +
+        '\n' +
+        '@Injectable()\n' +
+        'export class FooService {}\n',
+    );
+  });
+  it('should manage declaration in app module', () => {
+    const app: ApplicationOptions = {
+      name: '',
+    };
+    let tree: UnitTestTree = runner.runSchematic('application', app);
+    const options: ServiceOptions = {
+      name: 'foo',
+      flat: true,
+    };
+    tree = runner.runSchematic('service', 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 { FooService } from './foo.service';\n" +
+        '\n' +
+        '@Module({\n' +
+        '  imports: [],\n' +
+        '  controllers: [AppController],\n' +
+        '  providers: [AppService, FooService],\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: ServiceOptions = {
+      name: 'foo',
+      path: 'foo',
+      flat: true,
+    };
+    tree = runner.runSchematic('service', options, tree);
+    expect(tree.readContent(normalize('/src/foo/foo.module.ts'))).toEqual(
+      "import { Module } from '@nestjs/common';\n" +
+        "import { FooService } from './foo.service';\n" +
+        '\n' +
+        '@Module({\n' +
+        '  providers: [FooService]\n' +
+        '})\n' +
+        'export class FooModule {}\n',
+    );
+  });
+});