better allOf resolution with adhoc

Author: cm-ayf

src/internal/OpenApiTools/Guard.ts

@@ -66,6 +66,16 @@ export const isAnyOfSchema = (schema: OpenApi.Schema): schema is Types.AnyOfSche
   return !!schema.anyOf && typeof schema.anyOf !== "boolean" && Array.isArray(schema.anyOf);
 };
 
+export const isAdhocAllOfSchema = (
+  schema: OpenApi.JSONSchema,
+): schema is Types.AllOfSchema & {
+  allOf: [OpenApi.Reference, OpenApi.JSONSchema];
+} => {
+  if (!isAllOfSchema(schema)) return false;
+  const [maybeReference, maybeAdhoc, ...rest] = schema.allOf;
+  return isReference(maybeReference) && !("type" in maybeAdhoc) && !isReference(maybeAdhoc) && rest.length === 0;
+};
+
 export const isComponentName = (name: string): name is Def.ComponentName => {
   return ["schemas", "headers", "responses", "parameters", "requestBodies", "securitySchemes", "pathItems"].includes(name);
 };

src/internal/OpenApiTools/toTypeNode.ts

@@ -9,7 +9,7 @@ import * as Reference from "./components/Reference";
 import * as ConverterContext from "./ConverterContext";
 import * as Guard from "./Guard";
 import * as InferredType from "./InferredType";
-import { ObjectSchemaWithAdditionalProperties } from "./types";
+import { AllOfSchema, ObjectSchemaWithAdditionalProperties } from "./types";
 
 export interface ResolveReferencePath {
   name: string;
@@ -44,6 +44,19 @@ export interface Option {
   useClientSchema?: boolean;
 }
 
+export const mergeAdhoc = (
+  currentPoint: string,
+  schema: AllOfSchema & {
+    allOf: [OpenApi.Reference, OpenApi.JSONSchema];
+  },
+  context: Context,
+): OpenApi.JSONSchema => {
+  const [reference, adhoc] = schema.allOf;
+  const { pathArray } = context.resolveReferencePath(currentPoint, reference.$ref);
+  const resolvedSchema = DotProp.get<OpenApi.JSONSchema>(context.rootSchema, pathArray.join("."));
+  return { ...resolvedSchema, ...adhoc };
+};
+
 export const generateMultiTypeNode = (
   entryPoint: string,
   currentPoint: string,
@@ -137,6 +150,10 @@ export const convert: Convert = (
     return convert(entryPoint, reference.referencePoint, factory, reference.data, context, converterContext, { ...option, parent: schema });
   }
 
+  if (Guard.isAdhocAllOfSchema(schema)) {
+    return convert(entryPoint, currentPoint, factory, mergeAdhoc(currentPoint, schema, context), context, converterContext, option);
+  }
+
   if (Guard.isOneOfSchema(schema)) {
     return nullable(
       factory,