fix for some types

medusajs · Oct 16, 2024 · 2f1c43f · 2f1c43f
1 parent c1b323d
commit 2f1c43f
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 3 deletions.
diff --git a/www/utils/packages/docs-generator/src/classes/helpers/oas-schema.ts b/www/utils/packages/docs-generator/src/classes/helpers/oas-schema.ts
@@ -357,7 +357,7 @@ class OasSchemaHelper {
       .replace("DTO", "")
       .replace(this.schemaRefPrefix, "")
       .replace(
-        /(?<!(AdminProduct|CreateProduct|StoreShippingOption|AdminShippingOption))Type$/,
+        /(?<!(AdminProduct|CreateProduct|StoreShippingOption|AdminShippingOption|CreateShippingOption))Type$/,
         ""
       )
   }

diff --git a/www/utils/packages/docs-generator/src/classes/kinds/oas.ts b/www/utils/packages/docs-generator/src/classes/kinds/oas.ts
@@ -2055,8 +2055,49 @@ class OasKindGenerator extends FunctionKindGenerator {
               !Object.hasOwn(oldSchemaObj!.properties!, propertyKey)
           )
           .forEach((newPropertyKey) => {
-            oldSchemaObj!.properties![newPropertyKey] =
-              newSchemaObj!.properties![newPropertyKey]
+            const tryToUpdateSchema = (
+              schema: OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject
+            ) => {
+              let updatedSchema = schema
+              const newPropertySchemaName = this.oasSchemaHelper.isRefObject(
+                schema
+              )
+                ? schema.$ref
+                : "x-schemaName" in schema
+                  ? (schema["x-schemaName"] as string)
+                  : undefined
+              if (newPropertySchemaName) {
+                const schemaToUpdate = this.oasSchemaHelper.getSchemaByName(
+                  newPropertySchemaName,
+                  true,
+                  true
+                )
+
+                if (schemaToUpdate) {
+                  updatedSchema =
+                    this.updateSchema({
+                      oldSchema: schemaToUpdate.schema,
+                      newSchema: schema,
+                      level: maybeIncrementLevel(level, "object"),
+                    }) || newProperty
+                }
+              }
+
+              return updatedSchema
+            }
+
+            let newProperty = newSchemaObj!.properties![newPropertyKey]
+
+            if (
+              !this.oasSchemaHelper.isRefObject(newProperty) &&
+              newProperty.type === "array"
+            ) {
+              newProperty.items = tryToUpdateSchema(newProperty.items)
+            } else {
+              newProperty = tryToUpdateSchema(newProperty)
+            }
+
+            oldSchemaObj!.properties![newPropertyKey] = newProperty
           })
       }
     } else if (