@metaobjectsdev/codegen-ts 0.6.0 → 0.7.0-rc.2

package/dist/templates/zod-validators.js

@@ -2,24 +2,68 @@
 // Auto-generated PKs are EXCLUDED from InsertSchema (caller doesn't provide them).
 // @autoSet fields: INSERT → .optional().transform(() => new Date().toISOString())
 //                 UPDATE → onCreate fields omitted entirely; onUpdate gets same transform
-import { code, imp } from "ts-poet";
+//
+// field.object isArray:true objectRef:<Ref> — emits z.array(<Ref>InsertSchema)
+// with a cross-module imp() so consumers passing the schema to
+// zod-to-json-schema get a properly element-typed array. Without this, every
+// object-array field collapsed to z.array(z.string()) and the JSON Schema sent
+// downstream (e.g. to LLM tool_use input_schema) lost the nested object shape.
+import { code, joinCode, imp } from "ts-poet";
 import { MetaObject, MetaField } from "@metaobjectsdev/metadata";
-import { FIELD_SUBTYPE_STRING, FIELD_SUBTYPE_INT, FIELD_SUBTYPE_LONG, FIELD_SUBTYPE_CURRENCY, FIELD_SUBTYPE_BOOLEAN, FIELD_SUBTYPE_DOUBLE, FIELD_SUBTYPE_FLOAT, FIELD_SUBTYPE_DATE, FIELD_SUBTYPE_TIME, FIELD_SUBTYPE_TIMESTAMP, FIELD_SUBTYPE_ENUM, VALIDATOR_SUBTYPE_REQUIRED, VALIDATOR_SUBTYPE_LENGTH, VALIDATOR_SUBTYPE_REGEX, IDENTITY_ATTR_FIELDS, IDENTITY_ATTR_GENERATION, FIELD_ATTR_REQUIRED, FIELD_ATTR_MAX_LENGTH, FIELD_ATTR_DEFAULT, FIELD_ATTR_AUTO_SET, AUTO_SET_ON_CREATE, AUTO_SET_ON_UPDATE, VALIDATOR_ATTR_MAX, VALIDATOR_ATTR_MIN, VALIDATOR_ATTR_PATTERN, GENERATION_INCREMENT, GENERATION_UUID, } from "@metaobjectsdev/metadata";
+import { FIELD_SUBTYPE_STRING, FIELD_SUBTYPE_INT, FIELD_SUBTYPE_LONG, FIELD_SUBTYPE_CURRENCY, FIELD_SUBTYPE_BOOLEAN, FIELD_SUBTYPE_DOUBLE, FIELD_SUBTYPE_FLOAT, FIELD_SUBTYPE_DATE, FIELD_SUBTYPE_TIME, FIELD_SUBTYPE_TIMESTAMP, FIELD_SUBTYPE_ENUM, FIELD_SUBTYPE_OBJECT, VALIDATOR_SUBTYPE_REQUIRED, VALIDATOR_SUBTYPE_LENGTH, VALIDATOR_SUBTYPE_REGEX, IDENTITY_ATTR_FIELDS, IDENTITY_ATTR_GENERATION, FIELD_ATTR_REQUIRED, FIELD_ATTR_MAX_LENGTH, FIELD_ATTR_DEFAULT, FIELD_ATTR_AUTO_SET, FIELD_ATTR_OBJECT_REF, AUTO_SET_ON_CREATE, AUTO_SET_ON_UPDATE, VALIDATOR_ATTR_MAX, VALIDATOR_ATTR_MIN, VALIDATOR_ATTR_PATTERN, GENERATION_INCREMENT, GENERATION_UUID, } from "@metaobjectsdev/metadata";
 import { enumValues, zodEnumExpr } from "../enum-meta.js";
 import { renderDocsFor } from "./jsdoc.js";
