commonjs can import from .js just as well

MichalLytek · May 18, 2023 · 4366ba7 · 4366ba7
1 parent ef99728
commit 4366ba7
Show file tree

Hide file tree

Showing 20 changed files with 3,261 additions and 3,387 deletions.
diff --git a/jest.config.ts b/jest.config.ts
@@ -14,6 +14,9 @@ const config: Config.InitialOptions = {
       },
     ],
   },
+  moduleNameMapper: {
+    "^(\\.{1,2}/.*)\\.js$": "$1",
+  },
   testMatch: ["<rootDir>/tests/**/*.ts"],
   testPathIgnorePatterns: [
     "<rootDir>/tests/helpers",

diff --git a/src/generator/args-class.ts b/src/generator/args-class.ts
@@ -34,7 +34,6 @@ export default function generateArgsTypeClassFromArgs(
   generateGraphQLScalarsImport(sourceFile);
   generateInputsImports(
     sourceFile,
-    dmmfDocument.options,
     fields
       .map(arg => arg.selectedInputType)
       .filter(argInputType => argInputType.location === "inputObjectTypes")
@@ -43,7 +42,6 @@ export default function generateArgsTypeClassFromArgs(
   );
   generateEnumsImports(
     sourceFile,
-    dmmfDocument.options,
     fields
       .map(field => field.selectedInputType)
       .filter(argType => argType.location === "enumTypes")

diff --git a/src/generator/generate-code.ts b/src/generator/generate-code.ts
@@ -125,11 +125,7 @@ export default async function generateCode(
       undefined,
       { overwrite: true },
     );
-    generateEnumsBarrelFile(
-      enumsBarrelExportSourceFile,
-      dmmfDocument.options,
-      emittedEnumNames,
-    );
+    generateEnumsBarrelFile(enumsBarrelExportSourceFile, emittedEnumNames);
   }
 
   if (dmmfDocument.shouldGenerateBlock("models")) {
@@ -153,7 +149,6 @@ export default async function generateCode(
     );
     generateModelsBarrelFile(
       modelsBarrelExportSourceFile,
-      dmmfDocument.options,
       dmmfDocument.datamodel.models.map(it => it.typeName),
     );
   }
@@ -194,7 +189,6 @@ export default async function generateCode(
     );
     generateOutputsBarrelFile(
       outputsBarrelExportSourceFile,
-      dmmfDocument.options,
       outputTypesToGenerate.map(it => it.typeName),
       outputTypesFieldsArgsToGenerate.length > 0,
     );
@@ -224,7 +218,6 @@ export default async function generateCode(
       );
       generateArgsBarrelFile(
         outputsArgsBarrelExportSourceFile,
-        dmmfDocument.options,
         outputTypesFieldsArgsToGenerate.map(it => it.argsTypeName!),
       );
     }
@@ -247,7 +240,6 @@ export default async function generateCode(
     );
     generateInputsBarrelFile(
       inputsBarrelExportSourceFile,
-      dmmfDocument.options,
       dmmfDocument.schema.inputTypes.map(it => it.typeName),
     );
   }
@@ -278,7 +270,6 @@ export default async function generateCode(
     );
     generateResolversBarrelFile(
       relationResolversBarrelExportSourceFile,
-      dmmfDocument.options,
       dmmfDocument.relationModels.map<GenerateMappingData>(relationModel => ({
         resolverName: relationModel.resolverName,
         modelName: relationModel.model.typeName,
@@ -314,11 +305,7 @@ export default async function generateCode(
           undefined,
           { overwrite: true },
         );
-        generateArgsBarrelFile(
-          barrelExportSourceFile,
-          dmmfDocument.options,
-          argTypeNames,
-        );
+        generateArgsBarrelFile(barrelExportSourceFile, argTypeNames);
       }
     });
 
@@ -341,7 +328,6 @@ export default async function generateCode(
       );
       generateArgsIndexFile(
         relationResolversArgsIndexSourceFile,
-        dmmfDocument.options,
         relationModelsWithArgs.map(
           relationModelData => relationModelData.model.typeName,
         ),
@@ -359,7 +345,6 @@ export default async function generateCode(
     );
     generateResolversIndexFile(
       relationResolversIndexSourceFile,
-      dmmfDocument.options,
       "relations",
       relationModelsWithArgs.length > 0,
     );
@@ -417,7 +402,6 @@ export default async function generateCode(
     );
     generateResolversBarrelFile(
       crudResolversBarrelExportSourceFile,
-      dmmfDocument.options,
       generateMappingData,
     );
     const crudResolversActionsBarrelExportSourceFile = project.createSourceFile(
@@ -432,7 +416,6 @@ export default async function generateCode(
     );
     generateResolversActionsBarrelFile(
       crudResolversActionsBarrelExportSourceFile,
-      dmmfDocument.options,
       generateMappingData,
     );
     const crudResolversIndexSourceFile = project.createSourceFile(
@@ -445,12 +428,7 @@ export default async function generateCode(
       undefined,
       { overwrite: true },
     );
-    generateResolversIndexFile(
-      crudResolversIndexSourceFile,
-      dmmfDocument.options,
-      "crud",
-      true,
-    );
+    generateResolversIndexFile(crudResolversIndexSourceFile, "crud", true);
 
     log("Generating crud resolvers args...");
     dmmfDocument.modelMappings.forEach(async mapping => {
@@ -484,7 +462,6 @@ export default async function generateCode(
         );
         generateArgsBarrelFile(
           barrelExportSourceFile,
-          dmmfDocument.options,
           actionsWithArgs.map(it => it.argsTypeName!),
         );
       }
@@ -501,7 +478,6 @@ export default async function generateCode(
     );
     generateArgsIndexFile(
       crudResolversArgsIndexSourceFile,
-      dmmfDocument.options,
       dmmfDocument.modelMappings
         .filter(mapping =>
           mapping.actions.some(it => it.argsTypeName !== undefined),
@@ -550,7 +526,6 @@ export default async function generateCode(
   );
   generateIndexFile(
     indexSourceFile,
-    dmmfDocument.options,
     dmmfDocument.relationModels.length > 0,
     dmmfDocument.options.blocksToEmit,
   );

diff --git a/src/generator/generate-enhance.ts b/src/generator/generate-enhance.ts
@@ -42,15 +42,11 @@ export function generateEnhanceMap(
 
   if (dmmfDocument.shouldGenerateBlock("crudResolvers")) {
     sourceFile.addImportDeclaration({
-      moduleSpecifier: `./${resolversFolderName}/${crudResolversFolderName}/resolvers-crud.index${
-        dmmfDocument.options.emitESM ? ".js" : ""
-      }`,
+      moduleSpecifier: `./${resolversFolderName}/${crudResolversFolderName}/resolvers-crud.index.js`,
       namespaceImport: "crudResolvers",
     });
     sourceFile.addImportDeclaration({
-      moduleSpecifier: `./${resolversFolderName}/${crudResolversFolderName}/args.index${
-        dmmfDocument.options.emitESM ? ".js" : ""
-      }`,
+      moduleSpecifier: `./${resolversFolderName}/${crudResolversFolderName}/args.index.js`,
       namespaceImport: "argsTypes",
     });
     sourceFile.addVariableStatement({
@@ -71,9 +67,7 @@ export function generateEnhanceMap(
       trailingTrivia: "\r\n",
     });
     sourceFile.addImportDeclaration({
-      moduleSpecifier: `./${resolversFolderName}/${crudResolversFolderName}/resolvers-actions.index${
-        dmmfDocument.options.emitESM ? ".js" : ""
-      }`,
+      moduleSpecifier: `./${resolversFolderName}/${crudResolversFolderName}/resolvers-actions.index.js`,
       namespaceImport: "actionResolvers",
     });
     sourceFile.addVariableStatement({
@@ -243,9 +237,7 @@ export function generateEnhanceMap(
 
   if (hasRelations && dmmfDocument.shouldGenerateBlock("relationResolvers")) {
     sourceFile.addImportDeclaration({
-      moduleSpecifier: `./${resolversFolderName}/${relationsResolversFolderName}/resolvers.index${
-        dmmfDocument.options.emitESM ? ".js" : ""
-      }`,
+      moduleSpecifier: `./${resolversFolderName}/${relationsResolversFolderName}/resolvers.index.js`,
       namespaceImport: "relationResolvers",
     });
     sourceFile.addVariableStatement({
@@ -375,9 +367,7 @@ export function generateEnhanceMap(
 
   if (dmmfDocument.shouldGenerateBlock("models")) {
     sourceFile.addImportDeclaration({
-      moduleSpecifier: `./${modelsFolderName}${
-        dmmfDocument.options.emitESM ? "/index.js" : ""
-      }`,
+      moduleSpecifier: `./${modelsFolderName}/index.js`,
       namespaceImport: "models",
     });
     sourceFile.addVariableStatement({
@@ -445,9 +435,7 @@ export function generateEnhanceMap(
 
   if (dmmfDocument.shouldGenerateBlock("outputs")) {
     sourceFile.addImportDeclaration({
-      moduleSpecifier: `./${resolversFolderName}/${outputsFolderName}${
-        dmmfDocument.options.emitESM ? "/index.js" : ""
-      }`,
+      moduleSpecifier: `./${resolversFolderName}/${outputsFolderName}/index.js`,
       namespaceImport: "outputTypes",
     });
     sourceFile.addVariableStatement({
@@ -509,9 +497,7 @@ export function generateEnhanceMap(
 
   if (dmmfDocument.shouldGenerateBlock("inputs")) {
     sourceFile.addImportDeclaration({
-      moduleSpecifier: `./${resolversFolderName}/${inputsFolderName}${
-        dmmfDocument.options.emitESM ? "/index.js" : ""
-      }`,
+      moduleSpecifier: `./${resolversFolderName}/${inputsFolderName}/index.js`,
       namespaceImport: "inputTypes",
     });
     sourceFile.addVariableStatement({