@mercurjs/core 2.2.0-canary.3 → 2.2.0-canary.31

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

@@ -2,25 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GET = void 0;
 const utils_1 = require("@medusajs/framework/utils");
-const wrap_variants_with_offers_inventory_1 = require("../../../utils/wrap-variants-with-offers-inventory");
-const wrap_variants_with_offers_prices_1 = require("../../../utils/wrap-variants-with-offers-prices");
-const query_config_1 = require("../query-config");
+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`);
     }
-    const withCalculatedPrice = req.queryConfig.fields.some((field) => field.includes(query_config_1.OFFER_CALCULATED_PRICE_FIELD));
-    const withInventoryQuantity = req.queryConfig.fields.some((field) => field.includes(query_config_1.OFFER_INVENTORY_QUANTITY_FIELD));
-    if (withCalculatedPrice || withInventoryQuantity) {
-        req.queryConfig.fields = req.queryConfig.fields.filter((field) => !field.includes(query_config_1.OFFER_CALCULATED_PRICE_FIELD) &&
-            !field.includes(query_config_1.OFFER_INVENTORY_QUANTITY_FIELD));
-    }
+    // `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`.
@@ -33,15 +26,11 @@ const GET = async (req, res) => {
     if (!product) {
         throw new utils_1.MedusaError(utils_1.MedusaError.Types.NOT_FOUND, `Product with id ${req.params.id} was not found`);
     }
-    const variants = (product.variants ??
-        []);
+    await (0, utils_2.enrichProductAttributes)(req.scope, [product]);
     if (withCalculatedPrice) {
-        await (0, wrap_variants_with_offers_prices_1.wrapVariantsWithOffersPrices)(req, variants);
-    }
-    if (withInventoryQuantity) {
-        await (0, wrap_variants_with_offers_inventory_1.wrapVariantsWithOffersInventory)(req, variants);
+        await (0, utils_2.wrapProductVariantsWithOfferPrice)(req, [product]);
     }
     res.json({ product });
 };
 exports.GET = GET;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL3Byb2R1Y3RzL1tpZF0vcm91dGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBSUEscURBR2tDO0FBRWxDLDRHQUFvRztBQUNwRyxzR0FBOEY7QUFDOUYsa0RBR3dCO0FBRWpCLE1BQU0sR0FBRyxHQUFHLEtBQUssRUFBRSxHQUF1QixFQUFFLEdBQW1CLEVBQUUsRUFBRTtJQUN4RSxNQUFNLEtBQUssR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxpQ0FBeUIsQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUVoRSxzRUFBc0U7SUFDdEUseUVBQXlFO0lBQ3pFLHNFQUFzRTtJQUN0RSx1RUFBdUU7SUFDdkUsTUFBTSxVQUFVLEdBQUksR0FBRyxDQUFDLGdCQUFxQyxDQUFDLEVBQUUsQ0FBQTtJQUNoRSxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQztRQUNyRSxNQUFNLElBQUksbUJBQVcsQ0FDbkIsbUJBQVcsQ0FBQyxLQUFLLENBQUMsU0FBUyxFQUMzQixtQkFBbUIsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLGdCQUFnQixDQUNqRCxDQUFBO0lBQ0gsQ0FBQztJQUVELE1BQU0sbUJBQW1CLEdBQUcsR0FBRyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FDaEUsS0FBSyxDQUFDLFFBQVEsQ0FBQywyQ0FBNEIsQ0FBQyxDQUM3QyxDQUFBO0lBQ0QsTUFBTSxxQkFBcUIsR0FBRyxHQUFHLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUNsRSxLQUFLLENBQUMsUUFBUSxDQUFDLDZDQUE4QixDQUFDLENBQy9DLENBQUE7SUFFRCxJQUFJLG1CQUFtQixJQUFJLHFCQUFxQixFQUFFLENBQUM7UUFDakQsR0FBRyxDQUFDLFdBQVcsQ0FBQyxNQUFNLEdBQUcsR0FBRyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUNwRCxDQUFDLEtBQUssRUFBRSxFQUFFLENBQ1IsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLDJDQUE0QixDQUFDO1lBQzdDLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyw2Q0FBOEIsQ0FBQyxDQUNsRCxDQUFBO0lBQ0gsQ0FBQztJQUVELHFFQUFxRTtJQUNyRSxpRUFBaUU7SUFDakUsdUVBQXVFO0lBQ3ZFLE1BQU0sRUFDSixTQUFTLEVBQUUsRUFBRSxFQUNiLGFBQWEsRUFBRSxFQUFFLEVBQ2pCLEdBQUcsY0FBYyxFQUNsQixHQUFHLENBQUMsR0FBRyxDQUFDLGdCQUFnQixJQUFJLEVBQUUsQ0FBNEIsQ0FBQTtJQUUzRCxNQUFNLEVBQ0osSUFBSSxFQUFFLENBQUMsT0FBTyxDQUFDLEdBQ2hCLEdBQUcsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDO1FBQ3BCLE1BQU0sRUFBRSxTQUFTO1FBQ2pCLE1BQU0sRUFBRSxHQUFHLENBQUMsV0FBVyxDQUFDLE1BQU07UUFDOUIsT0FBTyxFQUFFLEVBQUUsR0FBRyxjQUFjLEVBQUUsRUFBRSxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFO0tBQ2xELENBQUMsQ0FBQTtJQUVGLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNiLE1BQU0sSUFBSSxtQkFBVyxDQUNuQixtQkFBVyxDQUFDLEtBQUssQ0FBQyxTQUFTLEVBQzNCLG1CQUFtQixHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUUsZ0JBQWdCLENBQ2pELENBQUE7SUFDSCxDQUFDO0lBRUQsTUFBTSxRQUFRLEdBQUcsQ0FBRSxPQUFvQyxDQUFDLFFBQVE7UUFDOUQsRUFBRSxDQUEwQixDQUFBO0lBRTlCLElBQUksbUJBQW1CLEVBQUUsQ0FBQztRQUN4QixNQUFNLElBQUEsK0RBQTRCLEVBQUMsR0FBRyxFQUFFLFFBQVEsQ0FBQyxDQUFBO0lBQ25ELENBQUM7SUFFRCxJQUFJLHFCQUFxQixFQUFFLENBQUM7UUFDMUIsTUFBTSxJQUFBLHFFQUErQixFQUFDLEdBQUcsRUFBRSxRQUFRLENBQUMsQ0FBQTtJQUN0RCxDQUFDO0lBRUQsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUE7QUFDdkIsQ0FBQyxDQUFBO0FBbEVZLFFBQUEsR0FBRyxPQWtFZiJ9
+//# 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,42 +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 set_pricing_context_1 = require("@medusajs/medusa/api/utils/middlewares/products/set-pricing-context");
+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();
 }
-const offerPricingMiddleware = (0, set_pricing_context_1.setPricingContext)({
-    priceFieldPaths: [query_config_1.OFFER_CALCULATED_PRICE_FIELD],
-});
+/**
+ * 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"],
@@ -53,7 +60,7 @@ exports.storeProductsMiddlewares = [
                 resourceId: "product_id",
                 filterableField: "seller_id",
             }),
-            offerPricingMiddleware,
+            ...pricingMiddlewares,
         ],
     },
     {
@@ -68,8 +75,8 @@ exports.storeProductsMiddlewares = [
                 resourceId: "product_id",
                 filterableField: "seller_id",
             }),
-            offerPricingMiddleware,
+            ...pricingMiddlewares,
         ],
     },
 ];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL3Byb2R1Y3RzL21pZGRsZXdhcmVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLG1EQU1pQztBQUNqQyxxREFBcUU7QUFDckUsbURBQStEO0FBQy9ELDZHQUF1RztBQUV2RyxpREFHdUI7QUFDdkIsNkNBR3FCO0FBQ3JCLDJDQUE2RDtBQUU3RCxNQUFNLG1CQUFtQixHQUFHLENBQzFCLEdBQWtCLEVBQ2xCLElBQW9CLEVBQ3BCLElBQXdCLEVBQ3hCLEVBQUU7SUFDRixHQUFHLENBQUMsZ0JBQWdCLEdBQUcsR0FBRyxDQUFDLGdCQUFnQixJQUFJLEVBQUUsQ0FBQTtJQUNqRCxHQUFHLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxHQUFHLHFCQUFhLENBQUMsU0FBUyxDQUFBO0lBQ3JELElBQUksRUFBRSxDQUFBO0FBQ1IsQ0FBQyxDQUFBO0FBRUQ7Ozs7O0dBS0c7QUFDSCxLQUFLLFVBQVUsMkJBQTJCLENBQ3hDLEdBQWtCLEVBQ2xCLElBQW9CLEVBQ3BCLElBQXdCO0lBRXhCLE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQ2hFLE1BQU0sR0FBRyxHQUFHLElBQUksSUFBSSxFQUFFLENBQUE7SUFFdEIsTUFBTSxFQUFFLElBQUksRUFBRSxjQUFjLEVBQUUsR0FBRyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUM7UUFDakQsTUFBTSxFQUFFLFFBQVE7UUFDaEIsTUFBTSxFQUFFLENBQUMsSUFBSSxDQUFDO1FBQ2QsT0FBTyxFQUFFO1lBQ1AsTUFBTSxFQUFFLG9CQUFZLENBQUMsSUFBSTtZQUN6QixJQUFJLEVBQUU7Z0JBQ0osRUFBRSxHQUFHLEVBQUUsQ0FBQyxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLFdBQVcsRUFBRSxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsRUFBRSxDQUFDLEVBQUU7Z0JBQy9ELEVBQUUsR0FBRyxFQUFFLENBQUMsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxTQUFTLEVBQUUsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLEVBQUUsQ0FBQyxFQUFFO2FBQzVEO1NBQ0Y7S0FDRixDQUFDLENBQUE7SUFFRixHQUFHLENBQUMsZ0JBQWdCLEtBQUssRUFBRSxDQUFBO0lBQzNCLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxTQUFTLEdBQUcsY0FBYyxDQUFDLEdBQUcsQ0FDakQsQ0FBQyxDQUFpQixFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUM1QixDQUFBO0lBRUQsSUFBSSxFQUFFLENBQUE7QUFDUixDQUFDO0FBRUQsTUFBTSxzQkFBc0IsR0FBRyxJQUFBLHVDQUFpQixFQUFDO0lBQy9DLGVBQWUsRUFBRSxDQUFDLDJDQUE0QixDQUFDO0NBQ2hELENBQUMsQ0FBQTtBQUVXLFFBQUEsd0JBQXdCLEdBQXNCO0lBQ3pEO1FBQ0UsTUFBTSxFQUFFLENBQUMsS0FBSyxDQUFDO1FBQ2YsT0FBTyxFQUFFLGlCQUFpQjtRQUMxQixXQUFXLEVBQUU7WUFDWCxJQUFBLHFDQUF5QixFQUN2QixtQ0FBc0IsRUFDdEIsc0NBQXVCLENBQUMsSUFBSSxDQUM3QjtZQUNELG1CQUFtQjtZQUNuQiwyQkFBMkI7WUFDM0IsSUFBQSwyQkFBb0IsRUFBQztnQkFDbkIsVUFBVSxFQUFFLGdCQUFnQjtnQkFDNUIsVUFBVSxFQUFFLFlBQVk7Z0JBQ3hCLGVBQWUsRUFBRSxXQUFXO2FBQzdCLENBQUM7WUFDRixzQkFBc0I7U0FDdkI7S0FDRjtJQUNEO1FBQ0UsTUFBTSxFQUFFLENBQUMsS0FBSyxDQUFDO1FBQ2YsT0FBTyxFQUFFLHFCQUFxQjtRQUM5QixXQUFXLEVBQUU7WUFDWCxJQUFBLHFDQUF5QixFQUN2QixrQ0FBcUIsRUFDckIsc0NBQXVCLENBQUMsUUFBUSxDQUNqQztZQUNELG1CQUFtQjtZQUNuQiwyQkFBMkI7WUFDM0IsSUFBQSwyQkFBb0IsRUFBQztnQkFDbkIsVUFBVSxFQUFFLGdCQUFnQjtnQkFDNUIsVUFBVSxFQUFFLFlBQVk7Z0JBQ3hCLGVBQWUsRUFBRSxXQUFXO2FBQzdCLENBQUM7WUFDRixzQkFBc0I7U0FDdkI7S0FDRjtDQUNGLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL3Byb2R1Y3RzL21pZGRsZXdhcmVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLG1EQVFpQztBQUNqQyxxREFBcUQ7QUFDckQsbURBQStEO0FBQy9ELHdFQUlxRDtBQUVyRCxpREFBd0Q7QUFDeEQsNkNBR3FCO0FBQ3JCLDJDQUErQztBQUMvQyxpREFBNkQ7QUFFN0Q7Ozs7Ozs7R0FPRztBQUNILE1BQU0sbUJBQW1CLEdBQUcsSUFBQSwwQkFBbUIsRUFBQztJQUM5QyxNQUFNLEVBQUUscUJBQWEsQ0FBQyxTQUFTO0lBQy9CLFVBQVUsRUFBRSxDQUFDLE9BQWdDLEVBQUUsRUFBRTtRQUMvQyxNQUFNLFdBQVcsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFBO1FBQ3ZDLE9BQU8sT0FBTyxDQUFDLFdBQVcsQ0FBQTtRQUUxQixJQUFJLENBQUMsSUFBQSxpQkFBUyxFQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUM7WUFDNUIsT0FBTTtRQUNSLENBQUM7UUFFRCxPQUFPLEVBQUUsRUFBRSxFQUFFLFdBQVcsRUFBRSxXQUFXLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsQ0FBQTtJQUNqRSxDQUFDO0NBQ0YsQ0FBQyxDQUFBO0FBRUYsS0FBSyxVQUFVLDJCQUEyQixDQUN4QyxHQUFrQixFQUNsQixJQUFvQixFQUNwQixJQUF3QjtJQUV4QixHQUFHLENBQUMsZ0JBQWdCLEtBQUssRUFBRSxDQUFBO0lBQzNCLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxTQUFTLEdBQUcsTUFBTSxJQUFBLGlDQUF1QixFQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUV6RSxJQUFJLEVBQUUsQ0FBQTtBQUNSLENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILE1BQU0sa0JBQWtCLEdBQUc7SUFDekIsSUFBQSxtQkFBWSxFQUFDLFVBQVUsRUFBRSxDQUFDLFNBQVMsRUFBRSxRQUFRLENBQUMsRUFBRTtRQUM5QyxvQkFBb0IsRUFBRSxJQUFJO0tBQzNCLENBQUM7SUFDRixJQUFBLCtCQUF1QixFQUFDLEVBQUUsZUFBZSxFQUFFLENBQUMsMkJBQTJCLENBQUMsRUFBRSxDQUFDO0lBQzNFLElBQUEseUJBQWlCLEVBQUMsRUFBRSxlQUFlLEVBQUUsQ0FBQywyQkFBMkIsQ0FBQyxFQUFFLENBQUM7SUFDckUsSUFBQSxxQkFBYSxFQUFDLEVBQUUsZUFBZSxFQUFFLENBQUMsMkJBQTJCLENBQUMsRUFBRSxDQUFDO0NBQ2xFLENBQUE7QUFFWSxRQUFBLHdCQUF3QixHQUFzQjtJQUN6RDtRQUNFLE1BQU0sRUFBRSxDQUFDLEtBQUssQ0FBQztRQUNmLE9BQU8sRUFBRSxpQkFBaUI7UUFDMUIsV0FBVyxFQUFFO1lBQ1gsSUFBQSxxQ0FBeUIsRUFDdkIsbUNBQXNCLEVBQ3RCLHNDQUF1QixDQUFDLElBQUksQ0FDN0I7WUFDRCxtQkFBbUI7WUFDbkIsMkJBQTJCO1lBQzNCLElBQUEsMkJBQW9CLEVBQUM7Z0JBQ25CLFVBQVUsRUFBRSxnQkFBZ0I7Z0JBQzVCLFVBQVUsRUFBRSxZQUFZO2dCQUN4QixlQUFlLEVBQUUsV0FBVzthQUM3QixDQUFDO1lBQ0YsR0FBRyxrQkFBa0I7U0FDdEI7S0FDRjtJQUNEO1FBQ0UsTUFBTSxFQUFFLENBQUMsS0FBSyxDQUFDO1FBQ2YsT0FBTyxFQUFFLHFCQUFxQjtRQUM5QixXQUFXLEVBQUU7WUFDWCxJQUFBLHFDQUF5QixFQUN2QixrQ0FBcUIsRUFDckIsc0NBQXVCLENBQUMsUUFBUSxDQUNqQztZQUNELG1CQUFtQjtZQUNuQiwyQkFBMkI7WUFDM0IsSUFBQSwyQkFBb0IsRUFBQztnQkFDbkIsVUFBVSxFQUFFLGdCQUFnQjtnQkFDNUIsVUFBVSxFQUFFLFlBQVk7Z0JBQ3hCLGVBQWUsRUFBRSxXQUFXO2FBQzdCLENBQUM7WUFDRixHQUFHLGtCQUFrQjtTQUN0QjtLQUNGO0NBQ0YsQ0FBQSJ9

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

@@ -1,4 +1,4 @@
-export declare const storeProductFields: string[];
+export declare const defaultStoreProductFields: string[];
 export declare const storeProductQueryConfig: {
     list: {
         defaults: string[];
@@ -10,5 +10,3 @@ export declare const storeProductQueryConfig: {
         isList: boolean;
     };
 };
-export declare const OFFER_CALCULATED_PRICE_FIELD = "variants.offers.calculated_price";
-export declare const OFFER_INVENTORY_QUANTITY_FIELD = "variants.offers.inventory_quantity";

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OFFER_INVENTORY_QUANTITY_FIELD = exports.OFFER_CALCULATED_PRICE_FIELD = exports.storeProductQueryConfig = exports.storeProductFields = void 0;
-exports.storeProductFields = [
+exports.storeProductQueryConfig = exports.defaultStoreProductFields = void 0;
+exports.defaultStoreProductFields = [
     "id",
     "title",
     "subtitle",
@@ -14,7 +14,6 @@ exports.storeProductFields = [
     "thumbnail",
     "collection_id",
     "type_id",
-    "brand_id",
     "weight",
     "length",
     "height",
@@ -27,32 +26,46 @@ exports.storeProductFields = [
     "updated_at",
     "metadata",
     "*type",
-    "*brand",
     "*collection",
     "*tags",
     "*images",
     "*categories",
     "*variants",
-    "*variants.attribute_values",
-    "*variants.attribute_values.attribute",
-    "*variant_attributes",
-    "*variant_attributes.values",
-    "*custom_attributes",
-    "*custom_attributes.values",
-    "*attribute_values",
-    "*attribute_values.attribute",
+    "*variants.options",
+    "*options",
+    "*options.values",
+    "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: {
-        defaults: exports.storeProductFields,
+        defaults: exports.defaultStoreProductFields,
         defaultLimit: 50,
         isList: true,
     },
     retrieve: {
-        defaults: exports.storeProductFields,
+        defaults: exports.defaultStoreProductFields,
         isList: false,
     },
 };
-exports.OFFER_CALCULATED_PRICE_FIELD = "variants.offers.calculated_price";
-exports.OFFER_INVENTORY_QUANTITY_FIELD = "variants.offers.inventory_quantity";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnktY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL2FwaS9zdG9yZS9wcm9kdWN0cy9xdWVyeS1jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQWEsUUFBQSxrQkFBa0IsR0FBRztJQUNoQyxJQUFJO0lBQ0osT0FBTztJQUNQLFVBQVU7SUFDVixRQUFRO0lBQ1IsYUFBYTtJQUNiLGFBQWE7SUFDYixRQUFRO0lBQ1IsYUFBYTtJQUNiLGNBQWM7SUFDZCxXQUFXO0lBQ1gsZUFBZTtJQUNmLFNBQVM7SUFDVCxVQUFVO0lBQ1YsUUFBUTtJQUNSLFFBQVE7SUFDUixRQUFRO0lBQ1IsT0FBTztJQUNQLFNBQVM7SUFDVCxnQkFBZ0I7SUFDaEIsVUFBVTtJQUNWLFVBQVU7SUFDVixZQUFZO0lBQ1osWUFBWTtJQUNaLFVBQVU7SUFDVixPQUFPO0lBQ1AsUUFBUTtJQUNSLGFBQWE7SUFDYixPQUFPO0lBQ1AsU0FBUztJQUNULGFBQWE7SUFDYixXQUFXO0lBQ1gsNEJBQTRCO0lBQzVCLHNDQUFzQztJQUN0QyxxQkFBcUI7SUFDckIsNEJBQTRCO0lBQzVCLG9CQUFvQjtJQUNwQiwyQkFBMkI7SUFDM0IsbUJBQW1CO0lBQ25CLDZCQUE2QjtDQUM5QixDQUFBO0FBRVksUUFBQSx1QkFBdUIsR0FBRztJQUNyQyxJQUFJLEVBQUU7UUFDSixRQUFRLEVBQUUsMEJBQWtCO1FBQzVCLFlBQVksRUFBRSxFQUFFO1FBQ2hCLE1BQU0sRUFBRSxJQUFJO0tBQ2I7SUFDRCxRQUFRLEVBQUU7UUFDUixRQUFRLEVBQUUsMEJBQWtCO1FBQzVCLE1BQU0sRUFBRSxLQUFLO0tBQ2Q7Q0FDRixDQUFBO0FBRVksUUFBQSw0QkFBNEIsR0FBRyxrQ0FBa0MsQ0FBQTtBQUNqRSxRQUFBLDhCQUE4QixHQUN6QyxvQ0FBb0MsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnktY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL2FwaS9zdG9yZS9wcm9kdWN0cy9xdWVyeS1jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQWEsUUFBQSx5QkFBeUIsR0FBRztJQUN2QyxJQUFJO0lBQ0osT0FBTztJQUNQLFVBQVU7SUFDVixRQUFRO0lBQ1IsYUFBYTtJQUNiLGFBQWE7SUFDYixRQUFRO0lBQ1IsYUFBYTtJQUNiLGNBQWM7SUFDZCxXQUFXO0lBQ1gsZUFBZTtJQUNmLFNBQVM7SUFDVCxRQUFRO0lBQ1IsUUFBUTtJQUNSLFFBQVE7SUFDUixPQUFPO0lBQ1AsU0FBUztJQUNULGdCQUFnQjtJQUNoQixVQUFVO0lBQ1YsVUFBVTtJQUNWLFlBQVk7SUFDWixZQUFZO0lBQ1osVUFBVTtJQUNWLE9BQU87SUFDUCxhQUFhO0lBQ2IsT0FBTztJQUNQLFNBQVM7SUFDVCxhQUFhO0lBQ2IsV0FBVztJQUNYLG1CQUFtQjtJQUNuQixVQUFVO0lBQ1YsaUJBQWlCO0lBQ2pCLDZCQUE2QjtJQUM3QiwrQkFBK0I7SUFDL0IsK0JBQStCO0lBQy9CLHVDQUF1QztJQUN2Qyx1Q0FBdUM7SUFDdkMseUNBQXlDO0lBQ3pDLDJDQUEyQztJQUMzQyx5Q0FBeUM7SUFDekMsb0RBQW9EO0lBQ3BELGdEQUFnRDtJQUNoRCx5Q0FBeUM7SUFDekMsOENBQThDO0lBQzlDLGdEQUFnRDtJQUNoRCxnREFBZ0Q7SUFDaEQsc0JBQXNCO0lBQ3RCLHdCQUF3QjtJQUN4QiwwQkFBMEI7SUFDMUIsd0JBQXdCO0lBQ3hCLG1DQUFtQztJQUNuQyw2QkFBNkI7SUFDN0IsK0JBQStCO0lBQy9CLCtCQUErQjtDQUNoQyxDQUFBO0FBRVksUUFBQSx1QkFBdUIsR0FBRztJQUNyQyxJQUFJLEVBQUU7UUFDSixRQUFRLEVBQUUsaUNBQXlCO1FBQ25DLFlBQVksRUFBRSxFQUFFO1FBQ2hCLE1BQU0sRUFBRSxJQUFJO0tBQ2I7SUFDRCxRQUFRLEVBQUU7UUFDUixRQUFRLEVBQUUsaUNBQXlCO1FBQ25DLE1BQU0sRUFBRSxLQUFLO0tBQ2Q7Q0FDRixDQUFBIn0=

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

@@ -2,17 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GET = void 0;
 const utils_1 = require("@medusajs/framework/utils");
-const wrap_variants_with_offers_inventory_1 = require("../../utils/wrap-variants-with-offers-inventory");
-const wrap_variants_with_offers_prices_1 = require("../../utils/wrap-variants-with-offers-prices");
-const query_config_1 = require("./query-config");
+const utils_2 = require("../../utils");
+const helpers_1 = require("./helpers");
 const GET = async (req, res) => {
     const query = req.scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
-    const withCalculatedPrice = req.queryConfig.fields.some((field) => field.includes(query_config_1.OFFER_CALCULATED_PRICE_FIELD));
-    const withInventoryQuantity = req.queryConfig.fields.some((field) => field.includes(query_config_1.OFFER_INVENTORY_QUANTITY_FIELD));
-    if (withCalculatedPrice || withInventoryQuantity) {
-        req.queryConfig.fields = req.queryConfig.fields.filter((field) => !field.includes(query_config_1.OFFER_CALCULATED_PRICE_FIELD) &&
-            !field.includes(query_config_1.OFFER_INVENTORY_QUANTITY_FIELD));
-    }
+    // `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
@@ -24,14 +21,9 @@ const GET = async (req, res) => {
         filters: productFilters,
         pagination: req.queryConfig.pagination,
     });
