ts-procedures 8.3.0 → 8.4.0

package/build/codegen/bin/flag-specs.d.ts

@@ -0,0 +1,10 @@
+export interface FlagSpec {
+    name: string;
+    arg?: string;
+    description: string;
+    group: 'Source' | 'Output' | 'Codegen' | 'Targets' | 'Misc';
+    default?: string;
+}
+export declare const FLAG_SPECS: readonly FlagSpec[];
+export declare const KNOWN_FLAGS: readonly string[];
+export declare function formatHelp(): string;

package/build/codegen/bin/flag-specs.js

@@ -0,0 +1,60 @@
+export const FLAG_SPECS = [
+    // Source
+    { name: '--url', arg: '<url>', description: 'Fetch the doc envelope from a running server', group: 'Source' },
+    { name: '--file', arg: '<path>', description: 'Read the doc envelope from a JSON file (see writeDocEnvelope)', group: 'Source' },
+    { name: '--config', arg: '<path>', description: 'Load options from a JSON config file', group: 'Source' },
+    // Output
+    { name: '--out', arg: '<dir>', description: 'Output directory for generated files', group: 'Output' },
+    { name: '--dry-run', description: 'Print what would be written without touching disk', group: 'Output' },
+    { name: '--clean-out-dir', description: 'Prune orphaned generator-owned files before writing', group: 'Output', default: 'on' },
+    { name: '--no-clean-out-dir', description: 'Disable orphan pruning', group: 'Output' },
+    { name: '--watch', description: 'Regenerate on envelope change', group: 'Output' },
+    { name: '--interval', arg: '<ms>', description: 'Poll interval for --watch (default 3000)', group: 'Output' },
+    // Codegen
+    { name: '--service-name', arg: '<name>', description: 'Service identifier driving generated names', group: 'Codegen', default: 'Api' },
+    { name: '--namespace-types', description: 'Wrap types in nested namespaces', group: 'Codegen', default: 'on' },
+    { name: '--no-namespace-types', description: 'Flat type names', group: 'Codegen' },
+    { name: '--self-contained', description: 'Bundle the client runtime into the output dir', group: 'Codegen', default: 'on' },
+    { name: '--no-self-contained', description: 'Import the client runtime from ts-procedures/client', group: 'Codegen' },
+    { name: '--client-import-path', arg: '<path>', description: 'Override the client runtime import path', group: 'Codegen' },
+    { name: '--share-models', description: 'Hoist $id-bearing schemas into a shared _models.ts', group: 'Codegen', default: 'on' },
+    { name: '--no-share-models', description: 'Inline every type per route (legacy behaviour)', group: 'Codegen' },
+    { name: '--jsdoc', description: 'Emit JSDoc on generated types', group: 'Codegen', default: 'on' },
+    { name: '--no-jsdoc', description: 'Suppress JSDoc', group: 'Codegen' },
+    { name: '--enum-style', arg: '<union|enum>', description: 'How to emit enums (namespace mode)', group: 'Codegen' },
+    { name: '--depluralize', description: 'Depluralize extracted array-item type names', group: 'Codegen' },
+    { name: '--array-item-naming', arg: '<name|false>', description: 'Naming for extracted array-item types', group: 'Codegen' },
+    { name: '--uncountable-words', arg: '<csv>', description: 'Words exempt from depluralization', group: 'Codegen' },
+    // Targets
+    { name: '--target', arg: '<ts|kotlin|swift>', description: 'Output language', group: 'Targets', default: 'ts' },
+    { name: '--kotlin-package', arg: '<pkg>', description: 'Package for Kotlin output (required for --target kotlin)', group: 'Targets' },
+    { name: '--kotlin-serializer', arg: '<kotlinx|none>', description: 'Kotlin serialization annotations', group: 'Targets', default: 'kotlinx' },
+    { name: '--swift-serializer', arg: '<codable|none>', description: 'Swift Codable conformance', group: 'Targets', default: 'codable' },
+    { name: '--swift-access-level', arg: '<public|internal>', description: 'Swift access level', group: 'Targets', default: 'public' },
+    { name: '--unsupported-unions', arg: '<throw|fallback>', description: 'Behaviour for untagged oneOf schemas', group: 'Targets', default: 'throw' },
+];
+export const KNOWN_FLAGS = FLAG_SPECS.map((s) => s.name);
+const GROUP_ORDER = ['Source', 'Output', 'Codegen', 'Targets', 'Misc'];
+export function formatHelp() {
+    const lines = [];
+    lines.push('Usage: ts-procedures-codegen --out <dir> (--url <url> | --file <path>) [options]');
+    lines.push('');
+    lines.push('Generate a typed client from a ts-procedures doc envelope.');
+    lines.push('');
+    const col = Math.max(...FLAG_SPECS.map((s) => (s.name + (s.arg ? ' ' + s.arg : '')).length)) + 2;
+    for (const group of GROUP_ORDER) {
+        const specs = FLAG_SPECS.filter((s) => s.group === group);
+        if (specs.length === 0)
+            continue;
+        lines.push(`${group}:`);
+        for (const s of specs) {
+            const left = s.name + (s.arg ? ' ' + s.arg : '');
+            const def = s.default ? ` (default: ${s.default})` : '';
+            lines.push(`  ${left.padEnd(col)}${s.description}${def}`);
+        }
+        lines.push('');
+    }
+    lines.push('  -h, --help      Show this help and exit');
+    return lines.join('\n');
+}
+//# sourceMappingURL=flag-specs.js.map

