Merge main branch - resolve conflicts in allOf additionalProperties handling

Author: Mxwllas

packages/openapi-ts/src/openApi/shared/types/schema.d.ts

@@ -6,7 +6,10 @@ export interface SchemaState {
   $ref?: string;
   circularReferenceTracker: Set<string>;
   /**
-   * True if current schema is being parsed inside an allOf composition.
+   * True if current schema is part of an allOf composition. This is used to
+   * avoid emitting [key: string]: never for empty objects with
+   * additionalProperties: false inside allOf, which would override inherited
+   * properties from other schemas in the composition.
    */
   inAllOf?: boolean;
   /**