From 6e5d007837fd0e4f448102b8d998948f3151c2d7 Mon Sep 17 00:00:00 2001 From: Adrien de Peretti Date: Wed, 25 Sep 2024 14:32:07 +0200 Subject: [PATCH] fix: Generated types interface name (#9307) **What** Fix interface name in the output generated types --- .../utils/src/graphql/graphql-to-ts-types.ts | 16 ++++++++++++---- packages/medusa/src/commands/start.ts | 1 + packages/modules/index/src/utils/gql-to-types.ts | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/packages/core/utils/src/graphql/graphql-to-ts-types.ts b/packages/core/utils/src/graphql/graphql-to-ts-types.ts index cfe14fb9a7..34fe687e50 100644 --- a/packages/core/utils/src/graphql/graphql-to-ts-types.ts +++ b/packages/core/utils/src/graphql/graphql-to-ts-types.ts @@ -1,4 +1,4 @@ -import { FileSystem, toCamelCase } from "@medusajs/utils" +import { FileSystem } from "@medusajs/utils" import { GraphQLSchema } from "graphql/type" import { parse, printSchema } from "graphql" import { codegen } from "@graphql-codegen/core" @@ -43,11 +43,13 @@ function buildEntryPointsTypeMap({ async function generateTypes({ outputDir, filename, + interfaceName, config, joinerConfigs, }: { outputDir: string filename: string + interfaceName: string config: Parameters[0] joinerConfigs: ModuleJoinerConfig[] }) { @@ -56,8 +58,6 @@ async function generateTypes({ let output = await codegen(config) const entryPoints = buildEntryPointsTypeMap({ schema: output, joinerConfigs }) - const interfaceName = toCamelCase(filename) - const remoteQueryEntryPoints = ` declare module '@medusajs/types' { interface ${interfaceName} { @@ -92,11 +92,13 @@ export async function gqlSchemaToTypes({ outputDir, filename, joinerConfigs, + interfaceName, }: { schema: GraphQLSchema outputDir: string filename: string joinerConfigs: ModuleJoinerConfig[] + interfaceName: string }) { const config = { documents: [], @@ -122,5 +124,11 @@ export async function gqlSchemaToTypes({ }, } - await generateTypes({ outputDir, filename, config, joinerConfigs }) + await generateTypes({ + outputDir, + filename, + config, + joinerConfigs, + interfaceName, + }) } diff --git a/packages/medusa/src/commands/start.ts b/packages/medusa/src/commands/start.ts index 6b1c0dc6a9..9f254e2556 100644 --- a/packages/medusa/src/commands/start.ts +++ b/packages/medusa/src/commands/start.ts @@ -66,6 +66,7 @@ async function start({ port, directory, types }) { await gqlSchemaToTypes({ outputDir: outputDirGeneratedTypes, filename: "remote-query-entry-points", + interfaceName: "RemoteQueryEntryPoints", schema: gqlSchema, joinerConfigs: MedusaModule.getAllJoinerConfigs(), }) diff --git a/packages/modules/index/src/utils/gql-to-types.ts b/packages/modules/index/src/utils/gql-to-types.ts index ae37c0723a..60246d0210 100644 --- a/packages/modules/index/src/utils/gql-to-types.ts +++ b/packages/modules/index/src/utils/gql-to-types.ts @@ -16,6 +16,7 @@ export async function gqlSchemaToTypes(schema: string) { await ModulesSdkGqlSchemaToTypes({ schema: executableSchema, filename, + interfaceName: "IndexServiceEntryPoints", outputDir: dir, joinerConfigs: MedusaModule.getAllJoinerConfigs(), })