From ce724d6b928d783d850350c309ba0691950b5abd Mon Sep 17 00:00:00 2001 From: Ali Almohammad Date: Tue, 25 Jan 2022 15:46:32 +0000 Subject: [PATCH 1/2] SYS-1934 - Included scheme name from extension --- packages/openapi-to-graphql/src/preprocessor.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/openapi-to-graphql/src/preprocessor.ts b/packages/openapi-to-graphql/src/preprocessor.ts index 6929a5f2..a5b59a7d 100644 --- a/packages/openapi-to-graphql/src/preprocessor.ts +++ b/packages/openapi-to-graphql/src/preprocessor.ts @@ -960,6 +960,8 @@ function getPreferredName(names: Oas3Tools.SchemaNames): string { return Oas3Tools.sanitize(names.fromSchema, Oas3Tools.CaseStyle.PascalCase) // CASE: name from schema (i.e., "title" property in schema) } else if (typeof names.fromPath === 'string') { return Oas3Tools.sanitize(names.fromPath, Oas3Tools.CaseStyle.PascalCase) // CASE: name from path + } else if(typeof names.fromExtension === 'string') { + return Oas3Tools.sanitize(names.fromExtension, Oas3Tools.CaseStyle.PascalCase) // CASE: name from Extension } else { return 'PlaceholderName' // CASE: placeholder name } From 44c7daa3e9bbc271630d420870048a4853237b75 Mon Sep 17 00:00:00 2001 From: Ali Almohammad Date: Tue, 25 Jan 2022 15:53:04 +0000 Subject: [PATCH 2/2] SYS-1934 - Included scheme name from extension --- packages/openapi-to-graphql/src/preprocessor.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/openapi-to-graphql/src/preprocessor.ts b/packages/openapi-to-graphql/src/preprocessor.ts index a5b59a7d..fb105efe 100644 --- a/packages/openapi-to-graphql/src/preprocessor.ts +++ b/packages/openapi-to-graphql/src/preprocessor.ts @@ -952,7 +952,9 @@ function getSchemaIndex( * been taken. */ function getPreferredName(names: Oas3Tools.SchemaNames): string { - if (typeof names.preferred === 'string') { + if(typeof names.fromExtension === 'string') { + return Oas3Tools.sanitize(names.fromExtension, Oas3Tools.CaseStyle.PascalCase) // CASE: name from Extension + } else if (typeof names.preferred === 'string') { return Oas3Tools.sanitize(names.preferred, Oas3Tools.CaseStyle.PascalCase) // CASE: preferred name already known } else if (typeof names.fromRef === 'string') { return Oas3Tools.sanitize(names.fromRef, Oas3Tools.CaseStyle.PascalCase) // CASE: name from reference @@ -960,8 +962,6 @@ function getPreferredName(names: Oas3Tools.SchemaNames): string { return Oas3Tools.sanitize(names.fromSchema, Oas3Tools.CaseStyle.PascalCase) // CASE: name from schema (i.e., "title" property in schema) } else if (typeof names.fromPath === 'string') { return Oas3Tools.sanitize(names.fromPath, Oas3Tools.CaseStyle.PascalCase) // CASE: name from path - } else if(typeof names.fromExtension === 'string') { - return Oas3Tools.sanitize(names.fromExtension, Oas3Tools.CaseStyle.PascalCase) // CASE: name from Extension } else { return 'PlaceholderName' // CASE: placeholder name }