@redocly/client-generator 0.3.7 → 0.4.0

package/lib/generators/typescript/type-guards.d.ts

@@ -0,0 +1,4 @@
+import type { NamedSchemaModel } from '@redocly/client-generator';
+/** `is<Member>(value): value is <Member>` guards for every discriminated union (explicit or implicit). */
+export declare function renderTypeGuards(schemas: NamedSchemaModel[]): string;
+//# sourceMappingURL=type-guards.d.ts.map

package/lib/generators/typescript/type-guards.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-guards.d.ts","sourceRoot":"","sources":["../../../src/generators/typescript/type-guards.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAsB,gBAAgB,EAAe,MAAM,2BAA2B,CAAC;AAanG,0GAA0G;AAC1G,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,MAAM,CAuCpE"}

package/lib/{emitters → generators/typescript}/type-guards.js

@@ -1,32 +1,13 @@
-import { jsdoc, ts } from './ts.js';
-/**
- * Emit `is<Member>(value): value is <Member>` type guards for every discriminated
- * union with a usable discriminator — whether it is a top-level named schema
- * (`MenuItem = A | B`) or nested inside one (e.g. the `items` of an array, the
- * value of a property). Two discriminator sources:
- *
- * - Explicit: the union carries a `discriminator` (built from the spec).
- * - Implicit: no discriminator, but every member is a ref to a named schema and
- *   they all constrain one shared property to a distinct string `const`.
- *
- * Nested unions only qualify when every member is a ref to a named schema, so the
- * `value` parameter is a clean union of exported types. Guard names are globally
- * deduped (`is<Member>`), keeping the first in document order — so a top-level
- * union wins its nicer `value: <UnionName>` parameter over a nested re-occurrence.
- * Undiscriminated unions are skipped — TypeScript can't soundly narrow them.
- * Returns the guard declarations as nodes (empty when no union narrows).
- */
-export function typeGuardStatements(schemas) {
+/** `is<Member>(value): value is <Member>` guards for every discriminated union (explicit or implicit). */
+export function renderTypeGuards(schemas) {
     const byName = new Map(schemas.map((s) => [s.name, s.schema]));
-    const nodes = [];
+    const blocks = [];
     const emitted = new Set();
     for (const named of schemas) {
         for (const site of collectUnionSites(named)) {
             const discriminator = site.union.discriminator ?? detectImplicitDiscriminator(site.union, byName);
             if (!discriminator)
                 continue;
-            // Group discriminant values by target schema so two mapping keys pointing at
-            // the same type produce one guard (a duplicate `is<Name>` would not compile).
             const valuesByTarget = new Map();
             for (const entry of discriminator.mapping) {
                 if (!byName.has(entry.schemaName))
@@ -42,13 +23,23 @@ export function typeGuardStatements(schemas) {
                 if (emitted.has(guardName))
                     continue;
                 emitted.add(guardName);
-                nodes.push(buildTypeGuard(site.makeParamType(), site.label, discriminator.propertyName, schemaName, values));
+                const access = `(value as Record<string, unknown>)[${JSON.stringify(discriminator.propertyName)}]`;
+                const check = values.length === 1
+                    ? `${access} === ${JSON.stringify(values[0])}`
+                    : `([${values.map((value) => JSON.stringify(value)).join(', ')}] as readonly unknown[]).includes(${access})`;
+                blocks.push([
+                    '/**',
+                    ` * Narrow a \`${site.label}\` to \`${schemaName}\` via its \`${discriminator.propertyName}\` discriminant.`,
+                    ' */',
+                    `export function ${guardName}(value: ${site.label}): value is ${schemaName} {`,
+                    `    return ${check};`,
+                    '}',
+                ].join('\n'));
             }
         }
     }
-    return nodes;
+    return blocks.join('\n\n');
 }
-const { factory } = ts;
 /**
  * The discriminated-union sites reachable from a named schema, in a stable order:
  * the schema itself (when it is a union), then any nested unions found by walking
@@ -59,11 +50,7 @@ function collectUnionSites(named) {
     const sites = [];
     const root = named.schema;
     if (root.kind === 'union') {
-        sites.push({
-            union: root,
-            label: named.name,
-            makeParamType: () => factory.createTypeReferenceNode(named.name),
-        });
+        sites.push({ union: root, label: named.name });
         for (const member of root.members)
             collectNestedSites(member, sites);
     }
@@ -78,11 +65,7 @@ function collectNestedSites(schema, sites) {
         case 'union': {
             const names = schema.members.map((m) => (m.kind === 'ref' ? m.name : undefined));
             if (names.every((n) => n !== undefined)) {
-                sites.push({
-                    union: schema,
-                    label: names.join(' | '),
-                    makeParamType: () => factory.createUnionTypeNode(names.map((n) => factory.createTypeReferenceNode(n))),
-                });
+                sites.push({ union: schema, label: names.join(' | ') });
             }
             for (const member of schema.members)
                 collectNestedSites(member, sites);
@@ -105,23 +88,6 @@ function collectNestedSites(schema, sites) {
         // scalar / literal / enum / ref / null / unknown / omit have no nested unions.
     }
 }
-/** `(value as Record<string, unknown>)[<prop>]` — the narrowed property access. */
-function propertyAccess(propertyName) {
-    const recordType = factory.createTypeReferenceNode('Record', [
-        factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
-        factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword),
-    ]);
-    return factory.createElementAccessExpression(factory.createAsExpression(factory.createIdentifier('value'), recordType), factory.createStringLiteral(propertyName));
-}
-function buildTypeGuard(paramType, unionLabel, propertyName, schemaName, values) {
-    const access = propertyAccess(propertyName);
-    const check = values.length === 1
-        ? factory.createBinaryExpression(access, factory.createToken(ts.SyntaxKind.EqualsEqualsEqualsToken), factory.createStringLiteral(values[0]))
-        : // `([...values] as readonly unknown[]).includes(<access>)`
-            factory.createCallExpression(factory.createPropertyAccessExpression(factory.createParenthesizedExpression(factory.createAsExpression(factory.createArrayLiteralExpression(values.map((v) => factory.createStringLiteral(v))), factory.createTypeOperatorNode(ts.SyntaxKind.ReadonlyKeyword, factory.createArrayTypeNode(factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword))))), 'includes'), undefined, [access]);
-    const fn = factory.createFunctionDeclaration([factory.createModifier(ts.SyntaxKind.ExportKeyword)], undefined, `is${schemaName}`, undefined, [factory.createParameterDeclaration(undefined, undefined, 'value', undefined, paramType)], factory.createTypePredicateNode(undefined, 'value', factory.createTypeReferenceNode(schemaName)), factory.createBlock([factory.createReturnStatement(check)], true));
-    return jsdoc(fn, `Narrow a \`${unionLabel}\` to \`${schemaName}\` via its \`${propertyName}\` discriminant.`);
-}
 /**
  * Detect an implicit discriminator: every member is a ref to a named schema,
  * and they all pin one shared property to a distinct string literal. Returns

package/lib/generators/typescript/type-guards.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-guards.js","sourceRoot":"","sources":["../../../src/generators/typescript/type-guards.ts"],"names":[],"mappings":"AAaA,0GAA0G;AAC1G,MAAM,UAAU,gBAAgB,CAAC,OAA2B;IAC1D,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAU,CAAC,CAAC,CAAC;IACxE,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,KAAK,MAAM,IAAI,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5C,MAAM,aAAa,GACjB,IAAI,CAAC,KAAK,CAAC,aAAa,IAAI,2BAA2B,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAC9E,IAAI,CAAC,aAAa;gBAAE,SAAS;YAC7B,MAAM,cAAc,GAAG,IAAI,GAAG,EAAoB,CAAC;YACnD,KAAK,MAAM,KAAK,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC;gBAC1C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC;oBAAE,SAAS;gBAC5C,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBACtD,IAAI,QAAQ;oBAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;;oBACpC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;YAC3D,CAAC;YACD,KAAK,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,cAAc,EAAE,CAAC;gBAClD,MAAM,SAAS,GAAG,KAAK,UAAU,EAAE,CAAC;gBACpC,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;oBAAE,SAAS;gBACrC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBACvB,MAAM,MAAM,GAAG,sCAAsC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC;gBACnG,MAAM,KAAK,GACT,MAAM,CAAC,MAAM,KAAK,CAAC;oBACjB,CAAC,CAAC,GAAG,MAAM,QAAQ,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;oBAC9C,CAAC,CAAC,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,qCAAqC,MAAM,GAAG,CAAC;gBACjH,MAAM,CAAC,IAAI,CACT;oBACE,KAAK;oBACL,iBAAiB,IAAI,CAAC,KAAK,WAAW,UAAU,gBAAgB,aAAa,CAAC,YAAY,kBAAkB;oBAC5G,KAAK;oBACL,mBAAmB,SAAS,WAAW,IAAI,CAAC,KAAK,eAAe,UAAU,IAAI;oBAC9E,cAAc,KAAK,GAAG;oBACtB,GAAG;iBACJ,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED;;;;;GAKG;AACH,SAAS,iBAAiB,CAAC,KAAuB;IAChD,MAAM,KAAK,GAAgB,EAAE,CAAC;IAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC;IAC1B,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC1B,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QAC/C,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO;YAAE,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACvE,CAAC;SAAM,CAAC;QACN,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAClC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,kFAAkF;AAClF,SAAS,kBAAkB,CAAC,MAAmB,EAAE,KAAkB;IACjE,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;YACjF,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,EAAE,CAAC;gBACrD,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC1D,CAAC;YACD,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO;gBAAE,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACvE,MAAM;QACR,CAAC;QACD,KAAK,OAAO;YACV,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACxC,MAAM;QACR,KAAK,QAAQ;YACX,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACxC,MAAM;QACR,KAAK,QAAQ;YACX,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,UAAU;gBAAE,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAC7E,MAAM;QACR,KAAK,cAAc;YACjB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO;gBAAE,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACvE,MAAM;QACR,+EAA+E;IACjF,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,2BAA2B,CAClC,KAA8C,EAC9C,MAAgC;IAEhC,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QACnC,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK;YAAE,OAAO,SAAS,CAAC;QAC5C,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,MAAM;YAAE,OAAO,SAAS,CAAC;QAC9B,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IACD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAE7C,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,CAAC,CAAC;IAEvF,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,IAAI,KAAK,CAAC;YAAE,SAAS;QACrE,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;QACjE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC;YAAE,SAAS;QACvE,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,MAAM;YAAE,SAAS;QACrD,OAAO;YACL,YAAY,EAAE,QAAQ;YACtB,OAAO,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBACrC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAW;gBAC1B,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;SACJ,CAAC;IACJ,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;GAIG;AACH,SAAS,cAAc,CAAC,MAAmB;IACzC,MAAM,GAAG,GAA8C,EAAE,CAAC;IAC1D,MAAM,OAAO,GAAG,CAAC,CAAc,EAAQ,EAAE;QACvC,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACxB,KAAK,MAAM,IAAI,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;gBAChC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS;oBAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YACzE,CAAC;QACH,CAAC;aAAM,IAAI,CAAC,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YACrC,KAAK,MAAM,MAAM,IAAI,CAAC,CAAC,OAAO;gBAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAClD,CAAC;IACH,CAAC,CAAC;IACF,OAAO,CAAC,MAAM,CAAC,CAAC;IAChB,OAAO,GAAG,CAAC;AACb,CAAC"}

package/lib/generators/typescript/types.d.ts

@@ -0,0 +1,8 @@
+import { type DateType, type NamedSchemaModel, type SchemaMetadata, type SchemaModel } from '@redocly/client-generator';
+/** A JSDoc block (description + metadata tags) as indented lines, or [] when empty. */
+export declare function tsJsdoc(text: string | undefined, metadata: SchemaMetadata | undefined, indent: string): string[];
+/** The TypeScript type for an IR schema, rendered at `indent` (the containing line's indent). */
+export declare function tsType(schema: SchemaModel, dateType?: DateType, indent?: string): string;
+/** The model type aliases (with JSDoc and enum const companions), blank-line separated. */
+export declare function renderTypeAliases(schemas: NamedSchemaModel[], dateType?: DateType): string;
+//# sourceMappingURL=types.d.ts.map

