@gapi/schematics 1.8.169 → 1.8.170

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

@@ -3,6 +3,7 @@ import {
   UnitTestTree,
 } from '@angular-devkit/schematics/testing';
 import * as path from 'path';
+
 import { ResolverOptions } from './resolver.schema';
 
 describe('Resolver Factory', () => {
@@ -18,12 +19,12 @@ describe('Resolver Factory', () => {
     const tree: UnitTestTree = runner.runSchematic('resolver', options);
     const files: string[] = tree.files;
     expect(
-      files.find(filename => filename === '/foo/foo.resolver.ts'),
+      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' +
+        "@Resolver('Foo')\n" +
         'export class FooResolver {}\n',
     );
   });
@@ -35,12 +36,12 @@ describe('Resolver Factory', () => {
     const tree: UnitTestTree = runner.runSchematic('resolver', options);
     const files: string[] = tree.files;
     expect(
-      files.find(filename => filename === '/bar/foo/foo.resolver.ts'),
+      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' +
+        "@Resolver('Foo')\n" +
         'export class FooResolver {}\n',
     );
   });
@@ -53,12 +54,12 @@ describe('Resolver Factory', () => {
     const tree: UnitTestTree = runner.runSchematic('resolver', options);
     const files: string[] = tree.files;
     expect(
-      files.find(filename => filename === '/baz/foo/foo.resolver.ts'),
+      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' +
+        "@Resolver('Foo')\n" +
         'export class FooResolver {}\n',
     );
   });
@@ -70,12 +71,12 @@ describe('Resolver Factory', () => {
     const tree: UnitTestTree = runner.runSchematic('resolver', options);
     const files: string[] = tree.files;
     expect(
-      files.find(filename => filename === '/foo-bar/foo-bar.resolver.ts'),
+      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' +
+        "@Resolver('FooBar')\n" +
         'export class FooBarResolver {}\n',
     );
   });
@@ -87,12 +88,12 @@ describe('Resolver Factory', () => {
     const tree: UnitTestTree = runner.runSchematic('resolver', options);
     const files: string[] = tree.files;
     expect(
-      files.find(filename => filename === '/bar-baz/foo/foo.resolver.ts'),
+      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' +
+        "@Resolver('Foo')\n" +
         'export class FooResolver {}\n',
     );
   });
@@ -105,12 +106,12 @@ describe('Resolver Factory', () => {
     const tree: UnitTestTree = runner.runSchematic('resolver', options);
     const files: string[] = tree.files;
     expect(
-      files.find(filename => filename === '/foo/foo.resolver.js'),
+      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' +
+        "@Resolver('Foo')\n" +
         'export class FooResolver {}\n',
     );
   });

package/src/lib/resolver/resolver.factory.ts

@@ -15,6 +15,7 @@ import {
   Tree,
   url,
 } from '@angular-devkit/schematics';
+
 import {
   DeclarationOptions,
   ModuleDeclarator,
@@ -60,7 +61,7 @@ function transform(options: ResolverOptions): ResolverOptions {
 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')),
+      options.spec ? noop() : filter((path) => !path.endsWith('.spec.ts')),
       template({
         ...strings,
         ...options,

package/src/lib/service/service.factory.test.ts

@@ -4,6 +4,7 @@ import {
   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';
@@ -22,10 +23,10 @@ describe('Service Factory', () => {
     const tree: UnitTestTree = runner.runSchematic('service', options);
     const files: string[] = tree.files;
     expect(
-      files.find(filename => filename === '/foo.service.ts'),
+      files.find((filename) => filename === '/foo.service.ts'),
     ).toBeDefined();
     expect(
-      files.find(filename => filename === '/foo.service.spec.ts'),
+      files.find((filename) => filename === '/foo.service.spec.ts'),
     ).toBeDefined();
     expect(tree.readContent('/foo.service.ts')).toEqual(
       "import { Injectable } from '@nestjs/common';\n" +
@@ -43,10 +44,10 @@ describe('Service Factory', () => {
     const tree: UnitTestTree = runner.runSchematic('service', options);
     const files: string[] = tree.files;
     expect(
-      files.find(filename => filename === '/bar/foo.service.ts'),
+      files.find((filename) => filename === '/bar/foo.service.ts'),
     ).toBeDefined();
     expect(
-      files.find(filename => filename === '/bar/foo.service.spec.ts'),
+      files.find((filename) => filename === '/bar/foo.service.spec.ts'),
     ).toBeDefined();
     expect(tree.readContent('/bar/foo.service.ts')).toEqual(
       "import { Injectable } from '@nestjs/common';\n" +
@@ -65,10 +66,10 @@ describe('Service Factory', () => {
     const tree: UnitTestTree = runner.runSchematic('service', options);
     const files: string[] = tree.files;
     expect(
-      files.find(filename => filename === '/bar/foo.service.ts'),
+      files.find((filename) => filename === '/bar/foo.service.ts'),
     ).toBeDefined();
     expect(
-      files.find(filename => filename === '/bar/foo.service.spec.ts'),
+      files.find((filename) => filename === '/bar/foo.service.spec.ts'),
     ).toBeDefined();
     expect(tree.readContent('/bar/foo.service.ts')).toEqual(
       "import { Injectable } from '@nestjs/common';\n" +
@@ -86,7 +87,7 @@ describe('Service Factory', () => {
     const tree: UnitTestTree = runner.runSchematic('service', options);
     const files: string[] = tree.files;
     expect(
-      files.find(filename => filename === '/foo-bar.service.ts'),
+      files.find((filename) => filename === '/foo-bar.service.ts'),
     ).toBeDefined();
     expect(tree.readContent('/foo-bar.service.ts')).toEqual(
       "import { Injectable } from '@nestjs/common';\n" +
@@ -104,10 +105,10 @@ describe('Service Factory', () => {
     const tree: UnitTestTree = runner.runSchematic('service', options);
     const files: string[] = tree.files;
     expect(
-      files.find(filename => filename === '/bar-baz/foo.service.ts'),
+      files.find((filename) => filename === '/bar-baz/foo.service.ts'),
     ).toBeDefined();
     expect(
-      files.find(filename => filename === '/bar-baz/foo.service.spec.ts'),
+      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" +
@@ -126,10 +127,10 @@ describe('Service Factory', () => {
     const tree: UnitTestTree = runner.runSchematic('service', options);
     const files: string[] = tree.files;
     expect(
-      files.find(filename => filename === '/foo.service.js'),
+      files.find((filename) => filename === '/foo.service.js'),
     ).toBeDefined();
     expect(
-      files.find(filename => filename === '/foo.service.spec.js'),
+      files.find((filename) => filename === '/foo.service.spec.js'),
     ).toBeDefined();
     expect(tree.readContent('/foo.service.js')).toEqual(
       "import { Injectable } from '@nestjs/common';\n" +

package/src/lib/service/service.factory.ts

@@ -14,7 +14,7 @@ import {
   Tree,
   url,
 } from '@angular-devkit/schematics';
-import { isNullOrUndefined } from 'util';
+
 import {
   DeclarationOptions,
   ModuleDeclarator,
@@ -42,7 +42,7 @@ function transform(source: ServiceOptions): ServiceOptions {
   target.metadata = 'providers';
   target.type = 'service';
 
-  if (isNullOrUndefined(target.name)) {
+  if (target.name === null || target.name === undefined) {
     throw new SchematicsException('Option (name) is required.');
   }
   const location: Location = new NameParser().parse(target);
@@ -59,7 +59,7 @@ function transform(source: ServiceOptions): ServiceOptions {
 function generate(options: ServiceOptions) {
   return (context: SchematicContext) =>
     apply(url(join('./files' as Path, options.language)), [
-      options.spec ? noop() : filter(path => !path.endsWith('.spec.ts')),
+      options.spec ? noop() : filter((path) => !path.endsWith('.spec.ts')),
       template({
         ...strings,
         ...options,

package/src/lib/type/type.factory.d.ts

@@ -1,3 +1,4 @@
 import { Rule } from '@angular-devkit/schematics';
+
 import { ControllerOptions } from './controller.schema';
 export declare function main(options: ControllerOptions): Rule;

package/src/lib/type/type.factory.test.ts

@@ -4,6 +4,7 @@ import {
   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';
@@ -24,10 +25,10 @@ describe('Controller Factory', () => {
     const files: string[] = tree.files;
 
     expect(
-      files.find(filename => filename === '/foo/foo.controller.ts'),
+      files.find((filename) => filename === '/foo/foo.controller.ts'),
     ).toBeDefined();
     expect(
-      files.find(filename => filename === '/foo/foo.controller.spec.ts'),
+      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" +
@@ -44,10 +45,10 @@ describe('Controller Factory', () => {
     const tree: UnitTestTree = runner.runSchematic('controller', options);
     const files: string[] = tree.files;
     expect(
-      files.find(filename => filename === '/bar/foo/foo.controller.ts'),
+      files.find((filename) => filename === '/bar/foo/foo.controller.ts'),
     ).toBeDefined();
     expect(
-      files.find(filename => filename === '/bar/foo/foo.controller.spec.ts'),
+      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" +
@@ -65,10 +66,10 @@ describe('Controller Factory', () => {
     const tree: UnitTestTree = runner.runSchematic('controller', options);
     const files: string[] = tree.files;
     expect(
-      files.find(filename => filename === '/bar/foo/foo.controller.ts'),
+      files.find((filename) => filename === '/bar/foo/foo.controller.ts'),
     ).toBeDefined();
     expect(
-      files.find(filename => filename === '/bar/foo/foo.controller.spec.ts'),
+      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" +
@@ -85,11 +86,11 @@ describe('Controller Factory', () => {
     const tree: UnitTestTree = runner.runSchematic('controller', options);
     const files: string[] = tree.files;
     expect(
-      files.find(filename => filename === '/foo-bar/foo-bar.controller.ts'),
+      files.find((filename) => filename === '/foo-bar/foo-bar.controller.ts'),
     ).toBeDefined();
     expect(
       files.find(
-        filename => filename === '/foo-bar/foo-bar.controller.spec.ts',
+        (filename) => filename === '/foo-bar/foo-bar.controller.spec.ts',
       ),
     ).toBeDefined();
     expect(tree.readContent('/foo-bar/foo-bar.controller.ts')).toEqual(
@@ -107,11 +108,11 @@ describe('Controller Factory', () => {
     const tree: UnitTestTree = runner.runSchematic('controller', options);
     const files: string[] = tree.files;
     expect(
-      files.find(filename => filename === '/bar-baz/foo/foo.controller.ts'),
+      files.find((filename) => filename === '/bar-baz/foo/foo.controller.ts'),
     ).toBeDefined();
     expect(
       files.find(
-        filename => filename === '/bar-baz/foo/foo.controller.spec.ts',
+        (filename) => filename === '/bar-baz/foo/foo.controller.spec.ts',
       ),
     ).toBeDefined();
     expect(tree.readContent('/bar-baz/foo/foo.controller.ts')).toEqual(
@@ -130,10 +131,10 @@ describe('Controller Factory', () => {
     const tree: UnitTestTree = runner.runSchematic('controller', options);
     const files: string[] = tree.files;
     expect(
-      files.find(filename => filename === '/foo/foo.controller.js'),
+      files.find((filename) => filename === '/foo/foo.controller.js'),
     ).toBeDefined();
     expect(
-      files.find(filename => filename === '/foo/foo.controller.spec.js'),
+      files.find((filename) => filename === '/foo/foo.controller.spec.js'),
     ).toBeDefined();
     expect(tree.readContent('/foo/foo.controller.js')).toEqual(
       "import { Controller } from '@nestjs/common';\n" +

package/src/lib/type/type.factory.ts

@@ -13,6 +13,7 @@ import {
   Tree,
   url,
 } from '@angular-devkit/schematics';
+
 import {
   DeclarationOptions,
   ModuleDeclarator,
@@ -59,7 +60,7 @@ function transform(source: ControllerOptions): ControllerOptions {
 function generate(options: ControllerOptions) {
   return (context: SchematicContext) =>
     apply(url(join('./files' as Path, options.language)), [
-      options.spec ? noop() : filter(path => !path.endsWith('.spec.ts')),
+      options.spec ? noop() : filter((path) => !path.endsWith('.spec.ts')),
       template({
         ...strings,
         ...options,

package/src/utils/metadata.manager.ts

@@ -15,6 +15,7 @@ import {
   StringLiteral,
   SyntaxKind,
 } from 'typescript';
+
 import { DeclarationOptions } from './module.declarator';
 
 export class MetadataManager {
@@ -30,10 +31,12 @@ export class MetadataManager {
       this.content,
       ScriptTarget.ES2017,
     );
-    const decoratorNodes: Node[] = this.getDecoratorMetadata(source, '@Module');
+    const decoratorNodes: Node[] = this.getDecoratorMetadata(source);
     const node: Node = decoratorNodes[0];
-    const matchingProperties: ObjectLiteralElement[] = (node as ObjectLiteralExpression).properties
-      .filter(prop => prop.kind === SyntaxKind.PropertyAssignment)
+    const matchingProperties: ObjectLiteralElement[] = (
+      node as ObjectLiteralExpression
+    ).properties
+      .filter((prop) => prop.kind === SyntaxKind.PropertyAssignment)
       .filter((prop: PropertyAssignment) => {
         const name = prop.name;
         switch (name.kind) {
@@ -78,20 +81,20 @@ export class MetadataManager {
     }
   }
 
-  private getDecoratorMetadata(source: SourceFile, identifier: string): Node[] {
+  private getDecoratorMetadata(source: SourceFile): Node[] {
     return this.getSourceNodes(source)
       .filter(
-        node =>
+        (node) =>
           node.kind === SyntaxKind.Decorator &&
           (node as Decorator).expression.kind === SyntaxKind.CallExpression,
       )
-      .map(node => (node as Decorator).expression as CallExpression)
+      .map((node) => (node as Decorator).expression as CallExpression)
       .filter(
-        expr =>
+        (expr) =>
           expr.arguments[0] &&
           expr.arguments[0].kind === SyntaxKind.ObjectLiteralExpression,
       )
-      .map(expr => expr.arguments[0] as ObjectLiteralExpression);
+      .map((expr) => expr.arguments[0] as ObjectLiteralExpression);
   }
 
   private getSourceNodes(sourceFile: SourceFile): Node[] {
@@ -165,8 +168,8 @@ export class MetadataManager {
       node = arrLiteral.elements;
     }
     if (Array.isArray(node)) {
-      const nodeArray = (node as {}) as Node[];
-      const symbolsArray = nodeArray.map(childNode =>
+      const nodeArray = node as never as Node[];
+      const symbolsArray = nodeArray.map((childNode) =>
         childNode.getText(source),
       );
       if (symbolsArray.includes(symbol)) {

package/src/utils/module-import.declarator.ts

@@ -1,4 +1,5 @@
 import { normalize, Path } from '@angular-devkit/core';
+
 import { DeclarationOptions } from './module.declarator';
 import { PathSolver } from './path.solver';
 
@@ -14,11 +15,11 @@ export class ModuleImportDeclarator {
   }
 
   private findImports(content: string): string[] {
-    return content.split('\n').filter(line => line.match(/import {/));
+    return content.split('\n').filter((line) => line.match(/import {/));
   }
 
   private findOtherLines(content: string, importLines: string[]) {
-    return content.split('\n').filter(line => importLines.indexOf(line) < 0);
+    return content.split('\n').filter((line) => importLines.indexOf(line) < 0);
   }
 
   private buildLineToInsert(options: DeclarationOptions): string {

package/src/utils/module.declarator.ts

@@ -1,5 +1,6 @@
 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';
 
@@ -12,6 +13,7 @@ export interface DeclarationOptions {
   symbol?: string;
   staticOptions?: {
     name: string;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     value: Record<string, any>;
   };
 }

package/src/utils/module.finder.ts

@@ -22,7 +22,7 @@ export class ModuleFinder {
     if (!directory) {
       return null;
     }
-    const moduleFilename: PathFragment = directory.subfiles.find(filename =>
+    const moduleFilename: PathFragment = directory.subfiles.find((filename) =>
       /\.module\.(t|j)s/.test(filename),
     );
     return moduleFilename !== undefined

package/src/utils/name.parser.ts

@@ -15,12 +15,11 @@ 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);
+    const namePath: string = dirname(
+      (options.path === undefined ? '' : options.path)
+        .concat('/')
+        .concat(options.name) as Path,
+    );
     return {
       name: nameWithoutPath,
       path: normalize('/'.concat(namePath)),

package/src/utils/path.solver.ts

@@ -9,9 +9,8 @@ export class PathSolver {
       dirname((placeholder + from) as Path),
       dirname((placeholder + to) as Path),
     );
-    return (relativeDir.startsWith('.')
-      ? relativeDir
-      : './' + relativeDir
+    return (
+      relativeDir.startsWith('.') ? relativeDir : './' + relativeDir
     ).concat(relativeDir.length === 0 ? basename(to) : '/' + basename(to));
   }
 }

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

@@ -1,5 +1,7 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { join, normalize } from '@angular-devkit/core';
 import { Rule, Tree } from '@angular-devkit/schematics';
+
 import { DEFAULT_PATH_NAME } from '../lib/defaults';
 
 export function isInRootDirectory(
@@ -7,11 +9,11 @@ export function isInRootDirectory(
   extraFiles: string[] = [],
 ): boolean {
   const files = ['nest-cli.json', 'nest.json'].concat(extraFiles || []);
-  return files.map(file => host.exists(file)).some(isPresent => isPresent);
+  return files.map((file) => host.exists(file)).some((isPresent) => isPresent);
 }
 
 export function mergeSourceRoot<
-  T extends { sourceRoot?: string; path?: string } = any
+  T extends { sourceRoot?: string; path?: string } = any,
 >(options: T): Rule {
   return (host: Tree) => {
     const isInRoot = isInRootDirectory(host, ['tsconfig.json', 'package.json']);