refactor: Moved some functions to utils

package.json

@@ -36,8 +36,8 @@
     "eslint:fix": "npm run eslint -- --fix",
     "build": "sh Taskfile bundle",
     "prisma:g": "node node_modules/@prisma/cli/build/index.js generate",
-    "prettier:format": "npx prettier src --write",
-    "regen": "rm -rf src/@generated && npm run prisma:g && npm run eslint:fix && npm run prettier:format",
+    "format": "npx prettier src --write",
+    "regen": "rm -rf src/@generated && npm run prisma:g && npm run eslint:fix && npm run format",
     "example": "ts-node-dev src/example/main.ts",
     "clean_cache": "rm -rf node_modules/.cache",
     "commit": "cz"

src/generate-class.ts

@@ -1,7 +1,7 @@
 import assert from 'assert';
 import { ClassDeclaration, Node, ObjectLiteralExpression, SourceFile } from 'ts-morph';
 
-import { generateGraphqlImport } from './generate-graphql-import';
+import { generateImport } from './generate-import';
 import { updateObjectProperty } from './utils';
 
 export type DecoratorPropertyType = {
@@ -21,7 +21,7 @@ type GenerateClassArgs = {
 export function generateClass(args: GenerateClassArgs) {
     const { name, sourceFile, decorator } = args;
 
-    generateGraphqlImport({
+    generateImport({
         name: decorator.name,
         sourceFile,
         moduleSpecifier: '@nestjs/graphql',

src/generate-enum/generate-enum.ts

@@ -7,7 +7,7 @@ import {
     SourceFile,
 } from 'ts-morph';
 
-import { generateGraphqlImport } from '../generate-graphql-import';
+import { generateImport } from '../generate-import';
 import { PrismaDMMF } from '../types';
 import { updateObjectProperty } from '../utils';
 
@@ -19,7 +19,7 @@ type GenerateEnumArgs = {
 export function generateEnum(args: GenerateEnumArgs) {
     const { enumerable, sourceFile } = args;
 
-    generateGraphqlImport({
+    generateImport({
         sourceFile,
         name: 'registerEnumType',
         moduleSpecifier: '@nestjs/graphql',

src/generate-project-import.ts → src/generate-import.ts

@@ -1,6 +1,39 @@
 import getRelativePath from 'get-relative-path';
 import { SourceFile } from 'ts-morph';
 
+type GenerateGraphqlImportArgs = {
+    name: string;
+    sourceFile: SourceFile;
+    moduleSpecifier: string | undefined;
+};
+
+export function generateImport(args: GenerateGraphqlImportArgs) {
+    const { moduleSpecifier, name, sourceFile } = args;
+    // console.log('name', name, moduleSpecifier);
+    if (!moduleSpecifier) {
+        return name;
+    }
+    let importDeclaration = sourceFile.getImportDeclaration(
+        (importDeclaration) =>
+            importDeclaration.getModuleSpecifier().getLiteralValue() === moduleSpecifier,
+    );
+    if (!importDeclaration) {
+        importDeclaration = sourceFile.addImportDeclaration({
+            moduleSpecifier,
+        });
+    }
+    let importSpecifier = importDeclaration
+        .getNamedImports()
+        .find((importSpecifier) => importSpecifier.getName() === name);
+
+    if (!importSpecifier) {
+        importSpecifier = importDeclaration.addNamedImport({
+            name,
+        });
+    }
+    return importSpecifier.getName();
+}
+
 type GenerateProjectImportArgs = {
     name: string;
     type: string;

src/generate-input/generate-input.ts

@@ -2,8 +2,7 @@ import { ClassDeclaration, SourceFile } from 'ts-morph';
 
 import { DecoratorPropertyType, generateClass, generateClassProperty } from '../generate-class';
 import { generateDecorator } from '../generate-decorator';
-import { generateGraphqlImport } from '../generate-graphql-import';
-import { generateProjectImport } from '../generate-project-import';
+import { generateImport, generateProjectImport } from '../generate-import';
 import { PrismaDMMF } from '../types';
 import { toGraphqlImportType, toPropertyType } from '../utils';
 import { getMatchingInputType } from './get-matching-input-type';
@@ -23,10 +22,12 @@ export function generateInput(args: GenerateInputArgs) {
         decorator,
         name: className,
     });
-    generateGraphqlImport({ name: 'Field', sourceFile, moduleSpecifier: '@nestjs/graphql' });
+    generateImport({ name: 'Field', sourceFile, moduleSpecifier: '@nestjs/graphql' });
     for (const field of inputType.fields) {
         const inputType = getMatchingInputType(field.inputTypes);
-        const propertyType = getPropertyType(field.inputTypes);
+        const propertyTypes = field.inputTypes.map((t) =>
+            toPropertyType({ ...t, type: String(t.type) }),
+        );
         // Additional import all objects
         const inputTypes = field.inputTypes.filter(
             (x) => ['object', 'enum'].includes(x.kind) && x.type !== className,
@@ -41,7 +42,7 @@ export function generateInput(args: GenerateInputArgs) {
         }
         generateInputProperty({
             inputType,
-            propertyType,
+            propertyTypes,
             classDeclaration,
             sourceFile,
             projectFilePath,
@@ -58,19 +59,31 @@ type GenerateInputPropertyArgs = {
     projectFilePath(data: { name: string; type: string }): string;
     className: string;
     classDeclaration: ClassDeclaration;
-    propertyType: string;
+    propertyTypes: string[];
 };
 
 function generateInputProperty(args: GenerateInputPropertyArgs) {
-    const { inputType, sourceFile, className, classDeclaration, projectFilePath } = args;
+    const {
+        inputType,
+        sourceFile,
+        className,
+        classDeclaration,
+        propertyTypes,
+        projectFilePath,
+    } = args;
     const propertyDeclaration = generateClassProperty({
         name: args.name,
-        type: args.propertyType,
+        type: propertyTypes.join(' | '),
         classDeclaration,
         isReadOnly: false,
         isRequired: false,
     });
-    let fieldType = getFieldType(inputType);
+    // TODO: Do import for custom typescript type
+    // if (propertyTypes.includes('Decimal')) {
+    //     generateImport({sourceFile, name: 'Decimal', moduleSpecifier: 'decimal.js'});
+    // }
+    // Get field type
+    let fieldType = String(inputType.type);
     if (inputType.kind === 'scalar') {
         const importType = toGraphqlImportType({
             kind: inputType.kind,
@@ -79,21 +92,14 @@ function generateInputProperty(args: GenerateInputPropertyArgs) {
         });
         // Override return field type value
         fieldType = importType.name;
-        generateGraphqlImport({
+        generateImport({
             sourceFile,
             ...importType,
         });
-    } else if (inputType.kind === 'object' && inputType.type !== className) {
-        generateProjectImport({
-            name: fieldType,
-            type: 'input',
-            sourceFile,
-            projectFilePath,
-        });
-    } else if (inputType.kind === 'enum') {
+    } else if (['object', 'enum'].includes(inputType.kind) && inputType.type !== className) {
         generateProjectImport({
             name: fieldType,
-            type: 'enum',
+            type: inputType.kind === 'object' ? 'input' : inputType.kind,
             sourceFile,
             projectFilePath,
         });
@@ -104,20 +110,3 @@ function generateInputProperty(args: GenerateInputPropertyArgs) {
         nullable: true,
     });
 }
-
-function getPropertyType(inputTypes: PrismaDMMF.SchemaArgInputType[]): string {
-    const types: string[] = inputTypes.map((inputType) => {
-        return toPropertyType({ ...inputType, type: String(inputType.type) });
-    });
-    types.sort((a, b) => {
-        if (b === 'null') {
-            return -2;
-        }
-        return 0;
-    });
-    return types.join(' | ');
-}
-
-function getFieldType(inputType: PrismaDMMF.SchemaArgInputType) {
-    return String(inputType.type);
-}

src/generate-model/generate-model.ts

@@ -1,7 +1,7 @@
 import { SourceFile } from 'ts-morph';
 
 import { generateClass } from '../generate-class';
-import { generateGraphqlImport } from '../generate-graphql-import';
+import { generateImport } from '../generate-import';
 import { generateProperty } from '../generate-property';
 import { PrismaDMMF } from '../types';
 
@@ -24,7 +24,7 @@ export function generateModel(args: GenerateModelArgs) {
         sourceFile,
         name: model.name,
     });
-    generateGraphqlImport({ name: 'Field', sourceFile, moduleSpecifier: '@nestjs/graphql' });
+    generateImport({ name: 'Field', sourceFile, moduleSpecifier: '@nestjs/graphql' });
     model.fields.forEach((field) => {
         generateProperty({
             field,

src/generate-object.ts

@@ -1,7 +1,7 @@
 import { SourceFile } from 'ts-morph';
 
 import { generateClass } from './generate-class';
-import { generateGraphqlImport } from './generate-graphql-import';
+import { generateImport } from './generate-import';
 import { generateProperty, Model } from './generate-property';
 
 type GenerateObjectArgs = {
@@ -23,7 +23,7 @@ export function generateObject(args: GenerateObjectArgs) {
         sourceFile,
         name: model.name,
     });
-    generateGraphqlImport({ name: 'Field', sourceFile, moduleSpecifier: '@nestjs/graphql' });
+    generateImport({ name: 'Field', sourceFile, moduleSpecifier: '@nestjs/graphql' });
     model.fields.forEach((field) => {
         generateProperty({
             field,

src/generate-property.ts

@@ -2,8 +2,7 @@ import { ClassDeclaration, SourceFile } from 'ts-morph';
 
 import { generateClassProperty } from './generate-class';
 import { generateDecorator } from './generate-decorator';
-import { generateGraphqlImport } from './generate-graphql-import';
-import { generateProjectImport } from './generate-project-import';
+import { generateImport, generateProjectImport } from './generate-import';
 import { toGraphqlImportType, toPropertyType } from './utils';
 
 export type Field = {
@@ -39,7 +38,7 @@ export function generateProperty(args: GeneratePropertyArgs) {
     const propertyType = toPropertyType(field);
     let fieldType = field.type;
     if (field.isId || field.kind === 'scalar') {
-        fieldType = generateGraphqlImport({
+        fieldType = generateImport({
             sourceFile,
             ...toGraphqlImportType({ ...field, isId: Boolean(field.isId) }),
         });

src/generate.ts

@@ -4,16 +4,20 @@ import { existsSync, promises as fs } from 'fs';
 import path from 'path';
 import { Project, QuoteKind, SourceFile } from 'ts-morph';
 
-import { featureName } from './feature-name';
 import { generateArgs } from './generate-args';
 import { generateEnum } from './generate-enum';
-import { generateFileName } from './generate-file-name';
 import { generateInput } from './generate-input';
 import { generateModel } from './generate-model';
 import { generateObject } from './generate-object';
 import { mutateFilters } from './mutate-filters';
 import { PrismaDMMF } from './types';
-import { getOutputTypeName, schemaFieldToArgument, schemaOutputToInput } from './utils';
+import {
+    featureName,
+    getOutputTypeName,
+    schemaFieldToArgument,
+    schemaOutputToInput,
+} from './utils';
+import { generateFileName } from './utils/generate-file-name';
 
 type GenerateArgs = GeneratorOptions & {
     prismaClientDmmf?: PrismaDMMF.Document;

src/utils.ts → src/utils/index.ts

@@ -1,6 +1,8 @@
+export { featureName } from './feature-name';
+
 import { ObjectLiteralExpression, PropertyAssignment, StructureKind } from 'ts-morph';
 
-import { PrismaDMMF } from './types';
+import { PrismaDMMF } from '../types';
 
 type ToGraphqlImportTypeArgs = {
     isId: boolean;