feat: update version to 0.3.7 and enhance changelog; refactor allOfToOneOf to always remove discriminator from base schemas

Author: bartoszm

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.3.7] - 2025-11-28
+### Changed
+- Fixed OAS with discriminator cleanup
+- Refined `allOfToOneOf` tests to assert the new discriminator ownership model.
+
 ## [0.3.6] - 2025-11-28
 ### Added
 - Introduced a minimal polymorphic OpenAPI 3.1 example (`examples/polymorphic-minimal.yaml`) showcasing `allOf` inheritance with a discriminator-based base schema.

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@amartus/oas-utils",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "Utilities for working with OpenAPI (OAS) documents.",
   "type": "module",
   "main": "dist/index.js",

package.json

@@ -2,8 +2,6 @@ import { refToName, buildInheritanceGraph } from "./oasUtils.js";
 
 
 export interface AllOfToOneOfOptions {
-  /** If true, remove discriminator from base schema and let oneOf wrapper handle it */
-  removeDiscriminatorFromBase?: boolean;
   /** If true, add const property with discriminator value to specialization schemas (default: true) */
   addDiscriminatorConst?: boolean;
   /** If true, skip oneOf transformation if only one specialization is found (default: false) */
@@ -139,12 +137,10 @@ export function allOfToOneOf(doc: any, opts: AllOfToOneOfOptions = {}): any {
     }
   }
 
-  // Step 6: Optionally remove discriminator from base schemas
-  if (opts.removeDiscriminatorFromBase) {
-    for (const baseName of baseSchemasWithDiscriminator.keys()) {
-      if (schemas[baseName] && polymorphicWrappers.has(baseName)) {
-        delete schemas[baseName].discriminator;
-      }
+  // Step 6: Always remove discriminator from base schemas that were converted
+  for (const baseName of baseSchemasWithDiscriminator.keys()) {
+    if (schemas[baseName] && polymorphicWrappers.has(baseName)) {
+      delete schemas[baseName].discriminator;
     }
   }
 

src/lib/allOfToOneOf.ts

@@ -64,7 +64,7 @@ describe("allOfToOneOf", () => {
     );
   });
 
-  it("preserves base schema discriminator by default", () => {
+  it("removes discriminator from base schema after conversion", () => {
     const doc: any = {
       components: {
         schemas: {
@@ -77,22 +77,6 @@ describe("allOfToOneOf", () => {
     };
 
     allOfToOneOf(doc);
-    expect(doc.components.schemas.Animal.discriminator).toBeDefined();
-  });
-
-  it("removes discriminator from base when option is set", () => {
-    const doc: any = {
-      components: {
-        schemas: {
-          Animal: testSchemas.animalWithDiscriminator({
-            Cat: "#/components/schemas/Cat",
-          }),
-          Cat: testSchemas.catSpecialized(),
-        },
-      },
-    };
-
-    allOfToOneOf(doc, { removeDiscriminatorFromBase: true });
     expect(doc.components.schemas.Animal.discriminator).toBeUndefined();
   });