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

package/dist/templates/routes-file-hono.d.ts

@@ -0,0 +1,4 @@
+import type { MetaObject } from "@metaobjectsdev/metadata";
+import { type RenderContext } from "../render-context.js";
+export declare function renderRoutesFileHono(entity: MetaObject, ctx: RenderContext): string;
+//# sourceMappingURL=routes-file-hono.d.ts.map

package/dist/templates/routes-file-hono.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"routes-file-hono.d.ts","sourceRoot":"","sources":["../../src/templates/routes-file-hono.ts"],"names":[],"mappings":"AA2BA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAM1D,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,aAAa,GAAG,MAAM,CA2GnF"}

package/dist/templates/routes-file-hono.js

@@ -0,0 +1,119 @@
+// Hono route template — emits a per-entity routes file that delegates
+// CRUD verbs to helpers from @metaobjectsdev/runtime-ts/hono.
+//
+// Hono parallel of templates/routes-file.ts. Two emit-shape differences
+// vs the Fastify flavor, both reflecting Hono idioms rather than contract
+// drift:
+//
+//   1) Exported function shape — `registerXxxRoutes(app, deps)` instead of
+//      `xxxRoutes(fastify)`. Workers/Bun consumers typically pass `db`
+//      through a per-request deps object (so a Worker can attach the
+//      D1 client pulled off bindings) rather than reaching for a
+//      module-level singleton. The Fastify flavor uses `import { db }`
+//      because Fastify apps are long-lived Node processes where a
+//      singleton is the norm. Both flavors talk to mountCrudRoutes /
+//      mountReadOnlyCrudRoutes with identical wire behavior.
+//
+//   2) apiPrefix is composed into the resource path (`${apiPrefix}${path}`)
+//      rather than wrapping the registration. Hono has no fastify.register
+//      / prefix-wrapping primitive; sub-apps via `app.route(prefix, sub)`
+//      exist but bloat the generated code. String concat is simpler and
+//      produces identical URL grammar.
+//
+// Dispatch logic mirrors Fastify:
+//   isProjection(entity)              → mountReadOnlyCrudRoutes (GET list + GET :id)
+//   vanilla / write-through entity    → mountCrudRoutes (all 5 CRUD verbs)
+import { code, imp } from "ts-poet";
+import {} from "../render-context.js";
+import { entityModuleSpecifier } from "../import-path.js";
+import { GENERATED_HEADER } from "../constants.js";
+import { variableNameFromEntity } from "../naming.js";
+import { isProjection } from "../projection/projection-detector.js";
+export function renderRoutesFileHono(entity, ctx) {
+    const entityName = entity.name;
+    const handlerName = `register${entityName}Routes`;
+    const entityFileSpec = entityModuleSpecifier(ctx.selfTarget, ctx.entityModuleTarget, entity.package, entityName, ctx.extStyle);
+    const header = `// ${GENERATED_HEADER} — DO NOT EDIT.\n` +
+        `// Source metadata: ${entityName} (${entity.fqn()})\n` +
+        `// Customize via ${entityName}.extra.ts in this directory (e.g., auth, additional handlers).\n`;
+    // Path composition: apiPrefix is a literal string in the URL.
+    const pathExpr = ctx.apiPrefix
+        ? `\`${ctx.apiPrefix}\${${entityName}.$path}\``
+        : `${entityName}.$path`;
+    // --- Projection path: read-only routes (GET list + GET :id) ---
+    if (isProjection(entity)) {
+        const camelName = entityName.charAt(0).toLowerCase() + entityName.slice(1);
+        const HonoSym = imp("t:Hono@hono");
+        const mountReadOnlyCrudRoutesSym = imp("mountReadOnlyCrudRoutes@@metaobjectsdev/runtime-ts/hono");
+        const literalImports = code `
+import {
+  ${entityName},
+  ${camelName}View,
+  ${entityName}FilterAllowlist,
+  ${entityName}SortAllowlist,
+} from ${JSON.stringify(entityFileSpec)};
+`;
+        const body = code `
+/**
+ * Mount read-only REST endpoints for ${entityName} (projection — view-backed, no writes).
+ *
+ * Exposes GET list + GET :id only. POST/PATCH/DELETE return 405.
+ * Customize: register this as-is, or import individual route helpers from
+ * @metaobjectsdev/runtime-ts/hono.
+ */
+// biome-ignore lint/suspicious/noExplicitAny: consumer-defined Hono bindings/variables
+export function ${handlerName}(app: ${HonoSym}<any, any, any>, deps: { db: unknown }): void {
+  ${mountReadOnlyCrudRoutesSym}({
+    app,
+    path: ${pathExpr},
+    db: deps.db,
+    view: ${camelName}View,
+    filterAllowlist: ${entityName}FilterAllowlist,
+    sortAllowlist: ${entityName}SortAllowlist,
+    dialect: ${JSON.stringify(ctx.dialect)},
+  });
+}
+`;
+        return header + literalImports.toString() + body.toString();
+    }
+    // --- Vanilla / write-through entity path: full CRUD routes ---
+    const tableVar = variableNameFromEntity(entityName);
+    const HonoSym = imp("t:Hono@hono");
+    const mountCrudRoutesSym = imp("mountCrudRoutes@@metaobjectsdev/runtime-ts/hono");
+    const literalImports = code `
+import {
+  ${entityName},
+  ${tableVar},
+  ${entityName}InsertSchema,
+  ${entityName}UpdateSchema,
+  ${entityName}FilterAllowlist,
+  ${entityName}SortAllowlist,
+} from ${JSON.stringify(entityFileSpec)};
+`;
+    const body = code `
+/**
+ * Mount the 5 standard REST endpoints for ${entityName} using Drizzle directly.
+ *
+ * Customize: register this as-is for stock CRUD, OR import the per-verb
+ * helpers (mountListRoute, mountGetRoute, ...) from
+ * @metaobjectsdev/runtime-ts/hono and mix with your own handlers
+ * (auth, side effects, etc.).
+ */
+// biome-ignore lint/suspicious/noExplicitAny: consumer-defined Hono bindings/variables
+export function ${handlerName}(app: ${HonoSym}<any, any, any>, deps: { db: unknown }): void {
+  ${mountCrudRoutesSym}({
+    app,
+    path: ${pathExpr},
+    db: deps.db,
+    table: ${tableVar},
+    insertSchema: ${entityName}InsertSchema,
+    updateSchema: ${entityName}UpdateSchema,
+    filterAllowlist: ${entityName}FilterAllowlist,
+    sortAllowlist: ${entityName}SortAllowlist,
+    dialect: ${JSON.stringify(ctx.dialect)},
+  });
+}
+`;
+    return header + literalImports.toString() + body.toString();
+}
+//# sourceMappingURL=routes-file-hono.js.map

