@brandboostinggmbh/observable-workflows 0.17.6 → 0.18.0

package/dist/index.d.ts

@@ -6,7 +6,6 @@ declare function createStepContext(context: StepContextOptions): Promise<{
     metadata?: Record<string, any>;
   }, callback: (ctx: StepCtx) => Promise<RESULT>): Promise<RESULT>;
 }>;
-
 //#endregion
 //#region src/observableWorkflows/migrations.d.ts
 
@@ -16,7 +15,8 @@ declare function createStepContext(context: StepContextOptions): Promise<{
  *
  * @param db - D1Database instance
  */
-declare function ensureTables(db: D1Database): Promise<void>; //#endregion
+declare function ensureTables(db: D1Database): Promise<void>;
+//#endregion
 //#region src/observableWorkflows/helperFunctions.d.ts
 declare function finalizeWorkflowRecord(options: InternalWorkflowContextOptions, {
   workflowStatus,
@@ -171,7 +171,6 @@ declare function upsertWorkflowProperty<T extends keyof ValueTypeMap>({
   value: ValueTypeMap[T];
   tenantId: string;
 }): Promise<boolean>;
-
 //#endregion
 //#region src/observableWorkflows/types.d.ts
 type StepContextOptions = {
@@ -438,7 +437,6 @@ type WorkflowCallParams<I> = {
   /** Optional trigger identifier for workflow correlation */
   triggerId?: string | null;
 };
-
 //#endregion
 //#region src/observableWorkflows/createLogAccessor.d.ts
 declare const createLogAccessor: (context: {
@@ -489,7 +487,6 @@ declare const createLogAccessor: (context: {
     failedWorkflowCount: number;
   }[]>;
 };
-
 //#endregion
 //#region src/observableWorkflows/createQueueWorkflowContext.d.ts
 declare function createQueueWorkflowContext(options: QueueWorkflowContextOptions): {
@@ -502,11 +499,9 @@ declare function createQueueWorkflowContext(options: QueueWorkflowContextOptions
     workflowResolver
   }: HandleWorkflowQueueMessageParams) => Promise<void>;
 };
-
 //#endregion
 //#region src/observableWorkflows/createWorkflowContext.d.ts
 declare function createWorkflowContext(options: WorkflowContextOptions): WorkflowContextInstance;
-
 //#endregion
 //#region src/observableWorkflows/defaultImplementations.d.ts
 declare const defaultSerializer: {
@@ -517,7 +512,6 @@ declare const defaultSerializer: {
   deserialize: (text: string, reviver?: (this: any, key: string, value: any) => any) => any;
 };
 declare const defaultIdFactory: () => string;
-
 //#endregion
 //#region src/observableWorkflows/defineWorkflow.d.ts
 declare function defineWorkflow<I extends {} | null>(workflow: {
@@ -525,7 +519,6 @@ declare function defineWorkflow<I extends {} | null>(workflow: {
   metadata?: Record<string, any>;
 }, callback: (input: I, ctx: WorkflowContext) => Promise<any>): WorkflowFunction<I>;
 declare function defineWorkflow<I extends {} | null>(workflowType: string, callback: (input: I, ctx: WorkflowContext) => Promise<any>): WorkflowFunction<I>;
-
 //#endregion
 //#region src/observableWorkflows/r2ExternalBlobStorage.d.ts
 /**
@@ -561,7 +554,6 @@ type R2ExternalBlobStorageOptions = {
  * ```
  */
 declare function createR2ExternalBlobStorage(options: R2ExternalBlobStorageOptions): ExternalBlobStorage;
-
 //#endregion
 //#region src/observableWorkflows/createCleanupManager.d.ts
 type DeleteConfig = {
@@ -618,6 +610,5 @@ declare const createCleanupManager: (context: {
     deletedOrphanedLogs: number;
   }>;
 };
-
 //#endregion
 export { ConsoleWrapper, DateRangeFilter, ExternalBlobStorage, HandleWorkflowQueueMessageParams, InternalWorkflowContextOptions, Log, PossibleValueTypeNames, PossibleValueTypes, PropertyFilter, QueueWorkflowContextOptions, R2ExternalBlobStorageOptions, Serializer, Step, StepContextOptions, StepCtx, StepWorkflowStatus, StringFilter, ValueTypeMap, WorkflowContext, WorkflowContextInstance, WorkflowContextOptions, WorkflowEnqueueBatchItem, WorkflowFilter, WorkflowFunction, WorkflowProperty, WorkflowPropertyDefinition, WorkflowQueueMessage, WorkflowRun, createCleanupManager, createLogAccessor, createQueueWorkflowContext, createR2ExternalBlobStorage, createStepContext, createWorkflowContext, defaultIdFactory, defaultSerializer, defineWorkflow, deserializeWithExternalStorage, ensureTables, finalizeWorkflowRecord, insertStepRecordFull, insertWorkflowRecord, pushLogToDB, serializeWithExternalStorage, tryDeserializeObj, updateWorkflowName, upsertWorkflowProperty, workflowTableRowToWorkflowRun };

package/dist/index.js

@@ -51,9 +51,7 @@ async function migrateWorkflowTableV1ToV2(db) {
 	const hasInputRef = workflowTableInfo.sql.includes("inputRef");
 	const inputHasNotNull = workflowTableInfo.sql.includes("input TEXT NOT NULL");
 	if (!hasInputRef || inputHasNotNull) await db.batch([
-		db.prepare(
-			/* sql */
-			`CREATE TABLE WorkflowTable_new (
+		db.prepare(`CREATE TABLE WorkflowTable_new (
         instanceId TEXT NOT NULL,
         workflowType TEXT NOT NULL,
         workflowName TEXT NOT NULL,
@@ -66,16 +64,12 @@ async function migrateWorkflowTableV1ToV2(db) {
         endTime INTEGER,
         parentInstanceId TEXT,
         PRIMARY KEY (instanceId)
-      )`
-),
-		db.prepare(
-			/* sql */
-			`INSERT INTO WorkflowTable_new 
+      )`),
+		db.prepare(`INSERT INTO WorkflowTable_new 
         SELECT instanceId, workflowType, workflowName, workflowMetadata, 
                CASE WHEN input = '' THEN NULL ELSE input END as input,
                NULL as inputRef, tenantId, workflowStatus, startTime, endTime, parentInstanceId
-        FROM WorkflowTable`
-),
+        FROM WorkflowTable`),
 		db.prepare(`DROP TABLE WorkflowTable`),
 		db.prepare(`ALTER TABLE WorkflowTable_new RENAME TO WorkflowTable`)
 	]);
@@ -88,9 +82,7 @@ async function migrateWorkflowTableV2V3ToV4(db) {
 	const workflowTableInfo = await db.prepare(`SELECT sql FROM sqlite_master WHERE type='table' AND name='WorkflowTable'`).first();
 	const hasTriggerId = workflowTableInfo.sql.includes("triggerId");
 	if (!hasTriggerId) await db.batch([
-		db.prepare(
-			/* sql */
-			`CREATE TABLE WorkflowTable_new (
+		db.prepare(`CREATE TABLE WorkflowTable_new (
         instanceId TEXT NOT NULL,
         workflowType TEXT NOT NULL,
         workflowName TEXT NOT NULL,
@@ -105,16 +97,12 @@ async function migrateWorkflowTableV2V3ToV4(db) {
         triggerId TEXT,
         PRIMARY KEY (instanceId),
         UNIQUE (triggerId)
-      )`
-),
-		db.prepare(
-			/* sql */
-			`INSERT INTO WorkflowTable_new 
+      )`),
+		db.prepare(`INSERT INTO WorkflowTable_new 
         SELECT instanceId, workflowType, workflowName, workflowMetadata, 
                input, inputRef, tenantId, workflowStatus, startTime, endTime, parentInstanceId,
                NULL as triggerId
-        FROM WorkflowTable`
-),
+        FROM WorkflowTable`),
 		db.prepare(`DROP TABLE WorkflowTable`),
 		db.prepare(`ALTER TABLE WorkflowTable_new RENAME TO WorkflowTable`)
 	]);
@@ -124,9 +112,7 @@ async function migrateWorkflowTableV2V3ToV4(db) {
 */
 async function migrateWorkflowTable(db, currentVersion) {
 	if (currentVersion === "missing") {
-		await db.prepare(
-			/* sql */
-			`CREATE TABLE WorkflowTable (
+		await db.prepare(`CREATE TABLE WorkflowTable (
           instanceId TEXT NOT NULL,
           workflowType TEXT NOT NULL,
           workflowName TEXT NOT NULL,
@@ -141,8 +127,7 @@ async function migrateWorkflowTable(db, currentVersion) {
           triggerId TEXT,
           PRIMARY KEY (instanceId),
           UNIQUE (triggerId)
-        )`
-).run();
+        )`).run();
 		return;
 	}
 	if (currentVersion === "v1") {
@@ -160,9 +145,7 @@ async function migrateWorkflowTable(db, currentVersion) {
 */
 async function migrateStepTable(db, currentVersion) {
 	if (currentVersion === "missing") {
-		await db.prepare(
-			/* sql */
-			`CREATE TABLE StepTable (
+		await db.prepare(`CREATE TABLE StepTable (
           instanceId TEXT NOT NULL,
           stepName TEXT NOT NULL,
           stepStatus TEXT NOT NULL,
@@ -176,8 +159,7 @@ async function migrateStepTable(db, currentVersion) {
           tenantId TEXT NOT NULL,
           PRIMARY KEY (instanceId, stepName),
           FOREIGN KEY (instanceId) REFERENCES WorkflowTable(instanceId) ON DELETE CASCADE
-        )`
-).run();
+        )`).run();
 		return;
 	}
 	if (currentVersion === "v1") {
@@ -193,9 +175,7 @@ async function migrateStepTable(db, currentVersion) {
 */
 async function migrateLogTable(db, currentVersion) {
 	if (currentVersion === "missing") {
-		await db.prepare(
-			/* sql */
-			`CREATE TABLE LogTable (
+		await db.prepare(`CREATE TABLE LogTable (
           instanceId TEXT NOT NULL,
           stepName TEXT,
           log TEXT NOT NULL,
@@ -205,8 +185,7 @@ async function migrateLogTable(db, currentVersion) {
           tenantId TEXT NOT NULL,
           FOREIGN KEY (instanceId, stepName) REFERENCES StepTable(instanceId, stepName) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
           FOREIGN KEY (instanceId) REFERENCES WorkflowTable(instanceId) ON DELETE CASCADE
-        )`
-).run();
+        )`).run();
 		return;
 	}
 }
@@ -215,9 +194,7 @@ async function migrateLogTable(db, currentVersion) {
 */
 async function migrateWorkflowPropertiesTable(db, currentVersion) {
 	if (currentVersion === "missing") {
-		await db.prepare(
-			/* sql */
-			`CREATE TABLE WorkflowProperties (
+		await db.prepare(`CREATE TABLE WorkflowProperties (
           instanceId TEXT NOT NULL,
           key TEXT NOT NULL,
           value TEXT NOT NULL,
@@ -226,8 +203,7 @@ async function migrateWorkflowPropertiesTable(db, currentVersion) {
           PRIMARY KEY (instanceId, key),
           FOREIGN KEY (instanceId) REFERENCES WorkflowTable(instanceId)
           ON DELETE CASCADE
-        )`
-).run();
+        )`).run();
 		return;
 	}
 }
@@ -235,21 +211,73 @@ async function migrateWorkflowPropertiesTable(db, currentVersion) {
 * Create necessary indexes
 */
 async function createIndexes(db) {
-	await db.prepare(`CREATE INDEX IF NOT EXISTS idx_workflows_parent_instance_id ON WorkflowTable (parentInstanceId)`).run();
-	await db.prepare(`CREATE INDEX IF NOT EXISTS idx_workflows_trigger_id ON WorkflowTable (triggerId)`).run();
-	await db.prepare(`CREATE INDEX IF NOT EXISTS idx_workflows_start_time ON WorkflowTable (startTime)`).run();
-	await db.prepare(`CREATE INDEX IF NOT EXISTS idx_workflows_tenant_id ON WorkflowTable (tenantId)`).run();
-	await db.prepare(`CREATE INDEX IF NOT EXISTS idx_workflows_tenant_starttime ON WorkflowTable (tenantId, startTime DESC)`).run();
-	await db.prepare(`CREATE INDEX IF NOT EXISTS idx_workflows_instance_id ON WorkflowTable (instanceId)`).run();
-	await db.prepare(`CREATE INDEX IF NOT EXISTS idx_workflows_status ON WorkflowTable (workflowStatus)`).run();
-	await db.prepare(`CREATE INDEX IF NOT EXISTS idx_steps_instance_id ON StepTable (instanceId)`).run();
-	await db.prepare(`CREATE INDEX IF NOT EXISTS idx_steps_tenant_id ON StepTable (tenantId)`).run();
-	await db.prepare(`CREATE INDEX IF NOT EXISTS idx_steps_start_time ON StepTable (startTime)`).run();
-	await db.prepare(`CREATE INDEX IF NOT EXISTS idx_steps_instance_starttime ON StepTable (instanceId, startTime)`).run();
-	await db.prepare(`CREATE INDEX IF NOT EXISTS idx_logs_instance_id ON LogTable (instanceId)`).run();
-	await db.prepare(`CREATE INDEX IF NOT EXISTS idx_logs_tenant_id ON LogTable (tenantId)`).run();
-	await db.prepare(`CREATE INDEX IF NOT EXISTS idx_workflow_properties_tenant_id ON WorkflowProperties (tenantId)`).run();
-	await db.prepare(`CREATE INDEX IF NOT EXISTS idx_workflow_properties_tenant_key ON WorkflowProperties (tenantId, key, valueType)`).run();
+	const existingIndexes = await db.prepare(`SELECT name FROM sqlite_master WHERE type='index' AND name LIKE 'idx_%'`).all();
+	const existingIndexNames = new Set(existingIndexes.results?.map((row) => row.name) || []);
+	const indexes = [
+		{
+			name: "idx_workflows_parent_instance_id",
+			sql: `CREATE INDEX idx_workflows_parent_instance_id ON WorkflowTable (parentInstanceId)`
+		},
+		{
+			name: "idx_workflows_trigger_id",
+			sql: `CREATE INDEX idx_workflows_trigger_id ON WorkflowTable (triggerId)`
+		},
+		{
+			name: "idx_workflows_start_time",
+			sql: `CREATE INDEX idx_workflows_start_time ON WorkflowTable (startTime)`
+		},
+		{
+			name: "idx_workflows_tenant_id",
+			sql: `CREATE INDEX idx_workflows_tenant_id ON WorkflowTable (tenantId)`
+		},
+		{
+			name: "idx_workflows_tenant_starttime",
+			sql: `CREATE INDEX idx_workflows_tenant_starttime ON WorkflowTable (tenantId, startTime DESC)`
+		},
+		{
+			name: "idx_workflows_instance_id",
+			sql: `CREATE INDEX idx_workflows_instance_id ON WorkflowTable (instanceId)`
+		},
+		{
+			name: "idx_workflows_status",
+			sql: `CREATE INDEX idx_workflows_status ON WorkflowTable (workflowStatus)`
+		},
+		{
+			name: "idx_steps_instance_id",
+			sql: `CREATE INDEX idx_steps_instance_id ON StepTable (instanceId)`
+		},
+		{
+			name: "idx_steps_tenant_id",
+			sql: `CREATE INDEX idx_steps_tenant_id ON StepTable (tenantId)`
+		},
+		{
+			name: "idx_steps_start_time",
+			sql: `CREATE INDEX idx_steps_start_time ON StepTable (startTime)`
+		},
+		{
+			name: "idx_steps_instance_starttime",
+			sql: `CREATE INDEX idx_steps_instance_starttime ON StepTable (instanceId, startTime)`
+		},
+		{
+			name: "idx_logs_instance_id",
+			sql: `CREATE INDEX idx_logs_instance_id ON LogTable (instanceId)`
+		},
+		{
+			name: "idx_logs_tenant_id",
+			sql: `CREATE INDEX idx_logs_tenant_id ON LogTable (tenantId)`
+		},
+		{
+			name: "idx_workflow_properties_tenant_id",
+			sql: `CREATE INDEX idx_workflow_properties_tenant_id ON WorkflowProperties (tenantId)`
+		},
+		{
+			name: "idx_workflow_properties_tenant_key",
+			sql: `CREATE INDEX idx_workflow_properties_tenant_key ON WorkflowProperties (tenantId, key, valueType)`
+		}
+	];
+	const preparedStatements = [];
+	for (const index of indexes) if (!existingIndexNames.has(index.name)) preparedStatements.push(db.prepare(index.sql));
+	if (preparedStatements.length > 0) await db.batch(preparedStatements);
 }
 /**
 * Main migration function that ensures all tables exist and are up-to-date.
@@ -270,35 +298,23 @@ async function ensureTables(db) {
 //#endregion
 //#region src/observableWorkflows/helperFunctions.ts
 function finalizeWorkflowRecord(options, { workflowStatus, endTime, instanceId }) {
-	return options.D1.prepare(
-		/* sql */
-		`UPDATE WorkflowTable
+	return options.D1.prepare(`UPDATE WorkflowTable
           SET workflowStatus = ?, endTime = ?
-          WHERE instanceId = ?`
-).bind(workflowStatus, endTime, instanceId).run();
+          WHERE instanceId = ?`).bind(workflowStatus, endTime, instanceId).run();
 }
 async function insertWorkflowRecord(options, { instanceId, workflowType, workflowName, workflowMetadata, input, workflowStatus, startTime, endTime, parentInstanceId, tenantId, triggerId }) {
 	const { data: inputData, externalRef: inputRef } = await serializeWithExternalStorage(input, options.serializer, options.externalBlobStorage);
-	return options.D1.prepare(
-		/* sql */
-		`INSERT INTO WorkflowTable
+	return options.D1.prepare(`INSERT INTO WorkflowTable
         (instanceId, workflowType, workflowName, workflowMetadata, input, inputRef, tenantId, workflowStatus, startTime, endTime, parentInstanceId, triggerId)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
-).bind(instanceId, workflowType, workflowName, options.serializer.serialize(workflowMetadata), inputData, inputRef, tenantId, workflowStatus, startTime, endTime ?? null, parentInstanceId ?? null, triggerId ?? null).run();
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).bind(instanceId, workflowType, workflowName, options.serializer.serialize(workflowMetadata), inputData, inputRef, tenantId, workflowStatus, startTime, endTime ?? null, parentInstanceId ?? null, triggerId ?? null).run();
 }
 function insertStepRecordFull(context, { instanceId, name, status, metadata, startTime, endTime, result, error, resultRef, errorRef }) {
-	return context.D1.prepare(
-		/* sql */
-		`INSERT INTO StepTable
+	return context.D1.prepare(`INSERT INTO StepTable
             (instanceId, stepName, stepStatus, stepMetadata, startTime, endTime, result, error, resultRef, errorRef, tenantId)
-            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
-).bind(instanceId, name, status, metadata, startTime, endTime, result, error, resultRef ?? null, errorRef ?? null, context.tenantId).run();
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).bind(instanceId, name, status, metadata, startTime, endTime, result, error, resultRef ?? null, errorRef ?? null, context.tenantId).run();
 }
 async function getStepRecord(context, stepName, instanceId) {
-	const existingStep = await context.D1.prepare(
-		/* sql */
-		`SELECT * FROM StepTable WHERE instanceId = ? AND stepName = ? AND tenantId = ?`
-).bind(instanceId, stepName, context.tenantId).first();
+	const existingStep = await context.D1.prepare(`SELECT * FROM StepTable WHERE instanceId = ? AND stepName = ? AND tenantId = ?`).bind(instanceId, stepName, context.tenantId).first();
 	const row = existingStep;
 	if (row) {
 		const result = await deserializeWithExternalStorage(row.result, row.resultRef, context.serializer, context.externalBlobStorage);
@@ -372,12 +388,9 @@ function truncateLogMessage(message) {
 }
 function pushLogToDB(options, { instanceId, stepName, message, timestamp, type, logOrder, tenantId }) {
 	const truncatedMessage = truncateLogMessage(message);
-	return options.D1.prepare(
-		/* sql */
-		`INSERT INTO LogTable
+	return options.D1.prepare(`INSERT INTO LogTable
            (instanceId, stepName, log, timestamp, type, logOrder, tenantId)
-           VALUES (?, ?, ?, ?, ?, ?, ?)`
-).bind(instanceId, stepName, truncatedMessage, timestamp, type, logOrder, tenantId).run();
+           VALUES (?, ?, ?, ?, ?, ?, ?)`).bind(instanceId, stepName, truncatedMessage, timestamp, type, logOrder, tenantId).run();
 }
 var LogBatcher = class {
 	batch = [];
@@ -412,12 +425,9 @@ var LogBatcher = class {
 		if (this.batch.length === 0) return;
 		const logsToFlush = this.batch.splice(0);
 		try {
-			const statements = logsToFlush.map((entry) => this.options.D1.prepare(
-				/* sql */
-				`INSERT INTO LogTable
+			const statements = logsToFlush.map((entry) => this.options.D1.prepare(`INSERT INTO LogTable
                  (instanceId, stepName, log, timestamp, type, logOrder, tenantId)
-                 VALUES (?, ?, ?, ?, ?, ?, ?)`
-).bind(entry.instanceId, entry.stepName, entry.message, entry.timestamp, entry.type, entry.logOrder, entry.tenantId));
+                 VALUES (?, ?, ?, ?, ?, ?, ?)`).bind(entry.instanceId, entry.stepName, entry.message, entry.timestamp, entry.type, entry.logOrder, entry.tenantId));
 			await this.options.D1.batch(statements);
 		} catch (error) {
 			console.error("Batch log insert failed, falling back to individual inserts:", error);
@@ -543,22 +553,16 @@ async function workflowTableRowToWorkflowRun({ row, serializer, externalBlobStor
 	};
 }
 async function updateWorkflowName(context, instanceId, newWorkflowName) {
-	return await context.D1.prepare(
-		/* sql */
-		`UPDATE WorkflowTable
+	return await context.D1.prepare(`UPDATE WorkflowTable
           SET workflowName = ?
-          WHERE instanceId = ?`
-).bind(newWorkflowName, instanceId).run();
+          WHERE instanceId = ?`).bind(newWorkflowName, instanceId).run();
 }
 async function upsertWorkflowProperty({ context, instanceId, key, value, tenantId }) {
 	const valueType = typeof value;
 	const serializedValue = valueType === "object" ? JSON.stringify(value) : String(value);
-	const res = await context.D1.prepare(
-		/* sql */
-		`INSERT OR REPLACE INTO WorkflowProperties
+	const res = await context.D1.prepare(`INSERT OR REPLACE INTO WorkflowProperties
           (instanceId, key, value, valueType, tenantId)
-          VALUES (?, ?, ?, ?, ?)`
-).bind(instanceId, key, serializedValue, valueType, tenantId).run();
+          VALUES (?, ?, ?, ?, ?)`).bind(instanceId, key, serializedValue, valueType, tenantId).run();
 	if (res.error) {
 		console.error("Error inserting workflow property:", res.error);
 		return false;
@@ -779,15 +783,12 @@ const createLogAccessor = (context) => {
 			})));
 			if (options?.populateProperties && workflows.length > 0) {
 				const instanceIds = workflows.map((w) => w.instanceId);
-				const BATCH_SIZE = 100;
+				const BATCH_SIZE = 80;
 				const propertiesByInstanceId = new Map();
 				for (let i = 0; i < instanceIds.length; i += BATCH_SIZE) {
 					const batchIds = instanceIds.slice(i, i + BATCH_SIZE);
 					const placeholders = batchIds.map(() => "?").join(", ");
-					const propertiesResult = await context.D1.prepare(
-						/* sql */
-						`SELECT * FROM WorkflowProperties WHERE instanceId IN (${placeholders}) AND tenantId = ?`
-).bind(...batchIds, context.tenantId).all();
+					const propertiesResult = await context.D1.prepare(`SELECT * FROM WorkflowProperties WHERE instanceId IN (${placeholders}) AND tenantId = ?`).bind(...batchIds, context.tenantId).all();
 					if (propertiesResult.results) for (const row of propertiesResult.results) {
 						const property = {
 							key: row.key,
@@ -806,10 +807,7 @@ const createLogAccessor = (context) => {
 		return [];
 	};
 	const getWorkflowByParentId = async (parentInstanceId) => {
-		const result = await context.D1.prepare(
-			/* sql */
-			`SELECT * FROM WorkflowTable WHERE parentInstanceId = ? AND tenantId = ?`
-).bind(parentInstanceId, context.tenantId).all();
+		const result = await context.D1.prepare(`SELECT * FROM WorkflowTable WHERE parentInstanceId = ? AND tenantId = ?`).bind(parentInstanceId, context.tenantId).all();
 		if (result.results) {
 			const workflows = await Promise.all(result.results.map((row) => workflowTableRowToWorkflowRun({
 				row,
@@ -821,10 +819,7 @@ const createLogAccessor = (context) => {
 		return null;
 	};
 	const getWorkflowByTriggerId = async (triggerId) => {
-		const result = await context.D1.prepare(
-			/* sql */
-			`SELECT * FROM WorkflowTable WHERE triggerId = ? AND tenantId = ?`
-).bind(triggerId, context.tenantId).first();
+		const result = await context.D1.prepare(`SELECT * FROM WorkflowTable WHERE triggerId = ? AND tenantId = ?`).bind(triggerId, context.tenantId).first();
 		if (result) {
 			const workflow = await workflowTableRowToWorkflowRun({
 				row: result,
@@ -836,18 +831,12 @@ const createLogAccessor = (context) => {
 		return null;
 	};
 	const getWorkflowTypesByTenantId = async (tenantId) => {
-		const result = await context.D1.prepare(
-			/* sql */
-			`SELECT DISTINCT workflowType FROM WorkflowTable WHERE tenantId = ?`
-).bind(tenantId).all();
+		const result = await context.D1.prepare(`SELECT DISTINCT workflowType FROM WorkflowTable WHERE tenantId = ?`).bind(tenantId).all();
 		if (!result.results) return [];
 		return result.results.map((row) => row.workflowType);
 	};
 	const getWorkflowProperties = async (instanceId) => {
-		const result = await context.D1.prepare(
-			/* sql */
-			`SELECT * FROM WorkflowProperties WHERE instanceId = ?`
-).bind(instanceId).all();
+		const result = await context.D1.prepare(`SELECT * FROM WorkflowProperties WHERE instanceId = ?`).bind(instanceId).all();
 		if (!result.results) return [];
 		return result.results.map((row) => ({
 			key: row.key,
@@ -857,10 +846,7 @@ const createLogAccessor = (context) => {
 	};
 	/** This function gets the basic data of a workflow, without populating any of it's complex fields */
 	const getWorkflowShallow = async (instanceId) => {
-		const result = await context.D1.prepare(
-			/* sql */
-			`SELECT * FROM WorkflowTable WHERE instanceId = ? AND tenantId = ?`
-).bind(instanceId, context.tenantId).first();
+		const result = await context.D1.prepare(`SELECT * FROM WorkflowTable WHERE instanceId = ? AND tenantId = ?`).bind(instanceId, context.tenantId).first();
 		if (!result) return null;
 		const workflow = await workflowTableRowToWorkflowRun({
 			row: result,
@@ -883,10 +869,7 @@ const createLogAccessor = (context) => {
 			retryWorkflow.isRetryOf = workflow;
 		});
 		workflow.isRetryOf = parentWorkflow;
-		const allLogs = await context.D1.prepare(
-			/* sql */
-			`SELECT * FROM LogTable WHERE instanceId = ? ORDER BY timestamp ASC, logOrder ASC`
-).bind(instanceId).all();
+		const allLogs = await context.D1.prepare(`SELECT * FROM LogTable WHERE instanceId = ? ORDER BY timestamp ASC, logOrder ASC`).bind(instanceId).all();
 		const logs = allLogs.results?.map((logRow) => ({
 			instanceId: logRow.instanceId,
 			stepName: logRow.stepName,
@@ -904,10 +887,7 @@ const createLogAccessor = (context) => {
 		return workflow;
 	};
 	const getStep = async (instanceId, stepName) => {
-		const result = await context.D1.prepare(
-			/* sql */
-			`SELECT * FROM StepTable WHERE instanceId = ? AND stepName = ? AND tenantId = ?`
-).bind(instanceId, stepName, context.tenantId).all();
+		const result = await context.D1.prepare(`SELECT * FROM StepTable WHERE instanceId = ? AND stepName = ? AND tenantId = ?`).bind(instanceId, stepName, context.tenantId).all();
 		if (!result.results || result.results.length === 0) return null;
 		const row = result.results[0];
 		if (!row) return null;
@@ -924,10 +904,7 @@ const createLogAccessor = (context) => {
 			error: deserializedError,
 			logs: []
 		};
-		const logResult = await context.D1.prepare(
-			/* sql */
-			`SELECT * FROM LogTable WHERE instanceId = ? AND stepName = ? ORDER BY logOrder ASC`
-).bind(instanceId, stepName).all();
+		const logResult = await context.D1.prepare(`SELECT * FROM LogTable WHERE instanceId = ? AND stepName = ? ORDER BY logOrder ASC`).bind(instanceId, stepName).all();
 		if (logResult.results) step.logs = logResult.results.map((logRow) => ({
 			instanceId: logRow.instanceId,
 			stepName: logRow.stepName,
@@ -938,13 +915,10 @@ const createLogAccessor = (context) => {
 		return step;
 	};
 	const getPropertiesKeys = async (instanceId) => {
-		const result = await context.D1.prepare(
-			/* sql */
-			`
+		const result = await context.D1.prepare(`
       SELECT DISTINCT key, valueType FROM WorkflowProperties
       WHERE tenantId = ? AND (? IS NULL OR instanceId = ?)  
-      `
-).bind(context.tenantId, instanceId ?? null, instanceId ?? null).all();
+      `).bind(context.tenantId, instanceId ?? null, instanceId ?? null).all();
 		console.log(`debug getPropertiesKeys: ${JSON.stringify(result)}`);
 		if (!result.results) return [];
 		return result.results.map((row) => ({
@@ -967,9 +941,7 @@ const createLogAccessor = (context) => {
 			bindings.push(toTime);
 		}
 		const whereClause = whereConditions.length > 0 ? `WHERE ${whereConditions.join(" AND ")}` : "";
-		const result = await context.D1.prepare(
-			/* sql */
-			`
+		const result = await context.D1.prepare(`
       SELECT 
         workflowType,
         COUNT(*) as workflowCount,
@@ -1012,8 +984,7 @@ const createLogAccessor = (context) => {
       ${whereClause}
       GROUP BY workflowType
       ORDER BY workflowCount DESC
-    `
-).bind(...bindings).all();
+    `).bind(...bindings).all();
 		if (!result.results) return [];
 		return result.results.map((row) => ({
 			workflowType: row.workflowType,
@@ -1191,12 +1162,9 @@ async function createStepContext(context) {
 			const stepStatus$1 = "completed";
 			const { data: resultData, externalRef: resultRef } = await serializeWithExternalStorage(result, context.serializer, context.externalBlobStorage);
 			const stepError$1 = null;
-			await context.D1.prepare(
-				/* sql */
-				`UPDATE StepTable
+			await context.D1.prepare(`UPDATE StepTable
           SET stepStatus = ?, endTime = ?, result = ?, error = ?, resultRef = ?, errorRef = ?
-          WHERE instanceId = ? AND stepName = ?`
-).bind(stepStatus$1, endTime, resultData, stepError$1, resultRef, null, instanceId, stepName).run();
+          WHERE instanceId = ? AND stepName = ?`).bind(stepStatus$1, endTime, resultData, stepError$1, resultRef, null, instanceId, stepName).run();
 			await logBatcher.destroy();
 			return result;
 		} catch (error) {
@@ -1204,12 +1172,9 @@ async function createStepContext(context) {
 			const stepStatus$1 = "failed";
 			const stepResult$1 = null;
 			const { data: errorData, externalRef: errorRef } = await serializeWithExternalStorage(error, context.serializer, context.externalBlobStorage);
-			await context.D1.prepare(
-				/* sql */
-				`UPDATE StepTable
+			await context.D1.prepare(`UPDATE StepTable
           SET stepStatus = ?, endTime = ?, result = ?, error = ?, resultRef = ?, errorRef = ?
-          WHERE instanceId = ? AND stepName = ?`
-).bind(stepStatus$1, endTime, stepResult$1, errorData, null, errorRef, instanceId, stepName).run();
+          WHERE instanceId = ? AND stepName = ?`).bind(stepStatus$1, endTime, stepResult$1, errorData, null, errorRef, instanceId, stepName).run();
 			await logBatcher.destroy();
 			throw error;
 		}
@@ -1337,10 +1302,7 @@ function createWorkflowContext(options) {
 			await ensureTables(options.D1);
 			ensuredTables = true;
 		}
-		const oldRun = await options.D1.prepare(
-			/* sql */
-			`SELECT input, workflowName, tenantId, inputRef FROM WorkflowTable WHERE instanceId = ? `
-).bind(retryInstanceId).first();
+		const oldRun = await options.D1.prepare(`SELECT input, workflowName, tenantId, inputRef FROM WorkflowTable WHERE instanceId = ? `).bind(retryInstanceId).first();
 		const oldWorkflowName = oldRun?.workflowName;
 		const tenantId = oldRun?.tenantId;
 		if (!tenantId) throw new Error(`No tenantId found for instanceId ${retryInstanceId}`);
@@ -1462,9 +1424,7 @@ const createCleanupManager = (context) => {
 	const getAffectedWorkflows = async (config, limit) => {
 		const { statuses, statusPlaceholders } = buildStatusesAndPlaceholders(config);
 		if (statuses.length === 0) return [];
-		const result = await context.D1.prepare(
-			/* sql */
-			`
+		const result = await context.D1.prepare(`
       SELECT instanceId, inputRef
       FROM WorkflowTable
       WHERE tenantId = ? 
@@ -1472,16 +1432,13 @@ const createCleanupManager = (context) => {
         AND workflowStatus IN (${statusPlaceholders})
       ORDER BY instanceId
       LIMIT ?
-    `
-).bind(context.tenantId, config.deleteWorkflowsOlderThanDays, ...statuses, limit).all();
+    `).bind(context.tenantId, config.deleteWorkflowsOlderThanDays, ...statuses, limit).all();
 		return result.results;
 	};
 	const getAffectedSteps = async (config, limit) => {
 		const { statuses, statusPlaceholders } = buildStatusesAndPlaceholders(config);
 		if (statuses.length === 0) return [];
-		const result = await context.D1.prepare(
-			/* sql */
-			`
+		const result = await context.D1.prepare(`
       SELECT s.instanceId, s.stepName, s.stepStatus, s.errorRef, s.resultRef
       FROM StepTable s
       WHERE s.instanceId IN (
@@ -1494,8 +1451,7 @@ const createCleanupManager = (context) => {
         LIMIT ?
       )
       ORDER BY s.instanceId, s.stepName
-    `
-).bind(context.tenantId, config.deleteWorkflowsOlderThanDays, ...statuses, limit).all();
+    `).bind(context.tenantId, config.deleteWorkflowsOlderThanDays, ...statuses, limit).all();
 		return result.results;
 	};
 	const collectExternalStorageKeys = (workflows, steps) => {
@@ -1553,13 +1509,10 @@ const createCleanupManager = (context) => {
 			for (let i = 0; i < deletedWorkflows.length; i += 100) {
 				const batch = deletedWorkflows.slice(i, i + 100);
 				const workflowIds = batch.map(() => "?").join(", ");
-				const result = await context.D1.prepare(
-					/* sql */
-					`
+				const result = await context.D1.prepare(`
           DELETE FROM WorkflowTable 
           WHERE instanceId IN (${workflowIds})
-        `
-).bind(...batch.map((w) => w.instanceId)).run();
+        `).bind(...batch.map((w) => w.instanceId)).run();
 				totalDeletedCount += result.meta.changes || 0;
 			}
 			return {
@@ -1576,9 +1529,7 @@ const createCleanupManager = (context) => {
 	};
 	const cleanupOrphanedSteps = async (config, limit) => {
 		await context.D1.prepare(`PRAGMA foreign_keys = ON`).run();
-		const orphanedSteps = await context.D1.prepare(
-			/* sql */
-			`
+		const orphanedSteps = await context.D1.prepare(`
       SELECT s.instanceId, s.stepName, s.errorRef, s.resultRef
       FROM StepTable s
       WHERE s.tenantId = ?
@@ -1588,8 +1539,7 @@ const createCleanupManager = (context) => {
         )
       ORDER BY s.instanceId, s.stepName
       LIMIT ?
-    `
-).bind(context.tenantId, context.tenantId, limit).all();
+    `).bind(context.tenantId, context.tenantId, limit).all();
 		const orphanedStepResults = orphanedSteps.results;
 		let deletedExternalStorageKeysCount = 0;
 		if (config.deleteRefsFromExternalStorage && context.externalBlobStorage && orphanedStepResults.length > 0) {
@@ -1605,14 +1555,11 @@ const createCleanupManager = (context) => {
 			for (let i = 0; i < orphanedStepResults.length; i += 99) {
 				const batch = orphanedStepResults.slice(i, i + 99);
 				const instanceIds = batch.map(() => "?").join(", ");
-				const deletedStepsResult = await context.D1.prepare(
-					/* sql */
-					`
+				const deletedStepsResult = await context.D1.prepare(`
           DELETE FROM StepTable 
           WHERE tenantId = ?
             AND instanceId IN (${instanceIds})
-        `
-).bind(context.tenantId, ...batch.map((s) => s.instanceId)).run();
+        `).bind(context.tenantId, ...batch.map((s) => s.instanceId)).run();
 				totalDeletedSteps += deletedStepsResult.meta.changes || 0;
 			}
 			return {
@@ -1629,9 +1576,7 @@ const createCleanupManager = (context) => {
 	};
 	const cleanupOrphanedLogs = async (limit) => {
 		await context.D1.prepare(`PRAGMA foreign_keys = ON`).run();
-		const deletedLogsResult = await context.D1.prepare(
-			/* sql */
-			`
+		const deletedLogsResult = await context.D1.prepare(`
       DELETE FROM LogTable
       WHERE tenantId = ?
         AND (
@@ -1646,8 +1591,7 @@ const createCleanupManager = (context) => {
           ))
         )
       LIMIT ?
-    `
-).bind(context.tenantId, context.tenantId, context.tenantId, limit).run();
+    `).bind(context.tenantId, context.tenantId, context.tenantId, limit).run();
 		return { deletedOrphanedLogs: deletedLogsResult.meta.changes || 0 };
 	};
 	return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brandboostinggmbh/observable-workflows",
-  "version": "0.17.6",
+  "version": "0.18.0",
   "description": "My awesome typescript library",
   "type": "module",
   "license": "MIT",