@pylonts/dsl 1.1.15 → 1.1.16

package/dist/typebox-driver.js

@@ -8,11 +8,21 @@ function renderDefault(v) {
         return renderString(v);
     return JSON.stringify(v);
 }
-function renderBasic(field, pattern, defaultValue, resolver, indent = 0) {
+/** BaseField-level description: description takes priority over label. */
+function fieldDescription(field) {
+    return field.description ?? field.label;
+}
+/** DtoField-level description: own description > referenced field description/label. */
+function dtoFieldDescription(f) {
+    return f.description ?? fieldDescription(f.field);
+}
+function renderBasic(field, pattern, defaultValue, resolver, indent = 0, description) {
     if (pattern !== undefined && field.type !== 'string') {
         throw new Error(`pattern is only supported on string fields, got ${field.type} (${field.name})`);
     }
     const def = defaultValue !== undefined ? `default: ${renderDefault(defaultValue)}` : undefined;
+    const desc = description !== undefined ? `description: ${renderString(description)}` : undefined;
+    const withOpts = (base, opts) => opts.length > 0 ? `${base}({ ${opts.join(', ')} })` : `${base}()`;
     switch (field.type) {
         case 'string': {
             const opts = [];
@@ -24,10 +34,18 @@ function renderBasic(field, pattern, defaultValue, resolver, indent = 0) {
                 opts.push(`pattern: ${renderString(pattern)}`);
             if (def !== undefined)
                 opts.push(def);
-            return opts.length > 0 ? `Type.String({ ${opts.join(', ')} })` : 'Type.String()';
+            if (desc !== undefined)
+                opts.push(desc);
+            return withOpts('Type.String', opts);
+        }
+        case 'text': {
+            const opts = [];
+            if (def !== undefined)
+                opts.push(def);
+            if (desc !== undefined)
+                opts.push(desc);
+            return withOpts('Type.String', opts);
         }
-        case 'text':
-            return def !== undefined ? `Type.String({ ${def} })` : 'Type.String()';
         case 'integer': {
             const opts = [];
             if (field.min !== undefined)
@@ -36,21 +54,41 @@ function renderBasic(field, pattern, defaultValue, resolver, indent = 0) {
                 opts.push(`maximum: ${field.max}`);
             if (def !== undefined)
                 opts.push(def);
-            return opts.length > 0 ? `Type.Integer({ ${opts.join(', ')} })` : 'Type.Integer()';
+            if (desc !== undefined)
+                opts.push(desc);
+            return withOpts('Type.Integer', opts);
         }
         case 'bigint':
         case 'decimal':
         case 'rate':
         case 'time':
         case 'date':
-        case 'datetime':
+        case 'datetime': {
             // Transmitted as string over HTTP: bigint/decimal/rate keep full
             // precision, date/time serialize to string.
-            return def !== undefined ? `Type.String({ ${def} })` : 'Type.String()';
-        case 'boolean':
-            return def !== undefined ? `Type.Boolean({ ${def} })` : 'Type.Boolean()';
-        case 'json':
-            return def !== undefined ? `Type.Unknown({ ${def} })` : 'Type.Unknown()';
+            const opts = [];
+            if (def !== undefined)
+                opts.push(def);
+            if (desc !== undefined)
+                opts.push(desc);
+            return withOpts('Type.String', opts);
+        }
+        case 'boolean': {
+            const opts = [];
+            if (def !== undefined)
+                opts.push(def);
+            if (desc !== undefined)
+                opts.push(desc);
+            return withOpts('Type.Boolean', opts);
+        }
+        case 'json': {
+            const opts = [];
+            if (def !== undefined)
+                opts.push(def);
+            if (desc !== undefined)
+                opts.push(desc);
+            return withOpts('Type.Unknown', opts);
+        }
         case 'enum': {
             const ref = resolver?.(field.enum.jsName);
             if (!ref)
@@ -60,18 +98,29 @@ function renderBasic(field, pattern, defaultValue, resolver, indent = 0) {
                 if (!member) {
                     throw new Error(`enum field ${field.name}: default ${renderDefault(defaultValue)} is not a member of ${field.enum.jsName}`);
                 }
-                return `Type.Enum(${ref.name}, { default: ${ref.name}.${member.symbol} })`;
+                const opts = [];
+                if (desc !== undefined)
+                    opts.push(desc);
+                return `Type.Enum(${ref.name}, { default: ${ref.name}.${member.symbol}${opts.length > 0 ? `, ${opts.join(', ')}` : ''} })`;
             }
+            if (desc !== undefined)
+                return `Type.Enum(${ref.name}, { ${desc} })`;
             return `Type.Enum(${ref.name})`;
         }
-        case 'aggregate':
+        case 'aggregate': {
             // Aggregate query outputs: count/sum(int) are numbers, everything else
             // arrives as a precision string.
-            return field.jsType === 'number' ? 'Type.Number()' : 'Type.String()';
+            const opts = [];
+            if (desc !== undefined)
+                opts.push(desc);
+            return field.jsType === 'number' ? withOpts('Type.Number', opts) : withOpts('Type.String', opts);
+        }
         case 'array':
-            return `Type.Array(${renderFieldValue(field.items, indent, resolver)})`;
+            return desc !== undefined
+                ? `Type.Array(${renderFieldValue(field.items, indent, resolver)}, { ${desc} })`
+                : `Type.Array(${renderFieldValue(field.items, indent, resolver)})`;
         case 'object':
-            return renderFieldObject(field.properties, indent + 1, resolver);
+            return renderFieldObject(field.properties, indent + 1, resolver, description);
         default:
             // Field union is exhaustive; this branch is unreachable at runtime.
             throw new Error(`unsupported field type: ${String(field.type)}`);
@@ -79,22 +128,28 @@ function renderBasic(field, pattern, defaultValue, resolver, indent = 0) {
 }
 /** Render a plain Field value (wire-format nested fields), wrapping optional. */
 function renderFieldValue(field, indent, resolver) {
-    const base = renderBasic(field, undefined, undefined, resolver, indent);
+    const base = renderBasic(field, undefined, undefined, resolver, indent, fieldDescription(field));
     return field.optional ? `Type.Optional(${base})` : base;
 }
 /** Render a plain Field object (wire-format nested object). */
-function renderFieldObject(properties, indent, resolver) {
+function renderFieldObject(properties, indent, resolver, description) {
     const pad = '  '.repeat(indent);
     const entries = Object.entries(properties).map(([name, f]) => `${pad}${name}: ${renderFieldValue(f, indent, resolver)}`);
-    return `Type.Object({\n${entries.join(',\n')}\n${'  '.repeat(indent - 1)}})`;
+    const obj = `Type.Object({\n${entries.join(',\n')}\n${'  '.repeat(indent - 1)}})`;
+    return description !== undefined
+        ? `Type.Object({\n${entries.join(',\n')}\n${'  '.repeat(indent - 1)}}, { description: ${renderString(description)} })`
+        : obj;
 }
-function renderObject(fields, indent, resolver) {
+function renderObject(fields, indent, resolver, description) {
     const pad = '  '.repeat(indent);
     const entries = Object.entries(fields).map(([name, f]) => {
         const rendered = isDtoField(f) ? renderField(f, indent, resolver) : renderFieldValue(f, indent, resolver);
         return `${pad}${name}: ${rendered}`;
     });
-    return `Type.Object({\n${entries.join(',\n')}\n${'  '.repeat(indent - 1)}})`;
+    const obj = `Type.Object({\n${entries.join(',\n')}\n${'  '.repeat(indent - 1)}})`;
+    return description !== undefined
+        ? `Type.Object({\n${entries.join(',\n')}\n${'  '.repeat(indent - 1)}}, { description: ${renderString(description)} })`
+        : obj;
 }
 function renderField(f, indent, resolver) {
     const base = renderValue(f, indent, resolver);
@@ -103,20 +158,31 @@ function renderField(f, indent, resolver) {
 function renderValue(f, indent, resolver) {
     if (f.field.type === 'array') {
         const items = f.field.items;
+        const desc = dtoFieldDescription(f);
         // Referenced DTO element — render by name (same-file export), not expanded.
-        if (isDtoMessage(items))
-            return `Type.Array(${items.name})`;
-        if (isDtoField(items))
-            return `Type.Array(${renderField(items, indent + 1, resolver)})`;
-        return `Type.Array(${renderFieldValue(items, indent, resolver)})`;
+        if (isDtoMessage(items)) {
+            return desc !== undefined
+                ? `Type.Array(${items.name}, { description: ${renderString(desc)} })`
+                : `Type.Array(${items.name})`;
+        }
+        if (isDtoField(items)) {
+            const rendered = `Type.Array(${renderField(items, indent + 1, resolver)})`;
+            return desc !== undefined
+                ? `Type.Array(${renderField(items, indent + 1, resolver)}, { description: ${renderString(desc)} })`
+                : rendered;
+        }
+        const rendered = `Type.Array(${renderFieldValue(items, indent, resolver)})`;
+        return desc !== undefined
+            ? `Type.Array(${renderFieldValue(items, indent, resolver)}, { description: ${renderString(desc)} })`
+            : rendered;
     }
     if (f.field.type === 'object') {
-        return renderObject(f.field.properties, indent + 1, resolver);
+        return renderObject(f.field.properties, indent + 1, resolver, dtoFieldDescription(f));
     }
     // DtoField only wraps a database Field; array/object defs live in the subclasses.
     // Only DTO-level defaults (setDefault) are emitted as TypeBox default
     // annotations; DB field defaults are not carried into the API contract.
-    return renderBasic(f.field, f.pattern, f.default, resolver, indent);
+    return renderBasic(f.field, f.pattern, f.default, resolver, indent, dtoFieldDescription(f));
 }
 function collectEnumImports(f, resolver, out) {
     if (f.field.type === 'array') {
@@ -163,7 +229,7 @@ export function collectDtoImports(schema, resolver, out) {
 }
 /** Render one DTO export (const + type) — no file header, for file-level generation. */
 export function renderDtoExport(schema, resolver) {
-    const object = renderObject(schema.fields, 1, resolver);
+    const object = renderObject(schema.fields, 1, resolver, schema.description);
     const bases = schema.bases ?? [];
     const body = bases.length > 0
         ? `Type.Intersect([${bases.map(renderBase).join(', ')}, ${object}])`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pylonts/dsl",
-  "version": "1.1.15",
+  "version": "1.1.16",
   "description": "Schema definition DSL with drivers: MySQL DDL, TS enum, TypeBox schema codegen.",
   "type": "module",
   "main": "dist/index.js",

package/src/typebox-driver.ts

@@ -1,235 +1,304 @@
-import { DtoArrayField, DtoField, DtoMessage, DtoObjectField, ImportBase, ImportRef, isDtoField, isDtoMessage } from './dto.js';
-import { collectEnumRefs, EnumField, Field } from './dsl.js';
-
-// TypeBox driver: renders a DtoMessage into TypeBox TypeScript source.
-// Shape matches the codegen product consumed by fastify v5 TypeBoxTypeProvider:
-//
-//   export const RegisterUserInput = Type.Object({...});
-//   export type RegisterUserInput = Static<typeof RegisterUserInput>;
-//
-// ENUM fields reference a generated enum (see enum-driver) by its import
-// location — the resolver maps a jsName to its product import.
-// DTO bases (.include()) render as Type.Intersect([...bases, Type.Object({...})]).
-
-export type EnumResolver = (enumName: string) => ImportBase | undefined;
-
-function renderString(s: string): string {
-  return `'${s.replace(/\\/g, '\\\\').replace(/'/g, "\\'")}'`;
-}
-
-function renderDefault(v: unknown): string {
-  if (typeof v === 'string') return renderString(v);
-  return JSON.stringify(v);
-}
-
-function renderBasic(
-  field: Field,
-  pattern: string | undefined,
-  defaultValue: unknown,
-  resolver: EnumResolver | undefined,
-  indent = 0,
-): string {
-  if (pattern !== undefined && field.type !== 'string') {
-    throw new Error(`pattern is only supported on string fields, got ${field.type} (${field.name})`);
-  }
-  const def = defaultValue !== undefined ? `default: ${renderDefault(defaultValue)}` : undefined;
-  switch (field.type) {
-    case 'string': {
-      const opts: string[] = [];
-      if (field.minLength !== undefined) opts.push(`minLength: ${field.minLength}`);
-      if (field.maxLength !== undefined) opts.push(`maxLength: ${field.maxLength}`);
-      if (pattern !== undefined) opts.push(`pattern: ${renderString(pattern)}`);
-      if (def !== undefined) opts.push(def);
-      return opts.length > 0 ? `Type.String({ ${opts.join(', ')} })` : 'Type.String()';
-    }
-    case 'text':
-      return def !== undefined ? `Type.String({ ${def} })` : 'Type.String()';
-    case 'integer': {
-      const opts: string[] = [];
-      if (field.min !== undefined) opts.push(`minimum: ${field.min}`);
-      if (field.max !== undefined) opts.push(`maximum: ${field.max}`);
-      if (def !== undefined) opts.push(def);
-      return opts.length > 0 ? `Type.Integer({ ${opts.join(', ')} })` : 'Type.Integer()';
-    }
-    case 'bigint':
-    case 'decimal':
-    case 'rate':
-    case 'time':
-    case 'date':
-    case 'datetime':
-      // Transmitted as string over HTTP: bigint/decimal/rate keep full
-      // precision, date/time serialize to string.
-      return def !== undefined ? `Type.String({ ${def} })` : 'Type.String()';
-    case 'boolean':
-      return def !== undefined ? `Type.Boolean({ ${def} })` : 'Type.Boolean()';
-    case 'json':
-      return def !== undefined ? `Type.Unknown({ ${def} })` : 'Type.Unknown()';
-    case 'enum': {
-      const ref = resolver?.(field.enum.jsName);
-      if (!ref) throw new Error(`enum field ${field.name}: no import ref for ${field.enum.jsName} — pass an EnumResolver`);
-      if (def !== undefined) {
-        const member = field.enum.values.find((v) => v.value === defaultValue);
-        if (!member) {
-          throw new Error(
-            `enum field ${field.name}: default ${renderDefault(defaultValue)} is not a member of ${field.enum.jsName}`,
-          );
-        }
-        return `Type.Enum(${ref.name}, { default: ${ref.name}.${member.symbol} })`;
-      }
-      return `Type.Enum(${ref.name})`;
-    }
-    case 'aggregate':
-      // Aggregate query outputs: count/sum(int) are numbers, everything else
-      // arrives as a precision string.
-      return field.jsType === 'number' ? 'Type.Number()' : 'Type.String()';
-    case 'array':
-      return `Type.Array(${renderFieldValue(field.items, indent, resolver)})`;
-    case 'object':
-      return renderFieldObject(field.properties, indent + 1, resolver);
-    default:
-      // Field union is exhaustive; this branch is unreachable at runtime.
-      throw new Error(`unsupported field type: ${String((field as Field).type)}`);
-  }
-}
-
-/** Render a plain Field value (wire-format nested fields), wrapping optional. */
-function renderFieldValue(field: Field, indent: number, resolver: EnumResolver | undefined): string {
-  const base = renderBasic(field, undefined, undefined, resolver, indent);
-  return field.optional ? `Type.Optional(${base})` : base;
-}
-
-/** Render a plain Field object (wire-format nested object). */
-function renderFieldObject(properties: Record<string, Field>, indent: number, resolver: EnumResolver | undefined): string {
-  const pad = '  '.repeat(indent);
-  const entries = Object.entries(properties).map(([name, f]) => `${pad}${name}: ${renderFieldValue(f, indent, resolver)}`);
-  return `Type.Object({\n${entries.join(',\n')}\n${'  '.repeat(indent - 1)}})`;
-}
-
-function renderObject(fields: Record<string, DtoField | Field>, indent: number, resolver: EnumResolver | undefined): string {
-  const pad = '  '.repeat(indent);
-  const entries = Object.entries(fields).map(([name, f]) => {
-    const rendered = isDtoField(f) ? renderField(f, indent, resolver) : renderFieldValue(f, indent, resolver);
-    return `${pad}${name}: ${rendered}`;
-  });
-  return `Type.Object({\n${entries.join(',\n')}\n${'  '.repeat(indent - 1)}})`;
-}
-
-function renderField(f: DtoField, indent: number, resolver: EnumResolver | undefined): string {
-  const base = renderValue(f, indent, resolver);
-  return f.isOptional() ? `Type.Optional(${base})` : base;
-}
-
-function renderValue(f: DtoField, indent: number, resolver: EnumResolver | undefined): string {
-  if (f.field.type === 'array') {
-    const items = f.field.items;
-    // Referenced DTO element — render by name (same-file export), not expanded.
-    if (isDtoMessage(items)) return `Type.Array(${items.name})`;
-    if (isDtoField(items)) return `Type.Array(${renderField(items, indent + 1, resolver)})`;
-    return `Type.Array(${renderFieldValue(items, indent, resolver)})`;
-  }
-  if (f.field.type === 'object') {
-    return renderObject(f.field.properties, indent + 1, resolver);
-  }
-  // DtoField only wraps a database Field; array/object defs live in the subclasses.
-  // Only DTO-level defaults (setDefault) are emitted as TypeBox default
-  // annotations; DB field defaults are not carried into the API contract.
-  return renderBasic(f.field as Field, f.pattern, f.default, resolver, indent);
-}
-
-function collectEnumImports(
-  f: DtoField,
-  resolver: EnumResolver | undefined,
-  out: Map<string, ImportBase>,
-): void {
-  if (f.field.type === 'array') {
-    const items = f.field.items;
-    if (isDtoMessage(items)) return;
-    if (isDtoField(items)) {
-      collectEnumImports(items, resolver, out);
-      return;
-    }
-    collectFieldEnumImports(items, resolver, out);
-    return;
-  }
-  if (f.field.type === 'object') {
-    for (const child of Object.values(f.field.properties)) {
-      if (isDtoField(child)) collectEnumImports(child, resolver, out);
-      else collectFieldEnumImports(child, resolver, out);
-    }
-    return;
-  }
-  if (f.field.type === 'enum') collectEnumRef(f.field, resolver, out);
-}
-
-/** Enum import collection over a plain Field (wire-format nested fields). */
-function collectFieldEnumImports(
-  field: Field,
-  resolver: EnumResolver | undefined,
-  out: Map<string, ImportBase>,
-): void {
-  for (const jsName of collectEnumRefs(field)) {
-    const ref = resolver?.(jsName);
-    if (!ref) throw new Error(`enum ${jsName}: no import ref — pass an EnumResolver`);
-    out.set(`${ref.from}#${ref.name}`, ref);
-  }
-}
-
-function collectEnumRef(field: EnumField, resolver: EnumResolver | undefined, out: Map<string, ImportBase>): void {
-  collectFieldEnumImports(field, resolver, out);
-}
-
-/** Collect all imports needed to render a DTO: include() bases + enum references. */
-export function collectDtoImports(
-  schema: DtoMessage,
-  resolver: EnumResolver | undefined,
-  out: Map<string, ImportBase>,
-): void {
-  for (const base of schema.bases ?? []) out.set(`${base.from}#${base.name}`, base);
-  for (const f of Object.values(schema.fields)) collectEnumImports(f, resolver, out);
-}
-
-/** Render one DTO export (const + type) — no file header, for file-level generation. */
-export function renderDtoExport(schema: DtoMessage, resolver: EnumResolver | undefined): string {
-  const object = renderObject(schema.fields, 1, resolver);
-  const bases = schema.bases ?? [];
-  const body =
-    bases.length > 0
-      ? `Type.Intersect([${bases.map(renderBase).join(', ')}, ${object}])`
-      : object;
-  return `export const ${schema.name} = ${body};`;
-}
-
-/** Render the Static type export for a DTO. */
-export function renderDtoTypeExport(name: string): string {
-  return `export type ${name} = Static<typeof ${name}>;`;
-}
-
-export function renderDtoMessage(
-  schema: DtoMessage,
-  options: { resolver?: EnumResolver; source?: string } = {},
-): string {
-  const { resolver, source } = options;
-  const imports = new Map<string, ImportBase>();
-  collectDtoImports(schema, resolver, imports);
-
-  const header = [
-    '// AUTO-GENERATED by typebox-driver — DO NOT EDIT',
-    ...(source !== undefined ? [`// Source: ${source}`] : []),
-    "import { Type, Static } from '@sinclair/typebox';",
-    ...[...imports.values()].map((r) => `import${r.type ? ' type' : ''} { ${r.name} } from '${r.from}';`),
-  ];
-
-  return [
-    ...header,
-    '',
-    renderDtoExport(schema, resolver),
-    renderDtoTypeExport(schema.name),
-    '',
-  ].join('\n');
-}
-
-function renderBase(base: ImportRef): string {
-  if (base.args === undefined || base.args.length === 0) return base.name;
-  const args = base.args.map((a) => (typeof a === 'string' ? a : a.name));
-  return `${base.name}(${args.join(', ')})`;
+import { DtoArrayField, DtoField, DtoMessage, DtoObjectField, ImportBase, ImportRef, isDtoField, isDtoMessage } from './dto.js';
+import { collectEnumRefs, EnumField, Field } from './dsl.js';
+
+// TypeBox driver: renders a DtoMessage into TypeBox TypeScript source.
+// Shape matches the codegen product consumed by fastify v5 TypeBoxTypeProvider:
+//
+//   export const RegisterUserInput = Type.Object({...});
+//   export type RegisterUserInput = Static<typeof RegisterUserInput>;
+//
+// ENUM fields reference a generated enum (see enum-driver) by its import
+// location — the resolver maps a jsName to its product import.
+// DTO bases (.include()) render as Type.Intersect([...bases, Type.Object({...})]).
+
+export type EnumResolver = (enumName: string) => ImportBase | undefined;
+
+function renderString(s: string): string {
+  return `'${s.replace(/\\/g, '\\\\').replace(/'/g, "\\'")}'`;
+}
+
+function renderDefault(v: unknown): string {
+  if (typeof v === 'string') return renderString(v);
+  return JSON.stringify(v);
+}
+
+/** BaseField-level description: description takes priority over label. */
+function fieldDescription(field: { description?: string; label?: string }): string | undefined {
+  return field.description ?? field.label;
+}
+
+/** DtoField-level description: own description > referenced field description/label. */
+function dtoFieldDescription(f: DtoField): string | undefined {
+  return f.description ?? fieldDescription(f.field);
+}
+
+function renderBasic(
+  field: Field,
+  pattern: string | undefined,
+  defaultValue: unknown,
+  resolver: EnumResolver | undefined,
+  indent = 0,
+  description?: string,
+): string {
+  if (pattern !== undefined && field.type !== 'string') {
+    throw new Error(`pattern is only supported on string fields, got ${field.type} (${field.name})`);
+  }
+  const def = defaultValue !== undefined ? `default: ${renderDefault(defaultValue)}` : undefined;
+  const desc = description !== undefined ? `description: ${renderString(description)}` : undefined;
+  const withOpts = (base: string, opts: string[]): string =>
+    opts.length > 0 ? `${base}({ ${opts.join(', ')} })` : `${base}()`;
+  switch (field.type) {
+    case 'string': {
+      const opts: string[] = [];
+      if (field.minLength !== undefined) opts.push(`minLength: ${field.minLength}`);
+      if (field.maxLength !== undefined) opts.push(`maxLength: ${field.maxLength}`);
+      if (pattern !== undefined) opts.push(`pattern: ${renderString(pattern)}`);
+      if (def !== undefined) opts.push(def);
+      if (desc !== undefined) opts.push(desc);
+      return withOpts('Type.String', opts);
+    }
+    case 'text': {
+      const opts: string[] = [];
+      if (def !== undefined) opts.push(def);
+      if (desc !== undefined) opts.push(desc);
+      return withOpts('Type.String', opts);
+    }
+    case 'integer': {
+      const opts: string[] = [];
+      if (field.min !== undefined) opts.push(`minimum: ${field.min}`);
+      if (field.max !== undefined) opts.push(`maximum: ${field.max}`);
+      if (def !== undefined) opts.push(def);
+      if (desc !== undefined) opts.push(desc);
+      return withOpts('Type.Integer', opts);
+    }
+    case 'bigint':
+    case 'decimal':
+    case 'rate':
+    case 'time':
+    case 'date':
+    case 'datetime': {
+      // Transmitted as string over HTTP: bigint/decimal/rate keep full
+      // precision, date/time serialize to string.
+      const opts: string[] = [];
+      if (def !== undefined) opts.push(def);
+      if (desc !== undefined) opts.push(desc);
+      return withOpts('Type.String', opts);
+    }
+    case 'boolean': {
+      const opts: string[] = [];
+      if (def !== undefined) opts.push(def);
+      if (desc !== undefined) opts.push(desc);
+      return withOpts('Type.Boolean', opts);
+    }
+    case 'json': {
+      const opts: string[] = [];
+      if (def !== undefined) opts.push(def);
+      if (desc !== undefined) opts.push(desc);
+      return withOpts('Type.Unknown', opts);
+    }
+    case 'enum': {
+      const ref = resolver?.(field.enum.jsName);
+      if (!ref) throw new Error(`enum field ${field.name}: no import ref for ${field.enum.jsName} — pass an EnumResolver`);
+      if (def !== undefined) {
+        const member = field.enum.values.find((v) => v.value === defaultValue);
+        if (!member) {
+          throw new Error(
+            `enum field ${field.name}: default ${renderDefault(defaultValue)} is not a member of ${field.enum.jsName}`,
+          );
+        }
+        const opts: string[] = [];
+        if (desc !== undefined) opts.push(desc);
+        return `Type.Enum(${ref.name}, { default: ${ref.name}.${member.symbol}${opts.length > 0 ? `, ${opts.join(', ')}` : ''} })`;
+      }
+      if (desc !== undefined) return `Type.Enum(${ref.name}, { ${desc} })`;
+      return `Type.Enum(${ref.name})`;
+    }
+    case 'aggregate': {
+      // Aggregate query outputs: count/sum(int) are numbers, everything else
+      // arrives as a precision string.
+      const opts: string[] = [];
+      if (desc !== undefined) opts.push(desc);
+      return field.jsType === 'number' ? withOpts('Type.Number', opts) : withOpts('Type.String', opts);
+    }
+    case 'array':
+      return desc !== undefined
+        ? `Type.Array(${renderFieldValue(field.items, indent, resolver)}, { ${desc} })`
+        : `Type.Array(${renderFieldValue(field.items, indent, resolver)})`;
+    case 'object':
+      return renderFieldObject(field.properties, indent + 1, resolver, description);
+    default:
+      // Field union is exhaustive; this branch is unreachable at runtime.
+      throw new Error(`unsupported field type: ${String((field as Field).type)}`);
+  }
+}
+
+/** Render a plain Field value (wire-format nested fields), wrapping optional. */
+function renderFieldValue(field: Field, indent: number, resolver: EnumResolver | undefined): string {
+  const base = renderBasic(field, undefined, undefined, resolver, indent, fieldDescription(field));
+  return field.optional ? `Type.Optional(${base})` : base;
+}
+
+/** Render a plain Field object (wire-format nested object). */
+function renderFieldObject(
+  properties: Record<string, Field>,
+  indent: number,
+  resolver: EnumResolver | undefined,
+  description?: string,
+): string {
+  const pad = '  '.repeat(indent);
+  const entries = Object.entries(properties).map(([name, f]) => `${pad}${name}: ${renderFieldValue(f, indent, resolver)}`);
+  const obj = `Type.Object({\n${entries.join(',\n')}\n${'  '.repeat(indent - 1)}})`;
+  return description !== undefined
+    ? `Type.Object({\n${entries.join(',\n')}\n${'  '.repeat(indent - 1)}}, { description: ${renderString(description)} })`
+    : obj;
+}
+
+function renderObject(
+  fields: Record<string, DtoField | Field>,
+  indent: number,
+  resolver: EnumResolver | undefined,
+  description?: string,
+): string {
+  const pad = '  '.repeat(indent);
+  const entries = Object.entries(fields).map(([name, f]) => {
+    const rendered = isDtoField(f) ? renderField(f, indent, resolver) : renderFieldValue(f, indent, resolver);
+    return `${pad}${name}: ${rendered}`;
+  });
+  const obj = `Type.Object({\n${entries.join(',\n')}\n${'  '.repeat(indent - 1)}})`;
+  return description !== undefined
+    ? `Type.Object({\n${entries.join(',\n')}\n${'  '.repeat(indent - 1)}}, { description: ${renderString(description)} })`
+    : obj;
+}
+
+function renderField(f: DtoField, indent: number, resolver: EnumResolver | undefined): string {
+  const base = renderValue(f, indent, resolver);
+  return f.isOptional() ? `Type.Optional(${base})` : base;
+}
+
+function renderValue(f: DtoField, indent: number, resolver: EnumResolver | undefined): string {
+  if (f.field.type === 'array') {
+    const items = f.field.items;
+    const desc = dtoFieldDescription(f);
+    // Referenced DTO element — render by name (same-file export), not expanded.
+    if (isDtoMessage(items)) {
+      return desc !== undefined
+        ? `Type.Array(${items.name}, { description: ${renderString(desc)} })`
+        : `Type.Array(${items.name})`;
+    }
+    if (isDtoField(items)) {
+      const rendered = `Type.Array(${renderField(items, indent + 1, resolver)})`;
+      return desc !== undefined
+        ? `Type.Array(${renderField(items, indent + 1, resolver)}, { description: ${renderString(desc)} })`
+        : rendered;
+    }
+    const rendered = `Type.Array(${renderFieldValue(items, indent, resolver)})`;
+    return desc !== undefined
+      ? `Type.Array(${renderFieldValue(items, indent, resolver)}, { description: ${renderString(desc)} })`
+      : rendered;
+  }
+  if (f.field.type === 'object') {
+    return renderObject(f.field.properties, indent + 1, resolver, dtoFieldDescription(f));
+  }
+  // DtoField only wraps a database Field; array/object defs live in the subclasses.
+  // Only DTO-level defaults (setDefault) are emitted as TypeBox default
+  // annotations; DB field defaults are not carried into the API contract.
+  return renderBasic(f.field as Field, f.pattern, f.default, resolver, indent, dtoFieldDescription(f));
+}
+
+function collectEnumImports(
+  f: DtoField,
+  resolver: EnumResolver | undefined,
+  out: Map<string, ImportBase>,
+): void {
+  if (f.field.type === 'array') {
+    const items = f.field.items;
+    if (isDtoMessage(items)) return;
+    if (isDtoField(items)) {
+      collectEnumImports(items, resolver, out);
+      return;
+    }
+    collectFieldEnumImports(items, resolver, out);
+    return;
+  }
+  if (f.field.type === 'object') {
+    for (const child of Object.values(f.field.properties)) {
+      if (isDtoField(child)) collectEnumImports(child, resolver, out);
+      else collectFieldEnumImports(child, resolver, out);
+    }
+    return;
+  }
+  if (f.field.type === 'enum') collectEnumRef(f.field, resolver, out);
+}
+
+/** Enum import collection over a plain Field (wire-format nested fields). */
+function collectFieldEnumImports(
+  field: Field,
+  resolver: EnumResolver | undefined,
+  out: Map<string, ImportBase>,
+): void {
+  for (const jsName of collectEnumRefs(field)) {
+    const ref = resolver?.(jsName);
+    if (!ref) throw new Error(`enum ${jsName}: no import ref — pass an EnumResolver`);
+    out.set(`${ref.from}#${ref.name}`, ref);
+  }
+}
+
+function collectEnumRef(field: EnumField, resolver: EnumResolver | undefined, out: Map<string, ImportBase>): void {
+  collectFieldEnumImports(field, resolver, out);
+}
+
+/** Collect all imports needed to render a DTO: include() bases + enum references. */
+export function collectDtoImports(
+  schema: DtoMessage,
+  resolver: EnumResolver | undefined,
+  out: Map<string, ImportBase>,
+): void {
+  for (const base of schema.bases ?? []) out.set(`${base.from}#${base.name}`, base);
+  for (const f of Object.values(schema.fields)) collectEnumImports(f, resolver, out);
+}
+
+/** Render one DTO export (const + type) — no file header, for file-level generation. */
+export function renderDtoExport(schema: DtoMessage, resolver: EnumResolver | undefined): string {
+  const object = renderObject(schema.fields, 1, resolver, schema.description);
+  const bases = schema.bases ?? [];
+  const body =
+    bases.length > 0
+      ? `Type.Intersect([${bases.map(renderBase).join(', ')}, ${object}])`
+      : object;
+  return `export const ${schema.name} = ${body};`;
+}
+
+/** Render the Static type export for a DTO. */
+export function renderDtoTypeExport(name: string): string {
+  return `export type ${name} = Static<typeof ${name}>;`;
+}
+
+export function renderDtoMessage(
+  schema: DtoMessage,
+  options: { resolver?: EnumResolver; source?: string } = {},
+): string {
+  const { resolver, source } = options;
+  const imports = new Map<string, ImportBase>();
+  collectDtoImports(schema, resolver, imports);
+
+  const header = [
+    '// AUTO-GENERATED by typebox-driver — DO NOT EDIT',
+    ...(source !== undefined ? [`// Source: ${source}`] : []),
+    "import { Type, Static } from '@sinclair/typebox';",
+    ...[...imports.values()].map((r) => `import${r.type ? ' type' : ''} { ${r.name} } from '${r.from}';`),
+  ];
+
+  return [
+    ...header,
+    '',
+    renderDtoExport(schema, resolver),
+    renderDtoTypeExport(schema.name),
+    '',
+  ].join('\n');
+}
+
+function renderBase(base: ImportRef): string {
+  if (base.args === undefined || base.args.length === 0) return base.name;
+  const args = base.args.map((a) => (typeof a === 'string' ? a : a.name));
+  return `${base.name}(${args.join(', ')})`;
 }