@gencow/core 0.1.29 → 0.1.30

package/dist/workflow-json.d.ts

@@ -0,0 +1,2 @@
+import { sql } from "drizzle-orm";
+export declare function workflowJsonb(value: unknown): ReturnType<typeof sql>;

package/dist/workflow-json.js

@@ -0,0 +1,5 @@
+import { sql } from "drizzle-orm";
+export function workflowJsonb(value) {
+    const json = JSON.stringify(value ?? {});
+    return sql `${json}::text::jsonb`;
+}

package/dist/workflow.js

@@ -1,5 +1,6 @@
 import { sql } from "drizzle-orm";
 import { mutation } from "./reactive-mutation.js";
+import { workflowJsonb } from "./workflow-json.js";
 import { registerWorkflowsApi } from "./workflows-api.js";
 const workflowRegistry = (globalThis.__gencow_workflowRegistry ??= new Map());
 export const DEFAULT_WORKFLOW_MAX_DURATION_MS = 30 * 60 * 1000;
@@ -90,63 +91,60 @@ function isMissingWorkflowV2SchemaError(error) {
         message.includes('column "retry_count"') ||
         message.includes('column "user_id"'));
 }
-async function tryInsertWorkflowV2WakeOutbox(db, workflowId) {
-    try {
-        await db.execute(sql `
-      INSERT INTO _gencow_workflow_outbox_v2 (
-        id,
-        run_id,
-        kind,
-        available_at,
-        status
-      )
-      VALUES (
-        ${`start:${workflowId}`},
-        ${workflowId},
-        'wake_run',
-        NOW(),
-        'pending'
-      )
-      ON CONFLICT (id) DO NOTHING
-    `);
-    }
-    catch (error) {
-        if (!isMissingWorkflowV2SchemaError(error))
-            throw error;
-    }
-}
 async function tryInsertWorkflowV2Run(options) {
     try {
         await options.db.execute(sql `
-      INSERT INTO _gencow_workflow_runs_v2 (
-        id,
-        workflow_name,
-        workflow_version,
-        args_json,
-        user_id,
-        max_active_duration_ms,
-        lifecycle_deadline_at,
-        retry_count,
-        max_retries,
-        max_attempts
-      )
-      VALUES (
-        ${options.workflowId},
-        ${options.workflowName},
-        ${options.workflowVersion ?? null},
-        ${JSON.stringify(options.args)}::jsonb,
-        ${options.userId},
-        ${options.maxActiveDurationMs},
-        CASE
-          WHEN ${options.lifecycleTimeoutMs}::bigint IS NULL THEN NULL
-          ELSE NOW() + (${options.lifecycleTimeoutMs}::bigint * INTERVAL '1 millisecond')
-        END,
-        0,
-        ${options.maxRetries},
-        ${options.maxRetries + 1}
+      WITH inserted_run AS (
+        INSERT INTO _gencow_workflow_runs_v2 (
+          id,
+          workflow_name,
+          workflow_version,
+          args_json,
+          user_id,
+          max_active_duration_ms,
+          lifecycle_deadline_at,
+          retry_count,
+          max_retries,
+          max_attempts
+        )
+        VALUES (
+          ${options.workflowId},
+          ${options.workflowName},
+          ${options.workflowVersion ?? null},
+          ${workflowJsonb(options.args)},
+          ${options.userId},
+          ${options.maxActiveDurationMs},
+          CASE
+            WHEN ${options.lifecycleTimeoutMs}::bigint IS NULL THEN NULL
+            ELSE NOW() + (${options.lifecycleTimeoutMs}::bigint * INTERVAL '1 millisecond')
+          END,
+          0,
+          ${options.maxRetries},
+          ${options.maxRetries + 1}
+        )
+        RETURNING id
+      ),
+      inserted_outbox AS (
+        INSERT INTO _gencow_workflow_outbox_v2 (
+          id,
+          run_id,
+          kind,
+          available_at,
+          status
+        )
+        SELECT
+          'start:' || inserted_run.id,
+          inserted_run.id,
+          'wake_run',
+          NOW(),
+          'pending'
+        FROM inserted_run
+        ON CONFLICT (id) DO NOTHING
+        RETURNING id
       )
+      SELECT id
+      FROM inserted_run
     `);
-        await tryInsertWorkflowV2WakeOutbox(options.db, options.workflowId);
         return true;
     }
     catch (error) {
@@ -230,7 +228,7 @@ export function workflow(name, options) {
                 VALUES (
                     ${workflowId},
                     ${name},
-                    ${JSON.stringify(persistedArgs)}::jsonb,
+                    ${workflowJsonb(persistedArgs)},
                   ${realtimeToken},
                   'pending',
                   0,

package/dist/workflows-api.js

@@ -2,6 +2,7 @@ import { sql } from "drizzle-orm";
 import { query } from "./reactive-query.js";
 import { mutation } from "./reactive-mutation.js";
 import { createWorkflowRealtimeToken, deserializeWorkflowValue, getWorkflowResumeActionName, getWorkflowRealtimeKey, serializeWorkflowValue, } from "./workflow.js";
+import { workflowJsonb } from "./workflow-json.js";
 import { GencowValidationError, v } from "./v.js";
 import { deriveWorkflowStatus } from "./workflow-types.js";
 const WORKFLOW_STATUSES = new Set(["pending", "running", "completed", "failed"]);
@@ -160,7 +161,7 @@ async function tryRecordWorkflowV2Signal(options) {
           ${crypto.randomUUID()},
           ${options.workflowId},
           ${options.event},
-          ${JSON.stringify(options.payload)}::jsonb,
+          ${workflowJsonb(options.payload)},
           ${crypto.randomUUID()}
         )
         RETURNING run_id
@@ -297,7 +298,7 @@ export function registerWorkflowsApi() {
                     ${crypto.randomUUID()},
                     ${workflow.id},
                     ${normalizedEvent},
-                  ${JSON.stringify(persistedPayload)}::jsonb
+                  ${workflowJsonb(persistedPayload)}
                 )
             `);
             await tryRecordWorkflowV2Signal({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gencow/core",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "description": "Gencow core library — defineQuery, defineMutation, reactive subscriptions",
   "type": "module",
   "main": "dist/index.js",

package/src/workflow-json.ts

@@ -0,0 +1,6 @@
+import { sql } from "drizzle-orm";
+
+export function workflowJsonb(value: unknown): ReturnType<typeof sql> {
+  const json = JSON.stringify(value ?? {});
+  return sql`${json}::text::jsonb`;
+}

package/src/workflow.ts

@@ -7,6 +7,7 @@ import type {
   WorkflowOptions,
   WorkflowStartResult,
 } from "./workflow-types.js";
+import { workflowJsonb } from "./workflow-json.js";
 import { registerWorkflowsApi } from "./workflows-api.js";
 
 declare global {
@@ -125,33 +126,6 @@ function isMissingWorkflowV2SchemaError(error: unknown): boolean {
   );
 }
 
-async function tryInsertWorkflowV2WakeOutbox(
-  db: { execute: (query: ReturnType<typeof sql>) => Promise<unknown> },
-  workflowId: string,
-): Promise<void> {
-  try {
-    await db.execute(sql`
-      INSERT INTO _gencow_workflow_outbox_v2 (
-        id,
-        run_id,
-        kind,
-        available_at,
-        status
-      )
-      VALUES (
-        ${`start:${workflowId}`},
-        ${workflowId},
-        'wake_run',
-        NOW(),
-        'pending'
-      )
-      ON CONFLICT (id) DO NOTHING
-    `);
-  } catch (error) {
-    if (!isMissingWorkflowV2SchemaError(error)) throw error;
-  }
-}
-
 async function tryInsertWorkflowV2Run(options: {
   db: { execute: (query: ReturnType<typeof sql>) => Promise<unknown> };
   workflowId: string;
@@ -165,35 +139,57 @@ async function tryInsertWorkflowV2Run(options: {
 }): Promise<boolean> {
   try {
     await options.db.execute(sql`
-      INSERT INTO _gencow_workflow_runs_v2 (
-        id,
-        workflow_name,
-        workflow_version,
-        args_json,
-        user_id,
-        max_active_duration_ms,
-        lifecycle_deadline_at,
-        retry_count,
-        max_retries,
-        max_attempts
-      )
-      VALUES (
-        ${options.workflowId},
-        ${options.workflowName},
-        ${options.workflowVersion ?? null},
-        ${JSON.stringify(options.args)}::jsonb,
-        ${options.userId},
-        ${options.maxActiveDurationMs},
-        CASE
-          WHEN ${options.lifecycleTimeoutMs}::bigint IS NULL THEN NULL
-          ELSE NOW() + (${options.lifecycleTimeoutMs}::bigint * INTERVAL '1 millisecond')
-        END,
-        0,
-        ${options.maxRetries},
-        ${options.maxRetries + 1}
+      WITH inserted_run AS (
+        INSERT INTO _gencow_workflow_runs_v2 (
+          id,
+          workflow_name,
+          workflow_version,
+          args_json,
+          user_id,
+          max_active_duration_ms,
+          lifecycle_deadline_at,
+          retry_count,
+          max_retries,
+          max_attempts
+        )
+        VALUES (
+          ${options.workflowId},
+          ${options.workflowName},
+          ${options.workflowVersion ?? null},
+          ${workflowJsonb(options.args)},
+          ${options.userId},
+          ${options.maxActiveDurationMs},
+          CASE
+            WHEN ${options.lifecycleTimeoutMs}::bigint IS NULL THEN NULL
+            ELSE NOW() + (${options.lifecycleTimeoutMs}::bigint * INTERVAL '1 millisecond')
+          END,
+          0,
+          ${options.maxRetries},
+          ${options.maxRetries + 1}
+        )
+        RETURNING id
+      ),
+      inserted_outbox AS (
+        INSERT INTO _gencow_workflow_outbox_v2 (
+          id,
+          run_id,
+          kind,
+          available_at,
+          status
+        )
+        SELECT
+          'start:' || inserted_run.id,
+          inserted_run.id,
+          'wake_run',
+          NOW(),
+          'pending'
+        FROM inserted_run
+        ON CONFLICT (id) DO NOTHING
+        RETURNING id
       )
+      SELECT id
+      FROM inserted_run
     `);
-    await tryInsertWorkflowV2WakeOutbox(options.db, options.workflowId);
     return true;
   } catch (error) {
     if (isMissingWorkflowV2SchemaError(error)) return false;
@@ -297,7 +293,7 @@ export function workflow<TSchema = any, TReturn = any>(
                 VALUES (
                     ${workflowId},
                     ${name},
-                    ${JSON.stringify(persistedArgs)}::jsonb,
+                    ${workflowJsonb(persistedArgs)},
                   ${realtimeToken},
                   'pending',
                   0,

package/src/workflows-api.ts

@@ -8,6 +8,7 @@ import {
   getWorkflowRealtimeKey,
   serializeWorkflowValue,
 } from "./workflow.js";
+import { workflowJsonb } from "./workflow-json.js";
 import { GencowValidationError, v } from "./v.js";
 import type {
   WorkflowDerivedStatus,
@@ -246,7 +247,7 @@ async function tryRecordWorkflowV2Signal(options: {
           ${crypto.randomUUID()},
           ${options.workflowId},
           ${options.event},
-          ${JSON.stringify(options.payload)}::jsonb,
+          ${workflowJsonb(options.payload)},
           ${crypto.randomUUID()}
         )
         RETURNING run_id
@@ -397,7 +398,7 @@ export function registerWorkflowsApi(): void {
                     ${crypto.randomUUID()},
                     ${workflow.id},
                     ${normalizedEvent},
-                  ${JSON.stringify(persistedPayload)}::jsonb
+                  ${workflowJsonb(persistedPayload)}
                 )
             `);
       await tryRecordWorkflowV2Signal({