package/lib/generators/typescript/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/generators/typescript/types.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,gBAAgB,EAGrB,KAAK,cAAc,EACnB,KAAK,WAAW,EACjB,MAAM,2BAA2B,CAAC;AAUnC,uFAAuF;AACvF,wBAAgB,OAAO,CACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,QAAQ,EAAE,cAAc,GAAG,SAAS,EACpC,MAAM,EAAE,MAAM,GACb,MAAM,EAAE,CAUV;AAsCD,iGAAiG;AACjG,wBAAgB,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,GAAE,QAAmB,EAAE,MAAM,SAAK,GAAG,MAAM,CA6C9F;AA+BD,2FAA2F;AAC3F,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,gBAAgB,EAAE,EAC3B,QAAQ,GAAE,QAAmB,GAC5B,MAAM,CAYR"}

package/lib/generators/typescript/types.js

@@ -0,0 +1,132 @@
+// TypeScript TYPES as source text: pure string logic over the IR, no
+// `typescript` import. Formatting contract: 4-space indent, double-quoted
+// literals, compound members parenthesized inside unions/intersections/arrays.
+import { escapeJsDoc, isIdentifier, jsdocText, safeIdent, } from '@redocly/client-generator/printers/typescript';
+const INDENT = '    ';
+/** A JSDoc block (description + metadata tags) as indented lines, or [] when empty. */
+export function tsJsdoc(text, metadata, indent) {
+    const body = jsdocText(text, metadata);
+    if (body === undefined)
+        return [];
+    return [
+        `${indent}/**`,
+        ...escapeJsDoc(body)
+            .split('\n')
+            .map((line) => `${indent} * ${line}`.replace(/ +$/, '')),
+        `${indent} */`,
+    ];
+}
+function literalType(value) {
+    return typeof value === 'string' ? JSON.stringify(value) : String(value);
+}
+function scalarType(kind, metadata, dateType) {
+    switch (kind) {
+        case 'string':
+            if (metadata?.format === 'binary')
+                return 'Blob';
+            if (dateType === 'Date' &&
+                (metadata?.format === 'date-time' || metadata?.format === 'date')) {
+                return 'Date';
+            }
+            return 'string';
+        case 'number':
+        case 'integer':
+            return 'number';
+        case 'boolean':
+            return 'boolean';
+    }
+}
+/** True when the rendered type needs parentheses as an array element / intersection member. */
+function isCompound(schema) {
+    return (schema.kind === 'union' ||
+        schema.kind === 'intersection' ||
+        (schema.kind === 'enum' && schema.values.length > 1));
+}
+/** The TypeScript type for an IR schema, rendered at `indent` (the containing line's indent). */
+export function tsType(schema, dateType = 'string', indent = '') {
+    switch (schema.kind) {
+        case 'scalar':
+            return scalarType(schema.scalar, schema.metadata, dateType);
+        case 'ref':
+            return schema.name;
+        case 'literal':
+            return literalType(schema.value);
+        case 'enum':
+            return schema.values.map(literalType).join(' | ');
+        case 'null':
+            return 'null';
+        case 'unknown':
+            return 'unknown';
+        case 'array': {
+            const element = tsType(schema.items, dateType, indent);
+            return isCompound(schema.items) ? `(${element})[]` : `${element}[]`;
+        }
+        case 'record':
+            return `Record<string, ${tsType(schema.value, dateType, indent)}>`;
+        case 'object': {
+            if (schema.properties.length === 0)
+                return '{}';
+            const inner = indent + INDENT;
+            const lines = schema.properties.flatMap((property) => propertyLines(property, dateType, inner));
+            return `{\n${lines.join('\n')}\n${indent}}`;
+        }
+        case 'union':
+            return schema.members
+                .map((member) => {
+                const rendered = tsType(member, dateType, indent);
+                return isCompound(member) ? `(${rendered})` : rendered;
+            })
+                .join(' | ');
+        case 'intersection':
+            return schema.members
+                .map((member) => {
+                const rendered = tsType(member, dateType, indent);
+                return isCompound(member) ? `(${rendered})` : rendered;
+            })
+                .join(' & ');
+        case 'omit':
+            return `Omit<${schema.base}, ${schema.keys.map((key) => JSON.stringify(key)).join(' | ')}>`;
+    }
+}
+function propertyLines(property, dateType, indent) {
+    const name = safeIdent(property.name);
+    const readonly = property.readOnly ? 'readonly ' : '';
+    const optional = property.required ? '' : '?';
+    const type = tsType(property.schema, dateType, indent);
+    return [
+        ...tsJsdoc(property.description, property.schema.metadata, indent),
+        `${indent}${readonly}${name}${optional}: ${type};`,
+    ];
+}
+/**
+ * For a named **string** enum whose values are all valid identifiers, the runtime
+ * companion `export const X = { a: "a", … } as const;` (cohabiting with the type).
+ */
+function enumConstLines(named) {
+    const schema = named.schema;
+    if (schema.kind !== 'enum' || schema.scalar !== 'string')
+        return [];
+    if (!schema.values.every((value) => typeof value === 'string' && isIdentifier(value)))
+        return [];
+    return [
+        `export const ${named.name} = {`,
+        ...schema.values.map((value, index) => `${INDENT}${value}: ${JSON.stringify(value)}${index === schema.values.length - 1 ? '' : ','}`),
+        '} as const;',
+    ];
+}
+/** The model type aliases (with JSDoc and enum const companions), blank-line separated. */
+export function renderTypeAliases(schemas, dateType = 'string') {
+    const blocks = [];
+    for (const named of schemas) {
+        const lines = [
+            ...tsJsdoc(named.schema.description ?? named.description, named.schema.metadata, ''),
+            `export type ${named.name} = ${tsType(named.schema, dateType)};`,
+        ];
+        blocks.push(lines.join('\n'));
+        const constCompanion = enumConstLines(named);
+        if (constCompanion.length > 0)
+            blocks.push(constCompanion.join('\n'));
+    }
+    return blocks.join('\n\n');
+}
+//# sourceMappingURL=types.js.map