package/build/codegen/bin/flag-specs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"flag-specs.js","sourceRoot":"","sources":["../../../src/codegen/bin/flag-specs.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,MAAM,UAAU,GAAwB;IAC7C,SAAS;IACT,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,8CAA8C,EAAE,KAAK,EAAE,QAAQ,EAAE;IAC7G,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,WAAW,EAAE,+DAA+D,EAAE,KAAK,EAAE,QAAQ,EAAE;IAChI,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,WAAW,EAAE,sCAAsC,EAAE,KAAK,EAAE,QAAQ,EAAE;IACzG,SAAS;IACT,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,sCAAsC,EAAE,KAAK,EAAE,QAAQ,EAAE;IACrG,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,mDAAmD,EAAE,KAAK,EAAE,QAAQ,EAAE;IACxG,EAAE,IAAI,EAAE,iBAAiB,EAAE,WAAW,EAAE,qDAAqD,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE;IAC/H,EAAE,IAAI,EAAE,oBAAoB,EAAE,WAAW,EAAE,wBAAwB,EAAE,KAAK,EAAE,QAAQ,EAAE;IACtF,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,+BAA+B,EAAE,KAAK,EAAE,QAAQ,EAAE;IAClF,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,0CAA0C,EAAE,KAAK,EAAE,QAAQ,EAAE;IAC7G,UAAU;IACV,EAAE,IAAI,EAAE,gBAAgB,EAAE,GAAG,EAAE,QAAQ,EAAE,WAAW,EAAE,4CAA4C,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;IACtI,EAAE,IAAI,EAAE,mBAAmB,EAAE,WAAW,EAAE,iCAAiC,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;IAC9G,EAAE,IAAI,EAAE,sBAAsB,EAAE,WAAW,EAAE,iBAAiB,EAAE,KAAK,EAAE,SAAS,EAAE;IAClF,EAAE,IAAI,EAAE,kBAAkB,EAAE,WAAW,EAAE,+CAA+C,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;IAC3H,EAAE,IAAI,EAAE,qBAAqB,EAAE,WAAW,EAAE,qDAAqD,EAAE,KAAK,EAAE,SAAS,EAAE;IACrH,EAAE,IAAI,EAAE,sBAAsB,EAAE,GAAG,EAAE,QAAQ,EAAE,WAAW,EAAE,yCAAyC,EAAE,KAAK,EAAE,SAAS,EAAE;IACzH,EAAE,IAAI,EAAE,gBAAgB,EAAE,WAAW,EAAE,oDAAoD,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;IAC9H,EAAE,IAAI,EAAE,mBAAmB,EAAE,WAAW,EAAE,gDAAgD,EAAE,KAAK,EAAE,SAAS,EAAE;IAC9G,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,+BAA+B,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;IAClG,EAAE,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,gBAAgB,EAAE,KAAK,EAAE,SAAS,EAAE;IACvE,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,cAAc,EAAE,WAAW,EAAE,oCAAoC,EAAE,KAAK,EAAE,SAAS,EAAE;IAClH,EAAE,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,6CAA6C,EAAE,KAAK,EAAE,SAAS,EAAE;IACvG,EAAE,IAAI,EAAE,qBAAqB,EAAE,GAAG,EAAE,cAAc,EAAE,WAAW,EAAE,uCAAuC,EAAE,KAAK,EAAE,SAAS,EAAE;IAC5H,EAAE,IAAI,EAAE,qBAAqB,EAAE,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,mCAAmC,EAAE,KAAK,EAAE,SAAS,EAAE;IACjH,UAAU;IACV,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,mBAAmB,EAAE,WAAW,EAAE,iBAAiB,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE;IAC/G,EAAE,IAAI,EAAE,kBAAkB,EAAE,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,0DAA0D,EAAE,KAAK,EAAE,SAAS,EAAE;IACrI,EAAE,IAAI,EAAE,qBAAqB,EAAE,GAAG,EAAE,gBAAgB,EAAE,WAAW,EAAE,kCAAkC,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE;IAC7I,EAAE,IAAI,EAAE,oBAAoB,EAAE,GAAG,EAAE,gBAAgB,EAAE,WAAW,EAAE,2BAA2B,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE;IACrI,EAAE,IAAI,EAAE,sBAAsB,EAAE,GAAG,EAAE,mBAAmB,EAAE,WAAW,EAAE,oBAAoB,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE;IAClI,EAAE,IAAI,EAAE,sBAAsB,EAAE,GAAG,EAAE,kBAAkB,EAAE,WAAW,EAAE,sCAAsC,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE;CACnJ,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAsB,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;AAE3E,MAAM,WAAW,GAAwB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;AAE3F,MAAM,UAAU,UAAU;IACxB,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,KAAK,CAAC,IAAI,CAAC,kFAAkF,CAAC,CAAA;IAC9F,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACd,KAAK,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAA;IACxE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACd,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAA;IAChG,KAAK,MAAM,KAAK,IAAI,WAAW,EAAE,CAAC;QAChC,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAA;QACzD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,SAAQ;QAChC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,GAAG,CAAC,CAAA;QACvB,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YACtB,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;YAChD,MAAM,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;YACvD,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,GAAG,EAAE,CAAC,CAAA;QAC3D,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAChB,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAA;IACvD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACzB,CAAC"}

