@amartus/oas-utils 0.5.2 → 0.7.0

package/README.md

@@ -1,6 +1,6 @@
 # oas-utils
 
-Utilities for working with OpenAPI (OAS) documents. Includes tools to remove unused schemas, remove entries from oneOf, optimize allOf composition, convert allOf + discriminator patterns to oneOf + discriminator, clean up discriminator mappings, and remove dangling `$ref` targets. Use them as a CLI or as Redocly decorators.
+Utilities for working with OpenAPI (OAS) documents. Includes tools to remove unused schemas, remove entries from oneOf, optimize allOf composition, convert allOf + discriminator patterns to oneOf + discriminator, clean up discriminator mappings, remove dangling `$ref` targets, and remove single-composition wrapper schemas. Use them as a CLI or as Redocly decorators.
 
 ## Definition of "unused schema"
 
@@ -76,23 +76,25 @@ Specifically, it:
 2. Finds concrete schemas that extend the base via allOf
 3. Optionally adds a const property to each concrete schema matching its discriminator value (enabled by default)
 4. Creates a new oneOf wrapper schema containing all concrete types
-5. Replaces references to the base schema with the wrapper schema (in polymorphic contexts)
+5. Replaces references to the base schema with the wrapper schema (outside of allOf composition contexts)
+6. Removes discriminators from base schemas that received wrappers
+7. Optionally merges nested oneOf schemas by inlining references to schemas that only contain oneOf
 
 ```
 oas-utils allof-to-oneof <input.yaml> -o output.yaml
-# Optionally remove discriminator from base schema
-oas-utils allof-to-oneof <input.yaml> -o output.yaml --remove-discriminator-from-base
 # Optionally skip adding const to specialization schemas
 oas-utils allof-to-oneof <input.yaml> -o output.yaml --no-add-discriminator-const
 # Optionally skip transformation if only one specialization is found
 oas-utils allof-to-oneof <input.yaml> -o output.yaml --ignore-single-specialization
+# Optionally merge nested oneOf schemas
+oas-utils allof-to-oneof <input.yaml> -o output.yaml --merge-nested-oneof
 ```
 
 Options:
 - -o, --output: write result to this file (defaults to stdout).
-- --remove-discriminator-from-base: remove the discriminator from base schemas after conversion.
 - --no-add-discriminator-const: do not add const property with discriminator value to specialization schemas.
 - --ignore-single-specialization: skip oneOf transformation if only one specialization is found (useful for bases with only one concrete implementation).
+- --merge-nested-oneof: merge nested oneOf schemas by inlining references to schemas that only contain oneOf.
 
 Example transformation (with addDiscriminatorConst enabled, the default):
 - Base schema `Animal` with discriminator `type` and mapping `{Cat: ..., Dog: ...}`
@@ -103,22 +105,43 @@ Example transformation (with addDiscriminatorConst enabled, the default):
 
 ### cleanup-discriminators
 
-Clean up discriminator mappings by removing entries that reference non-existent schemas. This is useful when schemas are removed but discriminator mappings are not updated, leaving dangling references.
+Clean up discriminator mappings by removing entries that reference non-existent schemas. This is useful when schemas are removed but discriminator mappings are not updated, leaving dangling references. Optionally, remove entire discriminators from schemas matching specified patterns.
 
 ```
 oas-utils cleanup-discriminators <input.yaml> -o output.yaml
 # Read from stdin and write to stdout
 cat openapi.yaml | oas-utils cleanup-discriminators > cleaned.yaml
+# Remove discriminators from schemas matching patterns
+oas-utils cleanup-discriminators spec.yaml --remove-patterns "*_RES" "*Response" -o output.yaml
 ```
 
 Options:
 - -o, --output: write result to this file (defaults to stdout).
+- --remove-patterns: schema name patterns for which discriminators should be removed entirely (supports glob-style wildcards like `*`).
 
 Example:
 - Original discriminator mapping: `{cat: '#/components/schemas/Cat', dog: '#/components/schemas/Dog', bird: '#/components/schemas/Bird'}`
 - After removing `Bird` schema: mapping entries `bird` is invalid
 - After cleanup: `{cat: '#/components/schemas/Cat', dog: '#/components/schemas/Dog'}`
 
