@open-rlb/nestjs-amqp 1.0.13 → 1.0.15

package/schematics/utils/module.declarator.spec.ts

@@ -0,0 +1,52 @@
+import { normalize } from '@angular-devkit/core';
+import { DeclarationOptions, ModuleDeclarator } from './module.declarator';
+
+describe('Module Declarator', () => {
+  it('should add module declaration when declare', () => {
+    const content: string =
+      'import { Module } from \'@nestjs/common\';\n' +
+      '\n' +
+      '@Module({})\n' +
+      'export class FooModule {}\n';
+    const declarator = new ModuleDeclarator();
+    const options: DeclarationOptions = {
+      metadata: 'imports',
+      type: 'module',
+      name: 'bar',
+      path: normalize('/src/foo/bar'),
+      module: normalize('/src/foo/foo.module.ts')
+    };
+    expect(declarator.declare(content, options)).toEqual(
+      'import { Module } from \'@nestjs/common\';\n' +
+      'import { BarModule } from \'./bar/bar.module\';\n' +
+      '\n' +
+      '@Module({\n' +
+      '  imports: [BarModule]\n' +
+      '})\n' +
+      'export class FooModule {}\n'
+    );
+  });
+  it('should manage no type', () => {
+    const content: string =
+      'import { Module } from \'@nestjs/common\';\n' +
+      '\n' +
+      '@Module({})\n' +
+      'export class FooModule {}\n';
+    const declarator = new ModuleDeclarator();
+    const options: DeclarationOptions = {
+      metadata: 'providers',
+      name: 'foo',
+      path: normalize('/src/foo'),
+      module: normalize('/src/foo.ts')
+    };
+    expect(declarator.declare(content, options)).toEqual(
+      'import { Module } from \'@nestjs/common\';\n' +
+      'import { Foo } from \'./foo/foo\';\n' +
+      '\n' +
+      '@Module({\n' +
+      '  providers: [Foo]\n' +
+      '})\n' +
+      'export class FooModule {}\n'
+    );
+  });
+});

package/schematics/utils/module.declarator.ts

@@ -0,0 +1,44 @@
+import { Path } from '@angular-devkit/core';
+import { capitalize, classify } from '@angular-devkit/core/src/utils/strings';
+import { ModuleImportDeclarator } from './module-import.declarator';
+import { ModuleMetadataDeclarator } from './module-metadata.declarator';
+
+export interface DeclarationOptions {
+  metadata: string;
+  type?: string;
+  name: string;
+  className?: string;
+  path: Path;
+  module: Path;
+  symbol?: string;
+  staticOptions?: {
+    name: string;
+    value: Record<string, any>;
+  };
+}
+
+export class ModuleDeclarator {
+  constructor(
+    private imports: ModuleImportDeclarator = new ModuleImportDeclarator(),
+    private metadata: ModuleMetadataDeclarator = new ModuleMetadataDeclarator(),
+  ) {}
+
+  public declare(content: string, options: DeclarationOptions): string {
+    options = this.computeSymbol(options);
+    content = this.imports.declare(content, options);
+    content = this.metadata.declare(content, options);
+    return content;
+  }
+
+  private computeSymbol(options: DeclarationOptions): DeclarationOptions {
+    const target = Object.assign({}, options);
+    if (options.className) {
+      target.symbol = options.className;
+    } else if (options.type !== undefined) {
+      target.symbol = classify(options.name).concat(capitalize(options.type));
+    } else {
+      target.symbol = classify(options.name);
+    }
+    return target;
+  }
+}

package/schematics/utils/module.finder.d.ts

@@ -0,0 +1,13 @@
+import { Path } from '@angular-devkit/core';
+import { Tree } from '@angular-devkit/schematics';
+export interface FindOptions {
+    name?: string;
+    path: Path;
+    kind?: string;
+}
+export declare class ModuleFinder {
+    private tree;
+    constructor(tree: Tree);
+    find(options: FindOptions): Path | null;
+    private findIn;
+}