package/build/codegen/bin/flag-specs.test.d.ts

@@ -0,0 +1 @@
+export {};

package/build/codegen/bin/flag-specs.test.js

@@ -0,0 +1,26 @@
+import { describe, it, expect } from 'vitest';
+import { FLAG_SPECS, KNOWN_FLAGS, formatHelp } from './flag-specs.js';
+describe('flag-specs', () => {
+    it('derives KNOWN_FLAGS from the spec table', () => {
+        expect(KNOWN_FLAGS).toContain('--url');
+        expect(KNOWN_FLAGS).toContain('--service-name');
+        expect(KNOWN_FLAGS).toContain('--target');
+        for (const spec of FLAG_SPECS)
+            expect(KNOWN_FLAGS).toContain(spec.name);
+    });
+    it('formatHelp lists every flag with its description, grouped', () => {
+        const help = formatHelp();
+        expect(help).toMatch(/Usage: ts-procedures-codegen/);
+        for (const spec of FLAG_SPECS) {
+            expect(help).toContain(spec.name);
+            expect(help).toContain(spec.description);
+        }
+        expect(help).toMatch(/Source/);
+        expect(help).toMatch(/Targets/);
+    });
+    it('does not list --help/-h as a real codegen flag in KNOWN_FLAGS', () => {
+        expect(KNOWN_FLAGS).not.toContain('--help');
+        expect(KNOWN_FLAGS).not.toContain('-h');
+    });
+});
+//# sourceMappingURL=flag-specs.test.js.map

