@techspokes/typescript-wsdl-client 0.25.0 → 0.26.0

package/README.md

@@ -25,7 +25,7 @@ Most tools in this space stop at one layer: a SOAP runtime, type generation, or
 
 - Typed client, OpenAPI spec, REST gateway, and runnable app from one command
 - Deterministic output safe for CI regeneration and version control
-- Handles complex inheritance, `xs:attribute`, namespace collisions, nested XSD imports, and choice elements
+- Handles complex inheritance, `xs:attribute`, namespace collisions, nested XSD imports, and configurable `xs:choice` modeling
 - Generated `operations.ts` interface enables testing without importing `soap` or calling a live service
 - OpenAPI is a first-class output, not an afterthought; types, schemas, and descriptions stay aligned
 - Opt-in NDJSON streaming for large SOAP responses: client emits `AsyncIterable<RecordType>`, gateway flushes records incrementally, OpenAPI advertises the record schema via `x-wsdl-tsc-stream`
@@ -152,7 +152,7 @@ Real-world WSDL/XSD files are rarely clean. This generator handles patterns that
 - `xs:attribute` on complex types, flattened into peer properties alongside elements
 - Namespace collisions across multiple XSD imports, resolved deterministically
 - Deep import chains across multiple schema files
-- Configurable strategies for `<xs:choice>` element modeling
+- `<xs:choice>` groups modeled as default all-optional fields or opt-in exclusive unions with `--client-choice-mode union`
 - Correct optionality for nillable fields in both TypeScript and OpenAPI output
 - The `$value` pattern for simple content with attributes, preserving text content alongside attribute properties
 - `ArrayOf*` wrapper types, unwrapped automatically in OpenAPI with runtime bridging
@@ -233,6 +233,7 @@ See [CLI Reference](docs/cli-reference.md) for all flags and examples.
 | [Core Concepts](docs/concepts.md) | Flattening, $value, primitives, determinism |
 | [Architecture](docs/architecture.md) | Internal pipeline for contributors |
 | [Agent Skill Artifact](docs/agent-skill.md) | Release ZIP for consumer-project AI agents |
+| [Version 1.0 Roadmap Plan](docs/roadmap/README.md) | Implementation slices and release gates for 1.0 |
 | [Streamable Responses (ADR-002)](docs/decisions/002-streamable-responses.md) | Opt-in streaming: client `AsyncIterable`, gateway NDJSON, `x-wsdl-tsc-stream` |
 | [Version Migration](docs/migration.md) | Upgrading between package versions |
 

package/dist/app/generateApp.js

@@ -516,7 +516,7 @@ function generatePackageJson(appDir, force) {
         },
         devDependencies: {
             "@types/node": "^25.9.1",
-            tsx: "^4.22.3",
+            tsx: "^4.22.4",
             typescript: "^6.0.3",
         },
     };

