[pull] develop from medusajs:develop

.changeset/heavy-spies-thank.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/core-flows": patch
+---
+
+fix(core-flows): use useQueryGraphStep instead of useQueryStep

.changeset/pink-ways-count.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/types": patch
+---
+
+chore(types): Keep intelisense while being more loosen

packages/core/core-flows/src/cart/utils/fields.ts

@@ -1,4 +1,5 @@
 // Always ensure that cartFieldsForPricingContext is present in cartFieldsForRefreshSteps
+// Always ensure that cartFieldsForCalculateShippingOptionsPrices is present in cartFieldsForRefreshSteps
 export const cartFieldsForRefreshSteps = [
   "id",
   "currency_code",
@@ -18,6 +19,13 @@ export const cartFieldsForRefreshSteps = [
   "items.product.collection_id",
   "items.product.categories.id",
   "items.product.tags.id",
+  "items.variant.id",
+  "items.variant.product.id",
+  "items.variant.weight",
+  "items.variant.length",
+  "items.variant.height",
+  "items.variant.width",
+  "items.variant.material",
   "items.adjustments.*",
   "items.tax_lines.*",
   "shipping_address.*",
@@ -146,3 +154,21 @@ export const productVariantsFields = [
   "inventory_items.inventory.location_levels.stock_locations.sales_channels.id",
   "inventory_items.inventory.location_levels.stock_locations.sales_channels.name",
 ]
+
+// ensure that at least these fields are present when fetching cart for caluclating shipping options prices
+export const cartFieldsForCalculateShippingOptionsPrices = [
+  "id",
+  "items.*",
+  "items.variant.id",
+  "items.variant.product.id",
+  "items.variant.weight",
+  "items.variant.length",
+  "items.variant.height",
+  "items.variant.width",
+  "items.variant.material",
+  "items.product.id",
+  "items.product.collection_id",
+  "items.product.categories.id",
+  "items.product.tags.id",
+  "shipping_address.*",
+]

packages/core/core-flows/src/cart/workflows/add-shipping-method-to-cart.ts

@@ -94,7 +94,11 @@ export const addShippingMethodToCartWorkflow = createWorkflow(
     )
 
     const shippingMethodInput = transform(
-      { input, shippingOptions, validatedMethodData },
+      {
+        input,
+        shippingOptions,
+        validatedMethodData,
+      },
       (data) => {
         const options = (data.input.options ?? []).map((option) => {
           const shippingOption = data.shippingOptions.find(

packages/core/core-flows/src/cart/workflows/complete-cart.ts

@@ -18,9 +18,9 @@ import {
 import {
   createRemoteLinkStep,
   emitEventStep,
+  useQueryGraphStep,
   useRemoteQueryStep,
 } from "../../common"
-import { useQueryStep } from "../../common/steps/use-query"
 import { createOrdersStep } from "../../order/steps/create-orders"
 import { authorizePaymentSessionStep } from "../../payment/steps/authorize-payment-session"
 import { registerUsageStep } from "../../promotion/steps/register-usage"
@@ -55,7 +55,7 @@ export const completeCartWorkflow = createWorkflow(
   (
     input: WorkflowData<CompleteCartWorkflowInput>
   ): WorkflowResponse<{ id: string }> => {
-    const orderCart = useQueryStep({
+    const orderCart = useQueryGraphStep({
       entity: "order_cart",
       fields: ["cart_id", "order_id"],
       filters: { cart_id: input.id },

packages/core/core-flows/src/cart/workflows/list-shipping-options-for-cart-with-pricing.ts

@@ -6,10 +6,12 @@ import {
   WorkflowData,
   WorkflowResponse,
 } from "@medusajs/framework/workflows-sdk"
+import { CalculateShippingOptionPriceDTO } from "@medusajs/types"
+
 import { useQueryGraphStep, validatePresenceOfStep } from "../../common"
 import { useRemoteQueryStep } from "../../common/steps/use-remote-query"
 import { calculateShippingOptionsPricesStep } from "../../fulfillment"
-import { CalculateShippingOptionPriceDTO } from "@medusajs/types"
+import { cartFieldsForCalculateShippingOptionsPrices } from "../utils/fields"
 
 const COMMON_OPTIONS_FIELDS = [
   "id",
@@ -57,15 +59,10 @@ export const listShippingOptionsForCartWithPricingWorkflow = createWorkflow(
       entity: "cart",
       filters: { id: input.cart_id },
       fields: [
-        "id",
+        ...cartFieldsForCalculateShippingOptionsPrices,
         "sales_channel_id",
         "currency_code",
         "region_id",
-        "shipping_address.city",
-        "shipping_address.country_code",
-        "shipping_address.province",
-        "shipping_address.postal_code",
-        "items.*",
         "item_total",
         "total",
       ],
@@ -245,8 +242,18 @@ export const listShippingOptionsForCartWithPricingWorkflow = createWorkflow(
     )
 
     const shippingOptionsWithPrice = transform(
-      { shippingOptionsFlatRate, shippingOptionsCalculated, prices },
-      ({ shippingOptionsFlatRate, shippingOptionsCalculated, prices }) => {
+      {
+        shippingOptionsFlatRate,
+        shippingOptionsCalculated,
+        prices,
+        fulfillmentSetLocationMap,
+      },
+      ({
+        shippingOptionsFlatRate,
+        shippingOptionsCalculated,
+        prices,
+        fulfillmentSetLocationMap,
+      }) => {
         return [
           ...shippingOptionsFlatRate.map((shippingOption) => {
             const price = shippingOption.calculated_price
@@ -264,6 +271,10 @@ export const listShippingOptionsForCartWithPricingWorkflow = createWorkflow(
               is_tax_inclusive:
                 prices[index]?.is_calculated_price_tax_inclusive,
               calculated_price: prices[index],
+              stock_location:
+                fulfillmentSetLocationMap[
+                  shippingOption.service_zone.fulfillment_set_id
+                ],
             }
           }),
         ]

packages/core/core-flows/src/cart/workflows/list-shipping-options-for-cart.ts

@@ -53,22 +53,19 @@ export const listShippingOptionsForCartWorkflow = createWorkflow(
       ({ scFulfillmentSetQuery }) => scFulfillmentSetQuery.data[0]
     )
 
-    const { fulfillmentSetIds, fulfillmentSetLocationMap } = transform(
+    const { fulfillmentSetIds } = transform(
       { scFulfillmentSets },
       ({ scFulfillmentSets }) => {
         const fulfillmentSetIds = new Set<string>()
-        const fulfillmentSetLocationMap = {}
 
         scFulfillmentSets.stock_locations.forEach((stockLocation) => {
           stockLocation.fulfillment_sets.forEach((fulfillmentSet) => {
-            fulfillmentSetLocationMap[fulfillmentSet.id] = stockLocation
             fulfillmentSetIds.add(fulfillmentSet.id)
           })
         })
 
         return {
           fulfillmentSetIds: Array.from(fulfillmentSetIds),
-          fulfillmentSetLocationMap,
         }
       }
     )
@@ -130,19 +127,15 @@ export const listShippingOptionsForCartWorkflow = createWorkflow(
     }).config({ name: "shipping-options-query" })
 
     const shippingOptionsWithPrice = transform(
-      { shippingOptions, fulfillmentSetLocationMap },
-      ({ shippingOptions, fulfillmentSetLocationMap }) =>
+      { shippingOptions },
+      ({ shippingOptions }) =>
         shippingOptions.map((shippingOption) => {
           const price = shippingOption.calculated_price
-          const fulfillmentSetId =
-            shippingOption.service_zone.fulfillment_set_id
-          const stockLocation = fulfillmentSetLocationMap[fulfillmentSetId]
 
           return {
             ...shippingOption,
             amount: price?.calculated_amount,
             is_tax_inclusive: !!price?.is_calculated_price_tax_inclusive,
-            stock_location: stockLocation,
           }
         })
     )

packages/core/core-flows/src/fulfillment/workflows/calculate-shipping-options-prices.ts

@@ -7,6 +7,7 @@ import {
 } from "@medusajs/framework/workflows-sdk"
 import { calculateShippingOptionsPricesStep } from "../steps"
 import { useQueryGraphStep } from "../../common"
+import { cartFieldsForCalculateShippingOptionsPrices } from "../../cart/utils/fields"
 
 export const calculateShippingOptionsPricesWorkflowId =
   "calculate-shipping-options-prices-workflow"
@@ -31,7 +32,7 @@ export const calculateShippingOptionsPricesWorkflow = createWorkflow(
     const cartQuery = useQueryGraphStep({
       entity: "cart",
       filters: { id: input.cart_id },
-      fields: ["id", "items.*", "shipping_address.*"],
+      fields: cartFieldsForCalculateShippingOptionsPrices,
     }).config({ name: "cart-query" })
 
     const fulfillmentSetId = transform(

packages/core/core-flows/src/payment/workflows/process-payment.ts

@@ -2,33 +2,33 @@ import { WebhookActionResult } from "@medusajs/types"
 import { PaymentActions } from "@medusajs/utils"
 import { createWorkflow, when } from "@medusajs/workflows-sdk"
 import { completeCartWorkflow } from "../../cart/workflows/complete-cart"
-import { useQueryStep } from "../../common/steps/use-query"
 import { authorizePaymentSessionStep } from "../steps"
 import { capturePaymentWorkflow } from "./capture-payment"
+import { useQueryGraphStep } from "../../common"
 
 interface ProcessPaymentWorkflowInput extends WebhookActionResult {}
 
 export const processPaymentWorkflowId = "process-payment-workflow"
 export const processPaymentWorkflow = createWorkflow(
   processPaymentWorkflowId,
   (input: ProcessPaymentWorkflowInput) => {
-    const paymentData = useQueryStep({
+    const paymentData = useQueryGraphStep({
       entity: "payment",
       fields: ["id"],
       filters: { payment_session_id: input.data?.session_id },
     }).config({
       name: "payment-query",
     })
 
-    const paymentSessionResult = useQueryStep({
+    const paymentSessionResult = useQueryGraphStep({
       entity: "payment_session",
       fields: ["payment_collection_id"],
       filters: { id: input.data?.session_id },
     }).config({
       name: "payment-session-query",
     })
 
-    const cartPaymentCollection = useQueryStep({
+    const cartPaymentCollection = useQueryGraphStep({
       entity: "cart_payment_collection",
       fields: ["cart_id"],
       filters: {

packages/core/types/src/modules-sdk/__tests__/remote-query.spec.ts

@@ -14,20 +14,21 @@ describe("RemoteQuery", () => {
     it("should return the correct type for fields when using a string entry point", () => {
       type Result = RemoteQueryObjectConfig<"simple_product">["fields"]
       expectTypeOf<Result>().toEqualTypeOf<
-        (
-          | "*"
-          | "id"
-          | "handle"
-          | "title"
-          | "variants.id"
-          | "variants.*"
-          | "sales_channels.id"
-          | "sales_channels.*"
-          | "sales_channels.name"
-          | "sales_channels_link.*"
-          | "sales_channels_link.product_id"
-          | "sales_channels_link.sales_channel_id"
-        )[]
+        | (
+            | "*"
+            | "id"
+            | "handle"
+            | "title"
+            | "variants.id"
+            | "variants.*"
+            | "sales_channels.id"
+            | "sales_channels.*"
+            | "sales_channels.name"
+            | "sales_channels_link.*"
+            | "sales_channels_link.product_id"
+            | "sales_channels_link.sales_channel_id"
+          )[]
+        | string[]
       >()
     })
 

packages/core/types/src/modules-sdk/remote-query-object-from-string.ts

@@ -11,9 +11,11 @@ export type RemoteQueryObjectConfig<TEntry extends string> = {
     RemoteQueryEntryPoints[TEntry & keyof RemoteQueryEntryPoints]
   > extends never
     ? string[]
-    : ObjectToRemoteQueryFields<
-        RemoteQueryEntryPoints[TEntry & keyof RemoteQueryEntryPoints]
-      >[]
+    :
+        | ObjectToRemoteQueryFields<
+            RemoteQueryEntryPoints[TEntry & keyof RemoteQueryEntryPoints]
+          >[]
+        | string[]
 }
 
 export type RemoteQueryObjectFromStringResult<
@@ -36,9 +38,11 @@ export type RemoteQueryInput<TEntry extends string> = {
     RemoteQueryEntryPoints[TEntry & keyof RemoteQueryEntryPoints]
   > extends never
     ? string[]
-    : ObjectToRemoteQueryFields<
-        RemoteQueryEntryPoints[TEntry & keyof RemoteQueryEntryPoints]
-      >[]
+    :
+        | ObjectToRemoteQueryFields<
+            RemoteQueryEntryPoints[TEntry & keyof RemoteQueryEntryPoints]
+          >[]
+        | string[]
   /**
    * Pagination configurations for the returned list of items.
    */