@mercurjs/core 2.2.0-canary.8 → 2.2.0-rc.0

package/.medusa/server/src/api/store/products/[id]/route.js

@@ -3,16 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GET = void 0;
 const utils_1 = require("@medusajs/framework/utils");
 const utils_2 = require("../../../utils");
+const helpers_1 = require("../helpers");
 const GET = async (req, res) => {
     const query = req.scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
-    // `applyVisibleSellerIdsFilter` + `maybeApplyLinkFilter` resolves the
-    // visible product set onto `req.filterableFields.id`. The URL id must be
-    // a member of that set; otherwise the seller-visibility constraint is
-    // bypassed and a suspended/closed seller's product would leak through.
     const visibleIds = req.filterableFields.id;
     if (Array.isArray(visibleIds) && !visibleIds.includes(req.params.id)) {
         throw new utils_1.MedusaError(utils_1.MedusaError.Types.NOT_FOUND, `Product with id ${req.params.id} was not found`);
     }
+    // `variants.calculated_price` / `variants.offer_id` are computed from the
+    // cheapest offer post-query, not graph columns — strip them before the read.
+    const { fields, withCalculatedPrice } = (0, helpers_1.splitComputedVariantFields)(req.queryConfig.fields);
+    req.queryConfig.fields = fields;
     // region_id / currency_code are consumed by setPricingContext only —
     // the Product entity has neither column, so passing them through
     // raises `Trying to query by not existing property Product.region_id`.
@@ -26,7 +27,10 @@ const GET = async (req, res) => {
         throw new utils_1.MedusaError(utils_1.MedusaError.Types.NOT_FOUND, `Product with id ${req.params.id} was not found`);
     }
     await (0, utils_2.enrichProductAttributes)(req.scope, [product]);
+    if (withCalculatedPrice) {
+        await (0, utils_2.wrapProductVariantsWithOfferPrice)(req, [product]);
+    }
     res.json({ product });
 };
 exports.GET = GET;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL3Byb2R1Y3RzL1tpZF0vcm91dGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBSUEscURBR2tDO0FBRWxDLDBDQUF3RDtBQUVqRCxNQUFNLEdBQUcsR0FBRyxLQUFLLEVBQUUsR0FBdUIsRUFBRSxHQUFtQixFQUFFLEVBQUU7SUFDeEUsTUFBTSxLQUFLLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsaUNBQXlCLENBQUMsS0FBSyxDQUFDLENBQUE7SUFFaEUsc0VBQXNFO0lBQ3RFLHlFQUF5RTtJQUN6RSxzRUFBc0U7SUFDdEUsdUVBQXVFO0lBQ3ZFLE1BQU0sVUFBVSxHQUFJLEdBQUcsQ0FBQyxnQkFBcUMsQ0FBQyxFQUFFLENBQUE7SUFDaEUsSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUM7UUFDckUsTUFBTSxJQUFJLG1CQUFXLENBQ25CLG1CQUFXLENBQUMsS0FBSyxDQUFDLFNBQVMsRUFDM0IsbUJBQW1CLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxnQkFBZ0IsQ0FDakQsQ0FBQTtJQUNILENBQUM7SUFFRCxxRUFBcUU7SUFDckUsaUVBQWlFO0lBQ2pFLHVFQUF1RTtJQUN2RSxNQUFNLEVBQ0osU0FBUyxFQUFFLEVBQUUsRUFDYixhQUFhLEVBQUUsRUFBRSxFQUNqQixHQUFHLGNBQWMsRUFDbEIsR0FBRyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsSUFBSSxFQUFFLENBQTRCLENBQUE7SUFFM0QsTUFBTSxFQUNKLElBQUksRUFBRSxDQUFDLE9BQU8sQ0FBQyxHQUNoQixHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUNwQixNQUFNLEVBQUUsU0FBUztRQUNqQixNQUFNLEVBQUUsR0FBRyxDQUFDLFdBQVcsQ0FBQyxNQUFNO1FBQzlCLE9BQU8sRUFBRSxFQUFFLEdBQUcsY0FBYyxFQUFFLEVBQUUsRUFBRSxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRTtLQUNsRCxDQUFDLENBQUE7SUFFRixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDYixNQUFNLElBQUksbUJBQVcsQ0FDbkIsbUJBQVcsQ0FBQyxLQUFLLENBQUMsU0FBUyxFQUMzQixtQkFBbUIsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLGdCQUFnQixDQUNqRCxDQUFBO0lBQ0gsQ0FBQztJQUVELE1BQU0sSUFBQSwrQkFBdUIsRUFBQyxHQUFHLENBQUMsS0FBSyxFQUFFLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQTtJQUVuRCxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQTtBQUN2QixDQUFDLENBQUE7QUExQ1ksUUFBQSxHQUFHLE9BMENmIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL3Byb2R1Y3RzL1tpZF0vcm91dGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBSUEscURBR2tDO0FBRWxDLDBDQUd1QjtBQUN2Qix3Q0FBdUQ7QUFFaEQsTUFBTSxHQUFHLEdBQUcsS0FBSyxFQUFFLEdBQXVCLEVBQUUsR0FBbUIsRUFBRSxFQUFFO0lBQ3hFLE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLEtBQUssQ0FBQyxDQUFBO0lBRWhFLE1BQU0sVUFBVSxHQUFJLEdBQUcsQ0FBQyxnQkFBcUMsQ0FBQyxFQUFFLENBQUE7SUFDaEUsSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUM7UUFDckUsTUFBTSxJQUFJLG1CQUFXLENBQ25CLG1CQUFXLENBQUMsS0FBSyxDQUFDLFNBQVMsRUFDM0IsbUJBQW1CLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxnQkFBZ0IsQ0FDakQsQ0FBQTtJQUNILENBQUM7SUFFRCwwRUFBMEU7SUFDMUUsNkVBQTZFO0lBQzdFLE1BQU0sRUFBRSxNQUFNLEVBQUUsbUJBQW1CLEVBQUUsR0FBRyxJQUFBLG9DQUEwQixFQUNoRSxHQUFHLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FDdkIsQ0FBQTtJQUNELEdBQUcsQ0FBQyxXQUFXLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQTtJQUUvQixxRUFBcUU7SUFDckUsaUVBQWlFO0lBQ2pFLHVFQUF1RTtJQUN2RSxNQUFNLEVBQ0osU0FBUyxFQUFFLEVBQUUsRUFDYixhQUFhLEVBQUUsRUFBRSxFQUNqQixHQUFHLGNBQWMsRUFDbEIsR0FBRyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsSUFBSSxFQUFFLENBQTRCLENBQUE7SUFFM0QsTUFBTSxFQUNKLElBQUksRUFBRSxDQUFDLE9BQU8sQ0FBQyxHQUNoQixHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUNwQixNQUFNLEVBQUUsU0FBUztRQUNqQixNQUFNLEVBQUUsR0FBRyxDQUFDLFdBQVcsQ0FBQyxNQUFNO1FBQzlCLE9BQU8sRUFBRSxFQUFFLEdBQUcsY0FBYyxFQUFFLEVBQUUsRUFBRSxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRTtLQUNsRCxDQUFDLENBQUE7SUFFRixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDYixNQUFNLElBQUksbUJBQVcsQ0FDbkIsbUJBQVcsQ0FBQyxLQUFLLENBQUMsU0FBUyxFQUMzQixtQkFBbUIsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLGdCQUFnQixDQUNqRCxDQUFBO0lBQ0gsQ0FBQztJQUVELE1BQU0sSUFBQSwrQkFBdUIsRUFBQyxHQUFHLENBQUMsS0FBSyxFQUFFLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQTtJQUVuRCxJQUFJLG1CQUFtQixFQUFFLENBQUM7UUFDeEIsTUFBTSxJQUFBLHlDQUFpQyxFQUFDLEdBQUcsRUFBRSxDQUFDLE9BQU8sQ0FBVSxDQUFDLENBQUE7SUFDbEUsQ0FBQztJQUVELEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFBO0FBQ3ZCLENBQUMsQ0FBQTtBQWpEWSxRQUFBLEdBQUcsT0FpRGYifQ==