package/lib/generators/typescript/types.js.map

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

package/lib/generators/{zod.d.ts → zod/index.d.ts}

@@ -1,4 +1,4 @@
-import type { Generator } from './types.js';
+import type { Generator } from '@redocly/client-generator';
 /**
  * The zod generator: a standalone `<stem>.zod.ts` module of Zod schemas (one
  * `export const <Name>Schema` per IR named schema), plus runtime validation for
@@ -11,4 +11,4 @@ import type { Generator } from './types.js';
  * named schemas nor JSON operation bodies.
  */
 export declare const zodGenerator: Generator;
-//# sourceMappingURL=zod.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/lib/generators/zod/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/zod/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAK3D;;;;;;;;;;GAUG;AACH,eAAO,MAAM,YAAY,EAAE,SAK1B,CAAC"}

package/lib/generators/{zod.js → zod/index.js}

@@ -1,7 +1,5 @@
 import { join } from 'node:path';
-import { HEADER } from '../emitters/emit-options.js';
-import { renderZodModule } from '../emitters/zod.js';
-import { anchor } from './anchor.js';
+import { renderZodModule } from "./schemas.js";
 /**
  * The zod generator: a standalone `<stem>.zod.ts` module of Zod schemas (one
  * `export const <Name>Schema` per IR named schema), plus runtime validation for
@@ -13,11 +11,11 @@ import { anchor } from './anchor.js';
  * how the sdk partitions its files. Emits nothing when the model has neither
  * named schemas nor JSON operation bodies.
  */
