@rxdi/schematics 0.7.124 → 0.7.128

package/lib/library/library.factory.test.ts

@@ -0,0 +1,68 @@
+import {
+  SchematicTestRunner,
+  UnitTestTree,
+} from '@angular-devkit/schematics/testing';
+import * as path from 'path';
+import { LibraryOptions } from './library.schema';
+
+describe('Library Factory', () => {
+  const runner: SchematicTestRunner = new SchematicTestRunner(
+    '.',
+    path.join(process.cwd(), 'src/collection.json'),
+  );
+  it('should manage name only', () => {
+    const options: LibraryOptions = {
+      name: 'project',
+      prefix: 'app',
+    };
+    const tree: UnitTestTree = runner.runSchematic('library', options);
+    const files: string[] = tree.files;
+    expect(files).toEqual([
+      '/libs/project/.gitignore',
+      '/libs/project/package.json',
+      '/libs/project/tsconfig.lib.json',
+      '/libs/project/tslint.json',
+      '/libs/project/src/index.ts',
+      '/libs/project/src/project.module.ts',
+      '/libs/project/src/project.service.spec.ts',
+      '/libs/project/src/project.service.ts',
+    ]);
+  });
+  it('should manage name to dasherize', () => {
+    const options: LibraryOptions = {
+      name: 'awesomeProject',
+      prefix: 'app',
+    };
+    const tree: UnitTestTree = runner.runSchematic('library', options);
+    const files: string[] = tree.files;
+    expect(files).toEqual([
+      '/libs/awesome-project/.gitignore',
+      '/libs/awesome-project/package.json',
+      '/libs/awesome-project/tsconfig.lib.json',
+      '/libs/awesome-project/tslint.json',
+      '/libs/awesome-project/src/index.ts',
+      '/libs/awesome-project/src/awesome-project.module.ts',
+      '/libs/awesome-project/src/awesome-project.service.spec.ts',
+      '/libs/awesome-project/src/awesome-project.service.ts',
+    ]);
+  });
+  it('should manage javascript files', () => {
+    const options: LibraryOptions = {
+      name: 'project',
+      language: 'js',
+      prefix: 'app',
+    };
+    const tree: UnitTestTree = runner.runSchematic('library', options);
+    const files: string[] = tree.files;
+    expect(files).toEqual([
+      '/libs/project/.babelrc',
+      '/libs/project/.gitignore',
+      '/libs/project/jsconfig.json',
+      '/libs/project/package.json',
+      '/libs/project/src/index.js',
+      '/libs/project/src/project.module.js',
+      '/libs/project/src/project.service.js',
+      '/libs/project/src/project.service.spec.js',
+    ]);
+  });
+});

package/lib/library/library.factory.ts