package/schematics/utils/module.finder.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModuleFinder = void 0;
+const core_1 = require("@angular-devkit/core");
+class ModuleFinder {
+    constructor(tree) {
+        this.tree = tree;
+    }
+    find(options) {
+        const generatedDirectoryPath = options.path;
+        const generatedDirectory = this.tree.getDir(generatedDirectoryPath);
+        return this.findIn(generatedDirectory);
+    }
+    findIn(directory) {
+        if (!directory) {
+            return null;
+        }
+        const moduleFilename = directory.subfiles.find(filename => /\.module\.(t|j)s$/.test(filename));
+        return moduleFilename !== undefined
+            ? (0, core_1.join)(directory.path, moduleFilename.valueOf())
+            : this.findIn(directory.parent);
+    }
+}
+exports.ModuleFinder = ModuleFinder;
+//# sourceMappingURL=module.finder.js.map

package/schematics/utils/module.finder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"module.finder.js","sourceRoot":"","sources":["../../../libs/rlb-nestjs-amqp/src/schematics/utils/module.finder.ts"],"names":[],"mappings":";;;AAAA,+CAAgE;AAShE,MAAa,YAAY;IACvB,YAAoB,IAAU;QAAV,SAAI,GAAJ,IAAI,CAAM;IAAG,CAAC;IAE3B,IAAI,CAAC,OAAoB;QAC9B,MAAM,sBAAsB,GAAS,OAAO,CAAC,IAAI,CAAC;QAClD,MAAM,kBAAkB,GAAa,IAAI,CAAC,IAAI,CAAC,MAAM,CACnD,sBAAsB,CACvB,CAAC;QACF,OAAO,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACzC,CAAC;IAEO,MAAM,CAAC,SAAmB;QAChC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,cAAc,GAAiB,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CACtE,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,CACnC,CAAC;QACF,OAAO,cAAc,KAAK,SAAS;YACjC,CAAC,CAAC,IAAA,WAAI,EAAC,SAAS,CAAC,IAAI,EAAE,cAAc,CAAC,OAAO,EAAE,CAAC;YAChD,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;CACF;AAtBD,oCAsBC"}

package/schematics/utils/module.finder.spec.ts

@@ -0,0 +1,59 @@
+import { normalize } from '@angular-devkit/core';
+import { EmptyTree } from '@angular-devkit/schematics';
+import { FindOptions, ModuleFinder } from './module.finder';
+
+describe('Module Finder', () => {
+  it('should return the app module path', () => {
+    const tree = new EmptyTree();
+    tree.create('/src/app.module.ts', 'app module content');
+    const finder = new ModuleFinder(tree);
+    const options: FindOptions = {
+      name: 'foo',
+      path: normalize('/src'),
+    };
+    expect(finder.find(options)).toEqual(normalize('/src/app.module.ts'));
+  });
+  it('should return the intermediate module path', () => {
+    const tree = new EmptyTree();
+    tree.create('/src/app.module.ts', 'app module content');
+    tree.create('/src/foo/foo.module.ts', 'foo module content');
+    const finder = new ModuleFinder(tree);
+    const options: FindOptions = {
+      name: 'name',
+      path: normalize('/src/foo'),
+    };
+    expect(finder.find(options)).toEqual(normalize('/src/foo/foo.module.ts'));
+  });
+  it('should manage javascript module file', () => {
+    const tree = new EmptyTree();
+    tree.create('/src/app.module.js', 'app module content');
+    const finder = new ModuleFinder(tree);
+    const options: FindOptions = {
+      name: 'foo',
+      path: normalize('/src'),
+    };
+    expect(finder.find(options)).toEqual(normalize('/src/app.module.js'));
+  });
+
+  it('should return null when directory does not exist', () => {
+    const tree = new EmptyTree();
+
+    const finder = new ModuleFinder(tree);
+    const options: FindOptions = {
+      name: 'foo',
+      path: normalize('/src'),
+    };
+    expect(finder.find(options)).toEqual(null);
+  });
+
+  it('should ignore vim swap files', () => {
+    const tree = new EmptyTree();
+    tree.create('/src/foo/foo.module.ts.swp', 'foo module content');
+    const finder = new ModuleFinder(tree);
+    const options: FindOptions = {
+      name: 'name',
+      path: normalize('/src/foo'),
+    };
+    expect(finder.find(options)).toEqual(null);
+  });
+});

