use mergeAdhoc

Author: cm-ayf

Diff for: src/internal/OpenApiTools/components/ClientSchema.ts

@@ -257,6 +257,9 @@ export const addSchema = (
   if (!schema) {
     return;
   }
+  if (Guard.isAdhocAllOfSchema(schema)) {
+    schema = ToTypeNode.mergeAdhoc(currentPoint, schema, context);
+  }
   if (Guard.isAllOfSchema(schema)) {
     store.addStatement(targetPoint, {
       kind: "typeAlias",

Diff for: src/internal/OpenApiTools/components/ClientSchemas.ts

@@ -82,7 +82,7 @@ export const generateNamespace = (
         }),
       });
     }
-    const schema = InferredType.getInferredType(targetSchema);
+    let schema = InferredType.getInferredType(targetSchema);
     const path = `${basePath}/${name}`;
     if (!schema) {
       // Schemaが特定できないためWarningを出力する
@@ -97,6 +97,9 @@ export const generateNamespace = (
         { override: true },
       );
     }
+    if (Guard.isAdhocAllOfSchema(schema)) {
+      schema = ToTypeNode.mergeAdhoc(currentPoint, schema, context);
+    }
     if (Guard.isAllOfSchema(schema)) {
       return store.addStatement(
         path,

Diff for: src/internal/OpenApiTools/components/Schema.ts

@@ -214,6 +214,9 @@ export const addSchema = (
   if (!schema) {
     return;
   }
+  if (Guard.isAdhocAllOfSchema(schema)) {
+    schema = ToTypeNode.mergeAdhoc(currentPoint, schema, context);
+  }
   if (Guard.isAllOfSchema(schema)) {
     store.addStatement(targetPoint, {
       kind: "typeAlias",

Diff for: src/internal/OpenApiTools/components/Schemas.ts

@@ -79,7 +79,7 @@ export const generateNamespace = (
         }),
       });
     }
-    const schema = InferredType.getInferredType(targetSchema);
+    let schema = InferredType.getInferredType(targetSchema);
     const path = `${basePath}/${name}`;
     if (!schema) {
       // Schemaが特定できないためWarningを出力する
@@ -94,6 +94,9 @@ export const generateNamespace = (
         { override: true },
       );
     }
+    if (Guard.isAdhocAllOfSchema(schema)) {
+      schema = ToTypeNode.mergeAdhoc(currentPoint, schema, context);
+    }
     if (Guard.isAllOfSchema(schema)) {
       return store.addStatement(
         path,