package/dist/client/generateTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateTypes.d.ts","sourceRoot":"","sources":["../../src/client/generateTypes.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAC,eAAe,EAAe,MAAM,+BAA+B,CAAC;AAGjF;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,QAsMvE"}
+{"version":3,"file":"generateTypes.d.ts","sourceRoot":"","sources":["../../src/client/generateTypes.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAC,eAAe,EAA0D,MAAM,+BAA+B,CAAC;AAG5H;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,QAmRvE"}

package/dist/client/generateTypes.js

@@ -64,6 +64,65 @@ export function generateTypes(outFile, compiled) {
     const aliasNames = new Set(compiled.aliases.map((a) => a.name));
     const isValidIdent = (name) => /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(name);
     const emitPropName = (name) => (isValidIdent(name) ? name : JSON.stringify(name));
+    const isChoiceUnionMode = compiled.options.choice === "union";
+    const elementType = (e) => {
+        const isArray = e.max === "unbounded" || (e.max > 1);
+        return `${e.tsType}${isArray ? "[]" : ""}`;
+    };
+    const elementOptionalMarker = (e) => (compiled.options.nillableAsOptional && e.nillable) || (e.min ?? 0) === 0 ? "?" : "";
+    const emitElementProperty = (indent, e, options = {}) => {
+        const annObj = {
+            kind: e.name === "$value" ? "scalar value" : "element",
+            type: e.declaredType,
+            occurs: { min: e.min, max: e.max, nillable: e.nillable ?? false },
+        };
+        lines.push("");
+        if (e.doc) {
+            emitDocBlock(indent, e.doc, JSON.stringify(annObj));
+        }
+        else {
+            lines.push(`${indent}/** @xsd ${JSON.stringify(annObj)} */`);
+        }
+        lines.push(`${indent}${emitPropName(e.name)}${options.optionalMarker ?? elementOptionalMarker(e)}: ${options.tsType ?? elementType(e)};`);
+    };
+    const sortElementsForEmit = (elements) => {
+        elements.sort((a, b) => {
+            if (a.name === "$value")
+                return 1;
+            if (b.name === "$value")
+                return -1;
+            if (a.min !== 0 && b.min === 0)
+                return -1;
+            if (a.min === 0 && b.min !== 0)
+                return 1;
+            return a.name.localeCompare(b.name);
+        });
+    };
+    const sortAttributesForEmit = (attrs) => {
+        attrs.sort((a, b) => {
+            if (a.use === "required" && b.use !== "required")
+                return -1;
+            if (a.use !== "required" && b.use === "required")
+                return 1;
+            return a.name.localeCompare(b.name);
+        });
+    };
+    const emitAttributeProperty = (indent, a) => {
+        const opt = a.use === "required" ? "" : "?";
+        const annObj = {
+            kind: "attribute",
+            type: a.declaredType,
+            use: a.use || "optional",
+        };
+        lines.push("");
+        if (a.doc) {
+            emitDocBlock(indent, a.doc, JSON.stringify(annObj));
+        }
+        else {
+            lines.push(`${indent}/** @xsd ${JSON.stringify(annObj)} */`);
+        }
+        lines.push(`${indent}${emitPropName(a.name)}${opt}: ${a.tsType};`);
+    };
     const isSyntheticAliasSelfWrapper = (t) => {
         const elems = t.elems || [];
         return aliasNames.has(t.name) &&
@@ -110,13 +169,6 @@ export function generateTypes(outFile, compiled) {
         if (t.doc) {
             emitDocBlock("", t.doc);
         }
-        // Header: extend base type if applicable
-        if (baseName) {
-            lines.push(`export interface ${t.name} extends ${baseName} {`);
-        }
-        else {
-            lines.push(`export interface ${t.name} {`);
-        }
         // Prepare lists: for complexContent extension use only local additions
         const attrsToEmit = complexBase ? (t.localAttrs || []) : (t.attrs || []);
         // Elements list similar
@@ -127,6 +179,79 @@ export function generateTypes(outFile, compiled) {
             if (idx >= 0)
                 elementsToEmit.splice(idx, 1);
         }
+        const choiceGroupsToEmit = isChoiceUnionMode
+            ? (complexBase ? (t.localChoiceGroups || []) : (t.choiceGroups || []))
+            : [];
+        if (choiceGroupsToEmit.length > 0) {
+            const choiceElementNames = new Set(choiceGroupsToEmit.flatMap((group) => group.branches.map((branch) => branch.name)));
+            const baseElements = elementsToEmit.filter((e) => !choiceElementNames.has(e.name));
+            const baseNameForChoice = `${t.name}ChoiceBase`;
+            const choiceNames = choiceGroupsToEmit.map((group) => group.name).join(" & ");
+            lines.push(`export type ${t.name} = ${baseNameForChoice} & ${choiceNames};`);
+            lines.push("");
+            if (baseName) {
+                lines.push(`export interface ${baseNameForChoice} extends ${baseName} {`);
+            }
+            else {
+                lines.push(`export interface ${baseNameForChoice} {`);
+            }
+            if (0 < attrsToEmit.length) {
+                lines.push("");
+                lines.push("  /**");
+                lines.push((1 === attrsToEmit.length) ? "   * Attribute." : "   * Attributes.");
+                lines.push("   */");
+                sortAttributesForEmit(attrsToEmit);
+            }
+            for (const a of attrsToEmit) {
+                emitAttributeProperty("  ", a);
+            }
+            if (0 < baseElements.length) {
+                lines.push("");
+                lines.push("  /**");
+                lines.push((1 === baseElements.length) ? "   * Child element." : "   * Children elements.");
+                lines.push("   */");
+                sortElementsForEmit(baseElements);
+            }
+            for (const e of baseElements) {
+                if ((e.name === "$value") && (1 < baseElements.length)) {
+                    lines.push("");
+                }
+                emitElementProperty("  ", e);
+            }
+            lines.push("}");
+            lines.push("");
+            for (const group of choiceGroupsToEmit) {
+                const branchNames = group.branches.map((branch) => branch.name);
+                lines.push(`export type ${group.name} =`);
+                for (const branch of group.branches) {
+                    lines.push("  | {");
+                    emitElementProperty("    ", branch);
+                    for (const peerName of branchNames.filter((name) => name !== branch.name)) {
+                        lines.push("");
+                        lines.push(`    ${emitPropName(peerName)}?: never;`);
+                    }
+                    lines.push("  }");
+                }
+                if (group.min === 0) {
+                    lines.push("  | {");
+                    for (const peerName of branchNames) {
+                        lines.push("");
+                        lines.push(`    ${emitPropName(peerName)}?: never;`);
+                    }
+                    lines.push("  }");
+                }
+                lines.push(";");
+                lines.push("");
+            }
+            continue;
+        }
+        // Header: extend base type if applicable
+        if (baseName) {
+            lines.push(`export interface ${t.name} extends ${baseName} {`);
+        }
+        else {
+            lines.push(`export interface ${t.name} {`);
+        }
         //
         // Attributes — with JSDoc on every attribute
         //
@@ -136,33 +261,10 @@ export function generateTypes(outFile, compiled) {
             lines.push("  /**");
             lines.push((1 === t.attrs.length) ? "   * Attribute." : "   * Attributes.");
             lines.push("   */");
-            // Sort the elements with the following logic: required first (sorted a-z), then optional (sorted a-z)
-            attrsToEmit.sort((a, b) => {
-                // Required attributes come before optional attributes
-                if (a.use === "required" && b.use !== "required")
-                    return -1; // `a` is required, b is optional
-                if (a.use !== "required" && b.use === "required")
-                    return 1; // `a` is optional, b is required
-                // Within the same group (required or optional), sort alphabetically
-                return a.name.localeCompare(b.name);
-            });
+            sortAttributesForEmit(attrsToEmit);
         }
         for (const a of attrsToEmit) {
-            const opt = a.use === "required" ? "" : "?";
-            const annObj = {
-                kind: "attribute",
-                type: a.declaredType,
-                use: a.use || "optional",
-            };
-            lines.push("");
-            if (a.doc) {
-                emitDocBlock("  ", a.doc, JSON.stringify(annObj));
-            }
-            else {
-                const ann = `  /** @xsd ${JSON.stringify(annObj)} */`;
-                lines.push(ann);
-            }
-            lines.push(`  ${emitPropName(a.name)}${opt}: ${a.tsType};`);
+            emitAttributeProperty("  ", a);
         }
         //
         // Elements — with JSDoc on every element
@@ -174,45 +276,14 @@ export function generateTypes(outFile, compiled) {
             lines.push("  /**");
             lines.push((1 === elementsToEmit.length) ? "   * Child element." : "   * Children elements.");
             lines.push("   */");
-            // Sort the elements with the following logic: required first (sorted a-z), then optional (sorted a-z), and finally "$value" if present.
-            elementsToEmit.sort((a, b) => {
-                // Special case: $value is always last
-                if (a.name === "$value")
-                    return 1;
-                if (b.name === "$value")
-                    return -1;
-                // Required elements come before optional elements
-                if (a.min !== 0 && b.min === 0)
-                    return -1; // `a` is required, b is optional
-                if (a.min === 0 && b.min !== 0)
-                    return 1; // `a` is optional, b is required
-                // Within the same group (required or optional), sort alphabetically
-                return a.name.localeCompare(b.name);
-            });
+            sortElementsForEmit(elementsToEmit);
         }
         for (const e of elementsToEmit) {
-            const isArray = e.max === "unbounded" || (e.max > 1);
-            const arr = isArray ? "[]" : "";
-            const opt = (compiled.options.nillableAsOptional && e.nillable) || (e.min ?? 0) === 0 ? "?" : "";
-            const annObj = {
-                // if a.name === "$value", the kind should be "scalar value"
-                kind: e.name === "$value" ? "scalar value" : "element",
-                type: e.declaredType,
-                occurs: { min: e.min, max: e.max, nillable: e.nillable ?? false },
-            };
             // if the a.name === "$value" and we have more child elements, add an empty line before the annotation
             if ((e.name === "$value") && (1 < elementsToEmit.length)) {
                 lines.push("");
             }
-            lines.push("");
-            if (e.doc) {
-                emitDocBlock("  ", e.doc, JSON.stringify(annObj));
-            }
-            else {
-                const ann = `  /** @xsd ${JSON.stringify(annObj)} */`;
-                lines.push(ann);
-            }
-            lines.push(`  ${emitPropName(e.name)}${opt}: ${e.tsType}${arr};`);
+            emitElementProperty("  ", e);
         }
         lines.push("}");
         lines.push("");

package/dist/compiler/schemaCompiler.d.ts

@@ -38,6 +38,23 @@ export type CompiledWildcard = {
     namespace?: string;
     processContents?: "lax" | "strict" | "skip";
 };
+export type CompiledChoiceBranch = {
+    name: string;
+    tsType: string;
+    min: number;
+    max: number | "unbounded";
+    nillable?: boolean;
+    declaredType: string;
+    doc?: string;
+    sourceOrder: number;
+};
+export type CompiledChoiceGroup = {
+    name: string;
+    min: number;
+    max: number | "unbounded";
+    sourceOrder: number;
+    branches: CompiledChoiceBranch[];
+};
 /**
  * Represents a compiled complex type with attributes and elements
  *
@@ -91,6 +108,8 @@ export type CompiledType = {
         doc?: string;
     }>;
     wildcards?: CompiledWildcard[];
+    choiceGroups?: CompiledChoiceGroup[];
+    localChoiceGroups?: CompiledChoiceGroup[];
 };
 /**
  * Represents a compiled type alias (simple type or restricted type)

package/dist/compiler/schemaCompiler.d.ts.map

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

package/dist/compiler/schemaCompiler.js

@@ -317,6 +317,24 @@ export function compileCatalog(cat, options, streamConfig) {
                 }
             }
         };
+        const mergeChoiceGroups = (into, list) => {
+            if (list.length === 0)
+                return into;
+            const merged = into ? [...into] : [];
+            const idx = new Map();
+            merged.forEach((g, i) => idx.set(g.name, i));
+            for (const g of list) {
+                const pos = idx.get(g.name);
+                if (pos == null) {
+                    idx.set(g.name, merged.length);
+                    merged.push(g);
+                }
+                else {
+                    merged[pos] = g;
+                }
+            }
+            return merged;
+        };
         const collectAttributes = (node) => {
             const out = [];
             const attrs = getChildrenWithLocalName(node, "attribute");
@@ -380,61 +398,86 @@ export function compileCatalog(cat, options, streamConfig) {
             recurse(node);
             return out;
         };
+        const readOccurrence = (node) => {
+            const min = node["@_minOccurs"] ? Number(node["@_minOccurs"]) : 1;
+            const maxAttr = node["@_maxOccurs"];
+            const max = maxAttr === "unbounded" ? "unbounded" : maxAttr ? Number(maxAttr) : 1;
+            return { min, max };
+        };
+        const localNameOf = (key) => {
+            const idx = key.indexOf(":");
+            return idx >= 0 ? key.slice(idx + 1) : key;
+        };
+        const compositorChildren = (node) => {
+            const out = [];
+            for (const [key, value] of Object.entries(node || {})) {
+                const kind = localNameOf(key);
+                if (kind !== "element" && kind !== "sequence" && kind !== "all" && kind !== "choice") {
+                    continue;
+                }
+                const arr = Array.isArray(value) ? value : [value];
+                for (const child of arr.filter(Boolean)) {
+                    out.push({ kind, node: child });
+                }
+            }
+            return out;
+        };
+        const compileElementParticle = (ownerTypeName, e) => {
+            const nameOrRef = e["@_name"] || e["@_ref"];
+            if (!nameOrRef)
+                return undefined;
+            const propName = e["@_name"];
+            const { min, max } = readOccurrence(e);
+            const nillable = e["@_nillable"] === "true";
+            const inlineComplex = getFirstWithLocalName(e, "complexType");
+            const inlineSimple = getFirstWithLocalName(e, "simpleType");
+            if (inlineComplex) {
+                const inlineName = makeInlineTypeName(ownerTypeName, propName || nameOrRef, max);
+                const rec = getOrCompileComplex(inlineName, inlineComplex, schemaNS, prefixes);
+                return {
+                    name: propName || nameOrRef,
+                    tsType: rec.name,
+                    min,
+                    max,
+                    nillable,
+                    declaredType: `{${schemaNS}}${rec.name}`,
+                    doc: extractAnnotationDocumentation(e),
+                };
+            }
+            if (inlineSimple) {
+                const r = compileSimpleTypeNode(inlineSimple, schemaNS, prefixes);
+                return {
+                    name: propName || nameOrRef,
+                    tsType: r.tsType,
+                    min,
+                    max,
+                    nillable,
+                    declaredType: r.declared,
+                    doc: extractAnnotationDocumentation(e),
+                };
+            }
+            const t = e["@_type"] || e["@_ref"];
+            const q = t ? resolveQName(t, schemaNS, prefixes) : { ns: XS, local: "string" };
+            const r = resolveTypeRef(q, schemaNS, prefixes);
+            return {
+                name: propName || nameOrRef,
+                tsType: r.tsType,
+                min,
+                max,
+                nillable,
+                declaredType: r.declared,
+                doc: extractAnnotationDocumentation(e),
+            };
+        };
         const collectParticles = (ownerTypeName, node) => {
             const out = [];
             // process a compositor or element container recursively
             const recurse = (groupNode) => {
                 // handle direct element children
                 for (const e of getChildrenWithLocalName(groupNode, "element")) {
-                    const nameOrRef = e["@_name"] || e["@_ref"];
-                    if (!nameOrRef)
-                        continue;
-                    const propName = e["@_name"];
-                    const min = e["@_minOccurs"] ? Number(e["@_minOccurs"]) : 1;
-                    const maxAttr = e["@_maxOccurs"];
-                    const max = maxAttr === "unbounded" ? "unbounded" : maxAttr ? Number(maxAttr) : 1;
-                    const nillable = e["@_nillable"] === "true";
-                    const inlineComplex = getFirstWithLocalName(e, "complexType");
-                    const inlineSimple = getFirstWithLocalName(e, "simpleType");
-                    if (inlineComplex) {
-                        const inlineName = makeInlineTypeName(ownerTypeName, propName || nameOrRef, max);
-                        const rec = getOrCompileComplex(inlineName, inlineComplex, schemaNS, prefixes);
-                        out.push({
-                            name: propName || nameOrRef,
-                            tsType: rec.name,
-                            min,
-                            max,
-                            nillable,
-                            declaredType: `{${schemaNS}}${rec.name}`,
-                            doc: extractAnnotationDocumentation(e),
-                        });
-                    }
-                    else if (inlineSimple) {
-                        const r = compileSimpleTypeNode(inlineSimple, schemaNS, prefixes);
-                        out.push({
-                            name: propName || nameOrRef,
-                            tsType: r.tsType,
-                            min,
-                            max,
-                            nillable,
-                            declaredType: r.declared,
-                            doc: extractAnnotationDocumentation(e),
-                        });
-                    }
-                    else {
-                        const t = e["@_type"] || e["@_ref"];
-                        const q = t ? resolveQName(t, schemaNS, prefixes) : { ns: XS, local: "string" };
-                        const r = resolveTypeRef(q, schemaNS, prefixes);
-                        out.push({
-                            name: propName || nameOrRef,
-                            tsType: r.tsType,
-                            min,
-                            max,
-                            nillable,
-                            declaredType: r.declared,
-                            doc: extractAnnotationDocumentation(e),
-                        });
-                    }
+                    const particle = compileElementParticle(ownerTypeName, e);
+                    if (particle)
+                        out.push(particle);
                 }
                 // recurse into nested compositor groups
                 for (const comp of ["sequence", "all", "choice"]) {
@@ -446,17 +489,69 @@ export function compileCatalog(cat, options, streamConfig) {
             recurse(node);
             return out;
         };
+        const collectChoiceGroups = (ownerTypeName, node) => {
+            const out = [];
+            let choiceIndex = 0;
+            const recurse = (groupNode) => {
+                let sourceOrder = 0;
+                for (const child of compositorChildren(groupNode)) {
+                    if (child.kind === "choice") {
+                        const { min, max } = readOccurrence(child.node);
+                        const branches = [];
+                        let branchSourceOrder = 0;
+                        for (const e of getChildrenWithLocalName(child.node, "element")) {
+                            const particle = compileElementParticle(ownerTypeName, e);
+                            if (particle) {
+                                branches.push({
+                                    name: particle.name,
+                                    tsType: particle.tsType,
+                                    min: particle.min,
+                                    max: particle.max,
+                                    ...(particle.nillable ? { nillable: true } : {}),
+                                    declaredType: particle.declaredType,
+                                    ...(particle.doc ? { doc: particle.doc } : {}),
+                                    sourceOrder: branchSourceOrder,
+                                });
+                            }
+                            branchSourceOrder += 1;
+                        }
+                        if (branches.length > 0) {
+                            choiceIndex += 1;
+                            out.push({
+                                name: `${ownerTypeName}Choice${choiceIndex}`,
+                                min,
+                                max,
+                                sourceOrder,
+                                branches,
+                            });
+                        }
+                        recurse(child.node);
+                    }
+                    else if (child.kind === "sequence" || child.kind === "all") {
+                        recurse(child.node);
+                    }
+                    sourceOrder += 1;
+                }
+            };
+            recurse(node);
+            return out;
+        };
         const present = compiledMap.get(key);
         if (present) {
             // On duplicate definitions, merge new attributes and elements
             const newAttrs = collectAttributes(cnode);
             const newElems = collectParticles(outName, cnode);
             const newWildcards = collectWildcards(cnode);
+            const newChoiceGroups = collectChoiceGroups(outName, cnode);
             mergeAttrs(present.attrs, newAttrs);
             mergeElems(present.elems, newElems);
             if (newWildcards.length > 0) {
                 present.wildcards = [...(present.wildcards ?? []), ...newWildcards];
             }
+            const mergedChoiceGroups = mergeChoiceGroups(present.choiceGroups, newChoiceGroups);
+            if (mergedChoiceGroups && mergedChoiceGroups.length > 0) {
+                present.choiceGroups = mergedChoiceGroups;
+            }
             if (!present.doc && typeDoc) {
                 present.doc = typeDoc;
             }
@@ -467,6 +562,7 @@ export function compileCatalog(cat, options, streamConfig) {
         // result accumulators
         const attrs = [];
         const elems = [];
+        const choiceGroups = [];
         // Inheritance: complexContent
         const complexContent = getFirstWithLocalName(cnode, "complexContent");
         if (complexContent) {
@@ -486,14 +582,17 @@ export function compileCatalog(cat, options, streamConfig) {
                         // inherit base members
                         attrs.push(...baseType.attrs);
                         elems.push(...baseType.elems);
+                        choiceGroups.push(...(baseType.choiceGroups ?? []));
                     }
                 }
                 // collect local additions/overrides
                 const locals = collectAttributes(node);
                 const localElems = collectParticles(outName, node);
                 const localWildcards = collectWildcards(node);
+                const localChoiceGroups = collectChoiceGroups(outName, node);
                 attrs.push(...locals);
                 elems.push(...localElems);
+                choiceGroups.push(...localChoiceGroups);
                 const result = {
                     name: outName,
                     ns: schemaNS,
@@ -504,6 +603,8 @@ export function compileCatalog(cat, options, streamConfig) {
                     localAttrs: locals,
                     localElems,
                     ...(localWildcards.length > 0 ? { wildcards: localWildcards } : {}),
+                    ...(choiceGroups.length > 0 ? { choiceGroups } : {}),
+                    ...(localChoiceGroups.length > 0 ? { localChoiceGroups } : {}),
                 };
                 compiledMap.set(key, result);
                 inProgress.delete(key);
@@ -547,6 +648,7 @@ export function compileCatalog(cat, options, streamConfig) {
         mergeAttrs(attrs, collectAttributes(cnode));
         mergeElems(elems, collectParticles(outName, cnode));
         const wildcards = collectWildcards(cnode);
+        choiceGroups.push(...collectChoiceGroups(outName, cnode));
         const result = {
             name: outName,
             ns: schemaNS,
@@ -554,6 +656,7 @@ export function compileCatalog(cat, options, streamConfig) {
             elems,
             doc: typeDoc,
             ...(wildcards.length > 0 ? { wildcards } : {}),
+            ...(choiceGroups.length > 0 ? { choiceGroups } : {}),
         };
         compiledMap.set(key, result);
         inProgress.delete(rawKey);

package/dist/compiler/shapeResolver.js

@@ -251,6 +251,21 @@ function canonicalizeType(t) {
             namespace: w.namespace ?? null,
             processContents: w.processContents ?? null,
         })),
+        choiceGroups: (t.choiceGroups ?? []).map((g) => ({
+            name: g.name,
+            min: g.min,
+            max: g.max,
+            sourceOrder: g.sourceOrder,
+            branches: g.branches.map((b) => ({
+                name: b.name,
+                tsType: b.tsType,
+                min: b.min,
+                max: b.max,
+                nillable: !!b.nillable,
+                declaredType: b.declaredType,
+                sourceOrder: b.sourceOrder,
+            })),
+        })),
     });
 }
 function canonicalizeAlias(a) {

package/dist/openapi/generateSchemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateSchemas.d.ts","sourceRoot":"","sources":["../../src/openapi/generateSchemas.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,KAAK,EAAgB,eAAe,EAAe,MAAM,+BAA+B,CAAC;AAEhG;;;;;;GAMG;AACH,MAAM,WAAW,sBAAsB;IACrC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAwKpD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,eAAe,EAAE,IAAI,EAAE,sBAAsB,GAAG,iBAAiB,CAoD1G"}
+{"version":3,"file":"generateSchemas.d.ts","sourceRoot":"","sources":["../../src/openapi/generateSchemas.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,KAAK,EAAgB,eAAe,EAAe,MAAM,+BAA+B,CAAC;AAEhG;;;;;;GAMG;AACH,MAAM,WAAW,sBAAsB;IACrC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAkNpD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,eAAe,EAAE,IAAI,EAAE,sBAAsB,GAAG,iBAAiB,CA2D1G"}