@@ -0,0 +1,158 @@
+import {
+  join,
+  normalize,
+  parseJson,
+  Path,
+  strings,
+} from '@angular-devkit/core';
+import {
+  apply,
+  branchAndMerge,
+  chain,
+  mergeWith,
+  move,
+  Rule,
+  SchematicsException,
+  Source,
+  template,
+  Tree,
+  url,
+} from '@angular-devkit/schematics';
+import { DEFAULT_LANGUAGE, DEFAULT_LIB_PATH } from '../defaults';
+import { LibraryOptions } from './library.schema';
+
+type UpdateJsonFn<T> = (obj: T) => T | void;
+interface TsConfigPartialType {
+  compilerOptions: {
+    baseUrl: string;
+    paths: {
+      [key: string]: string[];
+    };
+  };
+}
+
+export function main(options: LibraryOptions): Rule {
+  options = transform(options);
+  return chain([
+    updateTsConfig(options.name, options.prefix, options.path),
+    addLibraryToCliOptions(options.path, options.name),
+    branchAndMerge(mergeWith(generate(options))),
+  ]);
+}
+
+function transform(options: LibraryOptions): LibraryOptions {
+  const target: LibraryOptions = Object.assign({}, options);
+  const defaultSourceRoot =
+    options.rootDir !== undefined ? options.rootDir : DEFAULT_LIB_PATH;
+
+  if (!target.name) {
+    throw new SchematicsException('Option (name) is required.');
+  }
+  target.language = !!target.language ? target.language : DEFAULT_LANGUAGE;
+  target.name = strings.dasherize(target.name);
+  target.path =
+    target.path !== undefined
+      ? join(normalize(defaultSourceRoot), target.path)
+      : normalize(defaultSourceRoot);
+
+  target.prefix = target.prefix || '@app';
+  return target;
+}
+
+function updateJsonFile<T>(
+  host: Tree,
+  path: string,
+  callback: UpdateJsonFn<T>,
+): Tree {
+  const source = host.read(path);
+  if (source) {
+    const sourceText = source.toString('utf-8');
+    const json = parseJson(sourceText);
+    callback((json as {}) as T);
+    host.overwrite(path, JSON.stringify(json, null, 2));
+  }
+
+  return host;
+}
+
+function updateTsConfig(
+  packageName: string,
+  packagePrefix: string,
+  root: string,
+) {
+  return (host: Tree) => {
+    if (!host.exists('tsconfig.json')) {
+      return host;
+    }
+    const distRoot = join(root as Path, packageName, 'src');
+    const packageKey = packagePrefix
+      ? packagePrefix + '/' + packageName
+      : packageName;
+
+    return updateJsonFile(
+      host,
+      'tsconfig.json',
+      (tsconfig: TsConfigPartialType) => {
+        if (!tsconfig.compilerOptions) {
+          tsconfig.compilerOptions = {} as any;
+        }
+        if (!tsconfig.compilerOptions.baseUrl) {
+          tsconfig.compilerOptions.baseUrl = './';
+        }
+        if (!tsconfig.compilerOptions.paths) {
+          tsconfig.compilerOptions.paths = {};
+        }
+        if (!tsconfig.compilerOptions.paths[packageKey]) {
+          tsconfig.compilerOptions.paths[packageKey] = [];
+        }
+        tsconfig.compilerOptions.paths[packageKey].push(distRoot);
+
+        const deepPackagePath = packageKey + '/*';
+        if (!tsconfig.compilerOptions.paths[deepPackagePath]) {
+          tsconfig.compilerOptions.paths[deepPackagePath] = [];
+        }
+        tsconfig.compilerOptions.paths[deepPackagePath].push(distRoot + '/*');
+      },
+    );
+  };
+}
+
+function addLibraryToCliOptions(
+  projectRoot: string,
+  projectName: string,
+): Rule {
+  const project = {
+    root: join(projectRoot as Path, projectName),
+    sourceRoot: join(projectRoot as Path, projectName, 'src'),
+  };
+  return (host: Tree) => {
+    const nestCliFileExists = host.exists('nest-cli.json');
+    const nestFileExists = host.exists('nest.json');
+
+    if (!nestCliFileExists && !nestFileExists) {
+      return host;
+    }
+    return updateJsonFile(
+      host,
+      nestCliFileExists ? 'nest-cli.json' : 'nest.json',
+      (optionsFile: Record<string, any>) => {
+        if (!optionsFile.projects) {
+          optionsFile.projects = {} as any;
+        }
+        optionsFile.projects[projectName] = project;
+      },
+    );
+  };
+}
+
+function generate(options: LibraryOptions): Source {
+  const path = join(options.path as Path, options.name);
+
+  return apply(url(join('./files' as Path, options.language)), [
+    template({
+      ...strings,
+      ...options,
+    }),
+    move(path),
+  ]);
+}

package/lib/library/library.schema.d.ts

@@ -0,0 +1,24 @@
+import { Path } from '@angular-devkit/core';
+
+export interface LibraryOptions {
+  /**
+   * Nest library name.
+   */
+  name: string;
+  /**
+   * Prefix (scope)
+   */
+  prefix?: string;
+  /**
+   * Application language.
+   */
+  language?: string;
+  /**
+   * The path to create the library.
+   */
+  path?: string | Path;
+  /**
+   * The libraries root directory
+   */
+  rootDir?: string | Path;
+}

package/lib/library/schema.json

@@ -0,0 +1,37 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "SchematicsNestLibrary",
+  "title": "Nest Library Options Schema",
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "The name of the library.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What name would you like to use for the library?"
+    },
+    "prefix": {
+      "type": "string",
+      "description": "The prefix of the library.",
+      "x-prompt": "What prefix would you like to use for the library (default: @app)?"
+    },
+    "language": {
+      "type": "string",
+      "description": "Nest library language."
+    },
+    "path": {
+      "type": "string",
+      "format": "path",
+      "description": "The path to create the library."
+    },
+    "rootDir": {
+      "type": "string",
+      "format": "path",
+      "description": "The libraries root directory."
+    }
+  },
+  "required": ["name", "prefix"]
+}

