chore: Adjust openapi generator for azure spec

packages/openapi-generator/src/file-serializer/schema.ts

@@ -32,7 +32,9 @@ export function serializeSchema(schema: OpenApiSchema): string {
     const type = serializeSchema(schema.items);
     return schema.uniqueItems
       ? `Set<${type}>`
-      : 'properties' in schema.items
+      : ['properties', 'allOf', 'oneOf', 'anyOf'].some(
+            prop => prop in schema.items
+          )
         ? `(${type})[]`
         : `${type}[]`;
   }

packages/openapi-generator/src/generator.ts

@@ -264,7 +264,10 @@ async function generateService(
   const parsedOpenApiDocument = await parseOpenApiDocument(
     openApiDocument,
     serviceOptions,
-    { strictNaming: !options.skipValidation }
+    {
+      strictNaming: !options.skipValidation,
+      schemaPrefix: options.schemaPrefix
+    }
   );
 
   const serviceDir = resolve(options.outputDir, serviceOptions.directoryName);

packages/openapi-generator/src/options/generator-options.spec.ts

@@ -37,7 +37,8 @@ describe('parseGeneratorOptions', () => {
     verbose: false,
     overwrite: false,
     config: undefined,
-    generateESM: false
+    generateESM: false,
+    schemaPrefix: undefined
   };
 
   it('gets default options', () => {

packages/openapi-generator/src/options/options.ts

@@ -15,6 +15,11 @@ export type GeneratorOptions = CommonGeneratorOptions & OpenAPIGeneratorOptions;
  * Options to configure OpenAPI client generation when using the generator programmatically.
  */
 export interface OpenAPIGeneratorOptions {
+  /**
+   * Prefix all schema names with a value.
+   * @experimental
+   */
+  schemaPrefix?: string;
   /**
    * Whether to generate ECMAScript modules instead of CommonJS modules.
    */
@@ -37,5 +42,11 @@ export const cliOptions = {
       'When enabled, all generated files follow the ECMAScript module syntax.',
     type: 'boolean',
     default: false
+  },
+  schemaPrefix: {
+    describe:
+      'When enabled, all generated files follow the ECMAScript module syntax.',
+    type: 'string',
+    default: undefined
   }
 } as const satisfies Options<GeneratorOptions>;

packages/openapi-generator/src/parser/options.ts

@@ -7,4 +7,8 @@ export interface ParserOptions {
    * Fail parsing on conflicting names.
    */
   strictNaming: boolean;
+  /**
+   * Add prefix to schema names.
+   */
+  schemaPrefix?: string;
 }

packages/openapi-generator/src/parser/refs.spec.ts

@@ -60,6 +60,25 @@ describe('OpenApiDocumentRefs', () => {
       );
     });
 
+    it('gets the schema naming for reference object with a prefix', async () => {
+      refs = await createRefs(
+        {
+          ...emptyDocument,
+          components: { schemas: { typeName } }
+        },
+        { strictNaming: true, schemaPrefix: 'xyz' }
+      );
+
+      expect(
+        refs.getSchemaNaming({
+          $ref: '#/components/schemas/typeName'
+        })
+      ).toEqual({
+        schemaName: 'XyzTypeName',
+        fileName: 'type-name'
+      });
+    });
+
     it('renames a schema if needed due to illegal names', async () => {
       refs = await createRefs(
         {

packages/openapi-generator/src/parser/refs.ts

@@ -72,7 +72,7 @@ export class OpenApiDocumentRefs {
       (mapping, originalName, i) => ({
         ...mapping,
         [`#/components/schemas/${originalName}`]: {
-          schemaName: schemaNames[i],
+          schemaName: pascalCase(options.schemaPrefix ?? '') + schemaNames[i],
           fileName: fileNames[i]
         }
       }),

packages/openapi-generator/src/parser/schema.ts

@@ -42,14 +42,6 @@ export function parseSchema(
     return parseArraySchema(schema, refs, options);
   }
 
-  if (
-    schema.type === 'object' ||
-    schema.properties ||
-    'additionalProperties' in schema
-  ) {
-    return parseObjectSchema(schema, refs, options);
-  }
-
   if (schema.enum?.length) {
     return parseEnumSchema(schema, options);
   }
@@ -59,13 +51,28 @@ export function parseSchema(
   }
 
   if (schema.allOf?.length) {
+    if (schema.properties) {
+      logger.info(
+        'Detected schema with allOf and properties in the same level. This was refactored to a schema with allOf only, also containing all the properties from the top level.'
+      );
+      schema.allOf.push({ properties: schema.properties });
+      delete schema.properties;
+    }
     return parseXOfSchema(schema, refs, 'allOf', options);
   }
 
   if (schema.anyOf?.length) {
     return parseXOfSchema(schema, refs, 'anyOf', options);
   }
 
+  if (
+    schema.type === 'object' ||
+    schema.properties ||
+    'additionalProperties' in schema
+  ) {
+    return parseObjectSchema(schema, refs, options);
+  }
+
   if (schema.not) {
     return {
       not: parseSchema(schema.not, refs, options)

test-packages/test-services-openapi/swagger-yaml-service/schema/index.d.ts

@@ -4,3 +4,5 @@
  * This is a generated file powered by the SAP Cloud SDK for JavaScript.
  */
 export * from './test-entity';
+export * from './test-entity-2';
+export * from './test-entity-3';

test-packages/test-services-openapi/swagger-yaml-service/schema/index.ts

@@ -4,3 +4,5 @@
  * This is a generated file powered by the SAP Cloud SDK for JavaScript.
  */
 export * from './test-entity';
+export * from './test-entity-2';
+export * from './test-entity-3';

test-packages/test-services-openapi/swagger-yaml-service/schema/test-entity-2.d.ts

@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2024 SAP SE or an SAP affiliate company. All rights reserved.
+ *
+ * This is a generated file powered by the SAP Cloud SDK for JavaScript.
+ */
+import type { TestEntity } from './test-entity';
+/**
+ * Representation of the 'TestEntity2' schema.
+ */
+export type TestEntity2 = TestEntity & {
+  booleanProperty?: boolean;
+} & Record<string, any>;

test-packages/test-services-openapi/swagger-yaml-service/schema/test-entity-2.ts

@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2024 SAP SE or an SAP affiliate company. All rights reserved.
+ *
+ * This is a generated file powered by the SAP Cloud SDK for JavaScript.
+ */
+import type { TestEntity } from './test-entity';
+/**
+ * Representation of the 'TestEntity2' schema.
+ */
+export type TestEntity2 = TestEntity & {
+  booleanProperty?: boolean;
+} & Record<string, any>;

test-packages/test-services-openapi/swagger-yaml-service/schema/test-entity-3.d.ts

@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2024 SAP SE or an SAP affiliate company. All rights reserved.
+ *
+ * This is a generated file powered by the SAP Cloud SDK for JavaScript.
+ */
+import type { TestEntity } from './test-entity';
+/**
+ * Representation of the 'TestEntity3' schema.
+ */
+export type TestEntity3 = TestEntity & {
+  booleanProperty?: boolean;
+} & Record<string, any>;

test-packages/test-services-openapi/swagger-yaml-service/schema/test-entity-3.ts

@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2024 SAP SE or an SAP affiliate company. All rights reserved.
+ *
+ * This is a generated file powered by the SAP Cloud SDK for JavaScript.
+ */
+import type { TestEntity } from './test-entity';
+/**
+ * Representation of the 'TestEntity3' schema.
+ */
+export type TestEntity3 = TestEntity & {
+  booleanProperty?: boolean;
+} & Record<string, any>;

test-resources/openapi-service-specs/swagger-yaml-service.yml

@@ -54,3 +54,20 @@ definitions:
         type: integer
         description: An integer property
         required: false
+  TestEntity_2:
+    type: object
+    allOf:
+      - $ref: '#/definitions/TestEntity'
+      - properties:
+          booleanProperty:
+            type: boolean
+    required:
+      - booleanProperty
+  TestEntity_3:
+    type: object
+    allOf:
+      - $ref: '#/definitions/TestEntity'
+    properties:
+      booleanProperty:
+        type: boolean
+