@brandboostinggmbh/observable-workflows 0.20.2-beta.1 → 0.21.0-beta.1

package/dist/index.d.ts

@@ -686,12 +686,14 @@ type WorkflowFunction<INPUT, OUTPUT, TYPE extends string = string> = {
    * Use either the WorkflowContect, or the QueueWorkflowContext to run or enqueue this. */
   _callback: (input: INPUT, ctx: WorkflowContext) => Promise<OUTPUT>;
 };
-type WorkflowEnqueueBatchItem<I, O> = {
-  workflow: WorkflowFunction<I, O>;
+type WorkflowEnqueueBatchItem<I, O, TYPE extends string = string> = {
+  workflow: WorkflowFunction<I, O, TYPE>;
   tenantId: string;
   input: I;
   initialName: string;
   dependencies?: WorkflowDependency[];
+  /** Optional trigger identifier for workflow correlation. If not provided, one will be auto-generated. */
+  triggerId?: string | null;
 };
 type WorkflowQueueMessage = {
   type: 'workflow-run';
@@ -874,7 +876,7 @@ declare const createLogAccessor: (context: {
 //#endregion
 //#region src/observableWorkflows/createQueueWorkflowContext.d.ts
 declare function createQueueWorkflowContext(options: QueueWorkflowContextOptions): {
-  enqueueWorkflow: <I, O, TYPE extends string>(workflow: WorkflowFunction<I, O, TYPE>, tenantId: string, input: I, initialName: string, dependencies?: WorkflowDependency[]) => Promise<ScheduledWorkflowExecutionStub<O, TYPE>>;
+  enqueueWorkflow: <I, O, TYPE extends string>(params: WorkflowEnqueueBatchItem<I, O, TYPE>) => Promise<ScheduledWorkflowExecutionStub<O, TYPE>>;
   enqueueWorkflowBatch: <I, O>(workflows: Array<WorkflowEnqueueBatchItem<I, O>>) => Promise<Array<ScheduledWorkflowExecutionStub<O, string>>>;
   enqueueRetryWorkflow: <I, O>(workflow: WorkflowFunction<I, O>, tenantId: string, oldInstanceId: string, reuseSuccessfulSteps?: boolean) => Promise<void>;
   handleWorkflowQueueMessage: ({

package/dist/index.js

@@ -1419,7 +1419,10 @@ const createLogAccessor = (context) => {
 			offset
 		]));
 		const result = await retryD1Operation(() => context.D1.prepare(sql).bind(...bindings, limit, offset).all(), context.retryConfig);
-		if (options?.debugLogs) console.log(`listWorkflows SQL Query executed in ${Date.now() - debugStartTime}ms, rows: ${result.results?.length ?? 0}`);
+		if (options?.debugLogs) {
+			console.log(`listWorkflows SQL Query executed in ${Date.now() - debugStartTime}ms, rows: ${result.results?.length ?? 0}`);
+			if (result.meta) console.log("listWorkflows D1 meta:", JSON.stringify(result.meta));
+		}
 		if (result.results) {
 			const deserializeStart = options?.debugLogs ? Date.now() : 0;
 			const workflows = await Promise.all(result.results.map((row) => workflowTableRowToWorkflowRun({
@@ -1515,6 +1518,10 @@ const createLogAccessor = (context) => {
 		}
 		return [];
 	};
+	/**
+	* Gets all workflows that have the given parentInstanceId. This is a shallow get - only returns
+	* base workflow data without steps, logs, properties, or dependencies.
+	*/
 	const getWorkflowByParentId = async (parentInstanceId) => {
 		const result = await retryD1Operation(() => context.D1.prepare(`SELECT * FROM WorkflowTable WHERE parentInstanceId = ? AND tenantId = ?`).bind(parentInstanceId, context.tenantId).all(), context.retryConfig);
 		if (result.results) {
@@ -1527,6 +1534,11 @@ const createLogAccessor = (context) => {
 		}
 		return null;
 	};
+	/**
+	* Gets a workflow by its triggerId. This is a shallow get - only returns base workflow data
+	* without steps, logs, properties, retries, or dependencies.
+	* Use getWorkflow(instanceId) if you need the full workflow with all related data.
+	*/
 	const getWorkflowByTriggerId = async (triggerId) => {
 		const result = await retryD1Operation(() => context.D1.prepare(`SELECT * FROM WorkflowTable WHERE triggerId = ? AND tenantId = ?`).bind(triggerId, context.tenantId).first(), context.retryConfig);
 		if (result) {
@@ -1670,10 +1682,9 @@ const createLogAccessor = (context) => {
 		return step;
 	};
 	const getPropertiesKeys = async (instanceId) => {
-		const result = await retryD1Operation(() => context.D1.prepare(`
-      SELECT DISTINCT key, valueType FROM WorkflowProperties
-      WHERE tenantId = ? AND (? IS NULL OR instanceId = ?)  
-      `).bind(context.tenantId, instanceId ?? null, instanceId ?? null).all(), context.retryConfig);
+		let result;
+		if (instanceId) result = await retryD1Operation(() => context.D1.prepare(`SELECT DISTINCT key, valueType FROM WorkflowProperties WHERE instanceId = ?`).bind(instanceId).all(), context.retryConfig);
+		else result = await retryD1Operation(() => context.D1.prepare(`SELECT DISTINCT key, valueType FROM WorkflowProperties WHERE tenantId = ?`).bind(context.tenantId).all(), context.retryConfig);
 		console.log(`debug getPropertiesKeys: ${JSON.stringify(result)}`);
 		if (!result.results) return [];
 		return result.results.map((row) => ({
@@ -1773,8 +1784,9 @@ function createQueueWorkflowContext(options) {
 		idFactory: options.idFactory ?? defaultIdFactory
 	};
 	const idFactory = internalContext.idFactory;
-	const enqueueWorkflow = async (workflow, tenantId, input, initialName, dependencies) => {
-		const triggerId = idFactory();
+	const enqueueWorkflow = async (params) => {
+		const { workflow, tenantId, input, initialName, dependencies, triggerId: providedTriggerId } = params;
+		const triggerId = providedTriggerId ?? idFactory();
 		const instanceId = idFactory();
 		const startTime = Date.now();
 		if (dependencies && dependencies.length > 0) await insertWorkflowRecord(internalContext, {
@@ -1853,9 +1865,9 @@ function createQueueWorkflowContext(options) {
 	const enqueueWorkflowBatch = async (workflows) => {
 		const startTime = Date.now();
 		console.log(`enqueueWorkflowBatch: Starting batch of ${workflows.length} workflows`);
-		const preparedWorkflows = await Promise.all(workflows.map(async ({ workflow, tenantId, input, initialName, dependencies }) => {
+		const preparedWorkflows = await Promise.all(workflows.map(async ({ workflow, tenantId, input, initialName, dependencies, triggerId: providedTriggerId }) => {
 			const instanceId = idFactory();
-			const triggerId = idFactory();
+			const triggerId = providedTriggerId ?? idFactory();
 			const hasDependencies = dependencies && dependencies.length > 0;
 			const prepared = await prepareWorkflowInsertStatements(internalContext, {
 				instanceId,

package/package.json

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