package/lib/module/files/js/__name__.module.js

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

package/lib/module/files/ts/__name__.module.ts

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

package/lib/module/module.factory.js

@@ -10,10 +10,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);
     };
 }
@@ -24,14 +24,14 @@ function transform(source) {
     target.type = 'module';
     const location = new name_parser_1.NameParser().parse(target);
     target.name = core_1.strings.dasherize(location.name);
-    target.path = core_1.join(core_1.strings.dasherize(location.path), target.name);
+    target.path = (0, core_1.join)(core_1.strings.dasherize(location.path), target.name);
     target.language = target.language !== undefined ? target.language : 'ts';
     return target;
 }
 function generate(options) {
-    return (context) => 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.path),
+    return (context) => (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.path),
     ])(context);
 }
 function addDeclarationToModule(options) {

package/lib/module/module.factory.test.ts

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

package/lib/module/module.factory.ts

@@ -0,0 +1,79 @@
+import { join, Path, strings } from '@angular-devkit/core';
+import {
+  apply,
+  branchAndMerge,
+  chain,
+  mergeWith,
+  move,
+  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 { ModuleOptions } from './module.schema';
+
+export function main(options: ModuleOptions): Rule {
+  options = transform(options);
+  return (tree: Tree, context: SchematicContext) => {
+    return branchAndMerge(
+      chain([
+        mergeSourceRoot(options),
+        addDeclarationToModule(options),
+        mergeWith(generate(options)),
+      ]),
+    )(tree, context);
+  };
+}
+
+function transform(source: ModuleOptions): ModuleOptions {
+  const target: ModuleOptions = Object.assign({}, source);
+  target.metadata = 'imports';
+  target.type = 'module';
+
+  const location: Location = new NameParser().parse(target);
+  target.name = strings.dasherize(location.name);
+  target.path = join(strings.dasherize(location.path) as Path, target.name);
+  target.language = target.language !== undefined ? target.language : 'ts';
+  return target;
+}
+
+function generate(options: ModuleOptions) {
+  return (context: SchematicContext) =>
+    apply(url(join('./files' as Path, options.language)), [
+      template({
+        ...strings,
+        ...options,
+      }),
+      move(options.path),
+    ])(context);
+}
+
+function addDeclarationToModule(options: ModuleOptions): 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/module/module.schema.d.ts

@@ -0,0 +1,36 @@
+import { Path } from '@angular-devkit/core';
+
+export interface ModuleOptions {
+  /**
+   * The name of the module.
+   */
+  name: string;
+  /**
+   * The path to create the module.
+   */
+  path?: string;
+  /**
+   * The path to insert the module 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;
+}

package/lib/module/schema.json

@@ -0,0 +1,40 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "SchematicsNestModule",
+  "title": "Nest Module Options Schema",
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "The name of the module.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What name would you like to use for the module?"
+    },
+    "path": {
+      "type": "string",
+      "format": "path",
+      "description": "The path to create the module."
+    },
+    "module": {
+      "type": "string",
+      "format": "path",
+      "description": "The path to import the module."
+    },
+    "language": {
+      "type": "string",
+      "description": "Nest module language (ts/js)."
+    },
+    "sourceRoot": {
+      "type": "string",
+      "description": "Nest module source root directory."
+    },
+    "skipImport": {
+      "description": "Flag to skip the module import.",
+      "default": false
+    }
+  },
+  "required": ["name"]
+}

package/lib/pipe/files/js/__name__.pipe.js

@@ -0,0 +1,8 @@
+import { Injectable } from '@rxdi/core';
+
+@Injectable()
+export class <%= classify(name) %>Pipe {
+  transform(value) {
+    return value;
+  }
+}

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

@@ -0,0 +1,7 @@
+import { <%= classify(name) %>Pipe } from './<%= name %>.pipe';
+
+describe('<%= classify(name) %>Pipe', () => {
+  it('should be defined', () => {
+    expect(new <%= classify(name) %>Pipe()).toBeDefined();
+  });
+});

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

@@ -0,0 +1,7 @@
+import { <%= classify(name) %>Pipe } from './<%= name %>.pipe';
+
+describe('<%= classify(name) %>Pipe', () => {
+  it('should be defined', () => {
+    expect(new <%= classify(name) %>Pipe()).toBeDefined();
+  });
+});