@pattern-stack/codegen 0.15.0 → 0.15.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pattern-stack/codegen",
-  "version": "0.15.0",
+  "version": "0.15.2",
   "description": "Entity-driven code generation for full-stack TypeScript applications",
   "license": "MIT",
   "type": "module",

package/runtime/subsystems/bridge/bridge-delivery-handler.ts

@@ -64,7 +64,7 @@ import {
 
 import { EVENT_BUS } from '../events/events.tokens';
 import type { IEventBus, DomainEvent } from '../events/event-bus.protocol';
-import type { EventTypeName } from '../events/generated/types';
+import type { EventTypeName } from '../events/event-registry';
 
 import {
   BRIDGE_DELIVERY_REPO,

package/runtime/subsystems/bridge/bridge-outbox-drain-hook.ts

@@ -32,6 +32,7 @@
  */
 import { Inject, Injectable, Logger, Optional } from '@nestjs/common';
 import { randomUUID } from 'node:crypto';
+import { eq } from 'drizzle-orm';
 
 import type { DomainEvent, DrizzleTransaction } from '../events/event-bus.protocol';
 import { bridgeDelivery } from './bridge-delivery.schema';
@@ -45,7 +46,7 @@ import type {
   IBridgeOutboxDrainHook,
 } from './bridge.protocol';
 import { BRIDGE_DELIVERY_JOB_TYPE } from './bridge-delivery-handler';
-import type { EventTypeName } from '../events/generated/types';
+import type { EventTypeName } from '../events/event-registry';
 
 /** Reserved pools the wrapper rows route into; ADR-022 / ADR-024. */
 const POOL_BY_DIRECTION: Record<string, string> = {
@@ -143,7 +144,38 @@ export class BridgeOutboxDrainHook implements IBridgeOutboxDrainHook {
       const deliveryId = randomUUID();
       const wrapperRunId = randomUUID();
 
-      // 1. bridge_delivery insert with ON CONFLICT DO NOTHING + RETURNING.
+      // FK ORDER (BRIDGE / 0.15.2): `bridge_delivery.wrapper_run_id` REFERENCES
+      // `job_run(id)` is a plain (non-deferrable) FK, so the referenced
+      // wrapper `job_run` MUST exist before the delivery row that points at it
+      // is inserted — otherwise Postgres rejects the delivery insert
+      // immediately. (The codegen unit tests mock `tx`, so they never
+      // exercised this ordering against a real FK; package-mode bridge
+      // deliveries are the first to do so.) We therefore insert the wrapper
+      // run FIRST, then the delivery. Idempotency is unchanged: the delivery
+      // keeps its `ON CONFLICT (event_id, trigger_id) DO NOTHING RETURNING`,
+      // and when the delivery conflicts (outbox replay or facade-eager Case B)
+      // we DELETE the just-inserted orphan wrapper run in the same tx, so a
+      // skipped delivery leaves no stray `job_run` for a worker to claim.
+
+      // 1. Wrapper job_run insert. We carry the deliveryId into the wrapper
+      //    input so BridgeDeliveryHandler.run(ctx) can locate the row via
+      //    repo.findDeliveryById(ctx.input.deliveryId).
+      await (tx as unknown as { insert: typeof client.insert })
+        .insert(jobRuns)
+        .values({
+          id: wrapperRunId,
+          jobType: BRIDGE_DELIVERY_JOB_TYPE,
+          jobVersion: 1,
+          rootRunId: wrapperRunId,
+          pool: wrapperPool,
+          status: 'pending',
+          input: { deliveryId },
+          triggerSource: 'event',
+          triggerRef: event.id,
+          tenantId,
+        });
+
+      // 2. bridge_delivery insert with ON CONFLICT DO NOTHING + RETURNING.
       const inserted = await (tx as unknown as {
         insert: typeof client.insert;
       })
@@ -162,30 +194,21 @@ export class BridgeOutboxDrainHook implements IBridgeOutboxDrainHook {
         .returning({ id: bridgeDelivery.id });
 
       if (inserted.length === 0) {
-        // Case B (facade pre-wrote `delivered`) or drain replay — skip
-        // wrapper insert for this trigger. Sibling triggers still fire.
+        // Case B (facade pre-wrote `delivered`) or drain replay — the delivery
+        // already exists, so this trigger is a no-op. Remove the orphan wrapper
+        // run we speculatively inserted above so no worker claims it. Sibling
+        // triggers still fire.
+        await (tx as unknown as {
+          delete: (table: unknown) => {
+            where: (cond: unknown) => Promise<unknown>;
+          };
+        })
+          .delete(jobRuns)
+          .where(eq(jobRuns.id, wrapperRunId));
         dedupSkips++;
         continue;
       }
 
-      // 2. Wrapper job_run insert. We carry the deliveryId into the
-      //    wrapper input so BridgeDeliveryHandler.run(ctx) can locate
-      //    the row via repo.findDeliveryById(ctx.input.deliveryId).
-      await (tx as unknown as { insert: typeof client.insert })
-        .insert(jobRuns)
-        .values({
-          id: wrapperRunId,
-          jobType: BRIDGE_DELIVERY_JOB_TYPE,
-          jobVersion: 1,
-          rootRunId: wrapperRunId,
-          pool: wrapperPool,
-          status: 'pending',
-          input: { deliveryId },
-          triggerSource: 'event',
-          triggerRef: event.id,
-          tenantId,
-        });
-
       delivered++;
     }
 

package/runtime/subsystems/bridge/bridge.protocol.ts

@@ -29,7 +29,7 @@ import type { DrizzleTransaction, DomainEvent } from '../events/event-bus.protoc
 import type {
   EventOfType,
   EventTypeName,
-} from '../events/generated/types';
+} from '../events/event-registry';
 
 import type {
   BridgeDeliveryRecord,

package/runtime/subsystems/bridge/event-flow.service.ts

@@ -52,7 +52,7 @@ import type {
 import type {
   EventOfType,
   EventTypeName,
-} from '../events/generated/types';
+} from '../events/event-registry';
 
 import { JOB_ORCHESTRATOR } from '../jobs/jobs-domain.tokens';
 import type { IJobOrchestrator } from '../jobs/job-orchestrator.protocol';

package/runtime/subsystems/events/event-registry.ts

@@ -0,0 +1,77 @@
+/**
+ * Augmentable domain-event registry (ADR-037, package-mode trigger typing).
+ *
+ * This is the seam that lets the bridge + job-trigger types see a PACKAGE-MODE
+ * consumer's OWN events with full per-event payload typing — without the
+ * package shipping (and leaking) its internal test-fixture event union.
+ *
+ * ── The problem ──────────────────────────────────────────────────────────────
+ * In vendored mode, `bridge.protocol.ts` / `job-handler.base.ts` could import
+ * `EventTypeName` / `EventOfType` straight from the consumer's vendored
+ * `./generated/types` (a sibling file). In package mode the runtime is consumed
+ * from the published `@pattern-stack/codegen`, whose bundled
+ * `events/generated/types.ts` is the codegen-patterns repo's OWN fixture union
+ * (`contact_created`, `deal_created`, …). Keying the bridge/trigger types off
+ * THAT union rejects the consumer's events (`'inbound_webhook_received' is not
+ * assignable to '"contact_created" | …'`).
+ *
+ * ── The fix ──────────────────────────────────────────────────────────────────
+ * `EventTypeName` (as used by the bridge/trigger types) derives from an EMPTY,
+ * augmentable `DomainEventRegistry` interface instead of the bundled concrete
+ * union. A package-mode consumer's generated events code emits a
+ * `declare module '@pattern-stack/codegen/runtime/subsystems/events/index' {
+ *    interface DomainEventRegistry { <their_event>: <TheirEvent>; … } }`
+ * augmentation, so in the consumer's tsc program `keyof DomainEventRegistry`
+ * picks up THEIR events and `EventOfType<T>` resolves THEIR concrete payloads.
+ *
+ * In the package's OWN program (and any consumer that authors no events) the
+ * interface is never augmented, so `keyof DomainEventRegistry` is `never` and
+ * `EventTypeName` falls back to `string` — the bridge/trigger types degrade to
+ * `Record<string, …>` / `(event: DomainEvent) => …`, exactly the loose-but-
+ * sound shape that keeps the package's fixture-based runtime tests green.
+ *
+ * The bundled `events/generated/{types,bus,schemas}.ts` keep their concrete
+ * fixture union locally (the bundled `TypedEventBus` keys off `./types`, NOT
+ * this file), so they do NOT augment `DomainEventRegistry` and never leak the
+ * fixtures into a consumer's `EventTypeName` — even though the consumer pulls
+ * `generated/types.d.ts` in transitively via the events index barrel.
+ */
+import type { DomainEvent } from './event-bus.protocol';
+
+/**
+ * Empty marker interface, augmented by a consumer's generated events code via
+ * declaration merging on the events index module specifier
+ * (`@pattern-stack/codegen/runtime/subsystems/events/index`). Each key is an
+ * event `type` literal; each value is the event's concrete interface (extends
+ * `DomainEvent`). Empty in the package and in any project that declares no
+ * `events/*.yaml`.
+ *
+ * Intentionally NOT augmented by the package's own bundled
+ * `events/generated/types.ts` — those fixtures stay local to the bundled
+ * `TypedEventBus` so they never widen a consumer's `EventTypeName`.
+ *
+ * Must be an `interface` (only interfaces merge across module boundaries) and
+ * empty by design — a consumer augments it via declaration merging.
+ */
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
+export interface DomainEventRegistry {}
+
+/**
+ * Union of registered event `type` literals. When the registry is augmented
+ * (package-mode consumer with events) this is their event-type union; when it's
+ * empty (the package itself, or a no-events project) it falls back to `string`
+ * so the bridge/trigger types stay sound rather than collapsing to `never`.
+ */
+export type EventTypeName = keyof DomainEventRegistry extends never
+  ? string
+  : keyof DomainEventRegistry & string;
+
+/**
+ * The concrete event interface for a given `type`. Resolves to the consumer's
+ * registered interface when the registry knows `T`; otherwise (the fallback
+ * `string` case, or an unregistered literal) widens to the structural
+ * `DomainEvent` base so `event.type` / `event.id` / `event.payload` are still
+ * typed (payloads as `Record<string, unknown>`).
+ */
+export type EventOfType<T extends EventTypeName> =
+  T extends keyof DomainEventRegistry ? DomainEventRegistry[T] : DomainEvent;

package/runtime/subsystems/events/index.ts

@@ -4,6 +4,18 @@
  * Import the module in AppModule, inject the bus via EVENT_BUS token.
  */
 export type { DomainEvent, IEventBus, DrizzleTransaction } from './event-bus.protocol';
+// Augmentable event registry (ADR-037, package-mode trigger typing). A
+// package-mode consumer's generated events code augments `DomainEventRegistry`
+// via `declare module '@pattern-stack/codegen/runtime/subsystems/events/index'`
+// so the bridge + job-trigger types pick up THEIR events with full payload
+// typing. `EventTypeName` / `EventOfType` are re-exported here (the public
+// barrel is the stable augmentation target); they derive from the registry, NOT
+// the bundled fixture union the generated `./generated/types` re-export carries.
+export type {
+  DomainEventRegistry,
+  EventTypeName,
+  EventOfType,
+} from './event-registry';
 export type {
   IEventReadPort,
   ListEventsQuery,

package/runtime/subsystems/jobs/job-handler.base.ts

@@ -17,7 +17,7 @@
 // TODO(logging-subsystem): swap to ILogger once ADR-028 lands
 import type { Logger } from '@nestjs/common';
 import { tokenKey } from '../token-key';
-import type { EventOfType, EventTypeName } from '../events/generated/types';
+import type { EventOfType, EventTypeName } from '../events/event-registry';
 import type { JobRun } from './job-orchestrator.protocol';
 
 // ─── ParentClosePolicy ──────────────────────────────────────────────────────

package/runtime/subsystems/jobs/job-worker.ts

@@ -609,19 +609,25 @@ export class JobWorker implements OnModuleInit, OnModuleDestroy {
    * worker resumes via stale-claim sweep).
    */
   private async nextStepSeq(runId: string): Promise<number> {
-    const [row] = await this.db.execute(
+    const result = await this.db.execute(
       sql`SELECT COALESCE(MAX(seq), 0) + 1 AS next FROM job_step WHERE job_run_id = ${runId}`,
-    ) as unknown as Array<{ next: number }>;
-    // pg driver returns { rows: [...] } for raw execute; tolerate both shapes.
+    );
+    // Driver shape varies and is NOT uniformly array-iterable, so we must
+    // never array-destructure the raw result (that throws `{} is not iterable`
+    // on the node-postgres `Result` object, which exposes `.rows` instead of
+    // being an array — first hit by package-mode bridge deliveries on
+    // `drizzle-orm/node-postgres`). Normalise to a row array first, then read.
+    //   - node-postgres `db.execute(sql)` → `{ rows: [{ next }], ... }`
+    //   - some drivers / future shapes → a plain `[{ next }]` array
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const maybeRows = (row as any)?.rows;
-    if (Array.isArray(maybeRows) && maybeRows.length > 0) {
-      return Number(maybeRows[0].next ?? 1);
-    }
-    if (row && typeof (row as { next?: unknown }).next !== 'undefined') {
-      return Number((row as { next: unknown }).next);
-    }
-    return 1;
+    const raw = result as any;
+    const rows: Array<{ next?: unknown }> = Array.isArray(raw)
+      ? raw
+      : Array.isArray(raw?.rows)
+        ? raw.rows
+        : [];
+    const next = rows[0]?.next;
+    return typeof next === 'undefined' ? 1 : Number(next);
   }
 
   // ============================================================================