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

package/dist/templates/output-parser.js

@@ -0,0 +1,129 @@
+// server/typescript/packages/codegen-ts/src/templates/output-parser.ts
+//
+// Per-template renderer for template.output codegen. Walks the @payloadRef's
+// value-object into a Zod schema and emits a dual-API parser (parse + safeParse)
+// alongside the schema. The emitted file is self-contained: it derives a
+// local data type via `z.infer<typeof Schema>` and exports it as
+// `<TemplateName>Data`. Consumers wiring `promptRender()` get a structurally
+// identical payload-VO interface in `prompts.ts`; either type can be used
+// interchangeably with parse results.
+import { TYPE_OBJECT, TYPE_FIELD, TYPE_TEMPLATE, TEMPLATE_SUBTYPE_OUTPUT, FIELD_SUBTYPE_OBJECT, FIELD_ATTR_OBJECT_REF, TEMPLATE_ATTR_PAYLOAD_REF, } from "@metaobjectsdev/metadata";
+const SCALAR_ZOD = {
+    string: "z.string()",
+    class: "z.string()",
+    int: "z.number().int()",
+    short: "z.number().int()",
+    byte: "z.number().int()",
+    long: "z.number().int()",
+    double: "z.number()",
+    float: "z.number()",
+    boolean: "z.boolean()",
+};
+function findObject(root, name) {
+    return root.ownChildren().find((c) => c.type === TYPE_OBJECT && c.name === name);
+}
+function findTemplate(root, name) {
+    return root.ownChildren().find((c) => c.type === TYPE_TEMPLATE && c.name === name);
+}
+/** Render the Zod expression for a single field; recurses on @objectRef. */
+function fieldZod(field, root, seen, depth) {
+    // isArray is a native (reserved) property on MetaData, not an attr.
+    const isArray = field.isArray === true;
+    let base;
+    if (field.subType === FIELD_SUBTYPE_OBJECT) {
+        const refName = field.ownAttr(FIELD_ATTR_OBJECT_REF);
+        if (typeof refName !== "string") {
+            base = "z.unknown()";
+        }
+        else if (seen.has(refName)) {
+            // Cycle guard — emit unknown for self-references (rare; lazy schemas not in scope for v1).
+            base = "z.unknown()";
+        }
+        else {
+            const inner = findObject(root, refName);
+            base = inner ? renderObjectSchema(inner, root, new Set(seen).add(refName), depth + 1) : "z.unknown()";
+        }
+    }
+    else {
+        base = SCALAR_ZOD[field.subType] ?? "z.unknown()";
+    }
+    return isArray ? `z.array(${base})` : base;
+}
+/** Render a `z.object({ ... })` for an object.value node.
+ *  At depth 0 the schema starts at column 0 (consumer's `const Foo = z.object({`),
+ *  so fields sit at 2 spaces and the closing `})` at 0 spaces — matching the
+ *  surrounding `const NameSchema = ...` statement's indent. Nested schemas
+ *  step in two spaces per depth level. */
+function renderObjectSchema(vo, root, seen, depth) {
+    const fields = vo.children().filter((c) => c.type === TYPE_FIELD);
+    const fieldIndent = "  ".repeat(depth + 1);
+    const closeIndent = "  ".repeat(depth);
+    const lines = fields.map((f) => `${fieldIndent}${f.name}: ${fieldZod(f, root, seen, depth)},`);
+    return `z.object({\n${lines.join("\n")}\n${closeIndent}})`;
+}
+/**
+ * Render the full output-parser file for one `template.output` node.
+ * Throws if the template isn't found, isn't a template.output, or its
+ * @payloadRef doesn't resolve to an object.value.
+ */
+export function renderOutputParser(root, templateName) {
+    const tmpl = findTemplate(root, templateName);
+    if (!tmpl) {
+        throw new Error(`template "${templateName}" not found in metadata root`);
+    }
+    if (tmpl.subType !== TEMPLATE_SUBTYPE_OUTPUT) {
+        throw new Error(`template "${templateName}" is not a template.output (got subtype "${tmpl.subType}")`);
+    }
+    const payloadRef = tmpl.ownAttr(TEMPLATE_ATTR_PAYLOAD_REF);
+    if (typeof payloadRef !== "string") {
+        throw new Error(`template "${templateName}" missing @payloadRef`);
+    }
+    const vo = findObject(root, payloadRef);
+    if (!vo) {
+        throw new Error(`template "${templateName}" @payloadRef "${payloadRef}" not found in metadata root`);
+    }
+    const schema = renderObjectSchema(vo, root, new Set([payloadRef]), 0);
+    const schemaName = `${templateName}Schema`;
+    const dataName = `${templateName}Data`;
+    const errorName = `${templateName}ValidationError`;
+    const parseName = `parse${templateName}`;
+    const safeParseName = `safeParse${templateName}`;
+    return `import { z } from "zod";
+
+const ${schemaName} = ${schema};
+
+export type ${dataName} = z.infer<typeof ${schemaName}>;
+export type ${errorName} = z.ZodError;
+
+/**
+ * Parse an LLM response into a typed ${dataName}.
+ * @throws ZodError on validation failure.
+ */
+export function ${parseName}(text: string): ${dataName} {
+  return ${schemaName}.parse(JSON.parse(text));
+}
+
+/**
+ * Parse an LLM response with explicit error handling (Result-style).
+ * Does not throw on validation failure.
+ */
+export function ${safeParseName}(
+  text: string,
+): { success: true; data: ${dataName} } | { success: false; error: ${errorName} } {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(text);
+  } catch (err) {
+    return {
+      success: false,
+      error: new z.ZodError([{ code: "custom", path: [], message: \`invalid JSON: \${(err as Error).message}\` }]),
+    };
+  }
+  const result = ${schemaName}.safeParse(parsed);
+  return result.success
+    ? { success: true, data: result.data }
+    : { success: false, error: result.error };
+}
+`;
+}
+//# sourceMappingURL=output-parser.js.map