-    const variants = (products ?? [])
-        .flatMap((p) => p.variants ?? [])
-        .filter(Boolean);
+    await (0, utils_2.enrichProductAttributes)(req.scope, products);
     if (withCalculatedPrice) {
-        await (0, wrap_variants_with_offers_prices_1.wrapVariantsWithOffersPrices)(req, variants);
-    }
-    if (withInventoryQuantity) {
-        await (0, wrap_variants_with_offers_inventory_1.wrapVariantsWithOffersInventory)(req, variants);
+        await (0, utils_2.wrapProductVariantsWithOfferPrice)(req, products);
     }
     res.json({
         products,
@@ -41,4 +33,4 @@ const GET = async (req, res) => {
     });
 };
 exports.GET = GET;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL3Byb2R1Y3RzL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUlBLHFEQUFxRTtBQUVyRSx5R0FBaUc7QUFDakcsbUdBQTJGO0FBQzNGLGlEQUd1QjtBQUVoQixNQUFNLEdBQUcsR0FBRyxLQUFLLEVBQUUsR0FBdUIsRUFBRSxHQUFtQixFQUFFLEVBQUU7SUFDeEUsTUFBTSxLQUFLLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsaUNBQXlCLENBQUMsS0FBSyxDQUFDLENBQUE7SUFFaEUsTUFBTSxtQkFBbUIsR0FBRyxHQUFHLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUNoRSxLQUFLLENBQUMsUUFBUSxDQUFDLDJDQUE0QixDQUFDLENBQzdDLENBQUE7SUFDRCxNQUFNLHFCQUFxQixHQUFHLEdBQUcsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQ2xFLEtBQUssQ0FBQyxRQUFRLENBQUMsNkNBQThCLENBQUMsQ0FDL0MsQ0FBQTtJQUVELElBQUksbUJBQW1CLElBQUkscUJBQXFCLEVBQUUsQ0FBQztRQUNqRCxHQUFHLENBQUMsV0FBVyxDQUFDLE1BQU0sR0FBRyxHQUFHLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQ3BELENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FDUixDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsMkNBQTRCLENBQUM7WUFDN0MsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLDZDQUE4QixDQUFDLENBQ2xELENBQUE7SUFDSCxDQUFDO0lBRUQsb0VBQW9FO0lBQ3BFLG9FQUFvRTtJQUNwRSwrREFBK0Q7SUFDL0Qsc0JBQXNCO0lBQ3RCLE1BQU0sRUFDSixTQUFTLEVBQUUsRUFBRSxFQUNiLGFBQWEsRUFBRSxFQUFFLEVBQ2pCLEdBQUcsY0FBYyxFQUNsQixHQUFHLENBQUMsR0FBRyxDQUFDLGdCQUFnQixJQUFJLEVBQUUsQ0FBNEIsQ0FBQTtJQUUzRCxNQUFNLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxRQUFRLEVBQUUsR0FBRyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUM7UUFDckQsTUFBTSxFQUFFLFNBQVM7UUFDakIsTUFBTSxFQUFFLEdBQUcsQ0FBQyxXQUFXLENBQUMsTUFBTTtRQUM5QixPQUFPLEVBQUUsY0FBYztRQUN2QixVQUFVLEVBQUUsR0FBRyxDQUFDLFdBQVcsQ0FBQyxVQUFVO0tBQ3ZDLENBQUMsQ0FBQTtJQUVGLE1BQU0sUUFBUSxHQUFHLENBQUMsUUFBUSxJQUFJLEVBQUUsQ0FBQztTQUM5QixPQUFPLENBQUMsQ0FBQyxDQUEyQixFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsUUFBUSxJQUFJLEVBQUUsQ0FBQztTQUMxRCxNQUFNLENBQUMsT0FBTyxDQUEwQixDQUFBO0lBRTNDLElBQUksbUJBQW1CLEVBQUUsQ0FBQztRQUN4QixNQUFNLElBQUEsK0RBQTRCLEVBQUMsR0FBRyxFQUFFLFFBQVEsQ0FBQyxDQUFBO0lBQ25ELENBQUM7SUFFRCxJQUFJLHFCQUFxQixFQUFFLENBQUM7UUFDMUIsTUFBTSxJQUFBLHFFQUErQixFQUFDLEdBQUcsRUFBRSxRQUFRLENBQUMsQ0FBQTtJQUN0RCxDQUFDO0lBRUQsR0FBRyxDQUFDLElBQUksQ0FBQztRQUNQLFFBQVE7UUFDUixLQUFLLEVBQUUsUUFBUSxFQUFFLEtBQUssSUFBSSxDQUFDO1FBQzNCLE1BQU0sRUFBRSxRQUFRLEVBQUUsSUFBSSxJQUFJLENBQUM7UUFDM0IsS0FBSyxFQUFFLFFBQVEsRUFBRSxJQUFJLElBQUksQ0FBQztLQUMzQixDQUFDLENBQUE7QUFDSixDQUFDLENBQUE7QUFyRFksUUFBQSxHQUFHLE9BcURmIn0=