package/schematics/utils/module.finder.ts

@@ -0,0 +1,32 @@
+import { join, Path, PathFragment } from '@angular-devkit/core';
+import { DirEntry, Tree } from '@angular-devkit/schematics';
+
+export interface FindOptions {
+  name?: string;
+  path: Path;
+  kind?: string;
+}
+
+export class ModuleFinder {
+  constructor(private tree: Tree) {}
+
+  public find(options: FindOptions): Path | null {
+    const generatedDirectoryPath: Path = options.path;
+    const generatedDirectory: DirEntry = this.tree.getDir(
+      generatedDirectoryPath,
+    );
+    return this.findIn(generatedDirectory);
+  }
+
+  private findIn(directory: DirEntry): Path | null {
+    if (!directory) {
+      return null;
+    }
+    const moduleFilename: PathFragment = directory.subfiles.find(filename =>
+      /\.module\.(t|j)s$/.test(filename),
+    );
+    return moduleFilename !== undefined
+      ? join(directory.path, moduleFilename.valueOf())
+      : this.findIn(directory.parent);
+  }
+}

package/schematics/utils/name.parser.d.ts

@@ -0,0 +1,12 @@
+import { Path } from '@angular-devkit/core';
+export interface ParseOptions {
+    name: string;
+    path?: string;
+}
+export interface Location {
+    name: string;
+    path: Path;
+}
+export declare class NameParser {
+    parse(options: ParseOptions): Location;
+}

package/schematics/utils/name.parser.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NameParser = void 0;
+const core_1 = require("@angular-devkit/core");
+class NameParser {
+    parse(options) {
+        const nameWithoutPath = (0, core_1.basename)(options.name);
+        const namePath = (0, core_1.dirname)((options.path === undefined ? '' : options.path)
+            .concat('/')
+            .concat(options.name));
+        return {
+            name: nameWithoutPath,
+            path: (0, core_1.normalize)('/'.concat(namePath)),
+        };
+    }
+}
+exports.NameParser = NameParser;
+//# sourceMappingURL=name.parser.js.map

package/schematics/utils/name.parser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"name.parser.js","sourceRoot":"","sources":["../../../libs/rlb-nestjs-amqp/src/schematics/utils/name.parser.ts"],"names":[],"mappings":";;;AAAA,+CAA0E;AAY1E,MAAa,UAAU;IACd,KAAK,CAAC,OAAqB;QAChC,MAAM,eAAe,GAAW,IAAA,eAAQ,EAAC,OAAO,CAAC,IAAY,CAAC,CAAC;QAC/D,MAAM,QAAQ,GAAW,IAAA,cAAO,EAC9B,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;aAC7C,MAAM,CAAC,GAAG,CAAC;aACX,MAAM,CAAC,OAAO,CAAC,IAAI,CAAS,CAChC,CAAC;QACF,OAAO;YACL,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE,IAAA,gBAAS,EAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;SACtC,CAAC;IACJ,CAAC;CACF;AAbD,gCAaC"}

package/schematics/utils/name.parser.spec.ts

@@ -0,0 +1,50 @@
+import { Location, NameParser, ParseOptions } from './name.parser';
+
+describe('Name Parser', () => {
+  let parser: NameParser;
+  beforeAll(() => parser = new NameParser());
+  it('should handle no path', () => {
+    const options: ParseOptions = {
+      name: 'foo'
+    };
+    const location: Location = parser.parse(options);
+    expect(location.name).toEqual('foo');
+    expect(location.path).toEqual('/');
+  });
+  it('should handle just the name', () => {
+    const options: ParseOptions = {
+      name: 'foo',
+      path: 'baz'
+    };
+    const location: Location = parser.parse(options);
+    expect(location.name).toEqual('foo');
+    expect(location.path).toEqual('/baz');
+  });
+  it('should handle name has a path (sub-dir)', () => {
+    const options: ParseOptions = {
+      name: 'bar/foo',
+      path: 'baz'
+    };
+    const location: Location = parser.parse(options);
+    expect(location.name).toEqual('foo');
+    expect(location.path).toEqual('/baz/bar');
+  });
+
+  it('should handle name has a higher path', () => {
+    const options: ParseOptions = {
+      name: '../foo',
+      path: 'bar/baz'
+    };
+    const location: Location = parser.parse(options);
+    expect(location.name).toEqual('foo');
+    expect(location.path).toEqual('/bar');
+  });
+
+  it('should handle name has a higher path above root', () => {
+    const options: ParseOptions = {
+      name: '../../../foo',
+      path: 'baz'
+    };
+    expect(() => parser.parse(options)).toThrow();
+  });
+});

