firebase-contract 0.1.0-rc.11 → 0.1.0-rc.13

package/README.md

@@ -34,6 +34,7 @@ fbc init          # scaffold contract.yml + firebase-contract.json
 fbc validate      # parse, resolve imports, semantically validate
 fbc generate      # run every generator declared across the contract graph
 fbc inspect       # print the normalized IR (debugging)
+fbc where <Name>  # locate the yml defining a type (logical / gqlName / fsName / table)
 ```
 
 ### One-command generation
@@ -103,7 +104,13 @@ generators:
   and errors for generators without one.
 - **`options`** — free-form string map passed through to the generator.
   Currently: `typesImport` (api-types, task-payloads, data-connect-operations)
-  overrides the `./types` import path.
+  overrides the types import path. For api-types and task-payloads this is
+  normally unnecessary: when the option is absent and a `typescript` generator
+  is declared (nearest-first: same yml → root), the import specifier is derived
+  automatically as the relative path from the output file to the declared
+  barrel — moving or renaming the barrel (`out` / `file`) re-derives it. An
+  explicit `typesImport` always wins; without a typescript declaration the
+  generator's built-in default (`./types`) applies.
 - **`header`** — per-generator banner override: `default` for the built-in
   AUTO-GENERATED banner, any text for a custom comment, `""` to suppress the
   banner for this generator. Wins over the contract-level `header:` and the
@@ -116,8 +123,9 @@ generators:
 
 `fbc generate contract.yml` materializes **all** declared outputs across the
 whole import graph in one run. Passing `-o`/`-g` switches to single-target mode
-(`fbc generate <entry> -o <dir> -g typescript,zod`), and
-`firebase-contract.json` (`entry`, `outDir`, `generators`) can hold defaults.
+(`fbc generate <entry> -o <dir> -g typescript,zod`). `firebase-contract.json`
+holds only a default `entry` — output routing lives in the yml `generators:`
+declarations, so a config file can never silently override them.
 
 
 ### Generated-file headers
@@ -174,8 +182,25 @@ in other contracts (relative paths or npm packages). Imports are resolved
 transitively with cycle/duplicate detection and diamond dedup, so you can split
 a large contract across files that mirror your repo layout.
 
+**Type names are globally unique.** The namespace is flat across the whole
+import graph: defining the same name twice — same kind (`DUPLICATE_DEFINITION`)
+or across kinds/derived identifiers, e.g. an enum and a model both named
+`Status`, or two enums whose `CONSTANT_CASE` consts collide (`NAME_COLLISION`)
+— aborts generation. Uniqueness is enforced per output namespace with its
+*effective* names, so `fsName`/`gqlName` renames legitimately reuse a name in a
+different output: GraphQL names are checked per `data-connect-graphql` scope
+(services may map distinct logical names onto the same gqlName), and the
+firestore module is checked under `fsName ?? name` alongside doc names. A bare
+type reference therefore always resolves to exactly one definition — use
+`fbc where <Name>` to find it.
+
+**Unknown keys are errors.** Every key the parser does not consume is an
+`UNKNOWN_KEY` error (all reported in one pass), never silently dropped — a
+typo like `optionnal:` must not quietly turn into a required field. There is
+no `version:` field: nothing consumes one, so accepting it would only fake a
+compatibility mechanism that does not exist.
+
 ```yaml
-version: 1
 imports:
   - ./apps/shop/data-connect/schema.yml
   - some-shared-package/contract.yml