package/.medusa/server/src/api/store/products/helpers.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Splits the virtual offer-pricing fields (`variants.calculated_price[.*]`,
+ * `variants.offer_id`) out of a store-product field set. They are computed
+ * post-query from the cheapest offer, not graph columns, so passing them to
+ * `query.graph` raises `Trying to query by not existing property`.
+ */
+export declare const splitComputedVariantFields: (fields: string[]) => {
+    fields: string[];
+    withCalculatedPrice: boolean;
+};

package/.medusa/server/src/api/store/products/helpers.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.splitComputedVariantFields = void 0;
+/**
+ * Splits the virtual offer-pricing fields (`variants.calculated_price[.*]`,
+ * `variants.offer_id`) out of a store-product field set. They are computed
+ * post-query from the cheapest offer, not graph columns, so passing them to
+ * `query.graph` raises `Trying to query by not existing property`.
+ */
+const splitComputedVariantFields = (fields) => {
+    const withCalculatedPrice = fields.some((f) => f === "variants.calculated_price" ||
+        f.startsWith("variants.calculated_price.") ||
+        f === "variants.offer_id");
+    const filteredFields = fields.filter((f) => f !== "variants.calculated_price" &&
+        !f.startsWith("variants.calculated_price.") &&
+        f !== "variants.offer_id");
+    return { fields: filteredFields, withCalculatedPrice };
+};
+exports.splitComputedVariantFields = splitComputedVariantFields;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9hcGkvc3RvcmUvcHJvZHVjdHMvaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQTs7Ozs7R0FLRztBQUNJLE1BQU0sMEJBQTBCLEdBQUcsQ0FBQyxNQUFnQixFQUFFLEVBQUU7SUFDN0QsTUFBTSxtQkFBbUIsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUNyQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQ0osQ0FBQyxLQUFLLDJCQUEyQjtRQUNqQyxDQUFDLENBQUMsVUFBVSxDQUFDLDRCQUE0QixDQUFDO1FBQzFDLENBQUMsS0FBSyxtQkFBbUIsQ0FDNUIsQ0FBQTtJQUVELE1BQU0sY0FBYyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQ2xDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FDSixDQUFDLEtBQUssMkJBQTJCO1FBQ2pDLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyw0QkFBNEIsQ0FBQztRQUMzQyxDQUFDLEtBQUssbUJBQW1CLENBQzVCLENBQUE7SUFFRCxPQUFPLEVBQUUsTUFBTSxFQUFFLGNBQWMsRUFBRSxtQkFBbUIsRUFBRSxDQUFBO0FBQ3hELENBQUMsQ0FBQTtBQWhCWSxRQUFBLDBCQUEwQiw4QkFnQnRDIn0=

package/.medusa/server/src/api/store/products/middlewares.js

@@ -4,38 +4,49 @@ exports.storeProductsMiddlewares = void 0;
 const http_1 = require("@medusajs/framework/http");
 const utils_1 = require("@medusajs/framework/utils");
 const framework_1 = require("@medusajs/framework");
+const index_1 = require("@medusajs/medusa/api/utils/middlewares/index");
 const query_config_1 = require("./query-config");
 const validators_1 = require("./validators");
 const types_1 = require("@mercurjs/types");
-const applyProductFilters = (req, _res, next) => {
-    req.filterableFields = req.filterableFields ?? {};
-    req.filterableFields.status = types_1.ProductStatus.PUBLISHED;
-    next();
-};
+const sellers_1 = require("../../utils/sellers");
 /**
- * Resolve sellers that are currently OPEN and not within an active
- * closure window, then expose their IDs as `seller_id` so the link
- * filter below can translate it into a product-id constraint via the
- * `product_seller` join entity.
+ * Apply the store-facing defaults that vanilla Medusa applies on its own
+ * `/store/products` route. Besides forcing the `published` status, this
+ * translates the Medusa-standard `category_id` query param into the
+ * `categories` relation filter. The `Product` entity has no `category_id`
+ * column, so passing it straight to `query.graph` raises
+ * `Trying to query by not existing property Product.category_id` (#974).
  */
+const applyProductFilters = (0, http_1.applyDefaultFilters)({
+    status: types_1.ProductStatus.PUBLISHED,
+    categories: (filters) => {
+        const categoryIds = filters.category_id;
+        delete filters.category_id;
+        if (!(0, utils_1.isPresent)(categoryIds)) {
+            return;
+        }
+        return { id: categoryIds, is_internal: false, is_active: true };
+    },
+});
 async function applyVisibleSellerIdsFilter(req, _res, next) {
-    const query = req.scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
-    const now = new Date();
-    const { data: visibleSellers } = await query.graph({
-        entity: "seller",
-        fields: ["id"],
-        filters: {
-            status: types_1.SellerStatus.OPEN,
-            $and: [
-                { $or: [{ closed_from: null }, { closed_from: { $gt: now } }] },
-                { $or: [{ closed_to: null }, { closed_to: { $lt: now } }] },
-            ],
-        },
-    });
     req.filterableFields ??= {};
-    req.filterableFields.seller_id = visibleSellers.map((s) => s.id);
+    req.filterableFields.seller_id = await (0, sellers_1.resolveVisibleSellerIds)(req.scope);
     next();
 }
+/**
+ * Resolve the pricing/tax context consumed by the offer-price wrap. Reuses
+ * Medusa's product-pricing middlewares so the gate matches vanilla
+ * `/store/products`: prices compute only when the client requests
+ * `variants.calculated_price` or passes `region_id`.
+ */
+const pricingMiddlewares = [
+    (0, http_1.authenticate)("customer", ["session", "bearer"], {
+        allowUnauthenticated: true,
+    }),
+    (0, index_1.normalizeDataForContext)({ priceFieldPaths: ["variants.calculated_price"] }),
+    (0, index_1.setPricingContext)({ priceFieldPaths: ["variants.calculated_price"] }),
+    (0, index_1.setTaxContext)({ priceFieldPaths: ["variants.calculated_price"] }),
+];
 exports.storeProductsMiddlewares = [
     {
         method: ["GET"],
@@ -49,6 +60,7 @@ exports.storeProductsMiddlewares = [
                 resourceId: "product_id",
                 filterableField: "seller_id",
             }),
+            ...pricingMiddlewares,
         ],
     },
     {
@@ -63,7 +75,8 @@ exports.storeProductsMiddlewares = [
                 resourceId: "product_id",
                 filterableField: "seller_id",
             }),