+### remove-single-composition
+
+Remove single-composition wrapper schemas. A single-composition schema is one whose only content is a single `allOf`, `anyOf`, or `oneOf` containing exactly one `$ref`. Such schemas add indirection without semantic value and are replaced by their target reference.
+
+```
+oas-utils remove-single-composition <input.yaml> -o output.yaml
+# Read from stdin and write to stdout
+cat openapi.yaml | oas-utils remove-single-composition > cleaned.yaml
+```
+
+Options:
+- -o, --output: write result to this file (defaults to stdout).
+
+Example:
+- Schema `Foo` with `allOf: [{$ref: '#/components/schemas/Bar'}]`
+- `Foo` is removed and all references to `Foo` are replaced with `Bar`
+- Transitive chains are resolved: if `A`→`B`→`C` are all single-composition, both `A` and `B` are removed and references point to `C`
+
 ### seal-schema
 
 Seal object schemas to prevent additional properties. This ensures every final object shape exposed in the API is sealed (no additional properties allowed), without breaking schemas that are extended via `allOf`.
@@ -195,16 +218,22 @@ decorators:
 
   # Convert allOf + discriminator to oneOf + discriminator
   oas-utils/allof-to-oneof:
-    removeDiscriminatorFromBase: false
     addDiscriminatorConst: true
     ignoreSingleSpecialization: false
 
   # Clean up discriminator mappings
-  oas-utils/cleanup-discriminators: {}
+  oas-utils/cleanup-discriminators:
+    # Optional: remove discriminators from schemas matching these patterns
+    # removeDiscriminatorPatterns:
+    #   - '*_RES'
+    #   - '*Response'
 
   # Remove dangling $ref entries that point to missing component schemas
   oas-utils/remove-dangling-refs: {}
 
+  # Remove single-composition wrapper schemas
+  oas-utils/remove-single-composition: {}
+
   # Seal object schemas
   oas-utils/seal-schema:
     useUnevaluatedProperties: true