-export const zodGenerator = ({ model, outputPath }) => {
+export const zodGenerator = ({ model, output, banner }) => {
     const content = renderZodModule(model);
     if (content === '')
         return [];
-    const { dir, stem } = anchor(outputPath);
-    return [{ path: join(dir, `${stem}.zod.ts`), content: `${HEADER}\n\n${content}` }];
+    const header = banner.map((line) => `// ${line}`).join('\n');
+    return [{ path: join(output.dir, `${output.stem}.zod.ts`), content: `${header}\n\n${content}` }];
 };
-//# sourceMappingURL=zod.js.map
+//# sourceMappingURL=index.js.map

package/lib/generators/zod/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/generators/zod/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,YAAY,GAAc,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE;IACnE,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IACvC,IAAI,OAAO,KAAK,EAAE;QAAE,OAAO,EAAE,CAAC;IAC9B,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7D,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,IAAI,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,MAAM,OAAO,OAAO,EAAE,EAAE,CAAC,CAAC;AACnG,CAAC,CAAC"}

package/lib/{emitters/zod.d.ts → generators/zod/schemas.d.ts}

@@ -1,8 +1,7 @@
-import { type ApiModel, type SchemaModel } from '../intermediate-representation/model.js';
-import { ts } from './ts.js';
+import { type ApiModel, type SchemaModel } from '@redocly/client-generator';
 type SchemaByName = ReadonlyMap<string, SchemaModel>;
-/** Map an IR schema to the Zod expression that validates it. */
-export declare function schemaToZodExpression(schema: SchemaModel, byName?: SchemaByName): ts.Expression;
+/** Map an IR schema to the Zod expression (source text) that validates it. */
+export declare function schemaToZodExpression(schema: SchemaModel, byName?: SchemaByName, indent?: string): string;
 /**
  * Render the full zod module source: the component schemas, then — when any operation
  * has a JSON body — the `operationSchemas` map and the `zodValidation` middleware.
@@ -10,4 +9,4 @@ export declare function schemaToZodExpression(schema: SchemaModel, byName?: Sche
  */
 export declare function renderZodModule(model: ApiModel): string;
 export {};
-//# sourceMappingURL=zod.d.ts.map
+//# sourceMappingURL=schemas.d.ts.map

package/lib/generators/zod/schemas.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../../src/generators/zod/schemas.ts"],"names":[],"mappings":"AAWA,OAAO,EAEL,KAAK,QAAQ,EAIb,KAAK,WAAW,EACjB,MAAM,2BAA2B,CAAC;AAUnC,KAAK,YAAY,GAAG,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAIrD,8EAA8E;AAC9E,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,WAAW,EACnB,MAAM,GAAE,YAAyB,EACjC,MAAM,SAAK,GACV,MAAM,CAER;AAyYD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAcvD"}