package/dist/templates/routes-file-hono.js.map

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

package/dist/templates/value-object-file.d.ts

@@ -0,0 +1,3 @@
+import type { MetaObject } from "@metaobjectsdev/metadata";
+export declare function renderValueObjectFile(obj: MetaObject): string;
+//# sourceMappingURL=value-object-file.d.ts.map

package/dist/templates/value-object-file.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"value-object-file.d.ts","sourceRoot":"","sources":["../../src/templates/value-object-file.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAK3D,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,CAa7D"}

package/dist/templates/value-object-file.js

@@ -0,0 +1,27 @@
+// Value-object file composer — emits a streamlined "value-only" module for
+// metaobjects with no writable source.rdb child. Output is just the TS
+// interface + the Zod schema (and enum type aliases when applicable); no
+// Drizzle table, no Infer*Model aliases, no filter allowlists, no constants
+// object.
+//
+// Dispatch: entity-file.ts routes here when hasWritableRdbSource(entity) is
+// false. The entity may still have read-only source.* children (those are
+// handled by the projection path before this one is reached).
+import { joinCode } from "ts-poet";
+import { renderValueObjectInterface, renderEnumTypeAliases } from "./inferred-types.js";
+import { renderInsertSchemaOnly } from "./zod-validators.js";
+import { GENERATED_HEADER } from "../constants.js";
+export function renderValueObjectFile(obj) {
+    const enumAliases = renderEnumTypeAliases(obj);
+    const sections = [
+        renderValueObjectInterface(obj),
+        ...(enumAliases !== null ? [enumAliases] : []),
+        renderInsertSchemaOnly(obj),
+    ];
+    const body = joinCode(sections, { on: "\n" }).toString();
+    const header = `// ${GENERATED_HEADER} — DO NOT EDIT.\n` +
+        `// Source metadata: ${obj.name} (${obj.fqn()})\n` +
+        `// Customize via ${obj.name}.extra.ts in this directory.\n`;
+    return header + body;
+}
+//# sourceMappingURL=value-object-file.js.map

