@iterativeflow/mysql 2.7.0 → 3.1.0

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { Backend, IdGen } from "@iterativeflow/core/backend";
+import { Backend, IdGen, Json } from "@iterativeflow/core/backend";
 import { Pool } from "mysql2/promise";
 //#region src/sql.d.ts
 /** What a write reports — MySQL has no `RETURNING`, so first-writer-wins reads `affectedRows`. */
@@ -6,6 +6,13 @@ interface WriteResult {
   affectedRows: number;
   insertId: number;
 }
+type SqlScalar = string | number | boolean | Date | null;
+/** A value bound to a positional `?`; an array expands to a list (`IN (?)`). */
+type SqlParam = SqlScalar | readonly SqlScalar[];
+/** A column value as `mysql2` decodes it. */
+type SqlValue = Json | bigint | Date | Buffer;
+/** One result row, keyed by column name or alias. */
+type SqlRow = Readonly<Record<string, SqlValue>>;
 /**
  * The minimal SQL surface the backend needs: positional-`?` `query` for reads, `exec` for writes
  * (returning `affectedRows`, since MySQL has no `RETURNING`), and a `tx` that runs a unit of work on
@@ -14,8 +21,8 @@ interface WriteResult {
  * gives contention-free batch claims.
  */
 interface Sql {
-  query<R = Record<string, unknown>>(text: string, params?: readonly unknown[]): Promise<R[]>;
-  exec(text: string, params?: readonly unknown[]): Promise<WriteResult>;
+  query(text: string, params?: readonly SqlParam[]): Promise<SqlRow[]>;
+  exec(text: string, params?: readonly SqlParam[]): Promise<WriteResult>;
   tx<T>(fn: (t: Sql) => Promise<T>): Promise<T>;
 }
 /** Options for {@link mysqlPool}. */
@@ -80,4 +87,4 @@ declare const applySchema: (sql: Sql, prefix?: string) => Promise<void>;
  */
 declare const inTx: <T>(pool: Pool, fn: (backend: Backend, tx: Sql) => Promise<T>, opts?: MysqlBackendOpts) => Promise<T>;
 //#endregion
-export { type MysqlBackendOpts, type Sql, applySchema, createMysqlBackend, ddl, inTx, mysqlPool };
+export { type MysqlBackendOpts, type Sql, type SqlParam, type SqlRow, type SqlValue, applySchema, createMysqlBackend, ddl, inTx, mysqlPool };

package/dist/index.mjs

