@methodacting/actor-kit 0.47.0 → 0.47.1

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@methodacting/actor-kit",
-  "version": "0.47.0",
-  "main": "./src/index.ts",
-  "module": "./src/index.ts",
-  "types": "./src/index.ts",
+  "version": "0.47.1",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -14,24 +14,24 @@
       "import": "./dist/browser.js"
     },
     "./server": {
-      "types": "./src/server.ts",
-      "import": "./src/server.ts"
+      "types": "./dist/src/server.d.ts",
+      "import": "./dist/src/server.js"
     },
     "./react": {
       "types": "./dist/react.d.ts",
       "import": "./dist/react.js"
     },
     "./storybook": {
-      "types": "./src/storybook.ts",
-      "import": "./src/storybook.ts"
+      "types": "./dist/src/storybook.d.ts",
+      "import": "./dist/src/storybook.js"
     },
     "./test": {
-      "types": "./src/test.ts",
-      "import": "./src/test.ts"
+      "types": "./dist/src/test.d.ts",
+      "import": "./dist/src/test.js"
     },
     "./worker": {
-      "types": "./src/worker.ts",
-      "import": "./src/worker.ts"
+      "types": "./dist/src/worker.d.ts",
+      "import": "./dist/src/worker.js"
     }
   },
   "files": [
@@ -40,6 +40,8 @@
   ],
   "scripts": {
     "build": "rollup -c --bundleConfigAsCjs",
+    "test": "vitest run",
+    "test:watch": "vitest",
     "prepublishOnly": "npm run build"
   },
   "keywords": [
@@ -52,9 +54,9 @@
   "license": "ISC",
   "peerDependencies": {
     "@cloudflare/workers-types": "^4.20240925.0",
-    "react": "^17.0.0 || ^18.0.0",
+    "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
     "xstate": "^5.18.0",
-    "zod": "^3.23.0"
+    "zod": "^3.25.0 || ^4.0.0"
   },
   "dependencies": {
     "cloudflare": "^3.5.0",
@@ -77,8 +79,9 @@
     "rollup-plugin-preserve-directives": "^0.4.0",
     "rollup-plugin-typescript2": "^0.36.0",
     "typescript": "^5.6.2",
+    "vitest": "^3.2.4",
     "xstate": "^5.18.2",
-    "zod": "^3.23.8"
+    "zod": "^4.3.5"
   },
   "type": "module",
   "imports": {

package/src/createActorKitRouter.ts

@@ -112,14 +112,17 @@ export const createActorKitRouter = <Env extends EnvWithDurableObjects>(
     }
 
     if (request.method === "GET") {
-      const { waitForEvent, waitForState, timeout, errorOnWaitTimeout } = 
-        Object.fromEntries(new URL(request.url).searchParams);
-      
+      const searchParams = new URL(request.url).searchParams;
+      const waitForEvent = searchParams.get("waitForEvent");
+      const waitForState = searchParams.get("waitForState");
+      const timeout = searchParams.get("timeout");
+      const errorOnWaitTimeout = searchParams.get("errorOnWaitTimeout");
+
       const result = await durableObjectStub.getSnapshot(caller, {
         waitForEvent: waitForEvent ? JSON.parse(waitForEvent) : undefined,
         waitForState: waitForState ? JSON.parse(waitForState) : undefined,
         timeout: timeout ? parseInt(timeout, 10) : undefined,
-        errorOnWaitTimeout: errorOnWaitTimeout ? errorOnWaitTimeout === 'true' : undefined,
+        errorOnWaitTimeout: errorOnWaitTimeout ? errorOnWaitTimeout === "true" : undefined,
       });
       return new Response(JSON.stringify(result), {
         headers: { "Content-Type": "application/json" },

package/src/storage.ts

@@ -109,7 +109,7 @@ export class ActorKitStorage {
   private initialized = false;
   private sql: DurableObjectStorage["sql"];
 
-  constructor(private storage: DurableObjectStorage) {
+  constructor(private readonly storage: DurableObjectStorage) {
     this.sql = storage.sql;
   }
 
@@ -149,7 +149,7 @@ export class ActorKitStorage {
     await this.ensureInitialized();
     const result = await this.sql.exec(
       "SELECT id, type, scheduled_at, repeat_interval, payload, created_at FROM alarms WHERE scheduled_at <= ? ORDER BY scheduled_at ASC",
-      [before]
+      before
     );
     return (await this.parseRows(result)) as AlarmRecord[];
   }
@@ -173,14 +173,12 @@ export class ActorKitStorage {
     await this.ensureInitialized();
     await this.sql.exec(
       "INSERT INTO alarms (id, type, scheduled_at, repeat_interval, payload, created_at) VALUES (?, ?, ?, ?, ?, ?)",
-      [
-        options.id,
-        options.type,
-        options.scheduledAt,
-        options.repeatInterval ?? null,
-        JSON.stringify(options.payload),
-        Date.now(),
-      ]
+      options.id,
+      options.type,
+      options.scheduledAt,
+      options.repeatInterval ?? null,
+      JSON.stringify(options.payload),
+      Date.now()
     );
   }
 
@@ -191,7 +189,10 @@ export class ActorKitStorage {
     await this.ensureInitialized();
     await this.sql.exec(
       "UPDATE alarms SET scheduled_at = ?, repeat_interval = ?, payload = ? WHERE id = ?",
-      [options.scheduledAt, options.repeatInterval ?? null, JSON.stringify(options.payload), options.id]
+      options.scheduledAt,
+      options.repeatInterval ?? null,
+      JSON.stringify(options.payload),
+      options.id
     );
   }
 
@@ -200,7 +201,7 @@ export class ActorKitStorage {
    */
   async deleteAlarm(id: string): Promise<void> {
     await this.ensureInitialized();
-    await this.sql.exec("DELETE FROM alarms WHERE id = ?", [id]);
+    await this.sql.exec("DELETE FROM alarms WHERE id = ?", id);
   }
 
   /**
@@ -208,7 +209,7 @@ export class ActorKitStorage {
    */
   async deleteAlarmsByType(type: string): Promise<void> {
     await this.ensureInitialized();
-    await this.sql.exec("DELETE FROM alarms WHERE type = ?", [type]);
+    await this.sql.exec("DELETE FROM alarms WHERE type = ?", type);
   }
 
   // ==================== Actor Metadata ====================
@@ -238,7 +239,7 @@ export class ActorKitStorage {
 
     const result = await this.sql.exec(
       "SELECT actor_id, actor_type, initial_caller, input, created_at, updated_at FROM actor_meta WHERE actor_id = ?",
-      [actorId]
+      actorId
     );
     const rows = (await this.parseRows(result)) as ActorMetaRecord[];
     if (rows.length === 0) return null;
@@ -266,14 +267,12 @@ export class ActorKitStorage {
         initial_caller = excluded.initial_caller,
         input = excluded.input,
         updated_at = excluded.updated_at`,
-      [
-        meta.actorId,
-        meta.actorType,
-        JSON.stringify(meta.initialCaller),
-        JSON.stringify(meta.input),
-        now,
-        now,
-      ]
+      meta.actorId,
+      meta.actorType,
+      JSON.stringify(meta.initialCaller),
+      JSON.stringify(meta.input),
+      now,
+      now
     );
   }
 
@@ -282,7 +281,7 @@ export class ActorKitStorage {
    */
   async deleteActorMeta(actorId: string): Promise<void> {
     await this.ensureInitialized();
-    await this.sql.exec("DELETE FROM actor_meta WHERE actor_id = ?", [actorId]);
+    await this.sql.exec("DELETE FROM actor_meta WHERE actor_id = ?", actorId);
   }
 
   // ==================== Snapshots ====================
@@ -294,7 +293,7 @@ export class ActorKitStorage {
     await this.ensureInitialized();
     const result = await this.sql.exec(
       "SELECT actor_id, snapshot, checksum, updated_at FROM snapshots WHERE actor_id = ?",
-      [actorId]
+      actorId
     );
     const rows = (await this.parseRows(result)) as SnapshotRecord[];
     if (rows.length === 0) return null;
@@ -319,7 +318,10 @@ export class ActorKitStorage {
         snapshot = excluded.snapshot,
         checksum = excluded.checksum,
         updated_at = excluded.updated_at`,
-      [actorId, JSON.stringify(snapshot), checksum ?? null, Date.now()]
+      actorId,
+      JSON.stringify(snapshot),
+      checksum ?? null,
+      Date.now()
     );
   }
 
@@ -328,7 +330,7 @@ export class ActorKitStorage {
    */
   async deleteSnapshot(actorId: string): Promise<void> {
     await this.ensureInitialized();
-    await this.sql.exec("DELETE FROM snapshots WHERE actor_id = ?", [actorId]);
+    await this.sql.exec("DELETE FROM snapshots WHERE actor_id = ?", actorId);
   }
 
   // ==================== Migration Helpers ====================
@@ -375,13 +377,13 @@ export class ActorKitStorage {
     if (result && typeof result[Symbol.asyncIterator] === "function") {
       const cursor = result as AsyncIterable<{ columns: string[]; results: (string | number | null)[][] }>;
       const rows: unknown[] = [];
-      let columns: string[] = [];
+      let columns: string[] | null = null;
 
       for await (const batch of cursor) {
         if (!columns) columns = batch.columns;
         for (const row of batch.results) {
           const obj: Record<string, unknown> = {};
-          columns.forEach((col, i) => {
+          (columns ?? []).forEach((col, i) => {
             obj[col] = row[i];
           });
           rows.push(obj);
@@ -390,9 +392,21 @@ export class ActorKitStorage {
       return rows;
     }
 
-    // Handle array format
-    if (Array.isArray(result) && result.length === 0) return [];
-    const { columns, rows } = result[0];
+    // Handle row batches returned by sql.exec()
+    const batches = Array.isArray(result) ? result : result ? [result] : [];
+    if (batches.length === 0) return [];
+
+    const first = batches[0] as {
+      columns?: string[];
+      columnNames?: string[];
+      rows?: unknown[][];
+      results?: unknown[][];
+    };
+
+    const columns = first?.columns ?? first?.columnNames ?? [];
+    const rows = first?.rows ?? first?.results ?? [];
+    if (!columns.length || !rows.length) return [];
+
     return rows.map((row: unknown[]) => {
       const obj: Record<string, unknown> = {};
       columns.forEach((col: string, i: number) => {