+            ...pricingMiddlewares,
         ],
     },
 ];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL3Byb2R1Y3RzL21pZGRsZXdhcmVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLG1EQU1pQztBQUNqQyxxREFBcUU7QUFDckUsbURBQStEO0FBRS9ELGlEQUF3RDtBQUN4RCw2Q0FHcUI7QUFDckIsMkNBQTZEO0FBRTdELE1BQU0sbUJBQW1CLEdBQUcsQ0FDMUIsR0FBa0IsRUFDbEIsSUFBb0IsRUFDcEIsSUFBd0IsRUFDeEIsRUFBRTtJQUNGLEdBQUcsQ0FBQyxnQkFBZ0IsR0FBRyxHQUFHLENBQUMsZ0JBQWdCLElBQUksRUFBRSxDQUFBO0lBQ2pELEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxNQUFNLEdBQUcscUJBQWEsQ0FBQyxTQUFTLENBQUE7SUFDckQsSUFBSSxFQUFFLENBQUE7QUFDUixDQUFDLENBQUE7QUFFRDs7Ozs7R0FLRztBQUNILEtBQUssVUFBVSwyQkFBMkIsQ0FDeEMsR0FBa0IsRUFDbEIsSUFBb0IsRUFDcEIsSUFBd0I7SUFFeEIsTUFBTSxLQUFLLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsaUNBQXlCLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDaEUsTUFBTSxHQUFHLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQTtJQUV0QixNQUFNLEVBQUUsSUFBSSxFQUFFLGNBQWMsRUFBRSxHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUNqRCxNQUFNLEVBQUUsUUFBUTtRQUNoQixNQUFNLEVBQUUsQ0FBQyxJQUFJLENBQUM7UUFDZCxPQUFPLEVBQUU7WUFDUCxNQUFNLEVBQUUsb0JBQVksQ0FBQyxJQUFJO1lBQ3pCLElBQUksRUFBRTtnQkFDSixFQUFFLEdBQUcsRUFBRSxDQUFDLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsV0FBVyxFQUFFLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxFQUFFLENBQUMsRUFBRTtnQkFDL0QsRUFBRSxHQUFHLEVBQUUsQ0FBQyxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLFNBQVMsRUFBRSxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsRUFBRSxDQUFDLEVBQUU7YUFDNUQ7U0FDRjtLQUNGLENBQUMsQ0FBQTtJQUVGLEdBQUcsQ0FBQyxnQkFBZ0IsS0FBSyxFQUFFLENBQUE7SUFDM0IsR0FBRyxDQUFDLGdCQUFnQixDQUFDLFNBQVMsR0FBRyxjQUFjLENBQUMsR0FBRyxDQUNqRCxDQUFDLENBQWlCLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQzVCLENBQUE7SUFFRCxJQUFJLEVBQUUsQ0FBQTtBQUNSLENBQUM7QUFFWSxRQUFBLHdCQUF3QixHQUFzQjtJQUN6RDtRQUNFLE1BQU0sRUFBRSxDQUFDLEtBQUssQ0FBQztRQUNmLE9BQU8sRUFBRSxpQkFBaUI7UUFDMUIsV0FBVyxFQUFFO1lBQ1gsSUFBQSxxQ0FBeUIsRUFDdkIsbUNBQXNCLEVBQ3RCLHNDQUF1QixDQUFDLElBQUksQ0FDN0I7WUFDRCxtQkFBbUI7WUFDbkIsMkJBQTJCO1lBQzNCLElBQUEsMkJBQW9CLEVBQUM7Z0JBQ25CLFVBQVUsRUFBRSxnQkFBZ0I7Z0JBQzVCLFVBQVUsRUFBRSxZQUFZO2dCQUN4QixlQUFlLEVBQUUsV0FBVzthQUM3QixDQUFDO1NBQ0g7S0FDRjtJQUNEO1FBQ0UsTUFBTSxFQUFFLENBQUMsS0FBSyxDQUFDO1FBQ2YsT0FBTyxFQUFFLHFCQUFxQjtRQUM5QixXQUFXLEVBQUU7WUFDWCxJQUFBLHFDQUF5QixFQUN2QixrQ0FBcUIsRUFDckIsc0NBQXVCLENBQUMsUUFBUSxDQUNqQztZQUNELG1CQUFtQjtZQUNuQiwyQkFBMkI7WUFDM0IsSUFBQSwyQkFBb0IsRUFBQztnQkFDbkIsVUFBVSxFQUFFLGdCQUFnQjtnQkFDNUIsVUFBVSxFQUFFLFlBQVk7Z0JBQ3hCLGVBQWUsRUFBRSxXQUFXO2FBQzdCLENBQUM7U0FDSDtLQUNGO0NBQ0YsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL3Byb2R1Y3RzL21pZGRsZXdhcmVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLG1EQVFpQztBQUNqQyxxREFBcUQ7QUFDckQsbURBQStEO0FBQy9ELHdFQUlxRDtBQUVyRCxpREFBd0Q7QUFDeEQsNkNBR3FCO0FBQ3JCLDJDQUErQztBQUMvQyxpREFBNkQ7QUFFN0Q7Ozs7Ozs7R0FPRztBQUNILE1BQU0sbUJBQW1CLEdBQUcsSUFBQSwwQkFBbUIsRUFBQztJQUM5QyxNQUFNLEVBQUUscUJBQWEsQ0FBQyxTQUFTO0lBQy9CLFVBQVUsRUFBRSxDQUFDLE9BQWdDLEVBQUUsRUFBRTtRQUMvQyxNQUFNLFdBQVcsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFBO1FBQ3ZDLE9BQU8sT0FBTyxDQUFDLFdBQVcsQ0FBQTtRQUUxQixJQUFJLENBQUMsSUFBQSxpQkFBUyxFQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUM7WUFDNUIsT0FBTTtRQUNSLENBQUM7UUFFRCxPQUFPLEVBQUUsRUFBRSxFQUFFLFdBQVcsRUFBRSxXQUFXLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsQ0FBQTtJQUNqRSxDQUFDO0NBQ0YsQ0FBQyxDQUFBO0FBRUYsS0FBSyxVQUFVLDJCQUEyQixDQUN4QyxHQUFrQixFQUNsQixJQUFvQixFQUNwQixJQUF3QjtJQUV4QixHQUFHLENBQUMsZ0JBQWdCLEtBQUssRUFBRSxDQUFBO0lBQzNCLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxTQUFTLEdBQUcsTUFBTSxJQUFBLGlDQUF1QixFQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUV6RSxJQUFJLEVBQUUsQ0FBQTtBQUNSLENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILE1BQU0sa0JBQWtCLEdBQUc7SUFDekIsSUFBQSxtQkFBWSxFQUFDLFVBQVUsRUFBRSxDQUFDLFNBQVMsRUFBRSxRQUFRLENBQUMsRUFBRTtRQUM5QyxvQkFBb0IsRUFBRSxJQUFJO0tBQzNCLENBQUM7SUFDRixJQUFBLCtCQUF1QixFQUFDLEVBQUUsZUFBZSxFQUFFLENBQUMsMkJBQTJCLENBQUMsRUFBRSxDQUFDO0lBQzNFLElBQUEseUJBQWlCLEVBQUMsRUFBRSxlQUFlLEVBQUUsQ0FBQywyQkFBMkIsQ0FBQyxFQUFFLENBQUM7SUFDckUsSUFBQSxxQkFBYSxFQUFDLEVBQUUsZUFBZSxFQUFFLENBQUMsMkJBQTJCLENBQUMsRUFBRSxDQUFDO0NBQ2xFLENBQUE7QUFFWSxRQUFBLHdCQUF3QixHQUFzQjtJQUN6RDtRQUNFLE1BQU0sRUFBRSxDQUFDLEtBQUssQ0FBQztRQUNmLE9BQU8sRUFBRSxpQkFBaUI7UUFDMUIsV0FBVyxFQUFFO1lBQ1gsSUFBQSxxQ0FBeUIsRUFDdkIsbUNBQXNCLEVBQ3RCLHNDQUF1QixDQUFDLElBQUksQ0FDN0I7WUFDRCxtQkFBbUI7WUFDbkIsMkJBQTJCO1lBQzNCLElBQUEsMkJBQW9CLEVBQUM7Z0JBQ25CLFVBQVUsRUFBRSxnQkFBZ0I7Z0JBQzVCLFVBQVUsRUFBRSxZQUFZO2dCQUN4QixlQUFlLEVBQUUsV0FBVzthQUM3QixDQUFDO1lBQ0YsR0FBRyxrQkFBa0I7U0FDdEI7S0FDRjtJQUNEO1FBQ0UsTUFBTSxFQUFFLENBQUMsS0FBSyxDQUFDO1FBQ2YsT0FBTyxFQUFFLHFCQUFxQjtRQUM5QixXQUFXLEVBQUU7WUFDWCxJQUFBLHFDQUF5QixFQUN2QixrQ0FBcUIsRUFDckIsc0NBQXVCLENBQUMsUUFBUSxDQUNqQztZQUNELG1CQUFtQjtZQUNuQiwyQkFBMkI7WUFDM0IsSUFBQSwyQkFBb0IsRUFBQztnQkFDbkIsVUFBVSxFQUFFLGdCQUFnQjtnQkFDNUIsVUFBVSxFQUFFLFlBQVk7Z0JBQ3hCLGVBQWUsRUFBRSxXQUFXO2FBQzdCLENBQUM7WUFDRixHQUFHLGtCQUFrQjtTQUN0QjtLQUNGO0NBQ0YsQ0FBQSJ9

