bonescript-compiler 0.3.0 → 0.4.0

package/src/emit_composition.ts

@@ -57,7 +57,30 @@ export function emitPipelineBody(method: IR.IRMethod, indent: string = "    "):
     } else if (p.on_error.action === "ignore") {
       lines.push(`${indent}  // on_error: ignore — log only`);
     } else if (p.on_error.action === "retry") {
-      lines.push(`${indent}  // on_error: retry not yet supported in inline emission`);
+      // on_error: retry — re-run the entire pipeline with exponential backoff.
+      // Wraps the pipeline steps in a retry loop. The outer try/catch feeds __err here.
+      lines.push(`${indent}  // on_error: retry with exponential backoff`);
+      lines.push(`${indent}  const __maxAttempts = ${method.retry?.max_attempts ?? 3};`);
+      lines.push(`${indent}  const __backoffMs = ${method.retry?.interval_ms ?? 1000};`);
+      lines.push(`${indent}  let __lastErr = __err;`);
+      lines.push(`${indent}  for (let __attempt = 1; __attempt <= __maxAttempts; __attempt++) {`);
+      lines.push(`${indent}    await new Promise(r => setTimeout(r, __backoffMs * Math.pow(2, __attempt - 1)));`);
+      lines.push(`${indent}    try {`);
+      // Re-emit all pipeline steps inside the retry loop
+      for (const step of p.steps) {
+        const callExpr = generateStepCall(step);
+        if (step.bind_as) {
+          lines.push(`${indent}      __pipeline_results["${step.bind_as}"] = await ${callExpr};`);
+        } else {
+          lines.push(`${indent}      await ${callExpr};`);
+        }
+      }
+      lines.push(`${indent}      return { ok: true, value: __pipeline_results } as any; // retry succeeded`);
+      lines.push(`${indent}    } catch (__retryErr: any) {`);
+      lines.push(`${indent}      __lastErr = __retryErr;`);
+      lines.push(`${indent}    }`);
+      lines.push(`${indent}  }`);
+      lines.push(`${indent}  return { ok: false, error: { code: "PIPELINE_RETRY_EXHAUSTED", message: __lastErr.message, attempts: __maxAttempts } } as any;`);
     }
   } else {
     // Default: rollback on error
@@ -100,9 +123,19 @@ function emitParallelPipeline(method: IR.IRMethod, indent: string): string {
 }
 
 function generateStepCall(step: IR.IRPipelineStep): string {
-  // Replace any args that reference previous bindings with __pipeline_results
+  // Substitute any arg that references a previous step's bind_as result
+  // e.g. if a prior step bound its result as "payment", an arg of "payment"
+  // becomes __pipeline_results["payment"]
   const args = step.call_args.map(arg => {
-    // If arg looks like an identifier path, check if it might be a binding ref
+    // Simple identifier that looks like a binding reference
+    if (/^\w+$/.test(arg.trim())) {
+      return `(__pipeline_results["${arg.trim()}"] ?? ${arg.trim()})`;
+    }
+    // Dotted path like "payment.id" — resolve the root from pipeline results
+    const dotMatch = arg.trim().match(/^(\w+)(\..+)$/);
+    if (dotMatch) {
+      return `(__pipeline_results["${dotMatch[1]}"] as any)${dotMatch[2]} ?? undefined`;
+    }
     return arg;
   });
   return `${step.call_name}(${args.join(", ")})`;

package/src/emit_events.ts

@@ -305,3 +305,73 @@ export const eventBus = {
 };
 `;
 }
+
+// ─── Typed Event Publishers ───────────────────────────────────────────────────
+// Generates per-event emitXxx() typed publisher functions as specified in
+// spec/09_CODEGEN.md §5.4. These wrap eventBus.publish with a typed payload
+// interface so callers get compile-time safety instead of raw Record<string,unknown>.
+
+const TS_TYPE_MAP: Record<string, string> = {
+  string: "string", uint: "number", int: "number", float: "number",
+  bool: "boolean", timestamp: "Date", uuid: "string", bytes: "Buffer", json: "unknown",
+};
+
+function toTsType(irType: string): string {
+  if (TS_TYPE_MAP[irType]) return TS_TYPE_MAP[irType];
+  const listMatch = irType.match(/^list<(.+)>$/);
+  if (listMatch) return `${toTsType(listMatch[1])}[]`;
+  const setMatch = irType.match(/^set<(.+)>$/);
+  if (setMatch) return `${toTsType(setMatch[1])}[]`;
+  const optMatch = irType.match(/^optional<(.+)>$/);
+  if (optMatch) return `${toTsType(optMatch[1])} | null`;
+  return irType;
+}
+
+export function emitTypedEventPublishers(system: IR.IRSystem): string {
+  if (system.events.length === 0) return "";
+
+  const lines: string[] = [];
+  lines.push(`// Generated by BoneScript compiler. DO NOT EDIT.`);
+  lines.push(`// Typed event publisher functions — one per declared event.`);
+  lines.push(`// Import these instead of calling eventBus.publish() directly.`);
+  lines.push(``);
+  lines.push(`import { eventBus } from "./events";`);
+  lines.push(`import type { PoolClient } from "pg";`);
+  lines.push(``);
+
+  for (const ev of system.events) {
+    const ifaceName = `${ev.name}Payload`;
+
+    // Payload interface
+    lines.push(`export interface ${ifaceName} {`);
+    for (const field of ev.payload) {
+      const nullable = field.nullable ? " | null" : "";
+      lines.push(`  ${field.name}: ${toTsType(field.type)}${nullable};`);
+    }
+    lines.push(`}`);
+    lines.push(``);
+
+    // Publisher function
+    const sourceId = ev.source && ev.source !== "unknown" ? ev.source : system.name;
+    lines.push(`/**`);
+    lines.push(` * Publish a ${ev.name} event.`);
+    lines.push(` * Delivery: ${ev.delivery}${ev.ttl_ms ? ` | TTL: ${ev.ttl_ms}ms` : ""}`);
+    lines.push(` */`);
+    lines.push(`export async function emit${ev.name}(`);
+    lines.push(`  payload: ${ifaceName},`);
+    lines.push(`  correlationId?: string,`);
+    lines.push(`  client?: PoolClient,`);
+    lines.push(`): Promise<void> {`);
+    lines.push(`  await eventBus.publish(`);
+    lines.push(`    "${ev.name}",`);
+    lines.push(`    payload as unknown as Record<string, unknown>,`);
+    lines.push(`    "${sourceId}",`);
+    lines.push(`    correlationId,`);
+    lines.push(`    client,`);
+    lines.push(`  );`);
+    lines.push(`}`);
+    lines.push(``);
+  }
+
+  return lines.join("\n");
+}

package/src/emit_full.ts

@@ -27,11 +27,13 @@ import { emitFlowRuntime } from "./emit_extras";
 import { emitAlgorithmsFile, collectUsedAlgorithms } from "./emit_composition";
 import { emitExtensionPointStub } from "./extension_manager";
 import * as AST from "./ast";
-import { emitDurableEventBus, emitOutboxSchema } from "./emit_events";
+import { emitDurableEventBus, emitOutboxSchema, emitTypedEventPublishers } from "./emit_events";
 import { emitBatchExecutor } from "./emit_batch";
 import { emitSourceMapFile, emitDebugHandler } from "./emit_sourcemap";
 import { emitTestSuite } from "./emit_tests";
 import { emitDockerfile, emitDockerignore, emitK8sDeployment, emitGithubActions } from "./emit_deploy";
+import { emitModelFile, emitModelsIndex } from "./emit_models";
+import { emitOpenApiSchema } from "./emit_openapi";
 
 function toSnakeCase(s: string): string {
   return s.replace(/([a-z])([A-Z])/g, "$1_$2").toLowerCase();
@@ -54,6 +56,10 @@ export class FullEmitter {
     files.push({ path: "src/events.ts", content: emitDurableEventBus(system), language: "typescript", source_module: "infra" });
     // Outbox SQL schema
     files.push({ path: "migrations/event_outbox.sql", content: emitOutboxSchema(), language: "sql", source_module: "infra" });
+    // Typed event publisher functions (one per declared event)
+    if (system.events.length > 0) {
+      files.push({ path: "src/publishers.ts", content: emitTypedEventPublishers(system), language: "typescript", source_module: "infra" });
+    }
     files.push({ path: "src/auth.ts", content: emitAuthMiddleware(system), language: "typescript", source_module: "infra" });
     files.push({ path: "src/logger.ts", content: emitLogger(system), language: "typescript", source_module: "infra" });
     files.push({ path: "src/metrics.ts", content: emitMetrics(), language: "typescript", source_module: "infra" });
@@ -156,6 +162,29 @@ export class FullEmitter {
     // 5. Source: main entry point
     files.push({ path: "src/index.ts", content: emitIndex(system), language: "typescript", source_module: "root" });
 
+    // 5a. Model interfaces, schemas, and validators (one file per model)
+    const modelFiles: string[] = [];
+    for (const mod of system.modules) {
+      for (const model of mod.models) {
+        const modelPath = `src/models/${toSnakeCase(model.name)}.ts`;
+        files.push({
+          path: modelPath,
+          content: emitModelFile(model, mod, system),
+          language: "typescript",
+          source_module: mod.id,
+        });
+        modelFiles.push(modelPath);
+      }
+    }
+    if (modelFiles.length > 0) {
+      files.push({
+        path: "src/models/index.ts",
+        content: emitModelsIndex(system),
+        language: "typescript",
+        source_module: "shared",
+      });
+    }
+
     // 6. SQL migrations — run schema emitter ONCE, then match by model name
     const schemas: string[] = [];
     const allSchemaFiles = this.schemaEmitter.emit(system);
@@ -180,6 +209,12 @@ export class FullEmitter {
     // 9. README
     files.push({ path: "README.md", content: this.emitReadme(system), language: "yaml", source_module: "root" });
 
+    // 9a. OpenAPI schema (spec/09_CODEGEN.md §2 — ApiService secondary target)
+    const openApiContent = emitOpenApiSchema(system);
+    if (openApiContent) {
+      files.push({ path: "openapi.json", content: openApiContent, language: "json", source_module: "root" });
+    }
+
     // 10. Source map + debug handler
     files.push({ path: `${system.name}.bone.map`, content: emitSourceMapFile(system, `${system.name}.bone`), language: "json", source_module: "root" });
     files.push({ path: "src/debug.ts", content: emitDebugHandler(system), language: "typescript", source_module: "infra" });

package/src/emit_models.ts

@@ -0,0 +1,176 @@
+/**
+ * BoneScript Model Emitter
+ * Generates per-model TypeScript artifacts as specified in spec/09_CODEGEN.md §5.1:
+ *   - XxxInterface  — typed interface
+ *   - XxxSchema     — const with field metadata (type, nullable, unique, indexed)
+ *   - validateXxx() — runtime validation function derived from IR constraints
+ *
+ * These are emitted to src/models/<entity_name>.ts
+ */
+
+import * as IR from "./ir";
+import { toTsType, toSnakeCase } from "./emit_router";
+
+// ─── Per-model file ───────────────────────────────────────────────────────────
+
+export function emitModelFile(model: IR.IRModel, mod: IR.IRModule, system: IR.IRSystem): string {
+  const lines: string[] = [];
+  lines.push(`// Generated by BoneScript compiler. DO NOT EDIT.`);
+  lines.push(`// Source hash: ${system.source_hash}`);
+  lines.push(`// Module: ${mod.name}`);
+  lines.push(``);
+
+  // ── Interface ──────────────────────────────────────────────────────────────
+  lines.push(`export interface ${model.name} {`);
+  for (const field of model.fields) {
+    // Skip generated-always fields (derived columns)
+    if (field.default_value?.startsWith("GENERATED ALWAYS")) continue;
+    const nullable = field.nullable ? " | null" : "";
+    lines.push(`  ${field.name}: ${toTsType(field.type)}${nullable};`);
+  }
+  lines.push(`}`);
+  lines.push(``);
+
+  // ── Schema const ───────────────────────────────────────────────────────────
+  lines.push(`export const ${model.name}Schema = {`);
+  for (const field of model.fields) {
+    if (field.default_value?.startsWith("GENERATED ALWAYS")) continue;
+    const meta: string[] = [
+      `type: ${JSON.stringify(field.type)}`,
+      `nullable: ${field.nullable}`,
+      `unique: ${field.unique}`,
+      `indexed: ${field.indexed}`,
+    ];
+    if (field.default_value && !field.default_value.startsWith("GENERATED")) {
+      meta.push(`default: ${JSON.stringify(field.default_value)}`);
+    }
+    lines.push(`  ${field.name}: { ${meta.join(", ")} },`);
+  }
+  lines.push(`} as const;`);
+  lines.push(``);
+
+  // ── Input type (omits server-set fields) ──────────────────────────────────
+  const inputFields = model.fields.filter(f =>
+    !["id", "created_at", "updated_at"].includes(f.name) &&
+    !f.default_value?.startsWith("GENERATED ALWAYS")
+  );
+  lines.push(`export interface Create${model.name}Input {`);
+  for (const field of inputFields) {
+    const nullable = field.nullable ? "?" : "";
+    lines.push(`  ${field.name}${nullable}: ${toTsType(field.type)};`);
+  }
+  lines.push(`}`);
+  lines.push(``);
+
+  lines.push(`export interface Update${model.name}Input {`);
+  for (const field of inputFields) {
+    lines.push(`  ${field.name}?: ${toTsType(field.type)};`);
+  }
+  lines.push(`}`);
+  lines.push(``);
+
+  // ── Validation function ────────────────────────────────────────────────────
+  lines.push(`export interface ValidationError {`);
+  lines.push(`  field: string;`);
+  lines.push(`  code: string;`);
+  lines.push(`  message: string;`);
+  lines.push(`}`);
+  lines.push(``);
+  lines.push(`export function validate${model.name}(input: unknown): { ok: true; value: ${model.name} } | { ok: false; errors: ValidationError[] } {`);
+  lines.push(`  const errors: ValidationError[] = [];`);
+  lines.push(`  const data = input as Record<string, unknown>;`);
+  lines.push(``);
+
+  // Required field presence checks
+  for (const field of model.fields) {
+    if (field.nullable || field.default_value || ["id", "created_at", "updated_at"].includes(field.name)) continue;
+    if (field.default_value?.startsWith("GENERATED ALWAYS")) continue;
+    lines.push(`  if (data.${field.name} === undefined || data.${field.name} === null) {`);
+    lines.push(`    errors.push({ field: "${field.name}", code: "REQUIRED", message: "${field.name} is required" });`);
+    lines.push(`  }`);
+  }
+
+  // Type checks for primitive fields
+  for (const field of model.fields) {
+    if (["id", "created_at", "updated_at"].includes(field.name)) continue;
+    if (field.default_value?.startsWith("GENERATED ALWAYS")) continue;
+    const check = typeCheckExpr(field.type, `data.${field.name}`);
+    if (check) {
+      lines.push(`  if (data.${field.name} !== undefined && data.${field.name} !== null && !(${check})) {`);
+      lines.push(`    errors.push({ field: "${field.name}", code: "INVALID_TYPE", message: "${field.name} must be ${field.type}" });`);
+      lines.push(`  }`);
+    }
+  }
+
+  // Constraint-derived checks from model constraints
+  for (const c of model.constraints) {
+    if (c.kind === "unique") continue; // enforced by DB
+    if (c.kind === "range" && c.params["min"] !== undefined && c.params["max"] !== undefined) {
+      lines.push(`  if (typeof data.${c.target} === "number" && (data.${c.target} < ${c.params["min"]} || data.${c.target} > ${c.params["max"]})) {`);
+      lines.push(`    errors.push({ field: "${c.target}", code: "OUT_OF_RANGE", message: "${c.target} must be between ${c.params["min"]} and ${c.params["max"]}" });`);
+      lines.push(`  }`);
+    }
+    if (c.kind === "enum" && Array.isArray(c.params["values"])) {
+      const vals = (c.params["values"] as string[]).map(v => JSON.stringify(v)).join(", ");
+      lines.push(`  if (data.${c.target} !== undefined && ![${vals}].includes(data.${c.target} as string)) {`);
+      lines.push(`    errors.push({ field: "${c.target}", code: "INVALID_ENUM", message: "${c.target} must be one of: ${(c.params["values"] as string[]).join(", ")}" });`);
+      lines.push(`  }`);
+    }
+    if (c.kind === "check" && typeof c.params["expression"] === "string") {
+      // Parse length-in-range constraints like "username.length in 3..32"
+      const lenMatch = (c.params["expression"] as string).match(/^(\w+)\.length\s+in\s+(\d+)\.\.(\d+)$/);
+      if (lenMatch) {
+        const [, fieldName, minLen, maxLen] = lenMatch;
+        lines.push(`  if (typeof data.${fieldName} === "string" && (data.${fieldName}.length < ${minLen} || data.${fieldName}.length > ${maxLen})) {`);
+        lines.push(`    errors.push({ field: "${fieldName}", code: "INVALID_LENGTH", message: "${fieldName} must be between ${minLen} and ${maxLen} characters" });`);
+        lines.push(`  }`);
+      }
+      // Parse non-negative constraints like "score >= 0"
+      const nonNegMatch = (c.params["expression"] as string).match(/^(\w+)\s*>=\s*0$/);
+      if (nonNegMatch) {
+        const [, fieldName] = nonNegMatch;
+        lines.push(`  if (typeof data.${fieldName} === "number" && data.${fieldName} < 0) {`);
+        lines.push(`    errors.push({ field: "${fieldName}", code: "OUT_OF_RANGE", message: "${fieldName} must be >= 0" });`);
+        lines.push(`  }`);
+      }
+    }
+  }
+
+  lines.push(``);
+  lines.push(`  if (errors.length > 0) return { ok: false, errors };`);
+  lines.push(`  return { ok: true, value: data as unknown as ${model.name} };`);
+  lines.push(`}`);
+  lines.push(``);
+
+  return lines.join("\n");
+}
+
+function typeCheckExpr(irType: string, expr: string): string | null {
+  switch (irType) {
+    case "string":    return `typeof ${expr} === "string"`;
+    case "uint":      return `typeof ${expr} === "number" && Number.isInteger(${expr}) && ${expr} >= 0`;
+    case "int":       return `typeof ${expr} === "number" && Number.isInteger(${expr})`;
+    case "float":     return `typeof ${expr} === "number"`;
+    case "bool":      return `typeof ${expr} === "boolean"`;
+    case "uuid":      return `typeof ${expr} === "string" && /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(${expr})`;
+    case "timestamp": return `${expr} instanceof Date || typeof ${expr} === "string"`;
+    default:
+      if (irType.startsWith("list<") || irType.startsWith("set<")) return `Array.isArray(${expr})`;
+      return null;
+  }
+}
+
+// ─── Barrel index for all models ─────────────────────────────────────────────
+
+export function emitModelsIndex(system: IR.IRSystem): string {
+  const lines: string[] = [];
+  lines.push(`// Generated by BoneScript compiler. DO NOT EDIT.`);
+  lines.push(`// Re-exports all model interfaces, schemas, and validators.`);
+  lines.push(``);
+  for (const mod of system.modules) {
+    for (const model of mod.models) {
+      lines.push(`export * from "./${toSnakeCase(model.name)}";`);
+    }
+  }
+  return lines.join("\n");
+}