package/build/codegen/bin/flag-specs.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"flag-specs.test.js","sourceRoot":"","sources":["../../../src/codegen/bin/flag-specs.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAErE,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QACtC,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAA;QAC/C,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;QACzC,KAAK,MAAM,IAAI,IAAI,UAAU;YAAE,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACzE,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,IAAI,GAAG,UAAU,EAAE,CAAA;QACzB,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAA;QACpD,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;YAC9B,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACjC,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAC1C,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAC9B,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IACjC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QAC3C,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IACzC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/build/codegen/collect-models.d.ts

@@ -0,0 +1,37 @@
+import type { AnyHttpRouteDoc } from '../implementations/types.js';
+/** A schema hoisted out of per-route inlining because it carries a `$id`. */
+export interface CollectedModel {
+    /** The schema's `$id` — the stable identity key used for dedup and import mapping. */
+    id: string;
+    /** PascalCase TypeScript identifier for the emitted model (disambiguated on collision). */
+    name: string;
+    /** The model's JSON Schema (first-seen copy). */
+    schema: Record<string, unknown>;
+}
+/** Maps a model `$id` to an external import (module + exported name). */
+export interface SharedTypeImport {
+    module: string;
+    name: string;
+}
+/** `$id` → external import. Models with a matching entry are imported rather than generated. */
+export type SharedTypesImportMap = Record<string, SharedTypeImport>;
+/** A {@link CollectedModel} tagged with its external import, if one was configured. */
+export interface ResolvedModel extends CollectedModel {
+    import?: SharedTypeImport;
+}
+/**
+ * Deep-walks every route's `jsonSchema` and collects each subschema carrying a
+ * string `$id` exactly once (deduped by `$id`, first-seen order preserved).
+ *
+ * - Names are derived from `title` (or the last `$id` segment), PascalCased.
+ * - Distinct `$id`s that derive the same name are disambiguated deterministically
+ *   by first-seen order (`Message`, `Message2`, `Message3`, …).
+ * - Two nodes sharing an `$id` but differing structurally throw (the `$id` is a
+ *   broken identity contract).
+ */
+export declare function collectModels(routes: AnyHttpRouteDoc[]): CollectedModel[];
+/**
+ * Tags each collected model with its external import when its `$id` is a key in
+ * the import map; models without a mapping keep `import` undefined (generated locally).
+ */
+export declare function resolveModelImports(models: CollectedModel[], map?: SharedTypesImportMap): ResolvedModel[];

package/build/codegen/collect-models.js

@@ -0,0 +1,74 @@
+import { toPascalCase } from './naming.js';
+import { walkSubschemas } from './schema-walk.js';
+/** Produces a stable structural key for collision detection (key order does not matter). */
+function structuralKey(value) {
+    return JSON.stringify(value, (_k, v) => {
+        if (v && typeof v === 'object' && !Array.isArray(v)) {
+            const sorted = {};
+            for (const k of Object.keys(v).sort()) {
+                sorted[k] = v[k];
+            }
+            return sorted;
+        }
+        return v;
+    });
+}
+/** Derives a base PascalCase name from a schema's `title`, falling back to the last `$id` segment. */
+function deriveBaseName(schema, id) {
+    const title = typeof schema.title === 'string' ? schema.title : undefined;
+    const source = title ?? id.split(/[/:#?]+/).filter(Boolean).pop() ?? id;
+    const pascal = toPascalCase(source);
+    return pascal.length > 0 ? pascal : 'Model';
+}
+/**
+ * Deep-walks every route's `jsonSchema` and collects each subschema carrying a
+ * string `$id` exactly once (deduped by `$id`, first-seen order preserved).
+ *
+ * - Names are derived from `title` (or the last `$id` segment), PascalCased.
+ * - Distinct `$id`s that derive the same name are disambiguated deterministically
+ *   by first-seen order (`Message`, `Message2`, `Message3`, …).
+ * - Two nodes sharing an `$id` but differing structurally throw (the `$id` is a
+ *   broken identity contract).
+ */
+export function collectModels(routes) {
+    const byId = new Map();
+    const order = [];
+    const visit = (obj) => {
+        if (typeof obj.$id === 'string') {
+            const id = obj.$id;
+            const key = structuralKey(obj);
+            const existing = byId.get(id);
+            if (existing) {
+                if (existing.key !== key) {
+                    throw new Error(`[ts-procedures-codegen] Conflicting schemas share $id "${id}". A $id must identify a single structural shape; found two divergent definitions.`);
+                }
+            }
+            else {
+                byId.set(id, { schema: obj, key });
+                order.push(id);
+            }
+        }
+    };
+    for (const route of routes)
+        walkSubschemas(route.jsonSchema, visit);
+    const usedNames = new Map();
+    return order.map((id) => {
+        const { schema } = byId.get(id);
+        const base = deriveBaseName(schema, id);
+        const seen = usedNames.get(base) ?? 0;
+        usedNames.set(base, seen + 1);
+        const name = seen === 0 ? base : `${base}${seen + 1}`;
+        return { id, name, schema };
+    });
+}
+/**
+ * Tags each collected model with its external import when its `$id` is a key in
+ * the import map; models without a mapping keep `import` undefined (generated locally).
+ */
+export function resolveModelImports(models, map = {}) {
+    return models.map((model) => {
+        const mapped = map[model.id];
+        return mapped ? { ...model, import: mapped } : { ...model };
+    });
+}
+//# sourceMappingURL=collect-models.js.map

package/build/codegen/collect-models.js.map

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

package/build/codegen/collect-models.test.d.ts

@@ -0,0 +1 @@
+export {};

package/build/codegen/collect-models.test.js

@@ -0,0 +1,40 @@
+import { it, expect } from 'vitest';
+import { collectModels, resolveModelImports } from './collect-models.js';
+const message = { type: 'object', $id: 'urn:msg', title: 'Message', properties: { id: { type: 'string' } } };
+it('collects each $id subschema once, named from title', () => {
+    const routes = [
+        { jsonSchema: { response: message } },
+        { jsonSchema: { body: { type: 'object', properties: { msg: message } } } },
+    ];
+    const models = collectModels(routes);
+    expect(models.map((m) => m.name)).toEqual(['Message']);
+    expect(models[0]?.id).toBe('urn:msg');
+});
+it('throws on $id collision with divergent body', () => {
+    const a = { type: 'object', $id: 'urn:x', title: 'X', properties: { a: { type: 'string' } } };
+    const b = { type: 'object', $id: 'urn:x', title: 'X', properties: { b: { type: 'number' } } };
+    expect(() => collectModels([{ jsonSchema: { response: a } }, { jsonSchema: { body: b } }])).toThrow(/urn:x/);
+});
+it('disambiguates distinct $ids that derive the same name', () => {
+    const m1 = { type: 'object', $id: 'urn:a/message', title: 'Message', properties: { a: { type: 'string' } } };
+    const m2 = { type: 'object', $id: 'urn:b/message', title: 'Message', properties: { b: { type: 'string' } } };
+    const models = collectModels([{ jsonSchema: { response: m1 } }, { jsonSchema: { body: m2 } }]);
+    expect(models.map((m) => m.name).sort()).toEqual(['Message', 'Message2']);
+});
+it('ignores schemas without $id', () => {
+    const routes = [{ jsonSchema: { response: { type: 'object', title: 'Loose', properties: {} } } }];
+    expect(collectModels(routes)).toEqual([]);
+});
+it('does NOT throw for ordinary schemas without the reserved prefix', () => {
+    const routes = [
+        { jsonSchema: { response: { type: 'object', properties: { kind: { const: 'message' }, status: { enum: ['ok', 'error'] } } } } },
+    ];
+    expect(() => collectModels(routes)).not.toThrow();
+});
+it('resolveModelImports tags mapped models and leaves others generated', () => {
+    const models = [{ id: 'urn:msg', name: 'Message', schema: {} }];
+    const mapped = resolveModelImports(models, { 'urn:msg': { module: '@shared/schemas', name: 'Message' } });
+    expect(mapped[0]?.import).toEqual({ module: '@shared/schemas', name: 'Message' });
+    expect(resolveModelImports(models, {})[0]?.import).toBeUndefined();
+});
+//# sourceMappingURL=collect-models.test.js.map

package/build/codegen/collect-models.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"collect-models.test.js","sourceRoot":"","sources":["../../src/codegen/collect-models.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAExE,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAA;AAE5G,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;IAC5D,MAAM,MAAM,GAAG;QACb,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE;QACrC,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE;KACpE,CAAA;IACR,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAA;IACpC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC,CAAA;IACtD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;AACvC,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;IACrD,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAA;IAC7F,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAA;IAC7F,MAAM,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,CAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;AACrH,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;IAC/D,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAA;IAC5G,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAA;IAC5G,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,CAAQ,CAAC,CAAA;IACrG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAA;AAC3E,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;IACrC,MAAM,MAAM,GAAG,CAAC,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE,CAAQ,CAAA;IACxG,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;AAC3C,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;IACzE,MAAM,MAAM,GAAG;QACb,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;KACzH,CAAA;IACR,MAAM,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAA;AACnD,CAAC,CAAC,CAAA;AAEF,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;IAC5E,MAAM,MAAM,GAAG,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAS,EAAE,CAAC,CAAA;IACtE,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;IACzG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;IACjF,MAAM,CAAC,mBAAmB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,aAAa,EAAE,CAAA;AACpE,CAAC,CAAC,CAAA"}

package/build/codegen/emit-client-runtime.js

@@ -17,6 +17,7 @@ const TYPES_IMPORT = `import type {
   ClientInstance,
   ProcedureCallDefaults,
   ProcedureCallOptions,
+  ClientHeadersInit,
   CreateClientConfig,
   RequestMeta,
   ErrorRegistry,

package/build/codegen/emit-client-runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"emit-client-runtime.js","sourceRoot":"","sources":["../../src/codegen/emit-client-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAE/C,MAAM,YAAY,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA2BH,CAAA;AAElB;;;GAGG;AACH,MAAM,YAAY,GAAG;IACnB,WAAW;IACX,mBAAmB;IACnB,mBAAmB;IACnB,oBAAoB;IACpB,oBAAoB;IACpB,UAAU;IACV,SAAS;IACT,WAAW;IACX,kBAAkB;IAClB,UAAU;CACF,CAAA;AAEV;;;;;;;GAOG;AACH,SAAS,YAAY,CAAC,OAAe;IACnC,2DAA2D;IAC3D,OAAO,OAAO,CAAC,OAAO,CAAC,mDAAmD,EAAE,EAAE,CAAC,CAAA;AACjF,CAAC;AAED;;;;GAIG;AACH,SAAS,cAAc,CAAC,OAAe;IACrC,mFAAmF;IACnF,OAAO,OAAO,CAAC,OAAO,CAAC,gEAAgE,EAAE,EAAE,CAAC,CAAA;AAC9F,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB;IACzC,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACjD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;IACrC,sEAAsE;IACtE,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IAC/C,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;IAEpD,gCAAgC;IAChC,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;QAChC,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;QACzC,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YAChC,MAAM,IAAI,KAAK,CACb,oDAAoD,IAAI,sBAAsB,QAAQ,IAAI;gBAC1F,8CAA8C,CAC/C,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,QAAQ,GAAa,EAAE,CAAA;IAE7B,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;QAChC,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;QACzC,IAAI,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAE/C,mDAAmD;QACnD,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;QAE/B,kDAAkD;QAClD,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;YACxB,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;YACjC,0EAA0E;YAC1E,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAA;QACxD,CAAC;QAED,yCAAyC;QACzC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QAE5C,mCAAmC;QACnC,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAA;QAExB,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACxB,CAAC;IACH,CAAC;IAED,OAAO,CAAC,cAAc,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC3E,CAAC"}
+{"version":3,"file":"emit-client-runtime.js","sourceRoot":"","sources":["../../src/codegen/emit-client-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAE/C,MAAM,YAAY,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA4BH,CAAA;AAElB;;;GAGG;AACH,MAAM,YAAY,GAAG;IACnB,WAAW;IACX,mBAAmB;IACnB,mBAAmB;IACnB,oBAAoB;IACpB,oBAAoB;IACpB,UAAU;IACV,SAAS;IACT,WAAW;IACX,kBAAkB;IAClB,UAAU;CACF,CAAA;AAEV;;;;;;;GAOG;AACH,SAAS,YAAY,CAAC,OAAe;IACnC,2DAA2D;IAC3D,OAAO,OAAO,CAAC,OAAO,CAAC,mDAAmD,EAAE,EAAE,CAAC,CAAA;AACjF,CAAC;AAED;;;;GAIG;AACH,SAAS,cAAc,CAAC,OAAe;IACrC,mFAAmF;IACnF,OAAO,OAAO,CAAC,OAAO,CAAC,gEAAgE,EAAE,EAAE,CAAC,CAAA;AAC9F,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB;IACzC,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACjD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;IACrC,sEAAsE;IACtE,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IAC/C,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;IAEpD,gCAAgC;IAChC,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;QAChC,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;QACzC,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YAChC,MAAM,IAAI,KAAK,CACb,oDAAoD,IAAI,sBAAsB,QAAQ,IAAI;gBAC1F,8CAA8C,CAC/C,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,QAAQ,GAAa,EAAE,CAAA;IAE7B,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;QAChC,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;QACzC,IAAI,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAE/C,mDAAmD;QACnD,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;QAE/B,kDAAkD;QAClD,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;YACxB,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;YACjC,0EAA0E;YAC1E,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAA;QACxD,CAAC;QAED,yCAAyC;QACzC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QAE5C,mCAAmC;QACnC,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAA;QAExB,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACxB,CAAC;IACH,CAAC;IAED,OAAO,CAAC,cAAc,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC3E,CAAC"}

package/build/codegen/emit-models.d.ts

@@ -0,0 +1,26 @@
+import { type AjscOptions } from './emit-types.js';
+import type { ResolvedModel } from './collect-models.js';
+export interface EmitModelsOptions {
+    ajsc?: AjscOptions;
+}
+/**
+ * Emits the shared `_models.ts` hub: one named TypeScript type per `$id`-bearing
+ * schema so routes can reference a single entity type instead of inlining copies.
+ *
+ * Two kinds of model:
+ *   - **Imported** (`model.import` set): re-exported from the user's package —
+ *     `export { <PkgName>[ as <LocalName>] } from '<module>'`.
+ *   - **Generated** (no `import`): converted from JSON Schema to a TS type via
+ *     ajsc. Nested OTHER models are first rewritten to `x-named-type` nodes
+ *     ({@link substituteModelRefs} with `skipSelfId` so the model's own root
+ *     `$id` is not self-referenced); ajsc (≥7.3.0) then emits each nested model
+ *     as a bare verbatim reference rather than re-inlining its shape.
+ *
+ * Declarations are kept FLAT at the top level regardless of `namespaceTypes` —
+ * scopes import these by bare name and TS `type` aliases permit forward
+ * references, so declaration order does not matter. Re-exports are emitted first,
+ * then generated declarations.
+ *
+ * Returns `null` when there are no models.
+ */
+export declare function emitModelsFile(models: ResolvedModel[], opts: EmitModelsOptions): Promise<string | null>;

package/build/codegen/emit-models.js

@@ -0,0 +1,53 @@
+import { jsonSchemaToTypeBody } from './emit-types.js';
+import { substituteModelRefs } from './model-refs.js';
+import { CODEGEN_HEADER } from './constants.js';
+/**
+ * Emits the shared `_models.ts` hub: one named TypeScript type per `$id`-bearing
+ * schema so routes can reference a single entity type instead of inlining copies.
+ *
+ * Two kinds of model:
+ *   - **Imported** (`model.import` set): re-exported from the user's package —
+ *     `export { <PkgName>[ as <LocalName>] } from '<module>'`.
+ *   - **Generated** (no `import`): converted from JSON Schema to a TS type via
+ *     ajsc. Nested OTHER models are first rewritten to `x-named-type` nodes
+ *     ({@link substituteModelRefs} with `skipSelfId` so the model's own root
+ *     `$id` is not self-referenced); ajsc (≥7.3.0) then emits each nested model
+ *     as a bare verbatim reference rather than re-inlining its shape.
+ *
+ * Declarations are kept FLAT at the top level regardless of `namespaceTypes` —
+ * scopes import these by bare name and TS `type` aliases permit forward
+ * references, so declaration order does not matter. Re-exports are emitted first,
+ * then generated declarations.
+ *
+ * Returns `null` when there are no models.
+ */
+export async function emitModelsFile(models, opts) {
+    if (models.length === 0)
+        return null;
+    const idToName = new Map(models.map((m) => [m.id, m.name]));
+    const reExports = [];
+    const declarations = [];
+    for (const model of models) {
+        if (model.import) {
+            const pkgName = model.import.name;
+            const localName = model.name;
+            const clause = pkgName === localName ? pkgName : `${pkgName} as ${localName}`;
+            reExports.push(`export { ${clause} } from '${model.import.module}'`);
+            continue;
+        }
+        // Generated model: rewrite nested OTHER models to `x-named-type` nodes so
+        // ajsc emits them as bare references, then convert to a TS body.
+        const substituted = substituteModelRefs(model.schema, idToName, model.id);
+        const body = await jsonSchemaToTypeBody(substituted.schema, opts.ajsc);
+        if (body == null)
+            continue;
+        declarations.push(`export type ${model.name} = ${body}`);
+    }
+    const blocks = [];
+    if (reExports.length > 0)
+        blocks.push(reExports.join('\n'));
+    for (const decl of declarations)
+        blocks.push(decl);
+    return [CODEGEN_HEADER, '', blocks.join('\n\n')].join('\n');
+}
+//# sourceMappingURL=emit-models.js.map

package/build/codegen/emit-models.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"emit-models.js","sourceRoot":"","sources":["../../src/codegen/emit-models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAoB,MAAM,iBAAiB,CAAA;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAO/C;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAAuB,EACvB,IAAuB;IAEvB,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAA;IAEpC,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAE3D,MAAM,SAAS,GAAa,EAAE,CAAA;IAC9B,MAAM,YAAY,GAAa,EAAE,CAAA;IAEjC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAA;YACjC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAA;YAC5B,MAAM,MAAM,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,OAAO,SAAS,EAAE,CAAA;YAC7E,SAAS,CAAC,IAAI,CAAC,YAAY,MAAM,YAAY,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAA;YACpE,SAAQ;QACV,CAAC;QAED,0EAA0E;QAC1E,iEAAiE;QACjE,MAAM,WAAW,GAAG,mBAAmB,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,CAAA;QACzE,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;QACtE,IAAI,IAAI,IAAI,IAAI;YAAE,SAAQ;QAC1B,YAAY,CAAC,IAAI,CAAC,eAAe,KAAK,CAAC,IAAI,MAAM,IAAI,EAAE,CAAC,CAAA;IAC1D,CAAC;IAED,MAAM,MAAM,GAAa,EAAE,CAAA;IAC3B,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAC3D,KAAK,MAAM,IAAI,IAAI,YAAY;QAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAElD,OAAO,CAAC,cAAc,EAAE,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC7D,CAAC"}

package/build/codegen/emit-models.test.d.ts

@@ -0,0 +1 @@
+export {};

package/build/codegen/emit-models.test.js

@@ -0,0 +1,42 @@
+import { describe, it, expect } from 'vitest';
+import { emitModelsFile } from './emit-models.js';
+const thread = {
+    id: 'urn:thread', name: 'Thread',
+    schema: { type: 'object', $id: 'urn:thread', title: 'Thread',
+        properties: { id: { type: 'string' }, author: { type: 'object', $id: 'urn:msg', title: 'Message', properties: { id: { type: 'string' } } } } },
+};
+const messageGenerated = {
+    id: 'urn:msg', name: 'Message',
+    schema: { type: 'object', $id: 'urn:msg', title: 'Message', properties: { id: { type: 'string' } } },
+};
+const messageImported = {
+    id: 'urn:msg', name: 'Message', schema: {},
+    import: { module: '@shared/schemas', name: 'Message' },
+};
+describe('emitModelsFile', () => {
+    it('returns null when there are no models', async () => {
+        expect(await emitModelsFile([], { ajsc: {} })).toBeNull();
+    });
+    it('declares a generated model as a named type', async () => {
+        const code = await emitModelsFile([messageGenerated], { ajsc: {} });
+        expect(code).toMatch(/export type Message =/);
+    });
+    it('re-exports a mapped model from the user package', async () => {
+        const code = await emitModelsFile([messageImported], { ajsc: {} });
+        expect(code).toContain("export { Message } from '@shared/schemas'");
+    });
+    it('aliases a re-export when local name differs from the package name', async () => {
+        const m = { id: 'urn:msg', name: 'ChatMessage', schema: {}, import: { module: '@shared/schemas', name: 'Message' } };
+        const code = await emitModelsFile([m], { ajsc: {} });
+        expect(code).toContain("export { Message as ChatMessage } from '@shared/schemas'");
+    });
+    it('a generated model that nests another model references it by name, not inlined', async () => {
+        // Thread.author is the Message model — Thread should reference Message, not inline { id }
+        const code = await emitModelsFile([thread, messageGenerated], { ajsc: {} });
+        // Thread's author property is typed as Message (the model), referenced by bare name
+        expect(code).toMatch(/author\??:\s*Message/);
+        // and there is no leftover placeholder token
+        expect(code).not.toContain('__MODELREF__');
+    });
+});
+//# sourceMappingURL=emit-models.test.js.map

package/build/codegen/emit-models.test.js.map

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

package/build/codegen/emit-scope.d.ts

@@ -12,6 +12,16 @@ export interface EmitScopeOptions {
      * so generated code never references undefined types.
      */
     errorKeys?: Set<string>;
+    /**
+     * Maps a model `$id` to its shared model type name (built by the run module
+     * from ALL models — generated and imported). When present and non-empty,
+     * `$id` subschemas are rewritten to `x-named-type` nodes before ajsc; ajsc
+     * emits bare references and reports them via `referencedNamedTypes`, which
+     * drives the `import type { … } from './_models'` line. Absent/empty →
+     * identical inlining behaviour (the conversion wrappers short-circuit so
+     * output is byte-identical for envelopes without models).
+     */
+    idToModelName?: Map<string, string>;
 }
 /**
  * Generates a complete TypeScript scope file for a ScopeGroup.