fix: Cover more oneOf-transformation cases (#44)

PR: #44
ExpediaGroup · Aug 14, 2023 · 78c58b2 · 78c58b2
1 parent f49ba3f
commit 78c58b2
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 7 deletions.
diff --git a/src/model/Spec.ts b/src/model/Spec.ts
@@ -267,12 +267,39 @@ export default class Spec {
     for (const cmp in allOfComponents) {
       const refs = allOfComponents[cmp].allOf.filter((item: any) => item.$ref).map((item: any) => this.getRefComponentName(item));
       refs.forEach((ref: string) => {
+        if (!this.isDefinedInParent(cmp, ref)) return;
         /* istanbul ignore next */
         children.has(ref) ? children.set(ref, [...(children.get(ref) || []), cmp]) : children.set(ref, [cmp]);
       });
     }
   }
 
+  private isDefinedInParent = (child: string, parent: string): boolean => {
+    const extractComponentName = (ref: string): string => ref.slice(ref.lastIndexOf('/') + 1)
+
+    const discriminatorMappings: string[] = this.getDiscriminatorMappings(parent);
+    return !!discriminatorMappings.map((item: string) => extractComponentName(item))
+      .find((value: string): boolean => value === child);
+  }
+
+  private getDiscriminatorMappings = (componentName: string): string[] => {
+    const schema = this.specs.components.schemas[componentName];
+    let mappings: string[] = [];
+    const discriminatorMapping = schema.discriminator?.mapping;
+    if (discriminatorMapping) {
+      mappings = mappings.concat(Object.values(discriminatorMapping));
+    } else if (schema.allOf) {
+      mappings = mappings.concat(
+        schema.allOf.filter(
+          (item: Value) => item.discriminator?.mapping
+        ).map(
+          (item: Value) => Object.values(item.discriminator.mapping)
+        ).flat()
+      );
+    }
+    return mappings;
+  }
+
   private getRefComponentName = (item: any) => item.$ref.slice(item.$ref.lastIndexOf('/') + 1);
 
   private mapToLeaves = (children: Map<string, string[]>) => {

diff --git a/test/transformer/OneOfSettingTransformer.test.ts b/test/transformer/OneOfSettingTransformer.test.ts
@@ -80,18 +80,18 @@ describe(' test OneOfSettingTransformer', () => {
         },
         Visa: {
           title: 'Visa',
-          discriminator: {
-            propertyName: 'type',
-            mapping: {
-              DEBIT: 'Debit',
-              CREDIT: 'Credit'
-            }
-          },
           allOf: [
             {
               $ref: '#/components/schemas/CreditCard'
             },
             {
+              discriminator: {
+                propertyName: 'type',
+                mapping: {
+                  DEBIT: 'Debit',
+                  CREDIT: 'Credit'
+                }
+              },
               properties: {
                 type: {
                   enum: ['VISA']
@@ -144,6 +144,21 @@ describe(' test OneOfSettingTransformer', () => {
             }
           ]
         },
+        SomeCreditCard: {
+          title: 'SomeCreditCard',
+          allOf: [
+            {
+              $ref: '#/components/schemas/CreditCard'
+            },
+            {
+              properties: {
+                name: {
+                  type: 'string'
+                }
+              }
+            }
+          ]
+        },
         Dummy: {
           title: 'Dummy',
           type: 'object',