@@ -468,8 +493,11 @@ firestore:
 ```
 
 Emits Zod schemas + inferred types, mirroring a hand-written Firestore schema
-library. (The simpler `firestore-types` generator just re-types *every* model
-with the Firestore `Timestamp` and does not denormalize.)
+library. (`firestore-types` is the zero-config entry point for projects that
+have not written projections yet: it re-types *every* model with the Firestore
+`Timestamp`, no `firestore:` section needed. Once you declare projections,
+prefer the `firestore` generator — it is the one that understands
+pick/omit/fsName/denormalized fields.)
 
 With `firestore` + `split: true`, fields whose Zod chain is **identical** to the Data
 Connect schema are reused via `.pick()` — only representation changes are

package/dist/lib/_internal/compiler/compiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../../src/lib/_internal/compiler/compiler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAoB,MAAM,mBAAmB,CAAA;AAEhE,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAA;AAChC,OAAO,EAAU,WAAW,EAAqC,MAAM,2BAA2B,CAAA;AAElG,OAAO,EAAkB,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAG3E,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAI5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,EAEL,cAAc,EAGf,MAAM,kBAAkB,CAAA;AAEzB,MAAM,WAAW,cAAc;IAC7B,6DAA6D;IAC7D,MAAM,CAAC,EAAE,YAAY,CAAA;CACtB;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,EAAE,CAAA;IACN,SAAS,EAAE,WAAW,EAAE,CAAA;IACxB,WAAW,EAAE,UAAU,EAAE,CAAA;CAC1B;AAED;;;;;GAKG;AACH,eAAO,MAAM,OAAO,GAAI,WAAW,MAAM,EAAE,UAAS,cAAmB,KAAG,aAUzE,CAAA;AAED,MAAM,WAAW,eAAgB,SAAQ,cAAc;IACrD,MAAM,EAAE,MAAM,CAAA;IACd,2EAA2E;IAC3E,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,sEAAsE;IACtE,QAAQ,CAAC,EAAE,iBAAiB,CAAA;IAC5B,oDAAoD;IACpD,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,gBAAgB,CAAA;IAC1B,oFAAoF;IACpF,UAAU,CAAC,EAAE,cAAc,CAAA;IAC3B,mFAAmF;IACnF,GAAG,CAAC,EAAE,IAAI,CAAA;CACX;AAED,MAAM,WAAW,oBAAoB;IACnC,mDAAmD;IACnD,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,KAAK,EAAE,aAAa,EAAE,CAAA;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,oBAAoB,EAAE,CAAA;IAC/B,WAAW,EAAE,UAAU,EAAE,CAAA;IACzB,EAAE,EAAE,OAAO,CAAA;CACZ;AA6MD;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,GACtB,WAAW,MAAM,EACjB,UAAS;IACP,QAAQ,CAAC,EAAE,iBAAiB,CAAA;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,gBAAgB,CAAA;IAC1B,MAAM,CAAC,EAAE,YAAY,CAAA;IACrB,GAAG,CAAC,EAAE,IAAI,CAAA;CACN,KACL,iBA0FF,CAAA;AAED,MAAM,WAAW,SAAS;IACxB,sEAAsE;IACtE,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,mEAAmE;IACnE,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB;AAED;;;;GAIG;AACH,eAAO,MAAM,SAAS,GAAI,OAAO,aAAa,EAAE,KAAG,SAUlD,CAAA;AAED,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,EAAE,CAAA;IACN,WAAW,EAAE,UAAU,EAAE,CAAA;IACzB,oFAAoF;IACpF,KAAK,EAAE,aAAa,EAAE,CAAA;IACtB,0DAA0D;IAC1D,EAAE,EAAE,OAAO,CAAA;CACZ;AAED;;;;GAIG;AACH,eAAO,MAAM,QAAQ,GAAI,WAAW,MAAM,EAAE,SAAS,eAAe,KAAG,cAgEtE,CAAA"}
+{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../../src/lib/_internal/compiler/compiler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAoB,MAAM,mBAAmB,CAAA;AAEhE,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAA;AAChC,OAAO,EAAU,WAAW,EAAqC,MAAM,2BAA2B,CAAA;AAElG,OAAO,EAAkB,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAI3E,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAI5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,EAEL,cAAc,EAGf,MAAM,kBAAkB,CAAA;AAEzB,MAAM,WAAW,cAAc;IAC7B,6DAA6D;IAC7D,MAAM,CAAC,EAAE,YAAY,CAAA;CACtB;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,EAAE,CAAA;IACN,SAAS,EAAE,WAAW,EAAE,CAAA;IACxB,WAAW,EAAE,UAAU,EAAE,CAAA;CAC1B;AAED;;;;;GAKG;AACH,eAAO,MAAM,OAAO,GAAI,WAAW,MAAM,EAAE,UAAS,cAAmB,KAAG,aAkBzE,CAAA;AAED,MAAM,WAAW,eAAgB,SAAQ,cAAc;IACrD,MAAM,EAAE,MAAM,CAAA;IACd,2EAA2E;IAC3E,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,sEAAsE;IACtE,QAAQ,CAAC,EAAE,iBAAiB,CAAA;IAC5B,oDAAoD;IACpD,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,gBAAgB,CAAA;IAC1B,oFAAoF;IACpF,UAAU,CAAC,EAAE,cAAc,CAAA;IAC3B,mFAAmF;IACnF,GAAG,CAAC,EAAE,IAAI,CAAA;CACX;AAED,MAAM,WAAW,oBAAoB;IACnC,mDAAmD;IACnD,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,KAAK,EAAE,aAAa,EAAE,CAAA;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,oBAAoB,EAAE,CAAA;IAC/B,WAAW,EAAE,UAAU,EAAE,CAAA;IACzB,EAAE,EAAE,OAAO,CAAA;CACZ;AAyOD;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,GACtB,WAAW,MAAM,EACjB,UAAS;IACP,QAAQ,CAAC,EAAE,iBAAiB,CAAA;IAC5B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,gBAAgB,CAAA;IAC1B,MAAM,CAAC,EAAE,YAAY,CAAA;IACrB,GAAG,CAAC,EAAE,IAAI,CAAA;CACN,KACL,iBA0FF,CAAA;AAED,MAAM,WAAW,SAAS;IACxB,sEAAsE;IACtE,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,mEAAmE;IACnE,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB;AAED;;;;GAIG;AACH,eAAO,MAAM,SAAS,GAAI,OAAO,aAAa,EAAE,KAAG,SAUlD,CAAA;AAED,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,EAAE,CAAA;IACN,WAAW,EAAE,UAAU,EAAE,CAAA;IACzB,oFAAoF;IACpF,KAAK,EAAE,aAAa,EAAE,CAAA;IACtB,0DAA0D;IAC1D,EAAE,EAAE,OAAO,CAAA;CACZ;AAED;;;;GAIG;AACH,eAAO,MAAM,QAAQ,GAAI,WAAW,MAAM,EAAE,SAAS,eAAe,KAAG,cAgEtE,CAAA"}

package/dist/lib/_internal/compiler/compiler.js

@@ -4,6 +4,7 @@ import { error, hasErrors } from '../diagnostics.js';
 import { buildIr } from '../ir/build-ir.js';
 import { resolveImports } from '../resolver/import-resolver.js';
 import { createFsLoader } from '../resolver/module-loader.js';
+import { graphqlNameCollisions } from '../validation/rules.js';
 import { validateIr } from '../validation/validate.js';
 import { createDefaultRegistry } from '../generators/index.js';
 import { toHeaderComment } from '../generators/support/header.js';
@@ -20,10 +21,18 @@ export const compile = (entryPath, options = {}) => {
     const { documents, diagnostics: importDiagnostics } = resolveImports(entryPath, loader);
     const { ir, diagnostics: buildDiagnostics } = buildIr(documents);
     const validationDiagnostics = validateIr(ir);
+    // A GraphQL schema is generated per data-connect-graphql declaration from the
+    // declaring yml's subtree, so its name uniqueness only holds at that scope —
+    // distinct services may reuse a gqlName. generateAll re-compiles each target
+    // with the declaring yml as entry, which is exactly when this check applies.
+    const entryDoc = documents[documents.length - 1];
+    const graphqlDiagnostics = entryDoc?.generatorDecls?.some(decl => decl.generator === 'data-connect-graphql')
+        ? graphqlNameCollisions(ir)
+        : [];
     return {
         ir,
         documents,
-        diagnostics: [...importDiagnostics, ...buildDiagnostics, ...validationDiagnostics],
+        diagnostics: [...importDiagnostics, ...buildDiagnostics, ...validationDiagnostics, ...graphqlDiagnostics],
     };
 };
 /** `apis:/tasks:/events:` section a raw api belongs to (drives the section defaults lookup). */
@@ -74,6 +83,30 @@ const resolveOutDir = (out, declaringDoc, rootDoc, diagnostics) => {
 /** Find a generator declaration by name — nearest first: the declaring yml, then the root yml. */
 const findGeneratorDecl = (name, doc, rootDoc) => doc.generatorDecls?.find(decl => decl.generator === name) ??
     rootDoc.generatorDecls?.find(decl => decl.generator === name);
+/** Generators whose output imports the shared types barrel via `options.typesImport`. */
+const TYPES_IMPORT_GENERATORS = new Set(['api-types', 'task-payloads']);
+/**
+ * Derive the default `typesImport` specifier from the typescript declaration
+ * itself: the relative path from the job's output directory to the declared
+ * barrel (`out` + `file`, default `types.ts`). The declaration resolves
+ * nearest-first (same yml → root), mirroring how entries resolve declarations,
+ * so both outputs stay in sync when the barrel is moved or renamed. An explicit
+ * `options.typesImport` always wins; without a typescript declaration in scope
+ * the generator's built-in default applies.
+ */
+const deriveTypesImport = (outDir, doc, rootDoc) => {
+    const decl = findGeneratorDecl('typescript', doc, rootDoc);
+    if (!decl)
+        return undefined;
+    const declaringDoc = doc.generatorDecls?.includes(decl) ? doc : rootDoc;
+    // Alias problems are reported when the typescript job itself is built.
+    const barrelDir = resolveOutDir(decl.out, declaringDoc, rootDoc, []);
+    if (barrelDir === undefined)
+        return undefined;
+    const barrel = join(barrelDir, (decl.file ?? 'types.ts').replace(/\.ts$/, ''));
+    const specifier = relative(outDir, barrel);
+    return specifier.startsWith('.') ? specifier : `./${specifier}`;
+};
 /**
  * Build generator jobs from the declaration/application DSL:
  * - api-scoped generators run for entries that opt in (section `defaults` →
@@ -98,14 +131,12 @@ const buildGeneratorJobs = (doc, rootDoc, registry, diagnostics) => {
             const output = {};
             const file = use.file ?? decl?.file;
             const split = use.split ?? decl?.split ?? generator?.defaultOutput?.split;
-            const options = use.options ?? decl?.options;
+            let options = use.options ?? decl?.options;
             const header = use.header ?? decl?.header;
             if (file !== undefined)
                 output.file = file;
             if (split !== undefined)
                 output.split = split;
-            if (options !== undefined)
-                output.options = options;
             // Split mode needs a per-api file name; bundled mode cannot expand one.
             const effectiveFile = file ?? generator?.defaultOutput?.file;
             if (effectiveFile !== undefined && split === false && API_PLACEHOLDER_RE.test(effectiveFile)) {
@@ -123,6 +154,13 @@ const buildGeneratorJobs = (doc, rootDoc, registry, diagnostics) => {
             const outDir = resolveOutDir(expanded, doc, rootDoc, diagnostics);
             if (outDir === undefined)
                 continue;
+            if (TYPES_IMPORT_GENERATORS.has(use.generator) && options?.['typesImport'] === undefined) {
+                const derived = deriveTypesImport(outDir, doc, rootDoc);
+                if (derived !== undefined)
+                    options = { ...(options ?? {}), typesImport: derived };
+            }
+            if (options !== undefined)
+                output.options = options;
             const key = [use.generator, outDir, file ?? '', String(split ?? ''), JSON.stringify(options ?? null), header ?? '\u0001'].join('\u0000');
             const existing = grouped.get(key);
             if (existing) {

package/dist/lib/_internal/generators/support/split.d.ts

@@ -18,7 +18,7 @@ export declare const collectDeps: (ir: Ir, roots: IrModel[]) => HostedDeps;
 /**
  * Assign a unique module basename to every table. Two models may share a
  * physical table name across services (e.g. both declare
- * `reconciliation_operations`); the first keeps the table-derived name and
+ * `audit_logs`); the first keeps the table-derived name and
  * later ones fall back to their model name so files never overwrite each other.
  */
 export declare const assignModuleNames: (tables: IrModel[]) => Map<string, string>;

package/dist/lib/_internal/generators/support/split.js

@@ -52,7 +52,7 @@ export const collectDeps = (ir, roots) => {
 /**
  * Assign a unique module basename to every table. Two models may share a
  * physical table name across services (e.g. both declare
- * `reconciliation_operations`); the first keeps the table-derived name and
+ * `audit_logs`); the first keeps the table-derived name and
  * later ones fall back to their model name so files never overwrite each other.
  */
 export const assignModuleNames = (tables) => {

package/dist/lib/_internal/generators/typescript/render.d.ts

@@ -0,0 +1,15 @@
+import { Ir, IrEnum, IrField, IrModel, ScalarType } from '../../ir/ir.js';
+/**
+ * Rendering shared by the bundled and split TypeScript layouts. Both layouts
+ * MUST go through these helpers so a contract setting (valueKeys, nullable,
+ * multi-line descriptions, …) means the same thing regardless of layout.
+ */
+export declare const SCALAR_TS: Record<ScalarType, string>;
+export declare const JSON_TYPE: string;
+export declare const docLines: (description: string | undefined, indent: string) => string[];
+export declare const renderField: (field: IrField, ir: Ir) => string;
+export declare const renderEnumConst: (irEnum: IrEnum) => string;
+export declare const renderEnumUnion: (irEnum: IrEnum) => string;
+export declare const renderModel: (model: IrModel, ir: Ir) => string;
+export declare const usesJson: (models: IrModel[]) => boolean;
+//# sourceMappingURL=render.d.ts.map

package/dist/lib/_internal/generators/typescript/render.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../../../src/lib/_internal/generators/typescript/render.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAa,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAIpF;;;;GAIG;AAEH,eAAO,MAAM,SAAS,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAUhD,CAAA;AAED,eAAO,MAAM,SAAS,QAQV,CAAA;AAcZ,eAAO,MAAM,QAAQ,GAAI,aAAa,MAAM,GAAG,SAAS,EAAE,QAAQ,MAAM,KAAG,MAAM,EAKhF,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,OAAO,OAAO,EAAE,IAAI,EAAE,KAAG,MAiBpD,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,KAAG,MAchD,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,KAAG,MAIhD,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,OAAO,OAAO,EAAE,IAAI,EAAE,KAAG,MAIpD,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,QAAQ,OAAO,EAAE,KAAG,OACiE,CAAA"}

package/dist/lib/_internal/generators/typescript/render.js

@@ -0,0 +1,92 @@
+import { constantCase, singleQuote } from '../support/naming.js';
+import { isRelation, relationFkName, relationFkType } from '../support/relations.js';
+/**
+ * Rendering shared by the bundled and split TypeScript layouts. Both layouts
+ * MUST go through these helpers so a contract setting (valueKeys, nullable,
+ * multi-line descriptions, …) means the same thing regardless of layout.
+ */
+export const SCALAR_TS = {
+    string: 'string',
+    int: 'number',
+    int64: 'number',
+    float: 'number',
+    boolean: 'boolean',
+    timestamp: 'string',
+    date: 'string',
+    json: 'Json',
+    id: 'string',
+};
+export const JSON_TYPE = [
+    'export type Json =',
+    '  | string',
+    '  | number',
+    '  | boolean',
+    '  | null',
+    '  | Json[]',
+    '  | { [key: string]: Json }',
+].join('\n');
+const renderRef = (ref) => {
+    switch (ref.kind) {
+        case 'scalar':
+            return SCALAR_TS[ref.name];
+        case 'enum':
+        case 'model':
+            return ref.name;
+        default:
+            return 'unknown';
+    }
+};
+export const docLines = (description, indent) => {
+    if (!description)
+        return [];
+    const lines = description.split('\n');
+    if (lines.length === 1)
+        return [`${indent}/** ${lines[0]} */`];
+    return [`${indent}/**`, ...lines.map(line => `${indent} * ${line}`.trimEnd()), `${indent} */`];
+};
+export const renderField = (field, ir) => {
+    const optional = field.optional ? '?' : '';
+    const doc = docLines(field.description, '  ');
+    let entry;
+    if (field.literal !== undefined) {
+        const type = field.list ? `${singleQuote(field.literal)}[]` : singleQuote(field.literal);
+        entry = `  ${field.name}${optional}: ${type}`;
+    }
+    else if (isRelation(field)) {
+        const base = SCALAR_TS[relationFkType(ir, field)];
+        entry = `  ${relationFkName(field)}${optional}: ${field.list ? `${base}[]` : base}`;
+    }
+    else {
+        const base = renderRef(field.type);
+        const type = field.list ? `${base}[]` : base;
+        const nullable = field.nullable ? ' | null' : '';
+        entry = `  ${field.name}${optional}: ${type}${nullable}`;
+    }
+    return [...doc, entry].join('\n');
+};
+export const renderEnumConst = (irEnum) => {
+    const doc = docLines(irEnum.description, '');
+    const constName = constantCase(irEnum.name);
+    const entries = irEnum.values
+        .map(value => `  ${irEnum.valueKeys?.[value] ?? constantCase(value)}: ${singleQuote(value)},`)
+        .join('\n');
+    return [
+        ...doc,
+        `export const ${constName} = Object.freeze({`,
+        entries,
+        `} as const)`,
+        `export type ${irEnum.name}Key = keyof typeof ${constName}`,
+        `export type ${irEnum.name} = (typeof ${constName})[${irEnum.name}Key]`,
+    ].join('\n');
+};
+export const renderEnumUnion = (irEnum) => {
+    const doc = docLines(irEnum.description, '');
+    const union = irEnum.values.map(value => singleQuote(value)).join(' | ') || 'never';
+    return [...doc, `export type ${irEnum.name} = ${union}`].join('\n');
+};
+export const renderModel = (model, ir) => {
+    const doc = docLines(model.description, '');
+    const fields = model.fields.map(field => renderField(field, ir)).join('\n');
+    return [...doc, `export interface ${model.name} {`, fields, '}'].join('\n');
+};
+export const usesJson = (models) => models.some(model => model.fields.some(field => field.type.kind === 'scalar' && field.type.name === 'json'));

package/dist/lib/_internal/generators/typescript/typescript-generator.d.ts

@@ -12,7 +12,8 @@ export interface TypeScriptGeneratorOptions {
  * Generates TypeScript types: an interface per model and, per enum, either a
  * frozen const object (default — runtime values + `Key`/value types) or a
  * plain string-literal union. This is the highest-priority
- * generator and the shape other TS-facing generators reference.
+ * generator and the shape other TS-facing generators reference. Rendering is
+ * shared with the split layout (./render.js) so both emit identical members.
  */
 export declare const createTypeScriptGenerator: (options?: TypeScriptGeneratorOptions) => Generator;
 //# sourceMappingURL=typescript-generator.d.ts.map

package/dist/lib/_internal/generators/typescript/typescript-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typescript-generator.d.ts","sourceRoot":"","sources":["../../../../../src/lib/_internal/generators/typescript/typescript-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,SAAS,EAAoB,MAAM,iBAAiB,CAAA;AAQ5E,MAAM,WAAW,0BAA0B;IACzC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,GAAG,OAAO,CAAA;CAC9B;AA+ED;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,GAAI,UAAS,0BAA+B,KAAG,SA4BpF,CAAA"}
+{"version":3,"file":"typescript-generator.d.ts","sourceRoot":"","sources":["../../../../../src/lib/_internal/generators/typescript/typescript-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,SAAS,EAAoB,MAAM,iBAAiB,CAAA;AAO5E,MAAM,WAAW,0BAA0B;IACzC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,GAAG,OAAO,CAAA;CAC9B;AAED;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,GAAI,UAAS,0BAA+B,KAAG,SA0BpF,CAAA"}

package/dist/lib/_internal/generators/typescript/typescript-generator.js

@@ -1,82 +1,14 @@
 import { headerBlocks } from '../support/header.js';
 import { withSplitVariant } from '../support/split-variant.js';
 import { createTypeScriptSplitLayout } from './typescript-split-generator.js';
-import { constantCase, singleQuote } from '../support/naming.js';
-import { isRelation, relationFkName, relationFkType } from '../support/relations.js';
 import { outputFile } from '../support/templates.js';
-const SCALAR_TS = {
-    string: 'string',
-    int: 'number',
-    int64: 'number',
-    float: 'number',
-    boolean: 'boolean',
-    timestamp: 'string',
-    date: 'string',
-    json: 'Json',
-    id: 'string',
-};
-const JSON_TYPE = [
-    'export type Json =',
-    '  | string',
-    '  | number',
-    '  | boolean',
-    '  | null',
-    '  | Json[]',
-    '  | { [key: string]: Json }',
-].join('\n');
-const renderRef = (ref) => {
-    switch (ref.kind) {
-        case 'scalar':
-            return SCALAR_TS[ref.name];
-        case 'enum':
-        case 'model':
-            return ref.name;
-        default:
-            return 'unknown';
-    }
-};
-const renderFieldType = (field) => {
-    const base = renderRef(field.type);
-    return field.list ? `${base}[]` : base;
-};
-const renderField = (field, ir) => {
-    const optional = field.optional ? '?' : '';
-    const doc = field.description ? `  /** ${field.description} */\n` : '';
-    if (field.literal !== undefined) {
-        const type = field.list ? `${singleQuote(field.literal)}[]` : singleQuote(field.literal);
-        return `${doc}  ${field.name}${optional}: ${type}`;
-    }
-    // Relation: expose the foreign-key id (matching the persisted/projected shape).
-    if (isRelation(field)) {
-        const base = SCALAR_TS[relationFkType(ir, field)];
-        const type = field.list ? `${base}[]` : base;
-        return `${doc}  ${relationFkName(field)}${optional}: ${type}`;
-    }
-    return `${doc}  ${field.name}${optional}: ${renderFieldType(field)}`;
-};
-const usesJson = (ir) => ir.models.some(model => model.fields.some(field => field.type.kind === 'scalar' && field.type.name === 'json'));
-const renderEnumUnion = (irEnum) => {
-    const doc = irEnum.description ? `/** ${irEnum.description} */\n` : '';
-    const union = irEnum.values.map(value => singleQuote(value)).join(' | ') || 'never';
-    return `${doc}export type ${irEnum.name} = ${union}`;
-};
-const renderEnumConst = (irEnum) => {
-    const doc = irEnum.description ? `/** ${irEnum.description} */\n` : '';
-    const constName = constantCase(irEnum.name);
-    const entries = irEnum.values.map(value => `  ${constantCase(value)}: ${singleQuote(value)},`).join('\n');
-    return [
-        `${doc}export const ${constName} = Object.freeze({`,
-        entries,
-        `} as const)`,
-        `export type ${irEnum.name}Key = keyof typeof ${constName}`,
-        `export type ${irEnum.name} = (typeof ${constName})[${irEnum.name}Key]`,
-    ].join('\n');
-};
+import { JSON_TYPE, renderEnumConst, renderEnumUnion, renderModel, usesJson } from './render.js';
 /**
  * Generates TypeScript types: an interface per model and, per enum, either a
  * frozen const object (default — runtime values + `Key`/value types) or a
  * plain string-literal union. This is the highest-priority
- * generator and the shape other TS-facing generators reference.
+ * generator and the shape other TS-facing generators reference. Rendering is
+ * shared with the split layout (./render.js) so both emit identical members.
  */
 export const createTypeScriptGenerator = (options = {}) => {
     const enumStyle = options.enumStyle ?? 'const';
@@ -85,16 +17,14 @@ export const createTypeScriptGenerator = (options = {}) => {
         description: 'TypeScript interfaces and enum const/union types',
         generate(ir, context) {
             const blocks = [...headerBlocks(context)];
-            if (usesJson(ir)) {
+            if (usesJson(ir.models)) {
                 blocks.push(JSON_TYPE);
             }
             for (const irEnum of ir.enums) {
                 blocks.push(enumStyle === 'const' ? renderEnumConst(irEnum) : renderEnumUnion(irEnum));
             }
             for (const model of ir.models) {
-                const doc = model.description ? `/** ${model.description} */\n` : '';
-                const fields = model.fields.map(field => renderField(field, ir)).join('\n');
-                blocks.push(`${doc}export interface ${model.name} {\n${fields}\n}`);
+                blocks.push(renderModel(model, ir));
             }
             return [{ path: outputFile(context, 'types.ts'), content: `${blocks.join('\n\n')}\n` }];
         },

package/dist/lib/_internal/generators/typescript/typescript-split-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typescript-split-generator.d.ts","sourceRoot":"","sources":["../../../../../src/lib/_internal/generators/typescript/typescript-split-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,SAAS,EAAoB,MAAM,iBAAiB,CAAA;AA4F5E;;;;;;GAMG;AACH,eAAO,MAAM,2BAA2B,QAAO,SA0E7C,CAAA"}
+{"version":3,"file":"typescript-split-generator.d.ts","sourceRoot":"","sources":["../../../../../src/lib/_internal/generators/typescript/typescript-split-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,SAAS,EAAoB,MAAM,iBAAiB,CAAA;AAO5E;;;;;;GAMG;AACH,eAAO,MAAM,2BAA2B,QAAO,SA0E7C,CAAA"}

package/dist/lib/_internal/generators/typescript/typescript-split-generator.js

@@ -1,89 +1,9 @@
 import { findEnum, findModel } from '../../ir/ir.js';
 import { headerBlocks } from '../support/header.js';
-import { constantCase, singleQuote } from '../support/naming.js';
-import { isRelation, relationFkName, relationFkType } from '../support/relations.js';
+import { isRelation } from '../support/relations.js';
 import { assignModuleNames, collectDeps, splitGroups } from '../support/split.js';
 import { outputFile } from '../support/templates.js';
-const SCALAR_TS = {
-    string: 'string',
-    int: 'number',
-    int64: 'number',
-    float: 'number',
-    boolean: 'boolean',
-    timestamp: 'string',
-    date: 'string',
-    json: 'Json',
-    id: 'string',
-};
-const JSON_TYPE = [
-    'export type Json =',
-    '  | string',
-    '  | number',
-    '  | boolean',
-    '  | null',
-    '  | Json[]',
-    '  | { [key: string]: Json }',
-].join('\n');
-const renderRef = (ref) => {
-    switch (ref.kind) {
-        case 'scalar':
-            return SCALAR_TS[ref.name];
-        case 'enum':
-        case 'model':
-            return ref.name;
-        default:
-            return 'unknown';
-    }
-};
-const docLines = (description, indent) => {
-    if (!description)
-        return [];
-    const lines = description.split('\n');
-    if (lines.length === 1)
-        return [`${indent}/** ${lines[0]} */`];
-    return [`${indent}/**`, ...lines.map(line => `${indent} * ${line}`.trimEnd()), `${indent} */`];
-};
-const renderField = (field, ir) => {
-    const optional = field.optional ? '?' : '';
-    const doc = docLines(field.description, '  ');
-    let entry;
-    if (field.literal !== undefined) {
-        const type = field.list ? `${singleQuote(field.literal)}[]` : singleQuote(field.literal);
-        entry = `  ${field.name}${optional}: ${type}`;
-    }
-    else if (isRelation(field)) {
-        const base = SCALAR_TS[relationFkType(ir, field)];
-        entry = `  ${relationFkName(field)}${optional}: ${field.list ? `${base}[]` : base}`;
-    }
-    else {
-        const base = renderRef(field.type);
-        const type = field.list ? `${base}[]` : base;
-        const nullable = field.nullable ? ' | null' : '';
-        entry = `  ${field.name}${optional}: ${type}${nullable}`;
-    }
-    return [...doc, entry].join('\n');
-};
-const renderEnumConst = (irEnum) => {
-    const doc = docLines(irEnum.description, '');
-    const constName = constantCase(irEnum.name);
-    const entries = irEnum.values
-        .map(value => `  ${irEnum.valueKeys?.[value] ?? constantCase(value)}: ${singleQuote(value)},`)
-        .join('\n');
-    return [
-        ...doc,
-        `export const ${constName} = Object.freeze({`,
-        entries,
-        `} as const)`,
-        `export type ${irEnum.name}Key = keyof typeof ${constName}`,
-        `export type ${irEnum.name} = (typeof ${constName})[${irEnum.name}Key]`,
-    ].join('\n');
-};
-const renderModel = (model, ir) => {
-    const doc = docLines(model.description, '');
-    const fields = model.fields.map(field => renderField(field, ir)).join('\n');
-    return [...doc, `export interface ${model.name} {`, fields, '}'].join('\n');
-};
-const usesJson = (models) => models.some(model => model.fields.some(field => field.type.kind === 'scalar' && field.type.name === 'json'));
+import { JSON_TYPE, renderEnumConst, renderModel, usesJson } from './render.js';
 /**
  * Split variant of the TypeScript generator: one file per table at
  * `types/<table-name>.ts` (kebab-case), with enums and embedded value objects

package/dist/lib/_internal/generators/zod/render.d.ts

@@ -0,0 +1,12 @@
+import { Ir, IrEnum, IrField, IrModel, ScalarType } from '../../ir/ir.js';
+/**
+ * Rendering shared by the bundled and split Zod layouts. Both layouts MUST go
+ * through these helpers so a contract setting (nullable, constraints, …) means
+ * the same thing regardless of layout.
+ */
+export declare const SCALAR_ZOD: Record<ScalarType, string>;
+export declare const schemaName: (name: string) => string;
+export declare const renderFieldSchema: (field: IrField, ir: Ir) => string;
+export declare const renderEnum: (irEnum: IrEnum) => string;
+export declare const renderModel: (model: IrModel, ir: Ir) => string;
+//# sourceMappingURL=render.d.ts.map

package/dist/lib/_internal/generators/zod/render.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../../../src/lib/_internal/generators/zod/render.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAa,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAKpF;;;;GAIG;AAEH,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAUjD,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,KAAG,MAAyB,CAAA;AAgBnE,eAAO,MAAM,iBAAiB,GAAI,OAAO,OAAO,EAAE,IAAI,EAAE,KAAG,MAa1D,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,QAAQ,MAAM,KAAG,MAM3C,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,OAAO,OAAO,EAAE,IAAI,EAAE,KAAG,MAMpD,CAAA"}

package/dist/lib/_internal/generators/zod/render.js

@@ -0,0 +1,59 @@
+import { zodConstraints } from '../support/constraints.js';
+import { singleQuote } from '../support/naming.js';
+import { isRelation, relationFkName, relationFkType } from '../support/relations.js';
+/**
+ * Rendering shared by the bundled and split Zod layouts. Both layouts MUST go
+ * through these helpers so a contract setting (nullable, constraints, …) means
+ * the same thing regardless of layout.
+ */
+export const SCALAR_ZOD = {
+    string: 'z.string()',
+    int: 'z.number().int()',
+    int64: 'z.number().int()',
+    float: 'z.number()',
+    boolean: 'z.boolean()',
+    timestamp: 'z.string().datetime()',
+    date: 'z.string()',
+    json: 'z.unknown()',
+    id: 'z.string()',
+};
+export const schemaName = (name) => `${name}Schema`;
+const renderRef = (ref) => {
+    switch (ref.kind) {
+        case 'scalar':
+            return SCALAR_ZOD[ref.name];
+        case 'enum':
+            return schemaName(ref.name);
+        case 'model':
+            // Wrapped in z.lazy so declaration order and (cross-file) cycles never matter.
+            return `z.lazy(() => ${schemaName(ref.name)})`;
+        default:
+            return 'z.unknown()';
+    }
+};
+export const renderFieldSchema = (field, ir) => {
+    const isRel = isRelation(field);
+    const name = isRel ? relationFkName(field) : field.name;
+    const base = field.literal !== undefined
+        ? `z.literal(${singleQuote(field.literal)})`
+        : isRel
+            ? SCALAR_ZOD[relationFkType(ir, field)]
+            : renderRef(field.type);
+    const cons = zodConstraints(field);
+    let schema = field.list ? `z.array(${base})${cons}` : `${base}${cons}`;
+    if (field.nullable)
+        schema = `${schema}.nullable()`;
+    if (field.optional)
+        schema = `${schema}.optional()`;
+    return `  ${name}: ${schema},`;
+};
+export const renderEnum = (irEnum) => {
+    const values = irEnum.values.map(singleQuote).join(', ');
+    return (`export const ${schemaName(irEnum.name)} = z.enum([${values}])\n` +
+        `export type ${irEnum.name} = z.infer<typeof ${schemaName(irEnum.name)}>`);
+};
+export const renderModel = (model, ir) => {
+    const fields = model.fields.map(field => renderFieldSchema(field, ir)).join('\n');
+    return (`export const ${schemaName(model.name)} = z.object({\n${fields}\n})\n` +
+        `export type ${model.name} = z.infer<typeof ${schemaName(model.name)}>`);
+};

package/dist/lib/_internal/generators/zod/zod-generator.d.ts

@@ -1,7 +1,8 @@
 import { Generator } from '../generator.js';
 /**
  * Generates Zod schemas and the types inferred from them. Model references use
- * `z.lazy` so the output is order- and cycle-independent.
+ * `z.lazy` so the output is order- and cycle-independent. Rendering is shared
+ * with the split layout (./render.js) so both emit identical members.
  */
 export declare const createZodGenerator: () => Generator;
 //# sourceMappingURL=zod-generator.d.ts.map

package/dist/lib/_internal/generators/zod/zod-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zod-generator.d.ts","sourceRoot":"","sources":["../../../../../src/lib/_internal/generators/zod/zod-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,SAAS,EAAoB,MAAM,iBAAiB,CAAA;AAuD5E;;;GAGG;AACH,eAAO,MAAM,kBAAkB,QAAO,SA4BnC,CAAA"}
+{"version":3,"file":"zod-generator.d.ts","sourceRoot":"","sources":["../../../../../src/lib/_internal/generators/zod/zod-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,SAAS,EAAoB,MAAM,iBAAiB,CAAA;AAO5E;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,QAAO,SAoBnC,CAAA"}