okmodel 0.1.0 → 0.2.1

package/dist/shared/{kynx7vbm.js → 5z4q2zda.js}

@@ -5,25 +5,40 @@ import {
   serializeCatalog2,
   catalogHash2,
   parseCatalog2
-} from "./y9m15dfv.js";
+} from "./d2whjz4k.js";
 import {
-  quoteLiteral,
-  ColumnBuilder2,
-  snakeCase,
-  emittedTypeName
-} from "./gk7cs7sp.js";
+  VALIDATION_NOT_IMPORTED2,
+  VALIDATION_NOT_IMPORTED_FIX2
+} from "./n442h54c.js";
+import {
+  contributedFields
+} from "./g1b5zzj9.js";
+import {
+  assertValidation,
+  writeWouldValidate
+} from "./3a5ne750.js";
 import {
   catalog,
   sameEnumLabels
-} from "./g5fhqmwe.js";
+} from "./qxa0yb9j.js";
+import {
+  snakeCase,
+  emittedTypeName
+} from "./x9v1qgeb.js";
+import {
+  ColumnBuilder2
+} from "./dd4f8mnx.js";
+import {
+  quoteLiteral
+} from "./xatfg0gn.js";
 import {
   staticNamespace2,
   identityKey2,
   compareText
-} from "./j5cn2963.js";
+} from "./t4tbsy9h.js";
 import {
   OkmError2
-} from "./ycwz42az.js";
+} from "./52szzakm.js";
 
 // src/dialects/pg/ddl.ts
 function quoteIdent(name) {
@@ -71,8 +86,11 @@ function alterColumnSql(before, after, schema) {
   const statements = [];
   const table = qualify(schema, after.identity.parent.name);
   const name = quoteIdent(after.identity.name);
-  if (before.definition.dataType !== after.definition.dataType) {
-    statements.push(`alter table ${table} alter column ${name} set data type ${after.definition.dataType} using ${name}::${after.definition.dataType}`);
+  const typeChanged = before.definition.dataType !== after.definition.dataType;
+  const collationChanged = before.definition.collation !== after.definition.collation;
+  if (typeChanged || collationChanged) {
+    const using = typeChanged ? ` using ${name}::${after.definition.dataType}` : "";
+    statements.push(`alter table ${table} alter column ${name} set data type ${after.definition.dataType}${collateSql(after.definition.collation)}${using}`);
   }
   if (before.definition.nullable !== after.definition.nullable) {
     statements.push(`alter table ${table} alter column ${name} ${after.definition.nullable ? "drop not null" : "set not null"}`);
@@ -106,13 +124,18 @@ function createTableSql(tableObject, source, schema) {
   `)}
 )${tail}`;
 }
+function collateSql(collation) {
+  if (collation === undefined)
+    return "";
+  return ` collate ${quoteIdent(collation)}`;
+}
 function createEnumSql(object, schema) {
   const labels = object.definition.labels.map((label) => quoteLiteral(label)).join(", ");
   return `create type ${qualify(schema, object.identity.name)} as enum (${labels})`;
 }
 function columnSql(column) {
   const definition = column.definition;
-  let sql = `${quoteIdent(column.identity.name)} ${definition.dataType}`;
+  let sql = `${quoteIdent(column.identity.name)} ${definition.dataType}${collateSql(definition.collation)}`;
   if (definition.identity !== undefined) {
     sql += definition.identity.always ? " generated always as identity" : " generated by default as identity";
   } else if (definition.generated !== undefined) {
@@ -253,6 +276,8 @@ function planMigration(request) {
   const enums = enumEdits(beforeBy, afterBy, schema);
   requireReplacements(picklists, enums, replacements);
   recreateDependents(beforeList, afterList, alters, dropKeys, createKeys, picklists);
+  omitOwnedSequences(createKeys, afterBy, request.after);
+  omitOwnedSequences(dropKeys, beforeBy, renamed);
   const steps = [];
   steps.push(...renameSteps(request.before, renames, schema));
   steps.push(...keptNames.map((item) => renameShapeStep(item, schema)));
@@ -284,6 +309,9 @@ function planMigration(request) {
     for (const sql of alterColumnSql(change.before, change.after, schema)) {
       steps.push(step(sql, alterClass(sql), "ddl", ACCESS));
     }
+    const identitySql = identityChangeSql(change.before, change.after, schema);
+    if (identitySql !== undefined)
+      steps.push(step(identitySql, "expand", "ddl", ACCESS));
   }
   const createdTables = new Set([...createKeys].map((key) => afterBy.get(key)).filter((object) => object?.kind === "table").map((object) => object.identity.name));
   const emitted = new Set;
@@ -875,7 +903,29 @@ function columnNullable(source, table, column) {
   return false;
 }
 function columnAlterable(before, after) {
-  return stable(before.definition.identity) === stable(after.definition.identity) && stable(before.definition.generated) === stable(after.definition.generated);
+  return stable(before.definition.generated) === stable(after.definition.generated);
+}
+function identityChangeSql(before, after, schema) {
+  if (stable(before.definition.identity) === stable(after.definition.identity))
+    return;
+  const table = qualify2(schema, after.identity.parent.name);
+  const name = quoteIdent(after.identity.name);
+  const next = after.definition.identity;
+  const previous = before.definition.identity;
+  if (next === undefined)
+    return `alter table ${table} alter column ${name} drop identity`;
+  if (previous === undefined) {
+    const generated = next.always ? "always" : "by default";
+    return `alter table ${table} alter column ${name} add generated ${generated} as identity`;
+  }
+  return `alter table ${table} alter column ${name} set generated ${next.always ? "always" : "by default"}`;
+}
+function omitOwnedSequences(keys, by, source) {
+  for (const key of keys) {
+    const object = by.get(key);
+    if (object?.kind === "sequence" && folded(object, source))
+      keys.delete(key);
+  }
 }
 function sameDefinition(left, right) {
   return stable(left.definition) === stable(right.definition);
@@ -894,9 +944,16 @@ function folded(object, source) {
     return true;
   if (object.kind === "constraint" && object.definition.constraintKind === "primaryKey")
     return true;
-  if (object.kind === "sequence" && identitySequence(object, source))
+  if (object.kind !== "sequence")
+    return false;
+  if (identitySequence(object, source))
     return true;
-  return false;
+  const name = object.identity.name;
+  return source.objects.some((column) => {
+    if (column.kind !== "column" || column.definition.identity === undefined)
+      return false;
+    return name === `${column.identity.parent.name}_${column.identity.name}_seq`;
+  });
 }
 function anchoredParent(object) {
   if (object.kind === "column" || object.kind === "index" || object.kind === "constraint") {
@@ -1102,6 +1159,460 @@ import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from
 import { basename, join } from "node:path";
 import { pathToFileURL } from "node:url";
 
+// src/tooling/errors/registry.ts
+var ERROR_DOCS = [
+  {
+    code: "OKM1012",
+    title: "Trait field conflict",
+    summary: "A trait added a field that the table already declares.",
+    fix: "Rename the table field or drop the trait that introduces it. The error names both."
+  },
+  {
+    code: "OKM1020",
+    title: "Unknown table",
+    summary: "A table, dependency, or catalog object is missing or does not match its identity.",
+    fix: "Use a name that is in the schema. The error lists the accepted names and a nearest-name hint when one is close."
+  },
+  {
+    code: "OKM1021",
+    title: "Foreign key target",
+    summary: "A foreign key is missing its target table or column, or the target is ambiguous.",
+    fix: "Name the referenced table and columns. The error lists the columns that exist on the target."
+  },
+  {
+    code: "OKM1022",
+    title: "Foreign key type",
+    summary: "A foreign key column and the column it references have different types.",
+    fix: "Give both columns the same type. The error names the type that is accepted."
+  },
+  {
+    code: "OKM1023",
+    title: "Duplicate name",
+    summary: "Two catalog objects share an identity, or two tables emit the same type name.",
+    fix: "Rename one of them. Table names and emitted type names must be unique in the schema."
+  },
+  {
+    code: "OKM1024",
+    title: "Table file not in schema",
+    summary: "A table file is not passed to schema().",
+    fix: "Add the file's table to the schema() call that okm check reads."
+  },
+  {
+    code: "OKM1025",
+    title: "Multiple Register",
+    summary: "More than one Register augmentation is in the project.",
+    fix: 'Keep a single declare module "okmodel" that sets schema. Pass an explicit schema type everywhere else.'
+  },
+  {
+    code: "OKM1026",
+    title: "Dependency cycle",
+    summary: "The catalog dependency graph contains a cycle, so objects cannot be ordered.",
+    fix: "Break the cycle. The error is raised while ordering the catalog."
+  },
+  {
+    code: "OKM1027",
+    title: "Unreadable catalog",
+    summary: "The catalog document is malformed or uses a version this build cannot read.",
+    fix: "Regenerate the catalog with this version of okmodel. Do not hand-edit the document."
+  },
+  {
+    code: "OKM1030",
+    title: "Validation in two places",
+    summary: "A field is validated both on the column and somewhere else.",
+    fix: "Keep one validation for the field. The error names the field."
+  },
+  {
+    code: "OKM1040",
+    title: "Preset name collision",
+    summary: "A preset uses the name of a client method or a reserved name, or a table and its traits (or two traits) define the same preset.",
+    fix: "Rename the preset. The error names both sources when two define it. okm upgrade renames a preset when a later release claims its name."
+  },
+  {
+    code: "OKM1051",
+    title: "Archive foreign key",
+    summary: "A foreign key into a table-strategy archivable table uses CASCADE, SET NULL, or SET DEFAULT and is not listed in cascade.",
+    fix: "List the child table, the foreign key, and its action in cascade, or use RESTRICT or NO ACTION."
+  },
+  {
+    code: "OKM1052",
+    title: "Not archivable",
+    summary: "archive or restore was called on a table that is not archivable.",
+    fix: "Call it only on an archivable table. The methods are absent from the types of other tables."
+  },
+  {
+    code: "OKM1060",
+    title: "Invalid column",
+    summary: "A column definition has a bad length, precision, scale, array rank, interval qualifier, or an empty or repeated picklist or enum.",
+    fix: "Use a value the error lists as accepted."
+  },
+  {
+    code: "OKM1061",
+    title: "Reserved option",
+    summary: "The option exists in the types but this version does not implement it.",
+    fix: "Remove the option until the prompt or milestone named in the error adds it."
+  },
+  {
+    code: "OKM1101",
+    title: "Find without limit",
+    summary: "find was called without a limit.",
+    fix: "Pass limit, or call .all(reason) when the full set is intentional."
+  },
+  {
+    code: "OKM1102",
+    title: "Unfiltered write",
+    summary: "update or delete would run with an empty where.",
+    fix: "Pass a filter. undefined in a write filter does not mean every row."
+  },
+  {
+    code: "OKM1104",
+    title: "Upsert target",
+    summary: "onConflict names columns that are not a unique constraint.",
+    fix: "Set on to the columns of a unique constraint or the primary key."
+  },
+  {
+    code: "OKM1105",
+    title: "Include without limit",
+    summary: "A to-many include has no limit.",
+    fix: "Pass limit on the include, or call .all(reason)."
+  },
+  {
+    code: "OKM1110",
+    title: "Engine version",
+    summary: "The feature needs a newer engine than schema({ requires }) allows.",
+    fix: "Raise requires, or stop using the feature. The error names both versions."
+  },
+  {
+    code: "OKM1111",
+    title: "Missing capability",
+    summary: "The call needs a driver capability this driver does not have.",
+    fix: "Use a driver that declares the capability, or drop the call. The error names the flag."
+  },
+  {
+    code: "OKM1120",
+    title: "Unknown field",
+    summary: "A field name in where, select, orderBy, or include is not on the table.",
+    fix: "Use a field from the catalog. The error includes a nearest-name hint when one is close."
+  },
+  {
+    code: "OKM1121",
+    title: "Object as value",
+    summary: "A plain object was passed where a value is required. JSON cannot create an operator.",
+    fix: "Wrap the value with eq. eq is the equality form for json and jsonb."
+  },
+  {
+    code: "OKM1122",
+    title: "Bad identifier",
+    summary: "An identifier is empty, too long, contains NUL or another control character, or is an unquoted reserved word.",
+    fix: "Use a shorter name without control characters. Quote is not accepted here. The error names the rule that failed."
+  },
+  {
+    code: "OKM1123",
+    title: "Hidden field allowlist",
+    summary: "A hidden field was added to a filter or sort allowlist.",
+    fix: "Remove the hidden field from the allowlist. Hidden fields stay out of caller filters and sorts."
+  },
+  {
+    code: "OKM1124",
+    title: "Operator mismatch",
+    summary: "An operator does not apply to the column type.",
+    fix: "Use an operator the error lists for that column type. Text search needs a tsvector column."
+  },
+  {
+    code: "OKM1130",
+    title: "Cursor order",
+    summary: "A cursor was reused with a different orderBy than the one that created it, or is not a cursor page() returned.",
+    fix: "Request the next page with the same orderBy and the exact next value the previous page returned. The cursor encodes that order."
+  },
+  {
+    code: "OKM1190",
+    title: "Safety violation",
+    summary: "A query composition broke a core invariant. violations lists every broken rule in stable order.",
+    fix: "Change the contribution named on the first violation, or pass an explicit escape hatch (unscoped, all, trusted, allow) and record the reason."
+  },
+  {
+    code: "OKM1191",
+    title: "No snapshot plan",
+    summary: "A multi-statement read was requested inside READ COMMITTED and no single-statement plan exists.",
+    fix: "Run the read in REPEATABLE READ or SERIALIZABLE, or shape it so it is one statement."
+  },
+  {
+    code: "OKM1200",
+    title: "Validation failed",
+    summary: "A write or a standalone check failed a validation rule. issues lists each path and message key.",
+    fix: "Fix the fields named in issues. Each issue message is a key, not display text."
+  },
+  {
+    code: "OKM1201",
+    title: "Validation not imported",
+    summary: VALIDATION_NOT_IMPORTED2,
+    fix: VALIDATION_NOT_IMPORTED_FIX2
+  },
+  {
+    code: "OKM1210",
+    title: "Codec rejected a value",
+    summary: "A codec refused a value: not numeric text, not a valid temporal value, or the wrong shape.",
+    fix: "Pass a value the error lists as accepted. A missing Temporal global tells you to assign one to globalThis.Temporal."
+  },
+  {
+    code: "OKM1401",
+    title: "Outcome unknown",
+    summary: "A commit or batch was sent and its result never arrived, so the write may or may not have happened.",
+    fix: "Check whether the write landed, using an idempotency key, before retrying. This error is never retried automatically."
+  },
+  {
+    code: "OKM1510",
+    title: "Unsafe migration",
+    summary: "A migration is not expand-safe and has no reason.",
+    fix: "Split the change into expand and contract, or pass a reason that CI can record."
+  },
+  {
+    code: "OKM1520",
+    title: "Schema drift",
+    summary: "The database has drifted past what an expand migration can repair.",
+    fix: "Inspect the diff and repair the database, or generate a migration that matches the drift."
+  },
+  {
+    code: "OKM1521",
+    title: "Snapshot mismatch",
+    summary: "Provisioning from the snapshot does not match the replayed migration history.",
+    fix: "Regenerate the snapshot from the history. okm migrate check is the command that reports this."
+  },
+  {
+    code: "OKM1522",
+    title: "Apply lock held",
+    summary: "Another apply already holds the target's migration lock.",
+    fix: "Wait for that apply to finish. Do not start a second apply against the same target."
+  },
+  {
+    code: "OKM1530",
+    title: "Ambiguous rename",
+    summary: "A rename could match more than one object.",
+    fix: "Declare the rename explicitly so the plan has one pairing."
+  },
+  {
+    code: "OKM1541",
+    title: "Picklist removal",
+    summary: "A picklist or enum value was removed and the replacement was not given.",
+    fix: "Pass --replace <table>.<column>.<old>=<new>, or =null on a nullable column. The replacement must be in the new list."
+  },
+  {
+    code: "OKM1542",
+    title: "Data statement",
+    summary: "A migration contains a data statement outside backfill().",
+    fix: "Move the statement into backfill(). Data changes are batched and resumable there."
+  },
+  {
+    code: "OKM1601",
+    title: "Stale typed SQL",
+    summary: "A typed SQL signature no longer matches the database.",
+    fix: "Regenerate the typed SQL and commit the new signature."
+  },
+  {
+    code: "OKM1701",
+    title: "Tenant context missing",
+    summary: "A tenant table was used on a client that has no tenant context.",
+    fix: "Open the client with the tenant context before reading or writing that table."
+  },
+  {
+    code: "OKM1702",
+    title: "Unverifiable tenant SQL",
+    summary: "Raw SQL touches a tenant table and the tenant predicate cannot be proved.",
+    fix: "Use the query builder, or mark the fragment trusted with a reason if it is reviewed."
+  },
+  {
+    code: "OKM1704",
+    title: "Tenant key change",
+    summary: "An update tried to change the tenant key.",
+    fix: "Remove the tenant key from the update. Moving a row between tenants is not an update."
+  },
+  {
+    code: "OKM1705",
+    title: "Global references tenant",
+    summary: "A global table references a tenant table.",
+    fix: "Drop the reference, or make the referencing table a tenant table."
+  },
+  {
+    code: "OKM1706",
+    title: "Tenant index",
+    summary: "An index on a tenant table does not lead with the tenant key.",
+    fix: "Put the tenant key first in the index columns."
+  },
+  {
+    code: "OKM1707",
+    title: "RLS role",
+    summary: "connect() was given a role that owns the tables or is a superuser, under the rls strategy.",
+    fix: "Connect as a role that is neither the owner nor a superuser."
+  },
+  {
+    code: "OKM1801",
+    title: "Dialect mismatch",
+    summary: "The schema dialect and the driver dialect are not the same.",
+    fix: "Open the schema with the driver package that matches it."
+  },
+  {
+    code: "OKM1802",
+    title: "Server version",
+    summary: "The connected server does not satisfy schema({ requires }).",
+    fix: "Upgrade the server, or lower requires to a version the server meets."
+  },
+  {
+    code: "OKM1803",
+    title: "Postgres floor",
+    summary: "The connected server is older than PostgreSQL 15, and the schema does not set requires to that older major.",
+    fix: "Upgrade the server to PostgreSQL 15 or newer, or set schema({ requires }) to the older major on purpose."
+  },
+  {
+    code: "OKM1810",
+    title: "Extension not declared",
+    summary: "An extension builder was used but the extension is not declared on the schema.",
+    fix: "Declare the extension next to the schema that uses it."
+  },
+  {
+    code: "OKM1811",
+    title: "Extension unavailable",
+    summary: "A declared extension is not installed on the server.",
+    fix: "Install the extension, or remove the declaration. okm doctor reports this against the connected server."
+  },
+  {
+    code: "OKM1812",
+    title: "Feature version",
+    summary: "A feature needs a newer Postgres or extension version than the one declared or connected.",
+    fix: 'Raise the declared version, or avoid the feature. uuidv7() below 18 can use t.id({ default: "uuidv4" }), defaults.id set to "uuidv4", or a client generator. Core features are never gated on an extension.'
+  },
+  {
+    code: "OKM1813",
+    title: "Extension defined twice",
+    summary: "The same extension definition was registered twice.",
+    fix: "Keep one definition. A second copy fails at build."
+  },
+  {
+    code: "OKM1814",
+    title: "Extension change refused",
+    summary: "The plan would downgrade an extension, move a non-relocatable one, or drop one that still has dependents.",
+    fix: "Drop or move the dependents first. Postgres cannot lower an extension version."
+  },
+  {
+    code: "OKM1820",
+    title: "View tenancy",
+    summary: "A view over tenant tables does not expose the tenant key and is not marked global.",
+    fix: "Expose the tenant key so the predicate can be applied, or declare global(reason)."
+  },
+  {
+    code: "OKM1821",
+    title: "Replace needs recreate",
+    summary: "An incompatible replace would have to recreate dependents. CASCADE is never used.",
+    fix: "Review the dependents the plan lists and recreate them explicitly."
+  },
+  {
+    code: "OKM1822",
+    title: "Concurrent refresh",
+    summary: "REFRESH CONCURRENTLY was declared without a unique index on the materialized view.",
+    fix: "Add a unique index, or refresh without CONCURRENTLY."
+  },
+  {
+    code: "OKM1823",
+    title: "Security definer path",
+    summary: "A SECURITY DEFINER function has no search_path.",
+    fix: "Set search_path on the function to the schemas it is allowed to see."
+  },
+  {
+    code: "OKM1824",
+    title: "Function dependencies",
+    summary: "A plpgsql function has no dependsOn. Postgres does not record dependencies inside the body.",
+    fix: "List dependsOn. LANGUAGE sql with BEGIN ATOMIC is inferred and does not need the list."
+  },
+  {
+    code: "OKM1825",
+    title: "Missing privilege",
+    summary: "The application role lacks a privilege on a managed object.",
+    fix: "Grant the privilege, or change the role. okm doctor reports the object and the privilege."
+  },
+  {
+    code: "OKM1830",
+    title: "Lock outside transaction",
+    summary: "find was called with a row lock outside tx().",
+    fix: "Take the lock inside tx(). Advisory locks are transaction-scoped too."
+  },
+  {
+    code: "OKM1840",
+    title: "Replica not allowed",
+    summary: ".replica() was used on an operation that requires the primary, or inside tx().",
+    fix: "Run the operation on the primary. Writes, batch, locks, and tx() never go to a replica."
+  },
+  {
+    code: "OKM1841",
+    title: "External object differs",
+    summary: "An external object does not match the owner's exported catalog.",
+    fix: "Update the dependency's export, or stop treating the object as external."
+  },
+  {
+    code: "OKM1842",
+    title: "Cross-database foreign key",
+    summary: "A foreign key points at a table in another database.",
+    fix: "Keep the foreign key inside one database. Cross-catalog keys are allowed only there."
+  },
+  {
+    code: "OKM1843",
+    title: "No eligible replica",
+    summary: "A replica was required and none is eligible: unhealthy, behind the session, or none configured.",
+    fix: "Configure a replica or drop .replica(). This call does not read the primary."
+  },
+  {
+    code: "OKM1844",
+    title: "Fallback refused",
+    summary: "An automatic read found no eligible replica and fallback is error.",
+    fix: "Restore a replica, or set fallback to primary if the primary should absorb the read."
+  },
+  {
+    code: "OKM1845",
+    title: "Target unresolved",
+    summary: "The target could not be resolved. The tenant is unknown or the resolver failed.",
+    fix: "Check the tenant id and the resolver. Connection details are not guessed."
+  },
+  {
+    code: "OKM1846",
+    title: "Acquire timeout",
+    summary: "The pool did not hand out a connection within timeouts.acquire.",
+    fix: "Raise timeouts.acquire, or stop holding connections. The wait does not spill into another pool."
+  },
+  {
+    code: "OKM1850",
+    title: "Protected target",
+    summary: "The operation is blocked on a protected target and --allow-protected was not passed.",
+    fix: "Run a read-only command or an expand migration, or pass --allow-protected for this invocation."
+  },
+  {
+    code: "OKM1851",
+    title: "Target not empty",
+    summary: "Provisioning was asked to fill a target that already has objects.",
+    fix: "Provision an empty schema or an empty database. A non-empty target is refused."
+  },
+  {
+    code: "OKM1852",
+    title: "Protection mismatch",
+    summary: "Targets that resolve to the same database disagree about protection, or tenants of one schema-per-tenant database do.",
+    fix: "Give those targets the same protection flag. okm check and okm doctor both report this."
+  },
+  {
+    code: "OKM1853",
+    title: "Target not named",
+    summary: "Several targets are configured and the command was not given --target.",
+    fix: "Pass --target <name>. The command does not guess."
+  }
+];
+var byCode;
+function errorDoc(code) {
+  const index = byCode ?? indexDocs();
+  return index.get(code);
+}
+function indexDocs() {
+  const index = new Map;
+  for (const doc of ERROR_DOCS)
+    index.set(doc.code, doc);
+  byCode = index;
+  return index;
+}
+
 // src/dialects/pg/declarations.ts
 function schemaDeclarations(source) {
   const renames = [];
@@ -1159,13 +1670,13 @@ function emitRowTypes(source) {
     inserts.push(`  readonly ${key}: ${name}Insert;`);
     updates.push(`  readonly ${key}: ${name}Update;`);
     lines.push(`export interface ${name} {`);
-    lines.push(fields(item, "row"));
+    lines.push(fields(item, "row", source));
     lines.push("}", "");
     lines.push(`export interface ${name}Insert {`);
-    lines.push(fields(item, "insert"));
+    lines.push(fields(item, "insert", source));
     lines.push("}", "");
     lines.push(`export interface ${name}Update {`);
-    lines.push(fields(item, "update"));
+    lines.push(fields(item, "update", source));
     lines.push("}", "");
   }
   lines.push("export interface Rows {");
@@ -1187,20 +1698,29 @@ function emitRowTypes(source) {
 function propertyName(name) {
   return /^[A-Za-z_][A-Za-z0-9_]*$/.test(name) ? name : JSON.stringify(name);
 }
-function fields(item, kind) {
+function fields(item, kind, source) {
   const printed = [];
-  for (const [field, builder] of Object.entries(item.columns)) {
+  const options = item.options;
+  const entries = Object.entries(item.columns);
+  for (const pair of contributedFields(source.traits, options)) {
+    if (!Object.hasOwn(item.columns, pair[0]))
+      entries.push([pair[0], pair[1]]);
+  }
+  if (source.tenancy !== undefined && options?.tenancy?.kind !== "global" && !Object.hasOwn(item.columns, source.tenancy.key)) {
+    entries.push([source.tenancy.key, source.tenancy.column()]);
+  }
+  for (const [field, builder] of entries) {
     if (!(builder instanceof ColumnBuilder2)) {
       continue;
     }
     const state = builder.state;
-    const written = insertMode(state);
     if (kind === "row") {
       if (!state.hidden) {
         printed.push(`  readonly ${field}: ${valueType(state, "required")};`);
       }
       continue;
     }
+    const written = kind === "update" ? updateMode(state) : insertMode(state);
     if (written === "omit") {
       continue;
     }
@@ -1219,6 +1739,11 @@ function insertMode(state) {
   }
   return "required";
 }
+function updateMode(state) {
+  if (state.omitUpdate || insertMode(state) === "omit")
+    return "omit";
+  return "optional";
+}
 function valueType(state, mode) {
   let label = scalarLabel(state);
   if (state.dims > 0) {
@@ -1336,6 +1861,13 @@ async function planProject(cwd, name, flags) {
 }
 async function checkProject(cwd) {
   const opened = await openProject(cwd);
+  assertValidation(opened.built);
+  if (schemaRequestsValidation(opened.built) && !projectImportsValidate(cwd)) {
+    const doc = errorDoc("OKM1201");
+    if (doc === undefined)
+      throw new Error("OKM1201 missing from the error registry.");
+    throw new OkmError2(doc.code, doc.summary, { fix: { summary: doc.fix } });
+  }
   assertTargetAlias(listTargets(opened.config));
   if (opened.config.tables !== undefined) {
     const directory = join(cwd, opened.config.tables);
@@ -1486,5 +2018,56 @@ function isConfig(value) {
 function isRecord(value) {
   return typeof value === "object" && value !== null;
 }
+var SKIP_SCAN = new Set(["node_modules", "dist", "coverage"]);
+function schemaRequestsValidation(built) {
+  const flag = built.validation;
+  for (const item of built.tables) {
+    if (writeWouldValidate(flag, item, {}))
+      return true;
+  }
+  return false;
+}
+function projectImportsValidate(cwd) {
+  return directoryImportsValidate(cwd);
+}
+function directoryImportsValidate(dir) {
+  let entries;
+  try {
+    entries = readdirSync(dir, { withFileTypes: true });
+  } catch {
+    return false;
+  }
+  for (const entry of entries) {
+    if (entry.name.startsWith(".") || SKIP_SCAN.has(entry.name))
+      continue;
+    const path = join(dir, entry.name);
+    if (entry.isDirectory()) {
+      if (directoryImportsValidate(path))
+        return true;
+      continue;
+    }
+    if (!/\.(?:ts|tsx|mts|cts)$/.test(entry.name))
+      continue;
+    if (runtimeImportsValidate(readFileSync(path, "utf8")))
+      return true;
+  }
+  return false;
+}
+function runtimeImportsValidate(source) {
+  const text = source.replace(/\/\*[\s\S]*?\*\//g, "").replace(/\/\/[^\n]*/g, "");
+  const pattern = /["']okmodel\/validate(?:\.js)?["']/g;
+  for (const match of text.matchAll(pattern)) {
+    const index = match.index ?? 0;
+    const lead = text.slice(Math.max(0, index - 240), index);
+    const start = Math.max(lead.lastIndexOf(`
+`), lead.lastIndexOf(";"));
+    const head = lead.slice(start + 1);
+    if (/\bimport\s+type\b/.test(head) || /\bexport\s+type\b/.test(head))
+      continue;
+    if (/\bimport\b/.test(head) || /\bexport\b/.test(head))
+      return true;
+  }
+  return false;
+}
 
 export { quoteIdent, planMigration, formatPlan, parsePlan, assertTargetPolicy, assertDirectConnection, listTargets, selectTarget, buildProject, generateProject, planProject, checkProject, projectHead, loadConfig };