+//# 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<{} & {
@@ -22,15 +22,14 @@ export declare const StoreGetProductsParams: z.ZodObject<{} & {
         id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
         title: z.ZodOptional<z.ZodString>;
         handle: z.ZodOptional<z.ZodString>;
-        brand_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
         collection_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
         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;
@@ -43,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;
@@ -70,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;
@@ -83,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;
@@ -111,50 +110,49 @@ 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;
-        brand_id?: string | string[] | 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;
-        brand_id?: string | string[] | 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>;
         id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
         title: z.ZodOptional<z.ZodString>;
         handle: z.ZodOptional<z.ZodString>;
-        brand_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
         collection_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
         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;
@@ -167,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;
@@ -194,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;
@@ -207,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;
@@ -235,37 +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;
-        brand_id?: string | string[] | 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;
-        brand_id?: string | string[] | 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/products/validators.js

@@ -13,7 +13,6 @@ const StoreGetProductsParamsFields = zod_1.z.object({
     id: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
     title: zod_1.z.string().optional(),
     handle: zod_1.z.string().optional(),
-    brand_id: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
     collection_id: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
     type_id: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
     category_id: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
@@ -30,4 +29,4 @@ exports.StoreGetProductsParams = (0, validators_1.createFindParams)({
 })
     .merge(StoreGetProductsParamsFields)
     .merge((0, common_1.applyAndAndOrOperators)(StoreGetProductsParamsFields));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9hcGkvc3RvcmUvcHJvZHVjdHMvdmFsaWRhdG9ycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2QkFBdUI7QUFDdkIsc0VBSThDO0FBQzlDLGdGQUc0RDtBQUcvQyxRQUFBLHFCQUFxQixHQUFHLElBQUEsK0JBQWtCLEdBQUUsQ0FBQyxLQUFLLENBQzdELE9BQUMsQ0FBQyxNQUFNLENBQUM7SUFDUCxTQUFTLEVBQUUsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtJQUNoQyxhQUFhLEVBQUUsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtDQUNyQyxDQUFDLENBQ0gsQ0FBQTtBQUVELE1BQU0sNEJBQTRCLEdBQUcsT0FBQyxDQUFDLE1BQU0sQ0FBQztJQUM1QyxDQUFDLEVBQUUsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtJQUN4QixFQUFFLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLE9BQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLE9BQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUU7SUFDekQsS0FBSyxFQUFFLE9BQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDNUIsTUFBTSxFQUFFLE9BQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDN0IsUUFBUSxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxPQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFO0lBQy9ELGFBQWEsRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRTtJQUNwRSxPQUFPLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLE9BQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLE9BQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUU7SUFDOUQsV0FBVyxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxPQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFO0lBQ2xFLE1BQU0sRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRTtJQUM3RCxXQUFXLEVBQUUsSUFBQSxzQkFBYSxHQUFFLENBQUMsUUFBUSxFQUFFO0lBQ3ZDLFNBQVMsRUFBRSxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxFQUFFO0lBQ2hDLGFBQWEsRUFBRSxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxFQUFFO0lBQ3BDLFVBQVUsRUFBRSxJQUFBLDhCQUFpQixHQUFFLENBQUMsUUFBUSxFQUFFO0lBQzFDLFVBQVUsRUFBRSxJQUFBLDhCQUFpQixHQUFFLENBQUMsUUFBUSxFQUFFO0NBQzNDLENBQUMsQ0FBQTtBQUdXLFFBQUEsc0JBQXNCLEdBQUcsSUFBQSw2QkFBZ0IsRUFBQztJQUNyRCxNQUFNLEVBQUUsQ0FBQztJQUNULEtBQUssRUFBRSxFQUFFO0NBQ1YsQ0FBQztLQUNDLEtBQUssQ0FBQyw0QkFBNEIsQ0FBQztLQUNuQyxLQUFLLENBQUMsSUFBQSwrQkFBc0IsRUFBQyw0QkFBNEIsQ0FBQyxDQUFDLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9hcGkvc3RvcmUvcHJvZHVjdHMvdmFsaWRhdG9ycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2QkFBdUI7QUFDdkIsc0VBSThDO0FBQzlDLGdGQUc0RDtBQUcvQyxRQUFBLHFCQUFxQixHQUFHLElBQUEsK0JBQWtCLEdBQUUsQ0FBQyxLQUFLLENBQzdELE9BQUMsQ0FBQyxNQUFNLENBQUM7SUFDUCxTQUFTLEVBQUUsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtJQUNoQyxhQUFhLEVBQUUsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtDQUNyQyxDQUFDLENBQ0gsQ0FBQTtBQUVELE1BQU0sNEJBQTRCLEdBQUcsT0FBQyxDQUFDLE1BQU0sQ0FBQztJQUM1QyxDQUFDLEVBQUUsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtJQUN4QixFQUFFLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLE9BQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLE9BQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUU7SUFDekQsS0FBSyxFQUFFLE9BQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDNUIsTUFBTSxFQUFFLE9BQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDN0IsYUFBYSxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxPQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFO0lBQ3BFLE9BQU8sRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRTtJQUM5RCxXQUFXLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLE9BQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLE9BQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUU7SUFDbEUsTUFBTSxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxPQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFO0lBQzdELFdBQVcsRUFBRSxJQUFBLHNCQUFhLEdBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDdkMsU0FBUyxFQUFFLE9BQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDaEMsYUFBYSxFQUFFLE9BQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDcEMsVUFBVSxFQUFFLElBQUEsOEJBQWlCLEdBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDMUMsVUFBVSxFQUFFLElBQUEsOEJBQWlCLEdBQUUsQ0FBQyxRQUFRLEVBQUU7Q0FDM0MsQ0FBQyxDQUFBO0FBR1csUUFBQSxzQkFBc0IsR0FBRyxJQUFBLDZCQUFnQixFQUFDO0lBQ3JELE1BQU0sRUFBRSxDQUFDO0lBQ1QsS0FBSyxFQUFFLEVBQUU7Q0FDVixDQUFDO0tBQ0MsS0FBSyxDQUFDLDRCQUE0QixDQUFDO0tBQ25DLEtBQUssQ0FBQyxJQUFBLCtCQUFzQixFQUFDLDRCQUE0QixDQUFDLENBQUMsQ0FBQSJ9