cleanup

medusajs · Nov 12, 2024 · b6957cb · b6957cb
1 parent 1b1c40f
commit b6957cb
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 34 deletions.
diff --git a/packages/core/workflows-sdk/src/composer/composer.ts b/packages/core/workflows-sdk/src/composer/composer.ts
@@ -8,14 +8,16 @@ import {
   OrchestrationUtils,
 } from "@medusajs/utils"
 import {
+  createStep,
   CreateWorkflowComposerContext,
   ReturnWorkflow,
   StepFunction,
+  StepResponse,
   WorkflowData,
-} from "../utils/composer/type"
+  WorkflowResponse,
+} from "../utils/composer"
 import { proxify } from "../utils/composer/helpers/proxy"
 import { ExportedWorkflow } from "../helper"
-import { createStep, StepResponse, WorkflowResponse } from "../utils/composer"
 import { ulid } from "ulid"
 import {
   LocalWorkflowExecutionOptions,
@@ -127,7 +129,7 @@ export class WorkflowRunner<TData, TResult, THooks extends any[]> {
 
         return
       },
-      async (transaction, { container }) => {
+      async (transaction) => {
         if (!transaction) {
           return
         }
@@ -219,7 +221,7 @@ export class Composer {
   }
 
   get workflowRunner(): BackawrdCompatibleWorkflowRunner<any, any, any> {
-    // TODO: Once we are read
+    // TODO: Once we are ready to get read of the backward compatibility layer we can remove this and return directly the runner such as `return this.#workflowRunner`
     const runner = (container?: MedusaContainer) => {
       if (container) {
         this.#workflowRunner.container = container

diff --git a/packages/core/workflows-sdk/src/composer/workflow-exporter.ts b/packages/core/workflows-sdk/src/composer/workflow-exporter.ts
@@ -267,9 +267,9 @@ export class WorkflowExporter<TData = unknown, TResult = unknown> {
     const { defaultResult, dataPreparation } =
       this.#localWorkflowExecutionOptions
 
-    resultFrom ??= defaultResult
-    throwOnError ??= true
-    logOnError ??= false
+    const resultFrom_ = resultFrom ?? defaultResult
+    const throwOnError_ = throwOnError ?? true
+    const logOnError_ = logOnError ?? false
 
     const context = {
       ...outerContext,
@@ -279,12 +279,13 @@ export class WorkflowExporter<TData = unknown, TResult = unknown> {
     context.transactionId ??= ulid()
     context.eventGroupId ??= ulid()
 
+    let input_ = input
     if (typeof dataPreparation === "function") {
       try {
         const copyInput = input ? JSON.parse(JSON.stringify(input)) : input
-        input = (await dataPreparation(copyInput)) as any
+        input_ = (await dataPreparation(copyInput)) as any
       } catch (err) {
-        if (throwOnError) {
+        if (throwOnError_) {
           throw new Error(
             `Data preparation failed: ${err.message}${EOL}${err.stack}`
           )
@@ -298,13 +299,13 @@ export class WorkflowExporter<TData = unknown, TResult = unknown> {
     return await this.#executeAction(
       this.#executionWrapper.run,
       {
-        throwOnError,
-        resultFrom,
-        logOnError,
+        throwOnError: throwOnError_,
+        resultFrom: resultFrom_,
+        logOnError: logOnError_,
         container,
       },
       context.transactionId,
-      input,
+      input_,
       context,
       events
     )
@@ -326,12 +327,12 @@ export class WorkflowExporter<TData = unknown, TResult = unknown> {
   ) {
     const { defaultResult } = this.#localWorkflowExecutionOptions
 
-    idempotencyKey ??= ""
-    resultFrom ??= defaultResult
-    throwOnError ??= true
-    logOnError ??= false
+    const idempotencyKey_ = idempotencyKey ?? ""
+    const resultFrom_ = resultFrom ?? defaultResult
+    const throwOnError_ = throwOnError ?? true
+    const logOnError_ = logOnError ?? false
 
-    const [, transactionId] = idempotencyKey.split(":")
+    const [, transactionId] = idempotencyKey_.split(":")
     const context = {
       ...outerContext,
       transactionId,
@@ -343,12 +344,12 @@ export class WorkflowExporter<TData = unknown, TResult = unknown> {
     return await this.#executeAction(
       this.#executionWrapper.registerStepSuccess,
       {
-        throwOnError,
-        resultFrom,
-        logOnError,
+        throwOnError: throwOnError_,
+        resultFrom: resultFrom_,
+        logOnError: logOnError_,
         container,
       },
-      idempotencyKey,
+      idempotencyKey_,
       response,
       context,
       events
@@ -371,12 +372,12 @@ export class WorkflowExporter<TData = unknown, TResult = unknown> {
   ) {
     const { defaultResult } = this.#localWorkflowExecutionOptions
 
-    idempotencyKey ??= ""
-    resultFrom ??= defaultResult
-    throwOnError ??= true
-    logOnError ??= false
+    const idempotencyKey_ = idempotencyKey ?? ""
+    const resultFrom_ = resultFrom ?? defaultResult
+    const throwOnError_ = throwOnError ?? true
+    const logOnError_ = logOnError ?? false
 
-    const [, transactionId] = idempotencyKey.split(":")
+    const [, transactionId] = idempotencyKey_.split(":")
     const context = {
       ...outerContext,
       transactionId,
@@ -388,9 +389,9 @@ export class WorkflowExporter<TData = unknown, TResult = unknown> {
     return await this.#executeAction(
       this.#executionWrapper.registerStepFailure,
       {
-        throwOnError,
-        resultFrom,
-        logOnError,
+        throwOnError: throwOnError_,
+        resultFrom: resultFrom_,
+        logOnError: logOnError_,
         container,
       },
       idempotencyKey,
@@ -409,8 +410,8 @@ export class WorkflowExporter<TData = unknown, TResult = unknown> {
     events,
     container,
   }: FlowCancelOptions = {}) {
-    throwOnError ??= true
-    logOnError ??= false
+    const throwOnError_ = throwOnError ?? true
+    const logOnError_ = logOnError ?? false
 
     const context = {
       ...outerContext,
@@ -423,10 +424,10 @@ export class WorkflowExporter<TData = unknown, TResult = unknown> {
     return await this.#executeAction(
       this.#executionWrapper.cancel,
       {
-        throwOnError,
+        throwOnError: throwOnError_,
         resultFrom: undefined,
         isCancel: true,
-        logOnError,
+        logOnError: logOnError_,
         container,
       },
       transaction ?? transactionId!,