@pylonts/dsl 1.1.5 → 1.1.11

package/src/typebox-driver.ts

@@ -1,5 +1,6 @@
 import { DtoArrayField, DtoField, DtoMessage, DtoObjectField, ImportBase, ImportRef } from './dto.js';
-import { Field } from './dsl.js';
+import { EnumField, Field } from './dsl.js';
+import type { ThirdMethodSchema } from './third-service.js';
 
 // TypeBox driver: renders a DtoMessage into TypeBox TypeScript source.
 // Shape matches the codegen product consumed by fastify v5 TypeBoxTypeProvider:
@@ -27,6 +28,7 @@ function renderBasic(
   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})`);
@@ -77,15 +79,39 @@ function renderBasic(
       }
       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)}`);
   }
 }
 
-function renderObject(fields: Record<string, DtoField>, indent: number, resolver: EnumResolver | undefined): string {
+/** 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]) => `${pad}${name}: ${renderField(f, indent, resolver)}`);
+  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)}})`;
 }
 
@@ -99,7 +125,8 @@ function renderValue(f: DtoField, indent: number, resolver: EnumResolver | undef
     const items = f.field.items;
     // Referenced DTO element — render by name (same-file export), not expanded.
     if (isDtoMessage(items)) return `Type.Array(${items.name})`;
-    return `Type.Array(${renderField(items, indent + 1, resolver)})`;
+    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);
@@ -107,7 +134,7 @@ function renderValue(f: DtoField, indent: number, resolver: EnumResolver | undef
   // 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);
+  return renderBasic(f.field as Field, f.pattern, f.default, resolver, indent);
 }
 
 /** Structural check — DtoMessage instances may come from a different module copy, so instanceof is unreliable. */
@@ -116,6 +143,12 @@ function isDtoMessage(v: unknown): v is DtoMessage {
   return (v as Record<string, unknown>).type === 'dto';
 }
 
+/** Structural check — a DtoField wraps a Field in a .field property and has no .type of its own. */
+function isDtoField(v: unknown): v is DtoField {
+  if (typeof v !== 'object' || v === null) return false;
+  return 'field' in v && !('type' in v);
+}
+
 function collectEnumImports(
   f: DtoField,
   resolver: EnumResolver | undefined,
@@ -123,18 +156,45 @@ function collectEnumImports(
 ): void {
   if (f.field.type === 'array') {
     const items = f.field.items;
-    if (!isDtoMessage(items)) collectEnumImports(items, resolver, out);
+    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)) collectEnumImports(child, resolver, out);
+    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') {
-    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);
+  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 {
+  if (field.type === 'array') {
+    collectFieldEnumImports(field.items, resolver, out);
+    return;
   }
+  if (field.type === 'object') {
+    for (const child of Object.values(field.properties)) collectFieldEnumImports(child, resolver, out);
+    return;
+  }
+  if (field.type === 'enum') collectEnumRef(field, resolver, out);
+}
+
+function collectEnumRef(field: EnumField, resolver: EnumResolver | undefined, out: Map<string, ImportBase>): void {
+  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`);
+  out.set(`${ref.from}#${ref.name}`, ref);
 }
 
 /** Collect all imports needed to render a DTO: include() bases + enum references. */
@@ -191,4 +251,19 @@ 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(', ')})`;
+}
+
+/** Render one third-party method message export (const only — pair with
+ *  renderDtoTypeExport for the Static type). */
+export function renderThirdMethodExport(schema: ThirdMethodSchema, resolver: EnumResolver | undefined): string {
+  return `export const ${schema.name} = ${renderFieldObject(schema.fields, 1, resolver)};`;
+}
+
+/** Collect all imports needed to render a third-party method message: enum references. */
+export function collectThirdMethodImports(
+  schema: ThirdMethodSchema,
+  resolver: EnumResolver | undefined,
+  out: Map<string, ImportBase>,
+): void {
+  for (const f of Object.values(schema.fields)) collectFieldEnumImports(f, resolver, out);
 }

package/src/utils.ts

@@ -1,27 +1,75 @@
-// ── 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());
-}
-
-/** snake_case → PascalCase: mer_id → MerId */
-export function toPascalCase(snake: string): string {
-  return snake.replace(/(^|_)([a-z])/g, (_m, _p, c: string) => c.toUpperCase());
-}
-
-// ── schema ──
-
-import { SchemaBase } from './dsl.js';
-import { FrontAppSchema } from './project.js';
-
-/** A utility module bound to exactly one frontend app. */
-export interface UtilsSchema extends SchemaBase {
-  type: 'utils';
-  /** The frontend app this utility module belongs to (shared instance from project.config). */
-  app: FrontAppSchema;
-}
-
-export function defineUtils(name: string, app: FrontAppSchema, description?: string): UtilsSchema {
-  return { name, type: 'utils', app, description };
+import type { Field, SchemaBase } from './dsl.js';
+import type { FrontAppSchema, ProjectApiSchema } from './project.js';
+
+// Base utility modules — business-agnostic helpers with full method
+// signatures (e.g. DateTimeUtils.format). Called at the service layer;
+// their args/results are own wire types, independent of business schemas.
+
+/** A utility method with a full signature. */
+export interface UtilsMethodSchema extends SchemaBase {
+  type: 'utilsMethod';
+  /** The utility module this method belongs to. */
+  schema: UtilsSchema;
+  /** Input fields. */
+  args: Record<string, Field>;
+  /** Output field. */
+  result: Field;
+}
+
+/** Method input for defineUtils: type/schema/name are set by the builder. */
+export type UtilsMethodDef = Omit<UtilsMethodSchema, 'type' | 'schema' | 'name'>;
+
+/** A base utility module (e.g. DateTimeUtils). */
+export interface UtilsSchema extends SchemaBase {
+  type: 'utils';
+  /** Backend binding — the api module this utils belongs to (shared instance
+   *  from project.config.ts apis). With `app` it serves that frontend
+   *  ({api}/{app}/utils/); alone it is the api's public module
+   *  ({api}/common/utils/). Unset = not backend-side. */
+  api?: ProjectApiSchema;
+  /** Optional binding — the frontend app this utils serves (shared instance
+   *  from project.config.ts apps). Empty means a shared public module. */
+  app?: FrontAppSchema;
+  /** Methods keyed by name — the map key is written back as the method name. */
+  methods: Record<string, UtilsMethodSchema>;
+}
+
+export function defineUtils(options: {
+  name: string;
+  api?: ProjectApiSchema;
+  app?: FrontAppSchema;
+  methods: Record<string, UtilsMethodDef>;
+  description?: string;
+}): UtilsSchema {
+  if (options.api !== undefined && options.app !== undefined && !options.api.apps.includes(options.app)) {
+    throw new Error(`utils ${options.name}: api '${options.api.name}' does not serve app '${options.app.name}'`);
+  }
+  const schema: UtilsSchema = {
+    type: 'utils',
+    name: options.name,
+    description: options.description,
+    api: options.api,
+    app: options.app,
+    methods: {},
+  };
+  for (const key of Object.keys(options.methods)) {
+    const method = options.methods[key] as UtilsMethodDef;
+    const methodSchema: UtilsMethodSchema = {
+      type: 'utilsMethod',
+      name: key,
+      description: method.description,
+      schema,
+      args: method.args,
+      result: method.result,
+    };
+    for (const argKey of Object.keys(methodSchema.args)) {
+      const field = methodSchema.args[argKey] as Field;
+      field.name = argKey;
+      field.schema = methodSchema;
+    }
+    methodSchema.result.name = key;
+    methodSchema.result.schema = methodSchema;
+    schema.methods[key] = methodSchema;
+  }
+  return schema;
 }

package/dist/check-inheritance.d.ts

@@ -1,9 +0,0 @@
-export interface InheritanceIssue {
-    file: string;
-    container: string;
-    field: string;
-    /** e.g. ["t_order.order_no"] or ["t_order.id", "t_merchant.id"] when several inferred tables share the name */
-    candidates: string[];
-}
-/** Check one loaded DSL module (its exports) for inheritance gaps. */
-export declare function checkInheritance(mod: Record<string, unknown>, file: string): InheritanceIssue[];

package/dist/check-inheritance.js

@@ -1,58 +0,0 @@
-/** snake_case → camelCase: order_no → orderNo; names without underscores are unchanged */
-function toCamelCase(name) {
-    return name.replace(/_([a-z])/g, (_, c) => c.toUpperCase());
-}
-function isDtoMessage(v) {
-    if (typeof v !== 'object' || v === null)
-        return false;
-    const o = v;
-    return o.type === 'dto' && typeof o.name === 'string' && typeof o.fields === 'object' && o.fields !== null;
-}
-function collectFields(mod) {
-    const out = [];
-    for (const [name, v] of Object.entries(mod)) {
-        if (isDtoMessage(v)) {
-            const container = v;
-            for (const [fname, f] of Object.entries(container.fields)) {
-                out.push({ name: fname, field: f.field, container: name });
-            }
-        }
-    }
-    return out;
-}
-/** Check one loaded DSL module (its exports) for inheritance gaps. */
-export function checkInheritance(mod, file) {
-    const fields = collectFields(mod);
-    if (fields.length === 0)
-        return [];
-    // Infer the tables this file is about from the referenced fields' schema identity.
-    const tables = new Map(); // table -> camelCol -> origCol
-    for (const f of fields) {
-        const schema = f.field.schema;
-        if (schema?.type !== 'table')
-            continue;
-        const table = schema;
-        if (!tables.has(table.name))
-            tables.set(table.name, new Map());
-        tables.get(table.name).set(toCamelCase(f.name), f.name);
-    }
-    if (tables.size === 0)
-        return [];
-    const issues = [];
-    for (const f of fields) {
-        if (f.field.schema?.type === 'table')
-            continue;
-        if (f.field.semantic !== undefined || f.field.type === 'enum')
-            continue;
-        const candidates = [];
-        for (const [t, cols] of tables) {
-            const orig = cols.get(f.name);
-            if (orig !== undefined)
-                candidates.push(`${t}.${orig}`);
-        }
-        if (candidates.length > 0) {
-            issues.push({ file, container: f.container, field: f.name, candidates });
-        }
-    }
-    return issues;
-}

package/src/provider.ts

@@ -1,73 +0,0 @@
-import type { ImportBase } from './import-base.js';
-import type { ImportableSchemaBase } from './dsl.js';
-import type { DtoField, DtoMessage, DtoArrayField, DtoObjectField } from './dto.js';
-import type { ActionSchema } from './action.js';
-import type { RefSchema } from './ref.js';
-import type { ConvertSchema } from './convert.js';
-
-// ProviderSchema: an API function signature (args DTO + results DTO).
-
-/** Parameter data source for a call argument. */
-export type DataRef =
-  | { type: 'route'; key: string }
-  | { type: 'data';  key: string }
-  | { type: 'value'; value: unknown };
-
-/** Create a route-parameter reference. */
-export function route(key: string): DataRef {
-  return { type: 'route', key };
-}
-
-/** Create a page-data reference. */
-export function data(key: string): DataRef {
-  return { type: 'data', key };
-}
-
-export interface CallAction extends ActionSchema {
-  type: 'call';
-  func: ProviderSchema;
-  args?: Record<string, DtoField | DtoMessage | DtoArrayField | DtoObjectField | RefSchema | string>;
-}
-
-
-export function call(func: ProviderSchema, args?: Record<string, DtoField | DtoMessage | DtoArrayField | DtoObjectField | RefSchema | string>): CallAction {
-  return { name: func.name, type: 'call', func, args };
-}
-
-/** Provider function signature. The generated API client exposes one function
- *  per endpoint; ProviderSchema gives that function a name and types. */
-export interface ProviderSchema extends ImportableSchemaBase {
-  isAsync: boolean;
-  /** Input DTO (buildInput / buildQuery / buildPk result). */
-  args: DtoMessage;
-  /** Output DTO (buildOutput result) or primitive. */
-  results: DtoMessage | number | boolean | string;
-}
-
-/** Define a provider function. */
-export function defineProvider(
-  name: string,
-  schema: {
-    isAsync: boolean;
-    args: DtoMessage;
-    results: DtoMessage | number | boolean | string;
-    description?: string;
-    importRef?: ImportBase;
-  },
-): ProviderSchema {
-  return { name, ...schema };
-}
-
-/** Assign a call's result to a page data field.
- *  React: setState({ [field]: await ... }). Mini-program: this.setData({ [field]: ... }). */
-export interface SetDataAction extends ActionSchema {
-  type: 'setData';
-  call: CallAction;
-  field: DtoField;
-  /** Optional field-level transform before assignment. */
-  convert?: ConvertSchema;
-}
-
-export function setData(call: CallAction, field: DtoField, convert?: ConvertSchema): SetDataAction {
-  return { name: 'setData', type: 'setData', call, field, convert };
-}