package/dist/templates/value-object-file.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"value-object-file.js","sourceRoot":"","sources":["../../src/templates/value-object-file.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,uEAAuE;AACvE,yEAAyE;AACzE,4EAA4E;AAC5E,UAAU;AACV,EAAE;AACF,4EAA4E;AAC5E,0EAA0E;AAC1E,8DAA8D;AAE9D,OAAO,EAAE,QAAQ,EAAa,MAAM,SAAS,CAAC;AAE9C,OAAO,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AACxF,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,MAAM,UAAU,qBAAqB,CAAC,GAAe;IACnD,MAAM,WAAW,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAW;QACvB,0BAA0B,CAAC,GAAG,CAAC;QAC/B,GAAG,CAAC,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9C,sBAAsB,CAAC,GAAG,CAAC;KAC5B,CAAC;IACF,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;IACzD,MAAM,MAAM,GACV,MAAM,gBAAgB,mBAAmB;QACzC,uBAAuB,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,GAAG,EAAE,KAAK;QAClD,oBAAoB,GAAG,CAAC,IAAI,gCAAgC,CAAC;IAC/D,OAAO,MAAM,GAAG,IAAI,CAAC;AACvB,CAAC"}

package/dist/templates/zod-validators.d.ts

@@ -1,4 +1,14 @@
 import { type Code } from "ts-poet";
 import { MetaObject } from "@metaobjectsdev/metadata";
+/**
+ * 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 declare function renderInsertSchemaOnly(obj: MetaObject): Code;
 export declare function renderZodValidators(obj: MetaObject): Code;
 //# sourceMappingURL=zod-validators.d.ts.map

package/dist/templates/zod-validators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zod-validators.d.ts","sourceRoot":"","sources":["../../src/templates/zod-validators.ts"],"names":[],"mappings":"AAKA,OAAO,EAAa,KAAK,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAa,MAAM,0BAA0B,CAAC;AAgBjE,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,UAAU,GAAG,IAAI,CA6DzD"}
+{"version":3,"file":"zod-validators.d.ts","sourceRoot":"","sources":["../../src/templates/zod-validators.ts"],"names":[],"mappings":"AAWA,OAAO,EAAuB,KAAK,IAAI,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,EAAE,UAAU,EAAa,MAAM,0BAA0B,CAAC;AA+BjE;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,UAAU,GAAG,IAAI,CA4B5D;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,UAAU,GAAG,IAAI,CAqDzD"}

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":"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"}
+{"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.10",
   "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.10",
   "@biomejs/js-api": "^0.7.0",
   "@biomejs/wasm-nodejs": "^1.9.4",
   "ts-poet": "^6.10.0"
@@ -49,10 +49,11 @@
 },
 "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.10",
+  "@metaobjectsdev/render": "0.7.0-rc.10",
   "bun-types": "latest",
   "drizzle-orm": "^0.36.0",
+  "hono": "^4.6.0",
   "typescript": "^5.6.0",
   "zod": "^3.23.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.