test: add scenarios of allOf incorrectly add property with schema name

Author: malcolm-kee

packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/discriminator-all-of/types.gen.ts

@@ -44,6 +44,26 @@ export type QuxMapped = FooMapped & {
     qux?: boolean;
 };
 
+export type FooUnion = ({
+    id: 'bar';
+} & BarUnion) | ({
+    id: 'baz';
+} & BazUnion);
+
+export type BarUnion = {
+    id?: string;
+    bar?: string;
+};
+
+export type BazUnion = {
+    id?: string;
+    baz?: string;
+};
+
+export type QuxExtend = FooUnion & {
+    id?: 'QuxExtend';
+};
+
 export type ClientOptions = {
     baseUrl: `${string}://${string}` | (string & {});
 };

packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/discriminator-all-of/types.gen.ts

@@ -44,6 +44,26 @@ export type QuxMapped = FooMapped & {
     qux?: boolean;
 };
 
+export type FooUnion = ({
+    id: 'bar';
+} & BarUnion) | ({
+    id: 'baz';
+} & BazUnion);
+
+export type BarUnion = {
+    id?: string;
+    bar?: string;
+};
+
+export type BazUnion = {
+    id?: string;
+    baz?: string;
+};
+
+export type QuxExtend = FooUnion & {
+    id?: 'QuxExtend';
+};
+
 export type ClientOptions = {
     baseUrl: `${string}://${string}` | (string & {});
 };

packages/openapi-ts-tests/specs/3.0.x/discriminator-all-of.yaml

@@ -67,3 +67,29 @@ components:
           properties:
             qux:
               type: boolean
+    FooUnion:
+      oneOf:
+        - $ref: '#/components/schemas/BarUnion'
+        - $ref: '#/components/schemas/BazUnion'
+      discriminator:
+        propertyName: id
+        mapping:
+          bar: '#/components/schemas/BarUnion'
+          baz: '#/components/schemas/BazUnion'
+    BarUnion:
+      type: object
+      properties:
+        id:
+          type: string
+        bar:
+          type: string
+    BazUnion:
+      type: object
+      properties:
+        id:
+          type: string
+        baz:
+          type: string
+    QuxExtend: # this is a schema that extends the FooUnion schema
+      allOf:
+        - $ref: '#/components/schemas/FooUnion'

packages/openapi-ts-tests/specs/3.1.x/discriminator-all-of.yaml

@@ -67,3 +67,29 @@ components:
           properties:
             qux:
               type: boolean
+    FooUnion:
+      oneOf:
+        - $ref: '#/components/schemas/BarUnion'
+        - $ref: '#/components/schemas/BazUnion'
+      discriminator:
+        propertyName: id
+        mapping:
+          bar: '#/components/schemas/BarUnion'
+          baz: '#/components/schemas/BazUnion'
+    BarUnion:
+      type: object
+      properties:
+        id:
+          type: string
+        bar:
+          type: string
+    BazUnion:
+      type: object
+      properties:
+        id:
+          type: string
+        baz:
+          type: string
+    QuxExtend: # this is a schema that extends the FooUnion schema
+      allOf:
+        - $ref: '#/components/schemas/FooUnion'