From 950cf9af795f6d3a161763812e19aa324f11cf11 Mon Sep 17 00:00:00 2001 From: "Carlos R. L. Rodrigues" <37986729+carlos-r-l-rodrigues@users.noreply.github.com> Date: Mon, 16 Sep 2024 06:22:24 -0300 Subject: [PATCH] chore: remove container registration name (#9137) --- .../helpers/create-admin-user.ts | 16 +- .../helpers/seed-storefront-defaults.ts | 10 +- .../http/__tests__/claims/claims.spec.ts | 5 +- .../__tests__/customer/admin/customer.spec.ts | 6 +- .../__tests__/exchanges/exchanges.spec.ts | 5 +- .../admin/fulfillment-sets.spec.ts | 4 +- .../__tests__/order-edits/order-edits.spec.ts | 3 +- .../__tests__/order/admin/rma-flows.spec.ts | 8 +- .../product/admin/product-export.spec.ts | 16 +- .../product/admin/product-import.spec.ts | 21 +- .../__tests__/product/store/product.spec.ts | 12 +- .../http/__tests__/returns/returns.spec.ts | 3 +- .../admin/stock-location.spec.ts | 6 +- .../http/__tests__/store/admin/store.spec.ts | 6 +- .../http/__tests__/user/admin/user.spec.ts | 8 +- .../admin/email-password-provider.spec.ts | 6 +- .../cart/store/add-promotions-to-cart.spec.ts | 7 +- .../cart/store/cart.workflows.spec.ts | 29 +-- .../__tests__/cart/store/carts.spec.ts | 49 +++-- .../store/remove-promotions-from-cart.spec.ts | 7 +- .../admin/batch-add-customers.ts | 6 +- .../admin/batch-remove-customers.ts | 6 +- .../admin/delete-customer-group.ts | 6 +- .../admin/list-customer-group-customers.ts | 6 +- .../admin/list-customer-groups.spec.ts | 6 +- .../admin/retrieve-customer-group.ts | 6 +- .../admin/update-customer-group.ts | 6 +- .../admin/create-customer-addresses.ts | 6 +- .../admin/delete-customer-address.spec.ts | 6 +- .../customer/admin/delete-customer.ts | 6 +- .../customer/admin/list-customer-addresses.ts | 6 +- .../customer/admin/list-customers.spec.ts | 6 +- .../admin/update-customer-address.spec.ts | 6 +- .../customer/admin/update-customer.ts | 6 +- .../store/create-customer-addresses.ts | 6 +- .../customer/store/create-customer.spec.ts | 7 +- .../store/delete-customer-address.spec.ts | 6 +- .../customer/store/list-customer-addresses.ts | 6 +- .../store/update-customer-address.spec.ts | 6 +- .../modules/__tests__/event-bus/index.spec.ts | 6 +- .../fulfillment-providers/index.spec.ts | 4 +- .../fulfillment/fulfillment.workflows.spec.ts | 4 +- .../__tests__/fulfillment/index.spec.ts | 4 +- .../__tests__/invites/accept-invite.spec.ts | 4 +- .../__tests__/invites/delete-invite.spec.ts | 4 +- .../__tests__/invites/list-invites.spec.ts | 4 +- .../__tests__/invites/resend-invite.spec.ts | 4 +- .../__tests__/invites/retrieve-invite.spec.ts | 4 +- .../__tests__/link-modules/cart-links.spec.ts | 18 +- .../link-modules/cart-region.spec.ts | 6 +- .../link-modules/define-link.spec.ts | 60 +++--- .../fulfillment-set-location.spec.ts | 9 +- .../product-variant-price-set.spec.ts | 5 +- .../publishable-key-sales-channel.spec.ts | 12 +- .../region-payment-provider.spec.ts | 8 +- .../sales-channel-location.spec.ts | 12 +- .../shipping-option-price-set.spec.ts | 12 +- .../link-modules/store-currency.spec.ts | 11 +- .../__tests__/modules/remote-query.spec.ts | 12 +- .../notification/admin/notification.spec.ts | 11 +- .../__tests__/order/draft-order.spec.ts | 30 +-- .../modules/__tests__/order/order.spec.ts | 4 +- .../order/workflows/__fixtures__/index.ts | 23 +-- .../order/workflows/begin-order-claim.spec.ts | 23 +-- .../workflows/begin-order-exchange.spec.ts | 23 +-- .../workflows/begin-order-return.spec.ts | 23 +-- .../order/workflows/cancel-order.spec.ts | 6 +- .../workflows/create-complete-return.spec.ts | 25 +-- .../workflows/create-fulfillment.spec.ts | 33 ++-- .../order/workflows/create-shipment.spec.ts | 29 +-- .../order/workflows/order-change-actions.ts | 4 +- .../order/workflows/order-change.spec.ts | 8 +- .../return/create-return-shipping.spec.ts | 4 +- .../order/workflows/return/items.spec.ts | 4 +- .../payment/payment-session.workflows.spec.ts | 6 +- .../price-lists/admin/price-lists.spec.ts | 14 +- .../__tests__/product/admin/products.spec.ts | 10 +- .../product/workflows/batch-products.spec.ts | 4 +- .../__tests__/regions/admin/regions.spec.ts | 4 +- .../store/shipping-options.spec.ts | 12 +- .../workflows/batch-shipping-options-rules.ts | 9 +- .../workflows/create-shipping-options.ts | 11 +- .../workflows/delete-shipping-options.ts | 11 +- .../workflows/update-shipping-options.ts | 11 +- .../__tests__/store/admin/store.spec.ts | 4 +- .../modules/__tests__/tax/admin/tax.spec.ts | 4 +- .../__tests__/tax/workflow/tax.spec.ts | 4 +- .../__tests__/users/update-user.spec.ts | 4 +- .../helpers/create-authenticated-customer.ts | 8 +- .../helpers/create-variant-price-set.ts | 2 +- .../src/api-key/steps/create-api-keys.ts | 10 +- .../src/api-key/steps/delete-api-keys.ts | 6 +- .../src/api-key/steps/revoke-api-keys.ts | 6 +- .../src/api-key/steps/update-api-keys.ts | 13 +- .../steps/validate-sales-channel-exists.ts | 10 +- .../src/auth/steps/set-auth-app-metadata.ts | 10 +- .../cart/steps/add-shipping-method-to-cart.ts | 10 +- .../src/cart/steps/confirm-inventory.ts | 9 +- .../core-flows/src/cart/steps/create-carts.ts | 10 +- .../steps/create-line-item-adjustments.ts | 6 +- .../src/cart/steps/create-line-items.ts | 10 +- .../cart/steps/create-payment-collection.ts | 10 +- .../create-shipping-method-adjustments.ts | 6 +- .../src/cart/steps/find-one-or-any-region.ts | 10 +- .../src/cart/steps/find-or-create-customer.ts | 12 +- .../src/cart/steps/find-sales-channel.ts | 8 +- .../get-actions-to-compute-from-promotions.ts | 4 +- .../src/cart/steps/get-item-tax-lines.ts | 6 +- .../src/cart/steps/get-line-item-actions.ts | 13 +- .../steps/get-promotion-codes-to-apply.ts | 4 +- .../src/cart/steps/get-variant-price-sets.ts | 6 +- .../core-flows/src/cart/steps/get-variants.ts | 4 +- ...pare-adjustments-from-promotion-actions.ts | 9 +- .../steps/refresh-cart-shipping-methods.ts | 12 +- .../steps/remove-line-item-adjustments.ts | 6 +- .../remove-shipping-method-adjustments.ts | 6 +- .../steps/remove-shipping-method-from-cart.ts | 10 +- .../src/cart/steps/reserve-inventory.ts | 6 +- .../cart/steps/retrieve-cart-with-links.ts | 4 +- .../src/cart/steps/retrieve-cart.ts | 4 +- .../src/cart/steps/set-tax-lines-for-items.ts | 10 +- .../src/cart/steps/update-cart-promotions.ts | 5 +- .../core-flows/src/cart/steps/update-carts.ts | 13 +- .../src/cart/steps/update-line-items.ts | 13 +- .../steps/validate-cart-shipping-options.ts | 8 +- .../core-flows/src/common/steps/emit-event.ts | 4 +- .../src/common/steps/release-event.ts | 9 +- .../steps/create-customer-groups.ts | 10 +- .../steps/delete-customer-group-customers.ts | 10 +- .../steps/delete-customer-groups.ts | 10 +- .../steps/link-customers-customer-group.ts | 10 +- .../steps/update-customer-groups.ts | 10 +- .../src/customer/steps/create-addresses.ts | 10 +- .../src/customer/steps/create-customers.ts | 10 +- .../src/customer/steps/delete-addresses.ts | 10 +- .../src/customer/steps/delete-customers.ts | 10 +- .../maybe-unset-default-billing-addresses.ts | 6 +- .../maybe-unset-default-shipping-addresses.ts | 6 +- .../src/customer/steps/update-addresses.ts | 10 +- .../src/customer/steps/update-customers.ts | 10 +- .../validate-customer-account-creation.ts | 4 +- .../defaults/steps/create-default-store.ts | 8 +- .../core-flows/src/file/steps/delete-files.ts | 6 +- .../core-flows/src/file/steps/upload-files.ts | 10 +- .../steps/add-shipping-options-prices.ts | 10 +- .../fulfillment/steps/cancel-fulfillment.ts | 4 +- .../steps/create-fulfillment-set.ts | 6 +- .../fulfillment/steps/create-fulfillment.ts | 6 +- .../steps/create-return-fulfillment.ts | 6 +- .../fulfillment/steps/create-service-zones.ts | 6 +- .../steps/create-shipping-option-rules.ts | 6 +- .../steps/create-shipping-profiles.ts | 6 +- .../steps/delete-fulfillment-sets.ts | 6 +- .../fulfillment/steps/delete-service-zones.ts | 6 +- .../steps/delete-shipping-option-rules.ts | 6 +- .../steps/delete-shipping-options.ts | 8 +- .../steps/set-shipping-options-prices.ts | 12 +- .../fulfillment/steps/update-fulfillment.ts | 9 +- .../fulfillment/steps/update-service-zones.ts | 14 +- .../steps/update-shipping-option-rules.ts | 6 +- .../steps/update-shipping-profiles.ts | 9 +- .../steps/upsert-shipping-options.ts | 6 +- .../steps/validate-fulfillment-providers.ts | 8 +- .../fulfillment/steps/validate-shipment.ts | 6 +- .../steps/adjust-inventory-levels.ts | 6 +- .../inventory/steps/attach-inventory-items.ts | 5 +- .../inventory/steps/create-inventory-items.ts | 6 +- .../steps/create-inventory-levels.ts | 10 +- .../inventory/steps/delete-inventory-items.ts | 6 +- .../steps/delete-inventory-levels.ts | 10 +- .../inventory/steps/update-inventory-items.ts | 6 +- .../steps/update-inventory-levels.ts | 6 +- .../workflows/delete-inventory-levels.ts | 8 +- .../src/invite/steps/create-invites.ts | 10 +- .../src/invite/steps/delete-invites.ts | 10 +- .../src/invite/steps/refresh-invite-tokens.ts | 6 +- .../src/invite/steps/validate-token.ts | 4 +- .../src/line-item/steps/delete-line-items.ts | 10 +- .../src/line-item/steps/list-line-items.ts | 6 +- .../src/line-item/steps/update-line-items.ts | 10 +- .../notification/steps/notify-on-failure.ts | 6 +- .../notification/steps/send-notifications.ts | 4 +- .../src/order/steps/add-order-transaction.ts | 6 +- .../src/order/steps/archive-orders.ts | 10 +- .../src/order/steps/cancel-fulfillment.ts | 10 +- .../src/order/steps/cancel-order-change.ts | 10 +- .../src/order/steps/cancel-orders.ts | 10 +- .../src/order/steps/claim/cancel-claim.ts | 10 +- .../claim/create-claim-items-from-actions.ts | 6 +- .../src/order/steps/claim/create-claims.ts | 10 +- .../src/order/steps/claim/delete-claims.ts | 10 +- .../order/steps/claim/update-order-claims.ts | 13 +- .../src/order/steps/complete-orders.ts | 10 +- .../src/order/steps/confirm-order-changes.ts | 6 +- .../src/order/steps/create-line-items.ts | 6 +- .../src/order/steps/create-order-change.ts | 10 +- .../steps/create-order-shipping-methods.ts | 10 +- .../src/order/steps/create-orders.ts | 10 +- .../src/order/steps/decline-order-change.ts | 10 +- .../src/order/steps/delete-line-items.ts | 10 +- .../steps/delete-order-change-actions.ts | 10 +- .../src/order/steps/delete-order-changes.ts | 10 +- .../steps/delete-order-shipping-methods.ts | 10 +- .../order/steps/exchange/cancel-exchange.ts | 10 +- .../create-exchange-items-from-actions.ts | 6 +- .../order/steps/exchange/create-exchange.ts | 10 +- .../order/steps/exchange/delete-exchanges.ts | 10 +- .../steps/exchange/update-order-exchanges.ts | 13 +- .../src/order/steps/get-item-tax-lines.ts | 6 +- .../src/order/steps/preview-order-change.ts | 6 +- .../src/order/steps/register-fulfillment.ts | 10 +- .../src/order/steps/register-shipment.ts | 10 +- .../src/order/steps/return/cancel-return.ts | 10 +- .../steps/return/create-complete-return.ts | 10 +- .../create-return-items-from-actions.ts | 6 +- .../src/order/steps/return/create-returns.ts | 10 +- .../src/order/steps/return/delete-returns.ts | 10 +- .../src/order/steps/return/receive-return.ts | 10 +- .../order/steps/return/update-return-items.ts | 9 +- .../src/order/steps/return/update-returns.ts | 9 +- .../order/steps/set-tax-lines-for-items.ts | 10 +- .../steps/update-order-change-actions.ts | 10 +- .../src/order/steps/update-order-changes.ts | 13 +- .../src/order/steps/update-order-exchanges.ts | 13 +- .../order/steps/update-shipping-methods.ts | 13 +- .../workflows/create-order-change-actions.ts | 4 +- .../steps/create-payment-session.ts | 10 +- .../steps/create-refund-reasons.ts | 10 +- .../steps/delete-payment-sessions.ts | 15 +- .../steps/delete-refund-reasons.ts | 10 +- .../steps/update-payment-collection.ts | 6 +- .../steps/update-refund-reasons.ts | 10 +- .../steps/authorize-payment-session.ts | 6 +- .../src/payment/steps/cancel-payment.ts | 8 +- .../src/payment/steps/capture-payment.ts | 4 +- .../src/payment/steps/refund-payment.ts | 4 +- .../steps/create-price-list-prices.ts | 6 +- .../price-list/steps/create-price-lists.ts | 6 +- .../price-list/steps/delete-price-lists.ts | 6 +- .../get-existing-price-lists-price-ids.ts | 4 +- .../steps/remove-price-list-prices.ts | 6 +- .../steps/update-price-list-prices.ts | 9 +- .../price-list/steps/update-price-lists.ts | 6 +- .../price-list/steps/validate-price-lists.ts | 8 +- .../pricing/steps/create-price-preferences.ts | 11 +- .../src/pricing/steps/create-price-sets.ts | 6 +- .../pricing/steps/delete-price-preferences.ts | 10 +- .../update-price-preferences-as-array.ts | 19 +- .../pricing/steps/update-price-preferences.ts | 20 +- .../src/pricing/steps/update-price-sets.ts | 6 +- .../steps/create-product-categories.ts | 10 +- .../steps/delete-product-categories.ts | 10 +- .../steps/update-product-categories.ts | 13 +- .../steps/batch-link-products-collection.ts | 10 +- .../steps/batch-link-products-in-category.ts | 10 +- .../src/product/steps/create-collections.ts | 10 +- .../product/steps/create-product-options.ts | 10 +- .../src/product/steps/create-product-tags.ts | 10 +- .../src/product/steps/create-product-types.ts | 10 +- .../product/steps/create-product-variants.ts | 10 +- .../src/product/steps/create-products.ts | 10 +- .../src/product/steps/delete-collections.ts | 10 +- .../product/steps/delete-product-options.ts | 10 +- .../src/product/steps/delete-product-tags.ts | 10 +- .../src/product/steps/delete-product-types.ts | 10 +- .../product/steps/delete-product-variants.ts | 10 +- .../src/product/steps/delete-products.ts | 10 +- .../src/product/steps/generate-product-csv.ts | 12 +- .../src/product/steps/get-products.ts | 6 +- .../product/steps/group-products-for-batch.ts | 6 +- .../src/product/steps/parse-product-csv.ts | 8 +- .../src/product/steps/update-collections.ts | 13 +- .../product/steps/update-product-options.ts | 13 +- .../src/product/steps/update-product-tags.ts | 13 +- .../src/product/steps/update-product-types.ts | 13 +- .../product/steps/update-product-variants.ts | 10 +- .../src/product/steps/update-products.ts | 10 +- .../steps/add-campaign-promotions.ts | 6 +- .../add-or-remove-campaign-promotions.ts | 6 +- .../steps/add-rules-to-promotions.ts | 6 +- .../src/promotion/steps/create-campaigns.ts | 6 +- .../src/promotion/steps/create-promotions.ts | 6 +- .../src/promotion/steps/delete-campaigns.ts | 6 +- .../src/promotion/steps/delete-promotions.ts | 6 +- .../src/promotion/steps/register-usage.ts | 6 +- .../steps/remove-campaign-promotions.ts | 6 +- .../steps/remove-rules-from-promotions.ts | 6 +- .../src/promotion/steps/update-campaigns.ts | 6 +- .../promotion/steps/update-promotion-rules.ts | 6 +- .../src/promotion/steps/update-promotions.ts | 6 +- .../src/region/steps/create-regions.ts | 10 +- .../src/region/steps/delete-regions.ts | 10 +- .../steps/set-regions-payment-providers.ts | 7 +- .../src/region/steps/update-regions.ts | 13 +- .../reservation/steps/create-reservations.ts | 10 +- .../delete-reservations-by-line-items.ts | 10 +- .../reservation/steps/delete-reservations.ts | 10 +- .../reservation/steps/update-reservations.ts | 6 +- .../steps/create-return-reasons.ts | 10 +- .../steps/delete-return-reasons.ts | 10 +- .../steps/update-return-reasons.ts | 10 +- .../steps/create-default-sales-channel.ts | 6 +- .../steps/create-sales-channels.ts | 6 +- .../steps/delete-sales-channels.ts | 6 +- .../steps/update-sales-channels.ts | 9 +- .../list-shipping-options-for-context.ts | 4 +- .../steps/delete-shipping-profile.ts | 6 +- .../steps/create-stock-locations.ts | 8 +- .../steps/delete-stock-locations.ts | 8 +- .../steps/update-stock-locations.ts | 6 +- .../src/store/steps/create-stores.ts | 10 +- .../src/store/steps/delete-stores.ts | 10 +- .../src/store/steps/update-stores.ts | 13 +- .../src/tax/steps/create-tax-rate-rules.ts | 10 +- .../src/tax/steps/create-tax-rates.ts | 10 +- .../src/tax/steps/create-tax-regions.ts | 10 +- .../src/tax/steps/delete-tax-rate-rules.ts | 10 +- .../src/tax/steps/delete-tax-rates.ts | 10 +- .../src/tax/steps/delete-tax-regions.ts | 10 +- .../src/tax/steps/list-tax-rate-ids.ts | 8 +- .../src/tax/steps/list-tax-rate-rule-ids.ts | 8 +- .../src/tax/steps/update-tax-rates.ts | 13 +- .../src/tax/workflows/update-tax-rates.ts | 10 +- .../core-flows/src/user/steps/create-users.ts | 8 +- .../core-flows/src/user/steps/delete-users.ts | 10 +- .../core-flows/src/user/steps/update-users.ts | 6 +- .../src/module-test-runner.ts | 5 +- packages/core/modules-sdk/src/definitions.ts | 93 ++++----- .../src/loaders/__tests__/medusa-module.ts | 1 - .../src/loaders/__tests__/module-loader.ts | 8 - .../src/loaders/__tests__/register-modules.ts | 2 - .../modules-sdk/src/loaders/module-loader.ts | 9 +- .../src/loaders/register-modules.ts | 1 - .../utils/__tests__/load-internal.spec.ts | 4 - .../src/loaders/utils/load-internal.ts | 32 ++- packages/core/modules-sdk/src/medusa-app.ts | 19 +- .../core/modules-sdk/src/medusa-module.ts | 7 +- .../src/workflow/global-workflow.ts | 6 +- .../src/workflow/local-workflow.ts | 14 +- .../types/src/http/product/admin/entitites.ts | 6 +- packages/core/types/src/modules-sdk/index.ts | 3 - .../common/__tests__/define-config.spec.ts | 186 +++++++++--------- .../__tests__/message-aggregator.spec.ts | 20 +- .../core/utils/src/link/compose-link-name.ts | 4 +- .../core/utils/src/modules-sdk/definition.ts | 120 +++++------ .../utils/src/modules-sdk/medusa-service.ts | 8 +- .../src/helper/workflow-export.ts | 6 +- .../src/utils/composer/__tests__/compose.ts | 18 +- .../middlewares/authenticate-middleware.ts | 7 +- .../framework/src/medusa-app-loader.ts | 15 +- .../src/subscribers/__tests__/index.spec.ts | 11 +- .../src/subscribers/subscriber-loader.ts | 6 +- packages/medusa/src/api/admin/claims/route.ts | 4 +- .../medusa/src/api/admin/exchanges/route.ts | 4 +- .../[id]/service-zones/[zone_id]/route.ts | 6 +- .../api/admin/orders/[id]/preview/route.ts | 6 +- .../import/[transaction_id]/confirm/route.ts | 6 +- .../api/admin/returns/[id]/receive/route.ts | 6 +- .../medusa/src/api/admin/returns/route.ts | 4 +- .../api/admin/shipping-profiles/[id]/route.ts | 4 +- .../[step_id]/subscribe/route.ts | 4 +- .../[workflow_id]/run/route.ts | 4 +- .../[workflow_id]/steps/failure/route.ts | 4 +- .../[workflow_id]/steps/success/route.ts | 4 +- .../[workflow_id]/subscribe/route.ts | 4 +- .../[auth_provider]/callback/route.ts | 6 +- .../[auth_provider]/register/route.ts | 6 +- .../[actor_type]/[auth_provider]/route.ts | 6 +- .../[auth_provider]/update/route.ts | 6 +- .../src/api/auth/token/refresh/route.ts | 9 +- .../src/api/auth/utils/validate-token.ts | 11 +- .../src/api/hooks/payment/[provider]/route.ts | 6 +- .../medusa/src/api/store/products/helpers.ts | 19 +- .../src/api/store/shipping-options/route.ts | 6 +- packages/medusa/src/commands/user.ts | 9 +- .../subscribers/configurable-notifications.ts | 8 +- .../medusa/src/subscribers/payment-webhook.ts | 4 +- .../__tests__/api-key-module-service.spec.ts | 4 +- packages/modules/api-key/src/types/index.ts | 11 +- .../auth-module-service/index.spec.ts | 4 +- .../services/cart-module/index.spec.ts | 16 +- .../__tests__/currency-module-service.spec.ts | 4 +- .../currency/src/loaders/initial-data.ts | 8 +- packages/modules/currency/src/types/index.ts | 2 +- .../services/customer-module/index.spec.ts | 8 +- .../integration-tests/__fixtures__/events.ts | 2 +- .../fulfillment-module-service/index.spec.ts | 24 +-- .../modules/fulfillment/src/types/index.ts | 2 +- .../inventory-module-service.spec.ts | 6 +- packages/modules/link-modules/src/index.ts | 5 +- .../link-modules/src/initialize/index.ts | 43 ++-- .../link-modules/src/loaders/container.ts | 23 +-- .../src/services/link-module-service.ts | 9 +- .../src/utils/compose-link-name.ts | 9 - .../link-modules/src/utils/generate-entity.ts | 2 +- .../link-modules/src/utils/generate-schema.ts | 2 +- .../modules/link-modules/src/utils/index.ts | 1 - .../notification-module-service/index.spec.ts | 2 +- .../integration-tests/__tests__/index.spec.ts | 24 +-- packages/modules/order/src/types/index.ts | 2 +- .../services/payment-module/index.spec.ts | 10 +- .../services/pricing-module/index.spec.ts | 8 +- .../product-categories.spec.ts | 2 +- .../product-collections.spec.ts | 2 +- .../product-module-service/products.spec.ts | 4 +- .../integration-tests/__tests__/product.ts | 18 +- .../src/services/product-module-service.ts | 5 +- packages/modules/product/src/types/index.ts | 2 +- .../promotion-module/promotion.spec.ts | 6 +- .../__tests__/region-module.spec.ts | 4 +- .../services/sales-channel-module.spec.ts | 2 +- .../stock-location-module-service.spec.ts | 6 +- .../src/services/stock-location-module.ts | 5 +- .../__tests__/store-module-service.spec.ts | 4 +- packages/modules/store/src/types/index.ts | 5 +- .../integration-tests/__tests__/index.spec.ts | 8 +- .../__tests__/invite.spec.ts | 2 +- .../integration-tests/__tests__/user.spec.ts | 6 +- .../modules/user/src/services/user-module.ts | 4 +- .../integration-tests/__tests__/index.spec.ts | 2 +- .../integration-tests/__tests__/index.spec.ts | 2 +- 421 files changed, 1528 insertions(+), 2496 deletions(-) delete mode 100644 packages/modules/link-modules/src/utils/compose-link-name.ts diff --git a/integration-tests/helpers/create-admin-user.ts b/integration-tests/helpers/create-admin-user.ts index fedd7a9238..dfb06b482f 100644 --- a/integration-tests/helpers/create-admin-user.ts +++ b/integration-tests/helpers/create-admin-user.ts @@ -5,11 +5,7 @@ import { IUserModuleService, MedusaContainer, } from "@medusajs/types" -import { - ApiKeyType, - ModuleRegistrationName, - PUBLISHABLE_KEY_HEADER, -} from "@medusajs/utils" +import { ApiKeyType, Modules, PUBLISHABLE_KEY_HEADER } from "@medusajs/utils" import jwt from "jsonwebtoken" import Scrypt from "scrypt-kdf" import { getContainer } from "../environment-helpers/use-container" @@ -25,12 +21,8 @@ export const createAdminUser = async ( ) => { const appContainer = container ?? getContainer()! - const userModule: IUserModuleService = appContainer.resolve( - ModuleRegistrationName.USER - ) - const authModule: IAuthModuleService = appContainer.resolve( - ModuleRegistrationName.AUTH - ) + const userModule: IUserModuleService = appContainer.resolve(Modules.USER) + const authModule: IAuthModuleService = appContainer.resolve(Modules.AUTH) const user = await userModule.createUsers({ first_name: "Admin", last_name: "User", @@ -75,7 +67,7 @@ export const createAdminUser = async ( export const generatePublishableKey = async (container?: MedusaContainer) => { const appContainer = container ?? getContainer()! const apiKeyModule = appContainer.resolve( - ModuleRegistrationName.API_KEY + Modules.API_KEY ) return await apiKeyModule.createApiKeys({ diff --git a/integration-tests/helpers/seed-storefront-defaults.ts b/integration-tests/helpers/seed-storefront-defaults.ts index 822f6b747b..483a12bbe7 100644 --- a/integration-tests/helpers/seed-storefront-defaults.ts +++ b/integration-tests/helpers/seed-storefront-defaults.ts @@ -4,18 +4,14 @@ import { IStoreModuleService, MedusaContainer, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" export const seedStorefrontDefaults = async ( container: MedusaContainer, defaultCurrency: string = "usd" ) => { - const regionModule: IRegionModuleService = container.resolve( - ModuleRegistrationName.REGION - ) - const storeModule: IStoreModuleService = container.resolve( - ModuleRegistrationName.STORE - ) + const regionModule: IRegionModuleService = container.resolve(Modules.REGION) + const storeModule: IStoreModuleService = container.resolve(Modules.STORE) // Creates the stores & default sales channel await createDefaultsWorkflow(container).run() diff --git a/integration-tests/http/__tests__/claims/claims.spec.ts b/integration-tests/http/__tests__/claims/claims.spec.ts index c02f5cb687..3d7c11eadd 100644 --- a/integration-tests/http/__tests__/claims/claims.spec.ts +++ b/integration-tests/http/__tests__/claims/claims.spec.ts @@ -2,7 +2,6 @@ import { ClaimReason, ClaimType, ContainerRegistrationKeys, - ModuleRegistrationName, Modules, RuleOperator, } from "@medusajs/utils" @@ -122,7 +121,7 @@ medusaIntegrationTestRunner({ ) ).data.return_reason - const orderModule = container.resolve(ModuleRegistrationName.ORDER) + const orderModule = container.resolve(Modules.ORDER) order = await orderModule.createOrders({ region_id: region.id, @@ -401,7 +400,7 @@ medusaIntegrationTestRunner({ item = order.items[0] - await setupTaxStructure(container.resolve(ModuleRegistrationName.TAX)) + await setupTaxStructure(container.resolve(Modules.TAX)) }) describe("Claims lifecycle", () => { diff --git a/integration-tests/http/__tests__/customer/admin/customer.spec.ts b/integration-tests/http/__tests__/customer/admin/customer.spec.ts index 9b25428422..dc49c8219c 100644 --- a/integration-tests/http/__tests__/customer/admin/customer.spec.ts +++ b/integration-tests/http/__tests__/customer/admin/customer.spec.ts @@ -1,5 +1,5 @@ import { IAuthModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import jwt from "jsonwebtoken" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { @@ -443,9 +443,7 @@ medusaIntegrationTestRunner({ const { auth_identity_id } = jwt.decode(registeredCustomerToken) - const authModule: IAuthModuleService = container.resolve( - ModuleRegistrationName.AUTH - ) + const authModule: IAuthModuleService = container.resolve(Modules.AUTH) const authIdentity = await authModule.retrieveAuthIdentity( auth_identity_id diff --git a/integration-tests/http/__tests__/exchanges/exchanges.spec.ts b/integration-tests/http/__tests__/exchanges/exchanges.spec.ts index 0e5f15eeaf..902827c29d 100644 --- a/integration-tests/http/__tests__/exchanges/exchanges.spec.ts +++ b/integration-tests/http/__tests__/exchanges/exchanges.spec.ts @@ -1,6 +1,5 @@ import { ContainerRegistrationKeys, - ModuleRegistrationName, Modules, RuleOperator, } from "@medusajs/utils" @@ -118,7 +117,7 @@ medusaIntegrationTestRunner({ ) ).data.return_reason - const orderModule = container.resolve(ModuleRegistrationName.ORDER) + const orderModule = container.resolve(Modules.ORDER) order = await orderModule.createOrders({ region_id: region.id, @@ -420,7 +419,7 @@ medusaIntegrationTestRunner({ adminHeaders ) - await setupTaxStructure(container.resolve(ModuleRegistrationName.TAX)) + await setupTaxStructure(container.resolve(Modules.TAX)) }) describe("Exchanges lifecycle", () => { diff --git a/integration-tests/http/__tests__/fulfillment/admin/fulfillment-sets.spec.ts b/integration-tests/http/__tests__/fulfillment/admin/fulfillment-sets.spec.ts index 46589dc60f..5ada2527d2 100644 --- a/integration-tests/http/__tests__/fulfillment/admin/fulfillment-sets.spec.ts +++ b/integration-tests/http/__tests__/fulfillment/admin/fulfillment-sets.spec.ts @@ -1,5 +1,5 @@ import { IFulfillmentModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { adminHeaders, createAdminUser, @@ -29,7 +29,7 @@ medusaIntegrationTestRunner({ // TODO: Add support for creating fulfillment sets through HTTP const fulfillmentModule: IFulfillmentModuleService = - getContainer().resolve(ModuleRegistrationName.FULFILLMENT) + getContainer().resolve(Modules.FULFILLMENT) fulfillmentSet1 = await fulfillmentModule.createFulfillmentSets({ name: "Test fulfillment set", diff --git a/integration-tests/http/__tests__/order-edits/order-edits.spec.ts b/integration-tests/http/__tests__/order-edits/order-edits.spec.ts index b16afb1e27..afd200cbab 100644 --- a/integration-tests/http/__tests__/order-edits/order-edits.spec.ts +++ b/integration-tests/http/__tests__/order-edits/order-edits.spec.ts @@ -1,6 +1,5 @@ import { ContainerRegistrationKeys, - ModuleRegistrationName, Modules, OrderChangeStatus, RuleOperator, @@ -130,7 +129,7 @@ medusaIntegrationTestRunner({ ) ).data.product - const orderModule = container.resolve(ModuleRegistrationName.ORDER) + const orderModule = container.resolve(Modules.ORDER) order = await orderModule.createOrders({ region_id: region.id, diff --git a/integration-tests/http/__tests__/order/admin/rma-flows.spec.ts b/integration-tests/http/__tests__/order/admin/rma-flows.spec.ts index 5739da112f..32b16ca75f 100644 --- a/integration-tests/http/__tests__/order/admin/rma-flows.spec.ts +++ b/integration-tests/http/__tests__/order/admin/rma-flows.spec.ts @@ -1,8 +1,4 @@ -import { - ClaimType, - ModuleRegistrationName, - RuleOperator, -} from "@medusajs/utils" +import { ClaimType, Modules, RuleOperator } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { adminHeaders, @@ -26,7 +22,7 @@ medusaIntegrationTestRunner({ beforeEach(async () => { const container = getContainer() - await setupTaxStructure(container.resolve(ModuleRegistrationName.TAX)) + await setupTaxStructure(container.resolve(Modules.TAX)) await createAdminUser(dbConnection, adminHeaders, container) order = await createOrderSeeder({ api, container }) diff --git a/integration-tests/http/__tests__/product/admin/product-export.spec.ts b/integration-tests/http/__tests__/product/admin/product-export.spec.ts index e10e0505d0..ac153a22a4 100644 --- a/integration-tests/http/__tests__/product/admin/product-export.spec.ts +++ b/integration-tests/http/__tests__/product/admin/product-export.spec.ts @@ -1,13 +1,13 @@ import { IEventBusModuleService } from "@medusajs/types" +import { CommonEvents, Modules } from "@medusajs/utils" +import fs from "fs/promises" import { TestEventUtils, medusaIntegrationTestRunner } from "medusa-test-utils" +import path from "path" import { adminHeaders, createAdminUser, } from "../../../../helpers/create-admin-user" import { getProductFixture } from "../../../../helpers/fixtures" -import fs from "fs/promises" -import path from "path" -import { ModuleRegistrationName } from "@medusajs/utils" jest.setTimeout(50000) @@ -56,7 +56,7 @@ medusaIntegrationTestRunner({ let eventBus: IEventBusModuleService beforeAll(async () => { - eventBus = getContainer().resolve(ModuleRegistrationName.EVENT_BUS) + eventBus = getContainer().resolve(Modules.EVENT_BUS) }) beforeEach(async () => { @@ -201,7 +201,7 @@ medusaIntegrationTestRunner({ describe("POST /admin/products/export", () => { it("should export a csv file containing the expected products", async () => { const subscriberExecution = TestEventUtils.waitSubscribersExecution( - "notification.notification.created", + `${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`, eventBus ) @@ -243,7 +243,7 @@ medusaIntegrationTestRunner({ it("should export a csv file with categories", async () => { const subscriberExecution = TestEventUtils.waitSubscribersExecution( - "notification.notification.created", + `${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`, eventBus ) @@ -269,7 +269,7 @@ medusaIntegrationTestRunner({ it("should export a csv file with region prices", async () => { const subscriberExecution = TestEventUtils.waitSubscribersExecution( - "notification.notification.created", + `${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`, eventBus ) @@ -328,7 +328,7 @@ medusaIntegrationTestRunner({ it("should export a csv file filtered by specific products", async () => { const subscriberExecution = TestEventUtils.waitSubscribersExecution( - "notification.notification.created", + `${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`, eventBus ) diff --git a/integration-tests/http/__tests__/product/admin/product-import.spec.ts b/integration-tests/http/__tests__/product/admin/product-import.spec.ts index 7a4753dd48..2e32557c5d 100644 --- a/integration-tests/http/__tests__/product/admin/product-import.spec.ts +++ b/integration-tests/http/__tests__/product/admin/product-import.spec.ts @@ -1,13 +1,13 @@ import { IEventBusModuleService } from "@medusajs/types" +import { CommonEvents, Modules } from "@medusajs/utils" +import FormData from "form-data" +import fs from "fs/promises" import { TestEventUtils, medusaIntegrationTestRunner } from "medusa-test-utils" +import path from "path" import { adminHeaders, createAdminUser, } from "../../../../helpers/create-admin-user" -import FormData from "form-data" -import fs from "fs/promises" -import path from "path" -import { ModuleRegistrationName } from "@medusajs/utils" import { getProductFixture } from "../../../../helpers/fixtures" jest.setTimeout(50000) @@ -40,7 +40,7 @@ medusaIntegrationTestRunner({ let eventBus: IEventBusModuleService beforeAll(async () => { - eventBus = getContainer().resolve(ModuleRegistrationName.EVENT_BUS) + eventBus = getContainer().resolve(Modules.EVENT_BUS) }) beforeEach(async () => { @@ -127,7 +127,7 @@ medusaIntegrationTestRunner({ ].forEach((testcase) => { it(`should import a previously exported products CSV file ${testcase.name}`, async () => { const subscriberExecution = TestEventUtils.waitSubscribersExecution( - "notification.notification.created", + `${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`, eventBus ) @@ -383,7 +383,7 @@ medusaIntegrationTestRunner({ it("should import product with categories", async () => { const subscriberExecution = TestEventUtils.waitSubscribersExecution( - "notification.notification.created", + `${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`, eventBus ) @@ -452,7 +452,7 @@ medusaIntegrationTestRunner({ it("should ignore non-existent fields being present in the CSV that don't start with Product or Variant", async () => { const subscriberExecution = TestEventUtils.waitSubscribersExecution( - "notification.notification.created", + `${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`, eventBus ) @@ -502,7 +502,7 @@ medusaIntegrationTestRunner({ it("should fail on non-existent product fields being present in the CSV", async () => { const subscriberExecution = TestEventUtils.waitSubscribersExecution( - "notification.notification.created", + `${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`, eventBus ) @@ -552,7 +552,7 @@ medusaIntegrationTestRunner({ it("supports importing the v1 template", async () => { const subscriberExecution = TestEventUtils.waitSubscribersExecution( - "notification.notification.created", + `${Modules.NOTIFICATION}.notification.${CommonEvents.CREATED}`, eventBus ) @@ -781,6 +781,7 @@ medusaIntegrationTestRunner({ created_at: expect.any(String), updated_at: expect.any(String), }), + expect.objectContaining({ id: expect.any(String), title: "Test product", diff --git a/integration-tests/http/__tests__/product/store/product.spec.ts b/integration-tests/http/__tests__/product/store/product.spec.ts index 9364062c8d..68268cefaf 100644 --- a/integration-tests/http/__tests__/product/store/product.spec.ts +++ b/integration-tests/http/__tests__/product/store/product.spec.ts @@ -1,9 +1,5 @@ import { IStoreModuleService } from "@medusajs/types" -import { - ApiKeyType, - ModuleRegistrationName, - ProductStatus, -} from "@medusajs/utils" +import { ApiKeyType, Modules, ProductStatus } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { adminHeaders, @@ -91,7 +87,7 @@ medusaIntegrationTestRunner({ await createAdminUser(dbConnection, adminHeaders, appContainer) const storeModule: IStoreModuleService = appContainer.resolve( - ModuleRegistrationName.STORE + Modules.STORE ) // A default store is created when the app is started, so we want to delete that one and create one specifically for our tests. const defaultId = (await api.get("/admin/stores", adminHeaders)).data @@ -540,7 +536,7 @@ medusaIntegrationTestRunner({ adminHeaders ) - const service = appContainer.resolve(ModuleRegistrationName.STORE) + const service = appContainer.resolve(Modules.STORE) const [store] = await service.listStores() if (store) { @@ -1158,7 +1154,7 @@ medusaIntegrationTestRunner({ adminHeaders ) - const service = appContainer.resolve(ModuleRegistrationName.STORE) + const service = appContainer.resolve(Modules.STORE) const [store] = await service.listStores() if (store) { diff --git a/integration-tests/http/__tests__/returns/returns.spec.ts b/integration-tests/http/__tests__/returns/returns.spec.ts index f7352b7f3c..0170241aed 100644 --- a/integration-tests/http/__tests__/returns/returns.spec.ts +++ b/integration-tests/http/__tests__/returns/returns.spec.ts @@ -1,6 +1,5 @@ import { ContainerRegistrationKeys, - ModuleRegistrationName, Modules, RuleOperator, } from "@medusajs/utils" @@ -60,7 +59,7 @@ medusaIntegrationTestRunner({ ) ).data.return_reason - const orderModule = container.resolve(ModuleRegistrationName.ORDER) + const orderModule = container.resolve(Modules.ORDER) order = await orderModule.createOrders({ region_id: "test_region_id", diff --git a/integration-tests/http/__tests__/stock-location/admin/stock-location.spec.ts b/integration-tests/http/__tests__/stock-location/admin/stock-location.spec.ts index be337e1dd5..b64d6a6ac1 100644 --- a/integration-tests/http/__tests__/stock-location/admin/stock-location.spec.ts +++ b/integration-tests/http/__tests__/stock-location/admin/stock-location.spec.ts @@ -1,4 +1,4 @@ -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { adminHeaders, createAdminUser, @@ -298,9 +298,7 @@ medusaIntegrationTestRunner({ await api.delete(`/admin/stock-locations/${location1.id}`, adminHeaders) // TODO: Ideally we use HTTP here, maybe we should have a get endpoint for fulfillment sets? - const fulfillmentModule = getContainer().resolve( - ModuleRegistrationName.FULFILLMENT - ) + const fulfillmentModule = getContainer().resolve(Modules.FULFILLMENT) const sets = await fulfillmentModule.listFulfillmentSets() expect(sets).toHaveLength(0) }) diff --git a/integration-tests/http/__tests__/store/admin/store.spec.ts b/integration-tests/http/__tests__/store/admin/store.spec.ts index 7805cabb2f..6d44702539 100644 --- a/integration-tests/http/__tests__/store/admin/store.spec.ts +++ b/integration-tests/http/__tests__/store/admin/store.spec.ts @@ -1,10 +1,10 @@ +import { IStoreModuleService } from "@medusajs/types" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { adminHeaders, createAdminUser, } from "../../../../helpers/create-admin-user" -import { ModuleRegistrationName } from "@medusajs/utils" -import { IStoreModuleService } from "@medusajs/types" jest.setTimeout(90000) @@ -17,7 +17,7 @@ medusaIntegrationTestRunner({ beforeEach(async () => { container = getContainer() const storeModule: IStoreModuleService = container.resolve( - ModuleRegistrationName.STORE + Modules.STORE ) await createAdminUser(dbConnection, adminHeaders, container) diff --git a/integration-tests/http/__tests__/user/admin/user.spec.ts b/integration-tests/http/__tests__/user/admin/user.spec.ts index b5eb5a18d6..78f8b7020e 100644 --- a/integration-tests/http/__tests__/user/admin/user.spec.ts +++ b/integration-tests/http/__tests__/user/admin/user.spec.ts @@ -1,5 +1,5 @@ import { IAuthModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { adminHeaders, @@ -118,9 +118,7 @@ medusaIntegrationTestRunner({ deleted: true, }) - const authModule: IAuthModuleService = container.resolve( - ModuleRegistrationName.AUTH - ) + const authModule: IAuthModuleService = container.resolve(Modules.AUTH) const updatedAuthIdentity = await authModule.retrieveAuthIdentity( authIdentity.id @@ -159,7 +157,7 @@ medusaIntegrationTestRunner({ }) it("throws if you attempt to delete another user", async () => { - const userModule = container.resolve(ModuleRegistrationName.USER) + const userModule = container.resolve(Modules.USER) const userTwo = await userModule.createUsers({ email: "test@test.com", diff --git a/integration-tests/modules/__tests__/auth/admin/email-password-provider.spec.ts b/integration-tests/modules/__tests__/auth/admin/email-password-provider.spec.ts index e39b59d80c..b3dd4cc8c2 100644 --- a/integration-tests/modules/__tests__/auth/admin/email-password-provider.spec.ts +++ b/integration-tests/modules/__tests__/auth/admin/email-password-provider.spec.ts @@ -1,5 +1,5 @@ import { IAuthModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import Scrypt from "scrypt-kdf" import { @@ -32,7 +32,7 @@ medusaIntegrationTestRunner({ await Scrypt.kdf(password, { logN: 15, r: 8, p: 1 }) ).toString("base64") const authService: IAuthModuleService = appContainer.resolve( - ModuleRegistrationName.AUTH + Modules.AUTH ) await authService.createAuthIdentities({ @@ -67,7 +67,7 @@ medusaIntegrationTestRunner({ await Scrypt.kdf(password, { logN: 15, r: 8, p: 1 }) ).toString("base64") const authService: IAuthModuleService = appContainer.resolve( - ModuleRegistrationName.AUTH + Modules.AUTH ) await authService.createAuthIdentities({ diff --git a/integration-tests/modules/__tests__/cart/store/add-promotions-to-cart.spec.ts b/integration-tests/modules/__tests__/cart/store/add-promotions-to-cart.spec.ts index aac7851a46..c0bf3216d7 100644 --- a/integration-tests/modules/__tests__/cart/store/add-promotions-to-cart.spec.ts +++ b/integration-tests/modules/__tests__/cart/store/add-promotions-to-cart.spec.ts @@ -2,7 +2,6 @@ import { RemoteLink } from "@medusajs/modules-sdk" import { ICartModuleService, IPromotionModuleService } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, Modules, PromotionType, } from "@medusajs/utils" @@ -30,10 +29,8 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - cartModuleService = appContainer.resolve(ModuleRegistrationName.CART) - promotionModuleService = appContainer.resolve( - ModuleRegistrationName.PROMOTION - ) + cartModuleService = appContainer.resolve(Modules.CART) + promotionModuleService = appContainer.resolve(Modules.PROMOTION) remoteLinkService = appContainer.resolve( ContainerRegistrationKeys.REMOTE_LINK ) diff --git a/integration-tests/modules/__tests__/cart/store/cart.workflows.spec.ts b/integration-tests/modules/__tests__/cart/store/cart.workflows.spec.ts index 4e9fece085..23150eb71e 100644 --- a/integration-tests/modules/__tests__/cart/store/cart.workflows.spec.ts +++ b/integration-tests/modules/__tests__/cart/store/cart.workflows.spec.ts @@ -26,7 +26,6 @@ import { } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, Modules, RuleOperator, } from "@medusajs/utils" @@ -62,24 +61,16 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - cartModuleService = appContainer.resolve(ModuleRegistrationName.CART) - regionModuleService = appContainer.resolve( - ModuleRegistrationName.REGION - ) - scModuleService = appContainer.resolve( - ModuleRegistrationName.SALES_CHANNEL - ) - customerModule = appContainer.resolve(ModuleRegistrationName.CUSTOMER) - productModule = appContainer.resolve(ModuleRegistrationName.PRODUCT) - pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING) - paymentModule = appContainer.resolve(ModuleRegistrationName.PAYMENT) - inventoryModule = appContainer.resolve(ModuleRegistrationName.INVENTORY) - stockLocationModule = appContainer.resolve( - ModuleRegistrationName.STOCK_LOCATION - ) - fulfillmentModule = appContainer.resolve( - ModuleRegistrationName.FULFILLMENT - ) + cartModuleService = appContainer.resolve(Modules.CART) + regionModuleService = appContainer.resolve(Modules.REGION) + scModuleService = appContainer.resolve(Modules.SALES_CHANNEL) + customerModule = appContainer.resolve(Modules.CUSTOMER) + productModule = appContainer.resolve(Modules.PRODUCT) + pricingModule = appContainer.resolve(Modules.PRICING) + paymentModule = appContainer.resolve(Modules.PAYMENT) + inventoryModule = appContainer.resolve(Modules.INVENTORY) + stockLocationModule = appContainer.resolve(Modules.STOCK_LOCATION) + fulfillmentModule = appContainer.resolve(Modules.FULFILLMENT) remoteLink = appContainer.resolve(ContainerRegistrationKeys.REMOTE_LINK) remoteQuery = appContainer.resolve( ContainerRegistrationKeys.REMOTE_QUERY diff --git a/integration-tests/modules/__tests__/cart/store/carts.spec.ts b/integration-tests/modules/__tests__/cart/store/carts.spec.ts index 146f4c020c..e8147ec39b 100644 --- a/integration-tests/modules/__tests__/cart/store/carts.spec.ts +++ b/integration-tests/modules/__tests__/cart/store/carts.spec.ts @@ -17,7 +17,6 @@ import { import { ContainerRegistrationKeys, MedusaError, - ModuleRegistrationName, Modules, ProductStatus, PromotionRuleOperator, @@ -66,22 +65,20 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - cartModule = appContainer.resolve(ModuleRegistrationName.CART) - regionModule = appContainer.resolve(ModuleRegistrationName.REGION) - scModule = appContainer.resolve(ModuleRegistrationName.SALES_CHANNEL) - customerModule = appContainer.resolve(ModuleRegistrationName.CUSTOMER) - productModule = appContainer.resolve(ModuleRegistrationName.PRODUCT) - pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING) - apiKeyModule = appContainer.resolve(ModuleRegistrationName.API_KEY) + cartModule = appContainer.resolve(Modules.CART) + regionModule = appContainer.resolve(Modules.REGION) + scModule = appContainer.resolve(Modules.SALES_CHANNEL) + customerModule = appContainer.resolve(Modules.CUSTOMER) + productModule = appContainer.resolve(Modules.PRODUCT) + pricingModule = appContainer.resolve(Modules.PRICING) + apiKeyModule = appContainer.resolve(Modules.API_KEY) remoteLink = appContainer.resolve(ContainerRegistrationKeys.REMOTE_LINK) - promotionModule = appContainer.resolve(ModuleRegistrationName.PROMOTION) - taxModule = appContainer.resolve(ModuleRegistrationName.TAX) - regionService = appContainer.resolve(ModuleRegistrationName.REGION) - paymentService = appContainer.resolve(ModuleRegistrationName.PAYMENT) - storeService = appContainer.resolve(ModuleRegistrationName.STORE) - fulfillmentModule = appContainer.resolve( - ModuleRegistrationName.FULFILLMENT - ) + promotionModule = appContainer.resolve(Modules.PROMOTION) + taxModule = appContainer.resolve(Modules.TAX) + regionService = appContainer.resolve(Modules.REGION) + paymentService = appContainer.resolve(Modules.PAYMENT) + storeService = appContainer.resolve(Modules.STORE) + fulfillmentModule = appContainer.resolve(Modules.FULFILLMENT) remoteLinkService = appContainer.resolve( ContainerRegistrationKeys.REMOTE_LINK ) @@ -148,18 +145,18 @@ medusaIntegrationTestRunner({ await remoteLink.create([ { - productService: { + Product: { variant_id: product.variants[0].id, }, - pricingService: { + Pricing: { price_set_id: priceSet.id, }, }, { - productService: { + Product: { variant_id: product.variants[1].id, }, - pricingService: { + Pricing: { price_set_id: priceSetTwo.id, }, }, @@ -236,8 +233,8 @@ medusaIntegrationTestRunner({ await remoteLink.create([ { - productService: { variant_id: product.variants[0].id }, - pricingService: { price_set_id: priceSet.id }, + Product: { variant_id: product.variants[0].id }, + Pricing: { price_set_id: priceSet.id }, }, ]) @@ -1414,16 +1411,16 @@ medusaIntegrationTestRunner({ await remoteLink.create([ { - productService: { + Product: { variant_id: productWithSpecialTax.variants[0].id, }, - pricingService: { price_set_id: priceSet.id }, + Pricing: { price_set_id: priceSet.id }, }, { - productService: { + Product: { variant_id: productWithDefaultTax.variants[0].id, }, - pricingService: { price_set_id: priceSetDefaultTax.id }, + Pricing: { price_set_id: priceSetDefaultTax.id }, }, { [Modules.CART]: { cart_id: cart.id }, diff --git a/integration-tests/modules/__tests__/cart/store/remove-promotions-from-cart.spec.ts b/integration-tests/modules/__tests__/cart/store/remove-promotions-from-cart.spec.ts index 9be3d22ab4..5cc8767f5e 100644 --- a/integration-tests/modules/__tests__/cart/store/remove-promotions-from-cart.spec.ts +++ b/integration-tests/modules/__tests__/cart/store/remove-promotions-from-cart.spec.ts @@ -2,7 +2,6 @@ import { RemoteLink } from "@medusajs/modules-sdk" import { ICartModuleService, IPromotionModuleService } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, Modules, PromotionType, } from "@medusajs/utils" @@ -30,13 +29,11 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - cartModuleService = appContainer.resolve(ModuleRegistrationName.CART) + cartModuleService = appContainer.resolve(Modules.CART) remoteLinkService = appContainer.resolve( ContainerRegistrationKeys.REMOTE_LINK ) - promotionModuleService = appContainer.resolve( - ModuleRegistrationName.PROMOTION - ) + promotionModuleService = appContainer.resolve(Modules.PROMOTION) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/customer-group/admin/batch-add-customers.ts b/integration-tests/modules/__tests__/customer-group/admin/batch-add-customers.ts index fd5276c9eb..802f8efd5d 100644 --- a/integration-tests/modules/__tests__/customer-group/admin/batch-add-customers.ts +++ b/integration-tests/modules/__tests__/customer-group/admin/batch-add-customers.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../../helpers/create-admin-user" @@ -19,9 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - customerModuleService = appContainer.resolve( - ModuleRegistrationName.CUSTOMER - ) + customerModuleService = appContainer.resolve(Modules.CUSTOMER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/customer-group/admin/batch-remove-customers.ts b/integration-tests/modules/__tests__/customer-group/admin/batch-remove-customers.ts index f55a765ce5..83b17679ec 100644 --- a/integration-tests/modules/__tests__/customer-group/admin/batch-remove-customers.ts +++ b/integration-tests/modules/__tests__/customer-group/admin/batch-remove-customers.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../../helpers/create-admin-user" @@ -19,9 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - customerModuleService = appContainer.resolve( - ModuleRegistrationName.CUSTOMER - ) + customerModuleService = appContainer.resolve(Modules.CUSTOMER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/customer-group/admin/delete-customer-group.ts b/integration-tests/modules/__tests__/customer-group/admin/delete-customer-group.ts index e8f72cc92c..f96bd9d87e 100644 --- a/integration-tests/modules/__tests__/customer-group/admin/delete-customer-group.ts +++ b/integration-tests/modules/__tests__/customer-group/admin/delete-customer-group.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../../helpers/create-admin-user" @@ -19,9 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - customerModuleService = appContainer.resolve( - ModuleRegistrationName.CUSTOMER - ) + customerModuleService = appContainer.resolve(Modules.CUSTOMER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/customer-group/admin/list-customer-group-customers.ts b/integration-tests/modules/__tests__/customer-group/admin/list-customer-group-customers.ts index b78fa8a821..45d0378cd3 100644 --- a/integration-tests/modules/__tests__/customer-group/admin/list-customer-group-customers.ts +++ b/integration-tests/modules/__tests__/customer-group/admin/list-customer-group-customers.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../../helpers/create-admin-user" @@ -19,9 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - customerModuleService = appContainer.resolve( - ModuleRegistrationName.CUSTOMER - ) + customerModuleService = appContainer.resolve(Modules.CUSTOMER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/customer-group/admin/list-customer-groups.spec.ts b/integration-tests/modules/__tests__/customer-group/admin/list-customer-groups.spec.ts index a6ca46f501..a18f1e2c95 100644 --- a/integration-tests/modules/__tests__/customer-group/admin/list-customer-groups.spec.ts +++ b/integration-tests/modules/__tests__/customer-group/admin/list-customer-groups.spec.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../../helpers/create-admin-user" @@ -19,9 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - customerModuleService = appContainer.resolve( - ModuleRegistrationName.CUSTOMER - ) + customerModuleService = appContainer.resolve(Modules.CUSTOMER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/customer-group/admin/retrieve-customer-group.ts b/integration-tests/modules/__tests__/customer-group/admin/retrieve-customer-group.ts index c431963ff5..a1c0ff492d 100644 --- a/integration-tests/modules/__tests__/customer-group/admin/retrieve-customer-group.ts +++ b/integration-tests/modules/__tests__/customer-group/admin/retrieve-customer-group.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../../helpers/create-admin-user" @@ -19,9 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - customerModuleService = appContainer.resolve( - ModuleRegistrationName.CUSTOMER - ) + customerModuleService = appContainer.resolve(Modules.CUSTOMER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/customer-group/admin/update-customer-group.ts b/integration-tests/modules/__tests__/customer-group/admin/update-customer-group.ts index d5a933413f..74205c2f52 100644 --- a/integration-tests/modules/__tests__/customer-group/admin/update-customer-group.ts +++ b/integration-tests/modules/__tests__/customer-group/admin/update-customer-group.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../../helpers/create-admin-user" @@ -19,9 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - customerModuleService = appContainer.resolve( - ModuleRegistrationName.CUSTOMER - ) + customerModuleService = appContainer.resolve(Modules.CUSTOMER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/customer/admin/create-customer-addresses.ts b/integration-tests/modules/__tests__/customer/admin/create-customer-addresses.ts index 0f689c83cc..326af659e0 100644 --- a/integration-tests/modules/__tests__/customer/admin/create-customer-addresses.ts +++ b/integration-tests/modules/__tests__/customer/admin/create-customer-addresses.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../../helpers/create-admin-user" @@ -19,9 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - customerModuleService = appContainer.resolve( - ModuleRegistrationName.CUSTOMER - ) + customerModuleService = appContainer.resolve(Modules.CUSTOMER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/customer/admin/delete-customer-address.spec.ts b/integration-tests/modules/__tests__/customer/admin/delete-customer-address.spec.ts index c45a99a822..d7a788a63b 100644 --- a/integration-tests/modules/__tests__/customer/admin/delete-customer-address.spec.ts +++ b/integration-tests/modules/__tests__/customer/admin/delete-customer-address.spec.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../../helpers/create-admin-user" @@ -19,9 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - customerModuleService = appContainer.resolve( - ModuleRegistrationName.CUSTOMER - ) + customerModuleService = appContainer.resolve(Modules.CUSTOMER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/customer/admin/delete-customer.ts b/integration-tests/modules/__tests__/customer/admin/delete-customer.ts index 0046cd69bf..756359e64d 100644 --- a/integration-tests/modules/__tests__/customer/admin/delete-customer.ts +++ b/integration-tests/modules/__tests__/customer/admin/delete-customer.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../../helpers/create-admin-user" @@ -19,9 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - customerModuleService = appContainer.resolve( - ModuleRegistrationName.CUSTOMER - ) + customerModuleService = appContainer.resolve(Modules.CUSTOMER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/customer/admin/list-customer-addresses.ts b/integration-tests/modules/__tests__/customer/admin/list-customer-addresses.ts index 676dca6079..609da41c49 100644 --- a/integration-tests/modules/__tests__/customer/admin/list-customer-addresses.ts +++ b/integration-tests/modules/__tests__/customer/admin/list-customer-addresses.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../../helpers/create-admin-user" @@ -19,9 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - customerModuleService = appContainer.resolve( - ModuleRegistrationName.CUSTOMER - ) + customerModuleService = appContainer.resolve(Modules.CUSTOMER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/customer/admin/list-customers.spec.ts b/integration-tests/modules/__tests__/customer/admin/list-customers.spec.ts index ade854131b..d60f0454fc 100644 --- a/integration-tests/modules/__tests__/customer/admin/list-customers.spec.ts +++ b/integration-tests/modules/__tests__/customer/admin/list-customers.spec.ts @@ -1,10 +1,10 @@ +import { Modules } from "@medusajs/utils" import { adminHeaders, createAdminUser, } from "../../../../helpers/create-admin-user" import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" const { medusaIntegrationTestRunner } = require("medusa-test-utils") @@ -22,9 +22,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - customerModuleService = appContainer.resolve( - ModuleRegistrationName.CUSTOMER - ) + customerModuleService = appContainer.resolve(Modules.CUSTOMER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/customer/admin/update-customer-address.spec.ts b/integration-tests/modules/__tests__/customer/admin/update-customer-address.spec.ts index 1b55ce5e29..cbb4b3b2af 100644 --- a/integration-tests/modules/__tests__/customer/admin/update-customer-address.spec.ts +++ b/integration-tests/modules/__tests__/customer/admin/update-customer-address.spec.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../../helpers/create-admin-user" @@ -19,9 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - customerModuleService = appContainer.resolve( - ModuleRegistrationName.CUSTOMER - ) + customerModuleService = appContainer.resolve(Modules.CUSTOMER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/customer/admin/update-customer.ts b/integration-tests/modules/__tests__/customer/admin/update-customer.ts index 9d76618267..30d9f77635 100644 --- a/integration-tests/modules/__tests__/customer/admin/update-customer.ts +++ b/integration-tests/modules/__tests__/customer/admin/update-customer.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../../helpers/create-admin-user" @@ -19,9 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - customerModuleService = appContainer.resolve( - ModuleRegistrationName.CUSTOMER - ) + customerModuleService = appContainer.resolve(Modules.CUSTOMER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/customer/store/create-customer-addresses.ts b/integration-tests/modules/__tests__/customer/store/create-customer-addresses.ts index a30f518aef..6d2d9c62c2 100644 --- a/integration-tests/modules/__tests__/customer/store/create-customer-addresses.ts +++ b/integration-tests/modules/__tests__/customer/store/create-customer-addresses.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { generatePublishableKey, @@ -21,9 +21,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - customerModuleService = appContainer.resolve( - ModuleRegistrationName.CUSTOMER - ) + customerModuleService = appContainer.resolve(Modules.CUSTOMER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/customer/store/create-customer.spec.ts b/integration-tests/modules/__tests__/customer/store/create-customer.spec.ts index 9f95afc17f..2d4567a3bc 100644 --- a/integration-tests/modules/__tests__/customer/store/create-customer.spec.ts +++ b/integration-tests/modules/__tests__/customer/store/create-customer.spec.ts @@ -1,9 +1,6 @@ import { IAuthModuleService } from "@medusajs/types" -import { - ContainerRegistrationKeys, - ModuleRegistrationName, -} from "@medusajs/utils" +import { ContainerRegistrationKeys, Modules } from "@medusajs/utils" import jwt from "jsonwebtoken" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { @@ -37,7 +34,7 @@ medusaIntegrationTestRunner({ // TODO: Reenable once the customer authentication is fixed, and use the HTTP endpoints instead. it.skip("should create a customer", async () => { const authService: IAuthModuleService = appContainer.resolve( - ModuleRegistrationName.AUTH + Modules.AUTH ) const { http } = appContainer.resolve( ContainerRegistrationKeys.CONFIG_MODULE diff --git a/integration-tests/modules/__tests__/customer/store/delete-customer-address.spec.ts b/integration-tests/modules/__tests__/customer/store/delete-customer-address.spec.ts index 89a50b8ade..08a22fadcc 100644 --- a/integration-tests/modules/__tests__/customer/store/delete-customer-address.spec.ts +++ b/integration-tests/modules/__tests__/customer/store/delete-customer-address.spec.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { generatePublishableKey, @@ -21,9 +21,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - customerModuleService = appContainer.resolve( - ModuleRegistrationName.CUSTOMER - ) + customerModuleService = appContainer.resolve(Modules.CUSTOMER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/customer/store/list-customer-addresses.ts b/integration-tests/modules/__tests__/customer/store/list-customer-addresses.ts index af14f51017..a6c81f0d81 100644 --- a/integration-tests/modules/__tests__/customer/store/list-customer-addresses.ts +++ b/integration-tests/modules/__tests__/customer/store/list-customer-addresses.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { generatePublishableKey, @@ -21,9 +21,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - customerModuleService = appContainer.resolve( - ModuleRegistrationName.CUSTOMER - ) + customerModuleService = appContainer.resolve(Modules.CUSTOMER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/customer/store/update-customer-address.spec.ts b/integration-tests/modules/__tests__/customer/store/update-customer-address.spec.ts index e081089376..24b4085c01 100644 --- a/integration-tests/modules/__tests__/customer/store/update-customer-address.spec.ts +++ b/integration-tests/modules/__tests__/customer/store/update-customer-address.spec.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { generatePublishableKey, @@ -21,9 +21,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - customerModuleService = appContainer.resolve( - ModuleRegistrationName.CUSTOMER - ) + customerModuleService = appContainer.resolve(Modules.CUSTOMER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/event-bus/index.spec.ts b/integration-tests/modules/__tests__/event-bus/index.spec.ts index d430256019..61e7b60cdd 100644 --- a/integration-tests/modules/__tests__/event-bus/index.spec.ts +++ b/integration-tests/modules/__tests__/event-bus/index.spec.ts @@ -1,6 +1,6 @@ -import { medusaIntegrationTestRunner } from "medusa-test-utils" import { MedusaContainer } from "@medusajs/types" -import { composeMessage, ModuleRegistrationName } from "@medusajs/utils" +import { Modules, composeMessage } from "@medusajs/utils" +import { medusaIntegrationTestRunner } from "medusa-test-utils" import testEventPayloadHandlerMock from "../../dist/subscribers/test-event-payload" jest.setTimeout(30000) @@ -15,7 +15,7 @@ medusaIntegrationTestRunner({ }) it(`should emit event with the expected shape to be received by the subscribers`, async () => { - const eventBus = container.resolve(ModuleRegistrationName.EVENT_BUS) + const eventBus = container.resolve(Modules.EVENT_BUS) const eventName = "test-event-payload" await eventBus.emit( diff --git a/integration-tests/modules/__tests__/fulfillment-providers/index.spec.ts b/integration-tests/modules/__tests__/fulfillment-providers/index.spec.ts index 7cc6216da6..59aa4d6c38 100644 --- a/integration-tests/modules/__tests__/fulfillment-providers/index.spec.ts +++ b/integration-tests/modules/__tests__/fulfillment-providers/index.spec.ts @@ -1,5 +1,5 @@ import { IFulfillmentModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../helpers/create-admin-user" @@ -18,7 +18,7 @@ medusaIntegrationTestRunner({ beforeAll(() => { container = getContainer() - service = container.resolve(ModuleRegistrationName.FULFILLMENT) + service = container.resolve(Modules.FULFILLMENT) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/fulfillment/fulfillment.workflows.spec.ts b/integration-tests/modules/__tests__/fulfillment/fulfillment.workflows.spec.ts index 6e80ba3e3e..163cfab8a5 100644 --- a/integration-tests/modules/__tests__/fulfillment/fulfillment.workflows.spec.ts +++ b/integration-tests/modules/__tests__/fulfillment/fulfillment.workflows.spec.ts @@ -7,7 +7,7 @@ import { updateFulfillmentWorkflowId, } from "@medusajs/core-flows" import { IFulfillmentModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { generateCreateFulfillmentData, @@ -27,7 +27,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - service = appContainer.resolve(ModuleRegistrationName.FULFILLMENT) + service = appContainer.resolve(Modules.FULFILLMENT) }) describe("createFulfillmentWorkflow", () => { diff --git a/integration-tests/modules/__tests__/fulfillment/index.spec.ts b/integration-tests/modules/__tests__/fulfillment/index.spec.ts index 70a657f78f..bbc069ebe8 100644 --- a/integration-tests/modules/__tests__/fulfillment/index.spec.ts +++ b/integration-tests/modules/__tests__/fulfillment/index.spec.ts @@ -1,5 +1,5 @@ import { IFulfillmentModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../helpers/create-admin-user" import { @@ -24,7 +24,7 @@ medusaIntegrationTestRunner({ beforeAll(() => { container = getContainer() - service = container.resolve(ModuleRegistrationName.FULFILLMENT) + service = container.resolve(Modules.FULFILLMENT) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/invites/accept-invite.spec.ts b/integration-tests/modules/__tests__/invites/accept-invite.spec.ts index 5b26fdcab2..7fc9b5199b 100644 --- a/integration-tests/modules/__tests__/invites/accept-invite.spec.ts +++ b/integration-tests/modules/__tests__/invites/accept-invite.spec.ts @@ -1,5 +1,5 @@ import { IUserModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../helpers/create-admin-user" @@ -19,7 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - userModuleService = appContainer.resolve(ModuleRegistrationName.USER) + userModuleService = appContainer.resolve(Modules.USER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/invites/delete-invite.spec.ts b/integration-tests/modules/__tests__/invites/delete-invite.spec.ts index 2c98b81b0e..4b3fd6ac3a 100644 --- a/integration-tests/modules/__tests__/invites/delete-invite.spec.ts +++ b/integration-tests/modules/__tests__/invites/delete-invite.spec.ts @@ -1,5 +1,5 @@ import { IUserModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../helpers/create-admin-user" @@ -19,7 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - userModuleService = appContainer.resolve(ModuleRegistrationName.USER) + userModuleService = appContainer.resolve(Modules.USER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/invites/list-invites.spec.ts b/integration-tests/modules/__tests__/invites/list-invites.spec.ts index 347b482080..b8f18e13c0 100644 --- a/integration-tests/modules/__tests__/invites/list-invites.spec.ts +++ b/integration-tests/modules/__tests__/invites/list-invites.spec.ts @@ -1,5 +1,5 @@ import { IUserModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../helpers/create-admin-user" @@ -19,7 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - userModuleService = appContainer.resolve(ModuleRegistrationName.USER) + userModuleService = appContainer.resolve(Modules.USER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/invites/resend-invite.spec.ts b/integration-tests/modules/__tests__/invites/resend-invite.spec.ts index 97bb6b8af5..423f947e99 100644 --- a/integration-tests/modules/__tests__/invites/resend-invite.spec.ts +++ b/integration-tests/modules/__tests__/invites/resend-invite.spec.ts @@ -1,5 +1,5 @@ import { IUserModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../helpers/create-admin-user" @@ -19,7 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - userModuleService = appContainer.resolve(ModuleRegistrationName.USER) + userModuleService = appContainer.resolve(Modules.USER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/invites/retrieve-invite.spec.ts b/integration-tests/modules/__tests__/invites/retrieve-invite.spec.ts index b6317cdc25..e68a958794 100644 --- a/integration-tests/modules/__tests__/invites/retrieve-invite.spec.ts +++ b/integration-tests/modules/__tests__/invites/retrieve-invite.spec.ts @@ -1,5 +1,5 @@ import { IUserModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../helpers/create-admin-user" @@ -19,7 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - userModuleService = appContainer.resolve(ModuleRegistrationName.USER) + userModuleService = appContainer.resolve(Modules.USER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/link-modules/cart-links.spec.ts b/integration-tests/modules/__tests__/link-modules/cart-links.spec.ts index d098a363cd..93b11f6ca9 100644 --- a/integration-tests/modules/__tests__/link-modules/cart-links.spec.ts +++ b/integration-tests/modules/__tests__/link-modules/cart-links.spec.ts @@ -5,7 +5,7 @@ import { IRegionModuleService, ISalesChannelModuleService, } from "@medusajs/types" -import { ModuleRegistrationName, Modules } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" jest.setTimeout(50000) @@ -26,16 +26,12 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - cartModuleService = appContainer.resolve(ModuleRegistrationName.CART) - regionModule = appContainer.resolve(ModuleRegistrationName.REGION) - customerModule = appContainer.resolve(ModuleRegistrationName.CUSTOMER) - scModuleService = appContainer.resolve( - ModuleRegistrationName.SALES_CHANNEL - ) - regionModule = appContainer.resolve(ModuleRegistrationName.REGION) - paymentModuleService = appContainer.resolve( - ModuleRegistrationName.PAYMENT - ) + cartModuleService = appContainer.resolve(Modules.CART) + regionModule = appContainer.resolve(Modules.REGION) + customerModule = appContainer.resolve(Modules.CUSTOMER) + scModuleService = appContainer.resolve(Modules.SALES_CHANNEL) + regionModule = appContainer.resolve(Modules.REGION) + paymentModuleService = appContainer.resolve(Modules.PAYMENT) remoteQuery = appContainer.resolve("remoteQuery") remoteLink = appContainer.resolve("remoteLink") }) diff --git a/integration-tests/modules/__tests__/link-modules/cart-region.spec.ts b/integration-tests/modules/__tests__/link-modules/cart-region.spec.ts index c7d42cd58c..609e73afe7 100644 --- a/integration-tests/modules/__tests__/link-modules/cart-region.spec.ts +++ b/integration-tests/modules/__tests__/link-modules/cart-region.spec.ts @@ -1,5 +1,5 @@ import { ICartModuleService, IRegionModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" jest.setTimeout(50000) @@ -17,8 +17,8 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - cartModuleService = appContainer.resolve(ModuleRegistrationName.CART) - regionModule = appContainer.resolve(ModuleRegistrationName.REGION) + cartModuleService = appContainer.resolve(Modules.CART) + regionModule = appContainer.resolve(Modules.REGION) remoteQuery = appContainer.resolve("remoteQuery") }) diff --git a/integration-tests/modules/__tests__/link-modules/define-link.spec.ts b/integration-tests/modules/__tests__/link-modules/define-link.spec.ts index a42a96c34c..cde78ff706 100644 --- a/integration-tests/modules/__tests__/link-modules/define-link.spec.ts +++ b/integration-tests/modules/__tests__/link-modules/define-link.spec.ts @@ -29,7 +29,7 @@ medusaIntegrationTestRunner({ expect(link.serviceName).toEqual(linkDefinition.serviceName) expect(link.entryPoint).toEqual(linkDefinition.alias[0].name[0]) expect(linkDefinition).toEqual({ - serviceName: "currencyCurrencyRegionRegionLink", + serviceName: "CurrencyCurrencyRegionRegionLink", isLink: true, alias: [ { @@ -42,7 +42,7 @@ medusaIntegrationTestRunner({ primaryKeys: ["id", "currency_code", "region_id"], relationships: [ { - serviceName: "currency", + serviceName: "Currency", entity: "Currency", primaryKey: "code", foreignKey: "currency_code", @@ -53,7 +53,7 @@ medusaIntegrationTestRunner({ deleteCascade: false, }, { - serviceName: "region", + serviceName: "Region", entity: "Region", primaryKey: "id", foreignKey: "region_id", @@ -66,7 +66,7 @@ medusaIntegrationTestRunner({ ], extends: [ { - serviceName: "currency", + serviceName: "Currency", fieldAlias: { region: { path: "region_link.region", @@ -75,7 +75,7 @@ medusaIntegrationTestRunner({ }, }, relationship: { - serviceName: "currencyCurrencyRegionRegionLink", + serviceName: "CurrencyCurrencyRegionRegionLink", primaryKey: "currency_code", foreignKey: "code", alias: "region_link", @@ -83,7 +83,7 @@ medusaIntegrationTestRunner({ }, }, { - serviceName: "region", + serviceName: "Region", fieldAlias: { currency: { path: "currency_link.currency", @@ -92,7 +92,7 @@ medusaIntegrationTestRunner({ }, }, relationship: { - serviceName: "currencyCurrencyRegionRegionLink", + serviceName: "CurrencyCurrencyRegionRegionLink", primaryKey: "region_id", foreignKey: "id", alias: "currency_link", @@ -124,20 +124,20 @@ medusaIntegrationTestRunner({ expect(link.serviceName).toEqual(linkDefinition.serviceName) expect(link.entryPoint).toEqual(linkDefinition.alias[0].name[0]) expect(linkDefinition).toEqual({ - serviceName: "productProductVariantRegionRegionLink", + serviceName: "ProductProductVariantRegionRegionLink", isLink: true, alias: [ { name: ["product_variant_region"], args: { - entity: "LinkProductServiceProductVariantRegionRegion", + entity: "LinkProductProductVariantRegionRegion", }, }, ], primaryKeys: ["id", "product_variant_id", "region_id"], relationships: [ { - serviceName: "productService", + serviceName: "Product", entity: "ProductVariant", primaryKey: "id", foreignKey: "product_variant_id", @@ -148,7 +148,7 @@ medusaIntegrationTestRunner({ deleteCascade: false, }, { - serviceName: "region", + serviceName: "Region", entity: "Region", primaryKey: "id", foreignKey: "region_id", @@ -161,7 +161,7 @@ medusaIntegrationTestRunner({ ], extends: [ { - serviceName: "productService", + serviceName: "Product", fieldAlias: { region: { path: "region_link.region", @@ -170,7 +170,7 @@ medusaIntegrationTestRunner({ }, }, relationship: { - serviceName: "productProductVariantRegionRegionLink", + serviceName: "ProductProductVariantRegionRegionLink", primaryKey: "product_variant_id", foreignKey: "id", alias: "region_link", @@ -178,7 +178,7 @@ medusaIntegrationTestRunner({ }, }, { - serviceName: "region", + serviceName: "Region", fieldAlias: { product_variant: { path: "product_variant_link.product_variant", @@ -189,7 +189,7 @@ medusaIntegrationTestRunner({ }, }, relationship: { - serviceName: "productProductVariantRegionRegionLink", + serviceName: "ProductProductVariantRegionRegionLink", primaryKey: "region_id", foreignKey: "id", alias: "product_variant_link", @@ -224,7 +224,7 @@ medusaIntegrationTestRunner({ expect(link.serviceName).toEqual(linkDefinition.serviceName) expect(link.entryPoint).toEqual(linkDefinition.alias[0].name[0]) expect(linkDefinition).toEqual({ - serviceName: "currencyCurrencyRegionRegionLink", + serviceName: "CurrencyCurrencyRegionRegionLink", isLink: true, alias: [ { @@ -237,7 +237,7 @@ medusaIntegrationTestRunner({ primaryKeys: ["id", "currency_code", "region_id"], relationships: [ { - serviceName: "currency", + serviceName: "Currency", entity: "Currency", primaryKey: "code", foreignKey: "currency_code", @@ -248,7 +248,7 @@ medusaIntegrationTestRunner({ deleteCascade: true, }, { - serviceName: "region", + serviceName: "Region", entity: "Region", primaryKey: "id", foreignKey: "region_id", @@ -261,7 +261,7 @@ medusaIntegrationTestRunner({ ], extends: [ { - serviceName: "currency", + serviceName: "Currency", fieldAlias: { region: { path: "region_link.region", @@ -270,7 +270,7 @@ medusaIntegrationTestRunner({ }, }, relationship: { - serviceName: "currencyCurrencyRegionRegionLink", + serviceName: "CurrencyCurrencyRegionRegionLink", primaryKey: "currency_code", foreignKey: "code", alias: "region_link", @@ -278,7 +278,7 @@ medusaIntegrationTestRunner({ }, }, { - serviceName: "region", + serviceName: "Region", fieldAlias: { currency: { path: "currency_link.currency", @@ -287,7 +287,7 @@ medusaIntegrationTestRunner({ }, }, relationship: { - serviceName: "currencyCurrencyRegionRegionLink", + serviceName: "CurrencyCurrencyRegionRegionLink", primaryKey: "region_id", foreignKey: "id", alias: "currency_link", @@ -316,9 +316,9 @@ medusaIntegrationTestRunner({ }) .filter(Boolean)[0] - expect(link.serviceName).toEqual("currencyCurrencyRegionRegionLink") + expect(link.serviceName).toEqual("CurrencyCurrencyRegionRegionLink") expect(linkDefinition).toEqual({ - serviceName: "currencyCurrencyRegionRegionLink", + serviceName: "CurrencyCurrencyRegionRegionLink", isLink: true, alias: [ { @@ -331,7 +331,7 @@ medusaIntegrationTestRunner({ primaryKeys: ["id", "currency_code", "region_id"], relationships: [ { - serviceName: "currency", + serviceName: "Currency", entity: "Currency", primaryKey: "code", foreignKey: "currency_code", @@ -342,7 +342,7 @@ medusaIntegrationTestRunner({ deleteCascade: false, }, { - serviceName: "region", + serviceName: "Region", entity: "Region", primaryKey: "id", foreignKey: "region_id", @@ -355,7 +355,7 @@ medusaIntegrationTestRunner({ ], extends: [ { - serviceName: "currency", + serviceName: "Currency", fieldAlias: { regions: { path: "region_link.region", @@ -364,7 +364,7 @@ medusaIntegrationTestRunner({ }, }, relationship: { - serviceName: "currencyCurrencyRegionRegionLink", + serviceName: "CurrencyCurrencyRegionRegionLink", primaryKey: "currency_code", foreignKey: "code", alias: "region_link", @@ -372,7 +372,7 @@ medusaIntegrationTestRunner({ }, }, { - serviceName: "region", + serviceName: "Region", fieldAlias: { currency: { path: "currency_link.currency", @@ -381,7 +381,7 @@ medusaIntegrationTestRunner({ }, }, relationship: { - serviceName: "currencyCurrencyRegionRegionLink", + serviceName: "CurrencyCurrencyRegionRegionLink", primaryKey: "region_id", foreignKey: "id", alias: "currency_link", diff --git a/integration-tests/modules/__tests__/link-modules/fulfillment-set-location.spec.ts b/integration-tests/modules/__tests__/link-modules/fulfillment-set-location.spec.ts index 2b2a5c582e..bf988262d3 100644 --- a/integration-tests/modules/__tests__/link-modules/fulfillment-set-location.spec.ts +++ b/integration-tests/modules/__tests__/link-modules/fulfillment-set-location.spec.ts @@ -4,7 +4,6 @@ import { } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, Modules, remoteQueryObjectFromString, } from "@medusajs/utils" @@ -26,12 +25,8 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - fulfillmentModule = appContainer.resolve( - ModuleRegistrationName.FULFILLMENT - ) - locationModule = appContainer.resolve( - ModuleRegistrationName.STOCK_LOCATION - ) + fulfillmentModule = appContainer.resolve(Modules.FULFILLMENT) + locationModule = appContainer.resolve(Modules.STOCK_LOCATION) remoteQuery = appContainer.resolve( ContainerRegistrationKeys.REMOTE_QUERY ) diff --git a/integration-tests/modules/__tests__/link-modules/product-variant-price-set.spec.ts b/integration-tests/modules/__tests__/link-modules/product-variant-price-set.spec.ts index ef3e1e57cb..21c74a201f 100644 --- a/integration-tests/modules/__tests__/link-modules/product-variant-price-set.spec.ts +++ b/integration-tests/modules/__tests__/link-modules/product-variant-price-set.spec.ts @@ -1,7 +1,6 @@ import { IPricingModuleService, IProductModuleService } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, Modules, remoteQueryObjectFromString, } from "@medusajs/utils" @@ -23,8 +22,8 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - productModule = appContainer.resolve(ModuleRegistrationName.PRODUCT) - pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING) + productModule = appContainer.resolve(Modules.PRODUCT) + pricingModule = appContainer.resolve(Modules.PRICING) remoteQuery = appContainer.resolve( ContainerRegistrationKeys.REMOTE_QUERY ) diff --git a/integration-tests/modules/__tests__/link-modules/publishable-key-sales-channel.spec.ts b/integration-tests/modules/__tests__/link-modules/publishable-key-sales-channel.spec.ts index 9bddc85753..48e7e5e6b7 100644 --- a/integration-tests/modules/__tests__/link-modules/publishable-key-sales-channel.spec.ts +++ b/integration-tests/modules/__tests__/link-modules/publishable-key-sales-channel.spec.ts @@ -2,11 +2,7 @@ import { IApiKeyModuleService, ISalesChannelModuleService, } from "@medusajs/types" -import { - ModuleRegistrationName, - Modules, - remoteQueryObjectFromString, -} from "@medusajs/utils" +import { Modules, remoteQueryObjectFromString } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" jest.setTimeout(50000) @@ -25,10 +21,8 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - apiKeyModule = appContainer.resolve(ModuleRegistrationName.API_KEY) - scModuleService = appContainer.resolve( - ModuleRegistrationName.SALES_CHANNEL - ) + apiKeyModule = appContainer.resolve(Modules.API_KEY) + scModuleService = appContainer.resolve(Modules.SALES_CHANNEL) remoteQuery = appContainer.resolve("remoteQuery") remoteLink = appContainer.resolve("remoteLink") }) diff --git a/integration-tests/modules/__tests__/link-modules/region-payment-provider.spec.ts b/integration-tests/modules/__tests__/link-modules/region-payment-provider.spec.ts index 9b80431b3a..8c62f3f66b 100644 --- a/integration-tests/modules/__tests__/link-modules/region-payment-provider.spec.ts +++ b/integration-tests/modules/__tests__/link-modules/region-payment-provider.spec.ts @@ -1,9 +1,5 @@ import { IRegionModuleService } from "@medusajs/types" -import { - ContainerRegistrationKeys, - ModuleRegistrationName, - Modules, -} from "@medusajs/utils" +import { ContainerRegistrationKeys, Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" jest.setTimeout(50000) @@ -21,7 +17,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - regionModule = appContainer.resolve(ModuleRegistrationName.REGION) + regionModule = appContainer.resolve(Modules.REGION) remoteQuery = appContainer.resolve( ContainerRegistrationKeys.REMOTE_QUERY ) diff --git a/integration-tests/modules/__tests__/link-modules/sales-channel-location.spec.ts b/integration-tests/modules/__tests__/link-modules/sales-channel-location.spec.ts index 09143e85a7..c3da244e81 100644 --- a/integration-tests/modules/__tests__/link-modules/sales-channel-location.spec.ts +++ b/integration-tests/modules/__tests__/link-modules/sales-channel-location.spec.ts @@ -2,11 +2,7 @@ import { ISalesChannelModuleService, IStockLocationService, } from "@medusajs/types" -import { - ModuleRegistrationName, - Modules, - remoteQueryObjectFromString, -} from "@medusajs/utils" +import { Modules, remoteQueryObjectFromString } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" jest.setTimeout(50000) @@ -24,10 +20,8 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - scService = appContainer.resolve(ModuleRegistrationName.SALES_CHANNEL) - locationService = appContainer.resolve( - ModuleRegistrationName.STOCK_LOCATION - ) + scService = appContainer.resolve(Modules.SALES_CHANNEL) + locationService = appContainer.resolve(Modules.STOCK_LOCATION) remoteQuery = appContainer.resolve("remoteQuery") remoteLink = appContainer.resolve("remoteLink") }) diff --git a/integration-tests/modules/__tests__/link-modules/shipping-option-price-set.spec.ts b/integration-tests/modules/__tests__/link-modules/shipping-option-price-set.spec.ts index f311844dce..5c4592b2bc 100644 --- a/integration-tests/modules/__tests__/link-modules/shipping-option-price-set.spec.ts +++ b/integration-tests/modules/__tests__/link-modules/shipping-option-price-set.spec.ts @@ -2,11 +2,7 @@ import { IFulfillmentModuleService, IPricingModuleService, } from "@medusajs/types" -import { - ContainerRegistrationKeys, - ModuleRegistrationName, - Modules, -} from "@medusajs/utils" +import { ContainerRegistrationKeys, Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { adminHeaders, @@ -28,10 +24,8 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - fulfillmentModule = appContainer.resolve( - ModuleRegistrationName.FULFILLMENT - ) - pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING) + fulfillmentModule = appContainer.resolve(Modules.FULFILLMENT) + pricingModule = appContainer.resolve(Modules.PRICING) remoteQuery = appContainer.resolve( ContainerRegistrationKeys.REMOTE_QUERY ) diff --git a/integration-tests/modules/__tests__/link-modules/store-currency.spec.ts b/integration-tests/modules/__tests__/link-modules/store-currency.spec.ts index fe45d8d23e..5db4c388ef 100644 --- a/integration-tests/modules/__tests__/link-modules/store-currency.spec.ts +++ b/integration-tests/modules/__tests__/link-modules/store-currency.spec.ts @@ -1,8 +1,5 @@ import { ICurrencyModuleService, IStoreModuleService } from "@medusajs/types" -import { - ModuleRegistrationName, - remoteQueryObjectFromString, -} from "@medusajs/utils" +import { Modules, remoteQueryObjectFromString } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" jest.setTimeout(50000) @@ -20,10 +17,8 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - storeModuleService = appContainer.resolve(ModuleRegistrationName.STORE) - currencyModuleService = appContainer.resolve( - ModuleRegistrationName.CURRENCY - ) + storeModuleService = appContainer.resolve(Modules.STORE) + currencyModuleService = appContainer.resolve(Modules.CURRENCY) remoteQuery = appContainer.resolve("remoteQuery") }) diff --git a/integration-tests/modules/__tests__/modules/remote-query.spec.ts b/integration-tests/modules/__tests__/modules/remote-query.spec.ts index 0e3aac61fa..e7fd4565df 100644 --- a/integration-tests/modules/__tests__/modules/remote-query.spec.ts +++ b/integration-tests/modules/__tests__/modules/remote-query.spec.ts @@ -1,9 +1,5 @@ import { IRegionModuleService } from "@medusajs/types" -import { - ContainerRegistrationKeys, - ModuleRegistrationName, - Modules, -} from "@medusajs/utils" +import { ContainerRegistrationKeys, Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../..//helpers/create-admin-user" import { adminHeaders } from "../../../helpers/create-admin-user" @@ -23,7 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - regionModule = appContainer.resolve(ModuleRegistrationName.REGION) + regionModule = appContainer.resolve(Modules.REGION) remoteQuery = appContainer.resolve( ContainerRegistrationKeys.REMOTE_QUERY ) @@ -131,7 +127,7 @@ medusaIntegrationTestRunner({ } ) ).rejects.toThrow( - `regionRegionPaymentPaymentProviderLink region_id not found: ${regionNoLink.id}` + `RegionRegionPaymentPaymentProviderLink region_id not found: ${regionNoLink.id}` ) // Only validate the relations with Payment. It doesn't fail because the link didn't return any data @@ -174,7 +170,7 @@ medusaIntegrationTestRunner({ } ) ).rejects.toThrow( - "payment id not found: pp_system_default_non_existent" + "Payment id not found: pp_system_default_non_existent" ) // everything is fine diff --git a/integration-tests/modules/__tests__/notification/admin/notification.spec.ts b/integration-tests/modules/__tests__/notification/admin/notification.spec.ts index 0c568bc49f..32507de312 100644 --- a/integration-tests/modules/__tests__/notification/admin/notification.spec.ts +++ b/integration-tests/modules/__tests__/notification/admin/notification.spec.ts @@ -4,11 +4,8 @@ import { INotificationModuleService, Logger, } from "@medusajs/types" -import { - ContainerRegistrationKeys, - ModuleRegistrationName, -} from "@medusajs/utils" -import { medusaIntegrationTestRunner, TestEventUtils } from "medusa-test-utils" +import { ContainerRegistrationKeys, Modules } from "@medusajs/utils" +import { TestEventUtils, medusaIntegrationTestRunner } from "medusa-test-utils" jest.setTimeout(50000) @@ -19,7 +16,7 @@ medusaIntegrationTestRunner({ let logger: Logger beforeAll(async () => { - service = getContainer().resolve(ModuleRegistrationName.NOTIFICATION) + service = getContainer().resolve(Modules.NOTIFICATION) logger = getContainer().resolve(ContainerRegistrationKeys.LOGGER) }) @@ -166,7 +163,7 @@ medusaIntegrationTestRunner({ describe("Configurable notification subscriber", () => { let eventBus: IEventBusModuleService beforeAll(async () => { - eventBus = getContainer().resolve(ModuleRegistrationName.EVENT_BUS) + eventBus = getContainer().resolve(Modules.EVENT_BUS) }) it("should successfully sent a notification when an order is created (based on configuration)", async () => { diff --git a/integration-tests/modules/__tests__/order/draft-order.spec.ts b/integration-tests/modules/__tests__/order/draft-order.spec.ts index 8061ed3878..d5162251a0 100644 --- a/integration-tests/modules/__tests__/order/draft-order.spec.ts +++ b/integration-tests/modules/__tests__/order/draft-order.spec.ts @@ -9,11 +9,7 @@ import { IStockLocationServiceNext, ITaxModuleService, } from "@medusajs/types" -import { - ContainerRegistrationKeys, - ModuleRegistrationName, - Modules, -} from "@medusajs/utils" +import { ContainerRegistrationKeys, Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { adminHeaders, @@ -42,21 +38,15 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - cartModuleService = appContainer.resolve(ModuleRegistrationName.CART) - regionModuleService = appContainer.resolve(ModuleRegistrationName.REGION) - scModuleService = appContainer.resolve( - ModuleRegistrationName.SALES_CHANNEL - ) - productModule = appContainer.resolve(ModuleRegistrationName.PRODUCT) - pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING) - inventoryModule = appContainer.resolve(ModuleRegistrationName.INVENTORY) - stockLocationModule = appContainer.resolve( - ModuleRegistrationName.STOCK_LOCATION - ) - fulfillmentModule = appContainer.resolve( - ModuleRegistrationName.FULFILLMENT - ) - taxModule = appContainer.resolve(ModuleRegistrationName.TAX) + cartModuleService = appContainer.resolve(Modules.CART) + regionModuleService = appContainer.resolve(Modules.REGION) + scModuleService = appContainer.resolve(Modules.SALES_CHANNEL) + productModule = appContainer.resolve(Modules.PRODUCT) + pricingModule = appContainer.resolve(Modules.PRICING) + inventoryModule = appContainer.resolve(Modules.INVENTORY) + stockLocationModule = appContainer.resolve(Modules.STOCK_LOCATION) + fulfillmentModule = appContainer.resolve(Modules.FULFILLMENT) + taxModule = appContainer.resolve(Modules.TAX) remoteLink = appContainer.resolve(ContainerRegistrationKeys.REMOTE_LINK) remoteQuery = appContainer.resolve(ContainerRegistrationKeys.REMOTE_QUERY) }) diff --git a/integration-tests/modules/__tests__/order/order.spec.ts b/integration-tests/modules/__tests__/order/order.spec.ts index cedd49800b..e51b45c64f 100644 --- a/integration-tests/modules/__tests__/order/order.spec.ts +++ b/integration-tests/modules/__tests__/order/order.spec.ts @@ -1,5 +1,5 @@ import { IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { adminHeaders, @@ -18,7 +18,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - orderModule = appContainer.resolve(ModuleRegistrationName.ORDER) + orderModule = appContainer.resolve(Modules.ORDER) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/order/workflows/__fixtures__/index.ts b/integration-tests/modules/__tests__/order/workflows/__fixtures__/index.ts index c3d69c6609..3abdec9f34 100644 --- a/integration-tests/modules/__tests__/order/workflows/__fixtures__/index.ts +++ b/integration-tests/modules/__tests__/order/workflows/__fixtures__/index.ts @@ -8,24 +8,19 @@ import { } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, Modules, remoteQueryObjectFromString, } from "@medusajs/utils" const providerId = "manual_test-provider" export async function prepareDataFixtures({ container }) { - const fulfillmentService = container.resolve( - ModuleRegistrationName.FULFILLMENT - ) - const salesChannelService = container.resolve( - ModuleRegistrationName.SALES_CHANNEL - ) + const fulfillmentService = container.resolve(Modules.FULFILLMENT) + const salesChannelService = container.resolve(Modules.SALES_CHANNEL) const stockLocationModule: IStockLocationService = container.resolve( - ModuleRegistrationName.STOCK_LOCATION + Modules.STOCK_LOCATION ) - const productModule = container.resolve(ModuleRegistrationName.PRODUCT) - const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY) + const productModule = container.resolve(Modules.PRODUCT) + const inventoryModule = container.resolve(Modules.INVENTORY) const shippingProfile = await fulfillmentService.createShippingProfiles({ name: "test", @@ -49,7 +44,7 @@ export async function prepareDataFixtures({ container }) { }) const regionService = container.resolve( - ModuleRegistrationName.REGION + Modules.REGION ) as IRegionModuleService const [region] = await regionService.createRegions([ @@ -211,9 +206,7 @@ export async function createOrderFixture({ location, inventoryItem, }) { - const orderService: IOrderModuleService = container.resolve( - ModuleRegistrationName.ORDER - ) + const orderService: IOrderModuleService = container.resolve(Modules.ORDER) let order = await orderService.createOrders({ region_id: "test_region_id", @@ -287,7 +280,7 @@ export async function createOrderFixture({ customer_id: "joe", }) - const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY) + const inventoryModule = container.resolve(Modules.INVENTORY) await inventoryModule.createReservationItems([ { line_item_id: order.items![0].id, diff --git a/integration-tests/modules/__tests__/order/workflows/begin-order-claim.spec.ts b/integration-tests/modules/__tests__/order/workflows/begin-order-claim.spec.ts index 9debc604aa..dc74c53f3d 100644 --- a/integration-tests/modules/__tests__/order/workflows/begin-order-claim.spec.ts +++ b/integration-tests/modules/__tests__/order/workflows/begin-order-claim.spec.ts @@ -15,7 +15,6 @@ import { import { ClaimType, ContainerRegistrationKeys, - ModuleRegistrationName, Modules, RuleOperator, remoteQueryObjectFromString, @@ -28,18 +27,14 @@ const env = { MEDUSA_FF_MEDUSA_V2: true } const providerId = "manual_test-provider" async function prepareDataFixtures({ container }) { - const fulfillmentService = container.resolve( - ModuleRegistrationName.FULFILLMENT - ) - const salesChannelService = container.resolve( - ModuleRegistrationName.SALES_CHANNEL - ) + const fulfillmentService = container.resolve(Modules.FULFILLMENT) + const salesChannelService = container.resolve(Modules.SALES_CHANNEL) const stockLocationModule: IStockLocationService = container.resolve( - ModuleRegistrationName.STOCK_LOCATION + Modules.STOCK_LOCATION ) - const productModule = container.resolve(ModuleRegistrationName.PRODUCT) - const pricingModule = container.resolve(ModuleRegistrationName.PRICING) - const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY) + const productModule = container.resolve(Modules.PRODUCT) + const pricingModule = container.resolve(Modules.PRICING) + const inventoryModule = container.resolve(Modules.INVENTORY) const shippingProfile = await fulfillmentService.createShippingProfiles({ name: "test", @@ -63,7 +58,7 @@ async function prepareDataFixtures({ container }) { }) const regionService = container.resolve( - ModuleRegistrationName.REGION + Modules.REGION ) as IRegionModuleService const [region] = await regionService.createRegions([ @@ -237,9 +232,7 @@ async function prepareDataFixtures({ container }) { } async function createOrderFixture({ container, product }) { - const orderService: IOrderModuleService = container.resolve( - ModuleRegistrationName.ORDER - ) + const orderService: IOrderModuleService = container.resolve(Modules.ORDER) let order = await orderService.createOrders({ region_id: "test_region_id", email: "foo@bar.com", diff --git a/integration-tests/modules/__tests__/order/workflows/begin-order-exchange.spec.ts b/integration-tests/modules/__tests__/order/workflows/begin-order-exchange.spec.ts index 9516c828e7..06a231b215 100644 --- a/integration-tests/modules/__tests__/order/workflows/begin-order-exchange.spec.ts +++ b/integration-tests/modules/__tests__/order/workflows/begin-order-exchange.spec.ts @@ -17,7 +17,6 @@ import { } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, Modules, RuleOperator, remoteQueryObjectFromString, @@ -30,19 +29,15 @@ const env = { MEDUSA_FF_MEDUSA_V2: true } const providerId = "manual_test-provider" async function prepareDataFixtures({ container }) { - const fulfillmentService = container.resolve( - ModuleRegistrationName.FULFILLMENT - ) - const salesChannelService = container.resolve( - ModuleRegistrationName.SALES_CHANNEL - ) + const fulfillmentService = container.resolve(Modules.FULFILLMENT) + const salesChannelService = container.resolve(Modules.SALES_CHANNEL) const stockLocationModule: IStockLocationService = container.resolve( - ModuleRegistrationName.STOCK_LOCATION + Modules.STOCK_LOCATION ) - const productModule = container.resolve(ModuleRegistrationName.PRODUCT) - const pricingModule = container.resolve(ModuleRegistrationName.PRICING) - const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY) - const customerService = container.resolve(ModuleRegistrationName.CUSTOMER) + const productModule = container.resolve(Modules.PRODUCT) + const pricingModule = container.resolve(Modules.PRICING) + const inventoryModule = container.resolve(Modules.INVENTORY) + const customerService = container.resolve(Modules.CUSTOMER) const remoteLink = container.resolve(ContainerRegistrationKeys.REMOTE_LINK) const customer = await customerService.createCustomers({ @@ -72,7 +67,7 @@ async function prepareDataFixtures({ container }) { }) const regionService = container.resolve( - ModuleRegistrationName.REGION + Modules.REGION ) as IRegionModuleService const [region] = await regionService.createRegions([ @@ -292,7 +287,7 @@ async function createOrderFixture({ customer, region, }) { - const orderService = container.resolve(ModuleRegistrationName.ORDER) + const orderService = container.resolve(Modules.ORDER) let order = await orderService.createOrders({ region_id: region.id, email: "foo@bar.com", diff --git a/integration-tests/modules/__tests__/order/workflows/begin-order-return.spec.ts b/integration-tests/modules/__tests__/order/workflows/begin-order-return.spec.ts index cad2b1df5c..a746ab6fc4 100644 --- a/integration-tests/modules/__tests__/order/workflows/begin-order-return.spec.ts +++ b/integration-tests/modules/__tests__/order/workflows/begin-order-return.spec.ts @@ -13,7 +13,6 @@ import { } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, Modules, RuleOperator, remoteQueryObjectFromString, @@ -26,18 +25,14 @@ const env = { MEDUSA_FF_MEDUSA_V2: true } const providerId = "manual_test-provider" async function prepareDataFixtures({ container }) { - const fulfillmentService = container.resolve( - ModuleRegistrationName.FULFILLMENT - ) - const salesChannelService = container.resolve( - ModuleRegistrationName.SALES_CHANNEL - ) + const fulfillmentService = container.resolve(Modules.FULFILLMENT) + const salesChannelService = container.resolve(Modules.SALES_CHANNEL) const stockLocationModule: IStockLocationService = container.resolve( - ModuleRegistrationName.STOCK_LOCATION + Modules.STOCK_LOCATION ) - const productModule = container.resolve(ModuleRegistrationName.PRODUCT) - const pricingModule = container.resolve(ModuleRegistrationName.PRICING) - const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY) + const productModule = container.resolve(Modules.PRODUCT) + const pricingModule = container.resolve(Modules.PRICING) + const inventoryModule = container.resolve(Modules.INVENTORY) const shippingProfile = await fulfillmentService.createShippingProfiles({ name: "test", @@ -61,7 +56,7 @@ async function prepareDataFixtures({ container }) { }) const regionService = container.resolve( - ModuleRegistrationName.REGION + Modules.REGION ) as IRegionModuleService const [region] = await regionService.createRegions([ @@ -238,9 +233,7 @@ async function prepareDataFixtures({ container }) { } async function createOrderFixture({ container, product }) { - const orderService: IOrderModuleService = container.resolve( - ModuleRegistrationName.ORDER - ) + const orderService: IOrderModuleService = container.resolve(Modules.ORDER) let order = await orderService.createOrders({ region_id: "test_region_id", email: "foo@bar.com", diff --git a/integration-tests/modules/__tests__/order/workflows/cancel-order.spec.ts b/integration-tests/modules/__tests__/order/workflows/cancel-order.spec.ts index 8ce44a9791..258c2d8e59 100644 --- a/integration-tests/modules/__tests__/order/workflows/cancel-order.spec.ts +++ b/integration-tests/modules/__tests__/order/workflows/cancel-order.spec.ts @@ -4,8 +4,8 @@ import { createOrderFulfillmentWorkflow, } from "@medusajs/core-flows" import { - InventoryItemDTO, IOrderModuleService, + InventoryItemDTO, OrderWorkflow, ProductDTO, RegionDTO, @@ -14,7 +14,7 @@ import { } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, + Modules, remoteQueryObjectFromString, } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" @@ -52,7 +52,7 @@ medusaIntegrationTestRunner({ product = fixtures.product inventoryItem = fixtures.inventoryItem - orderService = container.resolve(ModuleRegistrationName.ORDER) + orderService = container.resolve(Modules.ORDER) }) it("should cancel an order", async () => { diff --git a/integration-tests/modules/__tests__/order/workflows/create-complete-return.spec.ts b/integration-tests/modules/__tests__/order/workflows/create-complete-return.spec.ts index 26665aa197..b7d505997e 100644 --- a/integration-tests/modules/__tests__/order/workflows/create-complete-return.spec.ts +++ b/integration-tests/modules/__tests__/order/workflows/create-complete-return.spec.ts @@ -17,7 +17,6 @@ import { } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, Modules, RuleOperator, remoteQueryObjectFromString, @@ -30,18 +29,14 @@ const env = { MEDUSA_FF_MEDUSA_V2: true } const providerId = "manual_test-provider" async function prepareDataFixtures({ container }) { - const fulfillmentService = container.resolve( - ModuleRegistrationName.FULFILLMENT - ) - const salesChannelService = container.resolve( - ModuleRegistrationName.SALES_CHANNEL - ) + const fulfillmentService = container.resolve(Modules.FULFILLMENT) + const salesChannelService = container.resolve(Modules.SALES_CHANNEL) const stockLocationModule: IStockLocationService = container.resolve( - ModuleRegistrationName.STOCK_LOCATION + Modules.STOCK_LOCATION ) - const productModule = container.resolve(ModuleRegistrationName.PRODUCT) - const pricingModule = container.resolve(ModuleRegistrationName.PRICING) - const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY) + const productModule = container.resolve(Modules.PRODUCT) + const pricingModule = container.resolve(Modules.PRICING) + const inventoryModule = container.resolve(Modules.INVENTORY) const remoteLink = container.resolve(ContainerRegistrationKeys.REMOTE_LINK) const shippingProfile = await fulfillmentService.createShippingProfiles({ @@ -66,7 +61,7 @@ async function prepareDataFixtures({ container }) { }) const regionService = container.resolve( - ModuleRegistrationName.REGION + Modules.REGION ) as IRegionModuleService const [region] = await regionService.createRegions([ @@ -241,9 +236,7 @@ async function prepareDataFixtures({ container }) { } async function createOrderFixture({ container, product }) { - const orderService: IOrderModuleService = container.resolve( - ModuleRegistrationName.ORDER - ) + const orderService: IOrderModuleService = container.resolve(Modules.ORDER) let order = await orderService.createOrders({ region_id: "test_region_id", email: "foo@bar.com", @@ -390,7 +383,7 @@ medusaIntegrationTestRunner({ product = fixtures.product fulfillmentSet = fixtures.fulfillmentSet - orderService = container.resolve(ModuleRegistrationName.ORDER) + orderService = container.resolve(Modules.ORDER) }) it("should create a return order", async () => { diff --git a/integration-tests/modules/__tests__/order/workflows/create-fulfillment.spec.ts b/integration-tests/modules/__tests__/order/workflows/create-fulfillment.spec.ts index 775f6d361d..b4e2d8b01c 100644 --- a/integration-tests/modules/__tests__/order/workflows/create-fulfillment.spec.ts +++ b/integration-tests/modules/__tests__/order/workflows/create-fulfillment.spec.ts @@ -17,7 +17,6 @@ import { import { BigNumber, ContainerRegistrationKeys, - ModuleRegistrationName, Modules, remoteQueryObjectFromString, } from "@medusajs/utils" @@ -31,17 +30,13 @@ const variantSkuWithInventory = "test-variant" let inventoryItem async function prepareDataFixtures({ container }) { - const fulfillmentService = container.resolve( - ModuleRegistrationName.FULFILLMENT - ) - const salesChannelService = container.resolve( - ModuleRegistrationName.SALES_CHANNEL - ) + const fulfillmentService = container.resolve(Modules.FULFILLMENT) + const salesChannelService = container.resolve(Modules.SALES_CHANNEL) const stockLocationModule: IStockLocationService = container.resolve( - ModuleRegistrationName.STOCK_LOCATION + Modules.STOCK_LOCATION ) - const productModule = container.resolve(ModuleRegistrationName.PRODUCT) - const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY) + const productModule = container.resolve(Modules.PRODUCT) + const inventoryModule = container.resolve(Modules.INVENTORY) const shippingProfile = await fulfillmentService.createShippingProfiles({ name: "test", @@ -65,7 +60,7 @@ async function prepareDataFixtures({ container }) { }) const regionService = container.resolve( - ModuleRegistrationName.REGION + Modules.REGION ) as IRegionModuleService const [region] = await regionService.createRegions([ @@ -226,9 +221,7 @@ async function prepareDataFixtures({ container }) { } async function createOrderFixture({ container, product, location }) { - const orderService: IOrderModuleService = container.resolve( - ModuleRegistrationName.ORDER - ) + const orderService: IOrderModuleService = container.resolve(Modules.ORDER) let order = await orderService.createOrders({ region_id: "test_region_id", email: "foo@bar.com", @@ -310,7 +303,7 @@ async function createOrderFixture({ container, product, location }) { customer_id: "joe", }) - const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY) + const inventoryModule = container.resolve(Modules.INVENTORY) const reservation = await inventoryModule.createReservationItems([ { @@ -355,13 +348,11 @@ medusaIntegrationTestRunner({ location = fixtures.location product = fixtures.product - orderService = container.resolve(ModuleRegistrationName.ORDER) + orderService = container.resolve(Modules.ORDER) }) it("should create a order fulfillment and cancel it", async () => { - const inventoryModule = container.resolve( - ModuleRegistrationName.INVENTORY - ) + const inventoryModule = container.resolve(Modules.INVENTORY) const order = await createOrderFixture({ container, product, location }) const itemWithInventory = order.items!.find( @@ -534,9 +525,7 @@ medusaIntegrationTestRunner({ expect(orderFulfill.fulfillments).toHaveLength(1) expect(orderFulfill.items[0].detail.fulfilled_quantity).toEqual(1) - const inventoryModule = container.resolve( - ModuleRegistrationName.INVENTORY - ) + const inventoryModule = container.resolve(Modules.INVENTORY) const reservation = await inventoryModule.listReservationItems({ line_item_id: order.items![0].id, }) diff --git a/integration-tests/modules/__tests__/order/workflows/create-shipment.spec.ts b/integration-tests/modules/__tests__/order/workflows/create-shipment.spec.ts index 0073a3fcd1..673a25554b 100644 --- a/integration-tests/modules/__tests__/order/workflows/create-shipment.spec.ts +++ b/integration-tests/modules/__tests__/order/workflows/create-shipment.spec.ts @@ -16,7 +16,6 @@ import { } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, Modules, RuleOperator, remoteQueryObjectFromString, @@ -30,17 +29,13 @@ const providerId = "manual_test-provider" let inventoryItem async function prepareDataFixtures({ container }) { - const fulfillmentService = container.resolve( - ModuleRegistrationName.FULFILLMENT - ) - const salesChannelService = container.resolve( - ModuleRegistrationName.SALES_CHANNEL - ) + const fulfillmentService = container.resolve(Modules.FULFILLMENT) + const salesChannelService = container.resolve(Modules.SALES_CHANNEL) const stockLocationModule: IStockLocationService = container.resolve( - ModuleRegistrationName.STOCK_LOCATION + Modules.STOCK_LOCATION ) - const productModule = container.resolve(ModuleRegistrationName.PRODUCT) - const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY) + const productModule = container.resolve(Modules.PRODUCT) + const inventoryModule = container.resolve(Modules.INVENTORY) const shippingProfile = await fulfillmentService.createShippingProfiles({ name: "test", @@ -64,7 +59,7 @@ async function prepareDataFixtures({ container }) { }) const regionService = container.resolve( - ModuleRegistrationName.REGION + Modules.REGION ) as IRegionModuleService const [region] = await regionService.createRegions([ @@ -227,9 +222,7 @@ async function prepareDataFixtures({ container }) { } async function createOrderFixture({ container, product, location }) { - const orderService: IOrderModuleService = container.resolve( - ModuleRegistrationName.ORDER - ) + const orderService: IOrderModuleService = container.resolve(Modules.ORDER) let order = await orderService.createOrders({ region_id: "test_region_id", email: "foo@bar.com", @@ -302,7 +295,7 @@ async function createOrderFixture({ container, product, location }) { customer_id: "joe", }) - const inventoryModule = container.resolve(ModuleRegistrationName.INVENTORY) + const inventoryModule = container.resolve(Modules.INVENTORY) const reservation = await inventoryModule.createReservationItems([ { line_item_id: order.items![0].id, @@ -346,7 +339,7 @@ medusaIntegrationTestRunner({ location = fixtures.location product = fixtures.product - orderService = container.resolve(ModuleRegistrationName.ORDER) + orderService = container.resolve(Modules.ORDER) }) it("should create a order fulfillment", async () => { @@ -417,9 +410,7 @@ medusaIntegrationTestRunner({ expect(orderFulfill.fulfillments).toHaveLength(1) expect(orderFulfill.items[0].detail.fulfilled_quantity).toEqual(1) - const inventoryModule = container.resolve( - ModuleRegistrationName.INVENTORY - ) + const inventoryModule = container.resolve(Modules.INVENTORY) const reservation = await inventoryModule.listReservationItems({ line_item_id: order.items![0].id, }) diff --git a/integration-tests/modules/__tests__/order/workflows/order-change-actions.ts b/integration-tests/modules/__tests__/order/workflows/order-change-actions.ts index 6070a423da..0572e1f0cd 100644 --- a/integration-tests/modules/__tests__/order/workflows/order-change-actions.ts +++ b/integration-tests/modules/__tests__/order/workflows/order-change-actions.ts @@ -13,7 +13,7 @@ import { OrderChangeDTO, OrderDTO, } from "@medusajs/types" -import { ChangeActionType, ModuleRegistrationName } from "@medusajs/utils" +import { ChangeActionType, Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createOrderFixture, prepareDataFixtures } from "./__fixtures__" @@ -48,7 +48,7 @@ medusaIntegrationTestRunner({ }) orderChange = result - service = container.resolve(ModuleRegistrationName.ORDER) + service = container.resolve(Modules.ORDER) }) describe("createOrderChangeActionsWorkflow", () => { diff --git a/integration-tests/modules/__tests__/order/workflows/order-change.spec.ts b/integration-tests/modules/__tests__/order/workflows/order-change.spec.ts index 67f38a6e51..0eef5d9645 100644 --- a/integration-tests/modules/__tests__/order/workflows/order-change.spec.ts +++ b/integration-tests/modules/__tests__/order/workflows/order-change.spec.ts @@ -8,7 +8,7 @@ import { deleteOrderChangeWorkflowId, } from "@medusajs/core-flows" import { IOrderModuleService, OrderChangeDTO, OrderDTO } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createOrderFixture, prepareDataFixtures } from "./__fixtures__" @@ -100,7 +100,7 @@ medusaIntegrationTestRunner({ }) orderChange = result - service = container.resolve(ModuleRegistrationName.ORDER) + service = container.resolve(Modules.ORDER) }) it("should successfully cancel an order change", async () => { @@ -179,7 +179,7 @@ medusaIntegrationTestRunner({ }) orderChange = result - service = container.resolve(ModuleRegistrationName.ORDER) + service = container.resolve(Modules.ORDER) }) it("should successfully delete an order change", async () => { @@ -256,7 +256,7 @@ medusaIntegrationTestRunner({ }) orderChange = result - service = container.resolve(ModuleRegistrationName.ORDER) + service = container.resolve(Modules.ORDER) }) it("should successfully decline an order change", async () => { diff --git a/integration-tests/modules/__tests__/order/workflows/return/create-return-shipping.spec.ts b/integration-tests/modules/__tests__/order/workflows/return/create-return-shipping.spec.ts index 7c7c78dd16..56c6f8ac9f 100644 --- a/integration-tests/modules/__tests__/order/workflows/return/create-return-shipping.spec.ts +++ b/integration-tests/modules/__tests__/order/workflows/return/create-return-shipping.spec.ts @@ -5,7 +5,7 @@ import { import { IFulfillmentModuleService, OrderDTO, ReturnDTO } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, + Modules, remoteQueryObjectFromString, } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" @@ -54,7 +54,7 @@ medusaIntegrationTestRunner({ fields: ["order_id", "id", "status", "order_change_id"], }) - service = container.resolve(ModuleRegistrationName.FULFILLMENT) + service = container.resolve(Modules.FULFILLMENT) ;[returnOrder] = await remoteQuery(remoteQueryObject) }) diff --git a/integration-tests/modules/__tests__/order/workflows/return/items.spec.ts b/integration-tests/modules/__tests__/order/workflows/return/items.spec.ts index b092d81392..8080ed7aad 100644 --- a/integration-tests/modules/__tests__/order/workflows/return/items.spec.ts +++ b/integration-tests/modules/__tests__/order/workflows/return/items.spec.ts @@ -6,7 +6,7 @@ import { import { IOrderModuleService, OrderDTO, ReturnDTO } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, + Modules, remoteQueryObjectFromString, } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" @@ -65,7 +65,7 @@ medusaIntegrationTestRunner({ fields: ["order_id", "id", "status", "order_change_id"], }) - service = container.resolve(ModuleRegistrationName.ORDER) + service = container.resolve(Modules.ORDER) ;[returnOrder] = await remoteQuery(remoteQueryObject) }) diff --git a/integration-tests/modules/__tests__/payment/payment-session.workflows.spec.ts b/integration-tests/modules/__tests__/payment/payment-session.workflows.spec.ts index 33a26a3efd..375086580c 100644 --- a/integration-tests/modules/__tests__/payment/payment-session.workflows.spec.ts +++ b/integration-tests/modules/__tests__/payment/payment-session.workflows.spec.ts @@ -3,7 +3,7 @@ import { createPaymentSessionsWorkflowId, } from "@medusajs/core-flows" import { IPaymentModuleService, IRegionModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" jest.setTimeout(50000) @@ -21,8 +21,8 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - paymentModule = appContainer.resolve(ModuleRegistrationName.PAYMENT) - regionModule = appContainer.resolve(ModuleRegistrationName.REGION) + paymentModule = appContainer.resolve(Modules.PAYMENT) + regionModule = appContainer.resolve(Modules.REGION) remoteLink = appContainer.resolve("remoteLink") }) diff --git a/integration-tests/modules/__tests__/price-lists/admin/price-lists.spec.ts b/integration-tests/modules/__tests__/price-lists/admin/price-lists.spec.ts index 1a8b4b72a0..2acfb5d49b 100644 --- a/integration-tests/modules/__tests__/price-lists/admin/price-lists.spec.ts +++ b/integration-tests/modules/__tests__/price-lists/admin/price-lists.spec.ts @@ -4,11 +4,7 @@ import { IProductModuleService, IRegionModuleService, } from "@medusajs/types" -import { - ModuleRegistrationName, - PriceListStatus, - PriceListType, -} from "@medusajs/utils" +import { Modules, PriceListStatus, PriceListType } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../../helpers/create-admin-user" import { createVariantPriceSet } from "../../../helpers/create-variant-price-set" @@ -37,10 +33,10 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING) - productModule = appContainer.resolve(ModuleRegistrationName.PRODUCT) - customerModule = appContainer.resolve(ModuleRegistrationName.CUSTOMER) - regionModule = appContainer.resolve(ModuleRegistrationName.REGION) + pricingModule = appContainer.resolve(Modules.PRICING) + productModule = appContainer.resolve(Modules.PRODUCT) + customerModule = appContainer.resolve(Modules.CUSTOMER) + regionModule = appContainer.resolve(Modules.REGION) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/product/admin/products.spec.ts b/integration-tests/modules/__tests__/product/admin/products.spec.ts index 5b1e10c8ff..3fb1f5a8ba 100644 --- a/integration-tests/modules/__tests__/product/admin/products.spec.ts +++ b/integration-tests/modules/__tests__/product/admin/products.spec.ts @@ -5,11 +5,7 @@ import { ProductDTO, ProductVariantDTO, } from "@medusajs/types" -import { - ModuleRegistrationName, - PriceListStatus, - PriceListType, -} from "@medusajs/utils" +import { Modules, PriceListStatus, PriceListType } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../../helpers/create-admin-user" import { createVariantPriceSet } from "../../../helpers/create-variant-price-set" @@ -54,8 +50,8 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - pricingModule = appContainer.resolve(ModuleRegistrationName.PRICING) - productModule = appContainer.resolve(ModuleRegistrationName.PRODUCT) + pricingModule = appContainer.resolve(Modules.PRICING) + productModule = appContainer.resolve(Modules.PRODUCT) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/product/workflows/batch-products.spec.ts b/integration-tests/modules/__tests__/product/workflows/batch-products.spec.ts index 742113c069..8ee065b974 100644 --- a/integration-tests/modules/__tests__/product/workflows/batch-products.spec.ts +++ b/integration-tests/modules/__tests__/product/workflows/batch-products.spec.ts @@ -5,7 +5,7 @@ import { batchProductVariantsWorkflowId, } from "@medusajs/core-flows" import { IProductModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" jest.setTimeout(50000) @@ -19,7 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - service = appContainer.resolve(ModuleRegistrationName.PRODUCT) + service = appContainer.resolve(Modules.PRODUCT) }) describe("batchProductWorkflow", () => { diff --git a/integration-tests/modules/__tests__/regions/admin/regions.spec.ts b/integration-tests/modules/__tests__/regions/admin/regions.spec.ts index 30a5d54a45..50b7711343 100644 --- a/integration-tests/modules/__tests__/regions/admin/regions.spec.ts +++ b/integration-tests/modules/__tests__/regions/admin/regions.spec.ts @@ -1,5 +1,5 @@ import { IRegionModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../../helpers/create-admin-user" @@ -19,7 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - service = appContainer.resolve(ModuleRegistrationName.REGION) + service = appContainer.resolve(Modules.REGION) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/shipping-options/store/shipping-options.spec.ts b/integration-tests/modules/__tests__/shipping-options/store/shipping-options.spec.ts index aac1704d3c..b1fd4a7b04 100644 --- a/integration-tests/modules/__tests__/shipping-options/store/shipping-options.spec.ts +++ b/integration-tests/modules/__tests__/shipping-options/store/shipping-options.spec.ts @@ -2,11 +2,7 @@ import { IFulfillmentModuleService, IRegionModuleService, } from "@medusajs/types" -import { - ContainerRegistrationKeys, - ModuleRegistrationName, - Modules, -} from "@medusajs/utils" +import { ContainerRegistrationKeys, Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser, @@ -39,10 +35,8 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - fulfillmentModule = appContainer.resolve( - ModuleRegistrationName.FULFILLMENT - ) - regionService = appContainer.resolve(ModuleRegistrationName.REGION) + fulfillmentModule = appContainer.resolve(Modules.FULFILLMENT) + regionService = appContainer.resolve(Modules.REGION) const publishableKey = await generatePublishableKey(appContainer) storeHeaders = generateStoreHeaders({ publishableKey }) }) diff --git a/integration-tests/modules/__tests__/shipping-options/workflows/batch-shipping-options-rules.ts b/integration-tests/modules/__tests__/shipping-options/workflows/batch-shipping-options-rules.ts index 13a691c3e6..74607c4754 100644 --- a/integration-tests/modules/__tests__/shipping-options/workflows/batch-shipping-options-rules.ts +++ b/integration-tests/modules/__tests__/shipping-options/workflows/batch-shipping-options-rules.ts @@ -15,7 +15,6 @@ import { } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, Modules, RuleOperator, remoteQueryObjectFromString, @@ -33,7 +32,7 @@ async function createShippingOptionFixture({ shippingProfile, }) { const regionService = container.resolve( - ModuleRegistrationName.REGION + Modules.REGION ) as IRegionModuleService const [region] = await regionService.createRegions([ @@ -123,7 +122,7 @@ medusaIntegrationTestRunner({ beforeAll(() => { container = getContainer() - service = container.resolve(ModuleRegistrationName.FULFILLMENT) + service = container.resolve(Modules.FULFILLMENT) }) describe("Fulfillment workflows", () => { @@ -153,9 +152,7 @@ medusaIntegrationTestRunner({ ], }) - const stockLocationModule = container.resolve( - ModuleRegistrationName.STOCK_LOCATION - ) + const stockLocationModule = container.resolve(Modules.STOCK_LOCATION) const location = await stockLocationModule.createStockLocations({ name: "Europe", diff --git a/integration-tests/modules/__tests__/shipping-options/workflows/create-shipping-options.ts b/integration-tests/modules/__tests__/shipping-options/workflows/create-shipping-options.ts index 1d126866c8..01089e9dec 100644 --- a/integration-tests/modules/__tests__/shipping-options/workflows/create-shipping-options.ts +++ b/integration-tests/modules/__tests__/shipping-options/workflows/create-shipping-options.ts @@ -9,7 +9,6 @@ import { } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, Modules, RuleOperator, remoteQueryObjectFromString, @@ -29,7 +28,7 @@ medusaIntegrationTestRunner({ beforeAll(() => { container = getContainer() - service = container.resolve(ModuleRegistrationName.FULFILLMENT) + service = container.resolve(Modules.FULFILLMENT) }) describe("Fulfillment workflows", () => { @@ -59,9 +58,7 @@ medusaIntegrationTestRunner({ ], }) - const stockLocationModule = container.resolve( - ModuleRegistrationName.STOCK_LOCATION - ) + const stockLocationModule = container.resolve(Modules.STOCK_LOCATION) const location = await stockLocationModule.createStockLocations({ name: "Europe", @@ -93,7 +90,7 @@ medusaIntegrationTestRunner({ it("should create shipping options and prices", async () => { const regionService = container.resolve( - ModuleRegistrationName.REGION + Modules.REGION ) as IRegionModuleService const [region] = await regionService.createRegions([ @@ -209,7 +206,7 @@ medusaIntegrationTestRunner({ it("should revert the shipping options and prices", async () => { const regionService = container.resolve( - ModuleRegistrationName.REGION + Modules.REGION ) as IRegionModuleService const [region] = await regionService.createRegions([ diff --git a/integration-tests/modules/__tests__/shipping-options/workflows/delete-shipping-options.ts b/integration-tests/modules/__tests__/shipping-options/workflows/delete-shipping-options.ts index 11fbc6da99..0f56af8ba3 100644 --- a/integration-tests/modules/__tests__/shipping-options/workflows/delete-shipping-options.ts +++ b/integration-tests/modules/__tests__/shipping-options/workflows/delete-shipping-options.ts @@ -12,7 +12,6 @@ import { } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, Modules, RuleOperator, remoteQueryObjectFromString, @@ -32,7 +31,7 @@ medusaIntegrationTestRunner({ beforeAll(() => { container = getContainer() - service = container.resolve(ModuleRegistrationName.FULFILLMENT) + service = container.resolve(Modules.FULFILLMENT) }) describe("Fulfillment workflows", () => { @@ -62,9 +61,7 @@ medusaIntegrationTestRunner({ ], }) - const stockLocationModule = container.resolve( - ModuleRegistrationName.STOCK_LOCATION - ) + const stockLocationModule = container.resolve(Modules.STOCK_LOCATION) const location = await stockLocationModule.createStockLocations({ name: "Europe", @@ -96,7 +93,7 @@ medusaIntegrationTestRunner({ it("should delete shipping options", async () => { const regionService = container.resolve( - ModuleRegistrationName.REGION + Modules.REGION ) as IRegionModuleService const [region] = await regionService.createRegions([ @@ -179,7 +176,7 @@ medusaIntegrationTestRunner({ it("should revert the deleted shipping options", async () => { const regionService = container.resolve( - ModuleRegistrationName.REGION + Modules.REGION ) as IRegionModuleService const [region] = await regionService.createRegions([ diff --git a/integration-tests/modules/__tests__/shipping-options/workflows/update-shipping-options.ts b/integration-tests/modules/__tests__/shipping-options/workflows/update-shipping-options.ts index 951da2c682..6c89aa60d6 100644 --- a/integration-tests/modules/__tests__/shipping-options/workflows/update-shipping-options.ts +++ b/integration-tests/modules/__tests__/shipping-options/workflows/update-shipping-options.ts @@ -13,7 +13,6 @@ import { } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, Modules, RuleOperator, remoteQueryObjectFromString, @@ -33,7 +32,7 @@ medusaIntegrationTestRunner({ beforeAll(() => { container = getContainer() - service = container.resolve(ModuleRegistrationName.FULFILLMENT) + service = container.resolve(Modules.FULFILLMENT) }) describe("Fulfillment workflows", () => { @@ -63,9 +62,7 @@ medusaIntegrationTestRunner({ ], }) - const stockLocationModule = container.resolve( - ModuleRegistrationName.STOCK_LOCATION - ) + const stockLocationModule = container.resolve(Modules.STOCK_LOCATION) const location = await stockLocationModule.createStockLocations({ name: "Europe", @@ -97,7 +94,7 @@ medusaIntegrationTestRunner({ it("should update shipping options", async () => { const regionService = container.resolve( - ModuleRegistrationName.REGION + Modules.REGION ) as IRegionModuleService const [region] = await regionService.createRegions([ @@ -262,7 +259,7 @@ medusaIntegrationTestRunner({ it("should revert the shipping options", async () => { const regionService = container.resolve( - ModuleRegistrationName.REGION + Modules.REGION ) as IRegionModuleService const [region] = await regionService.createRegions([ diff --git a/integration-tests/modules/__tests__/store/admin/store.spec.ts b/integration-tests/modules/__tests__/store/admin/store.spec.ts index 85dee2c9e3..77de636308 100644 --- a/integration-tests/modules/__tests__/store/admin/store.spec.ts +++ b/integration-tests/modules/__tests__/store/admin/store.spec.ts @@ -1,5 +1,5 @@ import { IStoreModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../../helpers/create-admin-user" @@ -19,7 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - service = appContainer.resolve(ModuleRegistrationName.STORE) + service = appContainer.resolve(Modules.STORE) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/tax/admin/tax.spec.ts b/integration-tests/modules/__tests__/tax/admin/tax.spec.ts index dcd5768fdf..6c402b6c59 100644 --- a/integration-tests/modules/__tests__/tax/admin/tax.spec.ts +++ b/integration-tests/modules/__tests__/tax/admin/tax.spec.ts @@ -1,6 +1,6 @@ import { ITaxModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../../helpers/create-admin-user" @@ -20,7 +20,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - service = appContainer.resolve(ModuleRegistrationName.TAX) + service = appContainer.resolve(Modules.TAX) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/tax/workflow/tax.spec.ts b/integration-tests/modules/__tests__/tax/workflow/tax.spec.ts index dee8b8466e..ed45a15840 100644 --- a/integration-tests/modules/__tests__/tax/workflow/tax.spec.ts +++ b/integration-tests/modules/__tests__/tax/workflow/tax.spec.ts @@ -1,10 +1,10 @@ import { ITaxModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" import { createTaxRateRulesStepId, updateTaxRatesWorkflow, } from "@medusajs/core-flows" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../../helpers/create-admin-user" @@ -24,7 +24,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - service = appContainer.resolve(ModuleRegistrationName.TAX) + service = appContainer.resolve(Modules.TAX) }) beforeEach(async () => { diff --git a/integration-tests/modules/__tests__/users/update-user.spec.ts b/integration-tests/modules/__tests__/users/update-user.spec.ts index 9f614c3560..76f057313f 100644 --- a/integration-tests/modules/__tests__/users/update-user.spec.ts +++ b/integration-tests/modules/__tests__/users/update-user.spec.ts @@ -1,5 +1,5 @@ import { IUserModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../helpers/create-admin-user" @@ -19,7 +19,7 @@ medusaIntegrationTestRunner({ beforeAll(async () => { appContainer = getContainer() - userModuleService = appContainer.resolve(ModuleRegistrationName.USER) + userModuleService = appContainer.resolve(Modules.USER) }) beforeEach(async () => { diff --git a/integration-tests/modules/helpers/create-authenticated-customer.ts b/integration-tests/modules/helpers/create-authenticated-customer.ts index 0c964b73b9..bbf1c40f2d 100644 --- a/integration-tests/modules/helpers/create-authenticated-customer.ts +++ b/integration-tests/modules/helpers/create-authenticated-customer.ts @@ -1,6 +1,6 @@ import { CreateCustomerDTO, MedusaContainer } from "@medusajs/types" +import { Modules } from "@medusajs/utils" -import { ModuleRegistrationName } from "@medusajs/utils" import jwt from "jsonwebtoken" export const createAuthenticatedCustomer = async ( @@ -8,10 +8,8 @@ export const createAuthenticatedCustomer = async ( customerData: Partial = {} ) => { const { http } = appContainer.resolve("configModule").projectConfig - const authService = appContainer.resolve(ModuleRegistrationName.AUTH) - const customerModuleService = appContainer.resolve( - ModuleRegistrationName.CUSTOMER - ) + const authService = appContainer.resolve(Modules.AUTH) + const customerModuleService = appContainer.resolve(Modules.CUSTOMER) const customer = await customerModuleService.createCustomers({ first_name: "John", diff --git a/integration-tests/modules/helpers/create-variant-price-set.ts b/integration-tests/modules/helpers/create-variant-price-set.ts index d9228df07c..76b4d5fffe 100644 --- a/integration-tests/modules/helpers/create-variant-price-set.ts +++ b/integration-tests/modules/helpers/create-variant-price-set.ts @@ -24,7 +24,7 @@ export const createVariantPriceSet = async ({ }): Promise => { const remoteLink = container.resolve("remoteLink") const pricingModuleService: IPricingModuleService = container.resolve( - "pricingModuleService" + Modules.PRICING ) const priceSet = await pricingModuleService.createPriceSets({ diff --git a/packages/core/core-flows/src/api-key/steps/create-api-keys.ts b/packages/core/core-flows/src/api-key/steps/create-api-keys.ts index 4af5fafa8e..fd6fcc26d3 100644 --- a/packages/core/core-flows/src/api-key/steps/create-api-keys.ts +++ b/packages/core/core-flows/src/api-key/steps/create-api-keys.ts @@ -1,5 +1,5 @@ import { CreateApiKeyDTO, IApiKeyModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type CreateApiKeysStepInput = { @@ -13,9 +13,7 @@ export const createApiKeysStepId = "create-api-keys" export const createApiKeysStep = createStep( createApiKeysStepId, async (data: CreateApiKeysStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.API_KEY - ) + const service = container.resolve(Modules.API_KEY) const created = await service.createApiKeys(data.api_keys) return new StepResponse( created, @@ -27,9 +25,7 @@ export const createApiKeysStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.API_KEY - ) + const service = container.resolve(Modules.API_KEY) await service.deleteApiKeys(createdIds) } diff --git a/packages/core/core-flows/src/api-key/steps/delete-api-keys.ts b/packages/core/core-flows/src/api-key/steps/delete-api-keys.ts index 11c09340b0..2cb79a0e90 100644 --- a/packages/core/core-flows/src/api-key/steps/delete-api-keys.ts +++ b/packages/core/core-flows/src/api-key/steps/delete-api-keys.ts @@ -1,5 +1,5 @@ import { IApiKeyModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteApiKeysStepId = "delete-api-keys" @@ -9,9 +9,7 @@ export const deleteApiKeysStepId = "delete-api-keys" export const deleteApiKeysStep = createStep( { name: deleteApiKeysStepId, noCompensation: true }, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.API_KEY - ) + const service = container.resolve(Modules.API_KEY) await service.deleteApiKeys(ids) return new StepResponse(void 0) diff --git a/packages/core/core-flows/src/api-key/steps/revoke-api-keys.ts b/packages/core/core-flows/src/api-key/steps/revoke-api-keys.ts index 9487da0106..c8f1f70723 100644 --- a/packages/core/core-flows/src/api-key/steps/revoke-api-keys.ts +++ b/packages/core/core-flows/src/api-key/steps/revoke-api-keys.ts @@ -3,7 +3,7 @@ import { IApiKeyModuleService, RevokeApiKeyDTO, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type RevokeApiKeysStepInput = { @@ -18,9 +18,7 @@ export const revokeApiKeysStepId = "revoke-api-keys" export const revokeApiKeysStep = createStep( { name: revokeApiKeysStepId, noCompensation: true }, async (data: RevokeApiKeysStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.API_KEY - ) + const service = container.resolve(Modules.API_KEY) const apiKeys = await service.revoke(data.selector, data.revoke) return new StepResponse(apiKeys) diff --git a/packages/core/core-flows/src/api-key/steps/update-api-keys.ts b/packages/core/core-flows/src/api-key/steps/update-api-keys.ts index dc7b3b7ba6..abe54081b0 100644 --- a/packages/core/core-flows/src/api-key/steps/update-api-keys.ts +++ b/packages/core/core-flows/src/api-key/steps/update-api-keys.ts @@ -3,10 +3,7 @@ import { IApiKeyModuleService, UpdateApiKeyDTO, } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type UpdateApiKeysStepInput = { @@ -21,9 +18,7 @@ export const updateApiKeysStepId = "update-api-keys" export const updateApiKeysStep = createStep( updateApiKeysStepId, async (data: UpdateApiKeysStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.API_KEY - ) + const service = container.resolve(Modules.API_KEY) const { selects, relations } = getSelectsAndRelationsFromObjectArray([ data.update, @@ -42,9 +37,7 @@ export const updateApiKeysStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.API_KEY - ) + const service = container.resolve(Modules.API_KEY) await service.upsertApiKeys( prevData.map((r) => ({ diff --git a/packages/core/core-flows/src/api-key/steps/validate-sales-channel-exists.ts b/packages/core/core-flows/src/api-key/steps/validate-sales-channel-exists.ts index a54f636987..99de008ae6 100644 --- a/packages/core/core-flows/src/api-key/steps/validate-sales-channel-exists.ts +++ b/packages/core/core-flows/src/api-key/steps/validate-sales-channel-exists.ts @@ -1,9 +1,5 @@ import { ISalesChannelModuleService } from "@medusajs/types" -import { - MedusaError, - ModuleRegistrationName, - arrayDifference, -} from "@medusajs/utils" +import { MedusaError, Modules, arrayDifference } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface ValidateSalesChannelsExistStepInput { @@ -18,9 +14,7 @@ export const validateSalesChannelsExistStep = createStep( validateSalesChannelsExistStepId, async (data: ValidateSalesChannelsExistStepInput, { container }) => { const salesChannelModuleService = - container.resolve( - ModuleRegistrationName.SALES_CHANNEL - ) + container.resolve(Modules.SALES_CHANNEL) const salesChannels = await salesChannelModuleService.listSalesChannels( { id: data.sales_channel_ids }, diff --git a/packages/core/core-flows/src/auth/steps/set-auth-app-metadata.ts b/packages/core/core-flows/src/auth/steps/set-auth-app-metadata.ts index d853385b4f..ead389e299 100644 --- a/packages/core/core-flows/src/auth/steps/set-auth-app-metadata.ts +++ b/packages/core/core-flows/src/auth/steps/set-auth-app-metadata.ts @@ -1,7 +1,7 @@ import { createStep, StepResponse } from "@medusajs/workflows-sdk" import { IAuthModuleService } from "@medusajs/types" -import { isDefined, ModuleRegistrationName } from "@medusajs/utils" +import { isDefined, Modules } from "@medusajs/utils" export type SetAuthAppMetadataStepInput = { authIdentityId: string @@ -16,9 +16,7 @@ export const setAuthAppMetadataStepId = "set-auth-app-metadata" export const setAuthAppMetadataStep = createStep( setAuthAppMetadataStepId, async (data: SetAuthAppMetadataStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.AUTH - ) + const service = container.resolve(Modules.AUTH) const key = `${data.actorType}_id` const authIdentity = await service.retrieveAuthIdentity(data.authIdentityId) @@ -52,9 +50,7 @@ export const setAuthAppMetadataStep = createStep( const { id, key, oldValue, value } = idAndKeyAndValue - const service = container.resolve( - ModuleRegistrationName.AUTH - ) + const service = container.resolve(Modules.AUTH) const authIdentity = await service.retrieveAuthIdentity(id) diff --git a/packages/core/core-flows/src/cart/steps/add-shipping-method-to-cart.ts b/packages/core/core-flows/src/cart/steps/add-shipping-method-to-cart.ts index 7a06e1434f..160f5632b8 100644 --- a/packages/core/core-flows/src/cart/steps/add-shipping-method-to-cart.ts +++ b/packages/core/core-flows/src/cart/steps/add-shipping-method-to-cart.ts @@ -1,5 +1,5 @@ import { CreateShippingMethodDTO, ICartModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface AddShippingMethodToCartStepInput { @@ -13,18 +13,14 @@ export const addShippingMethodToCartStepId = "add-shipping-method-to-cart-step" export const addShippingMethodToCartStep = createStep( addShippingMethodToCartStepId, async (data: AddShippingMethodToCartStepInput, { container }) => { - const cartService = container.resolve( - ModuleRegistrationName.CART - ) + const cartService = container.resolve(Modules.CART) const methods = await cartService.addShippingMethods(data.shipping_methods) return new StepResponse(methods, methods) }, async (methods, { container }) => { - const cartService: ICartModuleService = container.resolve( - ModuleRegistrationName.CART - ) + const cartService: ICartModuleService = container.resolve(Modules.CART) if (!methods?.length) { return } diff --git a/packages/core/core-flows/src/cart/steps/confirm-inventory.ts b/packages/core/core-flows/src/cart/steps/confirm-inventory.ts index 5f64a01df4..2ad8fd51a1 100644 --- a/packages/core/core-flows/src/cart/steps/confirm-inventory.ts +++ b/packages/core/core-flows/src/cart/steps/confirm-inventory.ts @@ -1,10 +1,5 @@ import { IInventoryService } from "@medusajs/types" -import { - MathBN, - MedusaError, - ModuleRegistrationName, - promiseAll, -} from "@medusajs/utils" +import { MathBN, MedusaError, Modules, promiseAll } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface ConfirmVariantInventoryStepInput { @@ -25,7 +20,7 @@ export const confirmInventoryStep = createStep( confirmInventoryStepId, async (data: ConfirmVariantInventoryStepInput, { container }) => { const inventoryService = container.resolve( - ModuleRegistrationName.INVENTORY + Modules.INVENTORY ) // TODO: Should be bulk diff --git a/packages/core/core-flows/src/cart/steps/create-carts.ts b/packages/core/core-flows/src/cart/steps/create-carts.ts index b40b8e7932..25b06a0965 100644 --- a/packages/core/core-flows/src/cart/steps/create-carts.ts +++ b/packages/core/core-flows/src/cart/steps/create-carts.ts @@ -1,5 +1,5 @@ import { CreateCartDTO, ICartModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createCartsStepId = "create-carts" @@ -9,9 +9,7 @@ export const createCartsStepId = "create-carts" export const createCartsStep = createStep( createCartsStepId, async (data: CreateCartDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.CART - ) + const service = container.resolve(Modules.CART) const createdCarts = await service.createCarts(data) @@ -25,9 +23,7 @@ export const createCartsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.CART - ) + const service = container.resolve(Modules.CART) await service.deleteCarts(createdCartsIds) } diff --git a/packages/core/core-flows/src/cart/steps/create-line-item-adjustments.ts b/packages/core/core-flows/src/cart/steps/create-line-item-adjustments.ts index 3b46aa016c..fa83a57fd3 100644 --- a/packages/core/core-flows/src/cart/steps/create-line-item-adjustments.ts +++ b/packages/core/core-flows/src/cart/steps/create-line-item-adjustments.ts @@ -2,7 +2,7 @@ import { CreateLineItemAdjustmentDTO, ICartModuleService, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface CreateLineItemAdjustmentsCartStepInput { @@ -18,7 +18,7 @@ export const createLineItemAdjustmentsStep = createStep( async (data: CreateLineItemAdjustmentsCartStepInput, { container }) => { const { lineItemAdjustmentsToCreate = [] } = data const cartModuleService: ICartModuleService = container.resolve( - ModuleRegistrationName.CART + Modules.CART ) const createdLineItemAdjustments = @@ -30,7 +30,7 @@ export const createLineItemAdjustmentsStep = createStep( }, async (createdLineItemAdjustments, { container }) => { const cartModuleService: ICartModuleService = container.resolve( - ModuleRegistrationName.CART + Modules.CART ) if (!createdLineItemAdjustments?.length) { diff --git a/packages/core/core-flows/src/cart/steps/create-line-items.ts b/packages/core/core-flows/src/cart/steps/create-line-items.ts index 142287eb03..50a85f6c7a 100644 --- a/packages/core/core-flows/src/cart/steps/create-line-items.ts +++ b/packages/core/core-flows/src/cart/steps/create-line-items.ts @@ -1,5 +1,5 @@ import { CreateLineItemForCartDTO, ICartModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface CreateLineItemsCartStepInput { @@ -14,9 +14,7 @@ export const createLineItemsStepId = "create-line-items-step" export const createLineItemsStep = createStep( createLineItemsStepId, async (data: CreateLineItemsCartStepInput, { container }) => { - const cartModule = container.resolve( - ModuleRegistrationName.CART - ) + const cartModule = container.resolve(Modules.CART) const createdItems = data.items.length ? await cartModule.addLineItems(data.items) @@ -29,9 +27,7 @@ export const createLineItemsStep = createStep( return } - const cartModule: ICartModuleService = container.resolve( - ModuleRegistrationName.CART - ) + const cartModule: ICartModuleService = container.resolve(Modules.CART) await cartModule.deleteLineItems(createdItems.map((c) => c.id)) } diff --git a/packages/core/core-flows/src/cart/steps/create-payment-collection.ts b/packages/core/core-flows/src/cart/steps/create-payment-collection.ts index af34405057..fdab9d9637 100644 --- a/packages/core/core-flows/src/cart/steps/create-payment-collection.ts +++ b/packages/core/core-flows/src/cart/steps/create-payment-collection.ts @@ -1,5 +1,5 @@ import { BigNumberInput, IPaymentModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type CreatePaymentCollectionCartStepInput = { @@ -16,9 +16,7 @@ export const createPaymentCollectionsStepId = "create-payment-collections" export const createPaymentCollectionsStep = createStep( createPaymentCollectionsStepId, async (data: CreatePaymentCollectionCartStepInput[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.PAYMENT - ) + const service = container.resolve(Modules.PAYMENT) const created = await service.createPaymentCollections(data) @@ -32,9 +30,7 @@ export const createPaymentCollectionsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PAYMENT - ) + const service = container.resolve(Modules.PAYMENT) await service.deletePaymentCollections(createdIds) } diff --git a/packages/core/core-flows/src/cart/steps/create-shipping-method-adjustments.ts b/packages/core/core-flows/src/cart/steps/create-shipping-method-adjustments.ts index 575a20b742..eb6d65c49b 100644 --- a/packages/core/core-flows/src/cart/steps/create-shipping-method-adjustments.ts +++ b/packages/core/core-flows/src/cart/steps/create-shipping-method-adjustments.ts @@ -2,7 +2,7 @@ import { CreateShippingMethodAdjustmentDTO, ICartModuleService, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface CreateShippingMethodAdjustmentsStepInput { @@ -19,7 +19,7 @@ export const createShippingMethodAdjustmentsStep = createStep( async (data: CreateShippingMethodAdjustmentsStepInput, { container }) => { const { shippingMethodAdjustmentsToCreate = [] } = data const cartModuleService: ICartModuleService = container.resolve( - ModuleRegistrationName.CART + Modules.CART ) const createdShippingMethodAdjustments = @@ -31,7 +31,7 @@ export const createShippingMethodAdjustmentsStep = createStep( }, async (createdShippingMethodAdjustments, { container }) => { const cartModuleService: ICartModuleService = container.resolve( - ModuleRegistrationName.CART + Modules.CART ) if (!createdShippingMethodAdjustments?.length) { diff --git a/packages/core/core-flows/src/cart/steps/find-one-or-any-region.ts b/packages/core/core-flows/src/cart/steps/find-one-or-any-region.ts index f0ecce6e9b..5ecc057da6 100644 --- a/packages/core/core-flows/src/cart/steps/find-one-or-any-region.ts +++ b/packages/core/core-flows/src/cart/steps/find-one-or-any-region.ts @@ -1,5 +1,5 @@ import { IRegionModuleService, IStoreModuleService } from "@medusajs/types" -import { MedusaError, ModuleRegistrationName } from "@medusajs/utils" +import { MedusaError, Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const findOneOrAnyRegionStepId = "find-one-or-any-region" @@ -9,13 +9,9 @@ export const findOneOrAnyRegionStepId = "find-one-or-any-region" export const findOneOrAnyRegionStep = createStep( findOneOrAnyRegionStepId, async (data: { regionId?: string }, { container }) => { - const service = container.resolve( - ModuleRegistrationName.REGION - ) + const service = container.resolve(Modules.REGION) - const storeModule = container.resolve( - ModuleRegistrationName.STORE - ) + const storeModule = container.resolve(Modules.STORE) if (data.regionId) { try { diff --git a/packages/core/core-flows/src/cart/steps/find-or-create-customer.ts b/packages/core/core-flows/src/cart/steps/find-or-create-customer.ts index ec06dfefde..0cd2b8e42e 100644 --- a/packages/core/core-flows/src/cart/steps/find-or-create-customer.ts +++ b/packages/core/core-flows/src/cart/steps/find-or-create-customer.ts @@ -1,5 +1,5 @@ import { CustomerDTO, ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName, validateEmail } from "@medusajs/utils" +import { Modules, validateEmail } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface FindOrCreateCustomerStepInput { @@ -19,7 +19,7 @@ interface StepCompensateInput { export const findOrCreateCustomerStepId = "find-or-create-customer" /** - * This step either finds a customer matching the specified ID, or finds / create a customer + * This step either finds a customer matching the specified ID, or finds / create a customer * matching the specified email. If both ID and email are provided, ID takes precedence. */ export const findOrCreateCustomerStep = createStep( @@ -38,9 +38,7 @@ export const findOrCreateCustomerStep = createStep( ) } - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) const customerData: FindOrCreateCustomerOutputStepOutput = { customer: null, @@ -87,9 +85,7 @@ export const findOrCreateCustomerStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) await service.deleteCustomers(customer.id) } diff --git a/packages/core/core-flows/src/cart/steps/find-sales-channel.ts b/packages/core/core-flows/src/cart/steps/find-sales-channel.ts index dbeeadd47e..938c75b329 100644 --- a/packages/core/core-flows/src/cart/steps/find-sales-channel.ts +++ b/packages/core/core-flows/src/cart/steps/find-sales-channel.ts @@ -3,7 +3,7 @@ import { IStoreModuleService, SalesChannelDTO, } from "@medusajs/types" -import { MedusaError, ModuleRegistrationName, isDefined } from "@medusajs/utils" +import { MedusaError, Modules, isDefined } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface FindSalesChannelStepInput { @@ -19,11 +19,9 @@ export const findSalesChannelStep = createStep( findSalesChannelStepId, async (data: FindSalesChannelStepInput, { container }) => { const salesChannelService = container.resolve( - ModuleRegistrationName.SALES_CHANNEL - ) - const storeModule = container.resolve( - ModuleRegistrationName.STORE + Modules.SALES_CHANNEL ) + const storeModule = container.resolve(Modules.STORE) let salesChannel: SalesChannelDTO | undefined diff --git a/packages/core/core-flows/src/cart/steps/get-actions-to-compute-from-promotions.ts b/packages/core/core-flows/src/cart/steps/get-actions-to-compute-from-promotions.ts index 04ae83d8d7..51499c20e2 100644 --- a/packages/core/core-flows/src/cart/steps/get-actions-to-compute-from-promotions.ts +++ b/packages/core/core-flows/src/cart/steps/get-actions-to-compute-from-promotions.ts @@ -1,5 +1,5 @@ import { CartDTO, IPromotionModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface GetActionsToComputeFromPromotionsStepInput { @@ -18,7 +18,7 @@ export const getActionsToComputeFromPromotionsStep = createStep( async (data: GetActionsToComputeFromPromotionsStepInput, { container }) => { const { cart, promotionCodesToApply = [] } = data const promotionService = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) const actionsToCompute = await promotionService.computeActions( diff --git a/packages/core/core-flows/src/cart/steps/get-item-tax-lines.ts b/packages/core/core-flows/src/cart/steps/get-item-tax-lines.ts index 1a244d0070..39922abf49 100644 --- a/packages/core/core-flows/src/cart/steps/get-item-tax-lines.ts +++ b/packages/core/core-flows/src/cart/steps/get-item-tax-lines.ts @@ -9,7 +9,7 @@ import { TaxableItemDTO, TaxableShippingDTO, } from "@medusajs/types" -import { MedusaError, ModuleRegistrationName } from "@medusajs/utils" +import { MedusaError, Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface GetItemTaxLinesStepInput { @@ -109,9 +109,7 @@ export const getItemTaxLinesStep = createStep( is_return: isReturn = false, } = data - const taxService = container.resolve( - ModuleRegistrationName.TAX - ) + const taxService = container.resolve(Modules.TAX) const taxContext = normalizeTaxModuleContext( cart, diff --git a/packages/core/core-flows/src/cart/steps/get-line-item-actions.ts b/packages/core/core-flows/src/cart/steps/get-line-item-actions.ts index 8abb52c72d..ffa1048e35 100644 --- a/packages/core/core-flows/src/cart/steps/get-line-item-actions.ts +++ b/packages/core/core-flows/src/cart/steps/get-line-item-actions.ts @@ -4,12 +4,7 @@ import { ICartModuleService, UpdateLineItemWithSelectorDTO, } from "@medusajs/types" -import { - MathBN, - ModuleRegistrationName, - deepEqualObj, - isPresent, -} from "@medusajs/utils" +import { MathBN, Modules, deepEqualObj, isPresent } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface GetLineItemActionsStepInput { @@ -19,15 +14,13 @@ export interface GetLineItemActionsStepInput { export const getLineItemActionsStepId = "get-line-item-actions-step" /** - * This step returns lists of cart line items to create or update based on the + * This step returns lists of cart line items to create or update based on the * provided input. */ export const getLineItemActionsStep = createStep( getLineItemActionsStepId, async (data: GetLineItemActionsStepInput, { container }) => { - const cartModule = container.resolve( - ModuleRegistrationName.CART - ) + const cartModule = container.resolve(Modules.CART) const existingVariantItems = await cartModule.listLineItems({ cart_id: data.id, diff --git a/packages/core/core-flows/src/cart/steps/get-promotion-codes-to-apply.ts b/packages/core/core-flows/src/cart/steps/get-promotion-codes-to-apply.ts index 2abb00de40..615c300c83 100644 --- a/packages/core/core-flows/src/cart/steps/get-promotion-codes-to-apply.ts +++ b/packages/core/core-flows/src/cart/steps/get-promotion-codes-to-apply.ts @@ -1,5 +1,5 @@ import { IPromotionModuleService } from "@medusajs/types" -import { ModuleRegistrationName, PromotionActions } from "@medusajs/utils" +import { Modules, PromotionActions } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface GetPromotionCodesToApplyStepInput { @@ -25,7 +25,7 @@ export const getPromotionCodesToApply = createStep( const { items = [], shipping_methods = [] } = cart const adjustmentCodes: string[] = [] const promotionService = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) const objects = items.concat(shipping_methods) diff --git a/packages/core/core-flows/src/cart/steps/get-variant-price-sets.ts b/packages/core/core-flows/src/cart/steps/get-variant-price-sets.ts index b2f9f27ded..6c10bf047c 100644 --- a/packages/core/core-flows/src/cart/steps/get-variant-price-sets.ts +++ b/packages/core/core-flows/src/cart/steps/get-variant-price-sets.ts @@ -1,6 +1,6 @@ import { IPricingModuleService } from "@medusajs/types" -import { MedusaError, ModuleRegistrationName } from "@medusajs/utils" -import { createStep, StepResponse } from "@medusajs/workflows-sdk" +import { MedusaError, Modules } from "@medusajs/utils" +import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface GetVariantPriceSetsStepInput { variantIds: string[] @@ -19,7 +19,7 @@ export const getVariantPriceSetsStep = createStep( } const pricingModuleService = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) const remoteQuery = container.resolve("remoteQuery") diff --git a/packages/core/core-flows/src/cart/steps/get-variants.ts b/packages/core/core-flows/src/cart/steps/get-variants.ts index db66aacc85..a4f9e62bc3 100644 --- a/packages/core/core-flows/src/cart/steps/get-variants.ts +++ b/packages/core/core-flows/src/cart/steps/get-variants.ts @@ -4,7 +4,7 @@ import { IProductModuleService, ProductVariantDTO, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface GetVariantsStepInput { @@ -20,7 +20,7 @@ export const getVariantsStep = createStep( getVariantsStepId, async (data: GetVariantsStepInput, { container }) => { const productModuleService = container.resolve( - ModuleRegistrationName.PRODUCT + Modules.PRODUCT ) const variants = await productModuleService.listProductVariants( diff --git a/packages/core/core-flows/src/cart/steps/prepare-adjustments-from-promotion-actions.ts b/packages/core/core-flows/src/cart/steps/prepare-adjustments-from-promotion-actions.ts index d0ebecd125..864aed7dbd 100644 --- a/packages/core/core-flows/src/cart/steps/prepare-adjustments-from-promotion-actions.ts +++ b/packages/core/core-flows/src/cart/steps/prepare-adjustments-from-promotion-actions.ts @@ -7,7 +7,7 @@ import { RemoveItemAdjustmentAction, RemoveShippingMethodAdjustment, } from "@medusajs/types" -import { ComputedActions, ModuleRegistrationName } from "@medusajs/utils" +import { ComputedActions, Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface PrepareAdjustmentsFromPromotionActionsStepInput { @@ -22,9 +22,12 @@ export const prepareAdjustmentsFromPromotionActionsStepId = */ export const prepareAdjustmentsFromPromotionActionsStep = createStep( prepareAdjustmentsFromPromotionActionsStepId, - async (data: PrepareAdjustmentsFromPromotionActionsStepInput, { container }) => { + async ( + data: PrepareAdjustmentsFromPromotionActionsStepInput, + { container } + ) => { const promotionModuleService: IPromotionModuleService = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) const { actions = [] } = data diff --git a/packages/core/core-flows/src/cart/steps/refresh-cart-shipping-methods.ts b/packages/core/core-flows/src/cart/steps/refresh-cart-shipping-methods.ts index ec20da25f9..d77fe69519 100644 --- a/packages/core/core-flows/src/cart/steps/refresh-cart-shipping-methods.ts +++ b/packages/core/core-flows/src/cart/steps/refresh-cart-shipping-methods.ts @@ -3,7 +3,7 @@ import { ICartModuleService, IFulfillmentModuleService, } from "@medusajs/types" -import { ModuleRegistrationName, arrayDifference } from "@medusajs/utils" +import { Modules, arrayDifference } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface RefreshCartShippingMethodsStepInput { @@ -25,12 +25,10 @@ export const refreshCartShippingMethodsStep = createStep( } const fulfillmentModule = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) - const cartModule = container.resolve( - ModuleRegistrationName.CART - ) + const cartModule = container.resolve(Modules.CART) const shippingOptionIds: string[] = shippingMethods.map( (sm) => sm.shipping_option_id! @@ -67,9 +65,7 @@ export const refreshCartShippingMethodsStep = createStep( }, async (shippingMethodsToRestore, { container }) => { if (shippingMethodsToRestore?.length) { - const cartModule = container.resolve( - ModuleRegistrationName.CART - ) + const cartModule = container.resolve(Modules.CART) await cartModule.restoreShippingMethods(shippingMethodsToRestore) } diff --git a/packages/core/core-flows/src/cart/steps/remove-line-item-adjustments.ts b/packages/core/core-flows/src/cart/steps/remove-line-item-adjustments.ts index d175b806f5..c7a06c8c8a 100644 --- a/packages/core/core-flows/src/cart/steps/remove-line-item-adjustments.ts +++ b/packages/core/core-flows/src/cart/steps/remove-line-item-adjustments.ts @@ -1,5 +1,5 @@ import { ICartModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface RemoveLineItemAdjustmentsStepInput { @@ -15,7 +15,7 @@ export const removeLineItemAdjustmentsStep = createStep( async (data: RemoveLineItemAdjustmentsStepInput, { container }) => { const { lineItemAdjustmentIdsToRemove = [] } = data const cartModuleService: ICartModuleService = container.resolve( - ModuleRegistrationName.CART + Modules.CART ) await cartModuleService.softDeleteLineItemAdjustments( @@ -26,7 +26,7 @@ export const removeLineItemAdjustmentsStep = createStep( }, async (lineItemAdjustmentIdsToRemove, { container }) => { const cartModuleService: ICartModuleService = container.resolve( - ModuleRegistrationName.CART + Modules.CART ) if (!lineItemAdjustmentIdsToRemove?.length) { diff --git a/packages/core/core-flows/src/cart/steps/remove-shipping-method-adjustments.ts b/packages/core/core-flows/src/cart/steps/remove-shipping-method-adjustments.ts index 90ee08076d..e8f6e99b5f 100644 --- a/packages/core/core-flows/src/cart/steps/remove-shipping-method-adjustments.ts +++ b/packages/core/core-flows/src/cart/steps/remove-shipping-method-adjustments.ts @@ -1,5 +1,5 @@ import { ICartModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface RemoveShippingMethodAdjustmentsStepInput { @@ -16,7 +16,7 @@ export const removeShippingMethodAdjustmentsStep = createStep( async (data: RemoveShippingMethodAdjustmentsStepInput, { container }) => { const { shippingMethodAdjustmentIdsToRemove = [] } = data const cartModuleService: ICartModuleService = container.resolve( - ModuleRegistrationName.CART + Modules.CART ) await cartModuleService.softDeleteShippingMethodAdjustments( @@ -27,7 +27,7 @@ export const removeShippingMethodAdjustmentsStep = createStep( }, async (shippingMethodAdjustmentIdsToRemove, { container }) => { const cartModuleService: ICartModuleService = container.resolve( - ModuleRegistrationName.CART + Modules.CART ) if (!shippingMethodAdjustmentIdsToRemove?.length) { diff --git a/packages/core/core-flows/src/cart/steps/remove-shipping-method-from-cart.ts b/packages/core/core-flows/src/cart/steps/remove-shipping-method-from-cart.ts index aed2f0274b..a22b6c6594 100644 --- a/packages/core/core-flows/src/cart/steps/remove-shipping-method-from-cart.ts +++ b/packages/core/core-flows/src/cart/steps/remove-shipping-method-from-cart.ts @@ -1,5 +1,5 @@ import { ICartModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface RemoveShippingMethodFromCartStepInput { @@ -14,9 +14,7 @@ export const removeShippingMethodFromCartStepId = export const removeShippingMethodFromCartStep = createStep( removeShippingMethodFromCartStepId, async (data: RemoveShippingMethodFromCartStepInput, { container }) => { - const cartService = container.resolve( - ModuleRegistrationName.CART - ) + const cartService = container.resolve(Modules.CART) const methods = await cartService.softDeleteShippingMethods( data.shipping_method_ids @@ -29,9 +27,7 @@ export const removeShippingMethodFromCartStep = createStep( return } - const cartService: ICartModuleService = container.resolve( - ModuleRegistrationName.CART - ) + const cartService: ICartModuleService = container.resolve(Modules.CART) await cartService.restoreShippingMethods(ids) } diff --git a/packages/core/core-flows/src/cart/steps/reserve-inventory.ts b/packages/core/core-flows/src/cart/steps/reserve-inventory.ts index 7fe6e310c9..fb15b9cd6c 100644 --- a/packages/core/core-flows/src/cart/steps/reserve-inventory.ts +++ b/packages/core/core-flows/src/cart/steps/reserve-inventory.ts @@ -1,5 +1,5 @@ import { IInventoryService } from "@medusajs/types" -import { MathBN, ModuleRegistrationName } from "@medusajs/utils" +import { MathBN, Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface ReserveVariantInventoryStepInput { @@ -22,7 +22,7 @@ export const reserveInventoryStep = createStep( reserveInventoryStepId, async (data: ReserveVariantInventoryStepInput, { container }) => { const inventoryService = container.resolve( - ModuleRegistrationName.INVENTORY + Modules.INVENTORY ) const items = data.items.map((item) => ({ @@ -45,7 +45,7 @@ export const reserveInventoryStep = createStep( } const inventoryService = container.resolve( - ModuleRegistrationName.INVENTORY + Modules.INVENTORY ) await inventoryService.deleteReservationItems(data.reservations) diff --git a/packages/core/core-flows/src/cart/steps/retrieve-cart-with-links.ts b/packages/core/core-flows/src/cart/steps/retrieve-cart-with-links.ts index a756247077..b41ff35a53 100644 --- a/packages/core/core-flows/src/cart/steps/retrieve-cart-with-links.ts +++ b/packages/core/core-flows/src/cart/steps/retrieve-cart-with-links.ts @@ -1,5 +1,5 @@ import { CartWorkflowDTO } from "@medusajs/types" -import { ContainerRegistrationKeys, isObject, Modules } from "@medusajs/utils" +import { ContainerRegistrationKeys, isObject } from "@medusajs/utils" import { createStep, StepResponse } from "@medusajs/workflows-sdk" export interface RetrieveCartWithLinksStepInput { @@ -25,7 +25,7 @@ export const retrieveCartWithLinksStep = createStep( ContainerRegistrationKeys.REMOTE_QUERY ) const query = { - entryPoint: Modules.CART, + entryPoint: "cart", fields, variables: { cart: { diff --git a/packages/core/core-flows/src/cart/steps/retrieve-cart.ts b/packages/core/core-flows/src/cart/steps/retrieve-cart.ts index 943dbf2a19..c452bf8c98 100644 --- a/packages/core/core-flows/src/cart/steps/retrieve-cart.ts +++ b/packages/core/core-flows/src/cart/steps/retrieve-cart.ts @@ -1,5 +1,5 @@ import { CartDTO, FindConfig, ICartModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface RetrieveCartStepInput { @@ -15,7 +15,7 @@ export const retrieveCartStep = createStep( retrieveCartStepId, async (data: RetrieveCartStepInput, { container }) => { const cartModuleService = container.resolve( - ModuleRegistrationName.CART + Modules.CART ) const cart = await cartModuleService.retrieveCart(data.id, data.config) diff --git a/packages/core/core-flows/src/cart/steps/set-tax-lines-for-items.ts b/packages/core/core-flows/src/cart/steps/set-tax-lines-for-items.ts index bedc5ce883..89524efda3 100644 --- a/packages/core/core-flows/src/cart/steps/set-tax-lines-for-items.ts +++ b/packages/core/core-flows/src/cart/steps/set-tax-lines-for-items.ts @@ -6,7 +6,7 @@ import { ItemTaxLineDTO, ShippingTaxLineDTO, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface SetTaxLinesForItemsStepInput { @@ -23,9 +23,7 @@ export const setTaxLinesForItemsStep = createStep( setTaxLinesForItemsStepId, async (data: SetTaxLinesForItemsStepInput, { container }) => { const { cart, item_tax_lines, shipping_tax_lines } = data - const cartService = container.resolve( - ModuleRegistrationName.CART - ) + const cartService = container.resolve(Modules.CART) const getShippingTaxLinesPromise = await cartService.listShippingMethodTaxLines({ @@ -72,9 +70,7 @@ export const setTaxLinesForItemsStep = createStep( const { cart, existingLineItemTaxLines, existingShippingMethodTaxLines } = revertData - const cartService = container.resolve( - ModuleRegistrationName.CART - ) + const cartService = container.resolve(Modules.CART) if (existingLineItemTaxLines) { await cartService.setLineItemTaxLines( diff --git a/packages/core/core-flows/src/cart/steps/update-cart-promotions.ts b/packages/core/core-flows/src/cart/steps/update-cart-promotions.ts index 6f3c4a8255..850130c2e6 100644 --- a/packages/core/core-flows/src/cart/steps/update-cart-promotions.ts +++ b/packages/core/core-flows/src/cart/steps/update-cart-promotions.ts @@ -1,11 +1,10 @@ import { IPromotionModuleService } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, Modules, PromotionActions, } from "@medusajs/utils" -import { createStep, StepResponse } from "@medusajs/workflows-sdk" +import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface UpdateCartPromotionStepInput { id: string @@ -29,7 +28,7 @@ export const updateCartPromotionsStep = createStep( ContainerRegistrationKeys.REMOTE_QUERY ) const promotionService = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) const existingCartPromotionLinks = await remoteQuery({ diff --git a/packages/core/core-flows/src/cart/steps/update-carts.ts b/packages/core/core-flows/src/cart/steps/update-carts.ts index 27f0eee52b..e5f2ea621d 100644 --- a/packages/core/core-flows/src/cart/steps/update-carts.ts +++ b/packages/core/core-flows/src/cart/steps/update-carts.ts @@ -3,10 +3,7 @@ import { UpdateCartDTO, UpdateCartWorkflowInputDTO, } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const updateCartsStepId = "update-carts" @@ -16,9 +13,7 @@ export const updateCartsStepId = "update-carts" export const updateCartsStep = createStep( updateCartsStepId, async (data: UpdateCartWorkflowInputDTO[], { container }) => { - const cartModule = container.resolve( - ModuleRegistrationName.CART - ) + const cartModule = container.resolve(Modules.CART) const { selects, relations } = getSelectsAndRelationsFromObjectArray(data) const cartsBeforeUpdate = await cartModule.listCarts( @@ -35,9 +30,7 @@ export const updateCartsStep = createStep( return } - const cartModule = container.resolve( - ModuleRegistrationName.CART - ) + const cartModule = container.resolve(Modules.CART) const dataToUpdate: UpdateCartDTO[] = [] diff --git a/packages/core/core-flows/src/cart/steps/update-line-items.ts b/packages/core/core-flows/src/cart/steps/update-line-items.ts index 0dafb953f7..b1f3422790 100644 --- a/packages/core/core-flows/src/cart/steps/update-line-items.ts +++ b/packages/core/core-flows/src/cart/steps/update-line-items.ts @@ -2,10 +2,7 @@ import { ICartModuleService, UpdateLineItemWithSelectorDTO, } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface UpdateLineItemsStepInput { @@ -26,9 +23,7 @@ export const updateLineItemsStep = createStep( return new StepResponse([], []) } - const cartModule = container.resolve( - ModuleRegistrationName.CART - ) + const cartModule = container.resolve(Modules.CART) const { selects, relations } = getSelectsAndRelationsFromObjectArray( items.map((item) => item.data) @@ -50,9 +45,7 @@ export const updateLineItemsStep = createStep( return } - const cartModule: ICartModuleService = container.resolve( - ModuleRegistrationName.CART - ) + const cartModule: ICartModuleService = container.resolve(Modules.CART) if (itemsBeforeUpdate.length) { const itemsToUpdate: UpdateLineItemWithSelectorDTO[] = [] diff --git a/packages/core/core-flows/src/cart/steps/validate-cart-shipping-options.ts b/packages/core/core-flows/src/cart/steps/validate-cart-shipping-options.ts index bc31bbd259..665996fc54 100644 --- a/packages/core/core-flows/src/cart/steps/validate-cart-shipping-options.ts +++ b/packages/core/core-flows/src/cart/steps/validate-cart-shipping-options.ts @@ -1,9 +1,5 @@ import { CartDTO, IFulfillmentModuleService } from "@medusajs/types" -import { - MedusaError, - ModuleRegistrationName, - arrayDifference, -} from "@medusajs/utils" +import { MedusaError, Modules, arrayDifference } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface ValidateCartShippingOptionsStepInput { @@ -30,7 +26,7 @@ export const validateCartShippingOptionsStep = createStep( } const fulfillmentModule = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) const validShippingOptions = diff --git a/packages/core/core-flows/src/common/steps/emit-event.ts b/packages/core/core-flows/src/common/steps/emit-event.ts index 1f80ee60d1..2e09b60f01 100644 --- a/packages/core/core-flows/src/common/steps/emit-event.ts +++ b/packages/core/core-flows/src/common/steps/emit-event.ts @@ -1,5 +1,5 @@ import { EventBusTypes, IEventBusModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepExecutionContext, createStep } from "@medusajs/workflows-sdk" /** @@ -64,7 +64,7 @@ export const emitEventStep = createStep( const { container } = context const eventBus: IEventBusModuleService = container.resolve( - ModuleRegistrationName.EVENT_BUS + Modules.EVENT_BUS ) const data_ = diff --git a/packages/core/core-flows/src/common/steps/release-event.ts b/packages/core/core-flows/src/common/steps/release-event.ts index d566ed0ff9..d97e73c054 100644 --- a/packages/core/core-flows/src/common/steps/release-event.ts +++ b/packages/core/core-flows/src/common/steps/release-event.ts @@ -1,14 +1,13 @@ -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { createStep } from "@medusajs/workflows-sdk" export const releaseEventsStepId = "release-events-step" export const releaseEventsStep = createStep( releaseEventsStepId, async (input: void, { container, eventGroupId }) => { - const eventBusService = container.resolve( - ModuleRegistrationName.EVENT_BUS, - { allowUnregistered: true } - ) + const eventBusService = container.resolve(Modules.EVENT_BUS, { + allowUnregistered: true, + }) if (!eventBusService || !eventGroupId) { return } diff --git a/packages/core/core-flows/src/customer-group/steps/create-customer-groups.ts b/packages/core/core-flows/src/customer-group/steps/create-customer-groups.ts index aa22326d3d..42267d19f3 100644 --- a/packages/core/core-flows/src/customer-group/steps/create-customer-groups.ts +++ b/packages/core/core-flows/src/customer-group/steps/create-customer-groups.ts @@ -1,5 +1,5 @@ import { CreateCustomerGroupDTO, ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createCustomerGroupsStepId = "create-customer-groups" @@ -9,9 +9,7 @@ export const createCustomerGroupsStepId = "create-customer-groups" export const createCustomerGroupsStep = createStep( createCustomerGroupsStepId, async (data: CreateCustomerGroupDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) const createdCustomerGroups = await service.createCustomerGroups(data) @@ -27,9 +25,7 @@ export const createCustomerGroupsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) await service.deleteCustomers(createdCustomerGroupIds) } diff --git a/packages/core/core-flows/src/customer-group/steps/delete-customer-group-customers.ts b/packages/core/core-flows/src/customer-group/steps/delete-customer-group-customers.ts index cea8655789..8dd47e52e8 100644 --- a/packages/core/core-flows/src/customer-group/steps/delete-customer-group-customers.ts +++ b/packages/core/core-flows/src/customer-group/steps/delete-customer-group-customers.ts @@ -1,5 +1,5 @@ import { GroupCustomerPair, ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteCustomerGroupCustomersStepId = @@ -10,9 +10,7 @@ export const deleteCustomerGroupCustomersStepId = export const deleteCustomerGroupCustomersStep = createStep( deleteCustomerGroupCustomersStepId, async (data: GroupCustomerPair[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) await service.removeCustomerFromGroup(data) @@ -22,9 +20,7 @@ export const deleteCustomerGroupCustomersStep = createStep( if (!groupPairs?.length) { return } - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) await service.addCustomerToGroup(groupPairs) } diff --git a/packages/core/core-flows/src/customer-group/steps/delete-customer-groups.ts b/packages/core/core-flows/src/customer-group/steps/delete-customer-groups.ts index f0fb06b6e5..f49ef66ed4 100644 --- a/packages/core/core-flows/src/customer-group/steps/delete-customer-groups.ts +++ b/packages/core/core-flows/src/customer-group/steps/delete-customer-groups.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { createStep, StepResponse } from "@medusajs/workflows-sdk" export const deleteCustomerGroupStepId = "delete-customer-groups" @@ -9,9 +9,7 @@ export const deleteCustomerGroupStepId = "delete-customer-groups" export const deleteCustomerGroupStep = createStep( deleteCustomerGroupStepId, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) await service.softDeleteCustomerGroups(ids) @@ -22,9 +20,7 @@ export const deleteCustomerGroupStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) await service.restoreCustomerGroups(prevCustomerGroups) } diff --git a/packages/core/core-flows/src/customer-group/steps/link-customers-customer-group.ts b/packages/core/core-flows/src/customer-group/steps/link-customers-customer-group.ts index e08d9e4c08..0a3fe43bbb 100644 --- a/packages/core/core-flows/src/customer-group/steps/link-customers-customer-group.ts +++ b/packages/core/core-flows/src/customer-group/steps/link-customers-customer-group.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService, LinkWorkflowInput } from "@medusajs/types" -import { ModuleRegistrationName, promiseAll } from "@medusajs/utils" +import { Modules, promiseAll } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const linkCustomersToCustomerGroupStepId = @@ -10,9 +10,7 @@ export const linkCustomersToCustomerGroupStepId = export const linkCustomersToCustomerGroupStep = createStep( linkCustomersToCustomerGroupStepId, async (data: LinkWorkflowInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) const toAdd = (data.add ?? []).map((customerId) => { return { @@ -43,9 +41,7 @@ export const linkCustomersToCustomerGroupStep = createStep( if (!prevData) { return } - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) if (prevData.toAdd.length) { await service.removeCustomerFromGroup(prevData.toAdd) diff --git a/packages/core/core-flows/src/customer-group/steps/update-customer-groups.ts b/packages/core/core-flows/src/customer-group/steps/update-customer-groups.ts index f096a510a0..8e370ed67f 100644 --- a/packages/core/core-flows/src/customer-group/steps/update-customer-groups.ts +++ b/packages/core/core-flows/src/customer-group/steps/update-customer-groups.ts @@ -4,7 +4,7 @@ import { ICustomerModuleService, } from "@medusajs/types" import { - ModuleRegistrationName, + Modules, getSelectsAndRelationsFromObjectArray, promiseAll, } from "@medusajs/utils" @@ -22,9 +22,7 @@ export const updateCustomerGroupStepId = "update-customer-groups" export const updateCustomerGroupsStep = createStep( updateCustomerGroupStepId, async (data: UpdateCustomerGroupStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) const { selects, relations } = getSelectsAndRelationsFromObjectArray([ data.update, @@ -46,9 +44,7 @@ export const updateCustomerGroupsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) await promiseAll( prevCustomerGroups.map((c) => diff --git a/packages/core/core-flows/src/customer/steps/create-addresses.ts b/packages/core/core-flows/src/customer/steps/create-addresses.ts index ac28b85c8a..0a767e142c 100644 --- a/packages/core/core-flows/src/customer/steps/create-addresses.ts +++ b/packages/core/core-flows/src/customer/steps/create-addresses.ts @@ -2,7 +2,7 @@ import { CreateCustomerAddressDTO, ICustomerModuleService, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createCustomerAddressesStepId = "create-customer-addresses" @@ -12,9 +12,7 @@ export const createCustomerAddressesStepId = "create-customer-addresses" export const createCustomerAddressesStep = createStep( createCustomerAddressesStepId, async (data: CreateCustomerAddressDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) const addresses = await service.createCustomerAddresses(data) @@ -28,9 +26,7 @@ export const createCustomerAddressesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) await service.deleteCustomerAddresses(ids) } diff --git a/packages/core/core-flows/src/customer/steps/create-customers.ts b/packages/core/core-flows/src/customer/steps/create-customers.ts index 42d7bfabc3..4f9279a562 100644 --- a/packages/core/core-flows/src/customer/steps/create-customers.ts +++ b/packages/core/core-flows/src/customer/steps/create-customers.ts @@ -1,5 +1,5 @@ import { CreateCustomerDTO, ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createCustomersStepId = "create-customers" @@ -9,9 +9,7 @@ export const createCustomersStepId = "create-customers" export const createCustomersStep = createStep( createCustomersStepId, async (data: CreateCustomerDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) const createdCustomers = await service.createCustomers(data) @@ -25,9 +23,7 @@ export const createCustomersStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) await service.deleteCustomers(createdCustomerIds) } diff --git a/packages/core/core-flows/src/customer/steps/delete-addresses.ts b/packages/core/core-flows/src/customer/steps/delete-addresses.ts index 4e64be40b7..f57a8362c0 100644 --- a/packages/core/core-flows/src/customer/steps/delete-addresses.ts +++ b/packages/core/core-flows/src/customer/steps/delete-addresses.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { createStep, StepResponse } from "@medusajs/workflows-sdk" export const deleteCustomerAddressesStepId = "delete-customer-addresses" @@ -9,9 +9,7 @@ export const deleteCustomerAddressesStepId = "delete-customer-addresses" export const deleteCustomerAddressesStep = createStep( deleteCustomerAddressesStepId, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) const existing = await service.listCustomerAddresses({ id: ids, @@ -25,9 +23,7 @@ export const deleteCustomerAddressesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) await service.createCustomerAddresses(prevAddresses) } diff --git a/packages/core/core-flows/src/customer/steps/delete-customers.ts b/packages/core/core-flows/src/customer/steps/delete-customers.ts index 1829693522..f16df00f19 100644 --- a/packages/core/core-flows/src/customer/steps/delete-customers.ts +++ b/packages/core/core-flows/src/customer/steps/delete-customers.ts @@ -1,5 +1,5 @@ import { ICustomerModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { createStep, StepResponse } from "@medusajs/workflows-sdk" export const deleteCustomersStepId = "delete-customers" @@ -9,9 +9,7 @@ export const deleteCustomersStepId = "delete-customers" export const deleteCustomersStep = createStep( deleteCustomersStepId, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) await service.softDeleteCustomers(ids) @@ -22,9 +20,7 @@ export const deleteCustomersStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) await service.restoreCustomers(prevCustomerIds) } diff --git a/packages/core/core-flows/src/customer/steps/maybe-unset-default-billing-addresses.ts b/packages/core/core-flows/src/customer/steps/maybe-unset-default-billing-addresses.ts index 55b6b0aa6f..9d23c34467 100644 --- a/packages/core/core-flows/src/customer/steps/maybe-unset-default-billing-addresses.ts +++ b/packages/core/core-flows/src/customer/steps/maybe-unset-default-billing-addresses.ts @@ -4,7 +4,7 @@ import { ICustomerModuleService, UpdateCustomerAddressDTO, } from "@medusajs/types" -import { ModuleRegistrationName, isDefined } from "@medusajs/utils" +import { Modules, isDefined } from "@medusajs/utils" import { createStep } from "@medusajs/workflows-sdk" import { unsetForCreate, unsetForUpdate } from "./utils" @@ -25,7 +25,7 @@ export const maybeUnsetDefaultBillingAddressesStep = createStep( maybeUnsetDefaultBillingAddressesStepId, async (data: MaybeUnsetDefaultBillingAddressStepInput, { container }) => { const customerModuleService = container.resolve( - ModuleRegistrationName.CUSTOMER + Modules.CUSTOMER ) if (isDefined(data.create)) { @@ -52,7 +52,7 @@ export const maybeUnsetDefaultBillingAddressesStep = createStep( } const customerModuleService = container.resolve( - ModuleRegistrationName.CUSTOMER + Modules.CUSTOMER ) await customerModuleService.updateCustomerAddresses( diff --git a/packages/core/core-flows/src/customer/steps/maybe-unset-default-shipping-addresses.ts b/packages/core/core-flows/src/customer/steps/maybe-unset-default-shipping-addresses.ts index 76722bfec0..7953b26b54 100644 --- a/packages/core/core-flows/src/customer/steps/maybe-unset-default-shipping-addresses.ts +++ b/packages/core/core-flows/src/customer/steps/maybe-unset-default-shipping-addresses.ts @@ -4,7 +4,7 @@ import { ICustomerModuleService, UpdateCustomerAddressDTO, } from "@medusajs/types" -import { ModuleRegistrationName, isDefined } from "@medusajs/utils" +import { Modules, isDefined } from "@medusajs/utils" import { createStep } from "@medusajs/workflows-sdk" import { unsetForCreate, unsetForUpdate } from "./utils" @@ -25,7 +25,7 @@ export const maybeUnsetDefaultShippingAddressesStep = createStep( maybeUnsetDefaultShippingAddressesStepId, async (data: MaybeUnsetDefaultShippingAddressesStepInput, { container }) => { const customerModuleService = container.resolve( - ModuleRegistrationName.CUSTOMER + Modules.CUSTOMER ) if (isDefined(data.create)) { return unsetForCreate( @@ -51,7 +51,7 @@ export const maybeUnsetDefaultShippingAddressesStep = createStep( } const customerModuleService = container.resolve( - ModuleRegistrationName.CUSTOMER + Modules.CUSTOMER ) await customerModuleService.updateCustomerAddresses( diff --git a/packages/core/core-flows/src/customer/steps/update-addresses.ts b/packages/core/core-flows/src/customer/steps/update-addresses.ts index c6360815dc..9c2fc275bf 100644 --- a/packages/core/core-flows/src/customer/steps/update-addresses.ts +++ b/packages/core/core-flows/src/customer/steps/update-addresses.ts @@ -4,7 +4,7 @@ import { UpdateCustomerAddressDTO, } from "@medusajs/types" import { - ModuleRegistrationName, + Modules, getSelectsAndRelationsFromObjectArray, promiseAll, } from "@medusajs/utils" @@ -22,9 +22,7 @@ export const updateCustomerAddresseStepId = "update-customer-addresses" export const updateCustomerAddressesStep = createStep( updateCustomerAddresseStepId, async (data: UpdateCustomerAddresseStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) const { selects, relations } = getSelectsAndRelationsFromObjectArray([ data.update, @@ -46,9 +44,7 @@ export const updateCustomerAddressesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) await promiseAll( prevCustomerAddresses.map((c) => diff --git a/packages/core/core-flows/src/customer/steps/update-customers.ts b/packages/core/core-flows/src/customer/steps/update-customers.ts index 2d435229de..4b1133c281 100644 --- a/packages/core/core-flows/src/customer/steps/update-customers.ts +++ b/packages/core/core-flows/src/customer/steps/update-customers.ts @@ -4,7 +4,7 @@ import { ICustomerModuleService, } from "@medusajs/types" import { - ModuleRegistrationName, + Modules, getSelectsAndRelationsFromObjectArray, promiseAll, } from "@medusajs/utils" @@ -22,9 +22,7 @@ export const updateCustomersStepId = "update-customer" export const updateCustomersStep = createStep( updateCustomersStepId, async (data: UpdateCustomersStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) const { selects, relations } = getSelectsAndRelationsFromObjectArray([ data.update, @@ -43,9 +41,7 @@ export const updateCustomersStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.CUSTOMER - ) + const service = container.resolve(Modules.CUSTOMER) await promiseAll( prevCustomers.map((c) => diff --git a/packages/core/core-flows/src/customer/steps/validate-customer-account-creation.ts b/packages/core/core-flows/src/customer/steps/validate-customer-account-creation.ts index 01e4beb79a..a45d620268 100644 --- a/packages/core/core-flows/src/customer/steps/validate-customer-account-creation.ts +++ b/packages/core/core-flows/src/customer/steps/validate-customer-account-creation.ts @@ -1,4 +1,4 @@ -import { MedusaError, ModuleRegistrationName } from "@medusajs/utils" +import { MedusaError, Modules } from "@medusajs/utils" import { createStep } from "@medusajs/workflows-sdk" import { CreateCustomerAccountWorkflowInput } from "../workflows" @@ -8,7 +8,7 @@ export const validateCustomerAccountCreationStepId = export const validateCustomerAccountCreation = createStep( validateCustomerAccountCreationStepId, async (input: CreateCustomerAccountWorkflowInput, { container }) => { - const customerService = container.resolve(ModuleRegistrationName.CUSTOMER) + const customerService = container.resolve(Modules.CUSTOMER) const { email } = input.customerData diff --git a/packages/core/core-flows/src/defaults/steps/create-default-store.ts b/packages/core/core-flows/src/defaults/steps/create-default-store.ts index b2a8ea3169..7a08ec4607 100644 --- a/packages/core/core-flows/src/defaults/steps/create-default-store.ts +++ b/packages/core/core-flows/src/defaults/steps/create-default-store.ts @@ -1,5 +1,5 @@ import { CreateStoreDTO, IStoreModuleService, StoreDTO } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" import { createStoresWorkflow } from "../../store" @@ -14,7 +14,7 @@ export const createDefaultStoreStepId = "create-default-store" export const createDefaultStoreStep = createStep( createDefaultStoreStepId, async (data: CreateDefaultStoreStepInput, { container }) => { - const storeService = container.resolve(ModuleRegistrationName.STORE) + const storeService = container.resolve(Modules.STORE) if (!storeService) { return new StepResponse(void 0) @@ -59,9 +59,7 @@ export const createDefaultStoreStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.STORE - ) + const service = container.resolve(Modules.STORE) await service.deleteStores(data.storeId) } diff --git a/packages/core/core-flows/src/file/steps/delete-files.ts b/packages/core/core-flows/src/file/steps/delete-files.ts index c58a9799c1..5e347b1cce 100644 --- a/packages/core/core-flows/src/file/steps/delete-files.ts +++ b/packages/core/core-flows/src/file/steps/delete-files.ts @@ -1,5 +1,5 @@ import { IFileModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteFilesStepId = "delete-files" @@ -9,9 +9,7 @@ export const deleteFilesStepId = "delete-files" export const deleteFilesStep = createStep( { name: deleteFilesStepId, noCompensation: true }, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.FILE - ) + const service = container.resolve(Modules.FILE) await service.deleteFiles(ids) return new StepResponse(void 0) diff --git a/packages/core/core-flows/src/file/steps/upload-files.ts b/packages/core/core-flows/src/file/steps/upload-files.ts index 13e48f7ce2..b0e05e7ae8 100644 --- a/packages/core/core-flows/src/file/steps/upload-files.ts +++ b/packages/core/core-flows/src/file/steps/upload-files.ts @@ -1,5 +1,5 @@ import { IFileModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type UploadFilesStepInput = { @@ -18,9 +18,7 @@ export const uploadFilesStepId = "upload-files" export const uploadFilesStep = createStep( uploadFilesStepId, async (data: UploadFilesStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.FILE - ) + const service = container.resolve(Modules.FILE) const created = await service.createFiles(data.files) return new StepResponse( created, @@ -32,9 +30,7 @@ export const uploadFilesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.FILE - ) + const service = container.resolve(Modules.FILE) await service.deleteFiles(createdIds) } diff --git a/packages/core/core-flows/src/fulfillment/steps/add-shipping-options-prices.ts b/packages/core/core-flows/src/fulfillment/steps/add-shipping-options-prices.ts index bff67b2618..99298877c3 100644 --- a/packages/core/core-flows/src/fulfillment/steps/add-shipping-options-prices.ts +++ b/packages/core/core-flows/src/fulfillment/steps/add-shipping-options-prices.ts @@ -3,8 +3,8 @@ import { IPricingModuleService, IRegionModuleService, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" -import { createStep, StepResponse } from "@medusajs/workflows-sdk" +import { Modules } from "@medusajs/utils" +import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface ShippingOptionsPriceCurrencyCode { currency_code: string @@ -69,7 +69,7 @@ export const createShippingOptionsPriceSetsStep = createStep( if (regionIds.length) { const regionService = container.resolve( - ModuleRegistrationName.REGION + Modules.REGION ) const regions = await regionService.listRegions( { @@ -90,7 +90,7 @@ export const createShippingOptionsPriceSetsStep = createStep( ) const pricingService = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) const priceSets = await pricingService.createPriceSets(priceSetsData) @@ -113,7 +113,7 @@ export const createShippingOptionsPriceSetsStep = createStep( } const pricingService = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) await pricingService.deletePriceSets(priceSetIds) diff --git a/packages/core/core-flows/src/fulfillment/steps/cancel-fulfillment.ts b/packages/core/core-flows/src/fulfillment/steps/cancel-fulfillment.ts index b27db2de32..1106b1016a 100644 --- a/packages/core/core-flows/src/fulfillment/steps/cancel-fulfillment.ts +++ b/packages/core/core-flows/src/fulfillment/steps/cancel-fulfillment.ts @@ -1,5 +1,5 @@ import { IFulfillmentModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const cancelFulfillmentStepId = "cancel-fulfillment" @@ -10,7 +10,7 @@ export const cancelFulfillmentStep = createStep( cancelFulfillmentStepId, async (id: string, { container }) => { const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) await service.cancelFulfillment(id) diff --git a/packages/core/core-flows/src/fulfillment/steps/create-fulfillment-set.ts b/packages/core/core-flows/src/fulfillment/steps/create-fulfillment-set.ts index c40bb49bdc..acb7d93f21 100644 --- a/packages/core/core-flows/src/fulfillment/steps/create-fulfillment-set.ts +++ b/packages/core/core-flows/src/fulfillment/steps/create-fulfillment-set.ts @@ -2,7 +2,7 @@ import { CreateFulfillmentSetDTO, IFulfillmentModuleService, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createFulfillmentSetsId = "create-fulfillment-sets" @@ -13,7 +13,7 @@ export const createFulfillmentSets = createStep( createFulfillmentSetsId, async (data: CreateFulfillmentSetDTO[], { container }) => { const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) const createSets = await service.createFulfillmentSets(data) @@ -29,7 +29,7 @@ export const createFulfillmentSets = createStep( } const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) await service.deleteFulfillmentSets(createSetIds) diff --git a/packages/core/core-flows/src/fulfillment/steps/create-fulfillment.ts b/packages/core/core-flows/src/fulfillment/steps/create-fulfillment.ts index e9e930bfdf..0bca805935 100644 --- a/packages/core/core-flows/src/fulfillment/steps/create-fulfillment.ts +++ b/packages/core/core-flows/src/fulfillment/steps/create-fulfillment.ts @@ -1,5 +1,5 @@ import { FulfillmentTypes, IFulfillmentModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createFulfillmentStepId = "create-fulfillment" @@ -10,7 +10,7 @@ export const createFulfillmentStep = createStep( createFulfillmentStepId, async (data: FulfillmentTypes.CreateFulfillmentDTO, { container }) => { const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) const fulfillment = await service.createFulfillment(data) @@ -23,7 +23,7 @@ export const createFulfillmentStep = createStep( } const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) await service.cancelFulfillment(id) diff --git a/packages/core/core-flows/src/fulfillment/steps/create-return-fulfillment.ts b/packages/core/core-flows/src/fulfillment/steps/create-return-fulfillment.ts index 46d8e6baef..04d9684be3 100644 --- a/packages/core/core-flows/src/fulfillment/steps/create-return-fulfillment.ts +++ b/packages/core/core-flows/src/fulfillment/steps/create-return-fulfillment.ts @@ -1,5 +1,5 @@ import { FulfillmentTypes, IFulfillmentModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createReturnFulfillmentStepId = "create-return-fulfillment" @@ -10,7 +10,7 @@ export const createReturnFulfillmentStep = createStep( createReturnFulfillmentStepId, async (data: FulfillmentTypes.CreateFulfillmentDTO, { container }) => { const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) const fulfillment = await service.createReturnFulfillment(data) @@ -23,7 +23,7 @@ export const createReturnFulfillmentStep = createStep( } const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) // await service.cancelReturnFulfillment(id) // TODO: Implement cancelReturnFulfillment diff --git a/packages/core/core-flows/src/fulfillment/steps/create-service-zones.ts b/packages/core/core-flows/src/fulfillment/steps/create-service-zones.ts index ccf87bf821..c31a58c923 100644 --- a/packages/core/core-flows/src/fulfillment/steps/create-service-zones.ts +++ b/packages/core/core-flows/src/fulfillment/steps/create-service-zones.ts @@ -2,7 +2,7 @@ import { CreateServiceZoneDTO, IFulfillmentModuleService, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createServiceZonesStepId = "create-service-zones" @@ -13,7 +13,7 @@ export const createServiceZonesStep = createStep( createServiceZonesStepId, async (input: CreateServiceZoneDTO[], { container }) => { const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) const createdServiceZones = await service.createServiceZones(input) @@ -29,7 +29,7 @@ export const createServiceZonesStep = createStep( } const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) await service.deleteServiceZones(createdServiceZones) diff --git a/packages/core/core-flows/src/fulfillment/steps/create-shipping-option-rules.ts b/packages/core/core-flows/src/fulfillment/steps/create-shipping-option-rules.ts index da91f9a145..aef43e8fb5 100644 --- a/packages/core/core-flows/src/fulfillment/steps/create-shipping-option-rules.ts +++ b/packages/core/core-flows/src/fulfillment/steps/create-shipping-option-rules.ts @@ -2,7 +2,7 @@ import { AddFulfillmentShippingOptionRulesWorkflowDTO, IFulfillmentModuleService, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createShippingOptionRulesStepId = "create-shipping-option-rules" @@ -18,7 +18,7 @@ export const createShippingOptionRulesStep = createStep( const { data } = input const fulfillmentModule = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) const createdShippingOptionRules = @@ -35,7 +35,7 @@ export const createShippingOptionRulesStep = createStep( } const fulfillmentModule = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) await fulfillmentModule.deleteShippingOptionRules(ruleIds) diff --git a/packages/core/core-flows/src/fulfillment/steps/create-shipping-profiles.ts b/packages/core/core-flows/src/fulfillment/steps/create-shipping-profiles.ts index 619c338a6b..ed51d1b9f1 100644 --- a/packages/core/core-flows/src/fulfillment/steps/create-shipping-profiles.ts +++ b/packages/core/core-flows/src/fulfillment/steps/create-shipping-profiles.ts @@ -2,7 +2,7 @@ import { CreateShippingProfileDTO, IFulfillmentModuleService, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createShippingProfilesStepId = "create-shipping-profiles" @@ -13,7 +13,7 @@ export const createShippingProfilesStep = createStep( createShippingProfilesStepId, async (input: CreateShippingProfileDTO[], { container }) => { const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) const createdShippingProfiles = await service.createShippingProfiles(input) @@ -29,7 +29,7 @@ export const createShippingProfilesStep = createStep( } const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) await service.deleteShippingProfiles(createdShippingProfiles) diff --git a/packages/core/core-flows/src/fulfillment/steps/delete-fulfillment-sets.ts b/packages/core/core-flows/src/fulfillment/steps/delete-fulfillment-sets.ts index 9a3b7fe63a..2135feab75 100644 --- a/packages/core/core-flows/src/fulfillment/steps/delete-fulfillment-sets.ts +++ b/packages/core/core-flows/src/fulfillment/steps/delete-fulfillment-sets.ts @@ -1,5 +1,5 @@ import { IFulfillmentModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { createStep, StepResponse } from "@medusajs/workflows-sdk" export const deleteFulfillmentSetsStepId = "delete-fulfillment-sets" @@ -10,7 +10,7 @@ export const deleteFulfillmentSetsStep = createStep( deleteFulfillmentSetsStepId, async (ids: string[], { container }) => { const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) await service.softDeleteFulfillmentSets(ids) @@ -23,7 +23,7 @@ export const deleteFulfillmentSetsStep = createStep( } const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) await service.restoreFulfillmentSets(prevIds) diff --git a/packages/core/core-flows/src/fulfillment/steps/delete-service-zones.ts b/packages/core/core-flows/src/fulfillment/steps/delete-service-zones.ts index 516780602a..8c30744734 100644 --- a/packages/core/core-flows/src/fulfillment/steps/delete-service-zones.ts +++ b/packages/core/core-flows/src/fulfillment/steps/delete-service-zones.ts @@ -1,5 +1,5 @@ import { IFulfillmentModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteServiceZonesStepId = "delete-service-zones" @@ -10,7 +10,7 @@ export const deleteServiceZonesStep = createStep( deleteServiceZonesStepId, async (ids: string[], { container }) => { const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) await service.softDeleteServiceZones(ids) @@ -23,7 +23,7 @@ export const deleteServiceZonesStep = createStep( } const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) await service.restoreServiceZones(prevIds) diff --git a/packages/core/core-flows/src/fulfillment/steps/delete-shipping-option-rules.ts b/packages/core/core-flows/src/fulfillment/steps/delete-shipping-option-rules.ts index cc98f15076..a02ee37404 100644 --- a/packages/core/core-flows/src/fulfillment/steps/delete-shipping-option-rules.ts +++ b/packages/core/core-flows/src/fulfillment/steps/delete-shipping-option-rules.ts @@ -3,7 +3,7 @@ import { RemoveFulfillmentShippingOptionRulesWorkflowDTO, RuleOperatorType, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteShippingOptionRulesStepId = "delete-shipping-option-rules" @@ -23,7 +23,7 @@ export const deleteShippingOptionRulesStep = createStep( const { ids } = input const fulfillmentModule = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) const shippingOptionRules = await fulfillmentModule.listShippingOptionRules( @@ -41,7 +41,7 @@ export const deleteShippingOptionRulesStep = createStep( } const fulfillmentModule = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) await fulfillmentModule.createShippingOptionRules( diff --git a/packages/core/core-flows/src/fulfillment/steps/delete-shipping-options.ts b/packages/core/core-flows/src/fulfillment/steps/delete-shipping-options.ts index 207dc6013e..ae4fc73f7e 100644 --- a/packages/core/core-flows/src/fulfillment/steps/delete-shipping-options.ts +++ b/packages/core/core-flows/src/fulfillment/steps/delete-shipping-options.ts @@ -1,7 +1,7 @@ import { DeleteEntityInput } from "@medusajs/modules-sdk" import { IFulfillmentModuleService } from "@medusajs/types" -import { ModuleRegistrationName, Modules } from "@medusajs/utils" -import { createStep, StepResponse } from "@medusajs/workflows-sdk" +import { Modules } from "@medusajs/utils" +import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteShippingOptionsStepId = "delete-shipping-options-step" /** @@ -15,7 +15,7 @@ export const deleteShippingOptionsStep = createStep( } const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) const softDeletedEntities = await service.softDeleteShippingOptions(ids) @@ -33,7 +33,7 @@ export const deleteShippingOptionsStep = createStep( } const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) await service.restoreShippingOptions(prevIds) diff --git a/packages/core/core-flows/src/fulfillment/steps/set-shipping-options-prices.ts b/packages/core/core-flows/src/fulfillment/steps/set-shipping-options-prices.ts index c65dd837e1..aedf72d39d 100644 --- a/packages/core/core-flows/src/fulfillment/steps/set-shipping-options-prices.ts +++ b/packages/core/core-flows/src/fulfillment/steps/set-shipping-options-prices.ts @@ -10,11 +10,11 @@ import { } from "@medusajs/types" import { ContainerRegistrationKeys, - isDefined, LINKS, - ModuleRegistrationName, + Modules, + isDefined, } from "@medusajs/utils" -import { createStep, StepResponse } from "@medusajs/workflows-sdk" +import { StepResponse, createStep } from "@medusajs/workflows-sdk" interface PriceRegionId { region_id: string @@ -106,7 +106,7 @@ export const setShippingOptionsPricesStep = createStep( if (regionIds.length) { const regionService = container.resolve( - ModuleRegistrationName.REGION + Modules.REGION ) const regions = await regionService.listRegions( { @@ -156,7 +156,7 @@ export const setShippingOptionsPricesStep = createStep( ) const pricingService = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) for (const data_ of data) { @@ -179,7 +179,7 @@ export const setShippingOptionsPricesStep = createStep( } const pricingService = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) for (const data_ of rollbackData) { diff --git a/packages/core/core-flows/src/fulfillment/steps/update-fulfillment.ts b/packages/core/core-flows/src/fulfillment/steps/update-fulfillment.ts index 91bfee1820..3e429878f4 100644 --- a/packages/core/core-flows/src/fulfillment/steps/update-fulfillment.ts +++ b/packages/core/core-flows/src/fulfillment/steps/update-fulfillment.ts @@ -1,8 +1,5 @@ import { FulfillmentWorkflow, IFulfillmentModuleService } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const updateFulfillmentStepId = "update-fulfillment" @@ -17,7 +14,7 @@ export const updateFulfillmentStep = createStep( ) => { const { id, ...data } = input const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) const { selects, relations } = getSelectsAndRelationsFromObjectArray([data]) @@ -36,7 +33,7 @@ export const updateFulfillmentStep = createStep( } const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) const { id, ...data } = fulfillment diff --git a/packages/core/core-flows/src/fulfillment/steps/update-service-zones.ts b/packages/core/core-flows/src/fulfillment/steps/update-service-zones.ts index f8a688e7ba..024cdb5ba6 100644 --- a/packages/core/core-flows/src/fulfillment/steps/update-service-zones.ts +++ b/packages/core/core-flows/src/fulfillment/steps/update-service-zones.ts @@ -1,8 +1,5 @@ import { FulfillmentWorkflow, IFulfillmentModuleService } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const updateServiceZonesStepId = "update-service-zones" @@ -11,9 +8,12 @@ export const updateServiceZonesStepId = "update-service-zones" */ export const updateServiceZonesStep = createStep( updateServiceZonesStepId, - async (input: FulfillmentWorkflow.UpdateServiceZonesWorkflowInput, { container }) => { + async ( + input: FulfillmentWorkflow.UpdateServiceZonesWorkflowInput, + { container } + ) => { const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) const { selects, relations } = getSelectsAndRelationsFromObjectArray([ @@ -38,7 +38,7 @@ export const updateServiceZonesStep = createStep( } const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) await service.upsertServiceZones(prevData) diff --git a/packages/core/core-flows/src/fulfillment/steps/update-shipping-option-rules.ts b/packages/core/core-flows/src/fulfillment/steps/update-shipping-option-rules.ts index 38799ebe8e..2aa4fa901f 100644 --- a/packages/core/core-flows/src/fulfillment/steps/update-shipping-option-rules.ts +++ b/packages/core/core-flows/src/fulfillment/steps/update-shipping-option-rules.ts @@ -3,7 +3,7 @@ import { UpdateFulfillmentShippingOptionRulesWorkflowDTO, UpdateShippingOptionRuleDTO, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const updateShippingOptionRulesStepId = "update-shipping-option-rules" @@ -23,7 +23,7 @@ export const updateShippingOptionRulesStep = createStep( const { data } = input const fulfillmentModule = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) const ids = data.map((d) => d.id) @@ -46,7 +46,7 @@ export const updateShippingOptionRulesStep = createStep( } const fulfillmentModule = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) await fulfillmentModule.updateShippingOptionRules(previousRulesData) diff --git a/packages/core/core-flows/src/fulfillment/steps/update-shipping-profiles.ts b/packages/core/core-flows/src/fulfillment/steps/update-shipping-profiles.ts index 40fe0c6894..3c55dfb02c 100644 --- a/packages/core/core-flows/src/fulfillment/steps/update-shipping-profiles.ts +++ b/packages/core/core-flows/src/fulfillment/steps/update-shipping-profiles.ts @@ -3,10 +3,7 @@ import { IFulfillmentModuleService, UpdateShippingProfileDTO, } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type UpdateShippingProfilesStepInput = { @@ -22,7 +19,7 @@ export const updateShippingProfilesStep = createStep( updateShippingProfilesStepId, async (input: UpdateShippingProfilesStepInput, { container }) => { const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) const { selects, relations } = getSelectsAndRelationsFromObjectArray([ @@ -47,7 +44,7 @@ export const updateShippingProfilesStep = createStep( } const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) await service.upsertShippingProfiles(prevData) diff --git a/packages/core/core-flows/src/fulfillment/steps/upsert-shipping-options.ts b/packages/core/core-flows/src/fulfillment/steps/upsert-shipping-options.ts index d92789f29d..8fa202ec59 100644 --- a/packages/core/core-flows/src/fulfillment/steps/upsert-shipping-options.ts +++ b/packages/core/core-flows/src/fulfillment/steps/upsert-shipping-options.ts @@ -5,7 +5,7 @@ import { UpsertShippingOptionDTO, } from "@medusajs/types" import { - ModuleRegistrationName, + Modules, arrayDifference, getSelectsAndRelationsFromObjectArray, } from "@medusajs/utils" @@ -29,7 +29,7 @@ export const upsertShippingOptionsStep = createStep( } const fulfillmentService = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) const toUpdate: FulfillmentWorkflow.UpdateShippingOptionsWorkflowInput[] = @@ -85,7 +85,7 @@ export const upsertShippingOptionsStep = createStep( } const fulfillmentService = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) if (shippingOptionIds.updatedPreviousData.length) { diff --git a/packages/core/core-flows/src/fulfillment/steps/validate-fulfillment-providers.ts b/packages/core/core-flows/src/fulfillment/steps/validate-fulfillment-providers.ts index e930fa945a..097b497928 100644 --- a/packages/core/core-flows/src/fulfillment/steps/validate-fulfillment-providers.ts +++ b/packages/core/core-flows/src/fulfillment/steps/validate-fulfillment-providers.ts @@ -2,9 +2,9 @@ import { ServiceZoneDTO, ShippingOptionDTO } from "@medusajs/types" import { ContainerRegistrationKeys, MedusaError, - ModuleRegistrationName, + Modules, } from "@medusajs/utils" -import { createStep, StepResponse } from "@medusajs/workflows-sdk" +import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type FulfillmentProviderValidationWorkflowInput = { id?: string @@ -28,9 +28,7 @@ export const validateFulfillmentProvidersStep = createStep( service_zone_id: string provider_id: string }[] = [] - const fulfillmentService = container.resolve( - ModuleRegistrationName.FULFILLMENT - ) + const fulfillmentService = container.resolve(Modules.FULFILLMENT) const shippingOptions = await fulfillmentService.listShippingOptions( { diff --git a/packages/core/core-flows/src/fulfillment/steps/validate-shipment.ts b/packages/core/core-flows/src/fulfillment/steps/validate-shipment.ts index 7e380d9a90..f3cf69f6a7 100644 --- a/packages/core/core-flows/src/fulfillment/steps/validate-shipment.ts +++ b/packages/core/core-flows/src/fulfillment/steps/validate-shipment.ts @@ -1,6 +1,6 @@ import { IFulfillmentModuleService } from "@medusajs/types" -import { MedusaError, ModuleRegistrationName } from "@medusajs/utils" -import { createStep, StepResponse } from "@medusajs/workflows-sdk" +import { MedusaError, Modules } from "@medusajs/utils" +import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const validateShipmentStepId = "validate-shipment" /** @@ -10,7 +10,7 @@ export const validateShipmentStep = createStep( validateShipmentStepId, async (id: string, { container }) => { const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) const fulfillment = await service.retrieveFulfillment(id, { select: ["shipped_at", "canceled_at", "shipping_option_id"], diff --git a/packages/core/core-flows/src/inventory/steps/adjust-inventory-levels.ts b/packages/core/core-flows/src/inventory/steps/adjust-inventory-levels.ts index f8c18e047a..066e9c9ae7 100644 --- a/packages/core/core-flows/src/inventory/steps/adjust-inventory-levels.ts +++ b/packages/core/core-flows/src/inventory/steps/adjust-inventory-levels.ts @@ -1,7 +1,7 @@ import { IInventoryService, InventoryTypes } from "@medusajs/types" import { StepResponse, createStep } from "@medusajs/workflows-sdk" -import { MathBN, ModuleRegistrationName } from "@medusajs/utils" +import { MathBN, Modules } from "@medusajs/utils" export const adjustInventoryLevelsStepId = "adjust-inventory-levels-step" /** @@ -14,7 +14,7 @@ export const adjustInventoryLevelsStep = createStep( { container } ) => { const inventoryService: IInventoryService = container.resolve( - ModuleRegistrationName.INVENTORY + Modules.INVENTORY ) const adjustedLevels: InventoryTypes.InventoryLevelDTO[] = @@ -43,7 +43,7 @@ export const adjustInventoryLevelsStep = createStep( return } - const inventoryService = container.resolve(ModuleRegistrationName.INVENTORY) + const inventoryService = container.resolve(Modules.INVENTORY) /** * @todo diff --git a/packages/core/core-flows/src/inventory/steps/attach-inventory-items.ts b/packages/core/core-flows/src/inventory/steps/attach-inventory-items.ts index a85056a03a..2c4e85e73b 100644 --- a/packages/core/core-flows/src/inventory/steps/attach-inventory-items.ts +++ b/packages/core/core-flows/src/inventory/steps/attach-inventory-items.ts @@ -1,7 +1,6 @@ import { StepResponse, createStep } from "@medusajs/workflows-sdk" import { ContainerRegistrationKeys } from "@medusajs/utils" -import { InventoryItemDTO } from "@medusajs/types" export const attachInventoryItemToVariantsStepId = "attach-inventory-items-to-variants-step" @@ -22,10 +21,10 @@ export const attachInventoryItemToVariants = createStep( const linkDefinitions = input .filter(({ tag }) => !!tag) .map(({ inventoryItemId, tag }) => ({ - productService: { + Product: { variant_id: tag!, }, - inventoryService: { + Inventory: { inventory_item_id: inventoryItemId, }, })) diff --git a/packages/core/core-flows/src/inventory/steps/create-inventory-items.ts b/packages/core/core-flows/src/inventory/steps/create-inventory-items.ts index 82ce5c5e86..1ba67da04d 100644 --- a/packages/core/core-flows/src/inventory/steps/create-inventory-items.ts +++ b/packages/core/core-flows/src/inventory/steps/create-inventory-items.ts @@ -1,7 +1,7 @@ import { StepResponse, createStep } from "@medusajs/workflows-sdk" import { IInventoryService, InventoryTypes } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" export const createInventoryItemsStepId = "create-inventory-items" /** @@ -11,7 +11,7 @@ export const createInventoryItemsStep = createStep( createInventoryItemsStepId, async (data: InventoryTypes.CreateInventoryItemInput[], { container }) => { const inventoryService: IInventoryService = container.resolve( - ModuleRegistrationName.INVENTORY + Modules.INVENTORY ) const createdItems: InventoryTypes.InventoryItemDTO[] = @@ -27,7 +27,7 @@ export const createInventoryItemsStep = createStep( return } - const inventoryService = container.resolve(ModuleRegistrationName.INVENTORY) + const inventoryService = container.resolve(Modules.INVENTORY) await inventoryService.deleteInventoryItems(data) } diff --git a/packages/core/core-flows/src/inventory/steps/create-inventory-levels.ts b/packages/core/core-flows/src/inventory/steps/create-inventory-levels.ts index d03cc4a0c7..f9ac5cc421 100644 --- a/packages/core/core-flows/src/inventory/steps/create-inventory-levels.ts +++ b/packages/core/core-flows/src/inventory/steps/create-inventory-levels.ts @@ -1,7 +1,7 @@ import { IInventoryService, InventoryTypes } from "@medusajs/types" import { StepResponse, createStep } from "@medusajs/workflows-sdk" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" export const createInventoryLevelsStepId = "create-inventory-levels" /** @@ -10,9 +10,7 @@ export const createInventoryLevelsStepId = "create-inventory-levels" export const createInventoryLevelsStep = createStep( createInventoryLevelsStepId, async (data: InventoryTypes.CreateInventoryLevelInput[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.INVENTORY - ) + const service = container.resolve(Modules.INVENTORY) const inventoryLevels = await service.createInventoryLevels(data) return new StepResponse( @@ -25,9 +23,7 @@ export const createInventoryLevelsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.INVENTORY - ) + const service = container.resolve(Modules.INVENTORY) await service.deleteInventoryLevels(ids) } diff --git a/packages/core/core-flows/src/inventory/steps/delete-inventory-items.ts b/packages/core/core-flows/src/inventory/steps/delete-inventory-items.ts index b04b66faf1..a04945f713 100644 --- a/packages/core/core-flows/src/inventory/steps/delete-inventory-items.ts +++ b/packages/core/core-flows/src/inventory/steps/delete-inventory-items.ts @@ -1,6 +1,6 @@ import { StepResponse, createStep } from "@medusajs/workflows-sdk" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" export const deleteInventoryItemStepId = "delete-inventory-item-step" /** @@ -9,7 +9,7 @@ export const deleteInventoryItemStepId = "delete-inventory-item-step" export const deleteInventoryItemStep = createStep( deleteInventoryItemStepId, async (ids: string[], { container }) => { - const inventoryService = container.resolve(ModuleRegistrationName.INVENTORY) + const inventoryService = container.resolve(Modules.INVENTORY) await inventoryService.softDeleteInventoryItems(ids) @@ -20,7 +20,7 @@ export const deleteInventoryItemStep = createStep( return } - const inventoryService = container.resolve(ModuleRegistrationName.INVENTORY) + const inventoryService = container.resolve(Modules.INVENTORY) await inventoryService.restoreInventoryItems(prevInventoryItemIds) } diff --git a/packages/core/core-flows/src/inventory/steps/delete-inventory-levels.ts b/packages/core/core-flows/src/inventory/steps/delete-inventory-levels.ts index 90f7232cf0..540bd4259f 100644 --- a/packages/core/core-flows/src/inventory/steps/delete-inventory-levels.ts +++ b/packages/core/core-flows/src/inventory/steps/delete-inventory-levels.ts @@ -1,7 +1,7 @@ import { IInventoryService } from "@medusajs/types" import { StepResponse, createStep } from "@medusajs/workflows-sdk" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" export const deleteInventoryLevelsStepId = "delete-inventory-levels-step" /** @@ -10,9 +10,7 @@ export const deleteInventoryLevelsStepId = "delete-inventory-levels-step" export const deleteInventoryLevelsStep = createStep( deleteInventoryLevelsStepId, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.INVENTORY - ) + const service = container.resolve(Modules.INVENTORY) await service.softDeleteInventoryLevels(ids) @@ -23,9 +21,7 @@ export const deleteInventoryLevelsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.INVENTORY - ) + const service = container.resolve(Modules.INVENTORY) await service.restoreInventoryLevels(prevLevelIds) } diff --git a/packages/core/core-flows/src/inventory/steps/update-inventory-items.ts b/packages/core/core-flows/src/inventory/steps/update-inventory-items.ts index 2e448525e8..7ec7fd9a2d 100644 --- a/packages/core/core-flows/src/inventory/steps/update-inventory-items.ts +++ b/packages/core/core-flows/src/inventory/steps/update-inventory-items.ts @@ -5,7 +5,7 @@ import { } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" export const updateInventoryItemsStepId = "update-inventory-items-step" /** @@ -15,7 +15,7 @@ export const updateInventoryItemsStep = createStep( updateInventoryItemsStepId, async (input: InventoryTypes.UpdateInventoryItemInput[], { container }) => { const inventoryService = container.resolve( - ModuleRegistrationName.INVENTORY + Modules.INVENTORY ) const { selects, relations } = getSelectsAndRelationsFromObjectArray(input) @@ -42,7 +42,7 @@ export const updateInventoryItemsStep = createStep( const { dataBeforeUpdate, selects, relations } = revertInput const inventoryService = container.resolve( - ModuleRegistrationName.INVENTORY + Modules.INVENTORY ) await inventoryService.updateInventoryItems( diff --git a/packages/core/core-flows/src/inventory/steps/update-inventory-levels.ts b/packages/core/core-flows/src/inventory/steps/update-inventory-levels.ts index 292427f043..7c08809c75 100644 --- a/packages/core/core-flows/src/inventory/steps/update-inventory-levels.ts +++ b/packages/core/core-flows/src/inventory/steps/update-inventory-levels.ts @@ -5,7 +5,7 @@ import { } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" export const updateInventoryLevelsStepId = "update-inventory-levels-step" /** @@ -18,7 +18,7 @@ export const updateInventoryLevelsStep = createStep( { container } ) => { const inventoryService: IInventoryService = container.resolve( - ModuleRegistrationName.INVENTORY + Modules.INVENTORY ) const { selects, relations } = getSelectsAndRelationsFromObjectArray(input) @@ -49,7 +49,7 @@ export const updateInventoryLevelsStep = createStep( const { dataBeforeUpdate, selects, relations } = revertInput - const inventoryService = container.resolve(ModuleRegistrationName.INVENTORY) + const inventoryService = container.resolve(Modules.INVENTORY) await inventoryService.updateInventoryLevels( dataBeforeUpdate.map((data) => diff --git a/packages/core/core-flows/src/inventory/workflows/delete-inventory-levels.ts b/packages/core/core-flows/src/inventory/workflows/delete-inventory-levels.ts index db44263f24..458ffeeb85 100644 --- a/packages/core/core-flows/src/inventory/workflows/delete-inventory-levels.ts +++ b/packages/core/core-flows/src/inventory/workflows/delete-inventory-levels.ts @@ -7,11 +7,7 @@ import { } from "@medusajs/workflows-sdk" import { FilterableInventoryLevelProps } from "@medusajs/types" -import { - deduplicate, - MedusaError, - ModuleRegistrationName, -} from "@medusajs/utils" +import { deduplicate, MedusaError, Modules } from "@medusajs/utils" import { useRemoteQueryStep } from "../../common" import { deleteEntitiesStep } from "../../common/steps/delete-entities" @@ -61,7 +57,7 @@ export const deleteInventoryLevelsWorkflow = createWorkflow( ) deleteEntitiesStep({ - moduleRegistrationName: ModuleRegistrationName.INVENTORY, + moduleRegistrationName: Modules.INVENTORY, invokeMethod: "softDeleteInventoryLevels", compensateMethod: "restoreInventoryLevels", data: idsToDelete, diff --git a/packages/core/core-flows/src/invite/steps/create-invites.ts b/packages/core/core-flows/src/invite/steps/create-invites.ts index 0e5f027f6e..abc5f2c6b0 100644 --- a/packages/core/core-flows/src/invite/steps/create-invites.ts +++ b/packages/core/core-flows/src/invite/steps/create-invites.ts @@ -1,5 +1,5 @@ import { CreateInviteDTO, IUserModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createInviteStepId = "create-invite-step" @@ -9,9 +9,7 @@ export const createInviteStepId = "create-invite-step" export const createInviteStep = createStep( createInviteStepId, async (input: CreateInviteDTO[], { container }) => { - const service: IUserModuleService = container.resolve( - ModuleRegistrationName.USER - ) + const service: IUserModuleService = container.resolve(Modules.USER) const createdInvites = await service.createInvites(input) @@ -25,9 +23,7 @@ export const createInviteStep = createStep( return } - const service: IUserModuleService = container.resolve( - ModuleRegistrationName.USER - ) + const service: IUserModuleService = container.resolve(Modules.USER) await service.deleteInvites(createdInvitesIds) } diff --git a/packages/core/core-flows/src/invite/steps/delete-invites.ts b/packages/core/core-flows/src/invite/steps/delete-invites.ts index 3454326907..8d07829e9c 100644 --- a/packages/core/core-flows/src/invite/steps/delete-invites.ts +++ b/packages/core/core-flows/src/invite/steps/delete-invites.ts @@ -1,5 +1,5 @@ import { IUserModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteInvitesStepId = "delete-invites-step" @@ -9,9 +9,7 @@ export const deleteInvitesStepId = "delete-invites-step" export const deleteInvitesStep = createStep( deleteInvitesStepId, async (input: string[], { container }) => { - const service: IUserModuleService = container.resolve( - ModuleRegistrationName.USER - ) + const service: IUserModuleService = container.resolve(Modules.USER) await service.softDeleteInvites(input) @@ -22,9 +20,7 @@ export const deleteInvitesStep = createStep( return } - const service: IUserModuleService = container.resolve( - ModuleRegistrationName.USER - ) + const service: IUserModuleService = container.resolve(Modules.USER) await service.restoreInvites(deletedInviteIds) } diff --git a/packages/core/core-flows/src/invite/steps/refresh-invite-tokens.ts b/packages/core/core-flows/src/invite/steps/refresh-invite-tokens.ts index f36eac6c42..6811ba2e6e 100644 --- a/packages/core/core-flows/src/invite/steps/refresh-invite-tokens.ts +++ b/packages/core/core-flows/src/invite/steps/refresh-invite-tokens.ts @@ -1,7 +1,7 @@ import { IUserModuleService } from "@medusajs/types" import { StepResponse, createStep } from "@medusajs/workflows-sdk" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" export const refreshInviteTokensStepId = "refresh-invite-tokens-step" /** @@ -10,9 +10,7 @@ export const refreshInviteTokensStepId = "refresh-invite-tokens-step" export const refreshInviteTokensStep = createStep( refreshInviteTokensStepId, async (input: string[], { container }) => { - const service: IUserModuleService = container.resolve( - ModuleRegistrationName.USER - ) + const service: IUserModuleService = container.resolve(Modules.USER) const invites = await service.refreshInviteTokens(input) diff --git a/packages/core/core-flows/src/invite/steps/validate-token.ts b/packages/core/core-flows/src/invite/steps/validate-token.ts index c4b91b8b6b..d7b3e50294 100644 --- a/packages/core/core-flows/src/invite/steps/validate-token.ts +++ b/packages/core/core-flows/src/invite/steps/validate-token.ts @@ -1,5 +1,5 @@ import { IUserModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const validateTokenStepId = "validate-invite-token-step" @@ -10,7 +10,7 @@ export const validateTokenStep = createStep( validateTokenStepId, async (input: string, { container }) => { const userModuleService: IUserModuleService = container.resolve( - ModuleRegistrationName.USER + Modules.USER ) const invite = await userModuleService.validateInviteToken(input) diff --git a/packages/core/core-flows/src/line-item/steps/delete-line-items.ts b/packages/core/core-flows/src/line-item/steps/delete-line-items.ts index f5ba7448e8..afcbb7c6da 100644 --- a/packages/core/core-flows/src/line-item/steps/delete-line-items.ts +++ b/packages/core/core-flows/src/line-item/steps/delete-line-items.ts @@ -1,5 +1,5 @@ import { ICartModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteLineItemsStepId = "delete-line-items" @@ -9,9 +9,7 @@ export const deleteLineItemsStepId = "delete-line-items" export const deleteLineItemsStep = createStep( deleteLineItemsStepId, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.CART - ) + const service = container.resolve(Modules.CART) await service.softDeleteLineItems(ids) @@ -21,9 +19,7 @@ export const deleteLineItemsStep = createStep( if (!ids?.length) { return } - const service = container.resolve( - ModuleRegistrationName.CART - ) + const service = container.resolve(Modules.CART) await service.restoreLineItems(ids) } diff --git a/packages/core/core-flows/src/line-item/steps/list-line-items.ts b/packages/core/core-flows/src/line-item/steps/list-line-items.ts index 390c2f0df6..c617d5e2ff 100644 --- a/packages/core/core-flows/src/line-item/steps/list-line-items.ts +++ b/packages/core/core-flows/src/line-item/steps/list-line-items.ts @@ -4,7 +4,7 @@ import { FindConfig, ICartModuleService, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface ListLineItemsStepInput { @@ -20,9 +20,7 @@ export const listLineItemsStepId = "list-line-items" export const listLineItemsStep = createStep( listLineItemsStepId, async (data: ListLineItemsStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.CART - ) + const service = container.resolve(Modules.CART) const items = await service.listLineItems(data.filters, data.config) diff --git a/packages/core/core-flows/src/line-item/steps/update-line-items.ts b/packages/core/core-flows/src/line-item/steps/update-line-items.ts index 9fe85bbcb5..286f9b4117 100644 --- a/packages/core/core-flows/src/line-item/steps/update-line-items.ts +++ b/packages/core/core-flows/src/line-item/steps/update-line-items.ts @@ -3,7 +3,7 @@ import { UpdateLineItemWithSelectorDTO, } from "@medusajs/types" import { - ModuleRegistrationName, + Modules, getSelectsAndRelationsFromObjectArray, promiseAll, removeUndefined, @@ -18,9 +18,7 @@ export const updateLineItemsStepWithSelectorId = export const updateLineItemsStepWithSelector = createStep( updateLineItemsStepWithSelectorId, async (input: UpdateLineItemWithSelectorDTO, { container }) => { - const service = container.resolve( - ModuleRegistrationName.CART - ) + const service = container.resolve(Modules.CART) const { selects, relations } = getSelectsAndRelationsFromObjectArray([ input.data, @@ -40,9 +38,7 @@ export const updateLineItemsStepWithSelector = createStep( return } - const service = container.resolve( - ModuleRegistrationName.CART - ) + const service = container.resolve(Modules.CART) await promiseAll( itemsBefore.map(async (i) => diff --git a/packages/core/core-flows/src/notification/steps/notify-on-failure.ts b/packages/core/core-flows/src/notification/steps/notify-on-failure.ts index c10790d711..1e5ea90b72 100644 --- a/packages/core/core-flows/src/notification/steps/notify-on-failure.ts +++ b/packages/core/core-flows/src/notification/steps/notify-on-failure.ts @@ -1,5 +1,5 @@ import { INotificationModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type NotifyOnFailureStepInput = { @@ -17,7 +17,7 @@ export type NotifyOnFailureStepInput = { export const notifyOnFailureStepId = "notify-on-failure" /** - * This step sends one or more notification when a workflow fails. This + * This step sends one or more notification when a workflow fails. This * step can be used in a workflow for its compensation function. When the workflow fails, * its compensation function is triggered to send the notification. */ @@ -33,7 +33,7 @@ export const notifyOnFailureStep = createStep( } const service = container.resolve( - ModuleRegistrationName.NOTIFICATION + Modules.NOTIFICATION ) await service.createNotifications(data) } diff --git a/packages/core/core-flows/src/notification/steps/send-notifications.ts b/packages/core/core-flows/src/notification/steps/send-notifications.ts index 85ac43e77f..3f6caaede7 100644 --- a/packages/core/core-flows/src/notification/steps/send-notifications.ts +++ b/packages/core/core-flows/src/notification/steps/send-notifications.ts @@ -1,5 +1,5 @@ import { INotificationModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type SendNotificationsStepInput = { @@ -23,7 +23,7 @@ export const sendNotificationsStep = createStep( sendNotificationsStepId, async (data: SendNotificationsStepInput, { container }) => { const service = container.resolve( - ModuleRegistrationName.NOTIFICATION + Modules.NOTIFICATION ) const created = await service.createNotifications(data) return new StepResponse( diff --git a/packages/core/core-flows/src/order/steps/add-order-transaction.ts b/packages/core/core-flows/src/order/steps/add-order-transaction.ts index 833cfa1e94..0b87117c33 100644 --- a/packages/core/core-flows/src/order/steps/add-order-transaction.ts +++ b/packages/core/core-flows/src/order/steps/add-order-transaction.ts @@ -1,5 +1,5 @@ import { CreateOrderTransactionDTO } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const addOrderTransactionStepId = "add-order-transaction" @@ -9,7 +9,7 @@ export const addOrderTransactionStepId = "add-order-transaction" export const addOrderTransactionStep = createStep( addOrderTransactionStepId, async (data: CreateOrderTransactionDTO, { container }) => { - const service = container.resolve(ModuleRegistrationName.ORDER) + const service = container.resolve(Modules.ORDER) const created = await service.addOrderTransactions(data) @@ -20,7 +20,7 @@ export const addOrderTransactionStep = createStep( return } - const service = container.resolve(ModuleRegistrationName.ORDER) + const service = container.resolve(Modules.ORDER) await service.deleteOrderTransactions(id) } diff --git a/packages/core/core-flows/src/order/steps/archive-orders.ts b/packages/core/core-flows/src/order/steps/archive-orders.ts index e2c95ddf2e..a5c4bbe332 100644 --- a/packages/core/core-flows/src/order/steps/archive-orders.ts +++ b/packages/core/core-flows/src/order/steps/archive-orders.ts @@ -1,5 +1,5 @@ import { IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { createStep, StepResponse } from "@medusajs/workflows-sdk" export type ArchiveOrdersStepInput = { @@ -13,9 +13,7 @@ export const archiveOrdersStepId = "archive-orders" export const archiveOrdersStep = createStep( archiveOrdersStepId, async (data: ArchiveOrdersStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const archived = await service.archive(data.orderIds) return new StepResponse( @@ -33,9 +31,7 @@ export const archiveOrdersStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.updateOrders(archived) } diff --git a/packages/core/core-flows/src/order/steps/cancel-fulfillment.ts b/packages/core/core-flows/src/order/steps/cancel-fulfillment.ts index aa9c1156bc..c4b909671c 100644 --- a/packages/core/core-flows/src/order/steps/cancel-fulfillment.ts +++ b/packages/core/core-flows/src/order/steps/cancel-fulfillment.ts @@ -1,5 +1,5 @@ import { CancelOrderFulfillmentDTO, IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const cancelOrderFulfillmentStepId = "cancel-order-fulfillment" @@ -9,9 +9,7 @@ export const cancelOrderFulfillmentStepId = "cancel-order-fulfillment" export const cancelOrderFulfillmentStep = createStep( cancelOrderFulfillmentStepId, async (data: CancelOrderFulfillmentDTO, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.cancelFulfillment(data) return new StepResponse(void 0, data.order_id) @@ -21,9 +19,7 @@ export const cancelOrderFulfillmentStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.revertLastVersion(orderId) } diff --git a/packages/core/core-flows/src/order/steps/cancel-order-change.ts b/packages/core/core-flows/src/order/steps/cancel-order-change.ts index 2d4307faf9..f2bc1ea8e1 100644 --- a/packages/core/core-flows/src/order/steps/cancel-order-change.ts +++ b/packages/core/core-flows/src/order/steps/cancel-order-change.ts @@ -4,7 +4,7 @@ import { UpdateOrderChangeDTO, } from "@medusajs/types" import { - ModuleRegistrationName, + Modules, deduplicate, getSelectsAndRelationsFromObjectArray, } from "@medusajs/utils" @@ -17,9 +17,7 @@ export const cancelOrderChangeStepId = "cancel-order-change" export const cancelOrderChangeStep = createStep( cancelOrderChangeStepId, async (data: CancelOrderChangeDTO, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const { selects, relations } = getSelectsAndRelationsFromObjectArray( [data], @@ -50,9 +48,7 @@ export const cancelOrderChangeStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.updateOrderChanges(rollbackData as UpdateOrderChangeDTO) } diff --git a/packages/core/core-flows/src/order/steps/cancel-orders.ts b/packages/core/core-flows/src/order/steps/cancel-orders.ts index 72ee6d867a..5b20c225e8 100644 --- a/packages/core/core-flows/src/order/steps/cancel-orders.ts +++ b/packages/core/core-flows/src/order/steps/cancel-orders.ts @@ -1,5 +1,5 @@ import { IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { createStep, StepResponse } from "@medusajs/workflows-sdk" export type CancelOrdersStepInput = { @@ -14,9 +14,7 @@ export const cancelOrdersStepId = "cancel-orders" export const cancelOrdersStep = createStep( cancelOrdersStepId, async (data: CancelOrdersStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const orders = await service.listOrders( { @@ -46,9 +44,7 @@ export const cancelOrdersStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.updateOrders(canceled) } diff --git a/packages/core/core-flows/src/order/steps/claim/cancel-claim.ts b/packages/core/core-flows/src/order/steps/claim/cancel-claim.ts index 174ae29faf..9e10e96dca 100644 --- a/packages/core/core-flows/src/order/steps/claim/cancel-claim.ts +++ b/packages/core/core-flows/src/order/steps/claim/cancel-claim.ts @@ -1,5 +1,5 @@ import { CancelOrderClaimDTO, IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const cancelOrderClaimStepId = "cancel-order-claim" @@ -9,9 +9,7 @@ export const cancelOrderClaimStepId = "cancel-order-claim" export const cancelOrderClaimStep = createStep( cancelOrderClaimStepId, async (data: CancelOrderClaimDTO, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.cancelClaim(data) return new StepResponse(void 0, data.order_id) @@ -21,9 +19,7 @@ export const cancelOrderClaimStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.revertLastVersion(orderId) } diff --git a/packages/core/core-flows/src/order/steps/claim/create-claim-items-from-actions.ts b/packages/core/core-flows/src/order/steps/claim/create-claim-items-from-actions.ts index e2280f7352..413091f4d0 100644 --- a/packages/core/core-flows/src/order/steps/claim/create-claim-items-from-actions.ts +++ b/packages/core/core-flows/src/order/steps/claim/create-claim-items-from-actions.ts @@ -1,5 +1,5 @@ import { IOrderModuleService, OrderChangeActionDTO } from "@medusajs/types" -import { ChangeActionType, ModuleRegistrationName } from "@medusajs/utils" +import { ChangeActionType, Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type CreateOrderClaimItemsFromActionsInput = { @@ -14,7 +14,7 @@ export const createOrderClaimItemsFromActionsStep = createStep( "create-claim-items-from-change-actions", async (input: CreateOrderClaimItemsFromActionsInput, { container }) => { const orderModuleService = container.resolve( - ModuleRegistrationName.ORDER + Modules.ORDER ) const claimItems = input.changes.map((item) => { @@ -54,7 +54,7 @@ export const createOrderClaimItemsFromActionsStep = createStep( } const orderModuleService = container.resolve( - ModuleRegistrationName.ORDER + Modules.ORDER ) await orderModuleService.deleteOrderClaimItems(ids) diff --git a/packages/core/core-flows/src/order/steps/claim/create-claims.ts b/packages/core/core-flows/src/order/steps/claim/create-claims.ts index f632feabc8..fa179d84bb 100644 --- a/packages/core/core-flows/src/order/steps/claim/create-claims.ts +++ b/packages/core/core-flows/src/order/steps/claim/create-claims.ts @@ -1,5 +1,5 @@ import { CreateOrderClaimDTO, IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createOrderClaimsStepId = "create-order-claims" @@ -9,9 +9,7 @@ export const createOrderClaimsStepId = "create-order-claims" export const createOrderClaimsStep = createStep( createOrderClaimsStepId, async (data: CreateOrderClaimDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const orderClaims = await service.createOrderClaims(data) @@ -24,9 +22,7 @@ export const createOrderClaimsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.deleteOrderClaims(claimIds) } diff --git a/packages/core/core-flows/src/order/steps/claim/delete-claims.ts b/packages/core/core-flows/src/order/steps/claim/delete-claims.ts index 67ad988bcc..a29104616b 100644 --- a/packages/core/core-flows/src/order/steps/claim/delete-claims.ts +++ b/packages/core/core-flows/src/order/steps/claim/delete-claims.ts @@ -1,5 +1,5 @@ import { IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { createStep, StepResponse } from "@medusajs/workflows-sdk" export const deleteClaimsStepId = "delete-claims" @@ -9,9 +9,7 @@ export const deleteClaimsStepId = "delete-claims" export const deleteClaimsStep = createStep( deleteClaimsStepId, async (data: { ids: string[] }, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const deleted = await service.softDeleteOrderClaims(data.ids) @@ -22,9 +20,7 @@ export const deleteClaimsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.restoreOrderClaims(ids) } diff --git a/packages/core/core-flows/src/order/steps/claim/update-order-claims.ts b/packages/core/core-flows/src/order/steps/claim/update-order-claims.ts index eccd3a41f4..611c197852 100644 --- a/packages/core/core-flows/src/order/steps/claim/update-order-claims.ts +++ b/packages/core/core-flows/src/order/steps/claim/update-order-claims.ts @@ -1,8 +1,5 @@ import { IOrderModuleService, UpdateOrderClaimDTO } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const updateOrderClaimsStepId = "update-order-claim" @@ -12,9 +9,7 @@ export const updateOrderClaimsStepId = "update-order-claim" export const updateOrderClaimsStep = createStep( updateOrderClaimsStepId, async (data: UpdateOrderClaimDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const { selects, relations } = getSelectsAndRelationsFromObjectArray(data, { objectFields: ["metadata"], @@ -41,9 +36,7 @@ export const updateOrderClaimsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.updateOrderClaims( dataBeforeUpdate.map((dt) => { diff --git a/packages/core/core-flows/src/order/steps/complete-orders.ts b/packages/core/core-flows/src/order/steps/complete-orders.ts index 0f1d086350..47c5385e31 100644 --- a/packages/core/core-flows/src/order/steps/complete-orders.ts +++ b/packages/core/core-flows/src/order/steps/complete-orders.ts @@ -1,5 +1,5 @@ import { IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { createStep, StepResponse } from "@medusajs/workflows-sdk" export type CompleteOrdersStepInput = { @@ -13,9 +13,7 @@ export const completeOrdersStepId = "complete-orders" export const completeOrdersStep = createStep( completeOrdersStepId, async (data: CompleteOrdersStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const orders = await service.listOrders( { @@ -43,9 +41,7 @@ export const completeOrdersStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.updateOrders(completed) } diff --git a/packages/core/core-flows/src/order/steps/confirm-order-changes.ts b/packages/core/core-flows/src/order/steps/confirm-order-changes.ts index a3efab9bec..c2e795365b 100644 --- a/packages/core/core-flows/src/order/steps/confirm-order-changes.ts +++ b/packages/core/core-flows/src/order/steps/confirm-order-changes.ts @@ -1,5 +1,5 @@ import { OrderChangeDTO } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { createStep, StepResponse } from "@medusajs/workflows-sdk" export type ConfirmOrderChangesInput = { @@ -14,7 +14,7 @@ export type ConfirmOrderChangesInput = { export const confirmOrderChanges = createStep( "confirm-order-changes", async (input: ConfirmOrderChangesInput, { container }) => { - const orderModuleService = container.resolve(ModuleRegistrationName.ORDER) + const orderModuleService = container.resolve(Modules.ORDER) await orderModuleService.confirmOrderChange( input.changes.map((action) => ({ id: action.id, @@ -29,7 +29,7 @@ export const confirmOrderChanges = createStep( return } - const orderModuleService = container.resolve(ModuleRegistrationName.ORDER) + const orderModuleService = container.resolve(Modules.ORDER) await orderModuleService.revertLastVersion(orderId) } ) diff --git a/packages/core/core-flows/src/order/steps/create-line-items.ts b/packages/core/core-flows/src/order/steps/create-line-items.ts index 72dde0c266..5f640ee1e5 100644 --- a/packages/core/core-flows/src/order/steps/create-line-items.ts +++ b/packages/core/core-flows/src/order/steps/create-line-items.ts @@ -1,5 +1,5 @@ import { CreateOrderLineItemDTO } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface CreateOrderLineItemsStepInput { @@ -13,7 +13,7 @@ export const createOrderLineItemsStepId = "create-order-line-items-step" export const createOrderLineItemsStep = createStep( createOrderLineItemsStepId, async (input: CreateOrderLineItemsStepInput, { container }) => { - const orderModule = container.resolve(ModuleRegistrationName.ORDER) + const orderModule = container.resolve(Modules.ORDER) const createdItems = input.items.length ? await orderModule.createOrderLineItems(input.items) @@ -29,7 +29,7 @@ export const createOrderLineItemsStep = createStep( return } - const orderModule = container.resolve(ModuleRegistrationName.ORDER) + const orderModule = container.resolve(Modules.ORDER) await orderModule.deleteOrderLineItems(itemIds) } diff --git a/packages/core/core-flows/src/order/steps/create-order-change.ts b/packages/core/core-flows/src/order/steps/create-order-change.ts index 41f3829100..30411bfe16 100644 --- a/packages/core/core-flows/src/order/steps/create-order-change.ts +++ b/packages/core/core-flows/src/order/steps/create-order-change.ts @@ -1,5 +1,5 @@ import { CreateOrderChangeDTO, IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createOrderChangeStepId = "create-order-change" @@ -9,9 +9,7 @@ export const createOrderChangeStepId = "create-order-change" export const createOrderChangeStep = createStep( createOrderChangeStepId, async (data: CreateOrderChangeDTO, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const created = await service.createOrderChange(data) @@ -22,9 +20,7 @@ export const createOrderChangeStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.deleteOrderChanges(id) } diff --git a/packages/core/core-flows/src/order/steps/create-order-shipping-methods.ts b/packages/core/core-flows/src/order/steps/create-order-shipping-methods.ts index 500e1148b4..c1cf6fc059 100644 --- a/packages/core/core-flows/src/order/steps/create-order-shipping-methods.ts +++ b/packages/core/core-flows/src/order/steps/create-order-shipping-methods.ts @@ -2,7 +2,7 @@ import { CreateOrderShippingMethodDTO, IOrderModuleService, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface CreateOrderShippingMethodsStepInput { @@ -15,9 +15,7 @@ export interface CreateOrderShippingMethodsStepInput { export const createOrderShippingMethods = createStep( "create-order-shipping-methods", async (input: CreateOrderShippingMethodsStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const created = await service.createOrderShippingMethods( input.shipping_methods @@ -33,9 +31,7 @@ export const createOrderShippingMethods = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.deleteOrderShippingMethods(createdMethodIds) } diff --git a/packages/core/core-flows/src/order/steps/create-orders.ts b/packages/core/core-flows/src/order/steps/create-orders.ts index 5ffd6db0f9..2704b84cd6 100644 --- a/packages/core/core-flows/src/order/steps/create-orders.ts +++ b/packages/core/core-flows/src/order/steps/create-orders.ts @@ -1,5 +1,5 @@ import { CreateOrderDTO, IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createOrdersStepId = "create-orders" @@ -9,9 +9,7 @@ export const createOrdersStepId = "create-orders" export const createOrdersStep = createStep( createOrdersStepId, async (data: CreateOrderDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const created = await service.createOrders(data) return new StepResponse( @@ -24,9 +22,7 @@ export const createOrdersStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.deleteOrders(createdIds) } diff --git a/packages/core/core-flows/src/order/steps/decline-order-change.ts b/packages/core/core-flows/src/order/steps/decline-order-change.ts index b5452a1ec5..93b45a2444 100644 --- a/packages/core/core-flows/src/order/steps/decline-order-change.ts +++ b/packages/core/core-flows/src/order/steps/decline-order-change.ts @@ -4,7 +4,7 @@ import { UpdateOrderChangeDTO, } from "@medusajs/types" import { - ModuleRegistrationName, + Modules, deduplicate, getSelectsAndRelationsFromObjectArray, } from "@medusajs/utils" @@ -17,9 +17,7 @@ export const declineOrderChangeStepId = "decline-order-change" export const declineOrderChangeStep = createStep( declineOrderChangeStepId, async (data: DeclineOrderChangeDTO, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const { selects, relations } = getSelectsAndRelationsFromObjectArray( [data], @@ -50,9 +48,7 @@ export const declineOrderChangeStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.updateOrderChanges(rollbackData as UpdateOrderChangeDTO) } diff --git a/packages/core/core-flows/src/order/steps/delete-line-items.ts b/packages/core/core-flows/src/order/steps/delete-line-items.ts index bbda679959..181a961ad8 100644 --- a/packages/core/core-flows/src/order/steps/delete-line-items.ts +++ b/packages/core/core-flows/src/order/steps/delete-line-items.ts @@ -1,5 +1,5 @@ import { IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface DeleteOrderLineItemsStepInput { @@ -12,9 +12,7 @@ export interface DeleteOrderLineItemsStepInput { export const deleteOrderLineItems = createStep( "delete-order-line-items", async (input: DeleteOrderLineItemsStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const deleted = await service.softDeleteOrderLineItems(input.ids) @@ -25,9 +23,7 @@ export const deleteOrderLineItems = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.restoreOrderLineItems(ids) } diff --git a/packages/core/core-flows/src/order/steps/delete-order-change-actions.ts b/packages/core/core-flows/src/order/steps/delete-order-change-actions.ts index 4a0e8b46c1..8d7b78302d 100644 --- a/packages/core/core-flows/src/order/steps/delete-order-change-actions.ts +++ b/packages/core/core-flows/src/order/steps/delete-order-change-actions.ts @@ -1,5 +1,5 @@ import { IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteOrderChangeActionsStepId = "delete-order-change-actions" @@ -9,9 +9,7 @@ export const deleteOrderChangeActionsStepId = "delete-order-change-actions" export const deleteOrderChangeActionsStep = createStep( deleteOrderChangeActionsStepId, async (data: { ids: string[] }, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.softDeleteOrderChangeActions(data.ids) @@ -22,9 +20,7 @@ export const deleteOrderChangeActionsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.restoreOrderChangeActions(ids) } diff --git a/packages/core/core-flows/src/order/steps/delete-order-changes.ts b/packages/core/core-flows/src/order/steps/delete-order-changes.ts index 28d3cecdc7..fa38b8162e 100644 --- a/packages/core/core-flows/src/order/steps/delete-order-changes.ts +++ b/packages/core/core-flows/src/order/steps/delete-order-changes.ts @@ -1,5 +1,5 @@ import { IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { createStep, StepResponse } from "@medusajs/workflows-sdk" export const deleteOrderChangesStepId = "delete-order-change" @@ -9,9 +9,7 @@ export const deleteOrderChangesStepId = "delete-order-change" export const deleteOrderChangesStep = createStep( deleteOrderChangesStepId, async (data: { ids: string[] }, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const deleted = await service.softDeleteOrderChanges(data.ids) @@ -22,9 +20,7 @@ export const deleteOrderChangesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.restoreOrderChanges(ids) } diff --git a/packages/core/core-flows/src/order/steps/delete-order-shipping-methods.ts b/packages/core/core-flows/src/order/steps/delete-order-shipping-methods.ts index f00e0b01a1..443d226c9b 100644 --- a/packages/core/core-flows/src/order/steps/delete-order-shipping-methods.ts +++ b/packages/core/core-flows/src/order/steps/delete-order-shipping-methods.ts @@ -1,5 +1,5 @@ import { IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface DeleteOrderShippingMethodsStepInput { @@ -12,9 +12,7 @@ export interface DeleteOrderShippingMethodsStepInput { export const deleteOrderShippingMethods = createStep( "delete-order-shipping-methods", async (input: DeleteOrderShippingMethodsStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const deleted = await service.softDeleteOrderShippingMethods(input.ids) @@ -25,9 +23,7 @@ export const deleteOrderShippingMethods = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.restoreOrderShippingMethods(ids) } diff --git a/packages/core/core-flows/src/order/steps/exchange/cancel-exchange.ts b/packages/core/core-flows/src/order/steps/exchange/cancel-exchange.ts index b4e77e863e..78b1666ec7 100644 --- a/packages/core/core-flows/src/order/steps/exchange/cancel-exchange.ts +++ b/packages/core/core-flows/src/order/steps/exchange/cancel-exchange.ts @@ -1,5 +1,5 @@ import { CancelOrderExchangeDTO, IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const cancelOrderExchangeStepId = "cancel-order-swap" @@ -9,9 +9,7 @@ export const cancelOrderExchangeStepId = "cancel-order-swap" export const cancelOrderExchangeStep = createStep( cancelOrderExchangeStepId, async (data: CancelOrderExchangeDTO, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.cancelExchange(data) return new StepResponse(void 0, data.order_id) @@ -21,9 +19,7 @@ export const cancelOrderExchangeStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.revertLastVersion(orderId) } diff --git a/packages/core/core-flows/src/order/steps/exchange/create-exchange-items-from-actions.ts b/packages/core/core-flows/src/order/steps/exchange/create-exchange-items-from-actions.ts index 834f1d6882..dcf9402b39 100644 --- a/packages/core/core-flows/src/order/steps/exchange/create-exchange-items-from-actions.ts +++ b/packages/core/core-flows/src/order/steps/exchange/create-exchange-items-from-actions.ts @@ -3,7 +3,7 @@ import { IOrderModuleService, OrderChangeActionDTO, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type CreateOrderExchangeItemsFromActionsInput = { @@ -18,7 +18,7 @@ export const createOrderExchangeItemsFromActionsStep = createStep( "create-exchange-items-from-change-actions", async (input: CreateOrderExchangeItemsFromActionsInput, { container }) => { const orderModuleService = container.resolve( - ModuleRegistrationName.ORDER + Modules.ORDER ) const exchangeItems = input.changes.map((item) => { @@ -45,7 +45,7 @@ export const createOrderExchangeItemsFromActionsStep = createStep( } const orderModuleService = container.resolve( - ModuleRegistrationName.ORDER + Modules.ORDER ) await orderModuleService.deleteOrderExchangeItems(ids) diff --git a/packages/core/core-flows/src/order/steps/exchange/create-exchange.ts b/packages/core/core-flows/src/order/steps/exchange/create-exchange.ts index 4acbb3aa9b..36f4c371d9 100644 --- a/packages/core/core-flows/src/order/steps/exchange/create-exchange.ts +++ b/packages/core/core-flows/src/order/steps/exchange/create-exchange.ts @@ -1,5 +1,5 @@ import { CreateOrderExchangeDTO, IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createOrderExchangesStepId = "create-order-exchanges" @@ -9,9 +9,7 @@ export const createOrderExchangesStepId = "create-order-exchanges" export const createOrderExchangesStep = createStep( createOrderExchangesStepId, async (data: CreateOrderExchangeDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const orderExchanges = await service.createOrderExchanges(data) @@ -24,9 +22,7 @@ export const createOrderExchangesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.deleteOrderExchanges(exchangeIds) } diff --git a/packages/core/core-flows/src/order/steps/exchange/delete-exchanges.ts b/packages/core/core-flows/src/order/steps/exchange/delete-exchanges.ts index f1dd6dd34d..f0169b6c7a 100644 --- a/packages/core/core-flows/src/order/steps/exchange/delete-exchanges.ts +++ b/packages/core/core-flows/src/order/steps/exchange/delete-exchanges.ts @@ -1,5 +1,5 @@ import { IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { createStep, StepResponse } from "@medusajs/workflows-sdk" export const deleteExchangesStepId = "delete-exchanges" @@ -9,9 +9,7 @@ export const deleteExchangesStepId = "delete-exchanges" export const deleteExchangesStep = createStep( deleteExchangesStepId, async (data: { ids: string[] }, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const deleted = await service.softDeleteOrderExchanges(data.ids) @@ -22,9 +20,7 @@ export const deleteExchangesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.restoreOrderExchanges(ids) } diff --git a/packages/core/core-flows/src/order/steps/exchange/update-order-exchanges.ts b/packages/core/core-flows/src/order/steps/exchange/update-order-exchanges.ts index a6ade05348..b720dc8b45 100644 --- a/packages/core/core-flows/src/order/steps/exchange/update-order-exchanges.ts +++ b/packages/core/core-flows/src/order/steps/exchange/update-order-exchanges.ts @@ -1,8 +1,5 @@ import { IOrderModuleService, UpdateOrderExchangeDTO } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const updateOrderExchangesStepId = "update-order-exchange" @@ -12,9 +9,7 @@ export const updateOrderExchangesStepId = "update-order-exchange" export const updateOrderExchangesStep = createStep( updateOrderExchangesStepId, async (data: UpdateOrderExchangeDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const { selects, relations } = getSelectsAndRelationsFromObjectArray(data, { objectFields: ["metadata"], @@ -41,9 +36,7 @@ export const updateOrderExchangesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.updateOrderExchanges( dataBeforeUpdate.map((dt) => { diff --git a/packages/core/core-flows/src/order/steps/get-item-tax-lines.ts b/packages/core/core-flows/src/order/steps/get-item-tax-lines.ts index 600150d198..b2f68a0137 100644 --- a/packages/core/core-flows/src/order/steps/get-item-tax-lines.ts +++ b/packages/core/core-flows/src/order/steps/get-item-tax-lines.ts @@ -9,7 +9,7 @@ import { TaxableShippingDTO, TaxCalculationContext, } from "@medusajs/types" -import { MedusaError, ModuleRegistrationName } from "@medusajs/utils" +import { MedusaError, Modules } from "@medusajs/utils" import { createStep, StepResponse } from "@medusajs/workflows-sdk" export interface GetOrderItemTaxLinesStepInput { @@ -116,9 +116,7 @@ export const getOrderItemTaxLinesStep = createStep( is_return: isReturn = false, shipping_address: shippingAddress, } = data - const taxService = container.resolve( - ModuleRegistrationName.TAX - ) + const taxService = container.resolve(Modules.TAX) const taxContext = normalizeTaxModuleContext( order, diff --git a/packages/core/core-flows/src/order/steps/preview-order-change.ts b/packages/core/core-flows/src/order/steps/preview-order-change.ts index 6418f57a72..8f4cbd2495 100644 --- a/packages/core/core-flows/src/order/steps/preview-order-change.ts +++ b/packages/core/core-flows/src/order/steps/preview-order-change.ts @@ -1,5 +1,5 @@ import { IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const previewOrderChangeStepId = "preview-order-change" @@ -9,9 +9,7 @@ export const previewOrderChangeStepId = "preview-order-change" export const previewOrderChangeStep = createStep( previewOrderChangeStepId, async (orderId: string, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const preview = await service.previewOrderChange(orderId) diff --git a/packages/core/core-flows/src/order/steps/register-fulfillment.ts b/packages/core/core-flows/src/order/steps/register-fulfillment.ts index bcca0e05ed..d4799b626f 100644 --- a/packages/core/core-flows/src/order/steps/register-fulfillment.ts +++ b/packages/core/core-flows/src/order/steps/register-fulfillment.ts @@ -2,7 +2,7 @@ import { IOrderModuleService, RegisterOrderFulfillmentDTO, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const registerOrderFulfillmentStepId = "register-order-fullfillment" @@ -12,9 +12,7 @@ export const registerOrderFulfillmentStepId = "register-order-fullfillment" export const registerOrderFulfillmentStep = createStep( registerOrderFulfillmentStepId, async (data: RegisterOrderFulfillmentDTO, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.registerFulfillment(data) return new StepResponse(void 0, data.order_id) @@ -24,9 +22,7 @@ export const registerOrderFulfillmentStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.revertLastVersion(orderId) } diff --git a/packages/core/core-flows/src/order/steps/register-shipment.ts b/packages/core/core-flows/src/order/steps/register-shipment.ts index 1b9b275438..671e42370d 100644 --- a/packages/core/core-flows/src/order/steps/register-shipment.ts +++ b/packages/core/core-flows/src/order/steps/register-shipment.ts @@ -1,5 +1,5 @@ import { IOrderModuleService, RegisterOrderShipmentDTO } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const registerOrderShipmentStepId = "register-order-shipment" @@ -9,9 +9,7 @@ export const registerOrderShipmentStepId = "register-order-shipment" export const registerOrderShipmentStep = createStep( registerOrderShipmentStepId, async (data: RegisterOrderShipmentDTO, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.registerShipment(data) return new StepResponse(void 0, data.order_id) @@ -21,9 +19,7 @@ export const registerOrderShipmentStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.revertLastVersion(orderId) } diff --git a/packages/core/core-flows/src/order/steps/return/cancel-return.ts b/packages/core/core-flows/src/order/steps/return/cancel-return.ts index 62b1388ca7..a1c1ee4fe7 100644 --- a/packages/core/core-flows/src/order/steps/return/cancel-return.ts +++ b/packages/core/core-flows/src/order/steps/return/cancel-return.ts @@ -1,5 +1,5 @@ import { CancelOrderReturnDTO, IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const cancelOrderReturnStepId = "cancel-order-return" @@ -9,9 +9,7 @@ export const cancelOrderReturnStepId = "cancel-order-return" export const cancelOrderReturnStep = createStep( cancelOrderReturnStepId, async (data: CancelOrderReturnDTO, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.cancelReturn(data) return new StepResponse(void 0, data.order_id) @@ -21,9 +19,7 @@ export const cancelOrderReturnStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.revertLastVersion(orderId) } diff --git a/packages/core/core-flows/src/order/steps/return/create-complete-return.ts b/packages/core/core-flows/src/order/steps/return/create-complete-return.ts index 54b9b48433..4a861355fa 100644 --- a/packages/core/core-flows/src/order/steps/return/create-complete-return.ts +++ b/packages/core/core-flows/src/order/steps/return/create-complete-return.ts @@ -1,5 +1,5 @@ import { CreateOrderReturnDTO, IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createCompleteReturnStepId = "create-complete-return" @@ -9,9 +9,7 @@ export const createCompleteReturnStepId = "create-complete-return" export const createCompleteReturnStep = createStep( createCompleteReturnStepId, async (data: CreateOrderReturnDTO, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const orderReturn = await service.createReturn(data) return new StepResponse(orderReturn, data.order_id) @@ -21,9 +19,7 @@ export const createCompleteReturnStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.revertLastVersion(orderId) } diff --git a/packages/core/core-flows/src/order/steps/return/create-return-items-from-actions.ts b/packages/core/core-flows/src/order/steps/return/create-return-items-from-actions.ts index e7c173191e..cf400c7f5a 100644 --- a/packages/core/core-flows/src/order/steps/return/create-return-items-from-actions.ts +++ b/packages/core/core-flows/src/order/steps/return/create-return-items-from-actions.ts @@ -3,7 +3,7 @@ import { IOrderModuleService, OrderChangeActionDTO, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type CreateReturnItemsFromActionsInput = { @@ -18,7 +18,7 @@ export const createReturnItemsFromActionsStep = createStep( "create-return-items-from-change-actions", async (input: CreateReturnItemsFromActionsInput, { container }) => { const orderModuleService = container.resolve( - ModuleRegistrationName.ORDER + Modules.ORDER ) const returnItems = input.changes.map((item) => { @@ -47,7 +47,7 @@ export const createReturnItemsFromActionsStep = createStep( } const orderModuleService = container.resolve( - ModuleRegistrationName.ORDER + Modules.ORDER ) await orderModuleService.deleteReturnItems(ids) diff --git a/packages/core/core-flows/src/order/steps/return/create-returns.ts b/packages/core/core-flows/src/order/steps/return/create-returns.ts index b7e6a6c8f7..6975b52557 100644 --- a/packages/core/core-flows/src/order/steps/return/create-returns.ts +++ b/packages/core/core-flows/src/order/steps/return/create-returns.ts @@ -1,5 +1,5 @@ import { CreateOrderReturnDTO, IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createReturnsStepId = "create-returns" @@ -9,9 +9,7 @@ export const createReturnsStepId = "create-returns" export const createReturnsStep = createStep( createReturnsStepId, async (data: CreateOrderReturnDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const orderReturns = await service.createReturns(data) @@ -24,9 +22,7 @@ export const createReturnsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.deleteReturns(returnIds) } diff --git a/packages/core/core-flows/src/order/steps/return/delete-returns.ts b/packages/core/core-flows/src/order/steps/return/delete-returns.ts index 39e1fce821..f011ce0559 100644 --- a/packages/core/core-flows/src/order/steps/return/delete-returns.ts +++ b/packages/core/core-flows/src/order/steps/return/delete-returns.ts @@ -1,5 +1,5 @@ import { IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { createStep, StepResponse } from "@medusajs/workflows-sdk" export const deleteReturnsStepId = "delete-return" @@ -9,9 +9,7 @@ export const deleteReturnsStepId = "delete-return" export const deleteReturnsStep = createStep( deleteReturnsStepId, async (data: { ids: string[] }, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const ids = data.ids.filter(Boolean) @@ -24,9 +22,7 @@ export const deleteReturnsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.restoreReturns(ids) } diff --git a/packages/core/core-flows/src/order/steps/return/receive-return.ts b/packages/core/core-flows/src/order/steps/return/receive-return.ts index ff3040aa9f..da3ff03dd0 100644 --- a/packages/core/core-flows/src/order/steps/return/receive-return.ts +++ b/packages/core/core-flows/src/order/steps/return/receive-return.ts @@ -1,5 +1,5 @@ import { IOrderModuleService, ReceiveOrderReturnDTO } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const receiveReturnStepId = "receive-return" @@ -9,9 +9,7 @@ export const receiveReturnStepId = "receive-return" export const receiveReturnStep = createStep( receiveReturnStepId, async (data: ReceiveOrderReturnDTO, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) if (!data.items?.length) { return new StepResponse(void 0) @@ -25,9 +23,7 @@ export const receiveReturnStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.revertLastVersion(orderId) } diff --git a/packages/core/core-flows/src/order/steps/return/update-return-items.ts b/packages/core/core-flows/src/order/steps/return/update-return-items.ts index ea50bae935..aa9dba13eb 100644 --- a/packages/core/core-flows/src/order/steps/return/update-return-items.ts +++ b/packages/core/core-flows/src/order/steps/return/update-return-items.ts @@ -1,7 +1,4 @@ -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface UpdateReturnItemBySelector { @@ -16,7 +13,7 @@ export const updateReturnItemsStepId = "update-return-items" export const updateReturnItemsStep = createStep( updateReturnItemsStepId, async (data: UpdateReturnItemBySelector[], { container }) => { - const service = container.resolve(ModuleRegistrationName.ORDER) as any + const service = container.resolve(Modules.ORDER) as any const { selects, relations } = getSelectsAndRelationsFromObjectArray(data, { objectFields: ["metadata"], @@ -35,7 +32,7 @@ export const updateReturnItemsStep = createStep( return } - const service = container.resolve(ModuleRegistrationName.ORDER) as any + const service = container.resolve(Modules.ORDER) as any await service.updateReturnItems(dataBeforeUpdate) } diff --git a/packages/core/core-flows/src/order/steps/return/update-returns.ts b/packages/core/core-flows/src/order/steps/return/update-returns.ts index efe896d221..b374e535b2 100644 --- a/packages/core/core-flows/src/order/steps/return/update-returns.ts +++ b/packages/core/core-flows/src/order/steps/return/update-returns.ts @@ -1,8 +1,5 @@ import { UpdateReturnDTO } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const updateReturnsStepId = "update-returns" @@ -12,7 +9,7 @@ export const updateReturnsStepId = "update-returns" export const updateReturnsStep = createStep( updateReturnsStepId, async (data: UpdateReturnDTO[], { container }) => { - const service = container.resolve(ModuleRegistrationName.ORDER) as any + const service = container.resolve(Modules.ORDER) as any const { selects, relations } = getSelectsAndRelationsFromObjectArray(data, { objectFields: ["metadata"], @@ -31,7 +28,7 @@ export const updateReturnsStep = createStep( return } - const service = container.resolve(ModuleRegistrationName.ORDER) as any + const service = container.resolve(Modules.ORDER) as any await service.updateReturns(dataBeforeUpdate) } diff --git a/packages/core/core-flows/src/order/steps/set-tax-lines-for-items.ts b/packages/core/core-flows/src/order/steps/set-tax-lines-for-items.ts index f6b2a319f3..473a6e7704 100644 --- a/packages/core/core-flows/src/order/steps/set-tax-lines-for-items.ts +++ b/packages/core/core-flows/src/order/steps/set-tax-lines-for-items.ts @@ -6,7 +6,7 @@ import { OrderDTO, ShippingTaxLineDTO, } from "@medusajs/types" -import { ModuleRegistrationName, promiseAll } from "@medusajs/utils" +import { Modules, promiseAll } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface SetOrderTaxLinesForItemsStepInput { @@ -23,9 +23,7 @@ export const setOrderTaxLinesForItemsStep = createStep( setOrderTaxLinesForItemsStepId, async (data: SetOrderTaxLinesForItemsStepInput, { container }) => { const { order, item_tax_lines, shipping_tax_lines } = data - const orderService = container.resolve( - ModuleRegistrationName.ORDER - ) + const orderService = container.resolve(Modules.ORDER) const getShippingTaxLinesPromise = await orderService.listOrderShippingMethodTaxLines({ @@ -74,9 +72,7 @@ export const setOrderTaxLinesForItemsStep = createStep( const { order, existingLineItemTaxLines, existingShippingMethodTaxLines } = revertData - const orderService = container.resolve( - ModuleRegistrationName.ORDER - ) + const orderService = container.resolve(Modules.ORDER) if (existingLineItemTaxLines) { await orderService.setOrderLineItemTaxLines( diff --git a/packages/core/core-flows/src/order/steps/update-order-change-actions.ts b/packages/core/core-flows/src/order/steps/update-order-change-actions.ts index a615a6c7c9..90054c2cd3 100644 --- a/packages/core/core-flows/src/order/steps/update-order-change-actions.ts +++ b/packages/core/core-flows/src/order/steps/update-order-change-actions.ts @@ -3,7 +3,7 @@ import { UpdateOrderChangeActionDTO, } from "@medusajs/types" import { - ModuleRegistrationName, + Modules, deduplicate, getSelectsAndRelationsFromObjectArray, } from "@medusajs/utils" @@ -16,9 +16,7 @@ export const updateOrderChangeActionsStepId = "update-order-change-actions" export const updateOrderChangeActionsStep = createStep( updateOrderChangeActionsStepId, async (data: UpdateOrderChangeActionDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const { selects, relations } = getSelectsAndRelationsFromObjectArray(data, { objectFields: ["metadata", "details"], @@ -46,9 +44,7 @@ export const updateOrderChangeActionsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.updateOrderChangeActions(dataBeforeUpdate) } diff --git a/packages/core/core-flows/src/order/steps/update-order-changes.ts b/packages/core/core-flows/src/order/steps/update-order-changes.ts index 5bb7f507ba..a5cefa5da6 100644 --- a/packages/core/core-flows/src/order/steps/update-order-changes.ts +++ b/packages/core/core-flows/src/order/steps/update-order-changes.ts @@ -1,8 +1,5 @@ import { IOrderModuleService, UpdateOrderChangeDTO } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const updateOrderChangesStepId = "update-order-shopping-methods" @@ -12,9 +9,7 @@ export const updateOrderChangesStepId = "update-order-shopping-methods" export const updateOrderChangesStep = createStep( updateOrderChangesStepId, async (data: UpdateOrderChangeDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const { selects, relations } = getSelectsAndRelationsFromObjectArray(data, { objectFields: ["metadata"], @@ -34,9 +29,7 @@ export const updateOrderChangesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.updateOrderChanges(dataBeforeUpdate as UpdateOrderChangeDTO[]) } diff --git a/packages/core/core-flows/src/order/steps/update-order-exchanges.ts b/packages/core/core-flows/src/order/steps/update-order-exchanges.ts index d684ab32e2..21b2994b61 100644 --- a/packages/core/core-flows/src/order/steps/update-order-exchanges.ts +++ b/packages/core/core-flows/src/order/steps/update-order-exchanges.ts @@ -1,8 +1,5 @@ import { IOrderModuleService, UpdateOrderExchangeDTO } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const updateOrderExchangesStepId = "update-order-exchange" @@ -12,9 +9,7 @@ export const updateOrderExchangesStepId = "update-order-exchange" export const updateOrderExchangesStep = createStep( updateOrderExchangesStepId, async (data: UpdateOrderExchangeDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const { selects, relations } = getSelectsAndRelationsFromObjectArray(data, { objectFields: ["metadata"], @@ -41,9 +36,7 @@ export const updateOrderExchangesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.updateOrderExchanges( dataBeforeUpdate.map((dt) => { diff --git a/packages/core/core-flows/src/order/steps/update-shipping-methods.ts b/packages/core/core-flows/src/order/steps/update-shipping-methods.ts index 9b06e58166..b89eb930b6 100644 --- a/packages/core/core-flows/src/order/steps/update-shipping-methods.ts +++ b/packages/core/core-flows/src/order/steps/update-shipping-methods.ts @@ -2,10 +2,7 @@ import { IOrderModuleService, UpdateOrderShippingMethodDTO, } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const updateOrderShippingMethodsStepId = "update-order-shopping-methods" @@ -15,9 +12,7 @@ export const updateOrderShippingMethodsStepId = "update-order-shopping-methods" export const updateOrderShippingMethodsStep = createStep( updateOrderShippingMethodsStepId, async (data: UpdateOrderShippingMethodDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const { selects, relations } = getSelectsAndRelationsFromObjectArray(data, { objectFields: ["metadata"], @@ -36,9 +31,7 @@ export const updateOrderShippingMethodsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.updateOrderShippingMethods(dataBeforeUpdate) } diff --git a/packages/core/core-flows/src/order/workflows/create-order-change-actions.ts b/packages/core/core-flows/src/order/workflows/create-order-change-actions.ts index 7e9516cb2c..60fb591c8f 100644 --- a/packages/core/core-flows/src/order/workflows/create-order-change-actions.ts +++ b/packages/core/core-flows/src/order/workflows/create-order-change-actions.ts @@ -2,7 +2,7 @@ import { CreateOrderChangeActionDTO, OrderChangeActionDTO, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { WorkflowData, WorkflowResponse, @@ -20,7 +20,7 @@ export const createOrderChangeActionsWorkflow = createWorkflow( input: WorkflowData ): WorkflowResponse => { const orderChangeActions = createEntitiesStep({ - moduleRegistrationName: ModuleRegistrationName.ORDER, + moduleRegistrationName: Modules.ORDER, invokeMethod: "addOrderAction", compensateMethod: "deleteOrderChangeActions", data: input, diff --git a/packages/core/core-flows/src/payment-collection/steps/create-payment-session.ts b/packages/core/core-flows/src/payment-collection/steps/create-payment-session.ts index 60f7c0fd4e..9cb52a2f3e 100644 --- a/packages/core/core-flows/src/payment-collection/steps/create-payment-session.ts +++ b/packages/core/core-flows/src/payment-collection/steps/create-payment-session.ts @@ -3,7 +3,7 @@ import { IPaymentModuleService, PaymentProviderContext, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface CreatePaymentSessionStepInput { @@ -22,9 +22,7 @@ export const createPaymentSessionStepId = "create-payment-session" export const createPaymentSessionStep = createStep( createPaymentSessionStepId, async (input: CreatePaymentSessionStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.PAYMENT - ) + const service = container.resolve(Modules.PAYMENT) const session = await service.createPaymentSession( input.payment_collection_id, @@ -44,9 +42,7 @@ export const createPaymentSessionStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PAYMENT - ) + const service = container.resolve(Modules.PAYMENT) await service.deletePaymentSession(createdSession) } diff --git a/packages/core/core-flows/src/payment-collection/steps/create-refund-reasons.ts b/packages/core/core-flows/src/payment-collection/steps/create-refund-reasons.ts index 9b76e8172b..e75b1fb1b5 100644 --- a/packages/core/core-flows/src/payment-collection/steps/create-refund-reasons.ts +++ b/packages/core/core-flows/src/payment-collection/steps/create-refund-reasons.ts @@ -1,5 +1,5 @@ import { CreateRefundReasonDTO, IPaymentModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createRefundReasonStepId = "create-refund-reason" @@ -9,9 +9,7 @@ export const createRefundReasonStepId = "create-refund-reason" export const createRefundReasonStep = createStep( createRefundReasonStepId, async (data: CreateRefundReasonDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.PAYMENT - ) + const service = container.resolve(Modules.PAYMENT) const refundReasons = await service.createRefundReasons(data) @@ -25,9 +23,7 @@ export const createRefundReasonStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PAYMENT - ) + const service = container.resolve(Modules.PAYMENT) await service.deleteRefundReasons(ids) } diff --git a/packages/core/core-flows/src/payment-collection/steps/delete-payment-sessions.ts b/packages/core/core-flows/src/payment-collection/steps/delete-payment-sessions.ts index 4ffcb00366..be6e30c683 100644 --- a/packages/core/core-flows/src/payment-collection/steps/delete-payment-sessions.ts +++ b/packages/core/core-flows/src/payment-collection/steps/delete-payment-sessions.ts @@ -3,10 +3,7 @@ import { Logger, PaymentSessionDTO, } from "@medusajs/types" -import { - ContainerRegistrationKeys, - ModuleRegistrationName, -} from "@medusajs/utils" +import { ContainerRegistrationKeys, Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface DeletePaymentSessionStepInput { @@ -16,7 +13,7 @@ export interface DeletePaymentSessionStepInput { export const deletePaymentSessionsStepId = "delete-payment-sessions" /** * This step deletes one or more payment sessions. - * + * * Note: This step should not be used alone as it doesn't consider a revert * Use deletePaymentSessionsWorkflow instead that uses this step */ @@ -26,9 +23,7 @@ export const deletePaymentSessionsStep = createStep( const { ids = [] } = input const deleted: PaymentSessionDTO[] = [] const logger = container.resolve(ContainerRegistrationKeys.LOGGER) - const service = container.resolve( - ModuleRegistrationName.PAYMENT - ) + const service = container.resolve(Modules.PAYMENT) if (!ids?.length) { return new StepResponse([], null) @@ -67,9 +62,7 @@ export const deletePaymentSessionsStep = createStep( }, async (deletedPaymentSessions, { container }) => { const logger = container.resolve(ContainerRegistrationKeys.LOGGER) - const service = container.resolve( - ModuleRegistrationName.PAYMENT - ) + const service = container.resolve(Modules.PAYMENT) if (!deletedPaymentSessions?.length) { return diff --git a/packages/core/core-flows/src/payment-collection/steps/delete-refund-reasons.ts b/packages/core/core-flows/src/payment-collection/steps/delete-refund-reasons.ts index 281b10aa05..312e19102d 100644 --- a/packages/core/core-flows/src/payment-collection/steps/delete-refund-reasons.ts +++ b/packages/core/core-flows/src/payment-collection/steps/delete-refund-reasons.ts @@ -1,5 +1,5 @@ import { IPaymentModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { createStep, StepResponse } from "@medusajs/workflows-sdk" export const deleteRefundReasonsStepId = "delete-refund-reasons" @@ -9,9 +9,7 @@ export const deleteRefundReasonsStepId = "delete-refund-reasons" export const deleteRefundReasonsStep = createStep( deleteRefundReasonsStepId, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.PAYMENT - ) + const service = container.resolve(Modules.PAYMENT) await service.softDeleteRefundReasons(ids) @@ -22,9 +20,7 @@ export const deleteRefundReasonsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PAYMENT - ) + const service = container.resolve(Modules.PAYMENT) await service.restoreRefundReasons(prevCustomerIds) } diff --git a/packages/core/core-flows/src/payment-collection/steps/update-payment-collection.ts b/packages/core/core-flows/src/payment-collection/steps/update-payment-collection.ts index 04e1c18142..f447d7cdc2 100644 --- a/packages/core/core-flows/src/payment-collection/steps/update-payment-collection.ts +++ b/packages/core/core-flows/src/payment-collection/steps/update-payment-collection.ts @@ -4,7 +4,7 @@ import { PaymentCollectionUpdatableFields, } from "@medusajs/types" import { - ModuleRegistrationName, + Modules, getSelectsAndRelationsFromObjectArray, isPresent, } from "@medusajs/utils" @@ -27,7 +27,7 @@ export const updatePaymentCollectionStep = createStep( } const paymentModuleService = container.resolve( - ModuleRegistrationName.PAYMENT + Modules.PAYMENT ) const { selects, relations } = getSelectsAndRelationsFromObjectArray([ @@ -54,7 +54,7 @@ export const updatePaymentCollectionStep = createStep( return } const paymentModuleService = container.resolve( - ModuleRegistrationName.PAYMENT + Modules.PAYMENT ) await paymentModuleService.upsertPaymentCollections( diff --git a/packages/core/core-flows/src/payment-collection/steps/update-refund-reasons.ts b/packages/core/core-flows/src/payment-collection/steps/update-refund-reasons.ts index ef15548e00..baf1ccfd89 100644 --- a/packages/core/core-flows/src/payment-collection/steps/update-refund-reasons.ts +++ b/packages/core/core-flows/src/payment-collection/steps/update-refund-reasons.ts @@ -1,6 +1,6 @@ import { IPaymentModuleService, UpdateRefundReasonDTO } from "@medusajs/types" import { - ModuleRegistrationName, + Modules, getSelectsAndRelationsFromObjectArray, promiseAll, } from "@medusajs/utils" @@ -15,9 +15,7 @@ export const updateRefundReasonsStep = createStep( async (data: UpdateRefundReasonDTO[], { container }) => { const ids = data.map((d) => d.id) const { selects, relations } = getSelectsAndRelationsFromObjectArray(data) - const service = container.resolve( - ModuleRegistrationName.PAYMENT - ) + const service = container.resolve(Modules.PAYMENT) const prevRefundReasons = await service.listRefundReasons( { id: ids }, @@ -33,9 +31,7 @@ export const updateRefundReasonsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PAYMENT - ) + const service = container.resolve(Modules.PAYMENT) await promiseAll( previousData.map((refundReason) => diff --git a/packages/core/core-flows/src/payment/steps/authorize-payment-session.ts b/packages/core/core-flows/src/payment/steps/authorize-payment-session.ts index 330c9c52fa..2787372194 100644 --- a/packages/core/core-flows/src/payment/steps/authorize-payment-session.ts +++ b/packages/core/core-flows/src/payment/steps/authorize-payment-session.ts @@ -2,7 +2,7 @@ import { IPaymentModuleService, Logger, PaymentDTO } from "@medusajs/types" import { ContainerRegistrationKeys, MedusaError, - ModuleRegistrationName, + Modules, PaymentSessionStatus, } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" @@ -22,7 +22,7 @@ export const authorizePaymentSessionStep = createStep( let payment: PaymentDTO | undefined const logger = container.resolve(ContainerRegistrationKeys.LOGGER) const paymentModule = container.resolve( - ModuleRegistrationName.PAYMENT + Modules.PAYMENT ) try { @@ -66,7 +66,7 @@ export const authorizePaymentSessionStep = createStep( const logger = container.resolve(ContainerRegistrationKeys.LOGGER) const paymentModule = container.resolve( - ModuleRegistrationName.PAYMENT + Modules.PAYMENT ) // If the payment session status is requires_more, we don't have to revert the payment. diff --git a/packages/core/core-flows/src/payment/steps/cancel-payment.ts b/packages/core/core-flows/src/payment/steps/cancel-payment.ts index 977f84cac2..0523057a37 100644 --- a/packages/core/core-flows/src/payment/steps/cancel-payment.ts +++ b/packages/core/core-flows/src/payment/steps/cancel-payment.ts @@ -1,9 +1,5 @@ import { IPaymentModuleService, Logger } from "@medusajs/types" -import { - ContainerRegistrationKeys, - ModuleRegistrationName, - promiseAll, -} from "@medusajs/utils" +import { ContainerRegistrationKeys, Modules, promiseAll } from "@medusajs/utils" import { createStep } from "@medusajs/workflows-sdk" export type CancelPaymentStepInput = { @@ -19,7 +15,7 @@ export const cancelPaymentStep = createStep( async (input: CancelPaymentStepInput, { container }) => { const logger = container.resolve(ContainerRegistrationKeys.LOGGER) const paymentModule = container.resolve( - ModuleRegistrationName.PAYMENT + Modules.PAYMENT ) const paymentIds = Array.isArray(input.paymentIds) diff --git a/packages/core/core-flows/src/payment/steps/capture-payment.ts b/packages/core/core-flows/src/payment/steps/capture-payment.ts index c93c46e957..0a6e139e12 100644 --- a/packages/core/core-flows/src/payment/steps/capture-payment.ts +++ b/packages/core/core-flows/src/payment/steps/capture-payment.ts @@ -1,5 +1,5 @@ import { BigNumberInput, IPaymentModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type CapturePaymentStepInput = { @@ -16,7 +16,7 @@ export const capturePaymentStep = createStep( capturePaymentStepId, async (input: CapturePaymentStepInput, { container }) => { const paymentModule = container.resolve( - ModuleRegistrationName.PAYMENT + Modules.PAYMENT ) const payment = await paymentModule.capturePayment(input) diff --git a/packages/core/core-flows/src/payment/steps/refund-payment.ts b/packages/core/core-flows/src/payment/steps/refund-payment.ts index 989d218731..8521d5fa11 100644 --- a/packages/core/core-flows/src/payment/steps/refund-payment.ts +++ b/packages/core/core-flows/src/payment/steps/refund-payment.ts @@ -1,5 +1,5 @@ import { BigNumberInput, IPaymentModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type RefundPaymentStepInput = { @@ -16,7 +16,7 @@ export const refundPaymentStep = createStep( refundPaymentStepId, async (input: RefundPaymentStepInput, { container }) => { const paymentModule = container.resolve( - ModuleRegistrationName.PAYMENT + Modules.PAYMENT ) const payment = await paymentModule.refundPayment(input) diff --git a/packages/core/core-flows/src/price-list/steps/create-price-list-prices.ts b/packages/core/core-flows/src/price-list/steps/create-price-list-prices.ts index 9796208e06..043c942813 100644 --- a/packages/core/core-flows/src/price-list/steps/create-price-list-prices.ts +++ b/packages/core/core-flows/src/price-list/steps/create-price-list-prices.ts @@ -5,7 +5,7 @@ import { CreatePriceListPricesWorkflowStepDTO, IPricingModuleService, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createPriceListPricesStepId = "create-price-list-prices" @@ -18,7 +18,7 @@ export const createPriceListPricesStep = createStep( const { data, variant_price_map: variantPriceSetMap } = stepInput const priceListPricesToCreate: AddPriceListPricesDTO[] = [] const pricingModule = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) for (const createPriceListPricesData of data) { @@ -57,7 +57,7 @@ export const createPriceListPricesStep = createStep( } const pricingModule = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) if (createdIds.length) { diff --git a/packages/core/core-flows/src/price-list/steps/create-price-lists.ts b/packages/core/core-flows/src/price-list/steps/create-price-lists.ts index 462017faaf..e97560fe06 100644 --- a/packages/core/core-flows/src/price-list/steps/create-price-lists.ts +++ b/packages/core/core-flows/src/price-list/steps/create-price-lists.ts @@ -3,7 +3,7 @@ import { CreatePriceListsWorkflowStepDTO, IPricingModuleService, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createPriceListsStepId = "create-price-lists" @@ -16,7 +16,7 @@ export const createPriceListsStep = createStep( const { data, variant_price_map: variantPriceMap } = stepInput const pricingModule = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) const createData = data.map((priceListDTO) => { @@ -48,7 +48,7 @@ export const createPriceListsStep = createStep( } const pricingModule = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) await pricingModule.deletePriceLists(createdPriceListIds) diff --git a/packages/core/core-flows/src/price-list/steps/delete-price-lists.ts b/packages/core/core-flows/src/price-list/steps/delete-price-lists.ts index 50ff54cda9..cee0bf0226 100644 --- a/packages/core/core-flows/src/price-list/steps/delete-price-lists.ts +++ b/packages/core/core-flows/src/price-list/steps/delete-price-lists.ts @@ -1,5 +1,5 @@ import { IPricingModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deletePriceListsStepId = "delete-price-lists" @@ -10,7 +10,7 @@ export const deletePriceListsStep = createStep( deletePriceListsStepId, async (ids: string[], { container }) => { const pricingModule = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) await pricingModule.softDeletePriceLists(ids) @@ -23,7 +23,7 @@ export const deletePriceListsStep = createStep( } const pricingModule = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) await pricingModule.restorePriceLists(idsToRestore) diff --git a/packages/core/core-flows/src/price-list/steps/get-existing-price-lists-price-ids.ts b/packages/core/core-flows/src/price-list/steps/get-existing-price-lists-price-ids.ts index b9ac8a9088..ae632ba956 100644 --- a/packages/core/core-flows/src/price-list/steps/get-existing-price-lists-price-ids.ts +++ b/packages/core/core-flows/src/price-list/steps/get-existing-price-lists-price-ids.ts @@ -1,5 +1,5 @@ import { IPricingModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const getExistingPriceListsPriceIdsStepId = @@ -13,7 +13,7 @@ export const getExistingPriceListsPriceIdsStep = createStep( const { price_list_ids: priceListIds = [] } = data const priceListPriceIdsMap: Record = {} const pricingModule = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) const existingPrices = priceListIds.length diff --git a/packages/core/core-flows/src/price-list/steps/remove-price-list-prices.ts b/packages/core/core-flows/src/price-list/steps/remove-price-list-prices.ts index 2eb36880f4..d6453d8776 100644 --- a/packages/core/core-flows/src/price-list/steps/remove-price-list-prices.ts +++ b/packages/core/core-flows/src/price-list/steps/remove-price-list-prices.ts @@ -1,5 +1,5 @@ import { IPricingModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const removePriceListPricesStepId = "remove-price-list-prices" @@ -14,7 +14,7 @@ export const removePriceListPricesStep = createStep( } const pricingModule = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) const prices = await pricingModule.listPrices( @@ -34,7 +34,7 @@ export const removePriceListPricesStep = createStep( } const pricingModule = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) await pricingModule.restorePrices(ids) diff --git a/packages/core/core-flows/src/price-list/steps/update-price-list-prices.ts b/packages/core/core-flows/src/price-list/steps/update-price-list-prices.ts index c75b19b7d7..06a85fc5f6 100644 --- a/packages/core/core-flows/src/price-list/steps/update-price-list-prices.ts +++ b/packages/core/core-flows/src/price-list/steps/update-price-list-prices.ts @@ -6,10 +6,7 @@ import { UpdatePriceListPriceWorkflowDTO, UpdatePriceListPriceWorkflowStepDTO, } from "@medusajs/types" -import { - buildPriceSetPricesForModule, - ModuleRegistrationName, -} from "@medusajs/utils" +import { buildPriceSetPricesForModule, Modules } from "@medusajs/utils" import { createStep, StepResponse } from "@medusajs/workflows-sdk" export const updatePriceListPricesStepId = "update-price-list-prices" @@ -23,7 +20,7 @@ export const updatePriceListPricesStep = createStep( const priceListPricesToUpdate: UpdatePriceListPricesDTO[] = [] const priceIds: string[] = [] const pricingModule = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) for (const priceListData of data) { @@ -86,7 +83,7 @@ export const updatePriceListPricesStep = createStep( } const pricingModule = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) if (dataBeforePriceUpdate.length) { diff --git a/packages/core/core-flows/src/price-list/steps/update-price-lists.ts b/packages/core/core-flows/src/price-list/steps/update-price-lists.ts index 94c3b0cb1d..d1939c6411 100644 --- a/packages/core/core-flows/src/price-list/steps/update-price-lists.ts +++ b/packages/core/core-flows/src/price-list/steps/update-price-lists.ts @@ -4,7 +4,7 @@ import { UpdatePriceListWorkflowInputDTO, } from "@medusajs/types" import { - ModuleRegistrationName, + Modules, buildPriceListRules, convertItemResponseToUpdateRequest, getSelectsAndRelationsFromObjectArray, @@ -19,7 +19,7 @@ export const updatePriceListsStep = createStep( updatePriceListsStepId, async (data: UpdatePriceListDTO[], { container }) => { const pricingModule = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) const { dataBeforeUpdate, selects, relations } = await getDataBeforeUpdate( @@ -42,7 +42,7 @@ export const updatePriceListsStep = createStep( const { dataBeforeUpdate, selects, relations } = revertInput const pricingModule = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) await pricingModule.updatePriceLists( diff --git a/packages/core/core-flows/src/price-list/steps/validate-price-lists.ts b/packages/core/core-flows/src/price-list/steps/validate-price-lists.ts index e13a3cf93a..46614cb61c 100644 --- a/packages/core/core-flows/src/price-list/steps/validate-price-lists.ts +++ b/packages/core/core-flows/src/price-list/steps/validate-price-lists.ts @@ -3,11 +3,7 @@ import { PriceListDTO, UpdatePriceListDTO, } from "@medusajs/types" -import { - MedusaError, - ModuleRegistrationName, - arrayDifference, -} from "@medusajs/utils" +import { MedusaError, Modules, arrayDifference } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const validatePriceListsStepId = "validate-price-lists" @@ -18,7 +14,7 @@ export const validatePriceListsStep = createStep( validatePriceListsStepId, async (data: Pick[], { container }) => { const pricingModule = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) const priceListIds = data.map((d) => d.id) diff --git a/packages/core/core-flows/src/pricing/steps/create-price-preferences.ts b/packages/core/core-flows/src/pricing/steps/create-price-preferences.ts index 806d32e61f..30f7f13459 100644 --- a/packages/core/core-flows/src/pricing/steps/create-price-preferences.ts +++ b/packages/core/core-flows/src/pricing/steps/create-price-preferences.ts @@ -1,6 +1,6 @@ import { IPricingModuleService } from "@medusajs/types" import { PricingWorkflow } from "@medusajs/types/dist/workflow" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createPricePreferencesStepId = "create-price-preferences" @@ -9,9 +9,12 @@ export const createPricePreferencesStepId = "create-price-preferences" */ export const createPricePreferencesStep = createStep( createPricePreferencesStepId, - async (data: PricingWorkflow.CreatePricePreferencesWorkflowInput[], { container }) => { + async ( + data: PricingWorkflow.CreatePricePreferencesWorkflowInput[], + { container } + ) => { const pricingModule = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) const pricePreferences = await pricingModule.createPricePreferences(data) @@ -27,7 +30,7 @@ export const createPricePreferencesStep = createStep( } const pricingModule = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) await pricingModule.deletePricePreferences(pricePreferences) diff --git a/packages/core/core-flows/src/pricing/steps/create-price-sets.ts b/packages/core/core-flows/src/pricing/steps/create-price-sets.ts index 0e134b8cdf..681acc618b 100644 --- a/packages/core/core-flows/src/pricing/steps/create-price-sets.ts +++ b/packages/core/core-flows/src/pricing/steps/create-price-sets.ts @@ -1,5 +1,5 @@ import { CreatePriceSetDTO, IPricingModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createPriceSetsStepId = "create-price-sets" @@ -10,7 +10,7 @@ export const createPriceSetsStep = createStep( createPriceSetsStepId, async (data: CreatePriceSetDTO[], { container }) => { const pricingModule = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) const priceSets = await pricingModule.createPriceSets(data) @@ -26,7 +26,7 @@ export const createPriceSetsStep = createStep( } const pricingModule = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) await pricingModule.deletePriceSets(priceSets) diff --git a/packages/core/core-flows/src/pricing/steps/delete-price-preferences.ts b/packages/core/core-flows/src/pricing/steps/delete-price-preferences.ts index 2b1d20e04d..d11d48cb51 100644 --- a/packages/core/core-flows/src/pricing/steps/delete-price-preferences.ts +++ b/packages/core/core-flows/src/pricing/steps/delete-price-preferences.ts @@ -1,5 +1,5 @@ import { IPricingModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deletePricePreferencesStepId = "delete-price-preferences" @@ -9,9 +9,7 @@ export const deletePricePreferencesStepId = "delete-price-preferences" export const deletePricePreferencesStep = createStep( deletePricePreferencesStepId, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRICING - ) + const service = container.resolve(Modules.PRICING) await service.softDeletePricePreferences(ids) @@ -22,9 +20,7 @@ export const deletePricePreferencesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRICING - ) + const service = container.resolve(Modules.PRICING) await service.restorePricePreferences(prevIds) } diff --git a/packages/core/core-flows/src/pricing/steps/update-price-preferences-as-array.ts b/packages/core/core-flows/src/pricing/steps/update-price-preferences-as-array.ts index 0b73e026a5..929f2682a9 100644 --- a/packages/core/core-flows/src/pricing/steps/update-price-preferences-as-array.ts +++ b/packages/core/core-flows/src/pricing/steps/update-price-preferences-as-array.ts @@ -1,12 +1,9 @@ -import { PricingWorkflow, IPricingModuleService } from "@medusajs/types" -import { - MedusaError, - ModuleRegistrationName, - arrayDifference, -} from "@medusajs/utils" +import { IPricingModuleService, PricingWorkflow } from "@medusajs/types" +import { MedusaError, Modules, arrayDifference } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" -export type UpdatePricePreferencesAsArrayStepInput = PricingWorkflow.UpdatePricePreferencesWorkflowInput["update"][] +export type UpdatePricePreferencesAsArrayStepInput = + PricingWorkflow.UpdatePricePreferencesWorkflowInput["update"][] export const updatePricePreferencesAsArrayStepId = "update-price-preferences-as-array" @@ -16,9 +13,7 @@ export const updatePricePreferencesAsArrayStepId = export const updatePricePreferencesAsArrayStep = createStep( updatePricePreferencesAsArrayStepId, async (input: UpdatePricePreferencesAsArrayStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRICING - ) + const service = container.resolve(Modules.PRICING) const prevData = await service.listPricePreferences({ $or: input.map( @@ -69,9 +64,7 @@ export const updatePricePreferencesAsArrayStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRICING - ) + const service = container.resolve(Modules.PRICING) await service.upsertPricePreferences(compensationData.prevData) await service.deletePricePreferences(compensationData.newDataIds) diff --git a/packages/core/core-flows/src/pricing/steps/update-price-preferences.ts b/packages/core/core-flows/src/pricing/steps/update-price-preferences.ts index a8369c8316..8c0f7e055d 100644 --- a/packages/core/core-flows/src/pricing/steps/update-price-preferences.ts +++ b/packages/core/core-flows/src/pricing/steps/update-price-preferences.ts @@ -1,8 +1,5 @@ -import { PricingWorkflow, IPricingModuleService } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { IPricingModuleService, PricingWorkflow } from "@medusajs/types" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const updatePricePreferencesStepId = "update-price-preferences" @@ -11,10 +8,11 @@ export const updatePricePreferencesStepId = "update-price-preferences" */ export const updatePricePreferencesStep = createStep( updatePricePreferencesStepId, - async (input: PricingWorkflow.UpdatePricePreferencesWorkflowInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRICING - ) + async ( + input: PricingWorkflow.UpdatePricePreferencesWorkflowInput, + { container } + ) => { + const service = container.resolve(Modules.PRICING) const { selects, relations } = getSelectsAndRelationsFromObjectArray([ input.update, @@ -37,9 +35,7 @@ export const updatePricePreferencesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRICING - ) + const service = container.resolve(Modules.PRICING) await service.upsertPricePreferences(prevData) } diff --git a/packages/core/core-flows/src/pricing/steps/update-price-sets.ts b/packages/core/core-flows/src/pricing/steps/update-price-sets.ts index 86b9ed57f1..02d5886996 100644 --- a/packages/core/core-flows/src/pricing/steps/update-price-sets.ts +++ b/packages/core/core-flows/src/pricing/steps/update-price-sets.ts @@ -1,7 +1,7 @@ import { IPricingModuleService, PricingTypes } from "@medusajs/types" import { MedusaError, - ModuleRegistrationName, + Modules, getSelectsAndRelationsFromObjectArray, } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" @@ -23,7 +23,7 @@ export const updatePriceSetsStep = createStep( updatePriceSetsStepId, async (data: UpdatePriceSetsStepInput, { container }) => { const pricingModule = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) if ("price_sets" in data) { @@ -65,7 +65,7 @@ export const updatePriceSetsStep = createStep( }, async (revertInput, { container }) => { const pricingModule = container.resolve( - ModuleRegistrationName.PRICING + Modules.PRICING ) if (!revertInput) { diff --git a/packages/core/core-flows/src/product-category/steps/create-product-categories.ts b/packages/core/core-flows/src/product-category/steps/create-product-categories.ts index 309e595353..e932baf8d4 100644 --- a/packages/core/core-flows/src/product-category/steps/create-product-categories.ts +++ b/packages/core/core-flows/src/product-category/steps/create-product-categories.ts @@ -2,7 +2,7 @@ import { CreateProductCategoryDTO, IProductModuleService, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type CreateProductCategoriesStepInput = { @@ -16,9 +16,7 @@ export const createProductCategoriesStepId = "create-product-categories" export const createProductCategoriesStep = createStep( createProductCategoriesStepId, async (data: CreateProductCategoriesStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) const created = await service.createProductCategories( data.product_categories @@ -34,9 +32,7 @@ export const createProductCategoriesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.deleteProductCategories(createdIds) } diff --git a/packages/core/core-flows/src/product-category/steps/delete-product-categories.ts b/packages/core/core-flows/src/product-category/steps/delete-product-categories.ts index d0da9e86c3..f8063c4299 100644 --- a/packages/core/core-flows/src/product-category/steps/delete-product-categories.ts +++ b/packages/core/core-flows/src/product-category/steps/delete-product-categories.ts @@ -1,5 +1,5 @@ import { IProductModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteProductCategoriesStepId = "delete-product-categories" @@ -9,9 +9,7 @@ export const deleteProductCategoriesStepId = "delete-product-categories" export const deleteProductCategoriesStep = createStep( deleteProductCategoriesStepId, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.softDeleteProductCategories(ids) return new StepResponse(void 0, ids) @@ -21,9 +19,7 @@ export const deleteProductCategoriesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.restoreProductCategories(prevIds) } diff --git a/packages/core/core-flows/src/product-category/steps/update-product-categories.ts b/packages/core/core-flows/src/product-category/steps/update-product-categories.ts index ad41e5d74d..ad56b64321 100644 --- a/packages/core/core-flows/src/product-category/steps/update-product-categories.ts +++ b/packages/core/core-flows/src/product-category/steps/update-product-categories.ts @@ -3,10 +3,7 @@ import { IProductModuleService, UpdateProductCategoryDTO, } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type UpdateProductCategoriesStepInput = { @@ -21,9 +18,7 @@ export const updateProductCategoriesStepId = "update-product-categories" export const updateProductCategoriesStep = createStep( updateProductCategoriesStepId, async (data: UpdateProductCategoriesStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) const { selects, relations } = getSelectsAndRelationsFromObjectArray([ data.update, @@ -45,9 +40,7 @@ export const updateProductCategoriesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.upsertProductCategories(prevData) } diff --git a/packages/core/core-flows/src/product/steps/batch-link-products-collection.ts b/packages/core/core-flows/src/product/steps/batch-link-products-collection.ts index 0d84c30667..c5ad777a94 100644 --- a/packages/core/core-flows/src/product/steps/batch-link-products-collection.ts +++ b/packages/core/core-flows/src/product/steps/batch-link-products-collection.ts @@ -1,5 +1,5 @@ import { IProductModuleService, LinkWorkflowInput } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const batchLinkProductsToCollectionStepId = @@ -10,9 +10,7 @@ export const batchLinkProductsToCollectionStepId = export const batchLinkProductsToCollectionStep = createStep( batchLinkProductsToCollectionStepId, async (data: LinkWorkflowInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) if (!data.add?.length && !data.remove?.length) { return new StepResponse(void 0, null) @@ -45,9 +43,7 @@ export const batchLinkProductsToCollectionStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.updateProductCollections(prevData.id, { product_ids: prevData.productIds, diff --git a/packages/core/core-flows/src/product/steps/batch-link-products-in-category.ts b/packages/core/core-flows/src/product/steps/batch-link-products-in-category.ts index bc1f357b36..dc9797d290 100644 --- a/packages/core/core-flows/src/product/steps/batch-link-products-in-category.ts +++ b/packages/core/core-flows/src/product/steps/batch-link-products-in-category.ts @@ -1,5 +1,5 @@ import { IProductModuleService, ProductCategoryWorkflow } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const batchLinkProductsToCategoryStepId = @@ -13,9 +13,7 @@ export const batchLinkProductsToCategoryStep = createStep( data: ProductCategoryWorkflow.BatchUpdateProductsOnCategoryWorkflowInput, { container } ) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) if (!data.add?.length && !data.remove?.length) { return new StepResponse(void 0, null) @@ -60,9 +58,7 @@ export const batchLinkProductsToCategoryStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) const dbProducts = await service.listProducts( { id: prevData.productIds }, diff --git a/packages/core/core-flows/src/product/steps/create-collections.ts b/packages/core/core-flows/src/product/steps/create-collections.ts index 6487eb119e..32efb832e9 100644 --- a/packages/core/core-flows/src/product/steps/create-collections.ts +++ b/packages/core/core-flows/src/product/steps/create-collections.ts @@ -1,5 +1,5 @@ import { IProductModuleService, ProductTypes } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createCollectionsStepId = "create-collections" @@ -9,9 +9,7 @@ export const createCollectionsStepId = "create-collections" export const createCollectionsStep = createStep( createCollectionsStepId, async (data: ProductTypes.CreateProductCollectionDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) const created = await service.createProductCollections(data) return new StepResponse( @@ -24,9 +22,7 @@ export const createCollectionsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.deleteProductCollections(createdIds) } diff --git a/packages/core/core-flows/src/product/steps/create-product-options.ts b/packages/core/core-flows/src/product/steps/create-product-options.ts index 94c1c2ce49..083b62a8c0 100644 --- a/packages/core/core-flows/src/product/steps/create-product-options.ts +++ b/packages/core/core-flows/src/product/steps/create-product-options.ts @@ -1,5 +1,5 @@ import { IProductModuleService, ProductTypes } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createProductOptionsStepId = "create-product-options" @@ -9,9 +9,7 @@ export const createProductOptionsStepId = "create-product-options" export const createProductOptionsStep = createStep( createProductOptionsStepId, async (data: ProductTypes.CreateProductOptionDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) const created = await service.createProductOptions(data) return new StepResponse( @@ -24,9 +22,7 @@ export const createProductOptionsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.deleteProductOptions(createdIds) } diff --git a/packages/core/core-flows/src/product/steps/create-product-tags.ts b/packages/core/core-flows/src/product/steps/create-product-tags.ts index ef50eed124..fbcde3e74b 100644 --- a/packages/core/core-flows/src/product/steps/create-product-tags.ts +++ b/packages/core/core-flows/src/product/steps/create-product-tags.ts @@ -1,5 +1,5 @@ import { IProductModuleService, ProductTypes } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createProductTagsStepId = "create-product-tags" @@ -9,9 +9,7 @@ export const createProductTagsStepId = "create-product-tags" export const createProductTagsStep = createStep( createProductTagsStepId, async (data: ProductTypes.CreateProductTagDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) const created = await service.createProductTags(data) return new StepResponse( @@ -24,9 +22,7 @@ export const createProductTagsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.deleteProductTags(createdIds) } diff --git a/packages/core/core-flows/src/product/steps/create-product-types.ts b/packages/core/core-flows/src/product/steps/create-product-types.ts index 8e599c9c79..be14eaa9a6 100644 --- a/packages/core/core-flows/src/product/steps/create-product-types.ts +++ b/packages/core/core-flows/src/product/steps/create-product-types.ts @@ -1,5 +1,5 @@ import { IProductModuleService, ProductTypes } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createProductTypesStepId = "create-product-types" @@ -9,9 +9,7 @@ export const createProductTypesStepId = "create-product-types" export const createProductTypesStep = createStep( createProductTypesStepId, async (data: ProductTypes.CreateProductTypeDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) const created = await service.createProductTypes(data) return new StepResponse( @@ -24,9 +22,7 @@ export const createProductTypesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.deleteProductTypes(createdIds) } diff --git a/packages/core/core-flows/src/product/steps/create-product-variants.ts b/packages/core/core-flows/src/product/steps/create-product-variants.ts index 2949e193eb..e5d0edf909 100644 --- a/packages/core/core-flows/src/product/steps/create-product-variants.ts +++ b/packages/core/core-flows/src/product/steps/create-product-variants.ts @@ -1,5 +1,5 @@ import { IProductModuleService, ProductTypes } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createProductVariantsStepId = "create-product-variants" @@ -9,9 +9,7 @@ export const createProductVariantsStepId = "create-product-variants" export const createProductVariantsStep = createStep( createProductVariantsStepId, async (data: ProductTypes.CreateProductVariantDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) const created = await service.createProductVariants(data) return new StepResponse( created, @@ -23,9 +21,7 @@ export const createProductVariantsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.deleteProductVariants(createdIds) } diff --git a/packages/core/core-flows/src/product/steps/create-products.ts b/packages/core/core-flows/src/product/steps/create-products.ts index 444a55d4db..5da8675488 100644 --- a/packages/core/core-flows/src/product/steps/create-products.ts +++ b/packages/core/core-flows/src/product/steps/create-products.ts @@ -1,5 +1,5 @@ import { IProductModuleService, ProductTypes } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createProductsStepId = "create-products" @@ -9,9 +9,7 @@ export const createProductsStepId = "create-products" export const createProductsStep = createStep( createProductsStepId, async (data: ProductTypes.CreateProductDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) const created = await service.createProducts(data) return new StepResponse( @@ -24,9 +22,7 @@ export const createProductsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.deleteProducts(createdIds) } diff --git a/packages/core/core-flows/src/product/steps/delete-collections.ts b/packages/core/core-flows/src/product/steps/delete-collections.ts index c9dcd1448a..49d49744db 100644 --- a/packages/core/core-flows/src/product/steps/delete-collections.ts +++ b/packages/core/core-flows/src/product/steps/delete-collections.ts @@ -1,5 +1,5 @@ import { IProductModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteCollectionsStepId = "delete-collections" @@ -9,9 +9,7 @@ export const deleteCollectionsStepId = "delete-collections" export const deleteCollectionsStep = createStep( deleteCollectionsStepId, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.softDeleteProductCollections(ids) return new StepResponse(void 0, ids) @@ -21,9 +19,7 @@ export const deleteCollectionsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.restoreProductCollections(prevIds) } diff --git a/packages/core/core-flows/src/product/steps/delete-product-options.ts b/packages/core/core-flows/src/product/steps/delete-product-options.ts index 67007b560a..cbf9220b73 100644 --- a/packages/core/core-flows/src/product/steps/delete-product-options.ts +++ b/packages/core/core-flows/src/product/steps/delete-product-options.ts @@ -1,5 +1,5 @@ import { IProductModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteProductOptionsStepId = "delete-product-options" @@ -9,9 +9,7 @@ export const deleteProductOptionsStepId = "delete-product-options" export const deleteProductOptionsStep = createStep( deleteProductOptionsStepId, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.softDeleteProductOptions(ids) return new StepResponse(void 0, ids) @@ -21,9 +19,7 @@ export const deleteProductOptionsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.restoreProductOptions(prevIds) } diff --git a/packages/core/core-flows/src/product/steps/delete-product-tags.ts b/packages/core/core-flows/src/product/steps/delete-product-tags.ts index e1e224e287..0729f2904e 100644 --- a/packages/core/core-flows/src/product/steps/delete-product-tags.ts +++ b/packages/core/core-flows/src/product/steps/delete-product-tags.ts @@ -1,5 +1,5 @@ import { IProductModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteProductTagsStepId = "delete-product-tags" @@ -9,9 +9,7 @@ export const deleteProductTagsStepId = "delete-product-tags" export const deleteProductTagsStep = createStep( deleteProductTagsStepId, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.softDeleteProductTags(ids) return new StepResponse(void 0, ids) @@ -21,9 +19,7 @@ export const deleteProductTagsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.restoreProductTags(prevIds) } diff --git a/packages/core/core-flows/src/product/steps/delete-product-types.ts b/packages/core/core-flows/src/product/steps/delete-product-types.ts index 04eb92b84b..381eec53ca 100644 --- a/packages/core/core-flows/src/product/steps/delete-product-types.ts +++ b/packages/core/core-flows/src/product/steps/delete-product-types.ts @@ -1,5 +1,5 @@ import { IProductModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteProductTypesStepId = "delete-product-types" @@ -9,9 +9,7 @@ export const deleteProductTypesStepId = "delete-product-types" export const deleteProductTypesStep = createStep( deleteProductTypesStepId, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.softDeleteProductTypes(ids) return new StepResponse(void 0, ids) @@ -21,9 +19,7 @@ export const deleteProductTypesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.restoreProductTypes(prevIds) } diff --git a/packages/core/core-flows/src/product/steps/delete-product-variants.ts b/packages/core/core-flows/src/product/steps/delete-product-variants.ts index 194d061810..ca2fccbeda 100644 --- a/packages/core/core-flows/src/product/steps/delete-product-variants.ts +++ b/packages/core/core-flows/src/product/steps/delete-product-variants.ts @@ -1,5 +1,5 @@ import { IProductModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteProductVariantsStepId = "delete-product-variants" @@ -9,9 +9,7 @@ export const deleteProductVariantsStepId = "delete-product-variants" export const deleteProductVariantsStep = createStep( deleteProductVariantsStepId, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.softDeleteProductVariants(ids) return new StepResponse(void 0, ids) @@ -21,9 +19,7 @@ export const deleteProductVariantsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.restoreProductVariants(prevIds) } diff --git a/packages/core/core-flows/src/product/steps/delete-products.ts b/packages/core/core-flows/src/product/steps/delete-products.ts index 783a419730..7ab5b800cb 100644 --- a/packages/core/core-flows/src/product/steps/delete-products.ts +++ b/packages/core/core-flows/src/product/steps/delete-products.ts @@ -1,5 +1,5 @@ import { IProductModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteProductsStepId = "delete-products" @@ -9,9 +9,7 @@ export const deleteProductsStepId = "delete-products" export const deleteProductsStep = createStep( deleteProductsStepId, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.softDeleteProducts(ids) return new StepResponse(void 0, ids) @@ -21,9 +19,7 @@ export const deleteProductsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.restoreProducts(prevIds) } diff --git a/packages/core/core-flows/src/product/steps/generate-product-csv.ts b/packages/core/core-flows/src/product/steps/generate-product-csv.ts index 94e562dee3..3c8ba095e8 100644 --- a/packages/core/core-flows/src/product/steps/generate-product-csv.ts +++ b/packages/core/core-flows/src/product/steps/generate-product-csv.ts @@ -3,7 +3,7 @@ import { IFileModuleService, IRegionModuleService, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" import { normalizeForExport } from "../helpers/normalize-for-export" import { convertJsonToCsv } from "../utlils" @@ -66,7 +66,7 @@ export const generateProductCsvStep = createStep( generateProductCsvStepId, async (products: HttpTypes.AdminProduct[], { container }) => { const regionService = container.resolve( - ModuleRegistrationName.REGION + Modules.REGION ) const regions = await regionService.listRegions( @@ -79,9 +79,7 @@ export const generateProductCsvStep = createStep( sortHeader: csvSortFunction, }) - const fileModule: IFileModuleService = container.resolve( - ModuleRegistrationName.FILE - ) + const fileModule: IFileModuleService = container.resolve(Modules.FILE) const filename = `${Date.now()}-product-exports.csv` const file = await fileModule.createFiles({ @@ -97,9 +95,7 @@ export const generateProductCsvStep = createStep( return } - const fileModule: IFileModuleService = container.resolve( - ModuleRegistrationName.FILE - ) + const fileModule: IFileModuleService = container.resolve(Modules.FILE) await fileModule.deleteFiles(fileId) } ) diff --git a/packages/core/core-flows/src/product/steps/get-products.ts b/packages/core/core-flows/src/product/steps/get-products.ts index 1c6825933d..4d10d5deae 100644 --- a/packages/core/core-flows/src/product/steps/get-products.ts +++ b/packages/core/core-flows/src/product/steps/get-products.ts @@ -1,5 +1,5 @@ import { IProductModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { createStep, StepResponse } from "@medusajs/workflows-sdk" export type GetProductsStepInput = { @@ -13,9 +13,7 @@ export const getProductsStepId = "get-products" export const getProductsStep = createStep( getProductsStepId, async (data: GetProductsStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) if (!data.ids?.length) { return new StepResponse([], []) diff --git a/packages/core/core-flows/src/product/steps/group-products-for-batch.ts b/packages/core/core-flows/src/product/steps/group-products-for-batch.ts index f757b4f971..c3af51b379 100644 --- a/packages/core/core-flows/src/product/steps/group-products-for-batch.ts +++ b/packages/core/core-flows/src/product/steps/group-products-for-batch.ts @@ -1,5 +1,5 @@ import { HttpTypes, IProductModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const groupProductsForBatchStepId = "group-products-for-batch" @@ -12,9 +12,7 @@ export const groupProductsForBatchStep = createStep( data: (HttpTypes.AdminCreateProduct & { id?: string })[], { container } ) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) const existingProducts = await service.listProducts( { diff --git a/packages/core/core-flows/src/product/steps/parse-product-csv.ts b/packages/core/core-flows/src/product/steps/parse-product-csv.ts index d60993a5d9..45631bf1de 100644 --- a/packages/core/core-flows/src/product/steps/parse-product-csv.ts +++ b/packages/core/core-flows/src/product/steps/parse-product-csv.ts @@ -3,7 +3,7 @@ import { IRegionModuleService, ISalesChannelModuleService, } from "@medusajs/types" -import { MedusaError, ModuleRegistrationName } from "@medusajs/utils" +import { MedusaError, Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" import { normalizeForImport } from "../helpers/normalize-for-import" import { normalizeV1Products } from "../helpers/normalize-v1-import" @@ -17,13 +17,13 @@ export const parseProductCsvStep = createStep( parseProductCsvStepId, async (fileContent: string, { container }) => { const regionService = container.resolve( - ModuleRegistrationName.REGION + Modules.REGION ) const productService = container.resolve( - ModuleRegistrationName.PRODUCT + Modules.PRODUCT ) const salesChannelService = container.resolve( - ModuleRegistrationName.SALES_CHANNEL + Modules.SALES_CHANNEL ) const csvProducts = convertCsvToJson(fileContent) diff --git a/packages/core/core-flows/src/product/steps/update-collections.ts b/packages/core/core-flows/src/product/steps/update-collections.ts index 0d80e8d3e1..7d09bd8979 100644 --- a/packages/core/core-flows/src/product/steps/update-collections.ts +++ b/packages/core/core-flows/src/product/steps/update-collections.ts @@ -1,8 +1,5 @@ import { IProductModuleService, ProductTypes } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type UpdateCollectionsStepInput = { @@ -17,9 +14,7 @@ export const updateCollectionsStepId = "update-collections" export const updateCollectionsStep = createStep( updateCollectionsStepId, async (data: UpdateCollectionsStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) const { selects, relations } = getSelectsAndRelationsFromObjectArray([ data.update, @@ -41,9 +36,7 @@ export const updateCollectionsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.upsertProductCollections( prevData.map((r) => ({ diff --git a/packages/core/core-flows/src/product/steps/update-product-options.ts b/packages/core/core-flows/src/product/steps/update-product-options.ts index 8d4af9a6f6..0c7296d951 100644 --- a/packages/core/core-flows/src/product/steps/update-product-options.ts +++ b/packages/core/core-flows/src/product/steps/update-product-options.ts @@ -1,8 +1,5 @@ import { IProductModuleService, ProductTypes } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type UpdateProductOptionsStepInput = { @@ -17,9 +14,7 @@ export const updateProductOptionsStepId = "update-product-options" export const updateProductOptionsStep = createStep( updateProductOptionsStepId, async (data: UpdateProductOptionsStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) const { selects, relations } = getSelectsAndRelationsFromObjectArray([ data.update, @@ -41,9 +36,7 @@ export const updateProductOptionsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.upsertProductOptions( prevData.map((o) => ({ diff --git a/packages/core/core-flows/src/product/steps/update-product-tags.ts b/packages/core/core-flows/src/product/steps/update-product-tags.ts index 94ce882d54..7875230546 100644 --- a/packages/core/core-flows/src/product/steps/update-product-tags.ts +++ b/packages/core/core-flows/src/product/steps/update-product-tags.ts @@ -1,8 +1,5 @@ import { IProductModuleService, ProductTypes } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type UpdateProductTagsStepInput = { @@ -17,9 +14,7 @@ export const updateProductTagsStepId = "update-product-tags" export const updateProductTagsStep = createStep( updateProductTagsStepId, async (data: UpdateProductTagsStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) const { selects, relations } = getSelectsAndRelationsFromObjectArray([ data.update, @@ -41,9 +36,7 @@ export const updateProductTagsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.upsertProductTags(prevData) } diff --git a/packages/core/core-flows/src/product/steps/update-product-types.ts b/packages/core/core-flows/src/product/steps/update-product-types.ts index 47e6384cbe..e70e989d16 100644 --- a/packages/core/core-flows/src/product/steps/update-product-types.ts +++ b/packages/core/core-flows/src/product/steps/update-product-types.ts @@ -1,8 +1,5 @@ import { IProductModuleService, ProductTypes } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type UpdateProductTypesStepInput = { @@ -17,9 +14,7 @@ export const updateProductTypesStepId = "update-product-types" export const updateProductTypesStep = createStep( updateProductTypesStepId, async (data: UpdateProductTypesStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) const { selects, relations } = getSelectsAndRelationsFromObjectArray([ data.update, @@ -41,9 +36,7 @@ export const updateProductTypesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.upsertProductTypes(prevData) } diff --git a/packages/core/core-flows/src/product/steps/update-product-variants.ts b/packages/core/core-flows/src/product/steps/update-product-variants.ts index b8280e4dea..2782a8bf0d 100644 --- a/packages/core/core-flows/src/product/steps/update-product-variants.ts +++ b/packages/core/core-flows/src/product/steps/update-product-variants.ts @@ -1,7 +1,7 @@ import { IProductModuleService, ProductTypes } from "@medusajs/types" import { MedusaError, - ModuleRegistrationName, + Modules, getSelectsAndRelationsFromObjectArray, } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" @@ -22,9 +22,7 @@ export const updateProductVariantsStepId = "update-product-variants" export const updateProductVariantsStep = createStep( updateProductVariantsStepId, async (data: UpdateProductVariantsStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) if ("product_variants" in data) { if (data.product_variants.some((p) => !p.id)) { @@ -64,9 +62,7 @@ export const updateProductVariantsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.upsertProductVariants(prevData) } diff --git a/packages/core/core-flows/src/product/steps/update-products.ts b/packages/core/core-flows/src/product/steps/update-products.ts index a9ed92d011..e721d2ea48 100644 --- a/packages/core/core-flows/src/product/steps/update-products.ts +++ b/packages/core/core-flows/src/product/steps/update-products.ts @@ -1,7 +1,7 @@ import { IProductModuleService, ProductTypes } from "@medusajs/types" import { MedusaError, - ModuleRegistrationName, + Modules, getSelectsAndRelationsFromObjectArray, } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" @@ -22,9 +22,7 @@ export const updateProductsStepId = "update-products" export const updateProductsStep = createStep( updateProductsStepId, async (data: UpdateProductsStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) if ("products" in data) { if (data.products.some((p) => !p.id)) { @@ -63,9 +61,7 @@ export const updateProductsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.PRODUCT - ) + const service = container.resolve(Modules.PRODUCT) await service.upsertProducts( prevData.map((r) => ({ diff --git a/packages/core/core-flows/src/promotion/steps/add-campaign-promotions.ts b/packages/core/core-flows/src/promotion/steps/add-campaign-promotions.ts index 08826a62fc..0db4498859 100644 --- a/packages/core/core-flows/src/promotion/steps/add-campaign-promotions.ts +++ b/packages/core/core-flows/src/promotion/steps/add-campaign-promotions.ts @@ -1,5 +1,5 @@ import { IPromotionModuleService, LinkWorkflowInput } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, WorkflowData, createStep } from "@medusajs/workflows-sdk" export const addCampaignPromotionsStepId = "add-campaign-promotions" @@ -12,7 +12,7 @@ export const addCampaignPromotionsStep = createStep( const { id: campaignId, add: promotionIdsToAdd = [] } = input const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) if (promotionIdsToAdd.length) { @@ -31,7 +31,7 @@ export const addCampaignPromotionsStep = createStep( const { id: campaignId, add: promotionIdsToRemove = [] } = data const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) if (promotionIdsToRemove.length) { diff --git a/packages/core/core-flows/src/promotion/steps/add-or-remove-campaign-promotions.ts b/packages/core/core-flows/src/promotion/steps/add-or-remove-campaign-promotions.ts index ac7261f103..51e3da3342 100644 --- a/packages/core/core-flows/src/promotion/steps/add-or-remove-campaign-promotions.ts +++ b/packages/core/core-flows/src/promotion/steps/add-or-remove-campaign-promotions.ts @@ -1,5 +1,5 @@ import { IPromotionModuleService, LinkWorkflowInput } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, WorkflowData, createStep } from "@medusajs/workflows-sdk" export const addOrRemoveCampaignPromotionsStepId = @@ -16,7 +16,7 @@ export const addOrRemoveCampaignPromotionsStep = createStep( remove: promotionIdsToRemove = [], } = input const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) if (promotionIdsToAdd.length) { @@ -47,7 +47,7 @@ export const addOrRemoveCampaignPromotionsStep = createStep( } = data const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) if (promotionIdsToAdd.length) { diff --git a/packages/core/core-flows/src/promotion/steps/add-rules-to-promotions.ts b/packages/core/core-flows/src/promotion/steps/add-rules-to-promotions.ts index d0ba8412fd..a18b569859 100644 --- a/packages/core/core-flows/src/promotion/steps/add-rules-to-promotions.ts +++ b/packages/core/core-flows/src/promotion/steps/add-rules-to-promotions.ts @@ -2,7 +2,7 @@ import { AddPromotionRulesWorkflowDTO, IPromotionModuleService, } from "@medusajs/types" -import { ModuleRegistrationName, RuleType } from "@medusajs/utils" +import { Modules, RuleType } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const addRulesToPromotionsStepId = "add-rules-to-promotions" @@ -15,7 +15,7 @@ export const addRulesToPromotionsStep = createStep( const { data, rule_type: ruleType } = input const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) const createdPromotionRules = @@ -59,7 +59,7 @@ export const addRulesToPromotionsStep = createStep( } = data const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) promotionRuleIds.length && diff --git a/packages/core/core-flows/src/promotion/steps/create-campaigns.ts b/packages/core/core-flows/src/promotion/steps/create-campaigns.ts index 1811473a4f..107194dd45 100644 --- a/packages/core/core-flows/src/promotion/steps/create-campaigns.ts +++ b/packages/core/core-flows/src/promotion/steps/create-campaigns.ts @@ -1,5 +1,5 @@ import { CreateCampaignDTO, IPromotionModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createCampaignsStepId = "create-campaigns" @@ -10,7 +10,7 @@ export const createCampaignsStep = createStep( createCampaignsStepId, async (data: CreateCampaignDTO[], { container }) => { const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) const createdCampaigns = await promotionModule.createCampaigns(data) @@ -26,7 +26,7 @@ export const createCampaignsStep = createStep( } const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) await promotionModule.deleteCampaigns(createdCampaignIds) diff --git a/packages/core/core-flows/src/promotion/steps/create-promotions.ts b/packages/core/core-flows/src/promotion/steps/create-promotions.ts index 135fede93d..b9b007a219 100644 --- a/packages/core/core-flows/src/promotion/steps/create-promotions.ts +++ b/packages/core/core-flows/src/promotion/steps/create-promotions.ts @@ -1,5 +1,5 @@ import { CreatePromotionDTO, IPromotionModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createPromotionsStepId = "create-promotions" @@ -10,7 +10,7 @@ export const createPromotionsStep = createStep( createPromotionsStepId, async (data: CreatePromotionDTO[], { container }) => { const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) const createdPromotions = await promotionModule.createPromotions(data) @@ -26,7 +26,7 @@ export const createPromotionsStep = createStep( } const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) await promotionModule.deletePromotions(createdPromotionIds) diff --git a/packages/core/core-flows/src/promotion/steps/delete-campaigns.ts b/packages/core/core-flows/src/promotion/steps/delete-campaigns.ts index a1ce77b517..51295cb710 100644 --- a/packages/core/core-flows/src/promotion/steps/delete-campaigns.ts +++ b/packages/core/core-flows/src/promotion/steps/delete-campaigns.ts @@ -1,5 +1,5 @@ import { IPromotionModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteCampaignsStepId = "delete-campaigns" @@ -10,7 +10,7 @@ export const deleteCampaignsStep = createStep( deleteCampaignsStepId, async (ids: string[], { container }) => { const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) await promotionModule.softDeleteCampaigns(ids) @@ -23,7 +23,7 @@ export const deleteCampaignsStep = createStep( } const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) await promotionModule.restoreCampaigns(idsToRestore) diff --git a/packages/core/core-flows/src/promotion/steps/delete-promotions.ts b/packages/core/core-flows/src/promotion/steps/delete-promotions.ts index c5e241537d..0bbfa9c3e5 100644 --- a/packages/core/core-flows/src/promotion/steps/delete-promotions.ts +++ b/packages/core/core-flows/src/promotion/steps/delete-promotions.ts @@ -1,5 +1,5 @@ import { IPromotionModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deletePromotionsStepId = "delete-promotions" @@ -10,7 +10,7 @@ export const deletePromotionsStep = createStep( deletePromotionsStepId, async (ids: string[], { container }) => { const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) await promotionModule.softDeletePromotions(ids) @@ -23,7 +23,7 @@ export const deletePromotionsStep = createStep( } const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) await promotionModule.restorePromotions(idsToRestore) diff --git a/packages/core/core-flows/src/promotion/steps/register-usage.ts b/packages/core/core-flows/src/promotion/steps/register-usage.ts index 3b1e271f8a..a6ff4d90e3 100644 --- a/packages/core/core-flows/src/promotion/steps/register-usage.ts +++ b/packages/core/core-flows/src/promotion/steps/register-usage.ts @@ -1,5 +1,5 @@ import { IPromotionModuleService, UsageComputedActions } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const registerUsageStepId = "register-usage" @@ -14,7 +14,7 @@ export const registerUsageStep = createStep( } const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) await promotionModule.registerUsage(data) @@ -27,7 +27,7 @@ export const registerUsageStep = createStep( } const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) await promotionModule.revertUsage(revertData) diff --git a/packages/core/core-flows/src/promotion/steps/remove-campaign-promotions.ts b/packages/core/core-flows/src/promotion/steps/remove-campaign-promotions.ts index f088ec36b6..d882da0eb5 100644 --- a/packages/core/core-flows/src/promotion/steps/remove-campaign-promotions.ts +++ b/packages/core/core-flows/src/promotion/steps/remove-campaign-promotions.ts @@ -1,5 +1,5 @@ import { IPromotionModuleService, LinkWorkflowInput } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, WorkflowData, createStep } from "@medusajs/workflows-sdk" export const removeCampaignPromotionsStepId = "remove-campaign-promotions" @@ -11,7 +11,7 @@ export const removeCampaignPromotionsStep = createStep( async (input: WorkflowData, { container }) => { const { id: campaignId, remove: promotionIdsToRemove = [] } = input const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) if (promotionIdsToRemove.length) { @@ -30,7 +30,7 @@ export const removeCampaignPromotionsStep = createStep( const { id: campaignId, remove: promotionIdsToAdd = [] } = data const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) if (promotionIdsToAdd.length) { diff --git a/packages/core/core-flows/src/promotion/steps/remove-rules-from-promotions.ts b/packages/core/core-flows/src/promotion/steps/remove-rules-from-promotions.ts index 79207e9c2b..66f0479542 100644 --- a/packages/core/core-flows/src/promotion/steps/remove-rules-from-promotions.ts +++ b/packages/core/core-flows/src/promotion/steps/remove-rules-from-promotions.ts @@ -4,7 +4,7 @@ import { PromotionRuleDTO, RemovePromotionRulesWorkflowDTO, } from "@medusajs/types" -import { ModuleRegistrationName, RuleType } from "@medusajs/utils" +import { Modules, RuleType } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const removeRulesFromPromotionsStepId = "remove-rules-from-promotions" @@ -17,7 +17,7 @@ export const removeRulesFromPromotionsStep = createStep( const { data, rule_type: ruleType } = input const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) const promotion = await promotionModule.retrievePromotion(data.id, { @@ -73,7 +73,7 @@ export const removeRulesFromPromotionsStep = createStep( } = data const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) promotionRulesToCreate.length && diff --git a/packages/core/core-flows/src/promotion/steps/update-campaigns.ts b/packages/core/core-flows/src/promotion/steps/update-campaigns.ts index cb14be3d26..0208047d67 100644 --- a/packages/core/core-flows/src/promotion/steps/update-campaigns.ts +++ b/packages/core/core-flows/src/promotion/steps/update-campaigns.ts @@ -1,6 +1,6 @@ import { IPromotionModuleService, UpdateCampaignDTO } from "@medusajs/types" import { - ModuleRegistrationName, + Modules, convertItemResponseToUpdateRequest, getSelectsAndRelationsFromObjectArray, } from "@medusajs/utils" @@ -14,7 +14,7 @@ export const updateCampaignsStep = createStep( updateCampaignsStepId, async (data: UpdateCampaignDTO[], { container }) => { const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) const { selects, relations } = getSelectsAndRelationsFromObjectArray(data) @@ -39,7 +39,7 @@ export const updateCampaignsStep = createStep( const { dataBeforeUpdate, selects, relations } = revertInput const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) await promotionModule.updateCampaigns( diff --git a/packages/core/core-flows/src/promotion/steps/update-promotion-rules.ts b/packages/core/core-flows/src/promotion/steps/update-promotion-rules.ts index 1544922047..a6f7248757 100644 --- a/packages/core/core-flows/src/promotion/steps/update-promotion-rules.ts +++ b/packages/core/core-flows/src/promotion/steps/update-promotion-rules.ts @@ -2,7 +2,7 @@ import { IPromotionModuleService, UpdatePromotionRulesWorkflowDTO, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const updatePromotionRulesStepId = "update-promotion-rules" @@ -15,7 +15,7 @@ export const updatePromotionRulesStep = createStep( const { data } = input const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) const promotionRulesBeforeUpdate = await promotionModule.listPromotionRules( @@ -35,7 +35,7 @@ export const updatePromotionRulesStep = createStep( } const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) await promotionModule.updatePromotionRules( diff --git a/packages/core/core-flows/src/promotion/steps/update-promotions.ts b/packages/core/core-flows/src/promotion/steps/update-promotions.ts index 5a899b3999..0847a0cc9c 100644 --- a/packages/core/core-flows/src/promotion/steps/update-promotions.ts +++ b/packages/core/core-flows/src/promotion/steps/update-promotions.ts @@ -1,6 +1,6 @@ import { IPromotionModuleService, UpdatePromotionDTO } from "@medusajs/types" import { - ModuleRegistrationName, + Modules, convertItemResponseToUpdateRequest, getSelectsAndRelationsFromObjectArray, } from "@medusajs/utils" @@ -14,7 +14,7 @@ export const updatePromotionsStep = createStep( updatePromotionsStepId, async (data: UpdatePromotionDTO[], { container }) => { const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) const { selects, relations } = getSelectsAndRelationsFromObjectArray(data) @@ -39,7 +39,7 @@ export const updatePromotionsStep = createStep( const { dataBeforeUpdate, selects, relations } = revertInput const promotionModule = container.resolve( - ModuleRegistrationName.PROMOTION + Modules.PROMOTION ) await promotionModule.updatePromotions( diff --git a/packages/core/core-flows/src/region/steps/create-regions.ts b/packages/core/core-flows/src/region/steps/create-regions.ts index 7c708cb8cb..d33911318d 100644 --- a/packages/core/core-flows/src/region/steps/create-regions.ts +++ b/packages/core/core-flows/src/region/steps/create-regions.ts @@ -1,5 +1,5 @@ import { CreateRegionDTO, IRegionModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createRegionsStepId = "create-regions" @@ -9,9 +9,7 @@ export const createRegionsStepId = "create-regions" export const createRegionsStep = createStep( createRegionsStepId, async (data: CreateRegionDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.REGION - ) + const service = container.resolve(Modules.REGION) const created = await service.createRegions(data) @@ -25,9 +23,7 @@ export const createRegionsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.REGION - ) + const service = container.resolve(Modules.REGION) await service.deleteRegions(createdIds) } diff --git a/packages/core/core-flows/src/region/steps/delete-regions.ts b/packages/core/core-flows/src/region/steps/delete-regions.ts index 16362d68e8..2db8cbc7f1 100644 --- a/packages/core/core-flows/src/region/steps/delete-regions.ts +++ b/packages/core/core-flows/src/region/steps/delete-regions.ts @@ -1,5 +1,5 @@ import { IRegionModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteRegionsStepId = "delete-regions" @@ -9,9 +9,7 @@ export const deleteRegionsStepId = "delete-regions" export const deleteRegionsStep = createStep( deleteRegionsStepId, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.REGION - ) + const service = container.resolve(Modules.REGION) await service.softDeleteRegions(ids) @@ -22,9 +20,7 @@ export const deleteRegionsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.REGION - ) + const service = container.resolve(Modules.REGION) await service.restoreRegions(prevIds) } diff --git a/packages/core/core-flows/src/region/steps/set-regions-payment-providers.ts b/packages/core/core-flows/src/region/steps/set-regions-payment-providers.ts index 82280691ce..f077591b05 100644 --- a/packages/core/core-flows/src/region/steps/set-regions-payment-providers.ts +++ b/packages/core/core-flows/src/region/steps/set-regions-payment-providers.ts @@ -1,15 +1,14 @@ import { RemoteLink } from "@medusajs/modules-sdk" import { IPaymentModuleService, RemoteQueryFunction } from "@medusajs/types" import { - arrayDifference, ContainerRegistrationKeys, LINKS, MedusaError, - ModuleRegistrationName, Modules, + arrayDifference, promiseAll, } from "@medusajs/utils" -import { createStep, StepResponse } from "@medusajs/workflows-sdk" +import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface SetRegionsPaymentProvidersStepInput { input: { @@ -104,7 +103,7 @@ export const setRegionsPaymentProvidersStep = createStep( } const paymentService = container.resolve( - ModuleRegistrationName.PAYMENT + Modules.PAYMENT ) const remoteLink = container.resolve( ContainerRegistrationKeys.REMOTE_LINK diff --git a/packages/core/core-flows/src/region/steps/update-regions.ts b/packages/core/core-flows/src/region/steps/update-regions.ts index 085ced13b9..b22c462bc0 100644 --- a/packages/core/core-flows/src/region/steps/update-regions.ts +++ b/packages/core/core-flows/src/region/steps/update-regions.ts @@ -3,10 +3,7 @@ import { IRegionModuleService, UpdateRegionDTO, } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type UpdateRegionsStepInput = { @@ -21,9 +18,7 @@ export const updateRegionsStepId = "update-region" export const updateRegionsStep = createStep( updateRegionsStepId, async (data: UpdateRegionsStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.REGION - ) + const service = container.resolve(Modules.REGION) const { selects, relations } = getSelectsAndRelationsFromObjectArray([ data.update, @@ -47,9 +42,7 @@ export const updateRegionsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.REGION - ) + const service = container.resolve(Modules.REGION) await service.upsertRegions( prevData.map((r) => ({ diff --git a/packages/core/core-flows/src/reservation/steps/create-reservations.ts b/packages/core/core-flows/src/reservation/steps/create-reservations.ts index 037dc6faa1..8b9de53990 100644 --- a/packages/core/core-flows/src/reservation/steps/create-reservations.ts +++ b/packages/core/core-flows/src/reservation/steps/create-reservations.ts @@ -1,7 +1,7 @@ import { IInventoryService, InventoryTypes } from "@medusajs/types" import { StepResponse, createStep } from "@medusajs/workflows-sdk" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" export const createReservationsStepId = "create-reservations-step" /** @@ -10,9 +10,7 @@ export const createReservationsStepId = "create-reservations-step" export const createReservationsStep = createStep( createReservationsStepId, async (data: InventoryTypes.CreateReservationItemInput[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.INVENTORY - ) + const service = container.resolve(Modules.INVENTORY) const created = await service.createReservationItems(data) @@ -26,9 +24,7 @@ export const createReservationsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.INVENTORY - ) + const service = container.resolve(Modules.INVENTORY) await service.deleteReservationItems(createdIds) } diff --git a/packages/core/core-flows/src/reservation/steps/delete-reservations-by-line-items.ts b/packages/core/core-flows/src/reservation/steps/delete-reservations-by-line-items.ts index bae8f32719..88b6fcfde8 100644 --- a/packages/core/core-flows/src/reservation/steps/delete-reservations-by-line-items.ts +++ b/packages/core/core-flows/src/reservation/steps/delete-reservations-by-line-items.ts @@ -1,7 +1,7 @@ import { StepResponse, createStep } from "@medusajs/workflows-sdk" import { IInventoryService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" export const deleteReservationsByLineItemsStepId = "delete-reservations-by-line-items" @@ -11,9 +11,7 @@ export const deleteReservationsByLineItemsStepId = export const deleteReservationsByLineItemsStep = createStep( deleteReservationsByLineItemsStepId, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.INVENTORY - ) + const service = container.resolve(Modules.INVENTORY) await service.deleteReservationItemsByLineItem(ids) @@ -24,9 +22,7 @@ export const deleteReservationsByLineItemsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.INVENTORY - ) + const service = container.resolve(Modules.INVENTORY) await service.restoreReservationItemsByLineItem(prevIds) } diff --git a/packages/core/core-flows/src/reservation/steps/delete-reservations.ts b/packages/core/core-flows/src/reservation/steps/delete-reservations.ts index ac8eb00e77..acb30006b0 100644 --- a/packages/core/core-flows/src/reservation/steps/delete-reservations.ts +++ b/packages/core/core-flows/src/reservation/steps/delete-reservations.ts @@ -1,7 +1,7 @@ import { StepResponse, createStep } from "@medusajs/workflows-sdk" import { IInventoryService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" export const deleteReservationsStepId = "delete-reservations" /** @@ -10,9 +10,7 @@ export const deleteReservationsStepId = "delete-reservations" export const deleteReservationsStep = createStep( deleteReservationsStepId, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.INVENTORY - ) + const service = container.resolve(Modules.INVENTORY) await service.softDeleteReservationItems(ids) @@ -23,9 +21,7 @@ export const deleteReservationsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.INVENTORY - ) + const service = container.resolve(Modules.INVENTORY) await service.restoreReservationItems(prevIds) } diff --git a/packages/core/core-flows/src/reservation/steps/update-reservations.ts b/packages/core/core-flows/src/reservation/steps/update-reservations.ts index 13c83532c2..eb998f2312 100644 --- a/packages/core/core-flows/src/reservation/steps/update-reservations.ts +++ b/packages/core/core-flows/src/reservation/steps/update-reservations.ts @@ -5,7 +5,7 @@ import { } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" export const updateReservationsStepId = "update-reservations-step" /** @@ -15,7 +15,7 @@ export const updateReservationsStep = createStep( updateReservationsStepId, async (data: InventoryTypes.UpdateReservationItemInput[], { container }) => { const inventoryModuleService = container.resolve( - ModuleRegistrationName.INVENTORY + Modules.INVENTORY ) const { selects, relations } = getSelectsAndRelationsFromObjectArray(data) @@ -41,7 +41,7 @@ export const updateReservationsStep = createStep( const { dataBeforeUpdate = [], selects, relations } = revertInput const inventoryModuleService = container.resolve( - ModuleRegistrationName.INVENTORY + Modules.INVENTORY ) await inventoryModuleService.updateReservationItems( diff --git a/packages/core/core-flows/src/return-reason/steps/create-return-reasons.ts b/packages/core/core-flows/src/return-reason/steps/create-return-reasons.ts index 3a0e1ef198..6e074503a6 100644 --- a/packages/core/core-flows/src/return-reason/steps/create-return-reasons.ts +++ b/packages/core/core-flows/src/return-reason/steps/create-return-reasons.ts @@ -2,7 +2,7 @@ import { CreateOrderReturnReasonDTO, IOrderModuleService, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createReturnReasonsStepId = "create-return-reasons" @@ -12,9 +12,7 @@ export const createReturnReasonsStepId = "create-return-reasons" export const createReturnReasonsStep = createStep( createReturnReasonsStepId, async (data: CreateOrderReturnReasonDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const createdReturnReasons = await service.createReturnReasons(data) @@ -30,9 +28,7 @@ export const createReturnReasonsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.deleteReturnReasons(createdReturnReasonIds) } diff --git a/packages/core/core-flows/src/return-reason/steps/delete-return-reasons.ts b/packages/core/core-flows/src/return-reason/steps/delete-return-reasons.ts index 6fc2e31750..8a284322c5 100644 --- a/packages/core/core-flows/src/return-reason/steps/delete-return-reasons.ts +++ b/packages/core/core-flows/src/return-reason/steps/delete-return-reasons.ts @@ -1,5 +1,5 @@ import { IOrderModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { createStep, StepResponse } from "@medusajs/workflows-sdk" export const deleteReturnReasonStepId = "delete-return-reasons" @@ -9,9 +9,7 @@ export const deleteReturnReasonStepId = "delete-return-reasons" export const deleteReturnReasonStep = createStep( deleteReturnReasonStepId, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.softDeleteReturnReasons(ids) @@ -22,9 +20,7 @@ export const deleteReturnReasonStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await service.restoreReturnReasons(prevReturnReasons) } diff --git a/packages/core/core-flows/src/return-reason/steps/update-return-reasons.ts b/packages/core/core-flows/src/return-reason/steps/update-return-reasons.ts index e67abe5902..0f4117e37b 100644 --- a/packages/core/core-flows/src/return-reason/steps/update-return-reasons.ts +++ b/packages/core/core-flows/src/return-reason/steps/update-return-reasons.ts @@ -4,7 +4,7 @@ import { ReturnReasonUpdatableFields, } from "@medusajs/types" import { - ModuleRegistrationName, + Modules, getSelectsAndRelationsFromObjectArray, promiseAll, } from "@medusajs/utils" @@ -22,9 +22,7 @@ export const updateReturnReasonStepId = "update-return-reasons" export const updateReturnReasonsStep = createStep( updateReturnReasonStepId, async (data: UpdateReturnReasonStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) const { selects, relations } = getSelectsAndRelationsFromObjectArray([ data.update, @@ -46,9 +44,7 @@ export const updateReturnReasonsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.ORDER - ) + const service = container.resolve(Modules.ORDER) await promiseAll( prevReturnReasons.map((c) => diff --git a/packages/core/core-flows/src/sales-channel/steps/create-default-sales-channel.ts b/packages/core/core-flows/src/sales-channel/steps/create-default-sales-channel.ts index 960603a107..2e63100b81 100644 --- a/packages/core/core-flows/src/sales-channel/steps/create-default-sales-channel.ts +++ b/packages/core/core-flows/src/sales-channel/steps/create-default-sales-channel.ts @@ -2,7 +2,7 @@ import { CreateSalesChannelDTO, ISalesChannelModuleService, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface CreateDefaultSalesChannelStepInput { @@ -17,7 +17,7 @@ export const createDefaultSalesChannelStep = createStep( createDefaultSalesChannelStepId, async (input: CreateDefaultSalesChannelStepInput, { container }) => { const salesChannelService = container.resolve( - ModuleRegistrationName.SALES_CHANNEL + Modules.SALES_CHANNEL ) if (!salesChannelService) { @@ -44,7 +44,7 @@ export const createDefaultSalesChannelStep = createStep( } const service = container.resolve( - ModuleRegistrationName.SALES_CHANNEL + Modules.SALES_CHANNEL ) await service.deleteSalesChannels(data.id) diff --git a/packages/core/core-flows/src/sales-channel/steps/create-sales-channels.ts b/packages/core/core-flows/src/sales-channel/steps/create-sales-channels.ts index cac37ff84a..f6ce455f12 100644 --- a/packages/core/core-flows/src/sales-channel/steps/create-sales-channels.ts +++ b/packages/core/core-flows/src/sales-channel/steps/create-sales-channels.ts @@ -2,7 +2,7 @@ import { CreateSalesChannelDTO, ISalesChannelModuleService, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface CreateSalesChannelsStepInput { @@ -17,7 +17,7 @@ export const createSalesChannelsStep = createStep( createSalesChannelsStepId, async (input: CreateSalesChannelsStepInput, { container }) => { const salesChannelService = container.resolve( - ModuleRegistrationName.SALES_CHANNEL + Modules.SALES_CHANNEL ) const salesChannels = await salesChannelService.createSalesChannels( @@ -35,7 +35,7 @@ export const createSalesChannelsStep = createStep( } const service = container.resolve( - ModuleRegistrationName.SALES_CHANNEL + Modules.SALES_CHANNEL ) await service.deleteSalesChannels(createdIds) diff --git a/packages/core/core-flows/src/sales-channel/steps/delete-sales-channels.ts b/packages/core/core-flows/src/sales-channel/steps/delete-sales-channels.ts index 2f1d204e2b..320815d9ed 100644 --- a/packages/core/core-flows/src/sales-channel/steps/delete-sales-channels.ts +++ b/packages/core/core-flows/src/sales-channel/steps/delete-sales-channels.ts @@ -1,5 +1,5 @@ import { ISalesChannelModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteSalesChannelsStepId = "delete-sales-channels" @@ -10,7 +10,7 @@ export const deleteSalesChannelsStep = createStep( deleteSalesChannelsStepId, async (ids: string[], { container }) => { const service = container.resolve( - ModuleRegistrationName.SALES_CHANNEL + Modules.SALES_CHANNEL ) await service.softDeleteSalesChannels(ids) @@ -23,7 +23,7 @@ export const deleteSalesChannelsStep = createStep( } const service = container.resolve( - ModuleRegistrationName.SALES_CHANNEL + Modules.SALES_CHANNEL ) await service.restoreSalesChannels(prevSalesChannelIds) diff --git a/packages/core/core-flows/src/sales-channel/steps/update-sales-channels.ts b/packages/core/core-flows/src/sales-channel/steps/update-sales-channels.ts index c81f82bb28..e2cfe0cb3d 100644 --- a/packages/core/core-flows/src/sales-channel/steps/update-sales-channels.ts +++ b/packages/core/core-flows/src/sales-channel/steps/update-sales-channels.ts @@ -3,10 +3,7 @@ import { ISalesChannelModuleService, UpdateSalesChannelDTO, } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type UpdateSalesChannelsStepInput = { @@ -22,7 +19,7 @@ export const updateSalesChannelsStep = createStep( updateSalesChannelsStepId, async (data: UpdateSalesChannelsStepInput, { container }) => { const service = container.resolve( - ModuleRegistrationName.SALES_CHANNEL + Modules.SALES_CHANNEL ) const { selects, relations } = getSelectsAndRelationsFromObjectArray([ @@ -47,7 +44,7 @@ export const updateSalesChannelsStep = createStep( } const service = container.resolve( - ModuleRegistrationName.SALES_CHANNEL + Modules.SALES_CHANNEL ) await service.upsertSalesChannels( diff --git a/packages/core/core-flows/src/shipping-options/steps/list-shipping-options-for-context.ts b/packages/core/core-flows/src/shipping-options/steps/list-shipping-options-for-context.ts index dea019cf52..602a58e704 100644 --- a/packages/core/core-flows/src/shipping-options/steps/list-shipping-options-for-context.ts +++ b/packages/core/core-flows/src/shipping-options/steps/list-shipping-options-for-context.ts @@ -3,7 +3,7 @@ import { IFulfillmentModuleService, ShippingOptionDTO, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export interface ListShippingOptionsForContextStepInput { @@ -20,7 +20,7 @@ export const listShippingOptionsForContextStep = createStep( listShippingOptionsForContextStepId, async (data: ListShippingOptionsForContextStepInput, { container }) => { const fulfillmentService = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) const shippingOptions = diff --git a/packages/core/core-flows/src/shipping-profile/steps/delete-shipping-profile.ts b/packages/core/core-flows/src/shipping-profile/steps/delete-shipping-profile.ts index c919ed6f29..4612a5bb68 100644 --- a/packages/core/core-flows/src/shipping-profile/steps/delete-shipping-profile.ts +++ b/packages/core/core-flows/src/shipping-profile/steps/delete-shipping-profile.ts @@ -1,5 +1,5 @@ import { IFulfillmentModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteShippingProfilesStepId = "delete-shipping-profile" @@ -10,7 +10,7 @@ export const deleteShippingProfilesStep = createStep( deleteShippingProfilesStepId, async (ids: string[], { container }) => { const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) await service.softDeleteShippingProfiles(ids) @@ -23,7 +23,7 @@ export const deleteShippingProfilesStep = createStep( } const service = container.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) await service.restoreShippingProfiles(prevIds) diff --git a/packages/core/core-flows/src/stock-location/steps/create-stock-locations.ts b/packages/core/core-flows/src/stock-location/steps/create-stock-locations.ts index aa84d47893..b612a2bd9b 100644 --- a/packages/core/core-flows/src/stock-location/steps/create-stock-locations.ts +++ b/packages/core/core-flows/src/stock-location/steps/create-stock-locations.ts @@ -4,7 +4,7 @@ import { } from "@medusajs/types" import { StepResponse, createStep } from "@medusajs/workflows-sdk" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" export const createStockLocationsStepId = "create-stock-locations" /** @@ -14,7 +14,7 @@ export const createStockLocations = createStep( createStockLocationsStepId, async (data: CreateStockLocationInput[], { container }) => { const stockLocationService = container.resolve( - ModuleRegistrationName.STOCK_LOCATION + Modules.STOCK_LOCATION ) const created = await stockLocationService.createStockLocations(data) @@ -29,9 +29,7 @@ export const createStockLocations = createStep( return } - const stockLocationService = container.resolve( - ModuleRegistrationName.STOCK_LOCATION - ) + const stockLocationService = container.resolve(Modules.STOCK_LOCATION) await stockLocationService.deleteStockLocations(createdStockLocationIds) } diff --git a/packages/core/core-flows/src/stock-location/steps/delete-stock-locations.ts b/packages/core/core-flows/src/stock-location/steps/delete-stock-locations.ts index 56381cbee9..f182d402e9 100644 --- a/packages/core/core-flows/src/stock-location/steps/delete-stock-locations.ts +++ b/packages/core/core-flows/src/stock-location/steps/delete-stock-locations.ts @@ -1,6 +1,6 @@ import { DeleteEntityInput } from "@medusajs/modules-sdk" -import { ModuleRegistrationName, Modules } from "@medusajs/utils" -import { createStep, StepResponse } from "@medusajs/workflows-sdk" +import { Modules } from "@medusajs/utils" +import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteStockLocationsStepId = "delete-stock-locations-step" /** @@ -9,7 +9,7 @@ export const deleteStockLocationsStepId = "delete-stock-locations-step" export const deleteStockLocationsStep = createStep( deleteStockLocationsStepId, async (input: string[], { container }) => { - const service = container.resolve(ModuleRegistrationName.STOCK_LOCATION) + const service = container.resolve(Modules.STOCK_LOCATION) const softDeletedEntities = await service.softDeleteStockLocations(input) @@ -24,7 +24,7 @@ export const deleteStockLocationsStep = createStep( if (!deletedLocationIds?.length) { return } - const service = container.resolve(ModuleRegistrationName.STOCK_LOCATION) + const service = container.resolve(Modules.STOCK_LOCATION) await service.restoreStockLocations(deletedLocationIds) } diff --git a/packages/core/core-flows/src/stock-location/steps/update-stock-locations.ts b/packages/core/core-flows/src/stock-location/steps/update-stock-locations.ts index 8808fbf399..2cf3a0db5b 100644 --- a/packages/core/core-flows/src/stock-location/steps/update-stock-locations.ts +++ b/packages/core/core-flows/src/stock-location/steps/update-stock-locations.ts @@ -6,7 +6,7 @@ import { import { getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" interface StepInput { selector: FilterableStockLocationProps @@ -21,7 +21,7 @@ export const updateStockLocationsStep = createStep( updateStockLocationsStepId, async (input: StepInput, { container }) => { const stockLocationService = container.resolve( - ModuleRegistrationName.STOCK_LOCATION + Modules.STOCK_LOCATION ) const { selects, relations } = getSelectsAndRelationsFromObjectArray([ input.update, @@ -49,7 +49,7 @@ export const updateStockLocationsStep = createStep( } const stockLocationService = container.resolve( - ModuleRegistrationName.STOCK_LOCATION + Modules.STOCK_LOCATION ) await stockLocationService.upsertStockLocations( diff --git a/packages/core/core-flows/src/store/steps/create-stores.ts b/packages/core/core-flows/src/store/steps/create-stores.ts index 8b369d792a..2cbef1043d 100644 --- a/packages/core/core-flows/src/store/steps/create-stores.ts +++ b/packages/core/core-flows/src/store/steps/create-stores.ts @@ -1,5 +1,5 @@ import { CreateStoreDTO, IStoreModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createStoresStepId = "create-stores" @@ -9,9 +9,7 @@ export const createStoresStepId = "create-stores" export const createStoresStep = createStep( createStoresStepId, async (data: CreateStoreDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.STORE - ) + const service = container.resolve(Modules.STORE) const created = await service.createStores(data) return new StepResponse( @@ -24,9 +22,7 @@ export const createStoresStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.STORE - ) + const service = container.resolve(Modules.STORE) await service.deleteStores(createdIds) } diff --git a/packages/core/core-flows/src/store/steps/delete-stores.ts b/packages/core/core-flows/src/store/steps/delete-stores.ts index daaa261bf8..506a78e847 100644 --- a/packages/core/core-flows/src/store/steps/delete-stores.ts +++ b/packages/core/core-flows/src/store/steps/delete-stores.ts @@ -1,5 +1,5 @@ import { IStoreModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteStoresStepId = "delete-stores" @@ -9,9 +9,7 @@ export const deleteStoresStepId = "delete-stores" export const deleteStoresStep = createStep( deleteStoresStepId, async (ids: string[], { container }) => { - const storeModule = container.resolve( - ModuleRegistrationName.STORE - ) + const storeModule = container.resolve(Modules.STORE) await storeModule.softDeleteStores(ids) return new StepResponse(void 0, ids) @@ -21,9 +19,7 @@ export const deleteStoresStep = createStep( return } - const storeModule = container.resolve( - ModuleRegistrationName.STORE - ) + const storeModule = container.resolve(Modules.STORE) await storeModule.restoreStores(idsToRestore) } diff --git a/packages/core/core-flows/src/store/steps/update-stores.ts b/packages/core/core-flows/src/store/steps/update-stores.ts index 0ba55217ac..1329250db1 100644 --- a/packages/core/core-flows/src/store/steps/update-stores.ts +++ b/packages/core/core-flows/src/store/steps/update-stores.ts @@ -3,10 +3,7 @@ import { IStoreModuleService, UpdateStoreDTO, } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type UpdateStoresStepInput = { @@ -21,9 +18,7 @@ export const updateStoresStepId = "update-stores" export const updateStoresStep = createStep( updateStoresStepId, async (data: UpdateStoresStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.STORE - ) + const service = container.resolve(Modules.STORE) const { selects, relations } = getSelectsAndRelationsFromObjectArray([ data.update, @@ -42,9 +37,7 @@ export const updateStoresStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.STORE - ) + const service = container.resolve(Modules.STORE) await service.upsertStores( prevData.map((r) => ({ diff --git a/packages/core/core-flows/src/tax/steps/create-tax-rate-rules.ts b/packages/core/core-flows/src/tax/steps/create-tax-rate-rules.ts index 80bdc76e0b..25d1f3aa51 100644 --- a/packages/core/core-flows/src/tax/steps/create-tax-rate-rules.ts +++ b/packages/core/core-flows/src/tax/steps/create-tax-rate-rules.ts @@ -1,5 +1,5 @@ import { CreateTaxRateRuleDTO, ITaxModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createTaxRateRulesStepId = "create-tax-rate-rules" @@ -9,9 +9,7 @@ export const createTaxRateRulesStepId = "create-tax-rate-rules" export const createTaxRateRulesStep = createStep( createTaxRateRulesStepId, async (data: CreateTaxRateRuleDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.TAX - ) + const service = container.resolve(Modules.TAX) const created = await service.createTaxRateRules(data) @@ -25,9 +23,7 @@ export const createTaxRateRulesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.TAX - ) + const service = container.resolve(Modules.TAX) await service.deleteTaxRateRules(createdIds) } diff --git a/packages/core/core-flows/src/tax/steps/create-tax-rates.ts b/packages/core/core-flows/src/tax/steps/create-tax-rates.ts index 4da05d7278..97f4a3b417 100644 --- a/packages/core/core-flows/src/tax/steps/create-tax-rates.ts +++ b/packages/core/core-flows/src/tax/steps/create-tax-rates.ts @@ -1,5 +1,5 @@ import { CreateTaxRateDTO, ITaxModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createTaxRatesStepId = "create-tax-rates" @@ -9,9 +9,7 @@ export const createTaxRatesStepId = "create-tax-rates" export const createTaxRatesStep = createStep( createTaxRatesStepId, async (data: CreateTaxRateDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.TAX - ) + const service = container.resolve(Modules.TAX) const created = await service.createTaxRates(data) @@ -25,9 +23,7 @@ export const createTaxRatesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.TAX - ) + const service = container.resolve(Modules.TAX) await service.deleteTaxRates(createdIds) } diff --git a/packages/core/core-flows/src/tax/steps/create-tax-regions.ts b/packages/core/core-flows/src/tax/steps/create-tax-regions.ts index 72c7a4e7e2..17ef70992f 100644 --- a/packages/core/core-flows/src/tax/steps/create-tax-regions.ts +++ b/packages/core/core-flows/src/tax/steps/create-tax-regions.ts @@ -1,5 +1,5 @@ import { CreateTaxRegionDTO, ITaxModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createTaxRegionsStepId = "create-tax-regions" @@ -9,9 +9,7 @@ export const createTaxRegionsStepId = "create-tax-regions" export const createTaxRegionsStep = createStep( createTaxRegionsStepId, async (data: CreateTaxRegionDTO[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.TAX - ) + const service = container.resolve(Modules.TAX) const created = await service.createTaxRegions(data) @@ -25,9 +23,7 @@ export const createTaxRegionsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.TAX - ) + const service = container.resolve(Modules.TAX) await service.deleteTaxRegions(createdIds) } diff --git a/packages/core/core-flows/src/tax/steps/delete-tax-rate-rules.ts b/packages/core/core-flows/src/tax/steps/delete-tax-rate-rules.ts index 4c57ba5f6b..e436e7a978 100644 --- a/packages/core/core-flows/src/tax/steps/delete-tax-rate-rules.ts +++ b/packages/core/core-flows/src/tax/steps/delete-tax-rate-rules.ts @@ -1,5 +1,5 @@ import { ITaxModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteTaxRateRulesStepId = "delete-tax-rate-rules" @@ -13,9 +13,7 @@ export const deleteTaxRateRulesStep = createStep( return new StepResponse(void 0, []) } - const service = container.resolve( - ModuleRegistrationName.TAX - ) + const service = container.resolve(Modules.TAX) await service.softDeleteTaxRateRules(ids) @@ -26,9 +24,7 @@ export const deleteTaxRateRulesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.TAX - ) + const service = container.resolve(Modules.TAX) await service.restoreTaxRateRules(prevIds) } diff --git a/packages/core/core-flows/src/tax/steps/delete-tax-rates.ts b/packages/core/core-flows/src/tax/steps/delete-tax-rates.ts index 89b2102d74..03b63b80f4 100644 --- a/packages/core/core-flows/src/tax/steps/delete-tax-rates.ts +++ b/packages/core/core-flows/src/tax/steps/delete-tax-rates.ts @@ -1,5 +1,5 @@ import { ITaxModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { createStep, StepResponse } from "@medusajs/workflows-sdk" export const deleteTaxRatesStepId = "delete-tax-rates" @@ -9,9 +9,7 @@ export const deleteTaxRatesStepId = "delete-tax-rates" export const deleteTaxRatesStep = createStep( deleteTaxRatesStepId, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.TAX - ) + const service = container.resolve(Modules.TAX) await service.softDeleteTaxRates(ids) @@ -22,9 +20,7 @@ export const deleteTaxRatesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.TAX - ) + const service = container.resolve(Modules.TAX) await service.restoreTaxRates(prevIds) } diff --git a/packages/core/core-flows/src/tax/steps/delete-tax-regions.ts b/packages/core/core-flows/src/tax/steps/delete-tax-regions.ts index 8a33fb7adb..107a3b47f7 100644 --- a/packages/core/core-flows/src/tax/steps/delete-tax-regions.ts +++ b/packages/core/core-flows/src/tax/steps/delete-tax-regions.ts @@ -1,5 +1,5 @@ import { ITaxModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteTaxRegionsStepId = "delete-tax-regions" @@ -9,9 +9,7 @@ export const deleteTaxRegionsStepId = "delete-tax-regions" export const deleteTaxRegionsStep = createStep( deleteTaxRegionsStepId, async (ids: string[], { container }) => { - const service = container.resolve( - ModuleRegistrationName.TAX - ) + const service = container.resolve(Modules.TAX) await service.softDeleteTaxRegions(ids) @@ -22,9 +20,7 @@ export const deleteTaxRegionsStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.TAX - ) + const service = container.resolve(Modules.TAX) await service.restoreTaxRegions(prevIds) } diff --git a/packages/core/core-flows/src/tax/steps/list-tax-rate-ids.ts b/packages/core/core-flows/src/tax/steps/list-tax-rate-ids.ts index f945060cde..e88896dfd5 100644 --- a/packages/core/core-flows/src/tax/steps/list-tax-rate-ids.ts +++ b/packages/core/core-flows/src/tax/steps/list-tax-rate-ids.ts @@ -1,6 +1,6 @@ import { FilterableTaxRateProps, ITaxModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" -import { createStep, StepResponse } from "@medusajs/workflows-sdk" +import { Modules } from "@medusajs/utils" +import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type ListTaxRateIdsStepInput = { selector: FilterableTaxRateProps @@ -13,9 +13,7 @@ export const listTaxRateIdsStepId = "list-tax-rate-ids" export const listTaxRateIdsStep = createStep( listTaxRateIdsStepId, async (input: ListTaxRateIdsStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.TAX - ) + const service = container.resolve(Modules.TAX) const rates = await service.listTaxRates(input.selector, { select: ["id"], diff --git a/packages/core/core-flows/src/tax/steps/list-tax-rate-rule-ids.ts b/packages/core/core-flows/src/tax/steps/list-tax-rate-rule-ids.ts index 93fddc41d3..31354eaede 100644 --- a/packages/core/core-flows/src/tax/steps/list-tax-rate-rule-ids.ts +++ b/packages/core/core-flows/src/tax/steps/list-tax-rate-rule-ids.ts @@ -1,6 +1,6 @@ import { FilterableTaxRateRuleProps, ITaxModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" -import { createStep, StepResponse } from "@medusajs/workflows-sdk" +import { Modules } from "@medusajs/utils" +import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type ListTaxRateRuleIdsStepInput = { selector: FilterableTaxRateRuleProps @@ -13,9 +13,7 @@ export const listTaxRateRuleIdsStepId = "list-tax-rate-rule-ids" export const listTaxRateRuleIdsStep = createStep( listTaxRateRuleIdsStepId, async (input: ListTaxRateRuleIdsStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.TAX - ) + const service = container.resolve(Modules.TAX) const rules = await service.listTaxRateRules(input.selector, { select: ["id"], diff --git a/packages/core/core-flows/src/tax/steps/update-tax-rates.ts b/packages/core/core-flows/src/tax/steps/update-tax-rates.ts index f824d58136..8255d1834b 100644 --- a/packages/core/core-flows/src/tax/steps/update-tax-rates.ts +++ b/packages/core/core-flows/src/tax/steps/update-tax-rates.ts @@ -3,10 +3,7 @@ import { ITaxModuleService, UpdateTaxRateDTO, } from "@medusajs/types" -import { - ModuleRegistrationName, - getSelectsAndRelationsFromObjectArray, -} from "@medusajs/utils" +import { Modules, getSelectsAndRelationsFromObjectArray } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export type UpdateTaxRatesStepInput = { @@ -21,9 +18,7 @@ export const updateTaxRatesStepId = "update-tax-rates" export const updateTaxRatesStep = createStep( updateTaxRatesStepId, async (data: UpdateTaxRatesStepInput, { container }) => { - const service = container.resolve( - ModuleRegistrationName.TAX - ) + const service = container.resolve(Modules.TAX) const { selects, relations } = getSelectsAndRelationsFromObjectArray([ data.update, @@ -43,9 +38,7 @@ export const updateTaxRatesStep = createStep( return } - const service = container.resolve( - ModuleRegistrationName.TAX - ) + const service = container.resolve(Modules.TAX) await service.upsertTaxRates(prevData) } diff --git a/packages/core/core-flows/src/tax/workflows/update-tax-rates.ts b/packages/core/core-flows/src/tax/workflows/update-tax-rates.ts index 811558b5f5..9817486167 100644 --- a/packages/core/core-flows/src/tax/workflows/update-tax-rates.ts +++ b/packages/core/core-flows/src/tax/workflows/update-tax-rates.ts @@ -4,7 +4,7 @@ import { TaxRateDTO, UpdateTaxRateDTO, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, WorkflowData, @@ -75,9 +75,7 @@ export const maybeListTaxRateRuleIdsStep = createStep( return new StepResponse([]) } - const service = container.resolve( - ModuleRegistrationName.TAX - ) + const service = container.resolve(Modules.TAX) const rules = await service.listTaxRateRules( { tax_rate_id: tax_rate_ids }, @@ -94,7 +92,9 @@ export const updateTaxRatesWorkflowId = "update-tax-rates" */ export const updateTaxRatesWorkflow = createWorkflow( updateTaxRatesWorkflowId, - (input: WorkflowData): WorkflowResponse => { + ( + input: WorkflowData + ): WorkflowResponse => { const cleanedUpdateInput = transform(input, (data) => { // Transform clones data so we can safely modify it if (data.update.rules) { diff --git a/packages/core/core-flows/src/user/steps/create-users.ts b/packages/core/core-flows/src/user/steps/create-users.ts index ddca9d922e..0f2be987f4 100644 --- a/packages/core/core-flows/src/user/steps/create-users.ts +++ b/packages/core/core-flows/src/user/steps/create-users.ts @@ -1,5 +1,5 @@ import { CreateUserDTO, IUserModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const createUsersStepId = "create-users-step" @@ -9,9 +9,7 @@ export const createUsersStepId = "create-users-step" export const createUsersStep = createStep( createUsersStepId, async (input: CreateUserDTO[], { container }) => { - const service: IUserModuleService = container.resolve( - ModuleRegistrationName.USER - ) + const service: IUserModuleService = container.resolve(Modules.USER) const users = await service.createUsers(input) return new StepResponse(users) }, @@ -19,7 +17,7 @@ export const createUsersStep = createStep( if (!createdUsers?.length) { return } - const service = container.resolve(ModuleRegistrationName.USER) + const service = container.resolve(Modules.USER) await service.deleteUsers(createdUsers.map((user) => user.id)) } ) diff --git a/packages/core/core-flows/src/user/steps/delete-users.ts b/packages/core/core-flows/src/user/steps/delete-users.ts index d8012b1a60..28a6a0f941 100644 --- a/packages/core/core-flows/src/user/steps/delete-users.ts +++ b/packages/core/core-flows/src/user/steps/delete-users.ts @@ -1,5 +1,5 @@ import { IUserModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const deleteUsersStepId = "delete-users-step" @@ -9,9 +9,7 @@ export const deleteUsersStepId = "delete-users-step" export const deleteUsersStep = createStep( deleteUsersStepId, async (input: string[], { container }) => { - const service: IUserModuleService = container.resolve( - ModuleRegistrationName.USER - ) + const service: IUserModuleService = container.resolve(Modules.USER) await service.softDeleteUsers(input) @@ -22,9 +20,7 @@ export const deleteUsersStep = createStep( return } - const service: IUserModuleService = container.resolve( - ModuleRegistrationName.USER - ) + const service: IUserModuleService = container.resolve(Modules.USER) await service.restoreUsers(prevUserIds) } diff --git a/packages/core/core-flows/src/user/steps/update-users.ts b/packages/core/core-flows/src/user/steps/update-users.ts index cc7c3ad9fc..dfabbde648 100644 --- a/packages/core/core-flows/src/user/steps/update-users.ts +++ b/packages/core/core-flows/src/user/steps/update-users.ts @@ -1,5 +1,5 @@ import { IUserModuleService, UpdateUserDTO } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { StepResponse, createStep } from "@medusajs/workflows-sdk" export const updateUsersStepId = "update-users-step" @@ -10,7 +10,7 @@ export const updateUsersStep = createStep( updateUsersStepId, async (input: UpdateUserDTO[], { container }) => { const service: IUserModuleService = container.resolve( - ModuleRegistrationName.USER + Modules.USER ) if (!input.length) { @@ -29,7 +29,7 @@ export const updateUsersStep = createStep( return } - const service = container.resolve(ModuleRegistrationName.USER) + const service = container.resolve(Modules.USER) await service.updateUsers( originalUsers.map((u) => ({ diff --git a/packages/core/medusa-test-utils/src/module-test-runner.ts b/packages/core/medusa-test-utils/src/module-test-runner.ts index 4226650909..125649a90a 100644 --- a/packages/core/medusa-test-utils/src/module-test-runner.ts +++ b/packages/core/medusa-test-utils/src/module-test-runner.ts @@ -2,14 +2,15 @@ import { ContainerRegistrationKeys, DmlEntity, loadModels, + Modules, ModulesSdkUtils, normalizeImportPathWithSource, toMikroOrmEntities, } from "@medusajs/utils" +import * as fs from "fs" import { getDatabaseURL, getMikroOrmWrapper, TestDatabase } from "./database" import { initModules, InitModulesOptions } from "./init-modules" import { default as MockEventBusService } from "./mock-event-bus-service" -import * as fs from "fs" export interface SuiteOptions { MikroOrmWrapper: TestDatabase @@ -121,7 +122,7 @@ export function moduleIntegrationTestRunner({ const moduleOptions_: InitModulesOptions = { injectedDependencies: { [ContainerRegistrationKeys.PG_CONNECTION]: connection, - eventBusModuleService: new MockEventBusService(), + [Modules.EVENT_BUS]: new MockEventBusService(), [ContainerRegistrationKeys.LOGGER]: console, ...injectedDependencies, }, diff --git a/packages/core/modules-sdk/src/definitions.ts b/packages/core/modules-sdk/src/definitions.ts index 514fd94f87..746c223540 100644 --- a/packages/core/modules-sdk/src/definitions.ts +++ b/packages/core/modules-sdk/src/definitions.ts @@ -1,9 +1,5 @@ import { ModuleDefinition } from "@medusajs/types" -import { - ModuleRegistrationName, - Modules, - upperCaseFirst, -} from "@medusajs/utils" +import { Modules, upperCaseFirst } from "@medusajs/utils" import { MODULE_RESOURCE_TYPE, MODULE_SCOPE } from "./types" export const MODULE_PACKAGE_NAMES = { @@ -38,9 +34,8 @@ export const ModulesDefinition: { } = { [Modules.EVENT_BUS]: { key: Modules.EVENT_BUS, - registrationName: ModuleRegistrationName.EVENT_BUS, defaultPackage: MODULE_PACKAGE_NAMES[Modules.EVENT_BUS], - label: upperCaseFirst(ModuleRegistrationName.EVENT_BUS), + label: upperCaseFirst(Modules.EVENT_BUS), isRequired: true, isQueryable: false, dependencies: ["logger"], @@ -51,12 +46,11 @@ export const ModulesDefinition: { }, [Modules.STOCK_LOCATION]: { key: Modules.STOCK_LOCATION, - registrationName: ModuleRegistrationName.STOCK_LOCATION, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.STOCK_LOCATION), + label: upperCaseFirst(Modules.STOCK_LOCATION), isRequired: false, isQueryable: true, - dependencies: [ModuleRegistrationName.EVENT_BUS], + dependencies: [Modules.EVENT_BUS], defaultModuleDeclaration: { scope: MODULE_SCOPE.INTERNAL, resources: MODULE_RESOURCE_TYPE.SHARED, @@ -64,12 +58,11 @@ export const ModulesDefinition: { }, [Modules.INVENTORY]: { key: Modules.INVENTORY, - registrationName: ModuleRegistrationName.INVENTORY, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.INVENTORY), + label: upperCaseFirst(Modules.INVENTORY), isRequired: false, isQueryable: true, - dependencies: [ModuleRegistrationName.EVENT_BUS], + dependencies: [Modules.EVENT_BUS], defaultModuleDeclaration: { scope: MODULE_SCOPE.INTERNAL, resources: MODULE_RESOURCE_TYPE.SHARED, @@ -77,9 +70,8 @@ export const ModulesDefinition: { }, [Modules.CACHE]: { key: Modules.CACHE, - registrationName: ModuleRegistrationName.CACHE, defaultPackage: MODULE_PACKAGE_NAMES[Modules.CACHE], - label: upperCaseFirst(ModuleRegistrationName.CACHE), + label: upperCaseFirst(Modules.CACHE), isRequired: true, isQueryable: false, defaultModuleDeclaration: { @@ -89,12 +81,11 @@ export const ModulesDefinition: { }, [Modules.PRODUCT]: { key: Modules.PRODUCT, - registrationName: ModuleRegistrationName.PRODUCT, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.PRODUCT), + label: upperCaseFirst(Modules.PRODUCT), isRequired: false, isQueryable: true, - dependencies: [ModuleRegistrationName.EVENT_BUS, "logger"], + dependencies: [Modules.EVENT_BUS, "logger"], defaultModuleDeclaration: { scope: MODULE_SCOPE.INTERNAL, resources: MODULE_RESOURCE_TYPE.SHARED, @@ -102,12 +93,11 @@ export const ModulesDefinition: { }, [Modules.PRICING]: { key: Modules.PRICING, - registrationName: ModuleRegistrationName.PRICING, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.PRICING), + label: upperCaseFirst(Modules.PRICING), isRequired: false, isQueryable: true, - dependencies: [ModuleRegistrationName.EVENT_BUS, "logger"], + dependencies: [Modules.EVENT_BUS, "logger"], defaultModuleDeclaration: { scope: MODULE_SCOPE.INTERNAL, resources: MODULE_RESOURCE_TYPE.SHARED, @@ -115,9 +105,8 @@ export const ModulesDefinition: { }, [Modules.PROMOTION]: { key: Modules.PROMOTION, - registrationName: ModuleRegistrationName.PROMOTION, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.PROMOTION), + label: upperCaseFirst(Modules.PROMOTION), isRequired: false, isQueryable: true, dependencies: ["logger"], @@ -128,9 +117,8 @@ export const ModulesDefinition: { }, [Modules.AUTH]: { key: Modules.AUTH, - registrationName: ModuleRegistrationName.AUTH, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.AUTH), + label: upperCaseFirst(Modules.AUTH), isRequired: false, isQueryable: true, dependencies: ["logger"], @@ -141,9 +129,8 @@ export const ModulesDefinition: { }, [Modules.WORKFLOW_ENGINE]: { key: Modules.WORKFLOW_ENGINE, - registrationName: ModuleRegistrationName.WORKFLOW_ENGINE, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.WORKFLOW_ENGINE), + label: upperCaseFirst(Modules.WORKFLOW_ENGINE), isRequired: false, isQueryable: true, dependencies: ["logger"], @@ -155,9 +142,8 @@ export const ModulesDefinition: { }, [Modules.SALES_CHANNEL]: { key: Modules.SALES_CHANNEL, - registrationName: ModuleRegistrationName.SALES_CHANNEL, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.SALES_CHANNEL), + label: upperCaseFirst(Modules.SALES_CHANNEL), isRequired: false, isQueryable: true, dependencies: ["logger"], @@ -168,12 +154,11 @@ export const ModulesDefinition: { }, [Modules.FULFILLMENT]: { key: Modules.FULFILLMENT, - registrationName: ModuleRegistrationName.FULFILLMENT, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.FULFILLMENT), + label: upperCaseFirst(Modules.FULFILLMENT), isRequired: false, isQueryable: true, - dependencies: ["logger", ModuleRegistrationName.EVENT_BUS], + dependencies: ["logger", Modules.EVENT_BUS], defaultModuleDeclaration: { scope: MODULE_SCOPE.INTERNAL, resources: MODULE_RESOURCE_TYPE.SHARED, @@ -181,9 +166,8 @@ export const ModulesDefinition: { }, [Modules.CART]: { key: Modules.CART, - registrationName: ModuleRegistrationName.CART, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.CART), + label: upperCaseFirst(Modules.CART), isRequired: false, isQueryable: true, dependencies: ["logger"], @@ -194,9 +178,8 @@ export const ModulesDefinition: { }, [Modules.CUSTOMER]: { key: Modules.CUSTOMER, - registrationName: ModuleRegistrationName.CUSTOMER, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.CUSTOMER), + label: upperCaseFirst(Modules.CUSTOMER), isRequired: false, isQueryable: true, dependencies: ["logger"], @@ -207,9 +190,8 @@ export const ModulesDefinition: { }, [Modules.PAYMENT]: { key: Modules.PAYMENT, - registrationName: ModuleRegistrationName.PAYMENT, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.PAYMENT), + label: upperCaseFirst(Modules.PAYMENT), isRequired: false, isQueryable: true, dependencies: ["logger"], @@ -220,12 +202,11 @@ export const ModulesDefinition: { }, [Modules.USER]: { key: Modules.USER, - registrationName: ModuleRegistrationName.USER, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.USER), + label: upperCaseFirst(Modules.USER), isRequired: false, isQueryable: true, - dependencies: [ModuleRegistrationName.EVENT_BUS, "logger"], + dependencies: [Modules.EVENT_BUS, "logger"], defaultModuleDeclaration: { scope: MODULE_SCOPE.INTERNAL, resources: MODULE_RESOURCE_TYPE.SHARED, @@ -233,9 +214,8 @@ export const ModulesDefinition: { }, [Modules.REGION]: { key: Modules.REGION, - registrationName: ModuleRegistrationName.REGION, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.REGION), + label: upperCaseFirst(Modules.REGION), isRequired: false, isQueryable: true, dependencies: ["logger"], @@ -246,12 +226,11 @@ export const ModulesDefinition: { }, [Modules.ORDER]: { key: Modules.ORDER, - registrationName: ModuleRegistrationName.ORDER, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.ORDER), + label: upperCaseFirst(Modules.ORDER), isRequired: false, isQueryable: true, - dependencies: ["logger", ModuleRegistrationName.EVENT_BUS], + dependencies: ["logger", Modules.EVENT_BUS], defaultModuleDeclaration: { scope: MODULE_SCOPE.INTERNAL, resources: MODULE_RESOURCE_TYPE.SHARED, @@ -259,12 +238,11 @@ export const ModulesDefinition: { }, [Modules.TAX]: { key: Modules.TAX, - registrationName: ModuleRegistrationName.TAX, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.TAX), + label: upperCaseFirst(Modules.TAX), isRequired: false, isQueryable: true, - dependencies: ["logger", ModuleRegistrationName.EVENT_BUS], + dependencies: ["logger", Modules.EVENT_BUS], defaultModuleDeclaration: { scope: MODULE_SCOPE.INTERNAL, resources: MODULE_RESOURCE_TYPE.SHARED, @@ -272,9 +250,8 @@ export const ModulesDefinition: { }, [Modules.API_KEY]: { key: Modules.API_KEY, - registrationName: ModuleRegistrationName.API_KEY, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.API_KEY), + label: upperCaseFirst(Modules.API_KEY), isRequired: false, isQueryable: true, dependencies: ["logger"], @@ -285,9 +262,8 @@ export const ModulesDefinition: { }, [Modules.STORE]: { key: Modules.STORE, - registrationName: ModuleRegistrationName.STORE, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.STORE), + label: upperCaseFirst(Modules.STORE), isRequired: false, isQueryable: true, dependencies: ["logger"], @@ -298,9 +274,8 @@ export const ModulesDefinition: { }, [Modules.CURRENCY]: { key: Modules.CURRENCY, - registrationName: ModuleRegistrationName.CURRENCY, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.CURRENCY), + label: upperCaseFirst(Modules.CURRENCY), isRequired: false, isQueryable: true, dependencies: ["logger"], @@ -311,9 +286,8 @@ export const ModulesDefinition: { }, [Modules.FILE]: { key: Modules.FILE, - registrationName: ModuleRegistrationName.FILE, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.FILE), + label: upperCaseFirst(Modules.FILE), isRequired: false, isQueryable: true, dependencies: ["logger"], @@ -324,12 +298,11 @@ export const ModulesDefinition: { }, [Modules.NOTIFICATION]: { key: Modules.NOTIFICATION, - registrationName: ModuleRegistrationName.NOTIFICATION, defaultPackage: false, - label: upperCaseFirst(ModuleRegistrationName.NOTIFICATION), + label: upperCaseFirst(Modules.NOTIFICATION), isRequired: false, isQueryable: true, - dependencies: [ModuleRegistrationName.EVENT_BUS, "logger"], + dependencies: [Modules.EVENT_BUS, "logger"], defaultModuleDeclaration: { scope: MODULE_SCOPE.INTERNAL, resources: MODULE_RESOURCE_TYPE.SHARED, diff --git a/packages/core/modules-sdk/src/loaders/__tests__/medusa-module.ts b/packages/core/modules-sdk/src/loaders/__tests__/medusa-module.ts index 01da8f7ee6..24310ad0e1 100644 --- a/packages/core/modules-sdk/src/loaders/__tests__/medusa-module.ts +++ b/packages/core/modules-sdk/src/loaders/__tests__/medusa-module.ts @@ -9,7 +9,6 @@ const mockRegisterMedusaModule = jest.fn().mockImplementation(() => { moduleKey: { definition: { key: "moduleKey", - registrationName: "moduleKey", }, moduleDeclaration: { scope: MODULE_SCOPE.INTERNAL, diff --git a/packages/core/modules-sdk/src/loaders/__tests__/module-loader.ts b/packages/core/modules-sdk/src/loaders/__tests__/module-loader.ts index 1a2d7941ca..0181197586 100644 --- a/packages/core/modules-sdk/src/loaders/__tests__/module-loader.ts +++ b/packages/core/modules-sdk/src/loaders/__tests__/module-loader.ts @@ -24,7 +24,6 @@ describe("modules loader", () => { testService: { resolutionPath: false, definition: { - registrationName: "testService", key: "testService", defaultPackage: "testService", label: "TestService", @@ -53,7 +52,6 @@ describe("modules loader", () => { testService: { resolutionPath: "@modules/default", definition: { - registrationName: "testService", key: "testService", defaultPackage: "testService", label: "TestService", @@ -94,7 +92,6 @@ describe("modules loader", () => { testService: { resolutionPath: "@modules/brokenloader", definition: { - registrationName: "testService", key: "testService", defaultPackage: "testService", label: "TestService", @@ -120,7 +117,6 @@ describe("modules loader", () => { testService: { resolutionPath: "@modules/no-service", definition: { - registrationName: "testService", key: "testService", defaultPackage: "testService", label: "TestService", @@ -148,7 +144,6 @@ describe("modules loader", () => { testService: { resolutionPath: "@modules/no-service", definition: { - registrationName: "testService", key: "testService", defaultPackage: "testService", label: "TestService", @@ -178,7 +173,6 @@ describe("modules loader", () => { testService: { resolutionPath: "@medusajs/testService", definition: { - registrationName: "testService", key: "testService", defaultPackage: "@medusajs/testService", label: "TestService", @@ -210,7 +204,6 @@ describe("modules loader", () => { testService: { resolutionPath: "@modules/no-service", definition: { - registrationName: "testService", key: "testService", defaultPackage: "testService", label: "TestService", @@ -242,7 +235,6 @@ describe("modules loader", () => { testService: { resolutionPath: "@modules/no-service", definition: { - registrationName: "testService", key: "testService", defaultPackage: "testService", label: "TestService", diff --git a/packages/core/modules-sdk/src/loaders/__tests__/register-modules.ts b/packages/core/modules-sdk/src/loaders/__tests__/register-modules.ts index aee7a7fa5a..25b8160d72 100644 --- a/packages/core/modules-sdk/src/loaders/__tests__/register-modules.ts +++ b/packages/core/modules-sdk/src/loaders/__tests__/register-modules.ts @@ -9,7 +9,6 @@ jest.mock("resolve-cwd", () => jest.fn(() => RESOLVED_PACKAGE)) describe("module definitions loader", () => { const defaultDefinition: ModuleDefinition = { key: "testService", - registrationName: "testService", defaultPackage: "@medusajs/test-service", label: "TestService", isRequired: false, @@ -63,7 +62,6 @@ describe("module definitions loader", () => { definition: expect.objectContaining({ key: "customModulesABC", label: "Custom: customModulesABC", - registrationName: "customModulesABC", }), moduleDeclaration: { resources: "shared", diff --git a/packages/core/modules-sdk/src/loaders/module-loader.ts b/packages/core/modules-sdk/src/loaders/module-loader.ts index 74f415758d..05a9dd207c 100644 --- a/packages/core/modules-sdk/src/loaders/module-loader.ts +++ b/packages/core/modules-sdk/src/loaders/module-loader.ts @@ -49,10 +49,7 @@ async function loadModule( throw new Error(`Module definition is missing property "key"`) } - modDefinition.registrationName ??= modDefinition.key - - const registrationName = modDefinition.registrationName - + const keyName = modDefinition.key const { scope, resources } = resolution.moduleDeclaration ?? ({} as any) const canSkip = @@ -72,7 +69,7 @@ async function loadModule( message = `The module ${resolution.definition.label} is missing its resources config` } - container.register(registrationName, asValue(undefined)) + container.register(keyName, asValue(undefined)) return { error: new Error(message), @@ -80,7 +77,7 @@ async function loadModule( } if (resolution.resolutionPath === false) { - container.register(registrationName, asValue(undefined)) + container.register(keyName, asValue(undefined)) return } diff --git a/packages/core/modules-sdk/src/loaders/register-modules.ts b/packages/core/modules-sdk/src/loaders/register-modules.ts index 7a66df3fe7..02d2891717 100644 --- a/packages/core/modules-sdk/src/loaders/register-modules.ts +++ b/packages/core/modules-sdk/src/loaders/register-modules.ts @@ -84,7 +84,6 @@ function getCustomModuleResolution( isRequired: false, defaultPackage: "", dependencies, - registrationName: key, defaultModuleDeclaration: { resources: MODULE_RESOURCE_TYPE.SHARED, scope: MODULE_SCOPE.INTERNAL, diff --git a/packages/core/modules-sdk/src/loaders/utils/__tests__/load-internal.spec.ts b/packages/core/modules-sdk/src/loaders/utils/__tests__/load-internal.spec.ts index 70098dc7af..15b52bcebf 100644 --- a/packages/core/modules-sdk/src/loaders/utils/__tests__/load-internal.spec.ts +++ b/packages/core/modules-sdk/src/loaders/utils/__tests__/load-internal.spec.ts @@ -22,7 +22,6 @@ describe("load internal - load resources", () => { ), definition: { key: "module-with-dml-mixed-without-joiner-config", - registrationName: "service", label: "Module with DML mixed without joiner config", defaultPackage: false, defaultModuleDeclaration: { @@ -103,7 +102,6 @@ describe("load internal - load resources", () => { ), definition: { key: "module-with-dml-without-joiner-config", - registrationName: "service", label: "Module with DML without joiner config", defaultPackage: false, defaultModuleDeclaration: { @@ -184,7 +182,6 @@ describe("load internal - load resources", () => { ), definition: { key: "module-without-joiner-config", - registrationName: "service", label: "Module without joiner config", defaultPackage: false, defaultModuleDeclaration: { @@ -264,7 +261,6 @@ describe("load internal - load resources", () => { ), definition: { key: "module-without-joiner-config", - registrationName: "service", label: "Module without joiner config", defaultPackage: false, defaultModuleDeclaration: { diff --git a/packages/core/modules-sdk/src/loaders/utils/load-internal.ts b/packages/core/modules-sdk/src/loaders/utils/load-internal.ts index 83fa8ba117..849b27c918 100644 --- a/packages/core/modules-sdk/src/loaders/utils/load-internal.ts +++ b/packages/core/modules-sdk/src/loaders/utils/load-internal.ts @@ -11,11 +11,11 @@ import { } from "@medusajs/types" import { ContainerRegistrationKeys, - createMedusaContainer, - defineJoinerConfig, DmlEntity, MedusaModuleType, ModulesSdkUtils, + createMedusaContainer, + defineJoinerConfig, toMikroOrmEntities, } from "@medusajs/utils" import { asFunction, asValue } from "awilix" @@ -45,9 +45,9 @@ export async function loadInternalModule( migrationOnly?: boolean, loaderOnly?: boolean ): Promise<{ error?: Error } | void> { - const registrationName = !loaderOnly - ? resolution.definition.registrationName - : resolution.definition.registrationName + "__loaderOnly" + const keyName = !loaderOnly + ? resolution.definition.key + : resolution.definition.key + "__loaderOnly" const { resources } = resolution.moduleDeclaration as InternalModuleDeclaration @@ -95,7 +95,7 @@ export async function loadInternalModule( if (!loadedModule?.service && !moduleResources.moduleService) { container.register({ - [registrationName]: asValue(undefined), + [keyName]: asValue(undefined), }) return { @@ -112,8 +112,9 @@ export async function loadInternalModule( const moduleService = { __joinerConfig: moduleService_.prototype.__joinerConfig, } + container.register({ - [registrationName]: asValue(moduleService), + [keyName]: asValue(moduleService), }) return } @@ -155,7 +156,7 @@ export async function loadInternalModule( logger, resolution, loaderOnly, - registrationName, + keyName, }) if (error) { @@ -165,7 +166,7 @@ export async function loadInternalModule( const moduleService = moduleResources.moduleService ?? loadedModule.service container.register({ - [registrationName]: asFunction((cradle) => { + [keyName]: asFunction((cradle) => { ;(moduleService as any).__type = MedusaModuleType return new moduleService( localContainer.cradle, @@ -177,7 +178,7 @@ export async function loadInternalModule( if (loaderOnly) { // The expectation is only to run the loader as standalone, so we do not need to register the service and we need to cleanup all services - const service = container.resolve(registrationName) + const service = container.resolve(keyName) await service.__hooks?.onApplicationPrepareShutdown?.() await service.__hooks?.onApplicationShutdown?.() } @@ -348,14 +349,7 @@ export async function loadResources( async function runLoaders( loaders: Function[] = [], - { - localContainer, - container, - logger, - resolution, - loaderOnly, - registrationName, - } + { localContainer, container, logger, resolution, loaderOnly, keyName } ): Promise { try { for (const loader of loaders) { @@ -371,7 +365,7 @@ async function runLoaders( } } catch (err) { container.register({ - [registrationName]: asValue(undefined), + [keyName]: asValue(undefined), }) return { diff --git a/packages/core/modules-sdk/src/medusa-app.ts b/packages/core/modules-sdk/src/medusa-app.ts index 089693a419..5830f9244b 100644 --- a/packages/core/modules-sdk/src/medusa-app.ts +++ b/packages/core/modules-sdk/src/medusa-app.ts @@ -18,13 +18,12 @@ import { } from "@medusajs/types" import { ContainerRegistrationKeys, + MedusaError, + Modules, + ModulesSdkUtils, createMedusaContainer, isObject, isString, - MedusaError, - ModuleRegistrationName, - Modules, - ModulesSdkUtils, promiseAll, } from "@medusajs/utils" import type { Knex } from "@mikro-orm/knex" @@ -37,7 +36,7 @@ import { RegisterModuleJoinerConfig, } from "./medusa-module" import { RemoteLink } from "./remote-link" -import { createQuery, RemoteQuery } from "./remote-query" +import { RemoteQuery, createQuery } from "./remote-query" import { MODULE_RESOURCE_TYPE, MODULE_SCOPE } from "./types" import { cleanGraphQLSchema } from "./utils" @@ -142,7 +141,7 @@ export async function loadModules( const service = loaded[moduleName] sharedContainer.register({ - [service.__definition.registrationName]: asValue(service), + [service.__definition.key]: asValue(service), }) if (allModules[moduleName] && !Array.isArray(allModules[moduleName])) { @@ -384,10 +383,12 @@ async function MedusaApp_({ } // Share Event bus with link modules - injectedDependencies[ModuleRegistrationName.EVENT_BUS] = - sharedContainer_.resolve(ModuleRegistrationName.EVENT_BUS, { + injectedDependencies[Modules.EVENT_BUS] = sharedContainer_.resolve( + Modules.EVENT_BUS, + { allowUnregistered: true, - }) + } + ) linkModules ??= [] if (!Array.isArray(linkModules)) { diff --git a/packages/core/modules-sdk/src/medusa-module.ts b/packages/core/modules-sdk/src/medusa-module.ts index c0833f2888..40b44b36c0 100644 --- a/packages/core/modules-sdk/src/medusa-module.ts +++ b/packages/core/modules-sdk/src/medusa-module.ts @@ -382,9 +382,8 @@ class MedusaModule { moduleResolutions ) as ModuleResolution[]) { const keyName = resolution.definition.key - const registrationName = resolution.definition.registrationName - services[keyName] = container.resolve(registrationName) + services[keyName] = container.resolve(keyName) services[keyName].__definition = resolution.definition if (resolution.definition.isQueryable) { @@ -466,7 +465,6 @@ class MedusaModule { const moduleDefinition: ModuleDefinition = { key: definition.key, - registrationName: definition.key, dependencies: definition.dependencies, defaultPackage: "", label: definition.label, @@ -518,9 +516,8 @@ class MedusaModule { moduleResolutions ) as ModuleResolution[]) { const keyName = resolution.definition.key - const registrationName = resolution.definition.registrationName - services[keyName] = container.resolve(registrationName) + services[keyName] = container.resolve(keyName) services[keyName].__definition = resolution.definition if (resolution.definition.isQueryable) { diff --git a/packages/core/orchestration/src/workflow/global-workflow.ts b/packages/core/orchestration/src/workflow/global-workflow.ts index b97baca5c6..94f86f84f3 100644 --- a/packages/core/orchestration/src/workflow/global-workflow.ts +++ b/packages/core/orchestration/src/workflow/global-workflow.ts @@ -3,8 +3,8 @@ import { createMedusaContainer } from "@medusajs/utils" import { asValue } from "awilix" import { - DistributedTransactionType, DistributedTransactionEvents, + DistributedTransactionType, } from "../transaction" import { WorkflowDefinition, WorkflowManager } from "./workflow-manager" @@ -33,8 +33,8 @@ export class GlobalWorkflow extends WorkflowManager { container = createMedusaContainer() for (const mod of modulesLoaded || []) { - const registrationName = mod.__definition.registrationName - container.register(registrationName, asValue(mod)) + const keyName = mod.__definition.key + container.register(keyName, asValue(mod)) } } diff --git a/packages/core/orchestration/src/workflow/local-workflow.ts b/packages/core/orchestration/src/workflow/local-workflow.ts index 53b6846160..722f495881 100644 --- a/packages/core/orchestration/src/workflow/local-workflow.ts +++ b/packages/core/orchestration/src/workflow/local-workflow.ts @@ -1,12 +1,12 @@ import { Context, LoadedModule, MedusaContainer } from "@medusajs/types" import { - createMedusaContainer, - isDefined, - isString, MedusaContext, MedusaContextType, MedusaError, MedusaModuleType, + createMedusaContainer, + isDefined, + isString, } from "@medusajs/utils" import { asValue } from "awilix" import { @@ -85,8 +85,8 @@ export class LocalWorkflow { container = createMedusaContainer() for (const mod of modulesLoaded || []) { - const registrationName = mod.__definition.registrationName - container.register(registrationName, asValue(mod)) + const keyName = mod.__definition.key + container.register(keyName, asValue(mod)) } } @@ -101,8 +101,8 @@ export class LocalWorkflow { // eslint-disable-next-line const this_ = this const originalResolver = container.resolve - container.resolve = function (registrationName, opts) { - const resolved = originalResolver(registrationName, opts) + container.resolve = function (keyName, opts) { + const resolved = originalResolver(keyName, opts) if (resolved?.constructor?.__type !== MedusaModuleType) { return resolved } diff --git a/packages/core/types/src/http/product/admin/entitites.ts b/packages/core/types/src/http/product/admin/entitites.ts index f440fd56dc..3f480bb09d 100644 --- a/packages/core/types/src/http/product/admin/entitites.ts +++ b/packages/core/types/src/http/product/admin/entitites.ts @@ -30,10 +30,10 @@ export interface AdminProduct } export type AdminProductStatus = ProductStatus export interface AdminProductVariantInventoryLink { - productService: { + Product: { variant_id: string } - inventoryService: { + Inventory: { inventory_item_id: string } -} \ No newline at end of file +} diff --git a/packages/core/types/src/modules-sdk/index.ts b/packages/core/types/src/modules-sdk/index.ts index e9187c2967..f3496b1c0e 100644 --- a/packages/core/types/src/modules-sdk/index.ts +++ b/packages/core/types/src/modules-sdk/index.ts @@ -30,7 +30,6 @@ export type LoggerOptions = boolean | "all" | LogLevel[] export type CustomModuleDefinition = { key?: string - registrationName?: string label?: string isQueryable?: boolean // If the module is queryable via Remote Joiner dependencies?: string[] @@ -84,7 +83,6 @@ export type ModuleResolution = { export type ModuleDefinition = { key: string - registrationName: string defaultPackage: string | false label: string isRequired?: boolean @@ -99,7 +97,6 @@ export type ModuleDefinition = { export type LinkModuleDefinition = { key: string - registrationName: string label: string dependencies?: string[] defaultModuleDeclaration: InternalModuleDeclaration diff --git a/packages/core/utils/src/common/__tests__/define-config.spec.ts b/packages/core/utils/src/common/__tests__/define-config.spec.ts index 2bf50b1068..0a07a9b37e 100644 --- a/packages/core/utils/src/common/__tests__/define-config.spec.ts +++ b/packages/core/utils/src/common/__tests__/define-config.spec.ts @@ -10,8 +10,8 @@ describe("defineConfig", function () { }, "featureFlags": {}, "modules": { - "apiKey": true, - "auth": { + "ApiKey": true, + "Auth": { "options": { "providers": [ { @@ -22,12 +22,12 @@ describe("defineConfig", function () { }, "resolve": "@medusajs/auth", }, - "cacheService": true, - "cart": true, - "currency": true, - "customer": true, - "eventBus": true, - "file": { + "Cache": true, + "Cart": true, + "Currency": true, + "Customer": true, + "EventBus": true, + "File": { "options": { "providers": [ { @@ -38,7 +38,7 @@ describe("defineConfig", function () { }, "resolve": "@medusajs/file", }, - "fulfillment": { + "Fulfillment": { "options": { "providers": [ { @@ -49,8 +49,8 @@ describe("defineConfig", function () { }, "resolve": "@medusajs/fulfillment", }, - "inventoryService": true, - "notification": { + "Inventory": true, + "Notification": { "options": { "providers": [ { @@ -67,23 +67,23 @@ describe("defineConfig", function () { }, "resolve": "@medusajs/notification", }, - "order": true, - "payment": true, - "pricingService": true, - "productService": true, - "promotion": true, - "region": true, - "salesChannel": true, - "stockLocationService": true, - "store": true, - "tax": true, - "user": { + "Order": true, + "Payment": true, + "Pricing": true, + "Product": true, + "Promotion": true, + "Region": true, + "SalesChannel": true, + "StockLocation": true, + "Store": true, + "Tax": true, + "User": { "options": { "jwt_secret": "supersecret", }, "resolve": "@medusajs/user", }, - "workflows": true, + "Workflows": true, }, "plugins": [], "projectConfig": { @@ -104,7 +104,7 @@ describe("defineConfig", function () { expect( defineConfig({ modules: { - githubModuleService: { + GithubModuleService: { resolve: "./modules/github", }, }, @@ -116,8 +116,8 @@ describe("defineConfig", function () { }, "featureFlags": {}, "modules": { - "apiKey": true, - "auth": { + "ApiKey": true, + "Auth": { "options": { "providers": [ { @@ -128,12 +128,12 @@ describe("defineConfig", function () { }, "resolve": "@medusajs/auth", }, - "cacheService": true, - "cart": true, - "currency": true, - "customer": true, - "eventBus": true, - "file": { + "Cache": true, + "Cart": true, + "Currency": true, + "Customer": true, + "EventBus": true, + "File": { "options": { "providers": [ { @@ -144,7 +144,7 @@ describe("defineConfig", function () { }, "resolve": "@medusajs/file", }, - "fulfillment": { + "Fulfillment": { "options": { "providers": [ { @@ -155,11 +155,11 @@ describe("defineConfig", function () { }, "resolve": "@medusajs/fulfillment", }, - "githubModuleService": { + "GithubModuleService": { "resolve": "./modules/github", }, - "inventoryService": true, - "notification": { + "Inventory": true, + "Notification": { "options": { "providers": [ { @@ -176,23 +176,23 @@ describe("defineConfig", function () { }, "resolve": "@medusajs/notification", }, - "order": true, - "payment": true, - "pricingService": true, - "productService": true, - "promotion": true, - "region": true, - "salesChannel": true, - "stockLocationService": true, - "store": true, - "tax": true, - "user": { + "Order": true, + "Payment": true, + "Pricing": true, + "Product": true, + "Promotion": true, + "Region": true, + "SalesChannel": true, + "StockLocation": true, + "Store": true, + "Tax": true, + "User": { "options": { "jwt_secret": "supersecret", }, "resolve": "@medusajs/user", }, - "workflows": true, + "Workflows": true, }, "plugins": [], "projectConfig": { @@ -225,8 +225,8 @@ describe("defineConfig", function () { }, "featureFlags": {}, "modules": { - "apiKey": true, - "auth": { + "ApiKey": true, + "Auth": { "options": { "providers": [ { @@ -237,12 +237,12 @@ describe("defineConfig", function () { }, "resolve": "@medusajs/auth", }, - "cacheService": true, - "cart": true, - "currency": true, - "customer": true, - "eventBus": true, - "file": { + "Cache": true, + "Cart": true, + "Currency": true, + "Customer": true, + "EventBus": true, + "File": { "options": { "providers": [ { @@ -253,7 +253,7 @@ describe("defineConfig", function () { }, "resolve": "@medusajs/file", }, - "fulfillment": { + "Fulfillment": { "options": { "providers": [ { @@ -264,8 +264,8 @@ describe("defineConfig", function () { }, "resolve": "@medusajs/fulfillment", }, - "inventoryService": true, - "notification": { + "Inventory": true, + "Notification": { "options": { "providers": [ { @@ -282,23 +282,23 @@ describe("defineConfig", function () { }, "resolve": "@medusajs/notification", }, - "order": true, - "payment": true, - "pricingService": true, - "productService": true, - "promotion": true, - "region": true, - "salesChannel": true, - "stockLocationService": true, - "store": true, - "tax": true, - "user": { + "Order": true, + "Payment": true, + "Pricing": true, + "Product": true, + "Promotion": true, + "Region": true, + "SalesChannel": true, + "StockLocation": true, + "Store": true, + "Tax": true, + "User": { "options": { "jwt_secret": "supersecret", }, "resolve": "@medusajs/user", }, - "workflows": true, + "Workflows": true, }, "plugins": [], "projectConfig": { @@ -334,8 +334,8 @@ describe("defineConfig", function () { }, "featureFlags": {}, "modules": { - "apiKey": true, - "auth": { + "ApiKey": true, + "Auth": { "options": { "providers": [ { @@ -346,11 +346,11 @@ describe("defineConfig", function () { }, "resolve": "@medusajs/auth", }, - "cacheService": true, - "currency": true, - "customer": true, - "eventBus": true, - "file": { + "Cache": true, + "Currency": true, + "Customer": true, + "EventBus": true, + "File": { "options": { "providers": [ { @@ -361,7 +361,7 @@ describe("defineConfig", function () { }, "resolve": "@medusajs/file", }, - "fulfillment": { + "Fulfillment": { "options": { "providers": [ { @@ -372,8 +372,8 @@ describe("defineConfig", function () { }, "resolve": "@medusajs/fulfillment", }, - "inventoryService": true, - "notification": { + "Inventory": true, + "Notification": { "options": { "providers": [ { @@ -390,23 +390,23 @@ describe("defineConfig", function () { }, "resolve": "@medusajs/notification", }, - "order": true, - "payment": true, - "pricingService": true, - "productService": true, - "promotion": true, - "region": true, - "salesChannel": true, - "stockLocationService": true, - "store": true, - "tax": true, - "user": { + "Order": true, + "Payment": true, + "Pricing": true, + "Product": true, + "Promotion": true, + "Region": true, + "SalesChannel": true, + "StockLocation": true, + "Store": true, + "Tax": true, + "User": { "options": { "jwt_secret": "supersecret", }, "resolve": "@medusajs/user", }, - "workflows": true, + "Workflows": true, }, "plugins": [], "projectConfig": { diff --git a/packages/core/utils/src/event-bus/__tests__/message-aggregator.spec.ts b/packages/core/utils/src/event-bus/__tests__/message-aggregator.spec.ts index 59c137fca1..48a1e7f8f2 100644 --- a/packages/core/utils/src/event-bus/__tests__/message-aggregator.spec.ts +++ b/packages/core/utils/src/event-bus/__tests__/message-aggregator.spec.ts @@ -10,7 +10,7 @@ describe("MessageAggregator", function () { aggregator.save({ eventName: "ProductVariant.created", metadata: { - source: "ProductService", + source: "Product", action: "created", object: "ProductVariant", eventGroupId: "1", @@ -20,7 +20,7 @@ describe("MessageAggregator", function () { aggregator.save({ eventName: "Product.created", metadata: { - source: "ProductService", + source: "Product", action: "created", object: "Product", eventGroupId: "1", @@ -30,7 +30,7 @@ describe("MessageAggregator", function () { aggregator.save({ eventName: "ProductVariant.created", metadata: { - source: "ProductService", + source: "Product", action: "created", object: "ProductVariant", eventGroupId: "1", @@ -40,7 +40,7 @@ describe("MessageAggregator", function () { aggregator.save({ eventName: "ProductType.detached", metadata: { - source: "ProductService", + source: "Product", action: "detached", object: "ProductType", eventGroupId: "1", @@ -50,7 +50,7 @@ describe("MessageAggregator", function () { aggregator.save({ eventName: "ProductVariant.updated", metadata: { - source: "ProductService", + source: "Product", action: "updated", object: "ProductVariant", eventGroupId: "1", @@ -76,7 +76,7 @@ describe("MessageAggregator", function () { { eventName: "ProductType.detached", metadata: { - source: "ProductService", + source: "Product", action: "detached", object: "ProductType", eventGroupId: "1", @@ -89,7 +89,7 @@ describe("MessageAggregator", function () { { eventName: "ProductVariant.updated", metadata: { - source: "ProductService", + source: "Product", action: "updated", object: "ProductVariant", eventGroupId: "1", @@ -102,7 +102,7 @@ describe("MessageAggregator", function () { { eventName: "ProductVariant.created", metadata: { - source: "ProductService", + source: "Product", action: "created", object: "ProductVariant", eventGroupId: "1", @@ -112,7 +112,7 @@ describe("MessageAggregator", function () { { eventName: "ProductVariant.created", metadata: { - source: "ProductService", + source: "Product", action: "created", object: "ProductVariant", eventGroupId: "1", @@ -125,7 +125,7 @@ describe("MessageAggregator", function () { { eventName: "Product.created", metadata: { - source: "ProductService", + source: "Product", action: "created", object: "Product", eventGroupId: "1", diff --git a/packages/core/utils/src/link/compose-link-name.ts b/packages/core/utils/src/link/compose-link-name.ts index ce833ccc14..a5c6a8249c 100644 --- a/packages/core/utils/src/link/compose-link-name.ts +++ b/packages/core/utils/src/link/compose-link-name.ts @@ -1,7 +1,7 @@ -import { lowerCaseFirst, toPascalCase } from "../common" +import { toPascalCase, upperCaseFirst } from "../common" export const composeLinkName = (...args) => { - return lowerCaseFirst(toPascalCase(composeTableName(...args.concat("link")))) + return upperCaseFirst(toPascalCase(composeTableName(...args.concat("link")))) } export const composeTableName = (...args) => { diff --git a/packages/core/utils/src/modules-sdk/definition.ts b/packages/core/utils/src/modules-sdk/definition.ts index dabc9b8655..2629ff3b6a 100644 --- a/packages/core/utils/src/modules-sdk/definition.ts +++ b/packages/core/utils/src/modules-sdk/definition.ts @@ -25,82 +25,58 @@ import type { } from "@medusajs/types" export enum Modules { - AUTH = "auth", - CACHE = "cacheService", - CART = "cart", - CUSTOMER = "customer", - EVENT_BUS = "eventBus", - INVENTORY = "inventoryService", - LINK = "linkModules", - PAYMENT = "payment", - PRICING = "pricingService", - PRODUCT = "productService", - PROMOTION = "promotion", - SALES_CHANNEL = "salesChannel", - TAX = "tax", - FULFILLMENT = "fulfillment", - STOCK_LOCATION = "stockLocationService", - USER = "user", - WORKFLOW_ENGINE = "workflows", - REGION = "region", - ORDER = "order", - API_KEY = "apiKey", - STORE = "store", - CURRENCY = "currency", - FILE = "file", - NOTIFICATION = "notification", + AUTH = "Auth", + CACHE = "Cache", + CART = "Cart", + CUSTOMER = "Customer", + EVENT_BUS = "EventBus", + INVENTORY = "Inventory", + LINK = "LinkModules", + PAYMENT = "Payment", + PRICING = "Pricing", + PRODUCT = "Product", + PROMOTION = "Promotion", + SALES_CHANNEL = "SalesChannel", + TAX = "Tax", + FULFILLMENT = "Fulfillment", + STOCK_LOCATION = "StockLocation", + USER = "User", + WORKFLOW_ENGINE = "Workflows", + REGION = "Region", + ORDER = "Order", + API_KEY = "ApiKey", + STORE = "Store", + CURRENCY = "Currency", + FILE = "File", + NOTIFICATION = "Notification", } -export enum ModuleRegistrationName { - AUTH = "authModuleService", - CACHE = "cacheService", - CART = "cartModuleService", - CUSTOMER = "customerModuleService", - EVENT_BUS = "eventBusModuleService", - INVENTORY = "inventoryService", - PAYMENT = "paymentModuleService", - PRICING = "pricingModuleService", - PRODUCT = "productModuleService", - PROMOTION = "promotionModuleService", - SALES_CHANNEL = "salesChannelModuleService", - FULFILLMENT = "fulfillmentModuleService", - STOCK_LOCATION = "stockLocationService", - TAX = "taxModuleService", - USER = "userModuleService", - WORKFLOW_ENGINE = "workflowsModuleService", - REGION = "regionModuleService", - ORDER = "orderModuleService", - API_KEY = "apiKeyModuleService", - STORE = "storeModuleService", - CURRENCY = "currencyModuleService", - FILE = "fileModuleService", - NOTIFICATION = "notificationModuleService", -} +export const ModuleRegistrationName = Modules declare module "@medusajs/types" { export interface ModuleImplementations { - [ModuleRegistrationName.AUTH]: IAuthModuleService - [ModuleRegistrationName.CACHE]: ICacheService - [ModuleRegistrationName.CART]: ICartModuleService - [ModuleRegistrationName.CUSTOMER]: ICustomerModuleService - [ModuleRegistrationName.EVENT_BUS]: IEventBusModuleService - [ModuleRegistrationName.INVENTORY]: IInventoryService - [ModuleRegistrationName.PAYMENT]: IPaymentModuleService - [ModuleRegistrationName.PRICING]: IPricingModuleService - [ModuleRegistrationName.PRODUCT]: IProductModuleService - [ModuleRegistrationName.PROMOTION]: IPromotionModuleService - [ModuleRegistrationName.SALES_CHANNEL]: ISalesChannelModuleService - [ModuleRegistrationName.TAX]: ITaxModuleService - [ModuleRegistrationName.FULFILLMENT]: IFulfillmentModuleService - [ModuleRegistrationName.STOCK_LOCATION]: IStockLocationService - [ModuleRegistrationName.USER]: IUserModuleService - [ModuleRegistrationName.WORKFLOW_ENGINE]: IWorkflowEngineService - [ModuleRegistrationName.REGION]: IRegionModuleService - [ModuleRegistrationName.ORDER]: IOrderModuleService - [ModuleRegistrationName.API_KEY]: IApiKeyModuleService - [ModuleRegistrationName.STORE]: IStoreModuleService - [ModuleRegistrationName.CURRENCY]: ICurrencyModuleService - [ModuleRegistrationName.FILE]: IFileModuleService - [ModuleRegistrationName.NOTIFICATION]: INotificationModuleService + [Modules.AUTH]: IAuthModuleService + [Modules.CACHE]: ICacheService + [Modules.CART]: ICartModuleService + [Modules.CUSTOMER]: ICustomerModuleService + [Modules.EVENT_BUS]: IEventBusModuleService + [Modules.INVENTORY]: IInventoryService + [Modules.PAYMENT]: IPaymentModuleService + [Modules.PRICING]: IPricingModuleService + [Modules.PRODUCT]: IProductModuleService + [Modules.PROMOTION]: IPromotionModuleService + [Modules.SALES_CHANNEL]: ISalesChannelModuleService + [Modules.TAX]: ITaxModuleService + [Modules.FULFILLMENT]: IFulfillmentModuleService + [Modules.STOCK_LOCATION]: IStockLocationService + [Modules.USER]: IUserModuleService + [Modules.WORKFLOW_ENGINE]: IWorkflowEngineService + [Modules.REGION]: IRegionModuleService + [Modules.ORDER]: IOrderModuleService + [Modules.API_KEY]: IApiKeyModuleService + [Modules.STORE]: IStoreModuleService + [Modules.CURRENCY]: ICurrencyModuleService + [Modules.FILE]: IFileModuleService + [Modules.NOTIFICATION]: INotificationModuleService } } diff --git a/packages/core/utils/src/modules-sdk/medusa-service.ts b/packages/core/utils/src/modules-sdk/medusa-service.ts index 499b209f71..fd28799145 100644 --- a/packages/core/utils/src/modules-sdk/medusa-service.ts +++ b/packages/core/utils/src/modules-sdk/medusa-service.ts @@ -11,17 +11,17 @@ import { SoftDeleteReturn, } from "@medusajs/types" import { + MapToConfig, isString, kebabCase, lowerCaseFirst, mapObjectTo, - MapToConfig, pluralize, upperCaseFirst, } from "../common" import { DmlEntity } from "../dml" import { InjectManager, MedusaContext } from "./decorators" -import { ModuleRegistrationName } from "./definition" +import { Modules } from "./definition" import { buildModelsNameToLinkableKeysMap } from "./joiner-config-builder" import { BaseMethods, @@ -385,11 +385,11 @@ export function MedusaService< this.baseRepository_ = container.baseRepository const hasEventBusModuleService = Object.keys(this.__container__).find( - (key) => key === ModuleRegistrationName.EVENT_BUS + (key) => key === Modules.EVENT_BUS ) this.eventBusModuleService_ = hasEventBusModuleService - ? this.__container__.eventBusModuleService + ? this.__container__[Modules.EVENT_BUS] : undefined this[MedusaServiceModelNameToLinkableKeysMapSymbol] = diff --git a/packages/core/workflows-sdk/src/helper/workflow-export.ts b/packages/core/workflows-sdk/src/helper/workflow-export.ts index dd56646efd..c51307f519 100644 --- a/packages/core/workflows-sdk/src/helper/workflow-export.ts +++ b/packages/core/workflows-sdk/src/helper/workflow-export.ts @@ -9,9 +9,9 @@ import { import { Context, LoadedModule, MedusaContainer } from "@medusajs/types" import { ContainerRegistrationKeys, - isPresent, MedusaContextType, - ModuleRegistrationName, + Modules, + isPresent, } from "@medusajs/utils" import { EOL } from "os" import { ulid } from "ulid" @@ -535,7 +535,7 @@ function attachOnFinishReleaseEvents( await onFinish?.(args) const eventBusService = (flow.container as MedusaContainer).resolve( - ModuleRegistrationName.EVENT_BUS, + Modules.EVENT_BUS, { allowUnregistered: true } ) diff --git a/packages/core/workflows-sdk/src/utils/composer/__tests__/compose.ts b/packages/core/workflows-sdk/src/utils/composer/__tests__/compose.ts index ae271f26e1..2a61cb5e92 100644 --- a/packages/core/workflows-sdk/src/utils/composer/__tests__/compose.ts +++ b/packages/core/workflows-sdk/src/utils/composer/__tests__/compose.ts @@ -5,7 +5,7 @@ import { WorkflowScheduler, } from "@medusajs/orchestration" import { - ModuleRegistrationName, + Modules, composeMessage, createMedusaContainer, promiseAll, @@ -2105,7 +2105,7 @@ describe("Workflow composer", function () { it("should emit grouped events once the workflow is executed and finished", async () => { const container = createMedusaContainer() container.register({ - [ModuleRegistrationName.EVENT_BUS]: asValue({ + [Modules.EVENT_BUS]: asValue({ releaseGroupedEvents: jest .fn() .mockImplementation(() => Promise.resolve()), @@ -2117,9 +2117,7 @@ describe("Workflow composer", function () { .fn() .mockImplementation( async (input, { context: stepContext, container }) => { - const eventBusService = container.resolve( - ModuleRegistrationName.EVENT_BUS - ) + const eventBusService = container.resolve(Modules.EVENT_BUS) await eventBusService.emit( "event1", @@ -2149,7 +2147,7 @@ describe("Workflow composer", function () { expect(mockStep1Fn).toHaveBeenCalledTimes(1) expect(mockStep1Fn.mock.calls[0]).toHaveLength(2) - const eventBusMock = container.resolve(ModuleRegistrationName.EVENT_BUS) + const eventBusMock = container.resolve(Modules.EVENT_BUS) expect(eventBusMock.emit).toHaveBeenCalledTimes(1) expect(eventBusMock.emit.mock.calls[0][0]).toEqual("event1") @@ -2162,7 +2160,7 @@ describe("Workflow composer", function () { it("should clear grouped events on fail state", async () => { const container = createMedusaContainer() container.register({ - [ModuleRegistrationName.EVENT_BUS]: asValue({ + [Modules.EVENT_BUS]: asValue({ releaseGroupedEvents: jest .fn() .mockImplementation(() => Promise.resolve()), @@ -2177,9 +2175,7 @@ describe("Workflow composer", function () { .fn() .mockImplementation( async (input, { context: stepContext, container }) => { - const eventBusService = container.resolve( - ModuleRegistrationName.EVENT_BUS - ) + const eventBusService = container.resolve(Modules.EVENT_BUS) await eventBusService.emit( "event1", @@ -2213,7 +2209,7 @@ describe("Workflow composer", function () { throwOnError: false, }) - const eventBusMock = container.resolve(ModuleRegistrationName.EVENT_BUS) + const eventBusMock = container.resolve(Modules.EVENT_BUS) expect(eventBusMock.emit).toHaveBeenCalledTimes(1) expect(eventBusMock.releaseGroupedEvents).toHaveBeenCalledTimes(0) diff --git a/packages/framework/framework/src/http/middlewares/authenticate-middleware.ts b/packages/framework/framework/src/http/middlewares/authenticate-middleware.ts index 3f2461ed1f..af715abc42 100644 --- a/packages/framework/framework/src/http/middlewares/authenticate-middleware.ts +++ b/packages/framework/framework/src/http/middlewares/authenticate-middleware.ts @@ -1,8 +1,5 @@ import { ApiKeyDTO, IApiKeyModuleService } from "@medusajs/types" -import { - ContainerRegistrationKeys, - ModuleRegistrationName, -} from "@medusajs/utils" +import { ContainerRegistrationKeys, Modules } from "@medusajs/utils" import { NextFunction, RequestHandler } from "express" import { JwtPayload, verify } from "jsonwebtoken" import { ConfigModule } from "../../config" @@ -139,7 +136,7 @@ const getApiKeyInfo = async (req: MedusaRequest): Promise => { } const apiKeyModule = req.scope.resolve( - ModuleRegistrationName.API_KEY + Modules.API_KEY ) as IApiKeyModuleService try { const apiKey = await apiKeyModule.authenticate(normalizedToken) diff --git a/packages/framework/framework/src/medusa-app-loader.ts b/packages/framework/framework/src/medusa-app-loader.ts index b4b3565b83..3fa85549cc 100644 --- a/packages/framework/framework/src/medusa-app-loader.ts +++ b/packages/framework/framework/src/medusa-app-loader.ts @@ -27,12 +27,12 @@ import { import { pgConnectionLoader } from "./database" import { asValue } from "awilix" +import { configManager } from "./config" import { container, container as mainContainer, MedusaContainer, } from "./container" -import { configManager } from "./config" export class MedusaAppLoader { /** @@ -86,7 +86,6 @@ export class MedusaAppLoader { )) { const def = {} as ModuleDefinition def.key ??= key - def.registrationName ??= ModulesDefinition[key]?.registrationName ?? key def.label ??= ModulesDefinition[key]?.label ?? upperCaseFirst(key) def.isQueryable = ModulesDefinition[key]?.isQueryable ?? true @@ -271,20 +270,14 @@ export class MedusaAppLoader { for (const moduleService of Object.values(medusaApp.modules)) { const loadedModule = moduleService as LoadedModule - container.register( - loadedModule.__definition.registrationName, - asValue(moduleService) - ) + container.register(loadedModule.__definition.key, asValue(moduleService)) } // Register all unresolved modules as undefined to be present in the container with undefined value by default // but still resolvable for (const moduleDefinition of Object.values(ModulesDefinition)) { - if (!container.hasRegistration(moduleDefinition.registrationName)) { - container.register( - moduleDefinition.registrationName, - asValue(undefined) - ) + if (!container.hasRegistration(moduleDefinition.key)) { + container.register(moduleDefinition.key, asValue(undefined)) } } diff --git a/packages/framework/framework/src/subscribers/__tests__/index.spec.ts b/packages/framework/framework/src/subscribers/__tests__/index.spec.ts index 3955fd51cc..ef242040ad 100644 --- a/packages/framework/framework/src/subscribers/__tests__/index.spec.ts +++ b/packages/framework/framework/src/subscribers/__tests__/index.spec.ts @@ -1,9 +1,9 @@ +import { Modules } from "@medusajs/utils" +import { asValue } from "awilix" import { join } from "path" +import { container } from "../../container" import { eventBusServiceMock } from "../__mocks__" import { SubscriberLoader } from "../subscriber-loader" -import { container } from "../../container" -import { ModuleRegistrationName } from "@medusajs/utils" -import { asValue } from "awilix" describe("SubscriberLoader", () => { const rootDir = join(__dirname, "../__fixtures__", "subscribers") @@ -17,10 +17,7 @@ describe("SubscriberLoader", () => { let registeredPaths: string[] = [] beforeAll(async () => { - container.register( - ModuleRegistrationName.EVENT_BUS, - asValue(eventBusServiceMock) - ) + container.register(Modules.EVENT_BUS, asValue(eventBusServiceMock)) const paths = await new SubscriberLoader(rootDir, pluginOptions).load() diff --git a/packages/framework/framework/src/subscribers/subscriber-loader.ts b/packages/framework/framework/src/subscribers/subscriber-loader.ts index e88f1c6f9e..77a4f81cb5 100644 --- a/packages/framework/framework/src/subscribers/subscriber-loader.ts +++ b/packages/framework/framework/src/subscribers/subscriber-loader.ts @@ -1,12 +1,12 @@ import { Event, IEventBusModuleService, Subscriber } from "@medusajs/types" -import { kebabCase, ModuleRegistrationName, promiseAll } from "@medusajs/utils" +import { Modules, kebabCase, promiseAll } from "@medusajs/utils" import { access, readdir } from "fs/promises" import { join, parse } from "path" import { configManager } from "../config" import { container } from "../container" -import { SubscriberArgs, SubscriberConfig } from "./types" import { logger } from "../logger" +import { SubscriberArgs, SubscriberConfig } from "./types" type SubscriberHandler = (args: SubscriberArgs) => Promise @@ -190,7 +190,7 @@ export class SubscriberLoader { handler: SubscriberHandler }) { const eventBusService: IEventBusModuleService = container.resolve( - ModuleRegistrationName.EVENT_BUS + Modules.EVENT_BUS ) const { event } = config diff --git a/packages/medusa/src/api/admin/claims/route.ts b/packages/medusa/src/api/admin/claims/route.ts index a5f4c6ef20..bec876fb72 100644 --- a/packages/medusa/src/api/admin/claims/route.ts +++ b/packages/medusa/src/api/admin/claims/route.ts @@ -2,7 +2,7 @@ import { beginClaimOrderWorkflow } from "@medusajs/core-flows" import { HttpTypes } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, + Modules, promiseAll, remoteQueryObjectFromString, } from "@medusajs/utils" @@ -49,7 +49,7 @@ export const POST = async ( } const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) - const orderModuleService = req.scope.resolve(ModuleRegistrationName.ORDER) + const orderModuleService = req.scope.resolve(Modules.ORDER) const workflow = beginClaimOrderWorkflow(req.scope) const { result } = await workflow.run({ diff --git a/packages/medusa/src/api/admin/exchanges/route.ts b/packages/medusa/src/api/admin/exchanges/route.ts index b0c5ab8ac7..00d739913b 100644 --- a/packages/medusa/src/api/admin/exchanges/route.ts +++ b/packages/medusa/src/api/admin/exchanges/route.ts @@ -2,7 +2,7 @@ import { beginExchangeOrderWorkflow } from "@medusajs/core-flows" import { HttpTypes } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, + Modules, promiseAll, remoteQueryObjectFromString, } from "@medusajs/utils" @@ -49,7 +49,7 @@ export const POST = async ( } const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) - const orderModuleService = req.scope.resolve(ModuleRegistrationName.ORDER) + const orderModuleService = req.scope.resolve(Modules.ORDER) const workflow = beginExchangeOrderWorkflow(req.scope) const { result } = await workflow.run({ diff --git a/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/[zone_id]/route.ts b/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/[zone_id]/route.ts index 18be0a24da..f34c6c3e6b 100644 --- a/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/[zone_id]/route.ts +++ b/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/[zone_id]/route.ts @@ -11,7 +11,7 @@ import { import { ContainerRegistrationKeys, MedusaError, - ModuleRegistrationName, + Modules, remoteQueryObjectFromString, } from "@medusajs/utils" import { @@ -52,7 +52,7 @@ export const POST = async ( res: MedusaResponse ) => { const fulfillmentModuleService = req.scope.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) // ensure fulfillment set exists and that the service zone is part of it @@ -99,7 +99,7 @@ export const DELETE = async ( const { id, zone_id } = req.params const fulfillmentModuleService = req.scope.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) // ensure fulfillment set exists and that the service zone is part of it diff --git a/packages/medusa/src/api/admin/orders/[id]/preview/route.ts b/packages/medusa/src/api/admin/orders/[id]/preview/route.ts index 9a2a1d5c6e..c4fd8f0423 100644 --- a/packages/medusa/src/api/admin/orders/[id]/preview/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/preview/route.ts @@ -1,9 +1,9 @@ -import { ModuleRegistrationName } from "@medusajs/utils" +import { HttpTypes } from "@medusajs/types" +import { Modules } from "@medusajs/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../types/routing" -import { HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, @@ -12,7 +12,7 @@ export const GET = async ( const { id } = req.params // NOTE: Consider replacing with remoteQuery when possible - const orderModuleService = req.scope.resolve(ModuleRegistrationName.ORDER) + const orderModuleService = req.scope.resolve(Modules.ORDER) const order = (await orderModuleService.previewOrderChange( id diff --git a/packages/medusa/src/api/admin/products/import/[transaction_id]/confirm/route.ts b/packages/medusa/src/api/admin/products/import/[transaction_id]/confirm/route.ts index 0b468cf6bf..294db0a8cf 100644 --- a/packages/medusa/src/api/admin/products/import/[transaction_id]/confirm/route.ts +++ b/packages/medusa/src/api/admin/products/import/[transaction_id]/confirm/route.ts @@ -3,12 +3,12 @@ import { MedusaResponse, } from "../../../../../../types/routing" -import { IWorkflowEngineService } from "@medusajs/types" -import { ModuleRegistrationName, TransactionHandlerType } from "@medusajs/utils" import { importProductsWorkflowId, waitConfirmationProductImportStepId, } from "@medusajs/core-flows" +import { IWorkflowEngineService } from "@medusajs/types" +import { Modules, TransactionHandlerType } from "@medusajs/utils" import { StepResponse } from "@medusajs/workflows-sdk" export const POST = async ( @@ -16,7 +16,7 @@ export const POST = async ( res: MedusaResponse ) => { const workflowEngineService: IWorkflowEngineService = req.scope.resolve( - ModuleRegistrationName.WORKFLOW_ENGINE + Modules.WORKFLOW_ENGINE ) const transactionId = req.params.transaction_id diff --git a/packages/medusa/src/api/admin/returns/[id]/receive/route.ts b/packages/medusa/src/api/admin/returns/[id]/receive/route.ts index ef171ed01d..6ce4ee288a 100644 --- a/packages/medusa/src/api/admin/returns/[id]/receive/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/receive/route.ts @@ -2,9 +2,10 @@ import { beginReceiveReturnWorkflow, cancelReturnReceiveWorkflow, } from "@medusajs/core-flows" +import { HttpTypes } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, + Modules, promiseAll, remoteQueryObjectFromString, } from "@medusajs/utils" @@ -13,14 +14,13 @@ import { MedusaResponse, } from "../../../../../types/routing" import { AdminPostReceiveReturnsReqSchemaType } from "../../validators" -import { HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) - const orderModuleService = req.scope.resolve(ModuleRegistrationName.ORDER) + const orderModuleService = req.scope.resolve(Modules.ORDER) const { id } = req.params diff --git a/packages/medusa/src/api/admin/returns/route.ts b/packages/medusa/src/api/admin/returns/route.ts index 10066eaabc..cbb14f32d6 100644 --- a/packages/medusa/src/api/admin/returns/route.ts +++ b/packages/medusa/src/api/admin/returns/route.ts @@ -2,7 +2,7 @@ import { beginReturnOrderWorkflow } from "@medusajs/core-flows" import { HttpTypes } from "@medusajs/types" import { ContainerRegistrationKeys, - ModuleRegistrationName, + Modules, promiseAll, remoteQueryObjectFromString, } from "@medusajs/utils" @@ -49,7 +49,7 @@ export const POST = async ( } const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) - const orderModuleService = req.scope.resolve(ModuleRegistrationName.ORDER) + const orderModuleService = req.scope.resolve(Modules.ORDER) const workflow = beginReturnOrderWorkflow(req.scope) const { result } = await workflow.run({ diff --git a/packages/medusa/src/api/admin/shipping-profiles/[id]/route.ts b/packages/medusa/src/api/admin/shipping-profiles/[id]/route.ts index 18dea7d895..5a8908d7d4 100644 --- a/packages/medusa/src/api/admin/shipping-profiles/[id]/route.ts +++ b/packages/medusa/src/api/admin/shipping-profiles/[id]/route.ts @@ -3,7 +3,7 @@ import { updateShippingProfilesWorkflow, } from "@medusajs/core-flows" import { HttpTypes, IFulfillmentModuleService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { AuthenticatedMedusaRequest, MedusaResponse, @@ -34,7 +34,7 @@ export const DELETE = async ( const { id } = req.params const fulfillmentModuleService = req.scope.resolve( - ModuleRegistrationName.FULFILLMENT + Modules.FULFILLMENT ) // Test if exists diff --git a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/[transaction_id]/[step_id]/subscribe/route.ts b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/[transaction_id]/[step_id]/subscribe/route.ts index 790fdc1023..ce35b3ae48 100644 --- a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/[transaction_id]/[step_id]/subscribe/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/[transaction_id]/[step_id]/subscribe/route.ts @@ -4,14 +4,14 @@ import { MedusaResponse, } from "../../../../../../../types/routing" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" export const GET = async ( req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const workflowEngineService: IWorkflowEngineService = req.scope.resolve( - ModuleRegistrationName.WORKFLOW_ENGINE + Modules.WORKFLOW_ENGINE ) const { workflow_id, transaction_id } = req.query as any diff --git a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/run/route.ts b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/run/route.ts index f24f4ea84f..702e9fbcc4 100644 --- a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/run/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/run/route.ts @@ -3,7 +3,7 @@ import { IWorkflowEngineService, WorkflowOrchestratorRunDTO, } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { AuthenticatedMedusaRequest, MedusaResponse, @@ -15,7 +15,7 @@ export const POST = async ( res: MedusaResponse ) => { const workflowEngineService: IWorkflowEngineService = req.scope.resolve( - ModuleRegistrationName.WORKFLOW_ENGINE + Modules.WORKFLOW_ENGINE ) const { workflow_id } = req.params diff --git a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/failure/route.ts b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/failure/route.ts index 2a43b77b76..460659763b 100644 --- a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/failure/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/failure/route.ts @@ -6,7 +6,7 @@ import { } from "../../../../../../types/routing" import { IWorkflowEngineService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { AdminCreateWorkflowsAsyncResponseType } from "../../../validators" export const POST = async ( @@ -14,7 +14,7 @@ export const POST = async ( res: MedusaResponse<{ success: boolean }> ) => { const workflowEngineService: IWorkflowEngineService = req.scope.resolve( - ModuleRegistrationName.WORKFLOW_ENGINE + Modules.WORKFLOW_ENGINE ) const { workflow_id } = req.params diff --git a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/success/route.ts b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/success/route.ts index 6b33ad5606..df453432e2 100644 --- a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/success/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/success/route.ts @@ -6,7 +6,7 @@ import { } from "../../../../../../types/routing" import { IWorkflowEngineService } from "@medusajs/types" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" import { AdminCreateWorkflowsAsyncResponseType } from "../../../validators" export const POST = async ( @@ -14,7 +14,7 @@ export const POST = async ( res: MedusaResponse<{ success: boolean }> ) => { const workflowEngineService: IWorkflowEngineService = req.scope.resolve( - ModuleRegistrationName.WORKFLOW_ENGINE + Modules.WORKFLOW_ENGINE ) const { workflow_id } = req.params diff --git a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/subscribe/route.ts b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/subscribe/route.ts index 6c4f7d2d7d..d260718031 100644 --- a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/subscribe/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/subscribe/route.ts @@ -4,14 +4,14 @@ import { MedusaResponse, } from "../../../../../types/routing" -import { ModuleRegistrationName } from "@medusajs/utils" +import { Modules } from "@medusajs/utils" export const GET = async ( req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const workflowEngineService: IWorkflowEngineService = req.scope.resolve( - ModuleRegistrationName.WORKFLOW_ENGINE + Modules.WORKFLOW_ENGINE ) const { workflow_id } = req.query as any diff --git a/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/callback/route.ts b/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/callback/route.ts index 09453bb726..cfbb9bee4f 100644 --- a/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/callback/route.ts +++ b/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/callback/route.ts @@ -6,7 +6,7 @@ import { import { ContainerRegistrationKeys, MedusaError, - ModuleRegistrationName, + Modules, } from "@medusajs/utils" import { MedusaRequest, MedusaResponse } from "../../../../../types/routing" import { generateJwtTokenForAuthIdentity } from "../../../utils/generate-jwt-token" @@ -17,9 +17,7 @@ export const GET = async (req: MedusaRequest, res: MedusaResponse) => { const config: ConfigModule = req.scope.resolve( ContainerRegistrationKeys.CONFIG_MODULE ) - const service: IAuthModuleService = req.scope.resolve( - ModuleRegistrationName.AUTH - ) + const service: IAuthModuleService = req.scope.resolve(Modules.AUTH) const authData = { url: req.url, diff --git a/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/register/route.ts b/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/register/route.ts index b4db076dfa..1b2206b2a7 100644 --- a/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/register/route.ts +++ b/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/register/route.ts @@ -6,7 +6,7 @@ import { import { ContainerRegistrationKeys, MedusaError, - ModuleRegistrationName, + Modules, } from "@medusajs/utils" import { MedusaRequest, MedusaResponse } from "../../../../../types/routing" import { generateJwtTokenForAuthIdentity } from "../../../utils/generate-jwt-token" @@ -17,9 +17,7 @@ export const POST = async (req: MedusaRequest, res: MedusaResponse) => { ContainerRegistrationKeys.CONFIG_MODULE ) - const service: IAuthModuleService = req.scope.resolve( - ModuleRegistrationName.AUTH - ) + const service: IAuthModuleService = req.scope.resolve(Modules.AUTH) const authData = { url: req.url, diff --git a/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/route.ts b/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/route.ts index efe17b28f8..0ab887e953 100644 --- a/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/route.ts +++ b/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/route.ts @@ -6,7 +6,7 @@ import { import { ContainerRegistrationKeys, MedusaError, - ModuleRegistrationName, + Modules, } from "@medusajs/utils" import { MedusaRequest, MedusaResponse } from "../../../../types/routing" import { generateJwtTokenForAuthIdentity } from "../../utils/generate-jwt-token" @@ -17,9 +17,7 @@ export const GET = async (req: MedusaRequest, res: MedusaResponse) => { ContainerRegistrationKeys.CONFIG_MODULE ) - const service: IAuthModuleService = req.scope.resolve( - ModuleRegistrationName.AUTH - ) + const service: IAuthModuleService = req.scope.resolve(Modules.AUTH) const authData = { url: req.url, diff --git a/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/update/route.ts b/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/update/route.ts index d3665ce40b..39f1a59653 100644 --- a/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/update/route.ts +++ b/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/update/route.ts @@ -1,6 +1,6 @@ import { AuthenticatedMedusaRequest } from "@medusajs/framework" import { IAuthModuleService } from "@medusajs/types" -import { MedusaError, ModuleRegistrationName } from "@medusajs/utils" +import { MedusaError, Modules } from "@medusajs/utils" import { MedusaResponse } from "../../../../../types/routing" export const POST = async ( @@ -9,9 +9,7 @@ export const POST = async ( ) => { const { auth_provider } = req.params - const authService = req.scope.resolve( - ModuleRegistrationName.AUTH - ) + const authService = req.scope.resolve(Modules.AUTH) const { authIdentity, success, error } = await authService.updateProvider( auth_provider, diff --git a/packages/medusa/src/api/auth/token/refresh/route.ts b/packages/medusa/src/api/auth/token/refresh/route.ts index d39d249fbb..28e5697c20 100644 --- a/packages/medusa/src/api/auth/token/refresh/route.ts +++ b/packages/medusa/src/api/auth/token/refresh/route.ts @@ -1,12 +1,9 @@ import { IAuthModuleService } from "@medusajs/types" +import { ContainerRegistrationKeys, Modules } from "@medusajs/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../types/routing" -import { - ContainerRegistrationKeys, - ModuleRegistrationName, -} from "@medusajs/utils" import { generateJwtTokenForAuthIdentity } from "../../utils/generate-jwt-token" // Retrieve a newly generated JWT token. All checks that the existing token is valid already happen in the auth middleware. @@ -16,9 +13,7 @@ export const POST = async ( req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { - const service: IAuthModuleService = req.scope.resolve( - ModuleRegistrationName.AUTH - ) + const service: IAuthModuleService = req.scope.resolve(Modules.AUTH) const authIdentity = await service.retrieveAuthIdentity( req.auth_context.auth_identity_id diff --git a/packages/medusa/src/api/auth/utils/validate-token.ts b/packages/medusa/src/api/auth/utils/validate-token.ts index 88f5d0c29d..0de23ecb33 100644 --- a/packages/medusa/src/api/auth/utils/validate-token.ts +++ b/packages/medusa/src/api/auth/utils/validate-token.ts @@ -5,11 +5,8 @@ import { MedusaResponse, } from "@medusajs/framework" import { ConfigModule, IAuthModuleService } from "@medusajs/types" -import { - ContainerRegistrationKeys, - ModuleRegistrationName, -} from "@medusajs/utils" -import { decode, JwtPayload, verify } from "jsonwebtoken" +import { ContainerRegistrationKeys, Modules } from "@medusajs/utils" +import { JwtPayload, decode, verify } from "jsonwebtoken" // Middleware to validate that a token is valid export const validateToken = () => { @@ -32,9 +29,7 @@ export const validateToken = () => { ContainerRegistrationKeys.CONFIG_MODULE ).projectConfig - const authModule = req.scope.resolve( - ModuleRegistrationName.AUTH - ) + const authModule = req.scope.resolve(Modules.AUTH) let decoded = decode(token as string) as JwtPayload diff --git a/packages/medusa/src/api/hooks/payment/[provider]/route.ts b/packages/medusa/src/api/hooks/payment/[provider]/route.ts index 4a43b65967..7fcbb3efc2 100644 --- a/packages/medusa/src/api/hooks/payment/[provider]/route.ts +++ b/packages/medusa/src/api/hooks/payment/[provider]/route.ts @@ -1,5 +1,5 @@ import { PaymentModuleOptions } from "@medusajs/types" -import { ModuleRegistrationName, PaymentWebhookEvents } from "@medusajs/utils" +import { Modules, PaymentWebhookEvents } from "@medusajs/utils" import { MedusaRequest, MedusaResponse } from "../../../../types/routing" @@ -9,14 +9,14 @@ export const POST = async (req: MedusaRequest, res: MedusaResponse) => { const options: PaymentModuleOptions = // @ts-expect-error "Not sure if .options exists on a module" - req.scope.resolve(ModuleRegistrationName.PAYMENT).options || {} + req.scope.resolve(Modules.PAYMENT).options || {} const event = { provider, payload: { data: req.body, rawData: req.rawBody, headers: req.headers }, } - const eventBus = req.scope.resolve(ModuleRegistrationName.EVENT_BUS) + const eventBus = req.scope.resolve(Modules.EVENT_BUS) // we delay the processing of the event to avoid a conflict caused by a race condition await eventBus.emit( diff --git a/packages/medusa/src/api/store/products/helpers.ts b/packages/medusa/src/api/store/products/helpers.ts index 63327593ff..c282a7460b 100644 --- a/packages/medusa/src/api/store/products/helpers.ts +++ b/packages/medusa/src/api/store/products/helpers.ts @@ -1,16 +1,13 @@ import { - ModuleRegistrationName, - calculateAmountsWithTax, -} from "@medusajs/utils" + HttpTypes, + ItemTaxLineDTO, + MedusaContainer, + TaxCalculationContext, + TaxableItemDTO, +} from "@medusajs/types" +import { Modules, calculateAmountsWithTax } from "@medusajs/utils" import { MedusaRequest } from "../../../types/routing" import { refetchEntities, refetchEntity } from "../../utils/refetch-entity" -import { - MedusaContainer, - HttpTypes, - TaxableItemDTO, - ItemTaxLineDTO, - TaxCalculationContext, -} from "@medusajs/types" export type RequestWithContext = MedusaRequest & { taxContext: { @@ -67,7 +64,7 @@ export const wrapProductsWithTaxPrices = async ( return } - const taxService = req.scope.resolve(ModuleRegistrationName.TAX) + const taxService = req.scope.resolve(Modules.TAX) const taxRates = (await taxService.getTaxLines( products.map(asTaxItem).flat(), diff --git a/packages/medusa/src/api/store/shipping-options/route.ts b/packages/medusa/src/api/store/shipping-options/route.ts index c0e3840f57..a58a441df7 100644 --- a/packages/medusa/src/api/store/shipping-options/route.ts +++ b/packages/medusa/src/api/store/shipping-options/route.ts @@ -1,6 +1,6 @@ import { listShippingOptionsForCartWorkflow } from "@medusajs/core-flows" import { HttpTypes, ICartModuleService } from "@medusajs/types" -import { MedusaError, ModuleRegistrationName } from "@medusajs/utils" +import { MedusaError, Modules } from "@medusajs/utils" import { MedusaRequest, MedusaResponse } from "../../../types/routing" export const GET = async ( @@ -15,9 +15,7 @@ export const GET = async ( ) } - const cartService = req.scope.resolve( - ModuleRegistrationName.CART - ) + const cartService = req.scope.resolve(Modules.CART) const cart = await cartService.retrieveCart(cart_id, { select: [ diff --git a/packages/medusa/src/commands/user.ts b/packages/medusa/src/commands/user.ts index b324258a76..5d75c0b80f 100644 --- a/packages/medusa/src/commands/user.ts +++ b/packages/medusa/src/commands/user.ts @@ -1,8 +1,7 @@ +import { logger } from "@medusajs/framework" +import { Modules } from "@medusajs/utils" import express from "express" import { track } from "medusa-telemetry" - -import { logger } from "@medusajs/framework" -import { ModuleRegistrationName } from "@medusajs/utils" import loaders from "../loaders" export default async function ({ @@ -27,8 +26,8 @@ export default async function ({ expressApp: app, }) - const userService = container.resolve(ModuleRegistrationName.USER) - const authService = container.resolve(ModuleRegistrationName.AUTH) + const userService = container.resolve(Modules.USER) + const authService = container.resolve(Modules.AUTH) const provider = "emailpass" diff --git a/packages/medusa/src/subscribers/configurable-notifications.ts b/packages/medusa/src/subscribers/configurable-notifications.ts index 3b66a436a5..4265be29c1 100644 --- a/packages/medusa/src/subscribers/configurable-notifications.ts +++ b/packages/medusa/src/subscribers/configurable-notifications.ts @@ -1,9 +1,5 @@ import { INotificationModuleService } from "@medusajs/types" -import { - ContainerRegistrationKeys, - ModuleRegistrationName, - promiseAll, -} from "@medusajs/utils" +import { ContainerRegistrationKeys, Modules, promiseAll } from "@medusajs/utils" import { get } from "lodash" import { SubscriberArgs, SubscriberConfig } from "../types/subscribers" @@ -49,7 +45,7 @@ export default async function configurableNotifications({ }: SubscriberArgs) { const logger = container.resolve(ContainerRegistrationKeys.LOGGER) const notificationService: INotificationModuleService = container.resolve( - ModuleRegistrationName.NOTIFICATION + Modules.NOTIFICATION ) const handlers = configAsMap[event.name] ?? [] diff --git a/packages/medusa/src/subscribers/payment-webhook.ts b/packages/medusa/src/subscribers/payment-webhook.ts index d00147c0b7..8ee4062bf4 100644 --- a/packages/medusa/src/subscribers/payment-webhook.ts +++ b/packages/medusa/src/subscribers/payment-webhook.ts @@ -1,5 +1,5 @@ import { IPaymentModuleService, ProviderWebhookPayload } from "@medusajs/types" -import { ModuleRegistrationName, PaymentWebhookEvents } from "@medusajs/utils" +import { Modules, PaymentWebhookEvents } from "@medusajs/utils" import { SubscriberArgs, SubscriberConfig } from "../types/subscribers" type SerializedBuffer = { @@ -12,7 +12,7 @@ export default async function paymentWebhookhandler({ container, }: SubscriberArgs) { const paymentService: IPaymentModuleService = container.resolve( - ModuleRegistrationName.PAYMENT + Modules.PAYMENT ) const input = event.data diff --git a/packages/modules/api-key/integration-tests/__tests__/api-key-module-service.spec.ts b/packages/modules/api-key/integration-tests/__tests__/api-key-module-service.spec.ts index 571d1975d2..df11e8c53a 100644 --- a/packages/modules/api-key/integration-tests/__tests__/api-key-module-service.spec.ts +++ b/packages/modules/api-key/integration-tests/__tests__/api-key-module-service.spec.ts @@ -56,7 +56,7 @@ moduleIntegrationTestRunner({ linkable: "api_key_id", entity: "ApiKey", primaryKey: "id", - serviceName: "apiKey", + serviceName: "ApiKey", field: "apiKey", }, publishable_key_id: { @@ -64,7 +64,7 @@ moduleIntegrationTestRunner({ entity: "ApiKey", linkable: "publishable_key_id", primaryKey: "publishable_key_id", - serviceName: "apiKey", + serviceName: "ApiKey", }, }) }) diff --git a/packages/modules/api-key/src/types/index.ts b/packages/modules/api-key/src/types/index.ts index ea71f85559..824fbce29c 100644 --- a/packages/modules/api-key/src/types/index.ts +++ b/packages/modules/api-key/src/types/index.ts @@ -1,9 +1,14 @@ -import { ApiKeyType, RevokeApiKeyDTO, UpdateApiKeyDTO } from "@medusajs/types" -import { IEventBusModuleService, Logger } from "@medusajs/types" +import { + ApiKeyType, + IEventBusModuleService, + Logger, + RevokeApiKeyDTO, + UpdateApiKeyDTO, +} from "@medusajs/types" export type InitializeModuleInjectableDependencies = { logger?: Logger - eventBusModuleService?: IEventBusModuleService + EventBus?: IEventBusModuleService } export type CreateApiKeyDTO = { diff --git a/packages/modules/auth/integration-tests/__tests__/auth-module-service/index.spec.ts b/packages/modules/auth/integration-tests/__tests__/auth-module-service/index.spec.ts index 972c73794e..0fd5a9034d 100644 --- a/packages/modules/auth/integration-tests/__tests__/auth-module-service/index.spec.ts +++ b/packages/modules/auth/integration-tests/__tests__/auth-module-service/index.spec.ts @@ -54,7 +54,7 @@ moduleIntegrationTestRunner({ linkable: "auth_identity_id", entity: "AuthIdentity", primaryKey: "id", - serviceName: "auth", + serviceName: "Auth", field: "authIdentity", }, }) @@ -66,7 +66,7 @@ moduleIntegrationTestRunner({ linkable: "provider_identity_id", entity: "ProviderIdentity", primaryKey: "id", - serviceName: "auth", + serviceName: "Auth", field: "providerIdentity", }, }) diff --git a/packages/modules/cart/integration-tests/__tests__/services/cart-module/index.spec.ts b/packages/modules/cart/integration-tests/__tests__/services/cart-module/index.spec.ts index ab63972611..c389925687 100644 --- a/packages/modules/cart/integration-tests/__tests__/services/cart-module/index.spec.ts +++ b/packages/modules/cart/integration-tests/__tests__/services/cart-module/index.spec.ts @@ -36,7 +36,7 @@ moduleIntegrationTestRunner({ linkable: "cart_id", entity: "Cart", primaryKey: "id", - serviceName: "cart", + serviceName: "Cart", field: "cart", }, }, @@ -45,7 +45,7 @@ moduleIntegrationTestRunner({ linkable: "address_id", entity: "Address", primaryKey: "id", - serviceName: "cart", + serviceName: "Cart", field: "address", }, }, @@ -54,7 +54,7 @@ moduleIntegrationTestRunner({ linkable: "line_item_id", entity: "LineItem", primaryKey: "id", - serviceName: "cart", + serviceName: "Cart", field: "lineItem", }, }, @@ -63,7 +63,7 @@ moduleIntegrationTestRunner({ linkable: "line_item_adjustment_id", entity: "LineItemAdjustment", primaryKey: "id", - serviceName: "cart", + serviceName: "Cart", field: "lineItemAdjustment", }, }, @@ -72,7 +72,7 @@ moduleIntegrationTestRunner({ linkable: "line_item_tax_line_id", entity: "LineItemTaxLine", primaryKey: "id", - serviceName: "cart", + serviceName: "Cart", field: "lineItemTaxLine", }, }, @@ -81,7 +81,7 @@ moduleIntegrationTestRunner({ linkable: "shipping_method_id", entity: "ShippingMethod", primaryKey: "id", - serviceName: "cart", + serviceName: "Cart", field: "shippingMethod", }, }, @@ -90,7 +90,7 @@ moduleIntegrationTestRunner({ linkable: "shipping_method_adjustment_id", entity: "ShippingMethodAdjustment", primaryKey: "id", - serviceName: "cart", + serviceName: "Cart", field: "shippingMethodAdjustment", }, }, @@ -99,7 +99,7 @@ moduleIntegrationTestRunner({ linkable: "shipping_method_tax_line_id", entity: "ShippingMethodTaxLine", primaryKey: "id", - serviceName: "cart", + serviceName: "Cart", field: "shippingMethodTaxLine", }, }, diff --git a/packages/modules/currency/integration-tests/__tests__/currency-module-service.spec.ts b/packages/modules/currency/integration-tests/__tests__/currency-module-service.spec.ts index b7a6ca8e19..0520a02ab5 100644 --- a/packages/modules/currency/integration-tests/__tests__/currency-module-service.spec.ts +++ b/packages/modules/currency/integration-tests/__tests__/currency-module-service.spec.ts @@ -1,7 +1,7 @@ import { ICurrencyModuleService } from "@medusajs/types" -import { moduleIntegrationTestRunner } from "medusa-test-utils" import { Module, Modules } from "@medusajs/utils" import { CurrencyModuleService } from "@services" +import { moduleIntegrationTestRunner } from "medusa-test-utils" jest.setTimeout(100000) @@ -26,7 +26,7 @@ moduleIntegrationTestRunner({ linkable: "currency_code", entity: "Currency", primaryKey: "code", - serviceName: "currency", + serviceName: "Currency", field: "currency", }, }, diff --git a/packages/modules/currency/src/loaders/initial-data.ts b/packages/modules/currency/src/loaders/initial-data.ts index 3f3a624c65..742e26c579 100644 --- a/packages/modules/currency/src/loaders/initial-data.ts +++ b/packages/modules/currency/src/loaders/initial-data.ts @@ -1,9 +1,5 @@ import { LoaderOptions, Logger, ModulesSdkTypes } from "@medusajs/types" -import { - ContainerRegistrationKeys, - ModuleRegistrationName, - defaultCurrencies, -} from "@medusajs/utils" +import { ContainerRegistrationKeys, defaultCurrencies } from "@medusajs/utils" import { Currency } from "@models" export default async ({ @@ -18,7 +14,7 @@ export default async ({ container.resolve(ContainerRegistrationKeys.LOGGER) ?? console const { currencyService_ } = container.resolve<{ currencyService_: ModulesSdkTypes.IMedusaInternalService - }>(ModuleRegistrationName.CURRENCY) + }>("currencyModuleService") try { const normalizedCurrencies = Object.values(defaultCurrencies).map((c) => ({ diff --git a/packages/modules/currency/src/types/index.ts b/packages/modules/currency/src/types/index.ts index d692c28400..473fec2d61 100644 --- a/packages/modules/currency/src/types/index.ts +++ b/packages/modules/currency/src/types/index.ts @@ -2,5 +2,5 @@ import { IEventBusModuleService, Logger } from "@medusajs/types" export type InitializeModuleInjectableDependencies = { logger?: Logger - eventBusModuleService?: IEventBusModuleService + EventBus?: IEventBusModuleService } diff --git a/packages/modules/customer/integration-tests/__tests__/services/customer-module/index.spec.ts b/packages/modules/customer/integration-tests/__tests__/services/customer-module/index.spec.ts index 402c5265ae..66e9be56e8 100644 --- a/packages/modules/customer/integration-tests/__tests__/services/customer-module/index.spec.ts +++ b/packages/modules/customer/integration-tests/__tests__/services/customer-module/index.spec.ts @@ -31,7 +31,7 @@ moduleIntegrationTestRunner({ linkable: "customer_address_id", entity: "CustomerAddress", primaryKey: "id", - serviceName: "customer", + serviceName: "Customer", field: "customerAddress", }, }, @@ -40,7 +40,7 @@ moduleIntegrationTestRunner({ linkable: "customer_group_customer_id", entity: "CustomerGroupCustomer", primaryKey: "id", - serviceName: "customer", + serviceName: "Customer", field: "customerGroupCustomer", }, }, @@ -49,7 +49,7 @@ moduleIntegrationTestRunner({ linkable: "customer_group_id", entity: "CustomerGroup", primaryKey: "id", - serviceName: "customer", + serviceName: "Customer", field: "customerGroup", }, }, @@ -58,7 +58,7 @@ moduleIntegrationTestRunner({ linkable: "customer_id", entity: "Customer", primaryKey: "id", - serviceName: "customer", + serviceName: "Customer", field: "customer", }, }, diff --git a/packages/modules/fulfillment/integration-tests/__fixtures__/events.ts b/packages/modules/fulfillment/integration-tests/__fixtures__/events.ts index c2283a0766..bc87840e80 100644 --- a/packages/modules/fulfillment/integration-tests/__fixtures__/events.ts +++ b/packages/modules/fulfillment/integration-tests/__fixtures__/events.ts @@ -13,7 +13,7 @@ export function buildExpectedEventMessageShape(options: { metadata: { action: options.action, eventGroupId: options.eventGroupId, - source: "fulfillment", + source: "Fulfillment", object: options.object, }, data: options.data, diff --git a/packages/modules/fulfillment/integration-tests/__tests__/fulfillment-module-service/index.spec.ts b/packages/modules/fulfillment/integration-tests/__tests__/fulfillment-module-service/index.spec.ts index af6eed0c32..531e3041b7 100644 --- a/packages/modules/fulfillment/integration-tests/__tests__/fulfillment-module-service/index.spec.ts +++ b/packages/modules/fulfillment/integration-tests/__tests__/fulfillment-module-service/index.spec.ts @@ -133,7 +133,7 @@ moduleIntegrationTestRunner({ linkable: "fulfillment_address_id", entity: "FulfillmentAddress", primaryKey: "id", - serviceName: "fulfillment", + serviceName: "Fulfillment", field: "fulfillmentAddress", }, }, @@ -142,7 +142,7 @@ moduleIntegrationTestRunner({ linkable: "fulfillment_item_id", entity: "FulfillmentItem", primaryKey: "id", - serviceName: "fulfillment", + serviceName: "Fulfillment", field: "fulfillmentItem", }, }, @@ -151,7 +151,7 @@ moduleIntegrationTestRunner({ linkable: "fulfillment_label_id", entity: "FulfillmentLabel", primaryKey: "id", - serviceName: "fulfillment", + serviceName: "Fulfillment", field: "fulfillmentLabel", }, }, @@ -160,7 +160,7 @@ moduleIntegrationTestRunner({ linkable: "fulfillment_provider_id", entity: "FulfillmentProvider", primaryKey: "id", - serviceName: "fulfillment", + serviceName: "Fulfillment", field: "fulfillmentProvider", }, }, @@ -169,7 +169,7 @@ moduleIntegrationTestRunner({ linkable: "fulfillment_set_id", entity: "FulfillmentSet", primaryKey: "id", - serviceName: "fulfillment", + serviceName: "Fulfillment", field: "fulfillmentSet", }, }, @@ -178,7 +178,7 @@ moduleIntegrationTestRunner({ linkable: "fulfillment_id", entity: "Fulfillment", primaryKey: "id", - serviceName: "fulfillment", + serviceName: "Fulfillment", field: "fulfillment", }, }, @@ -187,7 +187,7 @@ moduleIntegrationTestRunner({ linkable: "geo_zone_id", entity: "GeoZone", primaryKey: "id", - serviceName: "fulfillment", + serviceName: "Fulfillment", field: "geoZone", }, }, @@ -196,7 +196,7 @@ moduleIntegrationTestRunner({ linkable: "service_zone_id", entity: "ServiceZone", primaryKey: "id", - serviceName: "fulfillment", + serviceName: "Fulfillment", field: "serviceZone", }, }, @@ -205,7 +205,7 @@ moduleIntegrationTestRunner({ linkable: "shipping_option_rule_id", entity: "ShippingOptionRule", primaryKey: "id", - serviceName: "fulfillment", + serviceName: "Fulfillment", field: "shippingOptionRule", }, }, @@ -214,7 +214,7 @@ moduleIntegrationTestRunner({ linkable: "shipping_option_type_id", entity: "ShippingOptionType", primaryKey: "id", - serviceName: "fulfillment", + serviceName: "Fulfillment", field: "shippingOptionType", }, }, @@ -223,7 +223,7 @@ moduleIntegrationTestRunner({ linkable: "shipping_option_id", entity: "ShippingOption", primaryKey: "id", - serviceName: "fulfillment", + serviceName: "Fulfillment", field: "shippingOption", }, }, @@ -232,7 +232,7 @@ moduleIntegrationTestRunner({ linkable: "shipping_profile_id", entity: "ShippingProfile", primaryKey: "id", - serviceName: "fulfillment", + serviceName: "Fulfillment", field: "shippingProfile", }, }, diff --git a/packages/modules/fulfillment/src/types/index.ts b/packages/modules/fulfillment/src/types/index.ts index 88abd95f77..57ce0f402f 100644 --- a/packages/modules/fulfillment/src/types/index.ts +++ b/packages/modules/fulfillment/src/types/index.ts @@ -7,7 +7,7 @@ import { export type InitializeModuleInjectableDependencies = { logger?: Logger - eventBusModuleService?: IEventBusModuleService + EventBus?: IEventBusModuleService } export const FulfillmentIdentifiersRegistrationName = diff --git a/packages/modules/inventory-next/integration-tests/__tests__/inventory-module-service.spec.ts b/packages/modules/inventory-next/integration-tests/__tests__/inventory-module-service.spec.ts index 8fdfba19e5..a666cc2046 100644 --- a/packages/modules/inventory-next/integration-tests/__tests__/inventory-module-service.spec.ts +++ b/packages/modules/inventory-next/integration-tests/__tests__/inventory-module-service.spec.ts @@ -31,7 +31,7 @@ moduleIntegrationTestRunner({ entity: "InventoryItem", linkable: "inventory_item_id", primaryKey: "id", - serviceName: "inventoryService", + serviceName: "Inventory", }, }, inventoryLevel: { @@ -40,7 +40,7 @@ moduleIntegrationTestRunner({ entity: "InventoryLevel", linkable: "inventory_level_id", primaryKey: "id", - serviceName: "inventoryService", + serviceName: "Inventory", }, }, reservationItem: { @@ -49,7 +49,7 @@ moduleIntegrationTestRunner({ entity: "ReservationItem", linkable: "reservation_item_id", primaryKey: "id", - serviceName: "inventoryService", + serviceName: "Inventory", }, }, }) diff --git a/packages/modules/link-modules/src/index.ts b/packages/modules/link-modules/src/index.ts index 0dc1db4d6f..d785034254 100644 --- a/packages/modules/link-modules/src/index.ts +++ b/packages/modules/link-modules/src/index.ts @@ -1,6 +1,5 @@ export * from "./initialize" -export * from "./migration" -export * from "./types" export * from "./loaders" +export * from "./migration" export * from "./services" -export * from "./utils/compose-link-name" +export * from "./types" diff --git a/packages/modules/link-modules/src/initialize/index.ts b/packages/modules/link-modules/src/initialize/index.ts index ceabcea14f..8bb690b431 100644 --- a/packages/modules/link-modules/src/initialize/index.ts +++ b/packages/modules/link-modules/src/initialize/index.ts @@ -15,20 +15,17 @@ import { } from "@medusajs/types" import { arrayDifference, + composeLinkName, + composeTableName, ContainerRegistrationKeys, - lowerCaseFirst, - ModuleRegistrationName, + Modules, simpleHash, toPascalCase, } from "@medusajs/utils" import * as linkDefinitions from "../definitions" import { MigrationsExecutionPlanner } from "../migration" import { InitializeModuleInjectableDependencies } from "../types" -import { - composeLinkName, - composeTableName, - generateGraphQLSchema, -} from "../utils" +import { generateGraphQLSchema } from "../utils" import { getLinkModuleDefinition } from "./module-definition" export const initialize = async ( @@ -86,14 +83,12 @@ export const initialize = async ( } const serviceKey = !definition.isReadOnlyLink - ? lowerCaseFirst( - definition.serviceName ?? - composeLinkName( - primary.serviceName, - primary.foreignKey, - foreign.serviceName, - foreign.foreignKey - ) + ? definition.serviceName ?? + composeLinkName( + primary.serviceName, + primary.foreignKey, + foreign.serviceName, + foreign.foreignKey ) : simpleHash(JSON.stringify(definition.extends)) @@ -159,9 +154,8 @@ export const initialize = async ( const linkModuleDefinition: LinkModuleDefinition = { key: serviceKey, - registrationName: serviceKey, label: serviceKey, - dependencies: [ModuleRegistrationName.EVENT_BUS], + dependencies: [Modules.EVENT_BUS], defaultModuleDeclaration: { scope: MODULE_SCOPE.INTERNAL, resources: injectedDependencies?.[ @@ -218,15 +212,14 @@ export function getMigrationPlanner( } const [primary, foreign] = definition.relationships ?? [] - const serviceKey = lowerCaseFirst( + const serviceKey = definition.serviceName ?? - composeLinkName( - primary.serviceName, - primary.foreignKey, - foreign.serviceName, - foreign.foreignKey - ) - ) + composeLinkName( + primary.serviceName, + primary.foreignKey, + foreign.serviceName, + foreign.foreignKey + ) if (allLinks.has(serviceKey)) { throw new Error(`Link module ${serviceKey} already exists.`) diff --git a/packages/modules/link-modules/src/loaders/container.ts b/packages/modules/link-modules/src/loaders/container.ts index 08814747a0..d55dbf9c71 100644 --- a/packages/modules/link-modules/src/loaders/container.ts +++ b/packages/modules/link-modules/src/loaders/container.ts @@ -7,10 +7,13 @@ import { ModuleJoinerConfig, ModulesSdkTypes, } from "@medusajs/types" -import { lowerCaseFirst, simpleHash, toPascalCase } from "@medusajs/utils" +import { + composeLinkName, + composeTableName, + simpleHash, + toPascalCase, +} from "@medusajs/utils" import { asClass, asValue } from "awilix" -import { composeLinkName, composeTableName } from "../utils" - export function containerLoader(entity, joinerConfig: ModuleJoinerConfig) { return async ( { @@ -25,14 +28,12 @@ export function containerLoader(entity, joinerConfig: ModuleJoinerConfig) { const [primary, foreign] = joinerConfig.relationships! const serviceName = !joinerConfig.isReadOnlyLink - ? lowerCaseFirst( - joinerConfig.serviceName ?? - composeLinkName( - primary.serviceName, - primary.foreignKey, - foreign.serviceName, - foreign.foreignKey - ) + ? joinerConfig.serviceName ?? + composeLinkName( + primary.serviceName, + primary.foreignKey, + foreign.serviceName, + foreign.foreignKey ) : simpleHash(JSON.stringify(joinerConfig.extends)) diff --git a/packages/modules/link-modules/src/services/link-module-service.ts b/packages/modules/link-modules/src/services/link-module-service.ts index 253efa08ae..6a873fbe34 100644 --- a/packages/modules/link-modules/src/services/link-module-service.ts +++ b/packages/modules/link-modules/src/services/link-module-service.ts @@ -13,12 +13,13 @@ import { CommonEvents, InjectManager, InjectTransactionManager, - isDefined, - mapObjectTo, MapToConfig, MedusaContext, MedusaError, + Modules, ModulesSdkUtils, + isDefined, + mapObjectTo, } from "@medusajs/utils" import { LinkService } from "@services" import { shouldForceTransaction } from "../utils" @@ -26,12 +27,12 @@ import { shouldForceTransaction } from "../utils" type InjectedDependencies = { baseRepository: DAL.RepositoryService linkService: LinkService - eventBusModuleService?: IEventBusModuleService primaryKey: string | string[] foreignKey: string extraFields: string[] entityName: string serviceName: string + [Modules.EVENT_BUS]?: IEventBusModuleService } export default class LinkModuleService implements ILinkModule { @@ -48,12 +49,12 @@ export default class LinkModuleService implements ILinkModule { { baseRepository, linkService, - eventBusModuleService, primaryKey, foreignKey, extraFields, entityName, serviceName, + [Modules.EVENT_BUS]: eventBusModuleService, }: InjectedDependencies, readonly moduleDeclaration: InternalModuleDeclaration ) { diff --git a/packages/modules/link-modules/src/utils/compose-link-name.ts b/packages/modules/link-modules/src/utils/compose-link-name.ts deleted file mode 100644 index 63ccf052cf..0000000000 --- a/packages/modules/link-modules/src/utils/compose-link-name.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { lowerCaseFirst, toPascalCase } from "@medusajs/utils" - -export const composeLinkName = (...args) => { - return lowerCaseFirst(toPascalCase(composeTableName(...args.concat("link")))) -} - -export const composeTableName = (...args) => { - return args.map((name) => name.replace(/(_id|Service)$/gi, "")).join("_") -} diff --git a/packages/modules/link-modules/src/utils/generate-entity.ts b/packages/modules/link-modules/src/utils/generate-entity.ts index 8b5b9fc3e5..7bf9581f1a 100644 --- a/packages/modules/link-modules/src/utils/generate-entity.ts +++ b/packages/modules/link-modules/src/utils/generate-entity.ts @@ -1,12 +1,12 @@ import { JoinerRelationship, ModuleJoinerConfig } from "@medusajs/types" import { SoftDeletableFilterKey, + composeTableName, mikroOrmSoftDeletableFilterOptions, simpleHash, } from "@medusajs/utils" import { EntitySchema } from "@mikro-orm/core" -import { composeTableName } from "./compose-link-name" function getClass(...properties) { return class LinkModel { diff --git a/packages/modules/link-modules/src/utils/generate-schema.ts b/packages/modules/link-modules/src/utils/generate-schema.ts index 05363d7d61..4c642de6e8 100644 --- a/packages/modules/link-modules/src/utils/generate-schema.ts +++ b/packages/modules/link-modules/src/utils/generate-schema.ts @@ -2,11 +2,11 @@ import { MedusaModule } from "@medusajs/modules-sdk" import { ModuleJoinerConfig, ModuleJoinerRelationship } from "@medusajs/types" import { camelToSnakeCase, + composeTableName, isString, lowerCaseFirst, toPascalCase, } from "@medusajs/utils" -import { composeTableName } from "./compose-link-name" export function generateGraphQLSchema( joinerConfig: ModuleJoinerConfig, diff --git a/packages/modules/link-modules/src/utils/index.ts b/packages/modules/link-modules/src/utils/index.ts index dc95a6c05c..29115e423f 100644 --- a/packages/modules/link-modules/src/utils/index.ts +++ b/packages/modules/link-modules/src/utils/index.ts @@ -1,6 +1,5 @@ import { MODULE_RESOURCE_TYPE } from "@medusajs/modules-sdk" -export * from "./compose-link-name" export * from "./generate-entity" export * from "./generate-schema" diff --git a/packages/modules/notification/integration-tests/__tests__/notification-module-service/index.spec.ts b/packages/modules/notification/integration-tests/__tests__/notification-module-service/index.spec.ts index 9861c851df..575a728c35 100644 --- a/packages/modules/notification/integration-tests/__tests__/notification-module-service/index.spec.ts +++ b/packages/modules/notification/integration-tests/__tests__/notification-module-service/index.spec.ts @@ -60,7 +60,7 @@ moduleIntegrationTestRunner({ linkable: "notification_id", entity: "Notification", primaryKey: "id", - serviceName: "notification", + serviceName: "Notification", field: "notification", }, }, diff --git a/packages/modules/order/integration-tests/__tests__/index.spec.ts b/packages/modules/order/integration-tests/__tests__/index.spec.ts index 660e6ec04b..cab174f438 100644 --- a/packages/modules/order/integration-tests/__tests__/index.spec.ts +++ b/packages/modules/order/integration-tests/__tests__/index.spec.ts @@ -35,7 +35,7 @@ moduleIntegrationTestRunner({ linkable: "order_id", entity: "Order", primaryKey: "id", - serviceName: "order", + serviceName: "Order", field: "order", }, }, @@ -44,7 +44,7 @@ moduleIntegrationTestRunner({ linkable: "order_address_id", entity: "OrderAddress", primaryKey: "id", - serviceName: "order", + serviceName: "Order", field: "orderAddress", }, }, @@ -53,7 +53,7 @@ moduleIntegrationTestRunner({ linkable: "order_change_id", entity: "OrderChange", primaryKey: "id", - serviceName: "order", + serviceName: "Order", field: "orderChange", }, }, @@ -62,14 +62,14 @@ moduleIntegrationTestRunner({ linkable: "order_claim_id", entity: "OrderClaim", primaryKey: "id", - serviceName: "order", + serviceName: "Order", field: "orderClaim", }, claim_id: { linkable: "claim_id", entity: "OrderClaim", primaryKey: "claim_id", - serviceName: "order", + serviceName: "Order", field: "orderClaim", }, }, @@ -78,14 +78,14 @@ moduleIntegrationTestRunner({ linkable: "order_exchange_id", entity: "OrderExchange", primaryKey: "id", - serviceName: "order", + serviceName: "Order", field: "orderExchange", }, exchange_id: { linkable: "exchange_id", entity: "OrderExchange", primaryKey: "exchange_id", - serviceName: "order", + serviceName: "Order", field: "orderExchange", }, }, @@ -94,7 +94,7 @@ moduleIntegrationTestRunner({ linkable: "order_line_item_id", entity: "OrderLineItem", primaryKey: "id", - serviceName: "order", + serviceName: "Order", field: "orderLineItem", }, }, @@ -103,7 +103,7 @@ moduleIntegrationTestRunner({ linkable: "order_shipping_method_id", entity: "OrderShippingMethod", primaryKey: "id", - serviceName: "order", + serviceName: "Order", field: "orderShippingMethod", }, }, @@ -112,7 +112,7 @@ moduleIntegrationTestRunner({ linkable: "order_transaction_id", entity: "OrderTransaction", primaryKey: "id", - serviceName: "order", + serviceName: "Order", field: "orderTransaction", }, }, @@ -121,7 +121,7 @@ moduleIntegrationTestRunner({ linkable: "return_id", entity: "Return", primaryKey: "id", - serviceName: "order", + serviceName: "Order", field: "return", }, }, @@ -130,7 +130,7 @@ moduleIntegrationTestRunner({ linkable: "return_reason_id", entity: "ReturnReason", primaryKey: "id", - serviceName: "order", + serviceName: "Order", field: "returnReason", }, }, diff --git a/packages/modules/order/src/types/index.ts b/packages/modules/order/src/types/index.ts index 2b47f90293..93542812ec 100644 --- a/packages/modules/order/src/types/index.ts +++ b/packages/modules/order/src/types/index.ts @@ -15,5 +15,5 @@ export * from "./utils" export type InitializeModuleInjectableDependencies = { logger?: Logger - eventBusModuleService?: IEventBusModuleService + EventBus?: IEventBusModuleService } diff --git a/packages/modules/payment/integration-tests/__tests__/services/payment-module/index.spec.ts b/packages/modules/payment/integration-tests/__tests__/services/payment-module/index.spec.ts index d549df5ffa..64c41ee3cb 100644 --- a/packages/modules/payment/integration-tests/__tests__/services/payment-module/index.spec.ts +++ b/packages/modules/payment/integration-tests/__tests__/services/payment-module/index.spec.ts @@ -37,7 +37,7 @@ moduleIntegrationTestRunner({ linkable: "payment_id", entity: "Payment", primaryKey: "id", - serviceName: "payment", + serviceName: "Payment", field: "payment", }, }, @@ -46,7 +46,7 @@ moduleIntegrationTestRunner({ linkable: "payment_collection_id", entity: "PaymentCollection", primaryKey: "id", - serviceName: "payment", + serviceName: "Payment", field: "paymentCollection", }, }, @@ -55,7 +55,7 @@ moduleIntegrationTestRunner({ linkable: "payment_provider_id", entity: "PaymentProvider", primaryKey: "id", - serviceName: "payment", + serviceName: "Payment", field: "paymentProvider", }, }, @@ -65,7 +65,7 @@ moduleIntegrationTestRunner({ entity: "PaymentSession", linkable: "payment_session_id", primaryKey: "id", - serviceName: "payment", + serviceName: "Payment", }, }, refundReason: { @@ -73,7 +73,7 @@ moduleIntegrationTestRunner({ linkable: "refund_reason_id", entity: "RefundReason", primaryKey: "id", - serviceName: "payment", + serviceName: "Payment", field: "refundReason", }, }, diff --git a/packages/modules/pricing/integration-tests/__tests__/services/pricing-module/index.spec.ts b/packages/modules/pricing/integration-tests/__tests__/services/pricing-module/index.spec.ts index a9c7da41cc..6687f51b6b 100644 --- a/packages/modules/pricing/integration-tests/__tests__/services/pricing-module/index.spec.ts +++ b/packages/modules/pricing/integration-tests/__tests__/services/pricing-module/index.spec.ts @@ -29,7 +29,7 @@ moduleIntegrationTestRunner({ linkable: "price_set_id", entity: "PriceSet", primaryKey: "id", - serviceName: "pricingService", + serviceName: "Pricing", field: "priceSet", }, }, @@ -38,7 +38,7 @@ moduleIntegrationTestRunner({ linkable: "price_list_id", entity: "PriceList", primaryKey: "id", - serviceName: "pricingService", + serviceName: "Pricing", field: "priceList", }, }, @@ -47,7 +47,7 @@ moduleIntegrationTestRunner({ linkable: "price_id", entity: "Price", primaryKey: "id", - serviceName: "pricingService", + serviceName: "Pricing", field: "price", }, }, @@ -56,7 +56,7 @@ moduleIntegrationTestRunner({ linkable: "price_preference_id", entity: "PricePreference", primaryKey: "id", - serviceName: "pricingService", + serviceName: "Pricing", field: "pricePreference", }, }, diff --git a/packages/modules/product/integration-tests/__tests__/product-module-service/product-categories.spec.ts b/packages/modules/product/integration-tests/__tests__/product-module-service/product-categories.spec.ts index 88e1e67382..46285fc07c 100644 --- a/packages/modules/product/integration-tests/__tests__/product-module-service/product-categories.spec.ts +++ b/packages/modules/product/integration-tests/__tests__/product-module-service/product-categories.spec.ts @@ -18,7 +18,7 @@ jest.setTimeout(30000) moduleIntegrationTestRunner({ moduleName: Modules.PRODUCT, injectedDependencies: { - eventBusModuleService: new MockEventBusService(), + [Modules.EVENT_BUS]: new MockEventBusService(), }, testSuite: ({ MikroOrmWrapper, service }) => { describe("ProductModuleService product categories", () => { diff --git a/packages/modules/product/integration-tests/__tests__/product-module-service/product-collections.spec.ts b/packages/modules/product/integration-tests/__tests__/product-module-service/product-collections.spec.ts index f0d4d38027..fe7f36a3ca 100644 --- a/packages/modules/product/integration-tests/__tests__/product-module-service/product-collections.spec.ts +++ b/packages/modules/product/integration-tests/__tests__/product-module-service/product-collections.spec.ts @@ -12,7 +12,7 @@ jest.setTimeout(30000) moduleIntegrationTestRunner({ moduleName: Modules.PRODUCT, injectedDependencies: { - eventBusModuleService: new MockEventBusService(), + [Modules.EVENT_BUS]: new MockEventBusService(), }, testSuite: ({ MikroOrmWrapper, service }) => { describe("ProductModuleService product collections", () => { diff --git a/packages/modules/product/integration-tests/__tests__/product-module-service/products.spec.ts b/packages/modules/product/integration-tests/__tests__/product-module-service/products.spec.ts index 3cad7e4af6..2c9b0a29cd 100644 --- a/packages/modules/product/integration-tests/__tests__/product-module-service/products.spec.ts +++ b/packages/modules/product/integration-tests/__tests__/product-module-service/products.spec.ts @@ -3,7 +3,7 @@ import { ProductCategoryDTO, ProductTagDTO, } from "@medusajs/types" -import { kebabCase, Modules, ProductStatus } from "@medusajs/utils" +import { Modules, ProductStatus, kebabCase } from "@medusajs/utils" import { Product, ProductCategory, @@ -27,7 +27,7 @@ jest.setTimeout(300000) moduleIntegrationTestRunner({ moduleName: Modules.PRODUCT, injectedDependencies: { - eventBusModuleService: new MockEventBusService(), + [Modules.EVENT_BUS]: new MockEventBusService(), }, testSuite: ({ MikroOrmWrapper, service }) => { describe("ProductModuleService products", function () { diff --git a/packages/modules/product/integration-tests/__tests__/product.ts b/packages/modules/product/integration-tests/__tests__/product.ts index b74ef86680..88bbda49ce 100644 --- a/packages/modules/product/integration-tests/__tests__/product.ts +++ b/packages/modules/product/integration-tests/__tests__/product.ts @@ -67,7 +67,7 @@ moduleIntegrationTestRunner({ linkable: "product_id", entity: "Product", primaryKey: "id", - serviceName: "productService", + serviceName: "Product", field: "product", }, }, @@ -76,7 +76,7 @@ moduleIntegrationTestRunner({ linkable: "product_variant_id", entity: "ProductVariant", primaryKey: "id", - serviceName: "productService", + serviceName: "Product", field: "productVariant", }, variant_id: { @@ -84,7 +84,7 @@ moduleIntegrationTestRunner({ entity: "ProductVariant", linkable: "variant_id", primaryKey: "variant_id", - serviceName: "productService", + serviceName: "Product", }, }, productOption: { @@ -92,7 +92,7 @@ moduleIntegrationTestRunner({ linkable: "product_option_id", entity: "ProductOption", primaryKey: "id", - serviceName: "productService", + serviceName: "Product", field: "productOption", }, }, @@ -101,7 +101,7 @@ moduleIntegrationTestRunner({ linkable: "product_type_id", entity: "ProductType", primaryKey: "id", - serviceName: "productService", + serviceName: "Product", field: "productType", }, }, @@ -110,7 +110,7 @@ moduleIntegrationTestRunner({ linkable: "product_image_id", entity: "ProductImage", primaryKey: "id", - serviceName: "productService", + serviceName: "Product", field: "productImage", }, }, @@ -119,7 +119,7 @@ moduleIntegrationTestRunner({ linkable: "product_tag_id", entity: "ProductTag", primaryKey: "id", - serviceName: "productService", + serviceName: "Product", field: "productTag", }, }, @@ -128,7 +128,7 @@ moduleIntegrationTestRunner({ linkable: "product_collection_id", entity: "ProductCollection", primaryKey: "id", - serviceName: "productService", + serviceName: "Product", field: "productCollection", }, }, @@ -137,7 +137,7 @@ moduleIntegrationTestRunner({ linkable: "product_category_id", entity: "ProductCategory", primaryKey: "id", - serviceName: "productService", + serviceName: "Product", field: "productCategory", }, }, diff --git a/packages/modules/product/src/services/product-module-service.ts b/packages/modules/product/src/services/product-module-service.ts index e365dcefaa..f1336b9723 100644 --- a/packages/modules/product/src/services/product-module-service.ts +++ b/packages/modules/product/src/services/product-module-service.ts @@ -32,6 +32,7 @@ import { MedusaContext, MedusaError, MedusaService, + Modules, ProductStatus, promiseAll, removeUndefined, @@ -64,7 +65,7 @@ type InjectedDependencies = { productTypeService: ModulesSdkTypes.IMedusaInternalService productOptionService: ModulesSdkTypes.IMedusaInternalService productOptionValueService: ModulesSdkTypes.IMedusaInternalService - eventBusModuleService?: IEventBusModuleService + [Modules.EVENT_BUS]?: IEventBusModuleService } export default class ProductModuleService @@ -129,7 +130,7 @@ export default class ProductModuleService productTypeService, productOptionService, productOptionValueService, - eventBusModuleService, + [Modules.EVENT_BUS]: eventBusModuleService, }: InjectedDependencies, protected readonly moduleDeclaration: InternalModuleDeclaration ) { diff --git a/packages/modules/product/src/types/index.ts b/packages/modules/product/src/types/index.ts index 4b3cad8d90..4cd7648107 100644 --- a/packages/modules/product/src/types/index.ts +++ b/packages/modules/product/src/types/index.ts @@ -2,7 +2,7 @@ import { IEventBusModuleService, Logger, ProductTypes } from "@medusajs/types" export type InitializeModuleInjectableDependencies = { logger?: Logger - eventBusModuleService?: IEventBusModuleService + EventBus?: IEventBusModuleService } // TODO: remove and cleanup bellow code diff --git a/packages/modules/promotion/integration-tests/__tests__/services/promotion-module/promotion.spec.ts b/packages/modules/promotion/integration-tests/__tests__/services/promotion-module/promotion.spec.ts index 70ebcc5ee4..04c82edaf6 100644 --- a/packages/modules/promotion/integration-tests/__tests__/services/promotion-module/promotion.spec.ts +++ b/packages/modules/promotion/integration-tests/__tests__/services/promotion-module/promotion.spec.ts @@ -49,7 +49,7 @@ moduleIntegrationTestRunner({ linkable: "promotion_id", entity: "Promotion", primaryKey: "id", - serviceName: "promotion", + serviceName: "Promotion", field: "promotion", }, }, @@ -58,7 +58,7 @@ moduleIntegrationTestRunner({ linkable: "campaign_id", entity: "Campaign", primaryKey: "id", - serviceName: "promotion", + serviceName: "Promotion", field: "campaign", }, }, @@ -67,7 +67,7 @@ moduleIntegrationTestRunner({ linkable: "promotion_rule_id", entity: "PromotionRule", primaryKey: "id", - serviceName: "promotion", + serviceName: "Promotion", field: "promotionRule", }, }, diff --git a/packages/modules/region/integration-tests/__tests__/region-module.spec.ts b/packages/modules/region/integration-tests/__tests__/region-module.spec.ts index 99cc5d4e85..d734ba1bd9 100644 --- a/packages/modules/region/integration-tests/__tests__/region-module.spec.ts +++ b/packages/modules/region/integration-tests/__tests__/region-module.spec.ts @@ -26,7 +26,7 @@ moduleIntegrationTestRunner({ linkable: "region_id", entity: "Region", primaryKey: "id", - serviceName: "region", + serviceName: "Region", field: "region", }, }, @@ -35,7 +35,7 @@ moduleIntegrationTestRunner({ linkable: "country_iso_2", entity: "Country", primaryKey: "iso_2", - serviceName: "region", + serviceName: "Region", field: "country", }, }, diff --git a/packages/modules/sales-channel/integration-tests/__tests__/services/sales-channel-module.spec.ts b/packages/modules/sales-channel/integration-tests/__tests__/services/sales-channel-module.spec.ts index 403393272c..7934b7b85a 100644 --- a/packages/modules/sales-channel/integration-tests/__tests__/services/sales-channel-module.spec.ts +++ b/packages/modules/sales-channel/integration-tests/__tests__/services/sales-channel-module.spec.ts @@ -51,7 +51,7 @@ moduleIntegrationTestRunner({ linkable: "sales_channel_id", entity: "SalesChannel", primaryKey: "id", - serviceName: "salesChannel", + serviceName: "SalesChannel", field: "salesChannel", }, }, diff --git a/packages/modules/stock-location-next/integration-tests/__tests__/stock-location-module-service.spec.ts b/packages/modules/stock-location-next/integration-tests/__tests__/stock-location-module-service.spec.ts index 13e4c3a0cc..92e6eab380 100644 --- a/packages/modules/stock-location-next/integration-tests/__tests__/stock-location-module-service.spec.ts +++ b/packages/modules/stock-location-next/integration-tests/__tests__/stock-location-module-service.spec.ts @@ -30,7 +30,7 @@ moduleIntegrationTestRunner({ linkable: "stock_location_address_id", entity: "StockLocationAddress", primaryKey: "id", - serviceName: "stockLocationService", + serviceName: "StockLocation", field: "stockLocationAddress", }, }, @@ -40,13 +40,13 @@ moduleIntegrationTestRunner({ entity: "StockLocation", linkable: "stock_location_id", primaryKey: "id", - serviceName: "stockLocationService", + serviceName: "StockLocation", }, location_id: { linkable: "location_id", entity: "StockLocation", primaryKey: "location_id", - serviceName: "stockLocationService", + serviceName: "StockLocation", field: "stockLocation", }, }, diff --git a/packages/modules/stock-location-next/src/services/stock-location-module.ts b/packages/modules/stock-location-next/src/services/stock-location-module.ts index 5facd3ebbb..d4b246eb7c 100644 --- a/packages/modules/stock-location-next/src/services/stock-location-module.ts +++ b/packages/modules/stock-location-next/src/services/stock-location-module.ts @@ -18,6 +18,7 @@ import { InjectTransactionManager, MedusaContext, MedusaService, + Modules, isString, promiseAll, } from "@medusajs/utils" @@ -25,7 +26,7 @@ import { joinerConfig } from "../joiner-config" import { StockLocation, StockLocationAddress } from "../models" type InjectedDependencies = { - eventBusModuleService: IEventBusService + [Modules.EVENT_BUS]: IEventBusService baseRepository: DAL.RepositoryService stockLocationService: ModulesSdkTypes.IMedusaInternalService stockLocationAddressService: ModulesSdkTypes.IMedusaInternalService @@ -48,7 +49,7 @@ export default class StockLocationModuleService constructor( { - eventBusModuleService, + [Modules.EVENT_BUS]: eventBusModuleService, baseRepository, stockLocationService, stockLocationAddressService, diff --git a/packages/modules/store/integration-tests/__tests__/store-module-service.spec.ts b/packages/modules/store/integration-tests/__tests__/store-module-service.spec.ts index 6fa61600ae..2e75c39d67 100644 --- a/packages/modules/store/integration-tests/__tests__/store-module-service.spec.ts +++ b/packages/modules/store/integration-tests/__tests__/store-module-service.spec.ts @@ -27,7 +27,7 @@ moduleIntegrationTestRunner({ linkable: "store_id", entity: "Store", primaryKey: "id", - serviceName: "store", + serviceName: "Store", field: "store", }, }, @@ -36,7 +36,7 @@ moduleIntegrationTestRunner({ linkable: "store_currency_id", entity: "StoreCurrency", primaryKey: "id", - serviceName: "store", + serviceName: "Store", field: "storeCurrency", }, }, diff --git a/packages/modules/store/src/types/index.ts b/packages/modules/store/src/types/index.ts index bfd3dc482c..bccc6a2763 100644 --- a/packages/modules/store/src/types/index.ts +++ b/packages/modules/store/src/types/index.ts @@ -1,9 +1,8 @@ -import { StoreTypes } from "@medusajs/types" -import { IEventBusModuleService, Logger } from "@medusajs/types" +import { IEventBusModuleService, Logger, StoreTypes } from "@medusajs/types" export type InitializeModuleInjectableDependencies = { logger?: Logger - eventBusModuleService?: IEventBusModuleService + EventBus?: IEventBusModuleService } export type UpdateStoreInput = StoreTypes.UpdateStoreDTO & { id: string } diff --git a/packages/modules/tax/integration-tests/__tests__/index.spec.ts b/packages/modules/tax/integration-tests/__tests__/index.spec.ts index 2c6f2e5855..081f24d071 100644 --- a/packages/modules/tax/integration-tests/__tests__/index.spec.ts +++ b/packages/modules/tax/integration-tests/__tests__/index.spec.ts @@ -32,7 +32,7 @@ moduleIntegrationTestRunner({ linkable: "tax_rate_id", entity: "TaxRate", primaryKey: "id", - serviceName: "tax", + serviceName: "Tax", field: "taxRate", }, }, @@ -41,7 +41,7 @@ moduleIntegrationTestRunner({ linkable: "tax_region_id", entity: "TaxRegion", primaryKey: "id", - serviceName: "tax", + serviceName: "Tax", field: "taxRegion", }, }, @@ -50,7 +50,7 @@ moduleIntegrationTestRunner({ linkable: "tax_rate_rule_id", entity: "TaxRateRule", primaryKey: "id", - serviceName: "tax", + serviceName: "Tax", field: "taxRateRule", }, }, @@ -59,7 +59,7 @@ moduleIntegrationTestRunner({ linkable: "tax_provider_id", entity: "TaxProvider", primaryKey: "id", - serviceName: "tax", + serviceName: "Tax", field: "taxProvider", }, }, diff --git a/packages/modules/user/integration-tests/__tests__/invite.spec.ts b/packages/modules/user/integration-tests/__tests__/invite.spec.ts index 845b70b0a0..0247945f88 100644 --- a/packages/modules/user/integration-tests/__tests__/invite.spec.ts +++ b/packages/modules/user/integration-tests/__tests__/invite.spec.ts @@ -31,7 +31,7 @@ moduleIntegrationTestRunner({ jwt_secret: "test", }, injectedDependencies: { - eventBusModuleService: new MockEventBusService(), + [Modules.EVENT_BUS]: new MockEventBusService(), }, testSuite: ({ service }) => { describe("UserModuleService - Invite", () => { diff --git a/packages/modules/user/integration-tests/__tests__/user.spec.ts b/packages/modules/user/integration-tests/__tests__/user.spec.ts index 056279fb60..c395f6eea3 100644 --- a/packages/modules/user/integration-tests/__tests__/user.spec.ts +++ b/packages/modules/user/integration-tests/__tests__/user.spec.ts @@ -25,7 +25,7 @@ moduleIntegrationTestRunner({ jwt_secret: "test", }, injectedDependencies: { - eventBusModuleService: new MockEventBusService(), + [Modules.EVENT_BUS]: new MockEventBusService(), }, testSuite: ({ service }) => { it(`should export the appropriate linkable configuration`, () => { @@ -45,7 +45,7 @@ moduleIntegrationTestRunner({ linkable: "user_id", entity: "User", primaryKey: "id", - serviceName: "user", + serviceName: "User", field: "user", }, }, @@ -54,7 +54,7 @@ moduleIntegrationTestRunner({ linkable: "invite_id", entity: "Invite", primaryKey: "id", - serviceName: "user", + serviceName: "User", field: "invite", }, }, diff --git a/packages/modules/user/src/services/user-module.ts b/packages/modules/user/src/services/user-module.ts index 09c6ac5862..885ce4cba5 100644 --- a/packages/modules/user/src/services/user-module.ts +++ b/packages/modules/user/src/services/user-module.ts @@ -1,13 +1,11 @@ import { Context, DAL, - IEventBusModuleService, InternalModuleDeclaration, ModulesSdkTypes, UserTypes, } from "@medusajs/types" import { - arrayDifference, CommonEvents, EmitEvents, InjectManager, @@ -16,6 +14,7 @@ import { MedusaError, MedusaService, UserEvents, + arrayDifference, } from "@medusajs/utils" import jwt, { JwtPayload } from "jsonwebtoken" import crypto from "node:crypto" @@ -26,7 +25,6 @@ type InjectedDependencies = { baseRepository: DAL.RepositoryService userService: ModulesSdkTypes.IMedusaInternalService inviteService: ModulesSdkTypes.IMedusaInternalService - eventBusModuleService: IEventBusModuleService } // 1 day diff --git a/packages/modules/workflow-engine-inmemory/integration-tests/__tests__/index.spec.ts b/packages/modules/workflow-engine-inmemory/integration-tests/__tests__/index.spec.ts index 7edc08ca5c..784471bbdb 100644 --- a/packages/modules/workflow-engine-inmemory/integration-tests/__tests__/index.spec.ts +++ b/packages/modules/workflow-engine-inmemory/integration-tests/__tests__/index.spec.ts @@ -53,7 +53,7 @@ moduleIntegrationTestRunner({ linkable: "workflow_execution_id", entity: "WorkflowExecution", primaryKey: "id", - serviceName: "workflows", + serviceName: "Workflows", field: "workflowExecution", }, }, diff --git a/packages/modules/workflow-engine-redis/integration-tests/__tests__/index.spec.ts b/packages/modules/workflow-engine-redis/integration-tests/__tests__/index.spec.ts index cc34d8e2f2..7e3c3a439d 100644 --- a/packages/modules/workflow-engine-redis/integration-tests/__tests__/index.spec.ts +++ b/packages/modules/workflow-engine-redis/integration-tests/__tests__/index.spec.ts @@ -85,7 +85,7 @@ moduleIntegrationTestRunner({ linkable: "workflow_execution_id", entity: "WorkflowExecution", primaryKey: "id", - serviceName: "workflows", + serviceName: "Workflows", field: "workflowExecution", }, },