@brandboostinggmbh/observable-workflows 0.3.5 → 0.3.8

package/dist/index.d.ts

@@ -127,14 +127,12 @@ declare function upsertWorkflowProperty<T extends keyof ValueTypeMap>({
   context,
   instanceId,
   key,
-  valueType,
   value,
   tenantId
 }: {
   context: InternalWorkflowContextOptions;
   instanceId: string;
   key: string;
-  valueType: T;
   value: ValueTypeMap[T];
   tenantId: string;
 }): Promise<boolean>;
@@ -216,16 +214,25 @@ type WorkflowContextOptions = {
   serializer?: Serializer;
 };
 type InternalWorkflowContextOptions = WorkflowContextOptions & Required<Pick<WorkflowContextOptions, 'serializer' | 'idFactory'>>;
+type WorkflowContextInstance = {
+  call: <I>(args: {
+    workflow: WorkflowFunction<I>;
+    input: I;
+    workflowName: string;
+    tenantId: string;
+    parentInstanceId?: string | undefined;
+  }) => Promise<void>;
+  retry: <I>(workflow: WorkflowFunction<I>, retryInstanceId: string) => Promise<void>;
+};
 type QueueWorkflowContextOptions = {
   QUEUE: Queue<WorkflowQueueMessage>;
-  serializer?: Serializer;
-  idFactory?: () => string;
+  workflowContext: WorkflowContextInstance;
 };
 type WorkflowContext = {
   step: StepContext;
   console: ConsoleWrapper;
   setWorkflowName: (newName: string) => Promise<void>;
-  setWorkflowProperty: <T extends keyof ValueTypeMap>(key: string, valueType: T, value: ValueTypeMap[T]) => Promise<void>;
+  setWorkflowProperty: <T extends keyof ValueTypeMap>(key: string, value: ValueTypeMap[T]) => Promise<void>;
   tenantId: string;
 };
 type WorkflowFunction<INPUT, TYPE extends string = string> = {
@@ -260,22 +267,7 @@ declare function defineWorkflow<I extends {} | null>(workflowType: string, callb
 
 //#endregion
 //#region src/observableWorkflows/createWorkflowContext.d.ts
-declare function createWorkflowContext(options: WorkflowContextOptions): {
-  call: <I>({
-    workflow,
-    input,
-    workflowName,
-    tenantId,
-    parentInstanceId
-  }: {
-    workflow: WorkflowFunction<I>;
-    input: I;
-    workflowName: string;
-    tenantId: string;
-    parentInstanceId?: string | undefined;
-  }) => Promise<void>;
-  retry: <I>(workflow: WorkflowFunction<I>, retryInstanceId: string) => Promise<void>;
-};
+declare function createWorkflowContext(options: WorkflowContextOptions): WorkflowContextInstance;
 
 //#endregion
 //#region src/observableWorkflows/createQueueWorkflowContext.d.ts
@@ -314,4 +306,4 @@ declare const defaultSerializer: {
 declare const defaultIdFactory: () => string;
 
 //#endregion
-export { ConsoleWrapper, InternalWorkflowContextOptions, Log, PossibleValueTypeNames, PossibleValueTypes, QueueWorkflowContextOptions, Serializer, Step, StepContextOptions, StepCtx, StepWorkflowStatus, ValueTypeMap, WorkflowContext, WorkflowContextOptions, WorkflowFunction, WorkflowProperty, WorkflowPropertyDefinition, WorkflowQueueMessage, WorkflowRun, createLogAccessor, createQueueWorkflowContext, createStepContext, createWorkflowContext, defaultIdFactory, defaultSerializer, defineWorkflow, ensureTables, finalizeWorkflowRecord, insertStepRecordFull, insertWorkflowRecord, pushLogToDB, tryDeserializeObj, updateWorkflowName, upsertWorkflowProperty, workflowTableRowToWorkflowRun };
+export { ConsoleWrapper, InternalWorkflowContextOptions, Log, PossibleValueTypeNames, PossibleValueTypes, QueueWorkflowContextOptions, Serializer, Step, StepContextOptions, StepCtx, StepWorkflowStatus, ValueTypeMap, WorkflowContext, WorkflowContextInstance, WorkflowContextOptions, WorkflowFunction, WorkflowProperty, WorkflowPropertyDefinition, WorkflowQueueMessage, WorkflowRun, createLogAccessor, createQueueWorkflowContext, createStepContext, createWorkflowContext, defaultIdFactory, defaultSerializer, defineWorkflow, ensureTables, finalizeWorkflowRecord, insertStepRecordFull, insertWorkflowRecord, pushLogToDB, tryDeserializeObj, updateWorkflowName, upsertWorkflowProperty, workflowTableRowToWorkflowRun };

package/dist/index.js

@@ -159,7 +159,8 @@ async function updateWorkflowName(context, instanceId, newWorkflowName) {
           WHERE instanceId = ?`
 ).bind(newWorkflowName, instanceId).run();
 }
-async function upsertWorkflowProperty({ context, instanceId, key, valueType, value, tenantId }) {
+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 */
@@ -383,12 +384,11 @@ function createWorkflowContext(options) {
 				async setWorkflowName(newName) {
 					await updateWorkflowName({ D1: options.D1 }, instanceId, newName);
 				},
-				async setWorkflowProperty(key, valueType, value) {
+				async setWorkflowProperty(key, value) {
 					await upsertWorkflowProperty({
 						context: internalContext,
 						instanceId,
 						key,
-						valueType,
 						value,
 						tenantId
 					});
@@ -467,11 +467,7 @@ function createQueueWorkflowContext(options) {
 	const handleWorkflowQueueMessage = async (message, env, workflowResolver) => {
 		const workflowFunction = workflowResolver(message.workflowType);
 		if (!workflowFunction) throw new Error(`Workflow ${message.workflowType} not found`);
-		const wfc = await createWorkflowContext({
-			D1: env.LOG_DB,
-			serializer: options.serializer,
-			idFactory: options.idFactory
-		});
+		const wfc = options.workflowContext;
 		if (message.type === "workflow-run") {
 			console.log("running workflow", message.input);
 			await wfc.call({

package/package.json

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