@pylonts/dsl 1.0.3 → 1.0.5

package/src/index.ts

@@ -1,11 +1,14 @@
 export * from './dsl';
 export * from './dto';
+export * from './bases';
+export * from './utils';
 export * from './project';
 export * from './prototype';
 export * from './dictionary';
 export * from './mysql-driver';
 export * from './enum-driver';
 export * from './typebox-driver';
+export * from './check-inheritance';
 export * from './pattern';
 export * from './patterns/retry';
 export * from './flow';

package/src/mermaid-driver.ts

@@ -53,9 +53,12 @@ export function renderPageFlowMermaid(schema: PageFlow): string {
 
   const byApp = new Map<string, Page[]>();
   for (const p of schema.pages) {
-    const list = byApp.get(p.app.name) ?? [];
-    list.push(p);
-    byApp.set(p.app.name, list);
+    const list = byApp.get(p.app.name);
+    if (!list) {
+      byApp.set(p.app.name, [p]);
+    } else {
+      list.push(p);
+    }
   }
 
   let appIdx = 0;

package/src/typebox-driver.ts

@@ -1,141 +1,184 @@
-import { DtoArrayField, DtoField, DtoMessage, DtoObjectField, ImportRef } from './dto';
-import { Field } from './dsl';
-
-// 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) => ImportRef | undefined;
-
-function renderString(s: string): string {
-  return `'${s.replace(/\\/g, '\\\\').replace(/'/g, "\\'")}'`;
-}
-
-function renderBasic(field: Field, pattern: string | undefined, resolver: EnumResolver | undefined): string {
-  if (pattern !== undefined && field.type !== 'string') {
-    throw new Error(`pattern is only supported on string fields, got ${field.type} (${field.name})`);
-  }
-  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)}`);
-      return opts.length > 0 ? `Type.String({ ${opts.join(', ')} })` : 'Type.String()';
-    }
-    case 'text':
-      return '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}`);
-      return opts.length > 0 ? `Type.Integer({ ${opts.join(', ')} })` : 'Type.Integer()';
-    }
-    case 'bigint':
-    case 'decimal':
-    case 'time':
-    case 'date':
-    case 'datetime':
-      // Transmitted as string over HTTP: bigint/decimal keep full precision,
-      // date/time serialize to string.
-      return 'Type.String()';
-    case 'boolean':
-      return 'Type.Boolean()';
-    case 'json':
-      return '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`);
-      return `Type.Enum(${ref.name})`;
-    }
-    default:
-      // Field union is exhaustive; this branch is unreachable at runtime.
-      throw new Error(`unsupported field type: ${String((field as Field).type)}`);
-  }
-}
-
-function renderObject(fields: Record<string, DtoField>, indent: number, resolver: EnumResolver | undefined): string {
-  const pad = '  '.repeat(indent);
-  const entries = Object.entries(fields).map(([name, f]) => `${pad}${name}: ${renderField(f, indent, resolver)}`);
-  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 instanceof DtoArrayField) {
-    return `Type.Array(${renderField(f.items(), indent + 1, resolver)})`;
-  }
-  if (f instanceof DtoObjectField) {
-    return renderObject(f.properties(), indent + 1, resolver);
-  }
-  // DtoField only wraps a database Field; array/object defs live in the subclasses.
-  return renderBasic(f.field as Field, f.pattern, resolver);
-}
-
-function collectEnumImports(
-  f: DtoField,
-  resolver: EnumResolver | undefined,
-  out: Map<string, ImportRef>,
-): void {
-  if (f instanceof DtoArrayField) {
-    collectEnumImports(f.items(), resolver, out);
-    return;
-  }
-  if (f instanceof DtoObjectField) {
-    for (const child of Object.values(f.properties())) collectEnumImports(child, resolver, out);
-    return;
-  }
-  if (f.field.type === 'enum') {
-    const ref = resolver?.(f.field.enum.jsName);
-    if (!ref) throw new Error(`enum field ${f.field.name}: no import ref for ${f.field.enum.jsName} — pass an EnumResolver`);
-    out.set(`${ref.from}#${ref.name}`, ref);
-  }
-}
-
-export function renderDtoMessage(
-  schema: DtoMessage,
-  options: { resolver?: EnumResolver; source?: string } = {},
-): string {
-  const { resolver, source } = options;
-  const imports = new Map<string, ImportRef>();
-  for (const base of schema.bases ?? []) imports.set(`${base.from}#${base.name}`, base);
-  for (const f of Object.values(schema.fields)) collectEnumImports(f, 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.name} } from '${r.from}';`),
-  ];
-
-  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 [
-    ...header,
-    '',
-    `export const ${schema.name} = ${body};`,
-    `export type ${schema.name} = Static<typeof ${schema.name}>;`,
-    '',
-  ].join('\n');
-}
-
-function renderBase(base: ImportRef): string {
-  return base.args !== undefined && base.args.length > 0
-    ? `${base.name}(${base.args.join(', ')})`
-    : base.name;
+import { DtoArrayField, DtoField, DtoMessage, DtoObjectField, ImportRef } from './dto';
+import { Field } from './dsl';
+
+// 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) => ImportRef | 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,
+): 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 'time':
+    case 'date':
+    case 'datetime':
+      // Transmitted as string over HTTP: bigint/decimal 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})`;
+    }
+    default:
+      // Field union is exhaustive; this branch is unreachable at runtime.
+      throw new Error(`unsupported field type: ${String((field as Field).type)}`);
+  }
+}
+
+function renderObject(fields: Record<string, DtoField>, indent: number, resolver: EnumResolver | undefined): string {
+  const pad = '  '.repeat(indent);
+  const entries = Object.entries(fields).map(([name, f]) => `${pad}${name}: ${renderField(f, indent, resolver)}`);
+  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 instanceof DtoArrayField) {
+    return `Type.Array(${renderField(f.items(), indent + 1, resolver)})`;
+  }
+  if (f instanceof DtoObjectField) {
+    return renderObject(f.properties(), indent + 1, resolver);
+  }
+  // DtoField only wraps a database Field; array/object defs live in the subclasses.
+  // DTO-level default wins over the DB field default; the DB default (string)
+  // is used as a fallback so from() picks carry it into the API contract.
+  const defaultValue = f.default !== undefined ? f.default : f.field.default;
+  return renderBasic(f.field as Field, f.pattern, defaultValue, resolver);
+}
+
+function collectEnumImports(
+  f: DtoField,
+  resolver: EnumResolver | undefined,
+  out: Map<string, ImportRef>,
+): void {
+  if (f instanceof DtoArrayField) {
+    collectEnumImports(f.items(), resolver, out);
+    return;
+  }
+  if (f instanceof DtoObjectField) {
+    for (const child of Object.values(f.properties())) collectEnumImports(child, resolver, out);
+    return;
+  }
+  if (f.field.type === 'enum') {
+    const ref = resolver?.(f.field.enum.jsName);
+    if (!ref) throw new Error(`enum field ${f.field.name}: no import ref for ${f.field.enum.jsName} — pass an EnumResolver`);
+    out.set(`${ref.from}#${ref.name}`, ref);
+  }
+}
+
+/** Collect all imports needed to render a DTO: include() bases + enum references. */
+export function collectDtoImports(
+  schema: DtoMessage,
+  resolver: EnumResolver | undefined,
+  out: Map<string, ImportRef>,
+): 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, ImportRef>();
+  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.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(', ')})`;
 }

package/src/utils.ts

@@ -0,0 +1,6 @@
+// ── naming conversions ──
+
+/** snake_case → camelCase: mer_id → merId; names without underscores are unchanged */
+export function toCamelCase(name: string): string {
+  return name.replace(/_([a-z])/g, (_, c: string) => c.toUpperCase());
+}