package/schematics/utils/name.parser.ts

@@ -0,0 +1,26 @@
+import { basename, dirname, normalize, Path } from '@angular-devkit/core';
+
+export interface ParseOptions {
+  name: string;
+  path?: string;
+}
+
+export interface Location {
+  name: string;
+  path: Path;
+}
+
+export class NameParser {
+  public parse(options: ParseOptions): Location {
+    const nameWithoutPath: string = basename(options.name as Path);
+    const namePath: string = dirname(
+      (options.path === undefined ? '' : options.path)
+        .concat('/')
+        .concat(options.name) as Path,
+    );
+    return {
+      name: nameWithoutPath,
+      path: normalize('/'.concat(namePath)),
+    };
+  }
+}

package/schematics/utils/path.solver.d.ts

@@ -0,0 +1,4 @@
+import { Path } from '@angular-devkit/core';
+export declare class PathSolver {
+    relative(from: Path, to: Path): string;
+}

package/schematics/utils/path.solver.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PathSolver = void 0;
+const core_1 = require("@angular-devkit/core");
+class PathSolver {
+    relative(from, to) {
+        const placeholder = '/placeholder';
+        const relativeDir = (0, core_1.relative)((0, core_1.dirname)((placeholder + from)), (0, core_1.dirname)((placeholder + to)));
+        return (relativeDir.startsWith('.')
+            ? relativeDir
+            : './' + relativeDir).concat(relativeDir.length === 0 ? (0, core_1.basename)(to) : '/' + (0, core_1.basename)(to));
+    }
+}
+exports.PathSolver = PathSolver;
+//# sourceMappingURL=path.solver.js.map

package/schematics/utils/path.solver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"path.solver.js","sourceRoot":"","sources":["../../../libs/rlb-nestjs-amqp/src/schematics/utils/path.solver.ts"],"names":[],"mappings":";;;AAAA,+CAAyE;AAEzE,MAAa,UAAU;IACd,QAAQ,CAAC,IAAU,EAAE,EAAQ;QAClC,MAAM,WAAW,GAAG,cAAc,CAAC;QACnC,MAAM,WAAW,GAAG,IAAA,eAAQ,EAC1B,IAAA,cAAO,EAAC,CAAC,WAAW,GAAG,IAAI,CAAS,CAAC,EACrC,IAAA,cAAO,EAAC,CAAC,WAAW,GAAG,EAAE,CAAS,CAAC,CACpC,CAAC;QACF,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC;YACjC,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,IAAI,GAAG,WAAW,CACrB,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAA,eAAQ,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,IAAA,eAAQ,EAAC,EAAE,CAAC,CAAC,CAAC;IACzE,CAAC;CACF;AAZD,gCAYC"}

package/schematics/utils/path.solver.spec.ts

@@ -0,0 +1,11 @@
+import { normalize, Path } from '@angular-devkit/core';
+import { PathSolver } from './path.solver';
+
+describe('Path Solver', () => {
+  it('should relative path between path', () => {
+    const solver = new PathSolver();
+    const from: Path = normalize('/src/app.module.ts');
+    const to: Path = normalize('/src/foo/foo.module');
+    expect(solver.relative(from, to)).toEqual('./foo/foo.module');
+  });
+});

package/schematics/utils/path.solver.ts

@@ -0,0 +1,15 @@
+import { basename, dirname, Path, relative } from '@angular-devkit/core';
+
+export class PathSolver {
+  public relative(from: Path, to: Path): string {
+    const placeholder = '/placeholder';
+    const relativeDir = relative(
+      dirname((placeholder + from) as Path),
+      dirname((placeholder + to) as Path),
+    );
+    return (relativeDir.startsWith('.')
+      ? relativeDir
+      : './' + relativeDir
+    ).concat(relativeDir.length === 0 ? basename(to) : '/' + basename(to));
+  }
+}