-export function renderZodValidators(obj) {
-    const z = imp("z@zod");
+/** Auto-generated PK field names that should be omitted from InsertSchema. */
+function autoGenPkFieldNames(obj) {
+    const out = new Set();
     const primary = obj.primaryIdentity();
-    const autoGenPkFields = new Set();
     if (primary) {
         const generation = primary.ownAttr(IDENTITY_ATTR_GENERATION);
         if (generation === GENERATION_INCREMENT || generation === GENERATION_UUID) {
             const fields = primary.ownAttr(IDENTITY_ATTR_FIELDS);
             const fieldsList = Array.isArray(fields) ? fields : (typeof fields === "string" ? [fields] : []);
             for (const f of fieldsList)
-                autoGenPkFields.add(String(f));
+                out.add(String(f));
         }
     }
+    return out;
+}
+/**
+ * Emit ONLY the `<Name>InsertSchema`. Used by the value-object file emitter
+ * for metaobjects with no writable source.rdb — those have no PATCH/update
+ * semantics, so emitting an UpdateSchema would be misleading.
+ *
+ * The schema name is kept as `<Name>InsertSchema` even for pure value objects
+ * so consumer imports don't churn. A future polish PR could add a `<Name>Schema`
+ * alias for clarity.
+ */
+export function renderInsertSchemaOnly(obj) {
+    const z = imp("z@zod");
+    const autoGenPkFields = autoGenPkFieldNames(obj);
+    const insertFieldLines = [];
+    for (const child of obj.fields()) {
+        if (autoGenPkFields.has(child.name))
+            continue;
+        const autoSet = child.ownAttr(FIELD_ATTR_AUTO_SET);
+        if (autoSet === AUTO_SET_ON_CREATE || autoSet === AUTO_SET_ON_UPDATE) {
+            insertFieldLines.push(code `  ${child.name}: z.string().optional().transform(() => new Date().toISOString())`);
+        }
+        else {
+            insertFieldLines.push(code `  ${child.name}: ${zodFieldExpr(child)}`);
+        }
+    }
+    const insertSchemaName = `${obj.name}InsertSchema`;
+    const docs = renderDocsFor(obj);
+    const docsPrefix = docs ? `${docs}\n` : "";
+    return code `
+${docsPrefix}export const ${insertSchemaName} = ${z}.object({
+${joinCode(insertFieldLines, { on: ",\n" })}
+});
+`;
+}
+export function renderZodValidators(obj) {
+    const z = imp("z@zod");
+    const autoGenPkFields = autoGenPkFieldNames(obj);
     const insertFieldLines = [];
     const updateFieldLines = [];
     for (const child of obj.fields()) {
@@ -27,26 +71,25 @@ export function renderZodValidators(obj) {
             continue;
         const autoSet = child.ownAttr(FIELD_ATTR_AUTO_SET);
         // Insert schema: @autoSet fields use transform (always override client input).
-        // NOTE: use "z" as a literal string here — these lines are embedded in the
-        // `code` template tag below which resolves the imp("z@zod") import.
         if (autoSet === AUTO_SET_ON_CREATE || autoSet === AUTO_SET_ON_UPDATE) {
-            insertFieldLines.push(`  ${child.name}: z.string().optional().transform(() => new Date().toISOString())`);
+            insertFieldLines.push(code `  ${child.name}: z.string().optional().transform(() => new Date().toISOString())`);
         }
         else {
-            insertFieldLines.push(`  ${child.name}: ${zodFieldExpr(child)}`);
+            insertFieldLines.push(code `  ${child.name}: ${zodFieldExpr(child)}`);
         }
         // Update schema: @autoSet onCreate → omit entirely; onUpdate → transform
         if (autoSet === AUTO_SET_ON_CREATE) {
             // Omit: creation timestamps cannot be changed after creation
         }
         else if (autoSet === AUTO_SET_ON_UPDATE) {
-            updateFieldLines.push(`  ${child.name}: z.string().optional().transform(() => new Date().toISOString())`);
+            updateFieldLines.push(code `  ${child.name}: z.string().optional().transform(() => new Date().toISOString())`);
         }
         else {
-            // All non-autoSet fields are optional in the update schema (PATCH semantics)
-            const expr = zodFieldExpr(child);
-            const optionalExpr = expr.endsWith(".optional()") ? expr : `${expr}.optional()`;
-            updateFieldLines.push(`  ${child.name}: ${optionalExpr}`);
+            // All non-autoSet fields are optional in the update schema (PATCH semantics).
+            // zodFieldExpr already appends .optional() when the field is non-required
+            // OR has a default; only append once more when it didn't.
+            const baseExpr = zodFieldExpr(child);
+            updateFieldLines.push(fieldWillBeOptional(child) ? code `  ${child.name}: ${baseExpr}` : code `  ${child.name}: ${baseExpr}.optional()`);
         }
     }
     const insertSchemaName = `${obj.name}InsertSchema`;
@@ -55,46 +98,81 @@ export function renderZodValidators(obj) {
     const docsPrefix = docs ? `${docs}\n` : "";
     return code `
 ${docsPrefix}export const ${insertSchemaName} = ${z}.object({
-${insertFieldLines.join(",\n")}
+${joinCode(insertFieldLines, { on: ",\n" })}
 });
 
 ${docsPrefix}export const ${updateSchemaName} = ${z}.object({
-${updateFieldLines.join(",\n")}
+${joinCode(updateFieldLines, { on: ",\n" })}
 });
 `;
 }
 function zodFieldExpr(field) {
-    let base;
+    // FIELD_SUBTYPE_OBJECT: emit z.array(<Ref>InsertSchema) / <Ref>InsertSchema
+    // via an imp() so ts-poet hoists the cross-module import. Without this the
+    // field used to collapse to z.string() / z.array(z.string()) and downstream
+    // JSON Schema (e.g. LLM tool_use input_schema) lost the nested object shape.
+    if (field.subType === FIELD_SUBTYPE_OBJECT) {
+        const ref = field.ownAttr(FIELD_ATTR_OBJECT_REF);
+        if (typeof ref === "string" && ref.length > 0) {
+            const refImp = imp(`${ref}InsertSchema@./${ref}.js`);
+            let base = code `${refImp}`;
+            if (field.isArray)
+                base = code `z.array(${base})`;
+            return appendValidatorChain(base, field);
+        }
+        // No resolvable @objectRef — fall through to z.unknown(); downstream code
+        // can still pass a value through but loses validation.
+        let base = code `z.unknown()`;
+        if (field.isArray)
+            base = code `z.array(${base})`;
+        return appendValidatorChain(base, field);
+    }
+    let baseStr;
     switch (field.subType) {
         case FIELD_SUBTYPE_INT:
         case FIELD_SUBTYPE_CURRENCY:
         case FIELD_SUBTYPE_LONG:
-            base = "z.number().int()";
+            baseStr = "z.number().int()";
             break;
         case FIELD_SUBTYPE_DOUBLE:
         case FIELD_SUBTYPE_FLOAT:
-            base = "z.number()";
+            baseStr = "z.number()";
             break;
         case FIELD_SUBTYPE_BOOLEAN:
-            base = "z.boolean()";
+            baseStr = "z.boolean()";
             break;
         case FIELD_SUBTYPE_DATE:
         case FIELD_SUBTYPE_TIME:
         case FIELD_SUBTYPE_TIMESTAMP:
-            base = "z.string()";
+            baseStr = "z.string()";
             break;
         case FIELD_SUBTYPE_ENUM: {
             const values = enumValues(field);
-            base = values !== undefined ? zodEnumExpr(values) : "z.string()";
+            baseStr = values !== undefined ? zodEnumExpr(values) : "z.string()";
             break;
         }
         case FIELD_SUBTYPE_STRING:
         default:
-            base = "z.string()";
+            baseStr = "z.string()";
             break;
     }
     if (field.isArray)
-        base = `z.array(${base})`;
+        baseStr = `z.array(${baseStr})`;
+    return appendValidatorChain(code `${baseStr}`, field);
+}
+/** Mirrors the optional-or-not decision inside appendValidatorChain so the update-schema
+ *  caller can avoid stacking a second `.optional()` onto an already-optional expression. */
+function fieldWillBeOptional(field) {
+    let isRequired = field.ownAttr(FIELD_ATTR_REQUIRED) === true;
+    for (const child of field.validators()) {
+        if (child.subType === VALIDATOR_SUBTYPE_REQUIRED)
+            isRequired = true;
+    }
+    const hasDefault = field.ownAttr(FIELD_ATTR_DEFAULT) !== undefined;
+    return !isRequired || hasDefault;
+}
+/** Append .min/.max/.regex/.optional() based on field-level validators + required state. */
+function appendValidatorChain(base, field) {
     let isRequired = field.ownAttr(FIELD_ATTR_REQUIRED) === true;
     let maxLen = field.ownAttr(FIELD_ATTR_MAX_LENGTH);
     let minLen;
@@ -119,20 +197,20 @@ function zodFieldExpr(field) {
     let chain = base;
     if (field.subType === FIELD_SUBTYPE_STRING && !field.isArray) {
         if (minLen !== undefined)
-            chain += `.min(${minLen})`;
+            chain = code `${chain}.min(${minLen})`;
         else if (isRequired)
-            chain += `.min(1)`;
+            chain = code `${chain}.min(1)`;
         if (maxLen !== undefined)
-            chain += `.max(${maxLen})`;
+            chain = code `${chain}.max(${maxLen})`;
         if (pattern !== undefined)
-            chain += `.regex(new RegExp(${JSON.stringify(pattern)}))`;
+            chain = code `${chain}.regex(new RegExp(${JSON.stringify(pattern)}))`;
     }
     // Fields with DB-level defaults are optional in the InsertSchema: the caller
     // can omit them and the DB will fill in. Otherwise required-with-default
     // would force callers to repeat the default at every call site.
     const hasDefault = field.ownAttr(FIELD_ATTR_DEFAULT) !== undefined;
     if (!isRequired || hasDefault)
-        chain += `.optional()`;
+        chain = code `${chain}.optional()`;
     return chain;
 }
 //# sourceMappingURL=zod-validators.js.map

package/dist/templates/zod-validators.js.map

@@ -1 +1 @@
-{"version":3,"file":"zod-validators.js","sourceRoot":"","sources":["../../src/templates/zod-validators.ts"],"names":[],"mappings":"AAAA,2FAA2F;AAC3F,mFAAmF;AACnF,kFAAkF;AAClF,0FAA0F;AAE1F,OAAO,EAAE,IAAI,EAAE,GAAG,EAAa,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EACL,oBAAoB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,sBAAsB,EACnF,qBAAqB,EAAE,oBAAoB,EAAE,mBAAmB,EAChE,kBAAkB,EAAE,kBAAkB,EAAE,uBAAuB,EAC/D,kBAAkB,EAClB,0BAA0B,EAAE,wBAAwB,EAAE,uBAAuB,EAC7E,oBAAoB,EAAE,wBAAwB,EAC9C,mBAAmB,EAAE,qBAAqB,EAAE,kBAAkB,EAC9D,mBAAmB,EAAE,kBAAkB,EAAE,kBAAkB,EAC3D,kBAAkB,EAAE,kBAAkB,EAAE,sBAAsB,EAC9D,oBAAoB,EAAE,eAAe,GACtC,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,UAAU,mBAAmB,CAAC,GAAe;IACjD,MAAM,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC;IACvB,MAAM,OAAO,GAAG,GAAG,CAAC,eAAe,EAAE,CAAC;IACtC,MAAM,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;IAC1C,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;QAC7D,IAAI,UAAU,KAAK,oBAAoB,IAAI,UAAU,KAAK,eAAe,EAAE,CAAC;YAC1E,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;YACrD,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACjG,KAAK,MAAM,CAAC,IAAI,UAAU;gBAAE,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,MAAM,gBAAgB,GAAa,EAAE,CAAC;IACtC,MAAM,gBAAgB,GAAa,EAAE,CAAC;IACtC,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC;QACjC,IAAI,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;YAAE,SAAS;QAE9C,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QAEnD,+EAA+E;QAC/E,2EAA2E;QAC3E,oEAAoE;QACpE,IAAI,OAAO,KAAK,kBAAkB,IAAI,OAAO,KAAK,kBAAkB,EAAE,CAAC;YACrE,gBAAgB,CAAC,IAAI,CACnB,KAAK,KAAK,CAAC,IAAI,mEAAmE,CACnF,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,gBAAgB,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACnE,CAAC;QAED,yEAAyE;QACzE,IAAI,OAAO,KAAK,kBAAkB,EAAE,CAAC;YACnC,6DAA6D;QAC/D,CAAC;aAAM,IAAI,OAAO,KAAK,kBAAkB,EAAE,CAAC;YAC1C,gBAAgB,CAAC,IAAI,CACnB,KAAK,KAAK,CAAC,IAAI,mEAAmE,CACnF,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,6EAA6E;YAC7E,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;YACjC,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,aAAa,CAAC;YAChF,gBAAgB,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IAED,MAAM,gBAAgB,GAAG,GAAG,GAAG,CAAC,IAAI,cAAc,CAAC;IACnD,MAAM,gBAAgB,GAAG,GAAG,GAAG,CAAC,IAAI,cAAc,CAAC;IAEnD,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;IAChC,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IAE3C,OAAO,IAAI,CAAA;EACX,UAAU,gBAAgB,gBAAgB,MAAM,CAAC;EACjD,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC;;;EAG5B,UAAU,gBAAgB,gBAAgB,MAAM,CAAC;EACjD,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC;;CAE7B,CAAC;AACF,CAAC;AAED,SAAS,YAAY,CAAC,KAAgB;IACpC,IAAI,IAAY,CAAC;IACjB,QAAQ,KAAK,CAAC,OAAO,EAAE,CAAC;QACtB,KAAK,iBAAiB,CAAC;QACvB,KAAK,sBAAsB,CAAC;QAC5B,KAAK,kBAAkB;YACrB,IAAI,GAAG,kBAAkB,CAAC;YAC1B,MAAM;QACR,KAAK,oBAAoB,CAAC;QAC1B,KAAK,mBAAmB;YACtB,IAAI,GAAG,YAAY,CAAC;YACpB,MAAM;QACR,KAAK,qBAAqB;YACxB,IAAI,GAAG,aAAa,CAAC;YACrB,MAAM;QACR,KAAK,kBAAkB,CAAC;QACxB,KAAK,kBAAkB,CAAC;QACxB,KAAK,uBAAuB;YAC1B,IAAI,GAAG,YAAY,CAAC;YACpB,MAAM;QACR,KAAK,kBAAkB,CAAC,CAAC,CAAC;YACxB,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;YACjC,IAAI,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;YACjE,MAAM;QACR,CAAC;QACD,KAAK,oBAAoB,CAAC;QAC1B;YACE,IAAI,GAAG,YAAY,CAAC;YACpB,MAAM;IACV,CAAC;IAED,IAAI,KAAK,CAAC,OAAO;QAAE,IAAI,GAAG,WAAW,IAAI,GAAG,CAAC;IAE7C,IAAI,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC,KAAK,IAAI,CAAC;IAC7D,IAAI,MAAM,GAAuB,KAAK,CAAC,OAAO,CAAC,qBAAqB,CAAuB,CAAC;IAC5F,IAAI,MAA0B,CAAC;IAC/B,IAAI,OAA2B,CAAC;IAChC,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,UAAU,EAAE,EAAE,CAAC;QACvC,IAAI,KAAK,CAAC,OAAO,KAAK,0BAA0B;YAAE,UAAU,GAAG,IAAI,CAAC;QACpE,IAAI,KAAK,CAAC,OAAO,KAAK,wBAAwB,EAAE,CAAC;YAC/C,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;YAC9C,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;YAC9C,IAAI,OAAO,GAAG,KAAK,QAAQ;gBAAE,MAAM,GAAG,GAAG,CAAC;YAC1C,IAAI,OAAO,GAAG,KAAK,QAAQ;gBAAE,MAAM,GAAG,GAAG,CAAC;QAC5C,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,KAAK,uBAAuB,EAAE,CAAC;YAC9C,MAAM,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;YAChD,IAAI,OAAO,CAAC,KAAK,QAAQ;gBAAE,OAAO,GAAG,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED,IAAI,KAAK,GAAG,IAAI,CAAC;IACjB,IAAI,KAAK,CAAC,OAAO,KAAK,oBAAoB,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QAC7D,IAAI,MAAM,KAAK,SAAS;YAAE,KAAK,IAAI,QAAQ,MAAM,GAAG,CAAC;aAChD,IAAI,UAAU;YAAE,KAAK,IAAI,SAAS,CAAC;QACxC,IAAI,MAAM,KAAK,SAAS;YAAE,KAAK,IAAI,QAAQ,MAAM,GAAG,CAAC;QACrD,IAAI,OAAO,KAAK,SAAS;YAAE,KAAK,IAAI,qBAAqB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;IACvF,CAAC;IAED,6EAA6E;IAC7E,yEAAyE;IACzE,gEAAgE;IAChE,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,SAAS,CAAC;IACnE,IAAI,CAAC,UAAU,IAAI,UAAU;QAAE,KAAK,IAAI,aAAa,CAAC;IACtD,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"zod-validators.js","sourceRoot":"","sources":["../../src/templates/zod-validators.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metaobjectsdev/codegen-ts",
-  "version": "0.6.0",
+  "version": "0.7.0-rc.2",
   "description": "TypeScript codegen engine for MetaObjects — emits Drizzle, Zod, and Fastify artifacts.",
   "type": "module",
   "main": "./dist/index.js",
@@ -38,7 +38,7 @@
 "access": "public"
 },
 "dependencies": {
-  "@metaobjectsdev/metadata": "0.6.0",
+  "@metaobjectsdev/metadata": "0.7.0-rc.2",
   "@biomejs/js-api": "^0.7.0",
   "@biomejs/wasm-nodejs": "^1.9.4",
   "ts-poet": "^6.10.0"
@@ -49,8 +49,8 @@
 },
 "devDependencies": {
   "@biomejs/biome": "^1.9.0",
-  "@metaobjectsdev/codegen-ts-react": "0.6.0",
-  "@metaobjectsdev/render": "0.6.0",
+  "@metaobjectsdev/codegen-ts-react": "0.7.0-rc.2",
+  "@metaobjectsdev/render": "0.7.0-rc.2",
   "bun-types": "latest",
   "drizzle-orm": "^0.36.0",
   "typescript": "^5.6.0",

package/src/column-mapper.ts

@@ -23,10 +23,12 @@ import {
   FIELD_ATTR_REQUIRED,
   FIELD_ATTR_UNIQUE,
   FIELD_ATTR_DEFAULT,
+  FIELD_ATTR_OBJECT_REF,
   VALIDATOR_ATTR_MAX,
 } from "@metaobjectsdev/metadata";
 import { columnNameFromField } from "./naming.js";
 import { enumValues } from "./enum-meta.js";
+import { DEFAULT_COLUMN_NAMING_STRATEGY } from "@metaobjectsdev/metadata";
 import type { Dialect, ColumnNamingStrategy } from "./metaobjects-config.js";
 
 export type { Dialect };
@@ -62,6 +64,36 @@ function isSqlExprDefault(value: string): boolean {
   return SQL_EXPR_PATTERNS.some((re) => re.test(value));
 }
 
+/**
+ * For an isArray:true field stored in SQLite as text(...,{mode:"json"}), return
+ * the TS element type used in the emitted .$type<E[]>() chain. Returns undefined
+ * when the field's subType doesn't have a stable scalar TS mapping (e.g.,
+ * field.object — leave the inferred `unknown[]` so the consumer can layer a
+ * richer schema on top).
+ */
+function sqliteJsonArrayElementTsType(subType: string): string | undefined {
+  switch (subType) {
+    case FIELD_SUBTYPE_STRING:
+    case FIELD_SUBTYPE_ENUM:
+    case FIELD_SUBTYPE_CLASS:
+    case FIELD_SUBTYPE_DATE:
+    case FIELD_SUBTYPE_TIME:
+    case FIELD_SUBTYPE_TIMESTAMP:
+    case FIELD_SUBTYPE_DECIMAL:
+      return "string";
+    case FIELD_SUBTYPE_INT:
+    case FIELD_SUBTYPE_LONG:
+    case FIELD_SUBTYPE_CURRENCY:
+    case FIELD_SUBTYPE_DOUBLE:
+    case FIELD_SUBTYPE_FLOAT:
+      return "number";
+    case FIELD_SUBTYPE_BOOLEAN:
+      return "boolean";
+    default:
+      return undefined;
+  }
+}
+
 /** Map a recognized SQL expression to its canonical raw form (uppercase keywords). */
 function canonicalizeSqlExpr(value: string): string {
   const lower = value.toLowerCase();
@@ -92,6 +124,17 @@ export interface ColumnSpec {
   leadingComment?: string;
   /** Optional CHECK constraint expression for the column (e.g., `status IN ('A', 'B')`). */
   checkConstraint?: string;
+  /**
+   * Optional `.$type<...>()` chain target. Renderer (drizzle-schema.ts) emits
+   * `.$type<TS[]>()` ahead of the modifiers chain, using ts-poet `imp()` for
+   * objectRef variants so the cross-module type import auto-hoists.
+   * `kind: "scalar"` covers string[]/number[]/boolean[] — no import needed.
+   * `kind: "objectRef"` covers SourceLens[]/Dissent[]/etc. — `module` is the
+   * relative import path to that entity's emitted module.
+   */
+  dollarTypeRef?:
+    | { kind: "scalar"; tsType: "string" | "number" | "boolean" }
+    | { kind: "objectRef"; name: string; module: string };
 }
 
 /** Resolve max length from validator.length child or @maxLength attr.
@@ -118,7 +161,7 @@ function isRequired(field: MetaField): boolean {
 export function mapColumnType(
   field: MetaField,
   dialect: Dialect,
-  strategy: ColumnNamingStrategy = "snake_case",
+  strategy: ColumnNamingStrategy = DEFAULT_COLUMN_NAMING_STRATEGY,
 ): ColumnSpec {
   const dbName = field.column ?? columnNameFromField(field.name, strategy);
   const importModule = dialect === "sqlite" ? "drizzle-orm/sqlite-core" : "drizzle-orm/pg-core";
@@ -219,12 +262,36 @@ export function mapColumnType(
     }
   }
 
+  // Enum literal types: pass the values as `{ enum: [...] as const }` to
+  // Drizzle's text(...) so the inferred column type is a literal union
+  // ("a" | "b" | ...) instead of bare `string`. Skip when isArray — JSON
+  // arrays use { mode: "json" }, and the enum members go through Zod
+  // validation at the Insert/Update layer instead. Mirrors the Zod
+  // emission, which already uses z.enum([...]).
+  if (subType === FIELD_SUBTYPE_ENUM && !isArray && fnName === "text") {
+    const values = enumValues(field);
+    if (values !== undefined && values.length > 0) {
+      fnOptions = { ...(fnOptions ?? {}), enum: values };
+    }
+  }
+
   const modifiers: string[] = [];
 
   if (dialect === "postgres" && isArray) {
     modifiers.push(".array()");
   }
 
+  // SQLite stores arrays as JSON in a text column; Drizzle's text(...,{mode:"json"})
+  // infers the column as `unknown` without a $type<T>() annotation. Emit the
+  // chain via spec.dollarTypeRef so the renderer can hoist a type-only import
+  // for object refs (SourceLens[], Dissent[], etc.). Scalars (string/number/
+  // boolean) need no import. Postgres uses .array() above which is already
+  // element-typed by Drizzle.
+  // Determined ABOVE the modifiers chain so the renderer can position
+  // `.$type<>()` ahead of `.notNull()` etc.
+  // Note: dollarTypeRef is read alongside (and rendered ahead of) `modifiers`
+  // by `renderColumn` — see drizzle-schema.ts.
+
   if (isRequired(field)) {
     modifiers.push(".notNull()");
   }
@@ -257,6 +324,23 @@ export function mapColumnType(
     }
   }
 
+  // SQLite isArray columns route through {mode:"json"} above; compute the
+  // $type<E[]>() target so the renderer can hoist any cross-module imports.
+  let dollarTypeRef: ColumnSpec["dollarTypeRef"];
+  if (dialect === "sqlite" && isArray) {
+    if (subType === FIELD_SUBTYPE_OBJECT) {
+      const ref = field.ownAttr(FIELD_ATTR_OBJECT_REF);
+      if (typeof ref === "string" && ref.length > 0) {
+        dollarTypeRef = { kind: "objectRef", name: ref, module: `./${ref}.js` };
+      }
+    } else {
+      const scalar = sqliteJsonArrayElementTsType(subType);
+      if (scalar !== undefined) {
+        dollarTypeRef = { kind: "scalar", tsType: scalar as "string" | "number" | "boolean" };
+      }
+    }
+  }
+
   const result: ColumnSpec = {
     fnName,
     dbName,
@@ -266,6 +350,7 @@ export function mapColumnType(
   };
   if (fnOptions !== undefined) result.fnOptions = fnOptions;
   if (defaultExpr !== undefined) result.defaultExpr = defaultExpr;
+  if (dollarTypeRef !== undefined) result.dollarTypeRef = dollarTypeRef;
   if (leadingComment !== undefined) result.leadingComment = leadingComment;
 
   // Enum fields: emit a CHECK constraint listing the valid member values.

package/src/generators/entity-file.ts

@@ -7,9 +7,25 @@ import { entityOutputPath } from "../import-path.js";
 export interface EntityFileOpts {
   filter?: (entity: MetaObject) => boolean;
   target?: string;
+  /**
+   * Whether generated entity files include the Fastify-flavored
+   * `<Entity>FilterAllowlist` + `<Entity>SortAllowlist` blocks (and the
+   * `@metaobjectsdev/runtime-ts/drizzle-fastify` type-only imports they
+   * require). Default `true` for back-compat.
+   *
+   * Set to `false` for Worker/Lambda-style consumers that don't mount
+   * Fastify-style server routes — the generated entity file then has no
+   * `runtime-ts/drizzle-fastify` imports at all and `@metaobjectsdev/runtime-ts`
+   * can be omitted from the consumer's dependency tree.
+   *
+   * The client-side `<Entity>Filter` type is always emitted — it's a pure
+   * client-side type with no runtime-ts dependency.
+   */
+  allowlists?: boolean;
 }
 
 export const entityFile = function entityFile(opts?: EntityFileOpts): Generator {
+  const allowlists = opts?.allowlists ?? true;
   const generator: Generator = {
     name: "entity-file",
     emitsEntityModule: true,
@@ -19,7 +35,7 @@ export const entityFile = function entityFile(opts?: EntityFileOpts): Generator
       }
       return {
         path: entityOutputPath(ctx.config.outputLayout ?? "flat", entity.package, `${entity.name}.ts`),
-        content: await formatTs(renderEntityFile(entity, ctx.renderContext)),
+        content: await formatTs(renderEntityFile(entity, ctx.renderContext, { allowlists })),
       };
     }),
   };

package/src/generators/index.ts

@@ -3,3 +3,5 @@ export { queriesFile, type QueriesFileOpts } from "./queries-file.js";
 export { routesFile, type RoutesFileOpts } from "./routes-file.js";
 export { barrel, type BarrelOpts } from "./barrel.js";
 export { mermaidErDiagram, type MermaidErOptions } from "./mermaid-er.js";
+export { promptRender, type PromptRenderOpts } from "./prompt-render-file.js";
+export { outputParser, type OutputParserOpts } from "./output-parser-file.js";

package/src/generators/output-parser-file.ts

@@ -0,0 +1,50 @@
+// server/typescript/packages/codegen-ts/src/generators/output-parser-file.ts
+//
+// Stock generator that emits one <TemplateName>.output.ts file per declared
+// template.output node. Wraps renderOutputParser() from templates/output-parser.ts.
+//
+// Consumer wiring (metaobjects.config.ts):
+//   generators: [..., promptRender(), outputParser()]
+//
+// Custom output directory:
+//   generators: [..., outputParser({ outDir: "src/generated/outputs" })]
+
+import { TYPE_TEMPLATE, TEMPLATE_SUBTYPE_OUTPUT } from "@metaobjectsdev/metadata";
+import {
+  type EmittedFile,
+  type Generator,
+  type GeneratorFactory,
+  oncePerRun,
+} from "../generator.js";
+import { renderOutputParser } from "../templates/output-parser.js";
+
+export interface OutputParserOpts {
+  /** Output directory prefix relative to the target's outDir. Default: "" (root). */
+  outDir?: string;
+  /** Optional named output target (registry key). Defaults to "default". */
+  target?: string;
+}
+
+export const outputParser = function outputParser(opts?: OutputParserOpts): Generator {
+  const dirPrefix = opts?.outDir ? `${opts.outDir.replace(/\/$/, "")}/` : "";
+  const generator: Generator = {
+    name: "output-parser",
+    generate: oncePerRun((_entities, ctx) => {
+      const outputs = ctx.loadedRoot
+        .ownChildren()
+        .filter((c) => c.type === TYPE_TEMPLATE && c.subType === TEMPLATE_SUBTYPE_OUTPUT);
+      const files: EmittedFile[] = [];
+      for (const t of outputs) {
+        files.push({
+          path: `${dirPrefix}${t.name}.output.ts`,
+          content: renderOutputParser(ctx.loadedRoot, t.name),
+        });
+      }
+      return files;
+    }),
+  };
+  if (opts?.target) {
+    generator.target = opts.target;
+  }
+  return generator;
+} as GeneratorFactory<OutputParserOpts>;

package/src/generators/prompt-render-file.ts

@@ -0,0 +1,95 @@
+// Stock generator that wraps generatePayloadInterfaces() + generateRenderHandle()
+// from payload-codegen.ts into a Generator factory. Emits ONE file aggregating
+// typed payload interfaces (for object.value entities) and render handles (for
+// template.prompt nodes).
+//
+// Consumer wiring (metaobjects.config.ts):
+//   generators: [..., promptRender()]
+//
+// Custom output path:
+//   generators: [..., promptRender({ outFile: "src/render/generated/prompts.ts" })]
+
+import { TYPE_TEMPLATE, TEMPLATE_SUBTYPE_PROMPT, OBJECT_SUBTYPE_VALUE } from "@metaobjectsdev/metadata";
+import {
+  type Generator,
+  type GeneratorFactory,
+  oncePerRun,
+} from "../generator.js";
+import {
+  generatePayloadInterfacesBatch,
+  generateRenderHandle,
+} from "../payload-codegen.js";
+import { GENERATED_HEADER } from "../constants.js";
+
+export interface PromptRenderOpts {
+  /** Output file path relative to the target's outDir. Default: "prompts.ts". */
+  outFile?: string;
+  /** Optional named output target (registry key). Defaults to "default". */
+  target?: string;
+}
+
+// Hoisted into the emitted file once. generateRenderHandle() emits this line
+// per-handle (for the standalone scenario); we strip its per-handle copies.
+const RENDER_IMPORT = `import { render, type Provider } from "@metaobjectsdev/render";`;
+
+// Matches the `import type { ... } from "./payloads.js";` that generateRenderHandle
+// emits for the standalone two-file scenario. In the single-file output here the
+// payload interfaces are already defined above, so the import is dead.
+function isStandalonePayloadImport(line: string): boolean {
+  return line.startsWith("import type {") && line.includes('"./payloads.js"');
+}
+
+export const promptRender = function promptRender(opts?: PromptRenderOpts): Generator {
+  const outFile = opts?.outFile ?? "prompts.ts";
+  const generator: Generator = {
+    name: "prompt-render",
+    generate: oncePerRun((entities, ctx) => {
+      const payloads = entities.filter((e) => e.subType === OBJECT_SUBTYPE_VALUE);
+      const prompts = ctx.loadedRoot
+        .ownChildren()
+        .filter((c) => c.type === TYPE_TEMPLATE && c.subType === TEMPLATE_SUBTYPE_PROMPT);
+
+      if (payloads.length === 0 && prompts.length === 0) {
+        return [];
+      }
+
+      const parts: string[] = [`// ${GENERATED_HEADER} — DO NOT EDIT.`];
+
+      // Hoist the @metaobjectsdev/render import once (only when prompts emit handles).
+      if (prompts.length > 0) {
+        parts.push(RENDER_IMPORT);
+      }
+
+      // Emit payload interfaces with a single shared dedupe set so a lens
+      // referenced by multiple payloads appears exactly once.
+      const payloadInterfaces = generatePayloadInterfacesBatch(
+        ctx.loadedRoot,
+        payloads.map((p) => p.name),
+      );
+      if (payloadInterfaces.length > 0) {
+        parts.push(payloadInterfaces);
+      }
+
+      // Append each render handle with its per-handle imports stripped — both
+      // the now-hoisted render/Provider import and the standalone payloads.js
+      // import. Also drop any leading blank lines left behind by the strip so
+      // the joined output doesn't accumulate double blank gaps between parts.
+      for (const t of prompts) {
+        const lines = generateRenderHandle(ctx.loadedRoot, t.name)
+          .split("\n")
+          .filter((line) => line !== RENDER_IMPORT && !isStandalonePayloadImport(line));
+        while (lines.length > 0 && lines[0]!.trim() === "") lines.shift();
+        parts.push(lines.join("\n"));
+      }
+
+      return [{
+        path: outFile,
+        content: parts.filter((s) => s.length > 0).map((s) => s.trimEnd()).join("\n\n") + "\n",
+      }];
+    }),
+  };
+  if (opts?.target) {
+    generator.target = opts.target;
+  }
+  return generator;
+} as GeneratorFactory<PromptRenderOpts>;

package/src/generators/queries-file.ts

@@ -1,4 +1,4 @@
-import type { MetaObject } from "@metaobjectsdev/metadata";
+import { OBJECT_SUBTYPE_VALUE, type MetaObject } from "@metaobjectsdev/metadata";
 import { perEntity, type Generator, type GeneratorFactory } from "../generator.js";
 import { renderQueriesFile } from "../templates/queries-file.js";
 import { formatTs } from "../format.js";
@@ -9,9 +9,21 @@ export interface QueriesFileOpts {
   target?: string;
 }
 
+// object.value records have no primary identity, so the rendered queries module
+// emits findById/updateById/deleteById against a non-existent column. Skipping
+// value subtypes is unconditional — the user-supplied filter (if any) is applied
+// on top via boolean AND.
+const skipValueTypes = (e: MetaObject): boolean => e.subType !== OBJECT_SUBTYPE_VALUE;
+
 export const queriesFile = function queriesFile(opts?: QueriesFileOpts): Generator {
+  const userFilter = opts?.filter;
+  const filter: (e: MetaObject) => boolean = userFilter
+    ? (e) => skipValueTypes(e) && userFilter(e)
+    : skipValueTypes;
+
   const generator: Generator = {
     name: "queries-file",
+    filter,
     generate: perEntity(async (entity, ctx) => {
       if (!ctx.renderContext) {
         throw new Error("queries-file: renderContext is required (provided by runGen)");
@@ -22,9 +34,6 @@ export const queriesFile = function queriesFile(opts?: QueriesFileOpts): Generat
       };
     }),
   };
-  if (opts?.filter) {
-    generator.filter = opts.filter;
-  }
   if (opts?.target) {
     generator.target = opts.target;
   }