Merge branch 'chore/handle-ambiguous-module-relation-ships-filtering'…

… of github.com:medusajs/medusa into chore/handle-ambiguous-module-relation-ships-filtering
medusajs · Oct 2, 2024 · bf44b4b · bf44b4b
2 parents ae33c13 + 1e39b71
commit bf44b4b
Show file tree

Hide file tree

Showing 16 changed files with 479 additions and 43 deletions.
diff --git a/packages/cli/create-medusa-app/package.json b/packages/cli/create-medusa-app/package.json
@@ -13,7 +13,6 @@
     "watch": "tsc --watch"
   },
   "dependencies": {
-    "@medusajs/utils": "^1.11.9",
     "boxen": "^5",
     "chalk": "^5.2.0",
     "commander": "^10.0.1",

diff --git a/packages/cli/create-medusa-app/src/commands/create.ts b/packages/cli/create-medusa-app/src/commands/create.ts
@@ -25,7 +25,7 @@ import {
   installNextjsStarter,
   startNextjsStarter,
 } from "../utils/nextjs-utils.js"
-import { getNodeVersion, MIN_SUPPORTED_NODE_VERSION } from "@medusajs/utils"
+import { getNodeVersion, MIN_SUPPORTED_NODE_VERSION } from "../utils/node-version.js"
 
 const slugify = slugifyType.default
 

diff --git a/packages/cli/create-medusa-app/src/utils/node-version.ts b/packages/cli/create-medusa-app/src/utils/node-version.ts
@@ -0,0 +1,7 @@
+export function getNodeVersion(): number {
+  const [major] = process.versions.node.split('.').map(Number)
+
+  return major
+}
+
+export const MIN_SUPPORTED_NODE_VERSION = 20
diff --git a/packages/core/js-sdk/src/index.ts b/packages/core/js-sdk/src/index.ts
@@ -21,4 +21,18 @@ class Medusa {
 }
 
 export default Medusa
-export { FetchError } from "./client"
+
+export { FetchError, Client } from "./client"
+export { Admin } from "./admin"
+export { Auth } from "./auth"
+export { Store } from "./store"
+export {
+  Config,
+  ClientHeaders,
+  ClientFetch,
+  FetchArgs,
+  FetchInput,
+  FetchStreamResponse,
+  Logger,
+  ServerSentEventMessage,
+} from "./types"
diff --git a/packages/core/orchestration/src/transaction/orchestrator-builder.ts b/packages/core/orchestration/src/transaction/orchestrator-builder.ts
@@ -22,9 +22,11 @@ export class OrchestratorBuilder {
     this.steps = {
       depth: -1,
       parent: null,
-      next: steps
+      next: Object.keys(steps ?? {}).length
         ? JSON.parse(
-            JSON.stringify((steps.action ? steps : steps.next) as InternalStep)
+            JSON.stringify(
+              (steps!.action ? steps : steps!.next) as InternalStep
+            )
           )
         : undefined,
     }

diff --git a/packages/core/orchestration/src/transaction/transaction-orchestrator.ts b/packages/core/orchestration/src/transaction/transaction-orchestrator.ts
@@ -549,6 +549,16 @@ export class TransactionOrchestrator extends EventEmitter {
 
     step.changeState(TransactionStepState.TIMEOUT)
 
+    if (error?.stack) {
+      const workflowId = transaction.modelId
+      const stepAction = step.definition.action
+      const sourcePath = transaction.getFlow().metadata?.sourcePath
+      const sourceStack = sourcePath
+        ? `\n⮑ \sat ${sourcePath}: [${workflowId} -> ${stepAction} (${TransactionHandlerType.INVOKE})]`
+        : `\n⮑ \sat [${workflowId} -> ${stepAction} (${TransactionHandlerType.INVOKE})]`
+      error.stack += sourceStack
+    }
+
     transaction.addError(
       step.definition.action!,
       TransactionHandlerType.INVOKE,
@@ -602,13 +612,21 @@ export class TransactionOrchestrator extends EventEmitter {
       step.changeStatus(TransactionStepStatus.PERMANENT_FAILURE)
 
       if (!isTimeout) {
-        transaction.addError(
-          step.definition.action!,
-          step.isCompensating()
-            ? TransactionHandlerType.COMPENSATE
-            : TransactionHandlerType.INVOKE,
-          error
-        )
+        const handlerType = step.isCompensating()
+          ? TransactionHandlerType.COMPENSATE
+          : TransactionHandlerType.INVOKE
+
+        if (error?.stack) {
+          const workflowId = transaction.modelId
+          const stepAction = step.definition.action
+          const sourcePath = transaction.getFlow().metadata?.sourcePath
+          const sourceStack = sourcePath
+            ? `\n⮑ \sat ${sourcePath}: [${workflowId} -> ${stepAction} (${TransactionHandlerType.INVOKE})]`
+            : `\n⮑ \sat [${workflowId} -> ${stepAction} (${TransactionHandlerType.INVOKE})]`
+          error.stack += sourceStack
+        }
+
+        transaction.addError(step.definition.action!, handlerType, error)
       }
 
       if (!step.isCompensating()) {

diff --git a/packages/core/orchestration/src/transaction/types.ts b/packages/core/orchestration/src/transaction/types.ts
@@ -243,6 +243,7 @@ export type TransactionFlow = {
   metadata?: {
     eventGroupId?: string
     parentIdempotencyKey?: string
+    sourcePath?: string
     [key: string]: unknown
   }
   hasAsyncSteps: boolean

diff --git a/packages/core/types/src/fulfillment/provider.ts b/packages/core/types/src/fulfillment/provider.ts
@@ -1,18 +1,29 @@
+export type FulfillmentOption = {
+  /**
+   * The option's ID.
+   * 
+   * @example express
+   */
+  id: string
+  /**
+   * Whether the option can be used to return items.
+   */
+  is_return?: boolean
+  [k: string]: unknown
+}
+
 export interface IFulfillmentProvider {
   /**
-   * @ignore
    *
    * Return a unique identifier to retrieve the fulfillment plugin provider
    */
   getIdentifier(): string
   /**
-   * @ignore
    *
    * Return the available fulfillment options for the given data.
    */
-  getFulfillmentOptions(): Promise<Record<string, unknown>[]>
+  getFulfillmentOptions(): Promise<FulfillmentOption[]>
   /**
-   * @ignore
    *
    * Validate the given fulfillment data.
    */
@@ -22,19 +33,16 @@ export interface IFulfillmentProvider {
     context: Record<string, unknown>
   ): Promise<any>
   /**
-   * @ignore
    *
    * Validate the given option.
    */
   validateOption(data: Record<string, unknown>): Promise<boolean>
   /**
-   * @ignore
    *
    * Check if the provider can calculate the fulfillment price.
    */
   canCalculate(data: Record<string, unknown>): Promise<any>
   /**
-   * @ignore
    *
    * Calculate the price for the given fulfillment option.
    */
@@ -44,7 +52,6 @@ export interface IFulfillmentProvider {
     context: Record<string, unknown>
   ): Promise<any>
   /**
-   * @ignore
    *
    * Create a fulfillment for the given data.
    */
@@ -55,25 +62,21 @@ export interface IFulfillmentProvider {
     fulfillment: Record<string, unknown>
   ): Promise<Record<string, unknown>>
   /**
-   * @ignore
    *
    * Cancel the given fulfillment.
    */
   cancelFulfillment(fulfillment: Record<string, unknown>): Promise<any>
   /**
-   * @ignore
    *
    * Get the documents for the given fulfillment data.
    */
   getFulfillmentDocuments(data: Record<string, unknown>): Promise<any>
   /**
-   * @ignore
    *
    * Create a return for the given data.
    */
   createReturnFulfillment(fromData: Record<string, unknown>): Promise<any>
   /**
-   * @ignore
    *
    * Get the documents for the given return data.
    */
@@ -82,13 +85,11 @@ export interface IFulfillmentProvider {
     documentType: string
   ): Promise<any>
   /**
-   * @ignore
    *
    * Get the documents for the given return data.
    */
   getReturnDocuments(data: Record<string, unknown>): Promise<any>
   /**
-   * @ignore
    *
    * Get the documents for the given shipment data.
    */