package/schematics/utils/source-root.helpers.d.ts

@@ -0,0 +1,6 @@
+import { Rule, Tree } from '@angular-devkit/schematics';
+export declare function isInRootDirectory(host: Tree, extraFiles?: string[]): boolean;
+export declare function mergeSourceRoot<T extends {
+    sourceRoot?: string;
+    path?: string;
+} = any>(options: T): Rule;

package/schematics/utils/source-root.helpers.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isInRootDirectory = isInRootDirectory;
+exports.mergeSourceRoot = mergeSourceRoot;
+const core_1 = require("@angular-devkit/core");
+const defaults_1 = require("../defaults");
+function isInRootDirectory(host, extraFiles = []) {
+    const files = ['nest-cli.json', 'nest.json'].concat(extraFiles || []);
+    return files.map(file => host.exists(file)).some(isPresent => isPresent);
+}
+function mergeSourceRoot(options) {
+    return (host) => {
+        const isInRoot = isInRootDirectory(host, ['tsconfig.json', 'package.json']);
+        if (!isInRoot) {
+            return host;
+        }
+        const defaultSourceRoot = options.sourceRoot !== undefined ? options.sourceRoot : defaults_1.DEFAULT_PATH_NAME;
+        options.path =
+            options.path !== undefined
+                ? (0, core_1.join)((0, core_1.normalize)(defaultSourceRoot), options.path)
+                : (0, core_1.normalize)(defaultSourceRoot);
+        return host;
+    };
+}
+//# sourceMappingURL=source-root.helpers.js.map

package/schematics/utils/source-root.helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"source-root.helpers.js","sourceRoot":"","sources":["../../../libs/rlb-nestjs-amqp/src/schematics/utils/source-root.helpers.ts"],"names":[],"mappings":";;AAIA,8CAMC;AAED,0CAiBC;AA7BD,+CAAuD;AAEvD,0CAAgD;AAEhD,SAAgB,iBAAiB,CAC/B,IAAU,EACV,aAAuB,EAAE;IAEzB,MAAM,KAAK,GAAG,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;IACtE,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;AAC3E,CAAC;AAED,SAAgB,eAAe,CAE7B,OAAU;IACV,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,EAAE,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC;QAC5E,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,iBAAiB,GACrB,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,4BAAiB,CAAC;QAE5E,OAAO,CAAC,IAAI;YACV,OAAO,CAAC,IAAI,KAAK,SAAS;gBACxB,CAAC,CAAC,IAAA,WAAI,EAAC,IAAA,gBAAS,EAAC,iBAAiB,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC;gBAClD,CAAC,CAAC,IAAA,gBAAS,EAAC,iBAAiB,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}

package/schematics/utils/source-root.helpers.ts

@@ -0,0 +1,30 @@
+import { join, normalize } from '@angular-devkit/core';
+import { Rule, Tree } from '@angular-devkit/schematics';
+import { DEFAULT_PATH_NAME } from '../defaults';
+
+export function isInRootDirectory(
+  host: Tree,
+  extraFiles: string[] = [],
+): boolean {
+  const files = ['nest-cli.json', 'nest.json'].concat(extraFiles || []);
+  return files.map(file => host.exists(file)).some(isPresent => isPresent);
+}
+
+export function mergeSourceRoot<
+  T extends { sourceRoot?: string; path?: string } = any
+>(options: T): Rule {
+  return (host: Tree) => {
+    const isInRoot = isInRootDirectory(host, ['tsconfig.json', 'package.json']);
+    if (!isInRoot) {
+      return host;
+    }
+    const defaultSourceRoot =
+      options.sourceRoot !== undefined ? options.sourceRoot : DEFAULT_PATH_NAME;
+
+    options.path =
+      options.path !== undefined
+        ? join(normalize(defaultSourceRoot), options.path)
+        : normalize(defaultSourceRoot);
+    return host;
+  };
+}