@metaobjectsdev/codegen-ts 0.21.5 → 0.22.0-rc.1

package/src/templates/entity-file.ts

@@ -12,7 +12,7 @@ import { FIELD_ATTR_OBJECT_REF } from "@metaobjectsdev/metadata";
 import { fieldDeclaringPackage, type RenderContext } from "../render-context.js";
 import { renderDrizzleSchema } from "./drizzle-schema.js";
 import { renderInferredTypes, renderEnumTypeAliases } from "./inferred-types.js";
-import { renderZodValidators, isTphSubtype } from "./zod-validators.js";
+import { renderZodValidators, isTphSubtype, primaryIdentityFieldNames } from "./zod-validators.js";
 import { renderEntityConstants } from "./entity-constants.js";
 import { renderFilterAllowlist, renderSortAllowlist } from "./filter-allowlist.js";
 import { renderFilterType } from "./filter-type.js";
@@ -143,6 +143,9 @@ export function renderEntityFile(
     };
     const viewOpts = {
       dialect: ctx.dialect, columnNamingStrategy: ctx.columnNamingStrategy, timestampMode: ctx.timestampMode, voRef,
+      // PK fields type non-null in the replica-view decl + read schema even
+      // without @required (a PK is never NULL; see ViewDeclOpts.pkFieldNames).
+      pkFieldNames: new Set(primaryIdentityFieldNames(entity)) as ReadonlySet<string>,
     };
     const z = imp("z@zod");
     const docs = renderDocsFor(entity);

package/src/templates/projection-decl.ts

@@ -9,7 +9,7 @@
 
 import { code, imp, joinCode, type Code } from "ts-poet";
 import {
-  MetaField, MetaObject, type MetaRoot,
+  MetaField, MetaObject, type MetaRoot, isMetaObject,
   FIELD_ATTR_OBJECT_REF, stripPackage,
 } from "@metaobjectsdev/metadata";
 import { projectionViewName } from "../projection/extract-view-spec.js";
@@ -22,6 +22,7 @@ import { renderFilterAllowlist, renderSortAllowlist } from "./filter-allowlist.j
 import { renderFilterType } from "./filter-type.js";
 import { inferViewKind, currencyMetaFor, labelFor } from "./field-meta.js";
 import { renderExistingViewDecl, renderViewReadZodObject } from "./view-decl.js";
+import { primaryIdentityFieldNames } from "./zod-validators.js";
 
 // ---------------------------------------------------------------------------
 // Public interface