@@ -1,16 +1,147 @@
-import { ACTIVE_STATUSES, NON_SUCCESS_TERMINAL_STATUSES, RECONCILABLE_STATUSES, TERMINAL_STATUSES, assertSqlIdentifier, createLocalWakeup, isTerminal, newId, orphanedRunsSql, purgeWhereSql, queueDepthOf, runSetWhereSql, statusList, zeroRunStats } from "@iterativeflow/core/backend";
+import { ACTIVE_STATUSES, CRON_OVERLAPS, NON_SUCCESS_TERMINAL_STATUSES, RECONCILABLE_STATUSES, RUN_STATUSES, STEP_STATUSES, TERMINAL_STATUSES, assertSqlIdentifier, createLocalWakeup, decodeFlowError, decodeOneOf, decodeTags, distinctEnqueues, isTerminal, newId, orphanedRunsSql, purgeWhereSql, queueDepthOf, runSetWhereSql, statusList, zeroRunStats } from "@iterativeflow/core/backend";
+//#region src/codec.ts
+/** @internal */
+const j = (value) => value === void 0 ? null : JSON.stringify(value);
+const cell = (row, column) => {
+	const value = row[column];
+	if (value === void 0) throw new Error(`mysql: result has no column "${column}"`);
+	return value;
+};
+/** @internal */
+const textOrNull = (row, column) => {
+	const value = cell(row, column);
+	return value === null ? null : String(value);
+};
+/** @internal */
+const text = (row, column) => {
+	const value = textOrNull(row, column);
+	if (value === null) throw new Error(`mysql: column "${column}" is NULL`);
+	return value;
+};
+/** @internal */
+const intOrNull = (row, column) => {
+	const value = cell(row, column);
+	return value === null ? null : Number(value);
+};
+/** @internal */
+const int = (row, column) => Number(text(row, column));
+const oneOf = (allowed, row, column) => decodeOneOf(allowed, text(row, column), `mysql: column "${column}"`);
+/** @internal */
+const runStatus = (row) => oneOf(RUN_STATUSES, row, "status");
+const optionalText = (row, column) => textOrNull(row, column) ?? void 0;
+const json = (row, column) => {
+	const value = textOrNull(row, column);
+	return value === null ? void 0 : JSON.parse(value);
+};
+const at = (row, column) => new Date(int(row, column));
+const mapRun = (r) => ({
+	id: text(r, "id"),
+	name: text(r, "name"),
+	version: int(r, "version"),
+	status: runStatus(r),
+	input: json(r, "input"),
+	attempts: int(r, "attempts"),
+	output: json(r, "output"),
+	error: decodeFlowError(json(r, "error"), `mysql: column "error"`),
+	idempotencyKey: optionalText(r, "idempotency_key"),
+	tags: decodeTags(json(r, "tags"), `mysql: column "tags"`),
+	parentRunId: optionalText(r, "parent_run_id"),
+	parentCursorKey: optionalText(r, "parent_cursor_key"),
+	depth: int(r, "depth"),
+	createdAt: at(r, "created_at")
+});
+/** @internal */
+const STEP_COLUMNS = "status, result, error, attempts, shape AS memo_call";
+const mapStep = (r) => ({
+	status: oneOf(STEP_STATUSES, r, "status"),
+	result: json(r, "result"),
+	error: decodeFlowError(json(r, "error"), `mysql: column "error"`),
+	attempts: int(r, "attempts"),
+	call: optionalText(r, "memo_call")
+});
+const mapSignal = (r) => ({
+	id: text(r, "id"),
+	name: text(r, "name"),
+	payload: json(r, "payload")
+});
+const mapCron = (r) => {
+	const lastRunAt = intOrNull(r, "last_run_at");
+	return {
+		name: text(r, "name"),
+		schedule: text(r, "schedule"),
+		flowName: text(r, "flow_name"),
+		flowVersion: int(r, "flow_version"),
+		input: json(r, "input"),
+		overlap: oneOf(CRON_OVERLAPS, r, "overlap"),
+		nextRunAt: at(r, "next_run_at"),
+		lastRunAt: lastRunAt === null ? void 0 : new Date(lastRunAt)
+	};
+};
+//#endregion
+//#region src/statements.ts
+const ENQUEUE_ROWS_PER_STATEMENT = 1e3;
+const inList$1 = (n) => `(${Array.from({ length: n }, () => "?").join(",")})`;
+/** @internal */
+const enqueueManyStmt = async (sql, t, requests) => {
+	const rows = distinctEnqueues(requests);
+	for (let i = 0; i < rows.length; i += ENQUEUE_ROWS_PER_STATEMENT) {
+		const chunk = rows.slice(i, i + ENQUEUE_ROWS_PER_STATEMENT);
+		await sql.exec(`INSERT INTO ${t.job} (run_id, run_at, priority, version)
+       VALUES ${chunk.map(() => `(?, ?, COALESCE(?, (SELECT priority FROM ${t.run} WHERE id = ?), 0), 1)`).join(", ")}
+       ON DUPLICATE KEY UPDATE run_at = VALUES(run_at), priority = VALUES(priority), version = version + 1`, chunk.flatMap(([runId, opts]) => [
+			runId,
+			opts?.runAt ? opts.runAt.getTime() : 0,
+			opts?.priority ?? null,
+			runId
+		]));
+	}
+};
+/** @internal */
+const enqueueStmt = (sql, t, runId, opts) => enqueueManyStmt(sql, t, [{
+	runId,
+	opts
+}]);
+/** @internal */
+const scheduleStmt = (sql, t, runId, fireAt) => sql.exec(`INSERT INTO ${t.timer} (run_id, fire_at) VALUES (?, ?)
+     ON DUPLICATE KEY UPDATE fire_at = VALUES(fire_at)`, [runId, fireAt.getTime()]);
+/** @internal */
+const applyOutbox = async (sql, t, fx) => {
+	for (const s of fx.spawn ?? []) await sql.exec(`INSERT IGNORE INTO ${t.run}
+         (id, name, version, status, input, idempotency_key, tags, parent_run_id, parent_cursor_key, depth, priority, created_at)
+       VALUES (?, ?, ?, 'pending', ?, ?, ?, ?, ?, ?, ?, ?)`, [
+		s.runId,
+		s.spec.name,
+		s.spec.version,
+		j(s.spec.input),
+		s.spec.idempotencyKey ?? null,
+		j(s.spec.tags),
+		s.spec.parentRunId ?? null,
+		s.spec.parentCursorKey ?? null,
+		s.spec.depth ?? 0,
+		s.spec.priority ?? 0,
+		(s.spec.createdAt ?? /* @__PURE__ */ new Date()).getTime()
+	]);
+	const enqueues = [...(fx.spawn ?? []).map((s) => ({
+		runId: s.runId,
+		opts: s.enqueue
+	})), ...fx.enqueue ?? []];
+	if (enqueues.length) await enqueueManyStmt(sql, t, enqueues);
+	for (const tm of fx.timers ?? []) await scheduleStmt(sql, t, tm.runId, tm.fireAt);
+	if (fx.cancelTimers?.length) await sql.exec(`DELETE FROM ${t.timer} WHERE run_id IN ${inList$1(fx.cancelTimers.length)}`, fx.cancelTimers);
+	if (fx.consumeSignals?.length) await sql.exec(`UPDATE ${t.signal} SET consumed = 1 WHERE id IN ${inList$1(fx.consumeSignals.length)}`, fx.consumeSignals);
+	if (fx.joinTarget) await sql.exec(`UPDATE ${t.run} SET join_remaining = ? WHERE id = ?`, [fx.joinTarget.count, fx.joinTarget.runId]);
+};
+//#endregion
 //#region src/queue.ts
 /** @internal */
 const createMysqlQueue = (sql, t, id) => {
 	const ms = (d) => (d ?? /* @__PURE__ */ new Date()).getTime();
 	return {
 		async enqueue(runId, opts) {
-			await sql.exec(`INSERT INTO ${t.job} (run_id, run_at, priority, version) VALUES (?, ?, ?, 1)
-         ON DUPLICATE KEY UPDATE run_at = VALUES(run_at), priority = VALUES(priority), version = version + 1`, [
-				runId,
-				opts?.runAt ? opts.runAt.getTime() : 0,
-				opts?.priority ?? 0
-			]);
+			await enqueueStmt(sql, t, runId, opts);
+		},
+		async enqueueMany(requests) {
+			await enqueueManyStmt(sql, t, requests);
 		},
 		async claim({ limit, leaseMs, now, names }) {
 			if (names && names.length === 0) return [];
@@ -34,17 +165,18 @@ const createMysqlQueue = (sql, t, id) => {
              ORDER BY j.priority, j.run_at LIMIT ? FOR UPDATE OF j SKIP LOCKED`, params);
 				const leases = [];
 				for (const row of due) {
-					const token = `${id()}:${row.run_id}`;
+					const runId = text(row, "run_id");
+					const token = `${id()}:${runId}`;
 					await tx.exec(`UPDATE ${t.job} SET lease_token = ?, lease_expires = ? WHERE run_id = ?`, [
 						token,
 						at + leaseMs,
-						row.run_id
+						runId
 					]);
 					leases.push({
-						runId: row.run_id,
+						runId,
 						token,
 						expiresAt,
-						version: Number(row.version)
+						version: int(row, "version")
 					});
 				}
 				return leases;
@@ -81,7 +213,7 @@ const createMysqlQueue = (sql, t, id) => {
 			if (names && names.length === 0) return queueDepthOf([], now.getTime());
 			const nowMs = now.getTime();
 			const namePredicate = names ? ` WHERE r.name IS NULL OR r.name IN (${names.map(() => "?").join(",")})` : "";
-			const r = (await sql.query(`SELECT SUM(claimable) AS claimable, SUM(leased) AS leased,
+			const [row] = await sql.query(`SELECT SUM(claimable) AS claimable, SUM(leased) AS leased,
                 MIN(CASE WHEN claimable = 1 THEN run_at END) AS oldest
            FROM (SELECT j.run_at AS run_at,
                         (j.run_at <= ? AND (j.lease_expires IS NULL OR j.lease_expires <= ?)) AS claimable,
@@ -91,11 +223,12 @@ const createMysqlQueue = (sql, t, id) => {
 				nowMs,
 				nowMs,
 				...names ?? []
-			]))[0];
+			]);
+			const oldest = intOrNull(row, "oldest");
 			return {
-				claimable: Number(r?.claimable ?? 0),
-				leased: Number(r?.leased ?? 0),
-				oldestClaimableAgeMs: r?.oldest == null ? null : nowMs - Number(r.oldest)
+				claimable: intOrNull(row, "claimable") ?? 0,
+				leased: intOrNull(row, "leased") ?? 0,
+				oldestClaimableAgeMs: oldest === null ? null : nowMs - oldest
 			};
 		}
 	};
@@ -146,6 +279,7 @@ const ddl = (prefix = "") => {
       parent_cursor_key VARCHAR(191),
       depth             INT NOT NULL DEFAULT 0,
       join_remaining    INT NOT NULL DEFAULT 0,
+      priority          INT NOT NULL DEFAULT 0,
       created_at        BIGINT NOT NULL,
       UNIQUE KEY run_idem (name, version, idempotency_key),
       KEY run_created (created_at),
@@ -217,99 +351,18 @@ const ddl = (prefix = "") => {
      )`
 	];
 };
-const addSignalConsumed = async (sql, t) => {
-	const cols = await sql.query(`SELECT COUNT(*) AS n FROM information_schema.columns
-      WHERE table_schema = DATABASE() AND table_name = ? AND column_name = 'consumed'`, [t.signal.replace(/`/g, "")]);
-	if (Number(cols[0]?.n ?? 0) > 0) return;
-	await sql.query(`ALTER TABLE ${t.signal} ADD COLUMN consumed TINYINT(1) NOT NULL DEFAULT 0`);
+const addColumn = async (sql, table, column, def) => {
+	const [cols] = await sql.query(`SELECT COUNT(*) AS n FROM information_schema.columns
+      WHERE table_schema = DATABASE() AND table_name = ? AND column_name = ?`, [table.replace(/`/g, ""), column]);
+	if (int(cols, "n") > 0) return;
+	await sql.query(`ALTER TABLE ${table} ADD COLUMN ${column} ${def}`);
 };
 /** Apply the schema DDL (idempotent). Run once before use. */
 const applySchema = async (sql, prefix = "") => {
 	for (const stmt of ddl(prefix)) await sql.query(stmt);
-	await addSignalConsumed(sql, tables(prefix));
-};
-//#endregion
-//#region src/codec.ts
-/** @internal */
-const j = (value) => value === void 0 ? null : JSON.stringify(value);
-const p = (text) => text === null ? void 0 : JSON.parse(text);
-const orUndef = (v) => v === null ? void 0 : v;
-const at = (v) => new Date(Number(v));
-const mapRun = (r) => ({
-	id: r.id,
-	name: r.name,
-	version: r.version,
-	status: r.status,
-	input: p(r.input),
-	attempts: r.attempts,
-	output: p(r.output),
-	error: p(r.error),
-	idempotencyKey: orUndef(r.idempotency_key),
-	tags: p(r.tags),
-	parentRunId: orUndef(r.parent_run_id),
-	parentCursorKey: orUndef(r.parent_cursor_key),
-	depth: r.depth,
-	createdAt: at(r.created_at)
-});
-const mapStep = (r) => ({
-	status: r.status,
-	result: p(r.result),
-	error: p(r.error),
-	attempts: r.attempts,
-	shape: orUndef(r.shape ?? null)
-});
-const mapSignal = (r) => ({
-	id: r.id,
-	name: r.name,
-	payload: p(r.payload)
-});
-const mapCron = (r) => ({
-	name: r.name,
-	schedule: r.schedule,
-	flowName: r.flow_name,
-	flowVersion: r.flow_version,
-	input: p(r.input),
-	overlap: r.overlap,
-	nextRunAt: at(r.next_run_at),
-	lastRunAt: r.last_run_at === null ? void 0 : at(r.last_run_at)
-});
-//#endregion
-//#region src/statements.ts
-const inList$1 = (n) => `(${Array.from({ length: n }, () => "?").join(",")})`;
-/** @internal */
-const enqueueStmt = (sql, t, runId, opts) => sql.exec(`INSERT INTO ${t.job} (run_id, run_at, priority, version) VALUES (?, ?, ?, 1)
-     ON DUPLICATE KEY UPDATE run_at = VALUES(run_at), priority = VALUES(priority), version = version + 1`, [
-	runId,
-	opts?.runAt ? opts.runAt.getTime() : 0,
-	opts?.priority ?? 0
-]);
-/** @internal */
-const scheduleStmt = (sql, t, runId, fireAt) => sql.exec(`INSERT INTO ${t.timer} (run_id, fire_at) VALUES (?, ?)
-     ON DUPLICATE KEY UPDATE fire_at = VALUES(fire_at)`, [runId, fireAt.getTime()]);
-/** @internal */
-const applyOutbox = async (sql, t, fx) => {
-	for (const s of fx.spawn ?? []) {
-		await sql.exec(`INSERT IGNORE INTO ${t.run}
-         (id, name, version, status, input, idempotency_key, tags, parent_run_id, parent_cursor_key, depth, created_at)
-       VALUES (?, ?, ?, 'pending', ?, ?, ?, ?, ?, ?, ?)`, [
-			s.runId,
-			s.spec.name,
-			s.spec.version,
-			j(s.spec.input),
-			s.spec.idempotencyKey ?? null,
-			j(s.spec.tags),
-			s.spec.parentRunId ?? null,
-			s.spec.parentCursorKey ?? null,
-			s.spec.depth ?? 0,
-			(s.spec.createdAt ?? /* @__PURE__ */ new Date()).getTime()
-		]);
-		await enqueueStmt(sql, t, s.runId, s.enqueue);
-	}
-	for (const e of fx.enqueue ?? []) await enqueueStmt(sql, t, e.runId, e.opts);
-	for (const tm of fx.timers ?? []) await scheduleStmt(sql, t, tm.runId, tm.fireAt);
-	if (fx.cancelTimers?.length) await sql.exec(`DELETE FROM ${t.timer} WHERE run_id IN ${inList$1(fx.cancelTimers.length)}`, fx.cancelTimers);
-	if (fx.consumeSignals?.length) await sql.exec(`UPDATE ${t.signal} SET consumed = 1 WHERE id IN ${inList$1(fx.consumeSignals.length)}`, fx.consumeSignals);
-	if (fx.joinTarget) await sql.exec(`UPDATE ${t.run} SET join_remaining = ? WHERE id = ?`, [fx.joinTarget.count, fx.joinTarget.runId]);
+	const t = tables(prefix);
+	await addColumn(sql, t.signal, "consumed", "TINYINT(1) NOT NULL DEFAULT 0");
+	await addColumn(sql, t.run, "priority", "INT NOT NULL DEFAULT 0");
 };
 //#endregion
 //#region src/store.ts
@@ -320,13 +373,14 @@ const NON_SUCCESS_TERMINAL = sqlTuple(NON_SUCCESS_TERMINAL_STATUSES);
 const MS_PURGE = {
 	placeholder: () => "?",
 	time: (at) => at.getTime(),
-	statusTuple: sqlTuple
+	statusTuple: sqlTuple,
+	tag: (p) => `JSON_CONTAINS(tags, JSON_QUOTE(${p}))`
 };
 const inList = (n) => `(${Array.from({ length: n }, () => "?").join(",")})`;
 /** @internal */
 const createMysqlStore = (sql, t, id) => {
 	const loadStep = async (exec, runId, cursorKey) => {
-		const row = (await exec.query(`SELECT status, result, error, attempts, shape FROM ${t.step} WHERE run_id = ? AND cursor_key = ?`, [runId, cursorKey]))[0];
+		const row = (await exec.query(`SELECT ${STEP_COLUMNS} FROM ${t.step} WHERE run_id = ? AND cursor_key = ?`, [runId, cursorKey]))[0];
 		if (!row) throw new Error(`checkpointStep: step ${runId}/${cursorKey} vanished after write`);
 		return mapStep(row);
 	};
@@ -334,8 +388,8 @@ const createMysqlStore = (sql, t, id) => {
 		const runId = id();
 		if (spec.idempotencyKey) {
 			if ((await exec.exec(`INSERT IGNORE INTO ${t.run}
-           (id, name, version, status, input, idempotency_key, tags, parent_run_id, parent_cursor_key, depth, created_at)
-         VALUES (?, ?, ?, 'pending', ?, ?, ?, ?, ?, ?, ?)`, [
+           (id, name, version, status, input, idempotency_key, tags, parent_run_id, parent_cursor_key, depth, priority, created_at)
+         VALUES (?, ?, ?, 'pending', ?, ?, ?, ?, ?, ?, ?, ?)`, [
 				runId,
 				spec.name,
 				spec.version,
@@ -345,6 +399,7 @@ const createMysqlStore = (sql, t, id) => {
 				spec.parentRunId ?? null,
 				spec.parentCursorKey ?? null,
 				spec.depth ?? 0,
+				spec.priority ?? 0,
 				(spec.createdAt ?? /* @__PURE__ */ new Date()).getTime()
 			])).affectedRows === 1) return {
 				runId,
@@ -357,14 +412,14 @@ const createMysqlStore = (sql, t, id) => {
 				spec.idempotencyKey
 			]);
 			return {
-				runId: hit[0].id,
+				runId: text(hit[0], "id"),
 				created: false,
-				status: hit[0].status
+				status: runStatus(hit[0])
 			};
 		}
 		await exec.exec(`INSERT INTO ${t.run}
-         (id, name, version, status, input, tags, parent_run_id, parent_cursor_key, depth, created_at)
-       VALUES (?, ?, ?, 'pending', ?, ?, ?, ?, ?, ?)`, [
+         (id, name, version, status, input, tags, parent_run_id, parent_cursor_key, depth, priority, created_at)
+       VALUES (?, ?, ?, 'pending', ?, ?, ?, ?, ?, ?, ?)`, [
 			runId,
 			spec.name,
 			spec.version,
@@ -373,6 +428,7 @@ const createMysqlStore = (sql, t, id) => {
 			spec.parentRunId ?? null,
 			spec.parentCursorKey ?? null,
 			spec.depth ?? 0,
+			spec.priority ?? 0,
 			(spec.createdAt ?? /* @__PURE__ */ new Date()).getTime()
 		]);
 		return {
@@ -389,7 +445,7 @@ const createMysqlStore = (sql, t, id) => {
 		return sql.tx(async (tx) => {
 			const ids = (await tx.query(`SELECT id FROM ${t.run}
              WHERE ${q.where}
-             ${order} LIMIT ?`, params)).map((r) => r.id);
+             ${order} LIMIT ?`, params)).map((r) => text(r, "id"));
 			if (ids.length === 0) return 0;
 			const inIds = inList(ids.length);
 			await tx.exec(`DELETE FROM ${t.step} WHERE run_id IN ${inIds}`, ids);
@@ -414,14 +470,14 @@ const createMysqlStore = (sql, t, id) => {
 		async loadRun(runId) {
 			const [runRows, stepRows, sigRows] = await Promise.all([
 				sql.query(`SELECT * FROM ${t.run} WHERE id = ?`, [runId]),
-				sql.query(`SELECT cursor_key, status, result, error, attempts, shape FROM ${t.step} WHERE run_id = ?`, [runId]),
+				sql.query(`SELECT cursor_key, ${STEP_COLUMNS} FROM ${t.step} WHERE run_id = ?`, [runId]),
 				sql.query(`SELECT id, name, payload FROM ${t.signal} WHERE run_id = ? AND consumed = 0 ORDER BY seq`, [runId])
 			]);
 			const runRow = runRows[0];
 			if (!runRow) return void 0;
 			return {
 				run: mapRun(runRow),
-				steps: new Map(stepRows.map((r) => [r.cursor_key, mapStep(r)])),
+				steps: new Map(stepRows.map((r) => [text(r, "cursor_key"), mapStep(r)])),
 				signals: sigRows.map(mapSignal)
 			};
 		},
@@ -432,14 +488,14 @@ const createMysqlStore = (sql, t, id) => {
 		async loadRunRows(runIds) {
 			if (runIds.length === 0) return [];
 			const rows = await sql.query(`SELECT * FROM ${t.run} WHERE id IN ${inList(runIds.length)}`, runIds);
-			const byId = new Map(rows.map((r) => [r.id, mapRun(r)]));
+			const byId = new Map(rows.map(mapRun).map((run) => [run.id, run]));
 			return runIds.map((runId) => byId.get(runId));
 		},
 		arriveAtJoin(parentRunId) {
 			return sql.tx(async (tx) => {
 				if ((await tx.exec(`UPDATE ${t.run} SET join_remaining = join_remaining - 1 WHERE id = ?`, [parentRunId])).affectedRows === 0) return void 0;
 				const rows = await tx.query(`SELECT join_remaining FROM ${t.run} WHERE id = ?`, [parentRunId]);
-				return rows[0] ? Number(rows[0].join_remaining) : void 0;
+				return rows[0] ? int(rows[0], "join_remaining") : void 0;
 			});
 		},
 		async postSignal(runId, name, payload, opts) {
@@ -457,10 +513,10 @@ const createMysqlStore = (sql, t, id) => {
 		},
 		markRunning(runId) {
 			return sql.tx(async (tx) => {
-				const cur = await tx.query(`SELECT status, attempts FROM ${t.run} WHERE id = ? FOR UPDATE`, [runId]);
-				if (!cur[0]) throw new Error(`markRunning: run ${runId} not found`);
-				const attempts = Number(cur[0].attempts);
-				if (isTerminal(cur[0].status)) return attempts;
+				const [cur] = await tx.query(`SELECT status, attempts FROM ${t.run} WHERE id = ? FOR UPDATE`, [runId]);
+				if (!cur) throw new Error(`markRunning: run ${runId} not found`);
+				const attempts = int(cur, "attempts");
+				if (isTerminal(runStatus(cur))) return attempts;
 				await tx.exec(`UPDATE ${t.run} SET status = 'running', attempts = attempts + 1 WHERE id = ?`, [runId]);
 				return attempts + 1;
 			});
@@ -471,7 +527,7 @@ const createMysqlStore = (sql, t, id) => {
 				if (fx?.requireVersion !== void 0) {
 					if ((await tx.query(`SELECT 1 AS ok FROM ${t.step} WHERE run_id = ? AND cursor_key = ?`, [c.runId, c.cursorKey])).length === 0) {
 						const job = await tx.query(`SELECT version FROM ${t.job} WHERE run_id = ? FOR UPDATE`, [c.runId]);
-						if (!job[0] || Number(job[0].version) !== fx.requireVersion) return {
+						if (!job[0] || int(job[0], "version") !== fx.requireVersion) return {
 							status: c.status,
 							attempts: c.attempts,
 							committed: false
@@ -486,7 +542,7 @@ const createMysqlStore = (sql, t, id) => {
 					j(c.result),
 					j(c.error),
 					c.attempts,
-					c.shape ?? null
+					c.call ?? null
 				])).affectedRows === 1 && fx) await applyOutbox(tx, t, fx);
 				return loadStep(tx, c.runId, c.cursorKey);
 			});
@@ -502,7 +558,7 @@ const createMysqlStore = (sql, t, id) => {
 				const output = outcome.status === "done" ? outcome.output : void 0;
 				const error = outcome.status === "done" ? void 0 : outcome.error;
 				if ((await tx.exec(`UPDATE ${t.run} SET status = ?, output = ?, error = ?
-           WHERE id = ? AND status <> 'canceled'`, [
+           WHERE id = ? AND status NOT IN ${TERMINAL}`, [
 					outcome.status,
 					j(output),
 					j(error),
@@ -538,9 +594,9 @@ const createMysqlStore = (sql, t, id) => {
 			const clause = where.length ? `WHERE ${where.join(" AND ")}` : "";
 			const rows = await sql.query(`SELECT * FROM ${t.run} ${clause} ORDER BY seq DESC LIMIT ?`, params);
 			const last = rows[rows.length - 1];
-			const cursor = rows.length === page.limit && last ? String(last.seq) : void 0;
+			const cursor = rows.length === page.limit && last ? text(last, "seq") : void 0;
 			return {
-				runs: rows.map((r) => mapRun(r)),
+				runs: rows.map(mapRun),
 				cursor
 			};
 		},
@@ -549,7 +605,7 @@ const createMysqlStore = (sql, t, id) => {
 			if (!q) return 0;
 			const params = [...q.params, limit];
 			return sql.tx(async (tx) => {
-				const ids = (await tx.query(`SELECT id FROM ${t.run} WHERE ${q.where} LIMIT ? FOR UPDATE`, params)).map((r) => r.id);
+				const ids = (await tx.query(`SELECT id FROM ${t.run} WHERE ${q.where} LIMIT ? FOR UPDATE`, params)).map((r) => text(r, "id"));
 				if (ids.length === 0) return 0;
 				const inIds = inList(ids.length);
 				await tx.exec(`DELETE FROM ${t.timer} WHERE run_id IN ${inIds}`, ids);
@@ -562,21 +618,21 @@ const createMysqlStore = (sql, t, id) => {
 			if (!q) return 0;
 			const params = [...q.params, limit];
 			return sql.tx(async (tx) => {
-				const ids = (await tx.query(`SELECT id FROM ${t.run} WHERE ${q.where} LIMIT ? FOR UPDATE`, params)).map((r) => r.id);
+				const ids = (await tx.query(`SELECT id FROM ${t.run} WHERE ${q.where} LIMIT ? FOR UPDATE`, params)).map((r) => text(r, "id"));
 				if (ids.length === 0) return 0;
 				const inIds = inList(ids.length);
 				await tx.exec(`UPDATE ${t.run} SET status = 'pending', error = NULL, attempts = 0 WHERE id IN ${inIds}`, ids);
-				for (const runId of ids) await enqueueStmt(tx, t, runId);
+				await enqueueManyStmt(tx, t, ids.map((runId) => ({ runId })));
 				return ids.length;
 			});
 		},
 		async childrenOf(runId) {
-			return (await sql.query(`SELECT * FROM ${t.run} WHERE parent_run_id = ?`, [runId])).map((r) => mapRun(r));
+			return (await sql.query(`SELECT * FROM ${t.run} WHERE parent_run_id = ?`, [runId])).map(mapRun);
 		},
 		async runStats() {
 			const rows = await sql.query(`SELECT status, count(*) AS n FROM ${t.run} GROUP BY status`);
 			const stats = zeroRunStats();
-			for (const r of rows) stats[r.status] = Number(r.n);
+			for (const r of rows) stats[runStatus(r)] = int(r, "n");
 			return stats;
 		},
 		async orphanedRuns(limit) {
@@ -589,7 +645,7 @@ const createMysqlStore = (sql, t, id) => {
 				nonSuccessTerminal: NON_SUCCESS_TERMINAL,
 				order: "r.seq",
 				limit: "?"
-			}), [limit])).map((r) => r.id);
+			}), [limit])).map((r) => text(r, "id"));
 		},
 		deleteRuns,
 		deleteRunsOlderThan: (before, limit) => deleteRuns({ before }, limit),
@@ -635,8 +691,8 @@ const createMysqlStore = (sql, t, id) => {
 			if (names && names.length === 0) return 0;
 			const namePredicate = names ? ` AND flow_name IN ${inList(names.length)}` : "";
 			const params = names ? [now.getTime(), ...names] : [now.getTime()];
-			const rows = await sql.query(`SELECT count(*) AS n FROM ${t.cron} WHERE next_run_at <= ?${namePredicate}`, params);
-			return Number(rows[0]?.n ?? 0);
+			const [row] = await sql.query(`SELECT count(*) AS n FROM ${t.cron} WHERE next_run_at <= ?${namePredicate}`, params);
+			return int(row, "n");
 		},
 		async advanceCron(name, expectedNextRunAt, nextRunAt, lastRunAt) {
 			return (await sql.exec(`UPDATE ${t.cron} SET next_run_at = ?, last_run_at = ?
@@ -663,7 +719,7 @@ const createMysqlTimer = (sql, t) => {
 			return sql.tx(async (tx) => {
 				const due = await tx.query(`SELECT run_id FROM ${t.timer} WHERE fire_at <= ? ORDER BY fire_at LIMIT ? FOR UPDATE SKIP LOCKED`, [at, limit]);
 				if (!due.length) return [];
-				const ids = due.map((r) => r.run_id);
+				const ids = due.map((r) => text(r, "run_id"));
 				const holes = ids.map(() => "?").join(", ");
 				await tx.exec(`DELETE FROM ${t.timer} WHERE run_id IN (${holes})`, ids);
 				return ids;
@@ -673,16 +729,17 @@ const createMysqlTimer = (sql, t) => {
 			if (names && names.length === 0) return 0;
 			const namePredicate = names ? ` AND (r.name IS NULL OR r.name IN (${names.map(() => "?").join(",")}))` : "";
 			const params = names ? [now.getTime(), ...names] : [now.getTime()];
-			const rows = await sql.query(`SELECT count(*) AS n FROM ${t.timer} tm LEFT JOIN ${t.run} r ON r.id = tm.run_id
+			const [row] = await sql.query(`SELECT count(*) AS n FROM ${t.timer} tm LEFT JOIN ${t.run} r ON r.id = tm.run_id
          WHERE tm.fire_at <= ?${namePredicate}`, params);
-			return Number(rows[0]?.n ?? 0);
+			return int(row, "n");
 		},
 		async cancel(runId) {
 			await sql.exec(`DELETE FROM ${t.timer} WHERE run_id = ?`, [runId]);
 		},
 		async nextDueAt(now) {
-			const at = (await sql.query(`SELECT min(fire_at) AS fire_at FROM ${t.timer} WHERE fire_at > ?`, [now.getTime()]))[0]?.fire_at;
-			return at == null ? null : new Date(Number(at));
+			const [row] = await sql.query(`SELECT min(fire_at) AS fire_at FROM ${t.timer} WHERE fire_at > ?`, [now.getTime()]);
+			const at = intOrNull(row, "fire_at");
+			return at === null ? null : new Date(at);
 		}
 	};
 };
@@ -705,16 +762,18 @@ const createMysqlBackend = (sql, opts = {}) => {
 };
 //#endregion
 //#region src/sql.ts
-const write = (r) => {
-	const h = r[0];
-	return {
-		affectedRows: h.affectedRows,
-		insertId: h.insertId
-	};
-};
 const bind = (q) => ({
-	query: (text, params) => q.query(text, params).then((r) => r[0]),
-	exec: (text, params) => q.query(text, params).then(write)
+	query: async (text, params) => {
+		const [result] = await q.query(text, params && [...params]);
+		return Array.isArray(result) ? result : [];
+	},
+	exec: async (text, params) => {
+		const [{ affectedRows, insertId }] = await q.query(text, params && [...params]);
+		return {
+			affectedRows,
+			insertId
+		};
+	}
 });
 const onConn = (c) => ({
 	...bind(c),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iterativeflow/mysql",
-  "version": "2.7.0",
+  "version": "3.1.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@iterativeflow/core": "2.7.0"
+    "@iterativeflow/core": "3.1.0"
   },
   "peerDependencies": {
     "mysql2": ">=3.0.0"