package/.medusa/server/src/api/store/products/query-config.js

@@ -34,12 +34,28 @@ exports.defaultStoreProductFields = [
     "*variants.options",
     "*options",
     "*options.values",
-    // Linked product-attribute value ids — the GET handler enriches
-    // these into `product.attributes` via separate queries against the
-    // product-attribute module. Cross-module chained populate (e.g.
-    // `*attribute_values.attribute.values`) crashes MikroORM's
-    // `expandDotPaths`, so we keep the joiner request single-hop.
-    "attribute_values.id",
+    "product_attribute_values.id",
+    "product_attribute_values.name",
+    "product_attribute_values.rank",
+    "product_attribute_values.attribute_id",
+    "product_attribute_values.attribute.id",
+    "product_attribute_values.attribute.name",
+    "product_attribute_values.attribute.handle",
+    "product_attribute_values.attribute.type",
+    "product_attribute_values.attribute.is_variant_axis",
+    "product_attribute_values.attribute.is_required",
+    "product_attribute_values.attribute.rank",
+    "product_attribute_values.attribute.values.id",
+    "product_attribute_values.attribute.values.name",
+    "product_attribute_values.attribute.values.rank",
+    "scoped_attributes.id",
+    "scoped_attributes.name",
+    "scoped_attributes.handle",
+    "scoped_attributes.type",
+    "scoped_attributes.is_variant_axis",
+    "scoped_attributes.values.id",
+    "scoped_attributes.values.name",
+    "scoped_attributes.values.rank",
 ];
 exports.storeProductQueryConfig = {
     list: {
@@ -52,4 +68,4 @@ exports.storeProductQueryConfig = {
         isList: false,
     },
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnktY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL2FwaS9zdG9yZS9wcm9kdWN0cy9xdWVyeS1jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQWEsUUFBQSx5QkFBeUIsR0FBRztJQUN2QyxJQUFJO0lBQ0osT0FBTztJQUNQLFVBQVU7SUFDVixRQUFRO0lBQ1IsYUFBYTtJQUNiLGFBQWE7SUFDYixRQUFRO0lBQ1IsYUFBYTtJQUNiLGNBQWM7SUFDZCxXQUFXO0lBQ1gsZUFBZTtJQUNmLFNBQVM7SUFDVCxRQUFRO0lBQ1IsUUFBUTtJQUNSLFFBQVE7SUFDUixPQUFPO0lBQ1AsU0FBUztJQUNULGdCQUFnQjtJQUNoQixVQUFVO0lBQ1YsVUFBVTtJQUNWLFlBQVk7SUFDWixZQUFZO0lBQ1osVUFBVTtJQUNWLE9BQU87SUFDUCxhQUFhO0lBQ2IsT0FBTztJQUNQLFNBQVM7SUFDVCxhQUFhO0lBQ2IsV0FBVztJQUNYLG1CQUFtQjtJQUNuQixVQUFVO0lBQ1YsaUJBQWlCO0lBQ2pCLGdFQUFnRTtJQUNoRSxtRUFBbUU7SUFDbkUsZ0VBQWdFO0lBQ2hFLDJEQUEyRDtJQUMzRCw4REFBOEQ7SUFDOUQscUJBQXFCO0NBQ3RCLENBQUE7QUFFWSxRQUFBLHVCQUF1QixHQUFHO0lBQ3JDLElBQUksRUFBRTtRQUNKLFFBQVEsRUFBRSxpQ0FBeUI7UUFDbkMsWUFBWSxFQUFFLEVBQUU7UUFDaEIsTUFBTSxFQUFFLElBQUk7S0FDYjtJQUNELFFBQVEsRUFBRTtRQUNSLFFBQVEsRUFBRSxpQ0FBeUI7UUFDbkMsTUFBTSxFQUFFLEtBQUs7S0FDZDtDQUNGLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnktY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL2FwaS9zdG9yZS9wcm9kdWN0cy9xdWVyeS1jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQWEsUUFBQSx5QkFBeUIsR0FBRztJQUN2QyxJQUFJO0lBQ0osT0FBTztJQUNQLFVBQVU7SUFDVixRQUFRO0lBQ1IsYUFBYTtJQUNiLGFBQWE7SUFDYixRQUFRO0lBQ1IsYUFBYTtJQUNiLGNBQWM7SUFDZCxXQUFXO0lBQ1gsZUFBZTtJQUNmLFNBQVM7SUFDVCxRQUFRO0lBQ1IsUUFBUTtJQUNSLFFBQVE7SUFDUixPQUFPO0lBQ1AsU0FBUztJQUNULGdCQUFnQjtJQUNoQixVQUFVO0lBQ1YsVUFBVTtJQUNWLFlBQVk7SUFDWixZQUFZO0lBQ1osVUFBVTtJQUNWLE9BQU87SUFDUCxhQUFhO0lBQ2IsT0FBTztJQUNQLFNBQVM7SUFDVCxhQUFhO0lBQ2IsV0FBVztJQUNYLG1CQUFtQjtJQUNuQixVQUFVO0lBQ1YsaUJBQWlCO0lBQ2pCLDZCQUE2QjtJQUM3QiwrQkFBK0I7SUFDL0IsK0JBQStCO0lBQy9CLHVDQUF1QztJQUN2Qyx1Q0FBdUM7SUFDdkMseUNBQXlDO0lBQ3pDLDJDQUEyQztJQUMzQyx5Q0FBeUM7SUFDekMsb0RBQW9EO0lBQ3BELGdEQUFnRDtJQUNoRCx5Q0FBeUM7SUFDekMsOENBQThDO0lBQzlDLGdEQUFnRDtJQUNoRCxnREFBZ0Q7SUFDaEQsc0JBQXNCO0lBQ3RCLHdCQUF3QjtJQUN4QiwwQkFBMEI7SUFDMUIsd0JBQXdCO0lBQ3hCLG1DQUFtQztJQUNuQyw2QkFBNkI7SUFDN0IsK0JBQStCO0lBQy9CLCtCQUErQjtDQUNoQyxDQUFBO0FBRVksUUFBQSx1QkFBdUIsR0FBRztJQUNyQyxJQUFJLEVBQUU7UUFDSixRQUFRLEVBQUUsaUNBQXlCO1FBQ25DLFlBQVksRUFBRSxFQUFFO1FBQ2hCLE1BQU0sRUFBRSxJQUFJO0tBQ2I7SUFDRCxRQUFRLEVBQUU7UUFDUixRQUFRLEVBQUUsaUNBQXlCO1FBQ25DLE1BQU0sRUFBRSxLQUFLO0tBQ2Q7Q0FDRixDQUFBIn0=

package/.medusa/server/src/api/store/products/route.js

@@ -3,8 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GET = void 0;
 const utils_1 = require("@medusajs/framework/utils");
 const utils_2 = require("../../utils");
+const helpers_1 = require("./helpers");
 const GET = async (req, res) => {
     const query = req.scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
+    // `variants.calculated_price` / `variants.offer_id` are computed from the
+    // cheapest offer post-query, not graph columns — strip them before the read.
+    const { fields, withCalculatedPrice } = (0, helpers_1.splitComputedVariantFields)(req.queryConfig.fields);
+    req.queryConfig.fields = fields;
     // region_id / currency_code are consumed by setPricingContext only.
     // The Product entity has neither column, so passing them through to
     // query.graph raises `Trying to query by not existing property
@@ -17,6 +22,9 @@ const GET = async (req, res) => {
         pagination: req.queryConfig.pagination,
     });
     await (0, utils_2.enrichProductAttributes)(req.scope, products);
+    if (withCalculatedPrice) {
+        await (0, utils_2.wrapProductVariantsWithOfferPrice)(req, products);
+    }
     res.json({
         products,
         count: metadata?.count ?? 0,
@@ -25,4 +33,4 @@ const GET = async (req, res) => {
     });
 };
 exports.GET = GET;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL3Byb2R1Y3RzL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUlBLHFEQUFxRTtBQUVyRSx1Q0FBcUQ7QUFFOUMsTUFBTSxHQUFHLEdBQUcsS0FBSyxFQUFFLEdBQXVCLEVBQUUsR0FBbUIsRUFBRSxFQUFFO0lBQ3hFLE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLEtBQUssQ0FBQyxDQUFBO0lBRWhFLG9FQUFvRTtJQUNwRSxvRUFBb0U7SUFDcEUsK0RBQStEO0lBQy9ELHNCQUFzQjtJQUN0QixNQUFNLEVBQ0osU0FBUyxFQUFFLEVBQUUsRUFDYixhQUFhLEVBQUUsRUFBRSxFQUNqQixHQUFHLGNBQWMsRUFDbEIsR0FBRyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsSUFBSSxFQUFFLENBQTRCLENBQUE7SUFFM0QsTUFBTSxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFLEdBQUcsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDO1FBQ3JELE1BQU0sRUFBRSxTQUFTO1FBQ2pCLE1BQU0sRUFBRSxHQUFHLENBQUMsV0FBVyxDQUFDLE1BQU07UUFDOUIsT0FBTyxFQUFFLGNBQWM7UUFDdkIsVUFBVSxFQUFFLEdBQUcsQ0FBQyxXQUFXLENBQUMsVUFBVTtLQUN2QyxDQUFDLENBQUE7SUFFRixNQUFNLElBQUEsK0JBQXVCLEVBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxRQUFpQixDQUFDLENBQUE7SUFFM0QsR0FBRyxDQUFDLElBQUksQ0FBQztRQUNQLFFBQVE7UUFDUixLQUFLLEVBQUUsUUFBUSxFQUFFLEtBQUssSUFBSSxDQUFDO1FBQzNCLE1BQU0sRUFBRSxRQUFRLEVBQUUsSUFBSSxJQUFJLENBQUM7UUFDM0IsS0FBSyxFQUFFLFFBQVEsRUFBRSxJQUFJLElBQUksQ0FBQztLQUMzQixDQUFDLENBQUE7QUFDSixDQUFDLENBQUE7QUE1QlksUUFBQSxHQUFHLE9BNEJmIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL3Byb2R1Y3RzL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUlBLHFEQUFxRTtBQUVyRSx1Q0FHb0I7QUFDcEIsdUNBQXNEO0FBRS9DLE1BQU0sR0FBRyxHQUFHLEtBQUssRUFBRSxHQUF1QixFQUFFLEdBQW1CLEVBQUUsRUFBRTtJQUN4RSxNQUFNLEtBQUssR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxpQ0FBeUIsQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUVoRSwwRUFBMEU7SUFDMUUsNkVBQTZFO0lBQzdFLE1BQU0sRUFBRSxNQUFNLEVBQUUsbUJBQW1CLEVBQUUsR0FBRyxJQUFBLG9DQUEwQixFQUNoRSxHQUFHLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FDdkIsQ0FBQTtJQUNELEdBQUcsQ0FBQyxXQUFXLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQTtJQUUvQixvRUFBb0U7SUFDcEUsb0VBQW9FO0lBQ3BFLCtEQUErRDtJQUMvRCxzQkFBc0I7SUFDdEIsTUFBTSxFQUNKLFNBQVMsRUFBRSxFQUFFLEVBQ2IsYUFBYSxFQUFFLEVBQUUsRUFDakIsR0FBRyxjQUFjLEVBQ2xCLEdBQUcsQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLElBQUksRUFBRSxDQUE0QixDQUFBO0lBRTNELE1BQU0sRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUNyRCxNQUFNLEVBQUUsU0FBUztRQUNqQixNQUFNLEVBQUUsR0FBRyxDQUFDLFdBQVcsQ0FBQyxNQUFNO1FBQzlCLE9BQU8sRUFBRSxjQUFjO1FBQ3ZCLFVBQVUsRUFBRSxHQUFHLENBQUMsV0FBVyxDQUFDLFVBQVU7S0FDdkMsQ0FBQyxDQUFBO0lBRUYsTUFBTSxJQUFBLCtCQUF1QixFQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsUUFBaUIsQ0FBQyxDQUFBO0lBRTNELElBQUksbUJBQW1CLEVBQUUsQ0FBQztRQUN4QixNQUFNLElBQUEseUNBQWlDLEVBQUMsR0FBRyxFQUFFLFFBQWlCLENBQUMsQ0FBQTtJQUNqRSxDQUFDO0lBRUQsR0FBRyxDQUFDLElBQUksQ0FBQztRQUNQLFFBQVE7UUFDUixLQUFLLEVBQUUsUUFBUSxFQUFFLEtBQUssSUFBSSxDQUFDO1FBQzNCLE1BQU0sRUFBRSxRQUFRLEVBQUUsSUFBSSxJQUFJLENBQUM7UUFDM0IsS0FBSyxFQUFFLFFBQVEsRUFBRSxJQUFJLElBQUksQ0FBQztLQUMzQixDQUFDLENBQUE7QUFDSixDQUFDLENBQUE7QUF2Q1ksUUFBQSxHQUFHLE9BdUNmIn0=

package/.medusa/server/src/api/store/products/validators.d.ts

@@ -7,12 +7,12 @@ export declare const StoreGetProductParams: z.ZodObject<{
     currency_code: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     fields?: string | undefined;
-    currency_code?: string | undefined;
     region_id?: string | undefined;
+    currency_code?: string | undefined;
 }, {
     fields?: string | undefined;
-    currency_code?: string | undefined;
     region_id?: string | undefined;
+    currency_code?: string | undefined;
 }>;
 export type StoreGetProductsParamsType = z.infer<typeof StoreGetProductsParams>;
 export declare const StoreGetProductsParams: z.ZodObject<{} & {
@@ -26,10 +26,10 @@ export declare const StoreGetProductsParams: z.ZodObject<{} & {
         type_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
         category_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
         tag_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
-        is_giftcard: z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodUnion<[z.ZodBoolean, z.ZodString]>, string | boolean, string | boolean>, boolean, string | boolean>>;
+        is_giftcard: any;
         region_id: z.ZodOptional<z.ZodString>;
         currency_code: z.ZodOptional<z.ZodString>;
-        created_at: z.ZodOptional<z.ZodUnion<[any, z.ZodObject<{
+        created_at: z.ZodOptional<z.ZodUnion<readonly [any, z.ZodObject<{
             $eq: any;
             $ne: any;
             $in: any;
@@ -42,7 +42,7 @@ export declare const StoreGetProductsParams: z.ZodObject<{} & {
             $gte: any;
             $lt: any;
             $lte: any;
-        }, "strip", z.ZodTypeAny, {
+        }, z.core.$strip, z.ZodTypeAny, {
             $eq?: any;
             $ne?: any;
             $in?: any;
@@ -69,7 +69,7 @@ export declare const StoreGetProductsParams: z.ZodObject<{} & {
             $lt?: any;
             $lte?: any;
         }>]>>;
-        updated_at: z.ZodOptional<z.ZodUnion<[any, z.ZodObject<{
+        updated_at: z.ZodOptional<z.ZodUnion<readonly [any, z.ZodObject<{
             $eq: any;
             $ne: any;
             $in: any;
@@ -82,7 +82,7 @@ export declare const StoreGetProductsParams: z.ZodObject<{} & {
             $gte: any;
             $lt: any;
             $lte: any;
-        }, "strip", z.ZodTypeAny, {
+        }, z.core.$strip, z.ZodTypeAny, {
             $eq?: any;
             $ne?: any;
             $in?: any;
@@ -110,33 +110,35 @@ export declare const StoreGetProductsParams: z.ZodObject<{} & {
             $lte?: any;
         }>]>>;
     }, "strip", z.ZodTypeAny, {
-        id?: string | string[] | undefined;
-        created_at?: any;
-        updated_at?: any;
-        q?: string | undefined;
-        currency_code?: string | undefined;
-        title?: string | undefined;
-        handle?: string | undefined;
-        collection_id?: string | string[] | undefined;
-        type_id?: string | string[] | undefined;
-        tag_id?: string | string[] | undefined;
-        is_giftcard?: boolean | undefined;
-        category_id?: string | string[] | undefined;
-        region_id?: string | undefined;
+        [x: string]: any;
+        q?: unknown;
+        id?: unknown;
+        title?: unknown;
+        handle?: unknown;
+        collection_id?: unknown;
+        type_id?: unknown;
+        category_id?: unknown;
+        tag_id?: unknown;
+        is_giftcard?: unknown;
+        region_id?: unknown;
+        currency_code?: unknown;
+        created_at?: unknown;
+        updated_at?: unknown;
     }, {
-        id?: string | string[] | undefined;
-        created_at?: any;
-        updated_at?: any;
-        q?: string | undefined;
-        currency_code?: string | undefined;
-        title?: string | undefined;
-        handle?: string | undefined;
-        collection_id?: string | string[] | undefined;
-        type_id?: string | string[] | undefined;
-        tag_id?: string | string[] | undefined;
-        is_giftcard?: string | boolean | undefined;
-        category_id?: string | string[] | undefined;
-        region_id?: string | undefined;
+        [x: string]: any;
+        q?: unknown;
+        id?: unknown;
+        title?: unknown;
+        handle?: unknown;
+        collection_id?: unknown;
+        type_id?: unknown;
+        category_id?: unknown;
+        tag_id?: unknown;
+        is_giftcard?: unknown;
+        region_id?: unknown;
+        currency_code?: unknown;
+        created_at?: unknown;
+        updated_at?: unknown;
     }>, "many">>>;
     $or: z.ZodOptional<z.ZodLazy<z.ZodArray<z.ZodObject<{
         q: z.ZodOptional<z.ZodString>;
@@ -147,10 +149,10 @@ export declare const StoreGetProductsParams: z.ZodObject<{} & {
         type_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
         category_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
         tag_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
-        is_giftcard: z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodUnion<[z.ZodBoolean, z.ZodString]>, string | boolean, string | boolean>, boolean, string | boolean>>;
+        is_giftcard: any;
         region_id: z.ZodOptional<z.ZodString>;
         currency_code: z.ZodOptional<z.ZodString>;
-        created_at: z.ZodOptional<z.ZodUnion<[any, z.ZodObject<{
+        created_at: z.ZodOptional<z.ZodUnion<readonly [any, z.ZodObject<{
             $eq: any;
             $ne: any;
             $in: any;
@@ -163,7 +165,7 @@ export declare const StoreGetProductsParams: z.ZodObject<{} & {
             $gte: any;
             $lt: any;
             $lte: any;
-        }, "strip", z.ZodTypeAny, {
+        }, z.core.$strip, z.ZodTypeAny, {
             $eq?: any;
             $ne?: any;
             $in?: any;
@@ -190,7 +192,7 @@ export declare const StoreGetProductsParams: z.ZodObject<{} & {
             $lt?: any;
             $lte?: any;
         }>]>>;
-        updated_at: z.ZodOptional<z.ZodUnion<[any, z.ZodObject<{
+        updated_at: z.ZodOptional<z.ZodUnion<readonly [any, z.ZodObject<{
             $eq: any;
             $ne: any;
             $in: any;
@@ -203,7 +205,7 @@ export declare const StoreGetProductsParams: z.ZodObject<{} & {
             $gte: any;
             $lt: any;
             $lte: any;
-        }, "strip", z.ZodTypeAny, {
+        }, z.core.$strip, z.ZodTypeAny, {
             $eq?: any;
             $ne?: any;
             $in?: any;
@@ -231,35 +233,37 @@ export declare const StoreGetProductsParams: z.ZodObject<{} & {
             $lte?: any;
         }>]>>;
     }, "strip", z.ZodTypeAny, {
-        id?: string | string[] | undefined;
-        created_at?: any;
-        updated_at?: any;
-        q?: string | undefined;
-        currency_code?: string | undefined;
-        title?: string | undefined;
-        handle?: string | undefined;
-        collection_id?: string | string[] | undefined;
-        type_id?: string | string[] | undefined;
-        tag_id?: string | string[] | undefined;
-        is_giftcard?: boolean | undefined;
-        category_id?: string | string[] | undefined;
-        region_id?: string | undefined;
+        [x: string]: any;
+        q?: unknown;
+        id?: unknown;
+        title?: unknown;
+        handle?: unknown;
+        collection_id?: unknown;
+        type_id?: unknown;
+        category_id?: unknown;
+        tag_id?: unknown;
+        is_giftcard?: unknown;
+        region_id?: unknown;
+        currency_code?: unknown;
+        created_at?: unknown;
+        updated_at?: unknown;
     }, {
-        id?: string | string[] | undefined;
-        created_at?: any;
-        updated_at?: any;
-        q?: string | undefined;
-        currency_code?: string | undefined;
-        title?: string | undefined;
-        handle?: string | undefined;
-        collection_id?: string | string[] | undefined;
-        type_id?: string | string[] | undefined;
-        tag_id?: string | string[] | undefined;
-        is_giftcard?: string | boolean | undefined;
-        category_id?: string | string[] | undefined;
-        region_id?: string | undefined;
+        [x: string]: any;
+        q?: unknown;
+        id?: unknown;
+        title?: unknown;
+        handle?: unknown;
+        collection_id?: unknown;
+        type_id?: unknown;
+        category_id?: unknown;
+        tag_id?: unknown;
+        is_giftcard?: unknown;
+        region_id?: unknown;
+        currency_code?: unknown;
+        created_at?: unknown;
+        updated_at?: unknown;
     }>, "many">>>;
-}, "strip", z.ZodTypeAny, {
+}, z.core.$strip, z.ZodTypeAny, {
     [x: string]: any;
     $and?: unknown;
     $or?: unknown;

package/.medusa/server/src/api/store/search/middlewares.d.ts

@@ -0,0 +1,2 @@
+import { MiddlewareRoute } from "@medusajs/framework/http";
+export declare const storeSearchMiddlewares: MiddlewareRoute[];

package/.medusa/server/src/api/store/search/middlewares.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.storeSearchMiddlewares = void 0;
+const http_1 = require("@medusajs/framework/http");
+const framework_1 = require("@medusajs/framework");
+const utils_1 = require("@medusajs/framework/utils");
+const validators_1 = require("./validators");
+// Refetches the region (never trusts the body) to build the pricing/tax context,
+// mirroring the /store/products chain. No region_id -> no pricing context.
+const setSearchPricingContext = async (req, _res, next) => {
+    const body = req.validatedBody;
+    const regionId = body?.region_id;
+    if (!regionId) {
+        return next();
+    }
+    try {
+        const region = await (0, http_1.refetchEntity)({
+            entity: "region",
+            idOrFilter: regionId,
+            scope: req.scope,
+            fields: ["id", "currency_code", "automatic_taxes"],
+            options: { cache: { enable: true } },
+        });
+        if (!region) {
+            throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, `Region with id ${regionId} not found when populating the pricing context`);
+        }
+        const pricingContext = {
+            region_id: region.id,
+            currency_code: region.currency_code,
+        };
+        if (req.auth_context?.actor_id) {
+            const { data: customerGroups } = await (0, http_1.refetchEntities)({
+                entity: "customer_group",
+                idOrFilter: { customers: { id: req.auth_context.actor_id } },
+                scope: req.scope,
+                fields: ["id"],
+            });
+            pricingContext.customer = {
+                groups: customerGroups.map((cg) => ({ id: cg.id })),
+            };
+        }
+        req.pricingContext = pricingContext;
+        if (region.automatic_taxes && body?.country_code) {
+            req.taxContext = {
+                taxInclusivityContext: { automaticTaxes: true },
+                taxLineContext: {
+                    address: {
+                        country_code: body.country_code,
+                        province_code: body.province,
+                    },
+                },
+            };
+        }
+        return next();
+    }
+    catch (e) {
+        return next(e);
+    }
+};
+exports.storeSearchMiddlewares = [
+    {
+        method: ["POST"],
+        matcher: "/store/search",
+        middlewares: [
+            (0, http_1.authenticate)("customer", ["session", "bearer"], {
+                allowUnauthenticated: true,
+            }),
+            (0, framework_1.validateAndTransformBody)(validators_1.StoreSearchSchema),
+            setSearchPricingContext,
+        ],
+    },
+];
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL3NlYXJjaC9taWRkbGV3YXJlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtREFRaUM7QUFFakMsbURBQThEO0FBQzlELHFEQUF1RDtBQUV2RCw2Q0FBaUU7QUFVakUsaUZBQWlGO0FBQ2pGLDJFQUEyRTtBQUMzRSxNQUFNLHVCQUF1QixHQUFHLEtBQUssRUFDbkMsR0FBdUIsRUFDdkIsSUFBb0IsRUFDcEIsSUFBd0IsRUFDeEIsRUFBRTtJQUNGLE1BQU0sSUFBSSxHQUFHLEdBQUcsQ0FBQyxhQUFhLENBQUE7SUFDOUIsTUFBTSxRQUFRLEdBQUcsSUFBSSxFQUFFLFNBQVMsQ0FBQTtJQUNoQyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDZCxPQUFPLElBQUksRUFBRSxDQUFBO0lBQ2YsQ0FBQztJQUVELElBQUksQ0FBQztRQUNILE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBQSxvQkFBYSxFQUFDO1lBQ2pDLE1BQU0sRUFBRSxRQUFRO1lBQ2hCLFVBQVUsRUFBRSxRQUFRO1lBQ3BCLEtBQUssRUFBRSxHQUFHLENBQUMsS0FBSztZQUNoQixNQUFNLEVBQUUsQ0FBQyxJQUFJLEVBQUUsZUFBZSxFQUFFLGlCQUFpQixDQUFDO1lBQ2xELE9BQU8sRUFBRSxFQUFFLEtBQUssRUFBRSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsRUFBRTtTQUNyQyxDQUFDLENBQUE7UUFFRixJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDWixNQUFNLElBQUksbUJBQVcsQ0FDbkIsbUJBQVcsQ0FBQyxLQUFLLENBQUMsWUFBWSxFQUM5QixrQkFBa0IsUUFBUSxnREFBZ0QsQ0FDM0UsQ0FBQTtRQUNILENBQUM7UUFFRCxNQUFNLGNBQWMsR0FBeUI7WUFDM0MsU0FBUyxFQUFFLE1BQU0sQ0FBQyxFQUFFO1lBQ3BCLGFBQWEsRUFBRSxNQUFNLENBQUMsYUFBYTtTQUNwQyxDQUFBO1FBRUQsSUFBSSxHQUFHLENBQUMsWUFBWSxFQUFFLFFBQVEsRUFBRSxDQUFDO1lBQy9CLE1BQU0sRUFBRSxJQUFJLEVBQUUsY0FBYyxFQUFFLEdBQUcsTUFBTSxJQUFBLHNCQUFlLEVBQUM7Z0JBQ3JELE1BQU0sRUFBRSxnQkFBZ0I7Z0JBQ3hCLFVBQVUsRUFBRSxFQUFFLFNBQVMsRUFBRSxFQUFFLEVBQUUsRUFBRSxHQUFHLENBQUMsWUFBWSxDQUFDLFFBQVEsRUFBRSxFQUFFO2dCQUM1RCxLQUFLLEVBQUUsR0FBRyxDQUFDLEtBQUs7Z0JBQ2hCLE1BQU0sRUFBRSxDQUFDLElBQUksQ0FBQzthQUNmLENBQUMsQ0FBQTtZQUNGLGNBQWMsQ0FBQyxRQUFRLEdBQUc7Z0JBQ3hCLE1BQU0sRUFBRSxjQUFjLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBa0IsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQzthQUNwRSxDQUFBO1FBQ0gsQ0FBQztRQUVELEdBQUcsQ0FBQyxjQUFjLEdBQUcsY0FBYyxDQUFBO1FBRW5DLElBQUksTUFBTSxDQUFDLGVBQWUsSUFBSSxJQUFJLEVBQUUsWUFBWSxFQUFFLENBQUM7WUFDakQsR0FBRyxDQUFDLFVBQVUsR0FBRztnQkFDZixxQkFBcUIsRUFBRSxFQUFFLGNBQWMsRUFBRSxJQUFJLEVBQUU7Z0JBQy9DLGNBQWMsRUFBRTtvQkFDZCxPQUFPLEVBQUU7d0JBQ1AsWUFBWSxFQUFFLElBQUksQ0FBQyxZQUFZO3dCQUMvQixhQUFhLEVBQUUsSUFBSSxDQUFDLFFBQVE7cUJBQzdCO2lCQUNGO2FBQ0YsQ0FBQTtRQUNILENBQUM7UUFFRCxPQUFPLElBQUksRUFBRSxDQUFBO0lBQ2YsQ0FBQztJQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7UUFDWCxPQUFPLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNoQixDQUFDO0FBQ0gsQ0FBQyxDQUFBO0FBRVksUUFBQSxzQkFBc0IsR0FBc0I7SUFDdkQ7UUFDRSxNQUFNLEVBQUUsQ0FBQyxNQUFNLENBQUM7UUFDaEIsT0FBTyxFQUFFLGVBQWU7UUFDeEIsV0FBVyxFQUFFO1lBQ1gsSUFBQSxtQkFBWSxFQUFDLFVBQVUsRUFBRSxDQUFDLFNBQVMsRUFBRSxRQUFRLENBQUMsRUFBRTtnQkFDOUMsb0JBQW9CLEVBQUUsSUFBSTthQUMzQixDQUFDO1lBQ0YsSUFBQSxvQ0FBd0IsRUFBQyw4QkFBaUIsQ0FBQztZQUMzQyx1QkFBdUI7U0FDeEI7S0FDRjtDQUNGLENBQUEifQ==

package/.medusa/server/src/api/store/search/route.d.ts

@@ -0,0 +1,8 @@
+import { MedusaResponse, MedusaStoreRequest } from "@medusajs/framework/http";
+import { MedusaPricingContext } from "@medusajs/framework/types";
+import { StoreSearchType } from "./validators";
+type StoreSearchRequest = MedusaStoreRequest<StoreSearchType> & {
+    pricingContext?: MedusaPricingContext;
+};
+export declare const POST: (req: StoreSearchRequest, res: MedusaResponse) => Promise<void>;
+export {};

package/.medusa/server/src/api/store/search/route.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.POST = void 0;
+const types_1 = require("@mercurjs/types");
+const POST = async (req, res) => {
+    const search = req.scope.resolve(types_1.MercurModules.SEARCH);
+    const body = req.validatedBody;
+    const result = await search.search({
+        q: body.q,
+        limit: body.limit,
+        offset: body.offset,
+        // Built by `setSearchPricingContext`; the provider projects calculated_price.
+        context: req.pricingContext,
+        filters: body.filters,
+    });
+    res.json({
+        hits: result.hits,
+        count: result.count,
+        limit: body.limit,
+        offset: body.offset,
+        facets: result.facets,
+    });
+};
+exports.POST = POST;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL3NlYXJjaC9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFQSwyQ0FBOEQ7QUFTdkQsTUFBTSxJQUFJLEdBQUcsS0FBSyxFQUN2QixHQUF1QixFQUN2QixHQUFtQixFQUNuQixFQUFFO0lBQ0YsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQXNCLHFCQUFhLENBQUMsTUFBTSxDQUFDLENBQUE7SUFDM0UsTUFBTSxJQUFJLEdBQUcsR0FBRyxDQUFDLGFBQWEsQ0FBQTtJQUU5QixNQUFNLE1BQU0sR0FBa0IsTUFBTSxNQUFNLENBQUMsTUFBTSxDQUFDO1FBQ2hELENBQUMsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUNULEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSztRQUNqQixNQUFNLEVBQUUsSUFBSSxDQUFDLE1BQU07UUFDbkIsOEVBQThFO1FBQzlFLE9BQU8sRUFBRSxHQUFHLENBQUMsY0FBYztRQUMzQixPQUFPLEVBQUUsSUFBSSxDQUFDLE9BQU87S0FDdEIsQ0FBQyxDQUFBO0lBRUYsR0FBRyxDQUFDLElBQUksQ0FBQztRQUNQLElBQUksRUFBRSxNQUFNLENBQUMsSUFBSTtRQUNqQixLQUFLLEVBQUUsTUFBTSxDQUFDLEtBQUs7UUFDbkIsS0FBSyxFQUFFLElBQUksQ0FBQyxLQUFLO1FBQ2pCLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTTtRQUNuQixNQUFNLEVBQUUsTUFBTSxDQUFDLE1BQU07S0FDdEIsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFBO0FBdkJZLFFBQUEsSUFBSSxRQXVCaEIifQ==

package/.medusa/server/src/api/store/search/validators.d.ts

@@ -0,0 +1,27 @@
+import { z } from "zod";
+export declare const StoreSearchSchema: z.ZodObject<{
+    q: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    limit: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+    offset: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+    region_id: z.ZodOptional<z.ZodString>;
+    country_code: z.ZodOptional<z.ZodString>;
+    province: z.ZodOptional<z.ZodString>;
+    filters: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+}, "strict", z.ZodTypeAny, {
+    offset: number;
+    limit: number;
+    q: string;
+    region_id?: string | undefined;
+    country_code?: string | undefined;
+    province?: string | undefined;
+    filters?: Record<string, unknown> | undefined;
+}, {
+    offset?: number | undefined;
+    limit?: number | undefined;
+    q?: string | undefined;
+    region_id?: string | undefined;
+    country_code?: string | undefined;
+    province?: string | undefined;
+    filters?: Record<string, unknown> | undefined;
+}>;
+export type StoreSearchType = z.infer<typeof StoreSearchSchema>;

package/.medusa/server/src/api/store/search/validators.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StoreSearchSchema = void 0;
+const zod_1 = require("zod");
+// `filters` is passed straight to the active provider, which owns its shape.
+exports.StoreSearchSchema = zod_1.z
+    .object({
+    q: zod_1.z.string().optional().default(""),
+    limit: zod_1.z.coerce.number().int().min(1).max(100).optional().default(12),
+    offset: zod_1.z.coerce.number().int().min(0).optional().default(0),
+    region_id: zod_1.z.string().optional(),
+    country_code: zod_1.z.string().optional(),
+    province: zod_1.z.string().optional(),
+    filters: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()).optional(),
+})
+    .strict();
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9hcGkvc3RvcmUvc2VhcmNoL3ZhbGlkYXRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkJBQXVCO0FBRXZCLDZFQUE2RTtBQUNoRSxRQUFBLGlCQUFpQixHQUFHLE9BQUM7S0FDL0IsTUFBTSxDQUFDO0lBQ04sQ0FBQyxFQUFFLE9BQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDO0lBQ3BDLEtBQUssRUFBRSxPQUFDLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztJQUNyRSxNQUFNLEVBQUUsT0FBQyxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztJQUM1RCxTQUFTLEVBQUUsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtJQUNoQyxZQUFZLEVBQUUsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtJQUNuQyxRQUFRLEVBQUUsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtJQUMvQixPQUFPLEVBQUUsT0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsT0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUMsUUFBUSxFQUFFO0NBQ3RELENBQUM7S0FDRCxNQUFNLEVBQUUsQ0FBQSJ9