Implement error handling for enum mapping

Signed-off-by: Elias Meire <elias@meire.dev>

Author: elsmr

packages/openapi-to-graphql/lib/index.js

@@ -323,7 +323,7 @@ function translateOpenAPIToGraphQL<TSource, TContext, TArgs>(
       }
 
       let fieldName =
-        extensionFieldName ??
+        extensionFieldName ||
         (!singularNames
           ? Oas3Tools.uncapitalize(operation.responseDefinition.graphQLTypeName)
           : Oas3Tools.sanitize(
@@ -503,7 +503,7 @@ function translateOpenAPIToGraphQL<TSource, TContext, TArgs>(
       }
 
       const saneFieldName =
-        extensionFieldName ??
+        extensionFieldName ||
         Oas3Tools.storeSaneName(saneOperationId, operationId, data.saneMap)
 
       if (operation.inViewer) {

packages/openapi-to-graphql/lib/index.js.map

@@ -694,6 +694,11 @@ export function createDataDef<TSource, TContext, TArgs>(
       Object.keys(links).forEach((linkKey) => {
         const link = links[linkKey]
         const fromExtension = link[Oas3Tools.OAS_GRAPHQL_EXTENSIONS.FieldName]
+        if (fromExtension in saneLinks) {
+          throw new Error(
+            `Cannot create link with name "${fromExtension}".\nYou provided "${fromExtension}" in ${Oas3Tools.OAS_GRAPHQL_EXTENSIONS.FieldName}, but it conflicts with another link called "${fromExtension}"`
+          )
+        }
         const linkSaneName = Oas3Tools.sanitize(
           fromExtension || linkKey,
           !data.options.simpleNames

packages/openapi-to-graphql/lib/preprocessor.js

@@ -557,17 +557,23 @@ function createOrReuseEnum<TSource, TContext, TArgs>({
     const values = {}
     const mapping =
       def.schema[Oas3Tools.OAS_GRAPHQL_EXTENSIONS.EnumMapping] || {}
-    def.schema.enum.forEach((e) => {
-      values[
+    def.schema.enum.forEach((enumValue) => {
+      const enumValueString = enumValue.toString()
+      const fromExtension = mapping[enumValueString]
+      const saneEnumValue =
+        fromExtension ||
         Oas3Tools.sanitize(
-          mapping[e.toString()] || e.toString(),
+          enumValueString,
           !data.options.simpleEnumValues
             ? Oas3Tools.CaseStyle.ALL_CAPS
             : Oas3Tools.CaseStyle.simple
         )
-      ] = {
-        value: e
+      if (fromExtension in values) {
+        throw new Error(
+          `Cannot create enum value "${fromExtension}".\nYou provided "${fromExtension}" in ${Oas3Tools.OAS_GRAPHQL_EXTENSIONS.EnumMapping}, but it conflicts with another enum value "${fromExtension}"`
+        )
       }
+      values[saneEnumValue] = { value: enumValue }
     })
 
     // Store newly created Enum Object Type
@@ -628,7 +634,7 @@ function createFields<TSource, TContext, TArgs>({
       }
 
       const saneFieldTypeKey =
-        fromExtension ??
+        fromExtension ||
         Oas3Tools.sanitize(
           fieldTypeKey,
           !data.options.simpleNames

packages/openapi-to-graphql/lib/preprocessor.js.map

@@ -137,24 +137,24 @@ describe('GraphQL Extensions', () => {
       )
     })
 
-    test.skip('should throw when x-graphql-field-name causes naming conflicts on links', async () => {
-      const oas = require('./fixtures/extensions_error3.json')
+    test('should throw when x-graphql-field-name causes naming conflicts on links', async () => {
+      const oas = require('./fixtures/extensions_error6.json')
       await expect(
         openAPIToGraphQL.createGraphQLSchema(oas)
       ).rejects.toThrowError(
         new Error(
-          'Cannot create field with name "name".\nYou provided "name" in x-graphql-field-name, but it conflicts with another field called "name"'
+          'Cannot create link with name "group".\nYou provided "group" in x-graphql-field-name, but it conflicts with another link called "group"'
         )
       )
     })
 
-    test.skip('should throw when x-graphql-enum-mapping causes naming conflicts', async () => {
-      const oas = require('./fixtures/extensions_error3.json')
+    test('should throw when x-graphql-enum-mapping causes naming conflicts', async () => {
+      const oas = require('./fixtures/extensions_error7.json')
       await expect(
         openAPIToGraphQL.createGraphQLSchema(oas)
       ).rejects.toThrowError(
         new Error(
-          'Cannot create field with name "name".\nYou provided "name" in x-graphql-field-name, but it conflicts with another field called "name"'
+          'Cannot create enum value "CONFLICT".\nYou provided "CONFLICT" in x-graphql-enum-mapping, but it conflicts with another enum value "CONFLICT"'
         )
       )
     })