package/dist/templates/output-parser.js.map

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

package/dist/templates/projection-decl.d.ts

@@ -14,7 +14,7 @@ export interface ProjectionDeclOpts {
  *
  * @param projection  The projection entity (has a source[dbView] child).
  * @param root        The loader's root (all top-level objects as direct children,
- *                    from `MetaDataLoader.load()` / `FileMetaDataLoader.loadFiles()` as `result.root`).
+ *                    from `MetaDataLoader.load()` or `MetaDataLoader.fromDirectory()` as `result.root`).
  * @param opts        Column naming strategy + dialect.
  */
 export declare function renderProjectionDecl(projection: MetaObject, root: MetaRoot, opts: ProjectionDeclOpts): string;

package/dist/templates/projection-decl.js

@@ -40,7 +40,7 @@ function pathFromProjectionName(name) {
  *
  * @param projection  The projection entity (has a source[dbView] child).
  * @param root        The loader's root (all top-level objects as direct children,
- *                    from `MetaDataLoader.load()` / `FileMetaDataLoader.loadFiles()` as `result.root`).
+ *                    from `MetaDataLoader.load()` or `MetaDataLoader.fromDirectory()` as `result.root`).
  * @param opts        Column naming strategy + dialect.
  */
 export function renderProjectionDecl(projection, root, opts) {

package/dist/templates/queries-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queries-file.d.ts","sourceRoot":"","sources":["../../src/templates/queries-file.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAY1D,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,aAAa,GAAG,MAAM,CAsC7E"}
+{"version":3,"file":"queries-file.d.ts","sourceRoot":"","sources":["../../src/templates/queries-file.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAY1D,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,aAAa,GAAG,MAAM,CAoD7E"}

package/dist/templates/queries-file.js

@@ -3,7 +3,7 @@
 import { code, joinCode } from "ts-poet";
 import { MetaObject } from "@metaobjectsdev/metadata";
 import {} from "../render-context.js";
-import { entityModuleSpecifier, relativeModuleSpecifier } from "../import-path.js";
+import { entityModuleSpecifier } from "../import-path.js";
 import { renderFindByIdFn, renderListFn, renderCreateFn, renderUpdateFn, renderDeleteByIdFn, } from "./queries.js";
 import { variableNameFromEntity } from "../naming.js";
 import { GENERATED_HEADER } from "../constants.js";
@@ -12,12 +12,23 @@ export function renderQueriesFile(obj, ctx) {
     // Import the entity's own file. Same target → relative "./Entity"; cross
     // target → importBase-qualified package path.
     const entityFileName = entityModuleSpecifier(ctx.selfTarget, ctx.entityModuleTarget, obj.package, entityName, ctx.extStyle);
-    const dbImportSpec = relativeModuleSpecifier(ctx.outputLayout, obj.package, ctx.dbImport);
     const varName = variableNameFromEntity(entityName);
-    // Literal imports (db + entity types) live in a code block so they sort
+    // The persistence-context `db` is parameter-passed into every generated CRUD
+    // helper (ADR-0008). Emit the dialect-correct Drizzle type alias so the
+    // signatures `findXxx(db: Db, ...)` typecheck without the consumer importing
+    // anything to construct one. Consumers pass any compatible Drizzle instance.
+    const dbTypeImport = ctx.dialect === "postgres"
+        ? `import type { NodePgDatabase } from "drizzle-orm/node-postgres";`
+        : `import type { BaseSQLiteDatabase } from "drizzle-orm/sqlite-core";`;
+    const dbTypeAlias = ctx.dialect === "postgres"
+        ? `type Db = NodePgDatabase<Record<string, never>>;`
+        : `type Db = BaseSQLiteDatabase<"async", Record<string, never>>;`;
+    // Literal imports (Db type + entity types) live in a code block so they sort
     // alongside ts-poet's hoisted imp() imports at the top of the body.
     const literalImports = code `
-import { db } from ${JSON.stringify(dbImportSpec)};
+${dbTypeImport}
+${dbTypeAlias}
+
 import { ${varName}, type ${entityName}, ${entityName}InsertSchema } from ${JSON.stringify(entityFileName)};
 `;
     const sections = [

package/dist/templates/queries-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"queries-file.js","sourceRoot":"","sources":["../../src/templates/queries-file.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,kFAAkF;AAElF,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAa,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAsB,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AACnF,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,cAAc,EACd,cAAc,EACd,kBAAkB,GACnB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,MAAM,UAAU,iBAAiB,CAAC,GAAe,EAAE,GAAkB;IACnE,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC;IAC5B,yEAAyE;IACzE,8CAA8C;IAC9C,MAAM,cAAc,GAAG,qBAAqB,CAC1C,GAAG,CAAC,UAAU,EACd,GAAG,CAAC,kBAAkB,EACtB,GAAG,CAAC,OAAO,EACX,UAAU,EACV,GAAG,CAAC,QAAQ,CACb,CAAC;IACF,MAAM,YAAY,GAAG,uBAAuB,CAAC,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC1F,MAAM,OAAO,GAAG,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAEnD,wEAAwE;IACxE,oEAAoE;IACpE,MAAM,cAAc,GAAG,IAAI,CAAA;qBACR,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC;WACtC,OAAO,UAAU,UAAU,KAAK,UAAU,uBAAuB,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;CACzG,CAAC;IAEA,MAAM,QAAQ,GAAW;QACvB,cAAc;QACd,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC;QAC1B,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC;QACtB,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC;QACxB,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC;QACxB,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC;KAC7B,CAAC;IAEF,4EAA4E;IAC5E,kCAAkC;IAClC,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,UAAU,KAAK,GAAG,CAAC,GAAG,EAAE,KAAK;QACpD,oBAAoB,UAAU,mEAAmE,CAAC;IACpG,OAAO,MAAM,GAAG,IAAI,CAAC;AACvB,CAAC"}
+{"version":3,"file":"queries-file.js","sourceRoot":"","sources":["../../src/templates/queries-file.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,kFAAkF;AAElF,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAa,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAsB,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,cAAc,EACd,cAAc,EACd,kBAAkB,GACnB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,MAAM,UAAU,iBAAiB,CAAC,GAAe,EAAE,GAAkB;IACnE,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC;IAC5B,yEAAyE;IACzE,8CAA8C;IAC9C,MAAM,cAAc,GAAG,qBAAqB,CAC1C,GAAG,CAAC,UAAU,EACd,GAAG,CAAC,kBAAkB,EACtB,GAAG,CAAC,OAAO,EACX,UAAU,EACV,GAAG,CAAC,QAAQ,CACb,CAAC;IACF,MAAM,OAAO,GAAG,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAEnD,6EAA6E;IAC7E,wEAAwE;IACxE,6EAA6E;IAC7E,6EAA6E;IAC7E,MAAM,YAAY,GAChB,GAAG,CAAC,OAAO,KAAK,UAAU;QACxB,CAAC,CAAC,kEAAkE;QACpE,CAAC,CAAC,oEAAoE,CAAC;IAC3E,MAAM,WAAW,GACf,GAAG,CAAC,OAAO,KAAK,UAAU;QACxB,CAAC,CAAC,kDAAkD;QACpD,CAAC,CAAC,+DAA+D,CAAC;IAEtE,6EAA6E;IAC7E,oEAAoE;IACpE,MAAM,cAAc,GAAG,IAAI,CAAA;EAC3B,YAAY;EACZ,WAAW;;WAEF,OAAO,UAAU,UAAU,KAAK,UAAU,uBAAuB,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;CACzG,CAAC;IAEA,MAAM,QAAQ,GAAW;QACvB,cAAc;QACd,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC;QAC1B,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC;QACtB,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC;QACxB,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC;QACxB,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC;KAC7B,CAAC;IAEF,4EAA4E;IAC5E,kCAAkC;IAClC,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,UAAU,KAAK,GAAG,CAAC,GAAG,EAAE,KAAK;QACpD,oBAAoB,UAAU,mEAAmE,CAAC;IACpG,OAAO,MAAM,GAAG,IAAI,CAAC;AACvB,CAAC"}

package/dist/templates/queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../../src/templates/queries.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,KAAK,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AA0B1D,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI,CAgC7E;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,GAAG,IAAI,CAe1E;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,GAAG,IAAI,CAc5E;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI,CAgB3E;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI,CAc/E"}
+{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../../src/templates/queries.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,KAAK,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAqB1D,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI,CAc7E;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,GAAG,IAAI,CAe1E;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,GAAG,IAAI,CAc5E;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI,CAgB3E;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,aAAa,GAAG,IAAI,CAe/E"}

package/dist/templates/queries.js

@@ -2,11 +2,7 @@
 // Each returns a ts-poet Code block; composed into a file by queries-file.ts.
 import { code, imp } from "ts-poet";
 import { IDENTITY_ATTR_FIELDS } from "@metaobjectsdev/metadata";
-import { variableNameFromEntity, toSnakeCase, pluralize } from "../naming.js";
-/** Derive a stable prepared statement name. Deterministic from entity + field names. */
-function prepareName(prefix, entitySnakeName, fieldDbName) {
-    return `${prefix}_${entitySnakeName}_by_${fieldDbName}`;
-}
+import { variableNameFromEntity, pluralize } from "../naming.js";
 /** Get the PK field name and its TS type for a given entity. */
 function getPkInfo(entity, ctx) {
     // Use primaryIdentity() to find the primary identity (may be inherited from extends:/super:).
@@ -27,28 +23,12 @@ export function renderFindByIdFn(entity, ctx) {
     const varName = variableNameFromEntity(entity.name);
     const entityName = entity.name;
     const singularVar = entityName.charAt(0).toLowerCase() + entityName.slice(1);
-    const entitySnakeName = toSnakeCase(entityName);
     const { fieldName: pkField, tsType: pkType } = getPkInfo(entity, ctx);
-    const pkSnakeName = toSnakeCase(pkField);
-    const prepName = prepareName("find", entitySnakeName, pkSnakeName);
     const fnName = `find${entityName}ById`;
-    const prepVarName = `${fnName}Prepared`;
     const eqSym = imp("eq@drizzle-orm");
-    const sqlSym = imp("sql@drizzle-orm");
-    const baseVarName = `${fnName}Base`;
-    // Drizzle's `.prepare()` signature differs by dialect:
-    //   - Postgres: prepare(name) — the name is used by the pg driver to cache the plan
-    //   - SQLite:   prepare()     — no name; the name arg was removed in drizzle-orm 0.41+
-    const prepArg = ctx.dialect === "postgres" ? `"${prepName}"` : "";
     return code `
-const ${baseVarName} = db
-  .select()
-  .from(${varName})
-  .where(${eqSym}(${varName}.${pkField}, ${sqlSym}.placeholder(${JSON.stringify(pkField)})));
-const ${prepVarName} = ${baseVarName}.prepare(${prepArg});
-
-export async function ${fnName}(${pkField}: ${pkType}): Promise<${entityName} | null> {
-  const [${singularVar}] = await ${prepVarName}.execute({ ${pkField} });
+export async function ${fnName}(db: Db, ${pkField}: ${pkType}): Promise<${entityName} | null> {
+  const [${singularVar}] = await db.select().from(${varName}).where(${eqSym}(${varName}.${pkField}, ${pkField})).limit(1);
   return ${singularVar} ?? null;
 }
 `;
@@ -60,7 +40,7 @@ export function renderListFn(entity, _ctx) {
     // (e.g., "Category" -> "Categories", not "Categorys").
     const fnName = `list${pluralize(entityName)}`;
     return code `
-export async function ${fnName}(opts?: { limit?: number; offset?: number }): Promise<${entityName}[]> {
+export async function ${fnName}(db: Db, opts?: { limit?: number; offset?: number }): Promise<${entityName}[]> {
   let q = db.select().from(${varName}).$dynamic();
   if (opts?.limit !== undefined) q = q.limit(opts.limit);
   if (opts?.offset !== undefined) q = q.offset(opts.offset);
@@ -75,7 +55,7 @@ export function renderCreateFn(entity, _ctx) {
     const fnName = `create${entityName}`;
     const schemaName = `${entityName}InsertSchema`;
     return code `
-export async function ${fnName}(data: unknown): Promise<${entityName}> {
+export async function ${fnName}(db: Db, data: unknown): Promise<${entityName}> {
   const validated = ${schemaName}.parse(data);
   const [${singularVar}] = await db.insert(${varName}).values(validated).returning();
   return ${singularVar}!;
@@ -91,7 +71,7 @@ export function renderUpdateFn(entity, ctx) {
     const schemaName = `${entityName}InsertSchema`;
     const eqSym = imp("eq@drizzle-orm");
     return code `
-export async function ${fnName}(${pkField}: ${pkType}, data: unknown): Promise<${entityName} | null> {
+export async function ${fnName}(db: Db, ${pkField}: ${pkType}, data: unknown): Promise<${entityName} | null> {
   const validated = ${schemaName}.partial().parse(data);
   const [${singularVar}] = await db.update(${varName}).set(validated).where(${eqSym}(${varName}.${pkField}, ${pkField})).returning();
   return ${singularVar} ?? null;
@@ -105,10 +85,11 @@ export function renderDeleteByIdFn(entity, ctx) {
     const fnName = `delete${entityName}ById`;
     const eqSym = imp("eq@drizzle-orm");
     return code `
-export async function ${fnName}(${pkField}: ${pkType}): Promise<boolean> {
-  const result = await db.delete(${varName}).where(${eqSym}(${varName}.${pkField}, ${pkField}));
-  // SQLite (libsql/Turso) returns { rowsAffected }; postgres returns array from .returning()
-  return ('rowsAffected' in result ? result.rowsAffected : (result as unknown as unknown[]).length) > 0;
+export async function ${fnName}(db: Db, ${pkField}: ${pkType}): Promise<boolean> {
+  // Use .returning() unconditionally — supported on SQLite ≥3.35 (covers D1, libsql/Turso)
+  // and Postgres. Result is an array of deleted rows; presence implies success.
+  const deleted = await db.delete(${varName}).where(${eqSym}(${varName}.${pkField}, ${pkField})).returning();
+  return deleted.length > 0;
 }
 `;
 }

package/dist/templates/queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../src/templates/queries.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../src/templates/queries.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.1",
   "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.1",
   "@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.1",
+  "@metaobjectsdev/render": "0.7.0-rc.1",
   "bun-types": "latest",
   "drizzle-orm": "^0.36.0",
   "typescript": "^5.6.0",

package/src/column-mapper.ts

@@ -27,6 +27,7 @@ import {
 } 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 };
@@ -118,7 +119,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";

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,69 @@
+// 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 {
+  generatePayloadInterfaces,
+  generateRenderHandle,
+} from "../payload-codegen.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;
+}
+
+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[] = [];
+      for (const p of payloads) {
+        parts.push(generatePayloadInterfaces(ctx.loadedRoot, p.name));
+      }
+      // Strip the `import type { ... } from "./payloads.js"` line 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 a self-reference to a non-existent module.
+      for (const t of prompts) {
+        const handle = generateRenderHandle(ctx.loadedRoot, t.name)
+          .split("\n")
+          .filter((line) => !line.startsWith("import type {") || !line.includes("./payloads.js"))
+          .join("\n");
+        parts.push(handle);
+      }
+      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/metaobjects-config.ts

@@ -1,9 +1,11 @@
+import { DEFAULT_COLUMN_NAMING_STRATEGY, type ColumnNamingStrategy } from "@metaobjectsdev/metadata";
 import type { Generator } from "./generator.js";
 import type { ExtStyle } from "./render-context.js";
 import type { OutputLayout, ResolvedTarget } from "./import-path.js";
 
 export type Dialect = "sqlite" | "postgres";
-export type ColumnNamingStrategy = "snake_case" | "literal" | "kebab-case";
+/** Re-exported from metadata so codegen-ts consumers see one canonical type. */
+export type { ColumnNamingStrategy } from "@metaobjectsdev/metadata";
 export type { ExtStyle };
 export type { OutputLayout };
 export type { ResolvedTarget };
@@ -87,7 +89,7 @@ export function resolveTargets(config: MetaobjectsGenConfig): Record<string, Res
 export function normalizeConfig(config: MetaobjectsGenConfig): NormalizedMetaobjectsGenConfig {
   return {
     ...config,
-    columnNamingStrategy: config.columnNamingStrategy ?? "snake_case",
+    columnNamingStrategy: config.columnNamingStrategy ?? DEFAULT_COLUMN_NAMING_STRATEGY,
     apiPrefix: config.apiPrefix ?? "",
     outputLayout: config.outputLayout ?? "flat",
     targets: resolveTargets(config),

package/src/naming.ts

@@ -1,32 +1,19 @@
 // Naming helpers — case conversion + pluralization for codegen output.
-// All functions are pure.
+// All functions are pure. The strategy primitives (toSnakeCase, toKebabCase,
+// applyColumnNamingStrategy, pluralize, DEFAULT_COLUMN_NAMING_STRATEGY) are
+// re-exported from @metaobjectsdev/metadata so codegen + runtime + migrate
+// share a single source of truth for how field/table names lower to columns.
 
-import type { ColumnNamingStrategy } from "./metaobjects-config.js";
+import {
+  applyColumnNamingStrategy,
+  DEFAULT_COLUMN_NAMING_STRATEGY,
+  pluralize,
+  toKebabCase,
+  toSnakeCase,
+  type ColumnNamingStrategy,
+} from "@metaobjectsdev/metadata";
 
-/**
- * Convert PascalCase or camelCase to snake_case.
- * Treats consecutive capitals (e.g., "APIKey") as a single word: "api_key".
- */
-export function toSnakeCase(s: string): string {
-  return s
-    .replace(/([A-Z]+)([A-Z][a-z])/g, "$1_$2")
-    .replace(/([a-z0-9])([A-Z])/g, "$1_$2")
-    .toLowerCase();
-}
-
-/** Convert PascalCase or camelCase to kebab-case. */
-function toKebabCase(s: string): string {
-  return toSnakeCase(s).replace(/_/g, "-");
-}
-
-/** Apply a ColumnNamingStrategy to a name. */
-function applyStrategy(name: string, strategy: ColumnNamingStrategy): string {
-  switch (strategy) {
-    case "snake_case": return toSnakeCase(name);
-    case "literal":    return name;
-    case "kebab-case": return toKebabCase(name);
-  }
-}
+export { pluralize, toSnakeCase } from "@metaobjectsdev/metadata";
 
 /**
  * Convert snake_case to camelCase. Preserves already-camelCase input.
@@ -42,31 +29,20 @@ export function toPascalCase(s: string): string {
   return s.length > 0 ? s[0]!.toUpperCase() + s.slice(1) : s;
 }
 
-/**
- * Simple English pluralization. Documented imperfection per design §13 #1:
- * irregular plurals (Person → Persons, not People) are not handled.
- * Users override via source[dbTable]@name in metadata.
- */
-export function pluralize(s: string): string {
-  if (/(s|x|z|ch|sh)$/i.test(s)) return s + "es";
-  if (/[^aeiou]y$/i.test(s)) return s.slice(0, -1) + "ies";
-  return s + "s";
-}
-
 /** PascalCase entity → strategy-applied plural for DB table name. */
 export function tableNameFromEntity(
   entityName: string,
-  strategy: ColumnNamingStrategy = "snake_case",
+  strategy: ColumnNamingStrategy = DEFAULT_COLUMN_NAMING_STRATEGY,
 ): string {
-  return applyStrategy(pluralize(entityName), strategy);
+  return applyColumnNamingStrategy(pluralize(entityName), strategy);
 }
 
 /** camelCase or PascalCase field → strategy-applied DB column name. */
 export function columnNameFromField(
   fieldName: string,
-  strategy: ColumnNamingStrategy = "snake_case",
+  strategy: ColumnNamingStrategy = DEFAULT_COLUMN_NAMING_STRATEGY,
 ): string {
-  return applyStrategy(fieldName, strategy);
+  return applyColumnNamingStrategy(fieldName, strategy);
 }
 
 /**
@@ -78,14 +54,14 @@ export function viewNameFromProjection(
   projectionName: string,
   strategy: ColumnNamingStrategy,
 ): string {
-  switch (strategy) {
-    case "snake_case": return "v_" + toSnakeCase(projectionName);
-    case "literal":    return "v_" + projectionName;
-    case "kebab-case": return "v-" + toKebabCase(projectionName);
-  }
+  const sep = strategy === "kebab-case" ? "-" : "_";
+  return "v" + sep + applyColumnNamingStrategy(projectionName, strategy);
 }
 
 /** PascalCase entity → camelCase plural for the Drizzle table variable. */
 export function variableNameFromEntity(entityName: string): string {
   return pluralize(toCamelCase(entityName.charAt(0).toLowerCase() + entityName.slice(1)));
 }
+
+// Re-exported here for callers that import from codegen-ts's naming module.
+export { toKebabCase };

package/src/projection/extract-view-spec.ts

@@ -348,7 +348,7 @@ function buildGroupBy(spec: SelectSpec): string[] {
  *                    and extends a writable entity).
  * @param root        The loader's MetaRoot — all top-level objects are
  *                    direct children of root (returned by `MetaDataLoader.load()`
- *                    / `FileMetaDataLoader.loadFiles()` as `result.root`).
+ *                    or `MetaDataLoader.fromDirectory()` as `result.root`).
  * @param ctx         Column naming strategy for SQL identifiers.
  */
 export function extractViewSpec(