@@ -224,6 +253,7 @@ Notes:
 import {
   cleanupDiscriminatorMappings,
   removeDanglingRefs,
+  removeSingleComposition,
   removeUnusedSchemas,
   allOfToOneOf,
   sealSchema,
@@ -233,18 +263,29 @@ import {
 removeUnusedSchemas(doc, { keep: ['CommonError'], aggressive: true });
 
 // Convert allOf + discriminator to oneOf + discriminator
-allOfToOneOf(doc, { removeDiscriminatorFromBase: false, addDiscriminatorConst: true });
+allOfToOneOf(doc, { addDiscriminatorConst: true, mergeNestedOneOf: false });
 
 // Clean up discriminator mappings
 const result = cleanupDiscriminatorMappings(doc);
 console.log(`Removed ${result.mappingsRemoved} invalid mappings from ${result.schemasChecked} schemas`);
 
+// Clean up discriminator mappings and remove discriminators from schemas matching patterns
+const resultWithPatterns = cleanupDiscriminatorMappings(doc, {
+  removeDiscriminatorPatterns: ['*_RES', '*Response']
+});
+console.log(`Removed ${resultWithPatterns.discriminatorsRemoved} discriminator(s) from matching schemas`);
+console.log(`Removed schemas: ${resultWithPatterns.removedDiscriminators.join(', ')}`);
+
 // Seal object schemas
 sealSchema(doc, { useUnevaluatedProperties: true, uplift: true });
 
 // Remove dangling refs (aggressive mode prunes external URIs too)
 const dangling = removeDanglingRefs(doc, { aggressive: true });
 console.log(`Removed ${dangling.removed} dangling $ref(s)`);
+
+// Remove single-composition wrapper schemas
+const single = removeSingleComposition(doc);
+console.log(`Removed ${single.schemasRemoved} single-composition schema(s)`);
 ```
 
 ## Notes

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import fs from "node:fs/promises";
 import { Command } from "commander";
-import { runRemoveUnused, runRemoveOneOf, optimizeAllOf, runAllOfToOneOf, runSealSchema, runCleanupDiscriminators } from "./lib/cliActions.js";
+import { runRemoveUnused, runRemoveOneOf, optimizeAllOf, runAllOfToOneOf, runSealSchema, runCleanupDiscriminators, runRemoveSingleComposition } from "./lib/cliActions.js";
 import YAML from "yaml";
 import { dropNulls } from "./lib/utils.js";
 import { createRequire } from "node:module";
@@ -60,9 +60,9 @@ program
     .description("Convert allOf + discriminator patterns to oneOf + discriminator")
     .argument("[input]", "Path to input OpenAPI file (YAML or JSON). If omitted, reads from stdin")
     .option("-o, --output <file>", "Write result to this file (defaults to stdout)")
-    .option("--remove-discriminator-from-base", "Remove discriminator from base schemas after conversion", false)
     .option("--no-add-discriminator-const", "Do not add const property with discriminator value to specialization schemas", true)
     .option("--ignore-single-specialization", "Skip oneOf transformation if only one specialization is found", false)
+    .option("--merge-nested-oneof", "Merge nested oneOf schemas by inlining references to schemas that only contain oneOf", false)
     .action(async (input, opts) => {
     try {
         await runAllOfToOneOf(opts, format, () => reader(input));
@@ -97,6 +97,7 @@ program
     .description("Clean up discriminator mappings by removing references to non-existent schemas")
     .argument("[input]", "Path to input OpenAPI file (YAML or JSON). If omitted, reads from stdin")
     .option("-o, --output <file>", "Write result to this file (defaults to stdout)")
+    .option("--remove-patterns <patterns...>", "Schema name patterns for which discriminators should be removed entirely (e.g., *_RES)", [])
     .action(async (input, opts) => {
     try {
         await runCleanupDiscriminators(opts, format, () => reader(input));
@@ -106,6 +107,22 @@ program
         process.exitCode = 1;
     }
 });
+program
+    .command("remove-single-composition")
+    .showHelpAfterError()
+    .description("Remove single-composition wrapper schemas (allOf/anyOf/oneOf with a single $ref)")
+    .argument("[input]", "Path to input OpenAPI file (YAML or JSON). If omitted, reads from stdin")
+    .option("-o, --output <file>", "Write result to this file (defaults to stdout)")
+    .option("--aggressive", "Also remove schemas with extra keywords (e.g. description, discriminator) alongside the composition keyword, unless properties is present", false)
+    .action(async (input, opts) => {
+    try {
+        await runRemoveSingleComposition(opts, format, () => reader(input));
+    }
+    catch (err) {
+        console.error(`Error: ${err?.message || String(err)}`);
+        process.exitCode = 1;
+    }
+});
 if (process.argv.length <= 2) {
     program.help();
 }

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,10 +1,11 @@
 export * from './lib/removeUnusedSchemas.js';
 export * from './lib/removeFromOneOfByName.js';
 export * from './lib/optimizeAllOfComposition.js';
-export * from './lib/allOfToOneOf.js';
+export * from './lib/allOfToOneOfJsonPath.js';
 export * from './lib/sealSchema.js';
 export * from './lib/oasUtils.js';
 export * from './lib/cleanupDiscriminatorMappings.js';
 export * from './lib/schemaTransformUtils.js';
 export * from './lib/removeDanglingRefs.js';
+export * from './lib/removeSingleComposition.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,mCAAmC,CAAC;AAClD,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uCAAuC,CAAC;AACtD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,mCAAmC,CAAC;AAClD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uCAAuC,CAAC;AACtD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kCAAkC,CAAC"}

package/dist/index.js

@@ -1,10 +1,11 @@
 export * from './lib/removeUnusedSchemas.js';
 export * from './lib/removeFromOneOfByName.js';
 export * from './lib/optimizeAllOfComposition.js';
-export * from './lib/allOfToOneOf.js';
+export * from './lib/allOfToOneOfJsonPath.js';
 export * from './lib/sealSchema.js';
 export * from './lib/oasUtils.js';
 export * from './lib/cleanupDiscriminatorMappings.js';
 export * from './lib/schemaTransformUtils.js';
 export * from './lib/removeDanglingRefs.js';
+export * from './lib/removeSingleComposition.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,mCAAmC,CAAC;AAClD,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uCAAuC,CAAC;AACtD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,mCAAmC,CAAC;AAClD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uCAAuC,CAAC;AACtD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kCAAkC,CAAC"}

package/dist/lib/allOfToOneOfInterface.d.ts

@@ -0,0 +1,36 @@
+/**
+ * Common interface for allOf to oneOf transformation implementations
+ */
+export interface AllOfToOneOfOptions {
+    /** 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) */
+    ignoreSingleSpecialization?: boolean;
+    /** If true, merge nested oneOf schemas by inlining references to schemas that only contain oneOf (default: false) */
+    mergeNestedOneOf?: boolean;
+    /** Optional callback to receive warnings during transformation. If not provided, warnings are silently ignored. */
+    onWarning?: (message: string) => void;
+}
+/**
+ * Transforms allOf + discriminator patterns to oneOf + discriminator in OpenAPI documents.
+ *
+ * @param doc - The OpenAPI document to transform (will be modified in-place)
+ * @param opts - Optional configuration for the transformation
+ * @returns The transformed document (same reference as input)
+ *
+ * @example
+ * ```typescript
+ * import { allOfToOneOf } from "./lib/allOfToOneOfJsonPath.js";
+ *
+ * const doc = { ... }; // OpenAPI document
+ * const transformed = allOfToOneOf(doc, {
+ *   addDiscriminatorConst: true,
+ *   ignoreSingleSpecialization: false,
+ *   mergeNestedOneOf: false
+ * });
+ * ```
+ */
+export interface AllOfToOneOfTransform {
+    (doc: any, opts?: AllOfToOneOfOptions): any;
+}
+//# sourceMappingURL=allOfToOneOfInterface.d.ts.map

package/dist/lib/allOfToOneOfInterface.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"allOfToOneOfInterface.d.ts","sourceRoot":"","sources":["../../src/lib/allOfToOneOfInterface.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,MAAM,WAAW,mBAAmB;IAClC,qGAAqG;IACrG,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,8FAA8F;IAC9F,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,qHAAqH;IACrH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,mHAAmH;IACnH,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,WAAW,qBAAqB;IACpC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,mBAAmB,GAAG,GAAG,CAAC;CAC7C"}

package/dist/lib/allOfToOneOfInterface.js

@@ -0,0 +1,5 @@
+/**
+ * Common interface for allOf to oneOf transformation implementations
+ */
+export {};
+//# sourceMappingURL=allOfToOneOfInterface.js.map

package/dist/lib/allOfToOneOfInterface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"allOfToOneOfInterface.js","sourceRoot":"","sources":["../../src/lib/allOfToOneOfInterface.ts"],"names":[],"mappings":"AAAA;;GAEG"}

package/dist/lib/allOfToOneOfJsonPath.d.ts

@@ -0,0 +1,60 @@
+import { AllOfToOneOfOptions } from './allOfToOneOfInterface.js';
+/**
+ * Third implementation of allOfToOneOf using JSONPath library.
+ *
+ * This implementation focuses on using JSONPath queries for:
+ * - Finding all allOf relationships
+ * - Locating references to schemas
+ * - Replacing references throughout the document
+ *
+ * Algorithm:
+ * 1. Find discriminator parents (schemas with discriminator.mapping with >1 entry)
+ * 2. Build inheritance graph using JSONPath to find allOf relationships
+ * 3. For each discriminator parent:
+ *    - Find all references using JSONPath
+ *    - Check if referenced outside composition contexts
+ *    - If yes, create polymorphic wrapper
+ * 4. Rewire references using JSONPath
+ * 5. Remove discriminators from parents
+ * 6. Optionally add const constraints to children
+ * 7. Handle nested hierarchies (chain wrappers)
+ */
+interface SchemaReference {
+    $ref: string;
+}
+interface DiscriminatorObject {
+    propertyName: string;
+    mapping: Record<string, string>;
+}
+interface SchemaObject {
+    type?: string;
+    properties?: Record<string, unknown>;
+    allOf?: Array<SchemaReference | SchemaObject>;
+    oneOf?: Array<SchemaReference | SchemaObject>;
+    anyOf?: Array<SchemaReference | SchemaObject>;
+    discriminator?: Partial<DiscriminatorObject>;
+    [key: string]: unknown;
+}
+interface ComponentsObject {
+    schemas?: Record<string, SchemaObject>;
+    requestBodies?: Record<string, unknown>;
+    responses?: Record<string, unknown>;
+    parameters?: Record<string, unknown>;
+    callbacks?: Record<string, unknown>;
+    links?: Record<string, unknown>;
+    headers?: Record<string, unknown>;
+}
+interface OpenAPIDocument {
+    openapi?: string;
+    components?: ComponentsObject;
+    paths?: Record<string, unknown>;
+    webhooks?: Record<string, unknown>;
+    [key: string]: unknown;
+}
+/**
+ * Main transformation function.
+ * Converts allOf + discriminator patterns to oneOf wrappers using JSONPath.
+ */
+export declare function allOfToOneOf(doc: OpenAPIDocument, opts?: AllOfToOneOfOptions): OpenAPIDocument;
+export {};
+//# sourceMappingURL=allOfToOneOfJsonPath.d.ts.map

package/dist/lib/allOfToOneOfJsonPath.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"allOfToOneOfJsonPath.d.ts","sourceRoot":"","sources":["../../src/lib/allOfToOneOfJsonPath.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGjE;;;;;;;;;;;;;;;;;;;GAmBG;AAGH,UAAU,eAAe;IACvB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,mBAAmB;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC;AAED,UAAU,YAAY;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,KAAK,CAAC,EAAE,KAAK,CAAC,eAAe,GAAG,YAAY,CAAC,CAAC;IAC9C,KAAK,CAAC,EAAE,KAAK,CAAC,eAAe,GAAG,YAAY,CAAC,CAAC;IAC9C,KAAK,CAAC,EAAE,KAAK,CAAC,eAAe,GAAG,YAAY,CAAC,CAAC;IAC9C,aAAa,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC7C,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,UAAU,gBAAgB;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACvC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAED,UAAU,eAAe;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAqpBD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,GAAE,mBAAwB,GAAG,eAAe,CA4BlG"}