From 64820cebef816b29dc3791397b7f1963284110a6 Mon Sep 17 00:00:00 2001 From: Shahed Nasser Date: Thu, 22 Aug 2024 12:19:37 +0300 Subject: [PATCH] chore(core-flows): move cart and line item flows outside definition (#8703) * chore(core-flows): move cart and line item flows outside definition * remove all references of definition * export cart and line items --- .../core-flows/src/{definition => }/cart/index.ts | 0 .../cart/steps/add-shipping-method-to-cart.ts | 0 .../cart/steps/confirm-inventory.ts | 0 .../{definition => }/cart/steps/create-carts.ts | 0 .../cart/steps/create-line-item-adjustments.ts | 0 .../cart/steps/create-line-items.ts | 0 .../cart/steps/create-payment-collection.ts | 0 .../steps/create-shipping-method-adjustments.ts | 0 .../cart/steps/find-one-or-any-region.ts | 0 .../cart/steps/find-or-create-customer.ts | 0 .../cart/steps/find-sales-channel.ts | 0 .../get-actions-to-compute-from-promotions.ts | 0 .../cart/steps/get-item-tax-lines.ts | 0 .../cart/steps/get-line-item-actions.ts | 0 .../cart/steps/get-promotion-codes-to-apply.ts | 0 .../cart/steps/get-variant-price-sets.ts | 0 .../{definition => }/cart/steps/get-variants.ts | 0 .../src/{definition => }/cart/steps/index.ts | 0 .../prepare-adjustments-from-promotion-actions.ts | 0 .../cart/steps/refresh-cart-shipping-methods.ts | 0 .../cart/steps/remove-line-item-adjustments.ts | 0 .../steps/remove-shipping-method-adjustments.ts | 0 .../cart/steps/remove-shipping-method-from-cart.ts | 0 .../cart/steps/reserve-inventory.ts | 0 .../cart/steps/retrieve-cart-with-links.ts | 0 .../{definition => }/cart/steps/retrieve-cart.ts | 0 .../cart/steps/set-tax-lines-for-items.ts | 0 .../cart/steps/update-cart-promotions.ts | 0 .../{definition => }/cart/steps/update-carts.ts | 0 .../cart/steps/update-line-items.ts | 0 .../cart/steps/validate-cart-payments.ts | 0 .../cart/steps/validate-cart-shipping-options.ts | 0 .../cart/steps/validate-variant-prices.ts | 0 .../src/{definition => }/cart/utils/fields.ts | 0 .../cart/utils/prepare-confirm-inventory-input.ts | 0 .../cart/utils/prepare-line-item-data.ts | 0 .../cart/workflows/add-shipping-method-to-cart.ts | 2 +- .../{definition => }/cart/workflows/add-to-cart.ts | 2 +- .../cart/workflows/complete-cart.ts | 6 +++--- .../cart/workflows/confirm-variant-inventory.ts | 0 .../cart/workflows/create-carts.ts | 2 +- .../create-payment-collection-for-cart.ts | 4 ++-- .../src/{definition => }/cart/workflows/index.ts | 0 .../workflows/list-shipping-options-for-cart.ts | 2 +- .../cart/workflows/refresh-payment-collection.ts | 6 +++--- .../cart/workflows/update-cart-promotions.ts | 2 +- .../{definition => }/cart/workflows/update-cart.ts | 2 +- .../cart/workflows/update-line-item-in-cart.ts | 2 +- .../cart/workflows/update-tax-lines.ts | 0 packages/core/core-flows/src/definition/index.ts | 3 --- packages/core/core-flows/src/index.ts | 3 ++- .../src/{definition => }/line-item/index.ts | 0 .../line-item/steps/delete-line-items.ts | 0 .../src/{definition => }/line-item/steps/index.ts | 0 .../line-item/steps/list-line-items.ts | 0 .../line-item/steps/update-line-items.ts | 0 .../line-item/workflows/delete-line-items.ts | 0 .../{definition => }/line-item/workflows/index.ts | 0 .../src/order/workflows/add-line-items.ts | 14 +++++++------- .../order/workflows/claim/confirm-claim-request.ts | 4 ++-- .../workflows/create-order-payment-collection.ts | 2 +- .../src/order/workflows/create-orders.ts | 14 +++++++------- .../workflows/exchange/confirm-exchange-request.ts | 4 ++-- .../workflows/mark-payment-collection-as-paid.ts | 2 +- .../order-edit/confirm-order-edit-request.ts | 4 ++-- 65 files changed, 39 insertions(+), 41 deletions(-) rename packages/core/core-flows/src/{definition => }/cart/index.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/add-shipping-method-to-cart.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/confirm-inventory.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/create-carts.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/create-line-item-adjustments.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/create-line-items.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/create-payment-collection.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/create-shipping-method-adjustments.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/find-one-or-any-region.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/find-or-create-customer.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/find-sales-channel.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/get-actions-to-compute-from-promotions.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/get-item-tax-lines.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/get-line-item-actions.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/get-promotion-codes-to-apply.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/get-variant-price-sets.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/get-variants.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/index.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/prepare-adjustments-from-promotion-actions.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/refresh-cart-shipping-methods.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/remove-line-item-adjustments.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/remove-shipping-method-adjustments.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/remove-shipping-method-from-cart.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/reserve-inventory.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/retrieve-cart-with-links.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/retrieve-cart.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/set-tax-lines-for-items.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/update-cart-promotions.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/update-carts.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/update-line-items.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/validate-cart-payments.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/validate-cart-shipping-options.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/steps/validate-variant-prices.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/utils/fields.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/utils/prepare-confirm-inventory-input.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/utils/prepare-line-item-data.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/workflows/add-shipping-method-to-cart.ts (97%) rename packages/core/core-flows/src/{definition => }/cart/workflows/add-to-cart.ts (98%) rename packages/core/core-flows/src/{definition => }/cart/workflows/complete-cart.ts (96%) rename packages/core/core-flows/src/{definition => }/cart/workflows/confirm-variant-inventory.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/workflows/create-carts.ts (98%) rename packages/core/core-flows/src/{definition => }/cart/workflows/create-payment-collection-for-cart.ts (93%) rename packages/core/core-flows/src/{definition => }/cart/workflows/index.ts (100%) rename packages/core/core-flows/src/{definition => }/cart/workflows/list-shipping-options-for-cart.ts (98%) rename packages/core/core-flows/src/{definition => }/cart/workflows/refresh-payment-collection.ts (90%) rename packages/core/core-flows/src/{definition => }/cart/workflows/update-cart-promotions.ts (97%) rename packages/core/core-flows/src/{definition => }/cart/workflows/update-cart.ts (98%) rename packages/core/core-flows/src/{definition => }/cart/workflows/update-line-item-in-cart.ts (97%) rename packages/core/core-flows/src/{definition => }/cart/workflows/update-tax-lines.ts (100%) delete mode 100644 packages/core/core-flows/src/definition/index.ts rename packages/core/core-flows/src/{definition => }/line-item/index.ts (100%) rename packages/core/core-flows/src/{definition => }/line-item/steps/delete-line-items.ts (100%) rename packages/core/core-flows/src/{definition => }/line-item/steps/index.ts (100%) rename packages/core/core-flows/src/{definition => }/line-item/steps/list-line-items.ts (100%) rename packages/core/core-flows/src/{definition => }/line-item/steps/update-line-items.ts (100%) rename packages/core/core-flows/src/{definition => }/line-item/workflows/delete-line-items.ts (100%) rename packages/core/core-flows/src/{definition => }/line-item/workflows/index.ts (100%) diff --git a/packages/core/core-flows/src/definition/cart/index.ts b/packages/core/core-flows/src/cart/index.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/index.ts rename to packages/core/core-flows/src/cart/index.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/add-shipping-method-to-cart.ts b/packages/core/core-flows/src/cart/steps/add-shipping-method-to-cart.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/add-shipping-method-to-cart.ts rename to packages/core/core-flows/src/cart/steps/add-shipping-method-to-cart.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/confirm-inventory.ts b/packages/core/core-flows/src/cart/steps/confirm-inventory.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/confirm-inventory.ts rename to packages/core/core-flows/src/cart/steps/confirm-inventory.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/create-carts.ts b/packages/core/core-flows/src/cart/steps/create-carts.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/create-carts.ts rename to packages/core/core-flows/src/cart/steps/create-carts.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/create-line-item-adjustments.ts b/packages/core/core-flows/src/cart/steps/create-line-item-adjustments.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/create-line-item-adjustments.ts rename to packages/core/core-flows/src/cart/steps/create-line-item-adjustments.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/create-line-items.ts b/packages/core/core-flows/src/cart/steps/create-line-items.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/create-line-items.ts rename to packages/core/core-flows/src/cart/steps/create-line-items.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/create-payment-collection.ts b/packages/core/core-flows/src/cart/steps/create-payment-collection.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/create-payment-collection.ts rename to packages/core/core-flows/src/cart/steps/create-payment-collection.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/create-shipping-method-adjustments.ts b/packages/core/core-flows/src/cart/steps/create-shipping-method-adjustments.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/create-shipping-method-adjustments.ts rename to packages/core/core-flows/src/cart/steps/create-shipping-method-adjustments.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/find-one-or-any-region.ts b/packages/core/core-flows/src/cart/steps/find-one-or-any-region.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/find-one-or-any-region.ts rename to packages/core/core-flows/src/cart/steps/find-one-or-any-region.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/find-or-create-customer.ts b/packages/core/core-flows/src/cart/steps/find-or-create-customer.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/find-or-create-customer.ts rename to packages/core/core-flows/src/cart/steps/find-or-create-customer.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/find-sales-channel.ts b/packages/core/core-flows/src/cart/steps/find-sales-channel.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/find-sales-channel.ts rename to packages/core/core-flows/src/cart/steps/find-sales-channel.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/get-actions-to-compute-from-promotions.ts b/packages/core/core-flows/src/cart/steps/get-actions-to-compute-from-promotions.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/get-actions-to-compute-from-promotions.ts rename to packages/core/core-flows/src/cart/steps/get-actions-to-compute-from-promotions.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/get-item-tax-lines.ts b/packages/core/core-flows/src/cart/steps/get-item-tax-lines.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/get-item-tax-lines.ts rename to packages/core/core-flows/src/cart/steps/get-item-tax-lines.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/get-line-item-actions.ts b/packages/core/core-flows/src/cart/steps/get-line-item-actions.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/get-line-item-actions.ts rename to packages/core/core-flows/src/cart/steps/get-line-item-actions.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/get-promotion-codes-to-apply.ts b/packages/core/core-flows/src/cart/steps/get-promotion-codes-to-apply.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/get-promotion-codes-to-apply.ts rename to packages/core/core-flows/src/cart/steps/get-promotion-codes-to-apply.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/get-variant-price-sets.ts b/packages/core/core-flows/src/cart/steps/get-variant-price-sets.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/get-variant-price-sets.ts rename to packages/core/core-flows/src/cart/steps/get-variant-price-sets.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/get-variants.ts b/packages/core/core-flows/src/cart/steps/get-variants.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/get-variants.ts rename to packages/core/core-flows/src/cart/steps/get-variants.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/index.ts b/packages/core/core-flows/src/cart/steps/index.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/index.ts rename to packages/core/core-flows/src/cart/steps/index.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/prepare-adjustments-from-promotion-actions.ts b/packages/core/core-flows/src/cart/steps/prepare-adjustments-from-promotion-actions.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/prepare-adjustments-from-promotion-actions.ts rename to packages/core/core-flows/src/cart/steps/prepare-adjustments-from-promotion-actions.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/refresh-cart-shipping-methods.ts b/packages/core/core-flows/src/cart/steps/refresh-cart-shipping-methods.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/refresh-cart-shipping-methods.ts rename to packages/core/core-flows/src/cart/steps/refresh-cart-shipping-methods.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/remove-line-item-adjustments.ts b/packages/core/core-flows/src/cart/steps/remove-line-item-adjustments.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/remove-line-item-adjustments.ts rename to packages/core/core-flows/src/cart/steps/remove-line-item-adjustments.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/remove-shipping-method-adjustments.ts b/packages/core/core-flows/src/cart/steps/remove-shipping-method-adjustments.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/remove-shipping-method-adjustments.ts rename to packages/core/core-flows/src/cart/steps/remove-shipping-method-adjustments.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/remove-shipping-method-from-cart.ts b/packages/core/core-flows/src/cart/steps/remove-shipping-method-from-cart.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/remove-shipping-method-from-cart.ts rename to packages/core/core-flows/src/cart/steps/remove-shipping-method-from-cart.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/reserve-inventory.ts b/packages/core/core-flows/src/cart/steps/reserve-inventory.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/reserve-inventory.ts rename to packages/core/core-flows/src/cart/steps/reserve-inventory.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/retrieve-cart-with-links.ts b/packages/core/core-flows/src/cart/steps/retrieve-cart-with-links.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/retrieve-cart-with-links.ts rename to packages/core/core-flows/src/cart/steps/retrieve-cart-with-links.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/retrieve-cart.ts b/packages/core/core-flows/src/cart/steps/retrieve-cart.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/retrieve-cart.ts rename to packages/core/core-flows/src/cart/steps/retrieve-cart.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/set-tax-lines-for-items.ts b/packages/core/core-flows/src/cart/steps/set-tax-lines-for-items.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/set-tax-lines-for-items.ts rename to packages/core/core-flows/src/cart/steps/set-tax-lines-for-items.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/update-cart-promotions.ts b/packages/core/core-flows/src/cart/steps/update-cart-promotions.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/update-cart-promotions.ts rename to packages/core/core-flows/src/cart/steps/update-cart-promotions.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/update-carts.ts b/packages/core/core-flows/src/cart/steps/update-carts.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/update-carts.ts rename to packages/core/core-flows/src/cart/steps/update-carts.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/update-line-items.ts b/packages/core/core-flows/src/cart/steps/update-line-items.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/update-line-items.ts rename to packages/core/core-flows/src/cart/steps/update-line-items.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/validate-cart-payments.ts b/packages/core/core-flows/src/cart/steps/validate-cart-payments.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/validate-cart-payments.ts rename to packages/core/core-flows/src/cart/steps/validate-cart-payments.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/validate-cart-shipping-options.ts b/packages/core/core-flows/src/cart/steps/validate-cart-shipping-options.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/validate-cart-shipping-options.ts rename to packages/core/core-flows/src/cart/steps/validate-cart-shipping-options.ts diff --git a/packages/core/core-flows/src/definition/cart/steps/validate-variant-prices.ts b/packages/core/core-flows/src/cart/steps/validate-variant-prices.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/steps/validate-variant-prices.ts rename to packages/core/core-flows/src/cart/steps/validate-variant-prices.ts diff --git a/packages/core/core-flows/src/definition/cart/utils/fields.ts b/packages/core/core-flows/src/cart/utils/fields.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/utils/fields.ts rename to packages/core/core-flows/src/cart/utils/fields.ts diff --git a/packages/core/core-flows/src/definition/cart/utils/prepare-confirm-inventory-input.ts b/packages/core/core-flows/src/cart/utils/prepare-confirm-inventory-input.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/utils/prepare-confirm-inventory-input.ts rename to packages/core/core-flows/src/cart/utils/prepare-confirm-inventory-input.ts diff --git a/packages/core/core-flows/src/definition/cart/utils/prepare-line-item-data.ts b/packages/core/core-flows/src/cart/utils/prepare-line-item-data.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/utils/prepare-line-item-data.ts rename to packages/core/core-flows/src/cart/utils/prepare-line-item-data.ts diff --git a/packages/core/core-flows/src/definition/cart/workflows/add-shipping-method-to-cart.ts b/packages/core/core-flows/src/cart/workflows/add-shipping-method-to-cart.ts similarity index 97% rename from packages/core/core-flows/src/definition/cart/workflows/add-shipping-method-to-cart.ts rename to packages/core/core-flows/src/cart/workflows/add-shipping-method-to-cart.ts index 1b60773dac..66b20bda4e 100644 --- a/packages/core/core-flows/src/definition/cart/workflows/add-shipping-method-to-cart.ts +++ b/packages/core/core-flows/src/cart/workflows/add-shipping-method-to-cart.ts @@ -3,7 +3,7 @@ import { createWorkflow, transform, } from "@medusajs/workflows-sdk" -import { useRemoteQueryStep } from "../../../common/steps/use-remote-query" +import { useRemoteQueryStep } from "../../common/steps/use-remote-query" import { addShippingMethodToCartStep, removeShippingMethodFromCartStep, diff --git a/packages/core/core-flows/src/definition/cart/workflows/add-to-cart.ts b/packages/core/core-flows/src/cart/workflows/add-to-cart.ts similarity index 98% rename from packages/core/core-flows/src/definition/cart/workflows/add-to-cart.ts rename to packages/core/core-flows/src/cart/workflows/add-to-cart.ts index c856cd615d..43918dabf8 100644 --- a/packages/core/core-flows/src/definition/cart/workflows/add-to-cart.ts +++ b/packages/core/core-flows/src/cart/workflows/add-to-cart.ts @@ -9,7 +9,7 @@ import { parallelize, transform, } from "@medusajs/workflows-sdk" -import { useRemoteQueryStep } from "../../../common/steps/use-remote-query" +import { useRemoteQueryStep } from "../../common/steps/use-remote-query" import { createLineItemsStep, getLineItemActionsStep, diff --git a/packages/core/core-flows/src/definition/cart/workflows/complete-cart.ts b/packages/core/core-flows/src/cart/workflows/complete-cart.ts similarity index 96% rename from packages/core/core-flows/src/definition/cart/workflows/complete-cart.ts rename to packages/core/core-flows/src/cart/workflows/complete-cart.ts index 294d64eda6..819ced1366 100644 --- a/packages/core/core-flows/src/definition/cart/workflows/complete-cart.ts +++ b/packages/core/core-flows/src/cart/workflows/complete-cart.ts @@ -11,9 +11,9 @@ import { createRemoteLinkStep, emitEventStep, useRemoteQueryStep, -} from "../../../common" -import { createOrdersStep } from "../../../order/steps/create-orders" -import { authorizePaymentSessionStep } from "../../../payment/steps/authorize-payment-session" +} from "../../common" +import { createOrdersStep } from "../../order/steps/create-orders" +import { authorizePaymentSessionStep } from "../../payment/steps/authorize-payment-session" import { validateCartPaymentsStep } from "../steps" import { reserveInventoryStep } from "../steps/reserve-inventory" import { completeCartFields } from "../utils/fields" diff --git a/packages/core/core-flows/src/definition/cart/workflows/confirm-variant-inventory.ts b/packages/core/core-flows/src/cart/workflows/confirm-variant-inventory.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/workflows/confirm-variant-inventory.ts rename to packages/core/core-flows/src/cart/workflows/confirm-variant-inventory.ts diff --git a/packages/core/core-flows/src/definition/cart/workflows/create-carts.ts b/packages/core/core-flows/src/cart/workflows/create-carts.ts similarity index 98% rename from packages/core/core-flows/src/definition/cart/workflows/create-carts.ts rename to packages/core/core-flows/src/cart/workflows/create-carts.ts index 6ad6d1b1d0..c2bf58b98a 100644 --- a/packages/core/core-flows/src/definition/cart/workflows/create-carts.ts +++ b/packages/core/core-flows/src/cart/workflows/create-carts.ts @@ -8,7 +8,7 @@ import { parallelize, transform, } from "@medusajs/workflows-sdk" -import { useRemoteQueryStep } from "../../../common/steps/use-remote-query" +import { useRemoteQueryStep } from "../../common/steps/use-remote-query" import { createCartsStep, findOneOrAnyRegionStep, diff --git a/packages/core/core-flows/src/definition/cart/workflows/create-payment-collection-for-cart.ts b/packages/core/core-flows/src/cart/workflows/create-payment-collection-for-cart.ts similarity index 93% rename from packages/core/core-flows/src/definition/cart/workflows/create-payment-collection-for-cart.ts rename to packages/core/core-flows/src/cart/workflows/create-payment-collection-for-cart.ts index ed5510535e..723f851479 100644 --- a/packages/core/core-flows/src/definition/cart/workflows/create-payment-collection-for-cart.ts +++ b/packages/core/core-flows/src/cart/workflows/create-payment-collection-for-cart.ts @@ -9,8 +9,8 @@ import { createWorkflow, transform, } from "@medusajs/workflows-sdk" -import { createRemoteLinkStep } from "../../../common/steps/create-remote-links" -import { useRemoteQueryStep } from "../../../common/steps/use-remote-query" +import { createRemoteLinkStep } from "../../common/steps/create-remote-links" +import { useRemoteQueryStep } from "../../common/steps/use-remote-query" import { createPaymentCollectionsStep } from "../steps/create-payment-collection" /** diff --git a/packages/core/core-flows/src/definition/cart/workflows/index.ts b/packages/core/core-flows/src/cart/workflows/index.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/workflows/index.ts rename to packages/core/core-flows/src/cart/workflows/index.ts diff --git a/packages/core/core-flows/src/definition/cart/workflows/list-shipping-options-for-cart.ts b/packages/core/core-flows/src/cart/workflows/list-shipping-options-for-cart.ts similarity index 98% rename from packages/core/core-flows/src/definition/cart/workflows/list-shipping-options-for-cart.ts rename to packages/core/core-flows/src/cart/workflows/list-shipping-options-for-cart.ts index 0b1418200b..767577f3d8 100644 --- a/packages/core/core-flows/src/definition/cart/workflows/list-shipping-options-for-cart.ts +++ b/packages/core/core-flows/src/cart/workflows/list-shipping-options-for-cart.ts @@ -6,7 +6,7 @@ import { WorkflowData, WorkflowResponse, } from "@medusajs/workflows-sdk" -import { useRemoteQueryStep } from "../../../common/steps/use-remote-query" +import { useRemoteQueryStep } from "../../common/steps/use-remote-query" export const listShippingOptionsForCartWorkflowId = "list-shipping-options-for-cart" diff --git a/packages/core/core-flows/src/definition/cart/workflows/refresh-payment-collection.ts b/packages/core/core-flows/src/cart/workflows/refresh-payment-collection.ts similarity index 90% rename from packages/core/core-flows/src/definition/cart/workflows/refresh-payment-collection.ts rename to packages/core/core-flows/src/cart/workflows/refresh-payment-collection.ts index 1179e88fa8..470c2f8092 100644 --- a/packages/core/core-flows/src/definition/cart/workflows/refresh-payment-collection.ts +++ b/packages/core/core-flows/src/cart/workflows/refresh-payment-collection.ts @@ -6,9 +6,9 @@ import { transform, when, } from "@medusajs/workflows-sdk" -import { useRemoteQueryStep } from "../../../common/steps/use-remote-query" -import { updatePaymentCollectionStep } from "../../../payment-collection" -import { deletePaymentSessionsWorkflow } from "../../../payment-collection/workflows/delete-payment-sessions" +import { useRemoteQueryStep } from "../../common/steps/use-remote-query" +import { updatePaymentCollectionStep } from "../../payment-collection" +import { deletePaymentSessionsWorkflow } from "../../payment-collection/workflows/delete-payment-sessions" export type RefreshPaymentCollectionForCartWorklowInput = { cart_id: string diff --git a/packages/core/core-flows/src/definition/cart/workflows/update-cart-promotions.ts b/packages/core/core-flows/src/cart/workflows/update-cart-promotions.ts similarity index 97% rename from packages/core/core-flows/src/definition/cart/workflows/update-cart-promotions.ts rename to packages/core/core-flows/src/cart/workflows/update-cart-promotions.ts index 70459dc559..0f3c943785 100644 --- a/packages/core/core-flows/src/definition/cart/workflows/update-cart-promotions.ts +++ b/packages/core/core-flows/src/cart/workflows/update-cart-promotions.ts @@ -4,7 +4,7 @@ import { createWorkflow, parallelize, } from "@medusajs/workflows-sdk" -import { useRemoteQueryStep } from "../../../common" +import { useRemoteQueryStep } from "../../common" import { createLineItemAdjustmentsStep, createShippingMethodAdjustmentsStep, diff --git a/packages/core/core-flows/src/definition/cart/workflows/update-cart.ts b/packages/core/core-flows/src/cart/workflows/update-cart.ts similarity index 98% rename from packages/core/core-flows/src/definition/cart/workflows/update-cart.ts rename to packages/core/core-flows/src/cart/workflows/update-cart.ts index 1e2a5c2cba..c1313af3ce 100644 --- a/packages/core/core-flows/src/definition/cart/workflows/update-cart.ts +++ b/packages/core/core-flows/src/cart/workflows/update-cart.ts @@ -8,7 +8,7 @@ import { parallelize, transform, } from "@medusajs/workflows-sdk" -import { useRemoteQueryStep } from "../../../common" +import { useRemoteQueryStep } from "../../common" import { findOneOrAnyRegionStep, findOrCreateCustomerStep, diff --git a/packages/core/core-flows/src/definition/cart/workflows/update-line-item-in-cart.ts b/packages/core/core-flows/src/cart/workflows/update-line-item-in-cart.ts similarity index 97% rename from packages/core/core-flows/src/definition/cart/workflows/update-line-item-in-cart.ts rename to packages/core/core-flows/src/cart/workflows/update-line-item-in-cart.ts index 707e0a6810..51c23396d3 100644 --- a/packages/core/core-flows/src/definition/cart/workflows/update-line-item-in-cart.ts +++ b/packages/core/core-flows/src/cart/workflows/update-line-item-in-cart.ts @@ -5,7 +5,7 @@ import { createWorkflow, transform, } from "@medusajs/workflows-sdk" -import { useRemoteQueryStep } from "../../../common/steps/use-remote-query" +import { useRemoteQueryStep } from "../../common/steps/use-remote-query" import { updateLineItemsStepWithSelector } from "../../line-item/steps" import { refreshCartShippingMethodsStep } from "../steps" import { validateVariantPricesStep } from "../steps/validate-variant-prices" diff --git a/packages/core/core-flows/src/definition/cart/workflows/update-tax-lines.ts b/packages/core/core-flows/src/cart/workflows/update-tax-lines.ts similarity index 100% rename from packages/core/core-flows/src/definition/cart/workflows/update-tax-lines.ts rename to packages/core/core-flows/src/cart/workflows/update-tax-lines.ts diff --git a/packages/core/core-flows/src/definition/index.ts b/packages/core/core-flows/src/definition/index.ts deleted file mode 100644 index cdbfb6b0df..0000000000 --- a/packages/core/core-flows/src/definition/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from "../payment-collection" -export * from "./cart" -export * from "./line-item" diff --git a/packages/core/core-flows/src/index.ts b/packages/core/core-flows/src/index.ts index 4eaf9b70fd..a6d6c5bcb0 100644 --- a/packages/core/core-flows/src/index.ts +++ b/packages/core/core-flows/src/index.ts @@ -1,14 +1,15 @@ export * from "./api-key" export * from "./auth" +export * from "./cart" export * from "./common" export * from "./customer" export * from "./customer-group" export * from "./defaults" -export * from "./definition" export * from "./file" export * from "./fulfillment" export * from "./inventory" export * from "./invite" +export * from "./line-item" export * from "./order" export * from "./payment" export * from "./payment-collection" diff --git a/packages/core/core-flows/src/definition/line-item/index.ts b/packages/core/core-flows/src/line-item/index.ts similarity index 100% rename from packages/core/core-flows/src/definition/line-item/index.ts rename to packages/core/core-flows/src/line-item/index.ts diff --git a/packages/core/core-flows/src/definition/line-item/steps/delete-line-items.ts b/packages/core/core-flows/src/line-item/steps/delete-line-items.ts similarity index 100% rename from packages/core/core-flows/src/definition/line-item/steps/delete-line-items.ts rename to packages/core/core-flows/src/line-item/steps/delete-line-items.ts diff --git a/packages/core/core-flows/src/definition/line-item/steps/index.ts b/packages/core/core-flows/src/line-item/steps/index.ts similarity index 100% rename from packages/core/core-flows/src/definition/line-item/steps/index.ts rename to packages/core/core-flows/src/line-item/steps/index.ts diff --git a/packages/core/core-flows/src/definition/line-item/steps/list-line-items.ts b/packages/core/core-flows/src/line-item/steps/list-line-items.ts similarity index 100% rename from packages/core/core-flows/src/definition/line-item/steps/list-line-items.ts rename to packages/core/core-flows/src/line-item/steps/list-line-items.ts diff --git a/packages/core/core-flows/src/definition/line-item/steps/update-line-items.ts b/packages/core/core-flows/src/line-item/steps/update-line-items.ts similarity index 100% rename from packages/core/core-flows/src/definition/line-item/steps/update-line-items.ts rename to packages/core/core-flows/src/line-item/steps/update-line-items.ts diff --git a/packages/core/core-flows/src/definition/line-item/workflows/delete-line-items.ts b/packages/core/core-flows/src/line-item/workflows/delete-line-items.ts similarity index 100% rename from packages/core/core-flows/src/definition/line-item/workflows/delete-line-items.ts rename to packages/core/core-flows/src/line-item/workflows/delete-line-items.ts diff --git a/packages/core/core-flows/src/definition/line-item/workflows/index.ts b/packages/core/core-flows/src/line-item/workflows/index.ts similarity index 100% rename from packages/core/core-flows/src/definition/line-item/workflows/index.ts rename to packages/core/core-flows/src/line-item/workflows/index.ts diff --git a/packages/core/core-flows/src/order/workflows/add-line-items.ts b/packages/core/core-flows/src/order/workflows/add-line-items.ts index 8f9f4f93e3..1ca0fb4497 100644 --- a/packages/core/core-flows/src/order/workflows/add-line-items.ts +++ b/packages/core/core-flows/src/order/workflows/add-line-items.ts @@ -8,13 +8,13 @@ import { transform, } from "@medusajs/workflows-sdk" import { useRemoteQueryStep } from "../../common" -import { findOneOrAnyRegionStep } from "../../definition/cart/steps/find-one-or-any-region" -import { findOrCreateCustomerStep } from "../../definition/cart/steps/find-or-create-customer" -import { findSalesChannelStep } from "../../definition/cart/steps/find-sales-channel" -import { getVariantPriceSetsStep } from "../../definition/cart/steps/get-variant-price-sets" -import { validateVariantPricesStep } from "../../definition/cart/steps/validate-variant-prices" -import { prepareLineItemData } from "../../definition/cart/utils/prepare-line-item-data" -import { confirmVariantInventoryWorkflow } from "../../definition/cart/workflows/confirm-variant-inventory" +import { findOneOrAnyRegionStep } from "../../cart/steps/find-one-or-any-region" +import { findOrCreateCustomerStep } from "../../cart/steps/find-or-create-customer" +import { findSalesChannelStep } from "../../cart/steps/find-sales-channel" +import { getVariantPriceSetsStep } from "../../cart/steps/get-variant-price-sets" +import { validateVariantPricesStep } from "../../cart/steps/validate-variant-prices" +import { prepareLineItemData } from "../../cart/utils/prepare-line-item-data" +import { confirmVariantInventoryWorkflow } from "../../cart/workflows/confirm-variant-inventory" import { createOrderLineItemsStep } from "../steps" import { productVariantsFields } from "../utils/fields" import { prepareCustomLineItemData } from "../utils/prepare-custom-line-item-data" diff --git a/packages/core/core-flows/src/order/workflows/claim/confirm-claim-request.ts b/packages/core/core-flows/src/order/workflows/claim/confirm-claim-request.ts index 4229a5afec..7d9beaadd1 100644 --- a/packages/core/core-flows/src/order/workflows/claim/confirm-claim-request.ts +++ b/packages/core/core-flows/src/order/workflows/claim/confirm-claim-request.ts @@ -21,8 +21,8 @@ import { when, } from "@medusajs/workflows-sdk" import { createRemoteLinkStep, useRemoteQueryStep } from "../../../common" -import { reserveInventoryStep } from "../../../definition/cart/steps/reserve-inventory" -import { prepareConfirmInventoryInput } from "../../../definition/cart/utils/prepare-confirm-inventory-input" +import { reserveInventoryStep } from "../../../cart/steps/reserve-inventory" +import { prepareConfirmInventoryInput } from "../../../cart/utils/prepare-confirm-inventory-input" import { createReturnFulfillmentWorkflow } from "../../../fulfillment/workflows/create-return-fulfillment" import { previewOrderChangeStep, updateReturnsStep } from "../../steps" import { createOrderClaimItemsFromActionsStep } from "../../steps/claim/create-claim-items-from-actions" diff --git a/packages/core/core-flows/src/order/workflows/create-order-payment-collection.ts b/packages/core/core-flows/src/order/workflows/create-order-payment-collection.ts index af08759fdd..5b997d378a 100644 --- a/packages/core/core-flows/src/order/workflows/create-order-payment-collection.ts +++ b/packages/core/core-flows/src/order/workflows/create-order-payment-collection.ts @@ -6,7 +6,7 @@ import { transform, } from "@medusajs/workflows-sdk" import { createRemoteLinkStep, useRemoteQueryStep } from "../../common" -import { createPaymentCollectionsStep } from "../../definition" +import { createPaymentCollectionsStep } from "../../cart" export const createOrderPaymentCollectionWorkflowId = "create-order-payment-collection" diff --git a/packages/core/core-flows/src/order/workflows/create-orders.ts b/packages/core/core-flows/src/order/workflows/create-orders.ts index e80143ba48..b7deec8789 100644 --- a/packages/core/core-flows/src/order/workflows/create-orders.ts +++ b/packages/core/core-flows/src/order/workflows/create-orders.ts @@ -9,13 +9,13 @@ import { transform, } from "@medusajs/workflows-sdk" import { useRemoteQueryStep } from "../../common" -import { findOneOrAnyRegionStep } from "../../definition/cart/steps/find-one-or-any-region" -import { findOrCreateCustomerStep } from "../../definition/cart/steps/find-or-create-customer" -import { findSalesChannelStep } from "../../definition/cart/steps/find-sales-channel" -import { getVariantPriceSetsStep } from "../../definition/cart/steps/get-variant-price-sets" -import { validateVariantPricesStep } from "../../definition/cart/steps/validate-variant-prices" -import { prepareLineItemData } from "../../definition/cart/utils/prepare-line-item-data" -import { confirmVariantInventoryWorkflow } from "../../definition/cart/workflows/confirm-variant-inventory" +import { findOneOrAnyRegionStep } from "../../cart/steps/find-one-or-any-region" +import { findOrCreateCustomerStep } from "../../cart/steps/find-or-create-customer" +import { findSalesChannelStep } from "../../cart/steps/find-sales-channel" +import { getVariantPriceSetsStep } from "../../cart/steps/get-variant-price-sets" +import { validateVariantPricesStep } from "../../cart/steps/validate-variant-prices" +import { prepareLineItemData } from "../../cart/utils/prepare-line-item-data" +import { confirmVariantInventoryWorkflow } from "../../cart/workflows/confirm-variant-inventory" import { createOrdersStep } from "../steps" import { productVariantsFields } from "../utils/fields" import { prepareCustomLineItemData } from "../utils/prepare-custom-line-item-data" diff --git a/packages/core/core-flows/src/order/workflows/exchange/confirm-exchange-request.ts b/packages/core/core-flows/src/order/workflows/exchange/confirm-exchange-request.ts index a305ac1ec2..abda03d091 100644 --- a/packages/core/core-flows/src/order/workflows/exchange/confirm-exchange-request.ts +++ b/packages/core/core-flows/src/order/workflows/exchange/confirm-exchange-request.ts @@ -21,8 +21,8 @@ import { when, } from "@medusajs/workflows-sdk" import { createRemoteLinkStep, useRemoteQueryStep } from "../../../common" -import { reserveInventoryStep } from "../../../definition/cart/steps/reserve-inventory" -import { prepareConfirmInventoryInput } from "../../../definition/cart/utils/prepare-confirm-inventory-input" +import { reserveInventoryStep } from "../../../cart/steps/reserve-inventory" +import { prepareConfirmInventoryInput } from "../../../cart/utils/prepare-confirm-inventory-input" import { createReturnFulfillmentWorkflow } from "../../../fulfillment/workflows/create-return-fulfillment" import { previewOrderChangeStep, updateReturnsStep } from "../../steps" import { confirmOrderChanges } from "../../steps/confirm-order-changes" diff --git a/packages/core/core-flows/src/order/workflows/mark-payment-collection-as-paid.ts b/packages/core/core-flows/src/order/workflows/mark-payment-collection-as-paid.ts index d02029183a..26324bb348 100644 --- a/packages/core/core-flows/src/order/workflows/mark-payment-collection-as-paid.ts +++ b/packages/core/core-flows/src/order/workflows/mark-payment-collection-as-paid.ts @@ -7,11 +7,11 @@ import { createWorkflow, } from "@medusajs/workflows-sdk" import { useRemoteQueryStep } from "../../common" -import { createPaymentSessionsWorkflow } from "../../definition" import { authorizePaymentSessionStep, capturePaymentWorkflow, } from "../../payment" +import { createPaymentSessionsWorkflow } from "../../payment-collection" /** * This step validates that the payment collection is not_paid diff --git a/packages/core/core-flows/src/order/workflows/order-edit/confirm-order-edit-request.ts b/packages/core/core-flows/src/order/workflows/order-edit/confirm-order-edit-request.ts index 0dcb0d6c95..3fad6582f4 100644 --- a/packages/core/core-flows/src/order/workflows/order-edit/confirm-order-edit-request.ts +++ b/packages/core/core-flows/src/order/workflows/order-edit/confirm-order-edit-request.ts @@ -12,8 +12,8 @@ import { transform, } from "@medusajs/workflows-sdk" import { useRemoteQueryStep } from "../../../common" -import { reserveInventoryStep } from "../../../definition/cart/steps/reserve-inventory" -import { prepareConfirmInventoryInput } from "../../../definition/cart/utils/prepare-confirm-inventory-input" +import { reserveInventoryStep } from "../../../cart/steps/reserve-inventory" +import { prepareConfirmInventoryInput } from "../../../cart/utils/prepare-confirm-inventory-input" import { previewOrderChangeStep } from "../../steps" import { confirmOrderChanges } from "../../steps/confirm-order-changes" import {