chore: Fixed ESLint warnings

unlight · Apr 16, 2021 · 77aecd6 · 77aecd6
1 parent 34196b3
commit 77aecd6
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 28 deletions.
diff --git a/src/example/user/user-date.input.ts b/src/example/user/user-date.input.ts
@@ -1,4 +1,4 @@
-import { Field, GraphQLISODateTime, InputType, Int } from '@nestjs/graphql';
+import { Field, GraphQLISODateTime, InputType } from '@nestjs/graphql';
 
 @InputType()
 export class UserDateInput {

diff --git a/src/generate.ts b/src/generate.ts
@@ -70,6 +70,7 @@ export async function generate(
     const prismaClientDmmf: DMMF.Document = JSON.parse(
         JSON.stringify(
             args.prismaClientDmmf ??
+                // eslint-disable-next-line @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-member-access
                 (require(prismaClientOutput).dmmf as DMMF.Document),
         ),
     );

diff --git a/src/handlers/model-output-type.ts b/src/handlers/model-output-type.ts
@@ -19,6 +19,8 @@ import { ImportDeclarationMap } from '../helpers/import-declaration-map';
 import { propertyStructure } from '../helpers/property-structure';
 import { EventArguments, OutputType } from '../types';
 
+const nestjsGraphql = '@nestjs/graphql';
+
 export function modelOutputType(outputType: OutputType, args: EventArguments) {
     const {
         getSourceFile,
@@ -76,8 +78,8 @@ export function modelOutputType(outputType: OutputType, args: EventArguments) {
         ? [JSON5.stringify({ description: model.documentation })]
         : [];
 
-    importDeclarations.add('Field', '@nestjs/graphql');
-    importDeclarations.add('ObjectType', '@nestjs/graphql');
+    importDeclarations.add('Field', nestjsGraphql);
+    importDeclarations.add('ObjectType', nestjsGraphql);
 
     for (const field of outputType.fields) {
         // Do not generate already defined properties for model
@@ -156,7 +158,7 @@ export function modelOutputType(outputType: OutputType, args: EventArguments) {
         }
 
         if (settings?.hideOutput) {
-            importDeclarations.add('HideField', '@nestjs/graphql');
+            importDeclarations.add('HideField', nestjsGraphql);
             property.decorators?.push({ name: 'HideField', arguments: [] });
         } else {
             property.decorators?.push({

diff --git a/src/handlers/output-type.ts b/src/handlers/output-type.ts
@@ -8,6 +8,8 @@ import { ImportDeclarationMap } from '../helpers/import-declaration-map';
 import { propertyStructure } from '../helpers/property-structure';
 import { EventArguments, OutputType } from '../types';
 
+const nestjsGraphql = '@nestjs/graphql';
+
 export function outputType(outputType: OutputType, args: EventArguments) {
     const {
         getSourceFile,
@@ -51,8 +53,8 @@ export function outputType(outputType: OutputType, args: EventArguments) {
         properties: [],
     };
 
-    importDeclarations.add('Field', '@nestjs/graphql');
-    importDeclarations.add('ObjectType', '@nestjs/graphql');
+    importDeclarations.add('Field', nestjsGraphql);
+    importDeclarations.add('ObjectType', nestjsGraphql);
 
     for (const field of outputType.fields) {
         const { location, isList, type } = field.outputType;
@@ -108,7 +110,7 @@ export function outputType(outputType: OutputType, args: EventArguments) {
         }
 
         if (settings?.hideOutput) {
-            importDeclarations.add('HideField', '@nestjs/graphql');
+            importDeclarations.add('HideField', nestjsGraphql);
             property.decorators?.push({ name: 'HideField', arguments: [] });
         } else {
             // Generate `@Field()` decorator

diff --git a/src/helpers/field-settings.ts b/src/helpers/field-settings.ts
@@ -15,6 +15,7 @@ export type FieldSetting = {
     from: string;
     defaultImport?: string | true;
     namespaceImport?: string;
+    namespace?: string;
 };
 
 export class FieldSettings extends Array<FieldSetting> {
@@ -52,34 +53,16 @@ export function createFieldSettings(args: {
             input: false,
             output: false,
             from: '',
-            defaultImport: undefined,
-            namespaceImport: undefined,
         };
         if (name === 'TypeGraphQL.omit' || name === 'HideField') {
-            Object.assign(decorator, {
-                name: 'HideField',
-                arguments: [],
-                from: '@nestjs/graphql',
-                defaultImport: false,
-                namespaceImport: false,
-            });
-            if (match.groups?.args) {
-                if (/output:\s*true/.test(match.groups.args)) {
-                    decorator.output = true;
-                }
-                if (/input:\s*true/.test(match.groups.args)) {
-                    decorator.input = true;
-                }
-            } else {
-                decorator.output = true;
-            }
+            Object.assign(decorator, hideFieldDecorator(match));
         } else if (name === 'FieldType' && match.groups?.args) {
             let options = parseArgs(match.groups.args);
             if (typeof options === 'string') {
                 options = { name: options };
             }
             const namespace = getNamespace(options.name);
-            if (options.name.includes('.')) {
+            if ((options as { name: string }).name.includes('.')) {
                 decorator.namespaceImport = namespace;
             }
             merge(decorator, config.fields[namespace], options, { isFieldType: true });
@@ -104,7 +87,28 @@ export function createFieldSettings(args: {
     };
 }
 
-function parseArgs(string: string) {
+function hideFieldDecorator(match: RegExpExecArray) {
+    const result: Partial<FieldSetting> = {
+        name: 'HideField',
+        arguments: [],
+        from: '@nestjs/graphql',
+        defaultImport: undefined,
+        namespaceImport: undefined,
+    };
+    if (match.groups?.args) {
+        if (/output:\s*true/.test(match.groups.args)) {
+            result.output = true;
+        }
+        if (/input:\s*true/.test(match.groups.args)) {
+            result.input = true;
+        }
+    } else {
+        result.output = true;
+    }
+    return result;
+}
+
+function parseArgs(string: string): Record<string, unknown> | string {
     try {
         return JSON5.parse(string);
     } catch {