@@ -125,7 +126,7 @@ export function renderProjectionDecl(
   const superName = superModel?.name ?? projection.superRef;
   if (superName) {
     const baseObj =
-      superModel instanceof MetaObject ? superModel : root.findObject(superName);
+      isMetaObject(superModel) ? superModel : root.findObject(superName);
     if (baseObj) {
       // fields() returns effective fields, so inherited fields (from extends:/super:) are included.
       for (const f of baseObj.fields()) allFields.push(f);
@@ -152,15 +153,18 @@ export function renderProjectionDecl(
   const camelName = projName.charAt(0).toLowerCase() + projName.slice(1);
   const path = pathFromProjectionName(projName);
 
+  // The projection's primary-identity fields type non-null in the view decl +
+  // read schema even without @required (a PK is never NULL; see ViewDeclOpts).
+  const pkFieldNames: ReadonlySet<string> = new Set(primaryIdentityFieldNames(projection));
   const sections: Code[] = [
     ...(includeViewDecl
       ? [renderExistingViewDecl(allFields, viewName, `${camelName}View`, {
-          dialect, columnNamingStrategy, timestampMode, voRef,
+          dialect, columnNamingStrategy, timestampMode, voRef, pkFieldNames,
         })]
       : []),
     code`
 export const ${projName}Schema = ${renderViewReadZodObject(allFields, {
-  dialect, columnNamingStrategy, timestampMode, voRef,
+  dialect, columnNamingStrategy, timestampMode, voRef, pkFieldNames,
 })};
 `,
     code`

package/src/templates/view-decl.ts

@@ -29,6 +29,15 @@ export interface ViewDeclOpts {
    * `RenderContext.resolveValueObjectName` + `valueObjectModuleSpecifier`.
    */
   readonly voRef: (field: MetaField) => { name: string; module: string };
+  /**
+   * Field names of the owning object's PRIMARY identity (see
+   * `primaryIdentityFieldNames` in zod-validators). A PK column sits on the FROM
+   * side of every synthesized view, so it is never NULL even when the field
+   * carries no `@required` — the view column gets `.notNull()` and the read
+   * schema stays non-nullable, matching the generated api-docs, queries and
+   * UpdateSchema, all of which already treat the PK as non-null.
+   */
+  readonly pkFieldNames: ReadonlySet<string>;
 }
 
 /**
@@ -49,9 +58,13 @@ function viewColumnLine(f: MetaField, opts: ViewDeclOpts): Code {
   // typing) and `.notNull()` (shapes the SELECT type) carry to an existing view;
   // `.primaryKey()`/`.default()`/`.references()`/`.unique()` are table-DDL concerns
   // and invalid on a `.existing()` view declaration. Preserve the canonical order.
-  const viewModifiers = spec.modifiers
-    .filter((m) => m === ".array()" || m === ".notNull()")
-    .join("");
+  // A primary-identity column additionally gains `.notNull()`: on the table side
+  // its non-null comes from `.primaryKey()` (which the view cannot carry), so
+  // without this the view SELECT type — and the Zod read schema derived from it —
+  // typed the PK `T | null` for a column that can never be NULL.
+  const kept = spec.modifiers.filter((m) => m === ".array()" || m === ".notNull()");
+  if (opts.pkFieldNames.has(f.name) && !kept.includes(".notNull()")) kept.push(".notNull()");
+  const viewModifiers = kept.join("");
   // Narrow the column to its resolved element/value type — `.$type<…>()` — mirroring
   // the entity column so the read row is typed (not `unknown`) and an array column
   // reads as `T[]`, not `T`.
@@ -113,10 +126,13 @@ export function renderViewReadZodObject(fields: readonly MetaField[], opts: View
   const { dialect, columnNamingStrategy, timestampMode } = opts;
   const z = imp("z@zod");
   const lines: Code[] = fields.map((f) => {
-    const nullable =
-      mapColumnType(f, dialect, columnNamingStrategy, timestampMode).modifiers.includes(".notNull()")
-        ? ""
-        : ".nullable()";
+    // Non-null when the column is `.notNull()` OR it is a primary-identity
+    // field — a PK is never NULL, but its table-side non-null is expressed via
+    // `.primaryKey()`, not a `.notNull()` modifier (see viewColumnLine above).
+    const nonNull =
+      mapColumnType(f, dialect, columnNamingStrategy, timestampMode).modifiers.includes(".notNull()") ||
+      opts.pkFieldNames.has(f.name);
+    const nullable = nonNull ? "" : ".nullable()";
     const hasObjectRef =
       f.subType === FIELD_SUBTYPE_OBJECT &&
       typeof f.attr(FIELD_ATTR_OBJECT_REF) === "string" &&

package/src/templates/zod-validators.ts

@@ -129,8 +129,9 @@ ${joinCode(fieldLines, { on: ",\n" })}
 }
 
 /** Field names participating in the object's PRIMARY identity, normalized to a
- *  list. Empty when the object has no primary identity. */
-function primaryIdentityFieldNames(obj: MetaObject): string[] {
+ *  list. Empty when the object has no primary identity. Exported for the
+ *  view-decl read-schema path, which must type PK columns non-null too. */
+export function primaryIdentityFieldNames(obj: MetaObject): string[] {
   const primary = obj.primaryIdentity();
   if (!primary) return [];
   const fields = primary.attr(IDENTITY_ATTR_FIELDS);