@mercurjs/core 2.3.2-canary.4 → 2.3.2

package/.medusa/server/src/api/vendor/orders/helpers.js

@@ -1,38 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateSellerOrder = exports.normalizeOrderPaymentCollections = exports.withCartPaymentCollectionFields = void 0;
+exports.validateSellerOrder = exports.withCartPaymentCollectionFields = exports.normalizeOrderPaymentCollections = void 0;
 const utils_1 = require("@medusajs/framework/utils");
-const utils_2 = require("@medusajs/framework/utils");
-const aggregate_status_1 = require("../../../workflows/order-group/utils/aggregate-status");
-// The shared cart payment collection is reached through the cart, not linked
-// to the order. These fields must always be loaded so the routes can normalize
-// them back onto `payment_collections` and recompute `payment_status` — even
-// when the client sends an absolute `fields=` list that would otherwise replace
-// the route defaults.
-const CART_PAYMENT_COLLECTION_FIELDS = [
-    "cart.payment_collection.*",
-    "cart.payment_collection.payments.*",
-    "cart.payment_collection.payments.refunds.*",
-    "cart.payment_collection.payments.refunds.refund_reason.*",
-    "cart.payment_collection.payment_sessions.*",
-];
-const withCartPaymentCollectionFields = (fields) => {
-    return (0, utils_2.deduplicate)([...fields, ...CART_PAYMENT_COLLECTION_FIELDS]);
-};
-exports.withCartPaymentCollectionFields = withCartPaymentCollectionFields;
-// The shared cart payment collection is fetched via `cart.payment_collection`
-// (it is not linked directly to an order). Expose it back on the order under
-// `payment_collections` so consumers keep the familiar shape, and recompute
-// `payment_status` from it — Medusa's aggregation reads the linked payment
-// collections, which are always empty for split orders under the cart-path model.
-const normalizeOrderPaymentCollections = (order) => {
-    const paymentCollection = order.cart?.payment_collection;
-    order.payment_collections = paymentCollection ? [paymentCollection] : [];
-    delete order.cart;
-    order.payment_status = (0, aggregate_status_1.getLastPaymentStatus)(order);
-    return order;
-};
-exports.normalizeOrderPaymentCollections = normalizeOrderPaymentCollections;
+var split_order_payment_status_1 = require("../../utils/split-order-payment-status");
+Object.defineProperty(exports, "normalizeOrderPaymentCollections", { enumerable: true, get: function () { return split_order_payment_status_1.normalizeOrderPaymentCollections; } });
+Object.defineProperty(exports, "withCartPaymentCollectionFields", { enumerable: true, get: function () { return split_order_payment_status_1.withCartPaymentCollectionFields; } });
 const validateSellerOrder = async (scope, sellerId, orderIdOrIds) => {
     const query = scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
     const orderIds = Array.isArray(orderIdOrIds) ? orderIdOrIds : [orderIdOrIds];
@@ -51,4 +23,4 @@ const validateSellerOrder = async (scope, sellerId, orderIdOrIds) => {
     }
 };
 exports.validateSellerOrder = validateSellerOrder;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9hcGkvdmVuZG9yL29yZGVycy9oZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLHFEQUdrQztBQUVsQyxxREFBdUQ7QUFFdkQsNEZBQTRGO0FBUTVGLDZFQUE2RTtBQUM3RSwrRUFBK0U7QUFDL0UsNkVBQTZFO0FBQzdFLGdGQUFnRjtBQUNoRixzQkFBc0I7QUFDdEIsTUFBTSw4QkFBOEIsR0FBRztJQUNyQywyQkFBMkI7SUFDM0Isb0NBQW9DO0lBQ3BDLDRDQUE0QztJQUM1QywwREFBMEQ7SUFDMUQsNENBQTRDO0NBQzdDLENBQUE7QUFFTSxNQUFNLCtCQUErQixHQUFHLENBQzdDLE1BQWdCLEVBQ04sRUFBRTtJQUNaLE9BQU8sSUFBQSxtQkFBVyxFQUFDLENBQUMsR0FBRyxNQUFNLEVBQUUsR0FBRyw4QkFBOEIsQ0FBQyxDQUFDLENBQUE7QUFDcEUsQ0FBQyxDQUFBO0FBSlksUUFBQSwrQkFBK0IsbUNBSTNDO0FBRUQsOEVBQThFO0FBQzlFLDZFQUE2RTtBQUM3RSw0RUFBNEU7QUFDNUUsMkVBQTJFO0FBQzNFLGtGQUFrRjtBQUMzRSxNQUFNLGdDQUFnQyxHQUFHLENBRzlDLEtBQVEsRUFDTCxFQUFFO0lBQ0wsTUFBTSxpQkFBaUIsR0FBRyxLQUFLLENBQUMsSUFBSSxFQUFFLGtCQUFrQixDQUFBO0lBQ3hELEtBQUssQ0FBQyxtQkFBbUIsR0FBRyxpQkFBaUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUE7SUFDeEUsT0FBTyxLQUFLLENBQUMsSUFBSSxDQUFBO0lBRWpCLEtBQUssQ0FBQyxjQUFjLEdBQUcsSUFBQSx1Q0FBb0IsRUFDekMsS0FBa0MsQ0FDbkMsQ0FBQTtJQUVELE9BQU8sS0FBSyxDQUFBO0FBQ2QsQ0FBQyxDQUFBO0FBZFksUUFBQSxnQ0FBZ0Msb0NBYzVDO0FBRU0sTUFBTSxtQkFBbUIsR0FBRyxLQUFLLEVBQ3RDLEtBQXNCLEVBQ3RCLFFBQWdCLEVBQ2hCLFlBQStCLEVBQy9CLEVBQUU7SUFDRixNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLEtBQUssQ0FBQyxDQUFBO0lBRTVELE1BQU0sUUFBUSxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUMsQ0FBQTtJQUU1RSxNQUFNLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUMvQyxNQUFNLEVBQUUsY0FBYztRQUN0QixPQUFPLEVBQUU7WUFDUCxTQUFTLEVBQUUsUUFBUTtZQUNuQixRQUFRLEVBQUUsUUFBUTtTQUNuQjtRQUNELE1BQU0sRUFBRSxDQUFDLFdBQVcsRUFBRSxVQUFVLENBQUM7S0FDbEMsQ0FBQyxDQUFBO0lBRUYsTUFBTSxhQUFhLEdBQUcsSUFBSSxHQUFHLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUE7SUFDcEUsTUFBTSxlQUFlLEdBQUcsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7SUFFdkUsSUFBSSxlQUFlLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQy9CLE1BQU0sSUFBSSxtQkFBVyxDQUNuQixtQkFBVyxDQUFDLEtBQUssQ0FBQyxTQUFTLEVBQzNCLGtCQUFrQixlQUFlLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FDN0QsQ0FBQTtJQUNILENBQUM7QUFDSCxDQUFDLENBQUE7QUEzQlksUUFBQSxtQkFBbUIsdUJBMkIvQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9hcGkvdmVuZG9yL29yZGVycy9oZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHFEQUdrQztBQUVsQyxxRkFHK0M7QUFGN0MsOElBQUEsZ0NBQWdDLE9BQUE7QUFDaEMsNklBQUEsK0JBQStCLE9BQUE7QUFHMUIsTUFBTSxtQkFBbUIsR0FBRyxLQUFLLEVBQ3RDLEtBQXNCLEVBQ3RCLFFBQWdCLEVBQ2hCLFlBQStCLEVBQy9CLEVBQUU7SUFDRixNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLEtBQUssQ0FBQyxDQUFBO0lBRTVELE1BQU0sUUFBUSxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUMsQ0FBQTtJQUU1RSxNQUFNLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUMvQyxNQUFNLEVBQUUsY0FBYztRQUN0QixPQUFPLEVBQUU7WUFDUCxTQUFTLEVBQUUsUUFBUTtZQUNuQixRQUFRLEVBQUUsUUFBUTtTQUNuQjtRQUNELE1BQU0sRUFBRSxDQUFDLFdBQVcsRUFBRSxVQUFVLENBQUM7S0FDbEMsQ0FBQyxDQUFBO0lBRUYsTUFBTSxhQUFhLEdBQUcsSUFBSSxHQUFHLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUE7SUFDcEUsTUFBTSxlQUFlLEdBQUcsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7SUFFdkUsSUFBSSxlQUFlLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQy9CLE1BQU0sSUFBSSxtQkFBVyxDQUNuQixtQkFBVyxDQUFDLEtBQUssQ0FBQyxTQUFTLEVBQzNCLGtCQUFrQixlQUFlLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FDN0QsQ0FBQTtJQUNILENBQUM7QUFDSCxDQUFDLENBQUE7QUEzQlksUUFBQSxtQkFBbUIsdUJBMkIvQiJ9

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

@@ -496,8 +496,8 @@ declare const CreateProduct: z.ZodObject<{
         options: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     }, "strict", z.ZodTypeAny, {
         title: string;
-        options?: Record<string, string> | undefined;
         length?: number | undefined;
+        options?: Record<string, string> | undefined;
         metadata?: Record<string, unknown> | undefined;
         sku?: string | undefined;
         ean?: string | undefined;
@@ -516,8 +516,8 @@ declare const CreateProduct: z.ZodObject<{
         variant_rank?: number | undefined;
     }, {
         title: string;
-        options?: Record<string, string> | undefined;
         length?: number | undefined;
+        options?: Record<string, string> | undefined;
         metadata?: Record<string, unknown> | undefined;
         sku?: string | undefined;
         ean?: string | undefined;
@@ -671,8 +671,8 @@ declare const UpdateProduct: z.ZodObject<{
         metadata: z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodUnknown>>>;
         options: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     }, "strict", z.ZodTypeAny, {
-        options?: Record<string, string> | undefined;
         length?: number | null | undefined;
+        options?: Record<string, string> | undefined;
         id?: string | undefined;
         metadata?: Record<string, unknown> | null | undefined;
         title?: string | undefined;
@@ -693,8 +693,8 @@ declare const UpdateProduct: z.ZodObject<{
         barcode?: string | null | undefined;
         variant_rank?: number | undefined;
     }, {
-        options?: Record<string, string> | undefined;
         length?: number | null | undefined;
+        options?: Record<string, string> | undefined;
         id?: string | undefined;
         metadata?: Record<string, unknown> | null | undefined;
         title?: string | undefined;
@@ -1022,8 +1022,8 @@ export declare const VendorAddProductVariant: z.ZodObject<{
     options: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
 }, "strict", z.ZodTypeAny, {
     title: string;
-    options?: Record<string, string> | undefined;
     length?: number | undefined;
+    options?: Record<string, string> | undefined;
     metadata?: Record<string, unknown> | undefined;
     sku?: string | undefined;
     ean?: string | undefined;
@@ -1045,8 +1045,8 @@ export declare const VendorAddProductVariant: z.ZodObject<{
     allow_backorder?: boolean | undefined;
 }, {
     title: string;
-    options?: Record<string, string> | undefined;
     length?: number | undefined;
+    options?: Record<string, string> | undefined;
     metadata?: Record<string, unknown> | undefined;
     sku?: string | undefined;
     ean?: string | undefined;
@@ -1102,8 +1102,8 @@ export declare const VendorUpdateProductVariant: z.ZodObject<{
         remove?: string[] | undefined;
     }>>;
 }, "strict", z.ZodTypeAny, {
-    options?: Record<string, string> | undefined;
     length?: number | null | undefined;
+    options?: Record<string, string> | undefined;
     metadata?: Record<string, unknown> | null | undefined;
     title?: string | undefined;
     sku?: string | null | undefined;
@@ -1129,8 +1129,8 @@ export declare const VendorUpdateProductVariant: z.ZodObject<{
         remove?: string[] | undefined;
     } | undefined;
 }, {
-    options?: Record<string, string> | undefined;
     length?: number | null | undefined;
+    options?: Record<string, string> | undefined;
     metadata?: Record<string, unknown> | null | undefined;
     title?: string | undefined;
     sku?: string | null | undefined;

package/.medusa/server/src/api/vendor/sellers/middlewares.js

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.vendorSellersMiddlewares = void 0;
 const policy_resources_1 = require("../../utils/policy-resources");
+const ensure_seller_scope_middleware_1 = require("../../utils/ensure-seller-scope-middleware");
 const framework_1 = require("@medusajs/framework");
 const utils_1 = require("@medusajs/framework/utils");
 const QueryConfig = __importStar(require("./query-config"));
@@ -93,6 +94,7 @@ exports.vendorSellersMiddlewares = [
         method: ["GET"],
         matcher: "/vendor/sellers/:id",
         middlewares: [
+            ensure_seller_scope_middleware_1.ensureSellerIdParamMiddleware,
             (0, framework_1.validateAndTransformQuery)(validators_1.VendorGetSellerParams, QueryConfig.retrieveVendorSellerQueryConfig),
         ],
         policies: [
@@ -106,6 +108,7 @@ exports.vendorSellersMiddlewares = [
         method: ["POST"],
         matcher: "/vendor/sellers/:id",
         middlewares: [
+            ensure_seller_scope_middleware_1.ensureSellerIdParamMiddleware,
             (0, framework_1.validateAndTransformBody)(validators_1.VendorUpdateSeller),
             (0, framework_1.validateAndTransformQuery)(validators_1.VendorGetSellerParams, QueryConfig.retrieveVendorSellerQueryConfig),
         ],
@@ -120,6 +123,7 @@ exports.vendorSellersMiddlewares = [
         method: ["POST"],
         matcher: "/vendor/sellers/:id/address",
         middlewares: [
+            ensure_seller_scope_middleware_1.ensureSellerIdParamMiddleware,
             (0, framework_1.validateAndTransformBody)(validators_1.VendorUpsertSellerAddress),
             (0, framework_1.validateAndTransformQuery)(validators_1.VendorGetSellerParams, QueryConfig.retrieveVendorSellerQueryConfig),
         ],
@@ -134,6 +138,7 @@ exports.vendorSellersMiddlewares = [
         method: ["POST"],
         matcher: "/vendor/sellers/:id/payment-details",
         middlewares: [
+            ensure_seller_scope_middleware_1.ensureSellerIdParamMiddleware,
             (0, framework_1.validateAndTransformBody)(validators_1.VendorUpsertSellerPaymentDetails),
             (0, framework_1.validateAndTransformQuery)(validators_1.VendorGetSellerParams, QueryConfig.retrieveVendorSellerQueryConfig),
         ],
@@ -148,6 +153,7 @@ exports.vendorSellersMiddlewares = [
         method: ["POST"],
         matcher: "/vendor/sellers/:id/professional-details",
         middlewares: [
+            ensure_seller_scope_middleware_1.ensureSellerIdParamMiddleware,
             (0, framework_1.validateAndTransformBody)(validators_1.VendorUpsertSellerProfessionalDetails),
             (0, framework_1.validateAndTransformQuery)(validators_1.VendorGetSellerParams, QueryConfig.retrieveVendorSellerQueryConfig),
         ],
@@ -162,6 +168,7 @@ exports.vendorSellersMiddlewares = [
         method: ["DELETE"],
         matcher: "/vendor/sellers/:id/professional-details",
         middlewares: [
+            ensure_seller_scope_middleware_1.ensureSellerIdParamMiddleware,
             (0, framework_1.validateAndTransformQuery)(validators_1.VendorGetSellerParams, QueryConfig.retrieveVendorSellerQueryConfig),
         ],
         policies: [
@@ -175,6 +182,7 @@ exports.vendorSellersMiddlewares = [
         method: ["GET"],
         matcher: "/vendor/sellers/:id/members/me",
         middlewares: [
+            ensure_seller_scope_middleware_1.ensureSellerIdParamMiddleware,
             (0, framework_1.validateAndTransformQuery)(validators_1.VendorGetSellerParams, QueryConfig.retrieveVendorMemberQueryConfig),
         ],
         policies: [
@@ -188,6 +196,7 @@ exports.vendorSellersMiddlewares = [
         method: ["GET"],
         matcher: "/vendor/sellers/:id/members/invites",
         middlewares: [
+            ensure_seller_scope_middleware_1.ensureSellerIdParamMiddleware,
             (0, framework_1.validateAndTransformQuery)(validators_1.VendorGetSellersParams, QueryConfig.listVendorMemberInvitesQueryConfig),
         ],
         policies: [
@@ -201,6 +210,7 @@ exports.vendorSellersMiddlewares = [
         method: ["GET"],
         matcher: "/vendor/sellers/:id/members",
         middlewares: [
+            ensure_seller_scope_middleware_1.ensureSellerIdParamMiddleware,
             (0, framework_1.validateAndTransformQuery)(validators_1.VendorGetSellersParams, QueryConfig.listVendorMembersQueryConfig),
         ],
         policies: [
@@ -218,6 +228,7 @@ exports.vendorSellersMiddlewares = [
         method: ["POST"],
         matcher: "/vendor/sellers/:id/members",
         middlewares: [
+            ensure_seller_scope_middleware_1.ensureSellerIdParamMiddleware,
             (0, framework_1.validateAndTransformBody)(validators_1.VendorInviteMember),
         ],
         policies: [
@@ -231,6 +242,8 @@ exports.vendorSellersMiddlewares = [
         method: ["POST"],
         matcher: "/vendor/sellers/:id/members/:member_id",
         middlewares: [
+            ensure_seller_scope_middleware_1.ensureSellerIdParamMiddleware,
+            ensure_seller_scope_middleware_1.ensureSellerMemberParamMiddleware,
             (0, framework_1.validateAndTransformBody)(validators_1.VendorUpdateMemberRole),
         ],
         policies: [
@@ -243,7 +256,10 @@ exports.vendorSellersMiddlewares = [
     {
         method: ["DELETE"],
         matcher: "/vendor/sellers/:id/members/:member_id",
-        middlewares: [],
+        middlewares: [
+            ensure_seller_scope_middleware_1.ensureSellerIdParamMiddleware,
+            ensure_seller_scope_middleware_1.ensureSellerMemberParamMiddleware,
+        ],
         policies: [
             {
                 resource: query_config_1.Entities.seller_member,
@@ -252,4 +268,4 @@ exports.vendorSellersMiddlewares = [
         ],
     },
 ];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3ZlbmRvci9zZWxsZXJzL21pZGRsZXdhcmVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLG1FQUE2RDtBQUM3RCxtREFHNEI7QUFDNUIscURBQTJEO0FBRzNELDREQUE2QztBQUM3QyxpREFBeUM7QUFDekMsNkNBV3FCO0FBRVIsUUFBQSx3QkFBd0IsR0FBc0I7SUFDekQ7UUFDRSxNQUFNLEVBQUUsQ0FBQyxNQUFNLENBQUM7UUFDaEIsT0FBTyxFQUFFLHdCQUF3QjtRQUNqQyxXQUFXLEVBQUU7WUFDWCxJQUFBLG9DQUF3QixFQUFDLCtCQUFrQixDQUFDO1NBQzdDO0tBQ0Y7SUFDRDtRQUNFLE1BQU0sRUFBRSxDQUFDLEtBQUssQ0FBQztRQUNmLE9BQU8sRUFBRSxvQkFBb0I7UUFDN0IsV0FBVyxFQUFFO1lBQ1gsSUFBQSxxQ0FBeUIsRUFDdkIsa0NBQXFCLEVBQ3JCLFdBQVcsQ0FBQywrQkFBK0IsQ0FDNUM7U0FDRjtRQUNELFFBQVEsRUFBRTtZQUNSO2dCQUNFLFFBQVEsRUFBRSxpQ0FBYyxDQUFDLE1BQU07Z0JBQy9CLFNBQVMsRUFBRSx1QkFBZSxDQUFDLElBQUk7YUFDaEM7U0FDRjtLQUNGO0lBQ0Q7UUFDRSxNQUFNLEVBQUUsQ0FBQyxNQUFNLENBQUM7UUFDaEIsT0FBTyxFQUFFLG9CQUFvQjtRQUM3QixXQUFXLEVBQUU7WUFDWCxJQUFBLG9DQUF3QixFQUFDLCtCQUFrQixDQUFDO1lBQzVDLElBQUEscUNBQXlCLEVBQ3ZCLGtDQUFxQixFQUNyQixXQUFXLENBQUMsK0JBQStCLENBQzVDO1NBQ0Y7UUFDRCxRQUFRLEVBQUU7WUFDUjtnQkFDRSxRQUFRLEVBQUUsaUNBQWMsQ0FBQyxNQUFNO2dCQUMvQixTQUFTLEVBQUUsdUJBQWUsQ0FBQyxNQUFNO2FBQ2xDO1NBQ0Y7S0FDRjtJQUNEO1FBQ0UsTUFBTSxFQUFFLENBQUMsTUFBTSxDQUFDO1FBQ2hCLE9BQU8sRUFBRSxpQkFBaUI7UUFDMUIsV0FBVyxFQUFFO1lBQ1gsSUFBQSxvQ0FBd0IsRUFBQyxzQ0FBeUIsQ0FBQztTQUNwRDtLQUNGO0lBQ0Q7UUFDRSxNQUFNLEVBQUUsQ0FBQyxLQUFLLENBQUM7UUFDZixPQUFPLEVBQUUsaUJBQWlCO1FBQzFCLFdBQVcsRUFBRTtZQUNYLElBQUEscUNBQXlCLEVBQ3ZCLG1DQUFzQixFQUN0QixXQUFXLENBQUMsNEJBQTRCLENBQ3pDO1NBQ0Y7S0FDRjtJQUNEO1FBQ0UsTUFBTSxFQUFFLENBQUMsS0FBSyxDQUFDO1FBQ2YsT0FBTyxFQUFFLHFCQUFxQjtRQUM5QixXQUFXLEVBQUU7WUFDWCxJQUFBLHFDQUF5QixFQUN2QixrQ0FBcUIsRUFDckIsV0FBVyxDQUFDLCtCQUErQixDQUM1QztTQUNGO1FBQ0QsUUFBUSxFQUFFO1lBQ1I7Z0JBQ0UsUUFBUSxFQUFFLHVCQUFRLENBQUMsTUFBTTtnQkFDekIsU0FBUyxFQUFFLHVCQUFlLENBQUMsSUFBSTthQUNoQztTQUNGO0tBQ0Y7SUFDRDtRQUNFLE1BQU0sRUFBRSxDQUFDLE1BQU0sQ0FBQztRQUNoQixPQUFPLEVBQUUscUJBQXFCO1FBQzlCLFdBQVcsRUFBRTtZQUNYLElBQUEsb0NBQXdCLEVBQUMsK0JBQWtCLENBQUM7WUFDNUMsSUFBQSxxQ0FBeUIsRUFDdkIsa0NBQXFCLEVBQ3JCLFdBQVcsQ0FBQywrQkFBK0IsQ0FDNUM7U0FDRjtRQUNELFFBQVEsRUFBRTtZQUNSO2dCQUNFLFFBQVEsRUFBRSx1QkFBUSxDQUFDLE1BQU07Z0JBQ3pCLFNBQVMsRUFBRSx1QkFBZSxDQUFDLE1BQU07YUFDbEM7U0FDRjtLQUNGO0lBQ0Q7UUFDRSxNQUFNLEVBQUUsQ0FBQyxNQUFNLENBQUM7UUFDaEIsT0FBTyxFQUFFLDZCQUE2QjtRQUN0QyxXQUFXLEVBQUU7WUFDWCxJQUFBLG9DQUF3QixFQUFDLHNDQUF5QixDQUFDO1lBQ25ELElBQUEscUNBQXlCLEVBQ3ZCLGtDQUFxQixFQUNyQixXQUFXLENBQUMsK0JBQStCLENBQzVDO1NBQ0Y7UUFDRCxRQUFRLEVBQUU7WUFDUjtnQkFDRSxRQUFRLEVBQUUsdUJBQVEsQ0FBQyxNQUFNO2dCQUN6QixTQUFTLEVBQUUsdUJBQWUsQ0FBQyxNQUFNO2FBQ2xDO1NBQ0Y7S0FDRjtJQUNEO1FBQ0UsTUFBTSxFQUFFLENBQUMsTUFBTSxDQUFDO1FBQ2hCLE9BQU8sRUFBRSxxQ0FBcUM7UUFDOUMsV0FBVyxFQUFFO1lBQ1gsSUFBQSxvQ0FBd0IsRUFBQyw2Q0FBZ0MsQ0FBQztZQUMxRCxJQUFBLHFDQUF5QixFQUN2QixrQ0FBcUIsRUFDckIsV0FBVyxDQUFDLCtCQUErQixDQUM1QztTQUNGO1FBQ0QsUUFBUSxFQUFFO1lBQ1I7Z0JBQ0UsUUFBUSxFQUFFLHVCQUFRLENBQUMsTUFBTTtnQkFDekIsU0FBUyxFQUFFLHVCQUFlLENBQUMsTUFBTTthQUNsQztTQUNGO0tBQ0Y7SUFDRDtRQUNFLE1BQU0sRUFBRSxDQUFDLE1BQU0sQ0FBQztRQUNoQixPQUFPLEVBQUUsMENBQTBDO1FBQ25ELFdBQVcsRUFBRTtZQUNYLElBQUEsb0NBQXdCLEVBQUMsa0RBQXFDLENBQUM7WUFDL0QsSUFBQSxxQ0FBeUIsRUFDdkIsa0NBQXFCLEVBQ3JCLFdBQVcsQ0FBQywrQkFBK0IsQ0FDNUM7U0FDRjtRQUNELFFBQVEsRUFBRTtZQUNSO2dCQUNFLFFBQVEsRUFBRSx1QkFBUSxDQUFDLE1BQU07Z0JBQ3pCLFNBQVMsRUFBRSx1QkFBZSxDQUFDLE1BQU07YUFDbEM7U0FDRjtLQUNGO0lBQ0Q7UUFDRSxNQUFNLEVBQUUsQ0FBQyxRQUFRLENBQUM7UUFDbEIsT0FBTyxFQUFFLDBDQUEwQztRQUNuRCxXQUFXLEVBQUU7WUFDWCxJQUFBLHFDQUF5QixFQUN2QixrQ0FBcUIsRUFDckIsV0FBVyxDQUFDLCtCQUErQixDQUM1QztTQUNGO1FBQ0QsUUFBUSxFQUFFO1lBQ1I7Z0JBQ0UsUUFBUSxFQUFFLHVCQUFRLENBQUMsTUFBTTtnQkFDekIsU0FBUyxFQUFFLHVCQUFlLENBQUMsTUFBTTthQUNsQztTQUNGO0tBQ0Y7SUFDRDtRQUNFLE1BQU0sRUFBRSxDQUFDLEtBQUssQ0FBQztRQUNmLE9BQU8sRUFBRSxnQ0FBZ0M7UUFDekMsV0FBVyxFQUFFO1lBQ1gsSUFBQSxxQ0FBeUIsRUFDdkIsa0NBQXFCLEVBQ3JCLFdBQVcsQ0FBQywrQkFBK0IsQ0FDNUM7U0FDRjtRQUNELFFBQVEsRUFBRTtZQUNSO2dCQUNFLFFBQVEsRUFBRSx1QkFBUSxDQUFDLE1BQU07Z0JBQ3pCLFNBQVMsRUFBRSx1QkFBZSxDQUFDLElBQUk7YUFDaEM7U0FDRjtLQUNGO0lBQ0Q7UUFDRSxNQUFNLEVBQUUsQ0FBQyxLQUFLLENBQUM7UUFDZixPQUFPLEVBQUUscUNBQXFDO1FBQzlDLFdBQVcsRUFBRTtZQUNYLElBQUEscUNBQXlCLEVBQ3ZCLG1DQUFzQixFQUN0QixXQUFXLENBQUMsa0NBQWtDLENBQy9DO1NBQ0Y7UUFDRCxRQUFRLEVBQUU7WUFDUjtnQkFDRSxRQUFRLEVBQUUsdUJBQVEsQ0FBQyxhQUFhO2dCQUNoQyxTQUFTLEVBQUUsdUJBQWUsQ0FBQyxJQUFJO2FBQ2hDO1NBQ0Y7S0FDRjtJQUNEO1FBQ0UsTUFBTSxFQUFFLENBQUMsS0FBSyxDQUFDO1FBQ2YsT0FBTyxFQUFFLDZCQUE2QjtRQUN0QyxXQUFXLEVBQUU7WUFDWCxJQUFBLHFDQUF5QixFQUN2QixtQ0FBc0IsRUFDdEIsV0FBVyxDQUFDLDRCQUE0QixDQUN6QztTQUNGO1FBQ0QsUUFBUSxFQUFFO1lBQ1I7Z0JBQ0UsUUFBUSxFQUFFLHVCQUFRLENBQUMsTUFBTTtnQkFDekIsU0FBUyxFQUFFLHVCQUFlLENBQUMsSUFBSTthQUNoQztZQUNEO2dCQUNFLFFBQVEsRUFBRSx1QkFBUSxDQUFDLGFBQWE7Z0JBQ2hDLFNBQVMsRUFBRSx1QkFBZSxDQUFDLElBQUk7YUFDaEM7U0FDRjtLQUNGO0lBQ0Q7UUFDRSxNQUFNLEVBQUUsQ0FBQyxNQUFNLENBQUM7UUFDaEIsT0FBTyxFQUFFLDZCQUE2QjtRQUN0QyxXQUFXLEVBQUU7WUFDWCxJQUFBLG9DQUF3QixFQUFDLCtCQUFrQixDQUFDO1NBQzdDO1FBQ0QsUUFBUSxFQUFFO1lBQ1I7Z0JBQ0UsUUFBUSxFQUFFLHVCQUFRLENBQUMsYUFBYTtnQkFDaEMsU0FBUyxFQUFFLHVCQUFlLENBQUMsTUFBTTthQUNsQztTQUNGO0tBQ0Y7SUFDRDtRQUNFLE1BQU0sRUFBRSxDQUFDLE1BQU0sQ0FBQztRQUNoQixPQUFPLEVBQUUsd0NBQXdDO1FBQ2pELFdBQVcsRUFBRTtZQUNYLElBQUEsb0NBQXdCLEVBQUMsbUNBQXNCLENBQUM7U0FDakQ7UUFDRCxRQUFRLEVBQUU7WUFDUjtnQkFDRSxRQUFRLEVBQUUsdUJBQVEsQ0FBQyxhQUFhO2dCQUNoQyxTQUFTLEVBQUUsdUJBQWUsQ0FBQyxNQUFNO2FBQ2xDO1NBQ0Y7S0FDRjtJQUNEO1FBQ0UsTUFBTSxFQUFFLENBQUMsUUFBUSxDQUFDO1FBQ2xCLE9BQU8sRUFBRSx3Q0FBd0M7UUFDakQsV0FBVyxFQUFFLEVBQUU7UUFDZixRQUFRLEVBQUU7WUFDUjtnQkFDRSxRQUFRLEVBQUUsdUJBQVEsQ0FBQyxhQUFhO2dCQUNoQyxTQUFTLEVBQUUsdUJBQWUsQ0FBQyxNQUFNO2FBQ2xDO1NBQ0Y7S0FDRjtDQUNGLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3ZlbmRvci9zZWxsZXJzL21pZGRsZXdhcmVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLG1FQUE2RDtBQUM3RCwrRkFHbUQ7QUFDbkQsbURBRzRCO0FBQzVCLHFEQUEyRDtBQUczRCw0REFBNkM7QUFDN0MsaURBQXlDO0FBQ3pDLDZDQVdxQjtBQUVSLFFBQUEsd0JBQXdCLEdBQXNCO0lBQ3pEO1FBQ0UsTUFBTSxFQUFFLENBQUMsTUFBTSxDQUFDO1FBQ2hCLE9BQU8sRUFBRSx3QkFBd0I7UUFDakMsV0FBVyxFQUFFO1lBQ1gsSUFBQSxvQ0FBd0IsRUFBQywrQkFBa0IsQ0FBQztTQUM3QztLQUNGO0lBQ0Q7UUFDRSxNQUFNLEVBQUUsQ0FBQyxLQUFLLENBQUM7UUFDZixPQUFPLEVBQUUsb0JBQW9CO1FBQzdCLFdBQVcsRUFBRTtZQUNYLElBQUEscUNBQXlCLEVBQ3ZCLGtDQUFxQixFQUNyQixXQUFXLENBQUMsK0JBQStCLENBQzVDO1NBQ0Y7UUFDRCxRQUFRLEVBQUU7WUFDUjtnQkFDRSxRQUFRLEVBQUUsaUNBQWMsQ0FBQyxNQUFNO2dCQUMvQixTQUFTLEVBQUUsdUJBQWUsQ0FBQyxJQUFJO2FBQ2hDO1NBQ0Y7S0FDRjtJQUNEO1FBQ0UsTUFBTSxFQUFFLENBQUMsTUFBTSxDQUFDO1FBQ2hCLE9BQU8sRUFBRSxvQkFBb0I7UUFDN0IsV0FBVyxFQUFFO1lBQ1gsSUFBQSxvQ0FBd0IsRUFBQywrQkFBa0IsQ0FBQztZQUM1QyxJQUFBLHFDQUF5QixFQUN2QixrQ0FBcUIsRUFDckIsV0FBVyxDQUFDLCtCQUErQixDQUM1QztTQUNGO1FBQ0QsUUFBUSxFQUFFO1lBQ1I7Z0JBQ0UsUUFBUSxFQUFFLGlDQUFjLENBQUMsTUFBTTtnQkFDL0IsU0FBUyxFQUFFLHVCQUFl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

package/.medusa/server/src/api/vendor/stores/query-config.d.ts

@@ -1,11 +1,16 @@
 export declare const vendorStoreFields: string[];
+export declare const vendorStoreDisallowedFields: string[];
 export declare const vendorStoreQueryConfig: {
     list: {
         defaults: string[];
+        allowed: string[];
+        disallowed: string[];
         isList: boolean;
     };
     retrieve: {
         defaults: string[];
+        allowed: string[];
+        disallowed: string[];
         isList: boolean;
     };
 };

package/.medusa/server/src/api/vendor/stores/query-config.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.vendorStoreQueryConfig = exports.vendorStoreFields = void 0;
+exports.vendorStoreQueryConfig = exports.vendorStoreDisallowedFields = exports.vendorStoreFields = void 0;
 exports.vendorStoreFields = [
     "id",
     "name",
@@ -13,14 +13,21 @@ exports.vendorStoreFields = [
     "created_at",
     "updated_at",
 ];
+// `allowed` only strips select fields when the `rbac_filter_fields` feature flag
+// is on; `disallowed` is stripped unconditionally.
+exports.vendorStoreDisallowedFields = ["members"];
 exports.vendorStoreQueryConfig = {
     list: {
         defaults: exports.vendorStoreFields,
+        allowed: exports.vendorStoreFields,
+        disallowed: exports.vendorStoreDisallowedFields,
         isList: true,
     },
     retrieve: {
         defaults: exports.vendorStoreFields,
+        allowed: exports.vendorStoreFields,
+        disallowed: exports.vendorStoreDisallowedFields,
         isList: false,
     },
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnktY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL2FwaS92ZW5kb3Ivc3RvcmVzL3F1ZXJ5LWNvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBYSxRQUFBLGlCQUFpQixHQUFHO0lBQy9CLElBQUk7SUFDSixNQUFNO0lBQ04sdUJBQXVCO0lBQ3ZCLGdDQUFnQztJQUNoQywwQkFBMEI7SUFDMUIsbUJBQW1CO0lBQ25CLHFCQUFxQjtJQUNyQixVQUFVO0lBQ1YsWUFBWTtJQUNaLFlBQVk7Q0FDYixDQUFBO0FBRVksUUFBQSxzQkFBc0IsR0FBRztJQUNwQyxJQUFJLEVBQUU7UUFDSixRQUFRLEVBQUUseUJBQWlCO1FBQzNCLE1BQU0sRUFBRSxJQUFJO0tBQ2I7SUFDRCxRQUFRLEVBQUU7UUFDUixRQUFRLEVBQUUseUJBQWlCO1FBQzNCLE1BQU0sRUFBRSxLQUFLO0tBQ2Q7Q0FDRixDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnktY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL2FwaS92ZW5kb3Ivc3RvcmVzL3F1ZXJ5LWNvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBYSxRQUFBLGlCQUFpQixHQUFHO0lBQy9CLElBQUk7SUFDSixNQUFNO0lBQ04sdUJBQXVCO0lBQ3ZCLGdDQUFnQztJQUNoQywwQkFBMEI7SUFDMUIsbUJBQW1CO0lBQ25CLHFCQUFxQjtJQUNyQixVQUFVO0lBQ1YsWUFBWTtJQUNaLFlBQVk7Q0FDYixDQUFBO0FBRUQsaUZBQWlGO0FBQ2pGLG1EQUFtRDtBQUN0QyxRQUFBLDJCQUEyQixHQUFHLENBQUMsU0FBUyxDQUFDLENBQUE7QUFFekMsUUFBQSxzQkFBc0IsR0FBRztJQUNwQyxJQUFJLEVBQUU7UUFDSixRQUFRLEVBQUUseUJBQWlCO1FBQzNCLE9BQU8sRUFBRSx5QkFBaUI7UUFDMUIsVUFBVSxFQUFFLG1DQUEyQjtRQUN2QyxNQUFNLEVBQUUsSUFBSTtLQUNiO0lBQ0QsUUFBUSxFQUFFO1FBQ1IsUUFBUSxFQUFFLHlCQUFpQjtRQUMzQixPQUFPLEVBQUUseUJBQWlCO1FBQzFCLFVBQVUsRUFBRSxtQ0FBMkI7UUFDdkMsTUFBTSxFQUFFLEtBQUs7S0FDZDtDQUNGLENBQUEifQ==

package/.medusa/server/src/api/vendor/stores/route.js

@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GET = void 0;
 const utils_1 = require("@medusajs/framework/utils");
 const GET = async (req, res) => {
+    const memberId = req.auth_context?.actor_id;
+    if (!memberId) {
+        throw new utils_1.MedusaError(utils_1.MedusaError.Types.UNAUTHORIZED, "You must be authenticated to access store information.");
+    }
     const query = req.scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
     const { data: stores, metadata } = await query.graph({
         entity: "store",
@@ -18,4 +22,4 @@ const GET = async (req, res) => {
     });
 };
 exports.GET = GET;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3ZlbmRvci9zdG9yZXMvcm91dGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBSUEscURBQXFFO0FBRzlELE1BQU0sR0FBRyxHQUFHLEtBQUssRUFDdEIsR0FBK0QsRUFDL0QsR0FBcUQsRUFDckQsRUFBRTtJQUNGLE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLEtBQUssQ0FBQyxDQUFBO0lBRWhFLE1BQU0sRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUNuRCxNQUFNLEVBQUUsT0FBTztRQUNmLE1BQU0sRUFBRSxHQUFHLENBQUMsV0FBVyxDQUFDLE1BQU07UUFDOUIsT0FBTyxFQUFFLEdBQUcsQ0FBQyxnQkFBZ0I7UUFDN0IsVUFBVSxFQUFFLEdBQUcsQ0FBQyxXQUFXLENBQUMsVUFBVTtLQUN2QyxDQUFDLENBQUE7SUFFRixHQUFHLENBQUMsSUFBSSxDQUFDO1FBQ1AsTUFBTTtRQUNOLEtBQUssRUFBRSxRQUFRLEVBQUUsS0FBSyxJQUFJLENBQUM7UUFDM0IsTUFBTSxFQUFFLFFBQVEsRUFBRSxJQUFJLElBQUksQ0FBQztRQUMzQixLQUFLLEVBQUUsR0FBRyxDQUFDLFdBQVcsQ0FBQyxVQUFVLENBQUMsSUFBSSxJQUFJLENBQUM7S0FDNUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFBO0FBbkJZLFFBQUEsR0FBRyxPQW1CZiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3ZlbmRvci9zdG9yZXMvcm91dGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBSUEscURBQWtGO0FBRzNFLE1BQU0sR0FBRyxHQUFHLEtBQUssRUFDdEIsR0FBK0QsRUFDL0QsR0FBcUQsRUFDckQsRUFBRTtJQUNGLE1BQU0sUUFBUSxHQUFHLEdBQUcsQ0FBQyxZQUFZLEVBQUUsUUFBUSxDQUFBO0lBRTNDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUNkLE1BQU0sSUFBSSxtQkFBVyxDQUNuQixtQkFBVyxDQUFDLEtBQUssQ0FBQyxZQUFZLEVBQzlCLHdEQUF3RCxDQUN6RCxDQUFBO0lBQ0gsQ0FBQztJQUVELE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLEtBQUssQ0FBQyxDQUFBO0lBRWhFLE1BQU0sRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUNuRCxNQUFNLEVBQUUsT0FBTztRQUNmLE1BQU0sRUFBRSxHQUFHLENBQUMsV0FBVyxDQUFDLE1BQU07UUFDOUIsT0FBTyxFQUFFLEdBQUcsQ0FBQyxnQkFBZ0I7UUFDN0IsVUFBVSxFQUFFLEdBQUcsQ0FBQyxXQUFXLENBQUMsVUFBVTtLQUN2QyxDQUFDLENBQUE7SUFFRixHQUFHLENBQUMsSUFBSSxDQUFDO1FBQ1AsTUFBTTtRQUNOLEtBQUssRUFBRSxRQUFRLEVBQUUsS0FBSyxJQUFJLENBQUM7UUFDM0IsTUFBTSxFQUFFLFFBQVEsRUFBRSxJQUFJLElBQUksQ0FBQztRQUMzQixLQUFLLEVBQUUsR0FBRyxDQUFDLFdBQVcsQ0FBQyxVQUFVLENBQUMsSUFBSSxJQUFJLENBQUM7S0FDNUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFBO0FBNUJZLFFBQUEsR0FBRyxPQTRCZiJ9

package/.medusa/server/src/modules/product-edit/migrations/Migration20260828120000.d.ts

@@ -0,0 +1,5 @@
+import { Migration } from "@medusajs/framework/mikro-orm/migrations";
+export declare class Migration20260828120000 extends Migration {
+    up(): Promise<void>;
+    down(): Promise<void>;
+}

package/.medusa/server/src/modules/product-edit/migrations/Migration20260828120000.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Migration20260828120000 = void 0;
+const migrations_1 = require("@medusajs/framework/mikro-orm/migrations");
+class Migration20260828120000 extends migrations_1.Migration {
+    async up() {
+        this.addSql(`
+      CREATE INDEX IF NOT EXISTS "IDX_product_change_product_id_status"
+        ON "product_change" ("product_id", "status")
+        WHERE "deleted_at" IS NULL;
+    `);
+    }
+    async down() {
+        this.addSql(`
+      DROP INDEX IF EXISTS "IDX_product_change_product_id_status";
+    `);
+    }
+}
+exports.Migration20260828120000 = Migration20260828120000;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWlncmF0aW9uMjAyNjA4MjgxMjAwMDAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvbW9kdWxlcy9wcm9kdWN0LWVkaXQvbWlncmF0aW9ucy9NaWdyYXRpb24yMDI2MDgyODEyMDAwMC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSx5RUFBb0U7QUFFcEUsTUFBYSx1QkFBd0IsU0FBUSxzQkFBUztJQUMzQyxLQUFLLENBQUMsRUFBRTtRQUNmLElBQUksQ0FBQyxNQUFNLENBQUM7Ozs7S0FJWCxDQUFDLENBQUE7SUFDSixDQUFDO0lBRVEsS0FBSyxDQUFDLElBQUk7UUFDakIsSUFBSSxDQUFDLE1BQU0sQ0FBQzs7S0FFWCxDQUFDLENBQUE7SUFDSixDQUFDO0NBQ0Y7QUFkRCwwREFjQyJ9

package/.medusa/server/src/modules/product-edit/models/product-change.js

@@ -47,6 +47,12 @@ const ProductChange = utils_1.model
         unique: false,
         where: "deleted_at IS NULL",
     },
+    {
+        name: "IDX_product_change_product_id_status",
+        on: ["product_id", "status"],
+        unique: false,
+        where: "deleted_at IS NULL",
+    },
 ]);
 exports.default = ProductChange;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvZHVjdC1jaGFuZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvbW9kdWxlcy9wcm9kdWN0LWVkaXQvbW9kZWxzL3Byb2R1Y3QtY2hhbmdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEscURBQWlEO0FBQ2pELDJDQUFxRDtBQUVyRCxvRkFBeUQ7QUFFekQsTUFBTSxhQUFhLEdBQUcsYUFBSztLQUN4QixNQUFNLENBQUMsZUFBZSxFQUFFO0lBQ3ZCLEVBQUUsRUFBRSxhQUFLLENBQUMsRUFBRSxDQUFDLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxDQUFDLENBQUMsVUFBVSxFQUFFO0lBQy9DLFVBQVUsRUFBRSxhQUFLLENBQUMsSUFBSSxFQUFFO0lBQ3hCLE1BQU0sRUFBRSxhQUFLO1NBQ1YsSUFBSSxDQUFDLDJCQUFtQixDQUFDO1NBQ3pCLE9BQU8sQ0FBQywyQkFBbUIsQ0FBQyxPQUFPLENBQUM7SUFDdkMsYUFBYSxFQUFFLGFBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDdEMsYUFBYSxFQUFFLGFBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDdEMsVUFBVSxFQUFFLGFBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDbkMsWUFBWSxFQUFFLGFBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDckMsWUFBWSxFQUFFLGFBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDekMsV0FBVyxFQUFFLGFBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDcEMsV0FBVyxFQUFFLGFBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDeEMsZUFBZSxFQUFFLGFBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDeEMsV0FBVyxFQUFFLGFBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDcEMsV0FBVyxFQUFFLGFBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDeEMsa0JBQWtCLEVBQUUsYUFBSyxDQUFDLElBQUksRUFBRSxDQUFDLFFBQVEsRUFBRTtJQUMzQyxrQkFBa0IsRUFBRSxhQUFLLENBQUMsUUFBUSxFQUFFLENBQUMsUUFBUSxFQUFFO0lBQy9DLHNCQUFzQixFQUFFLGFBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDL0MsUUFBUSxFQUFFLGFBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFFakMsT0FBTyxFQUFFLGFBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsK0JBQW1CLEVBQUU7UUFDaEQsUUFBUSxFQUFFLGdCQUFnQjtLQUMzQixDQUFDO0NBQ0gsQ0FBQztLQUNELFFBQVEsQ0FBQztJQUNSLE1BQU0sRUFBRSxDQUFDLFNBQVMsQ0FBQztDQUNwQixDQUFDO0tBQ0QsT0FBTyxDQUFDO0lBQ1A7UUFDRSxJQUFJLEVBQUUsMkJBQTJCO1FBQ2pDLEVBQUUsRUFBRSxDQUFDLFFBQVEsQ0FBQztRQUNkLE1BQU0sRUFBRSxLQUFLO1FBQ2IsS0FBSyxFQUFFLG9CQUFvQjtLQUM1QjtJQUNEO1FBQ0UsSUFBSSxFQUFFLCtCQUErQjtRQUNyQyxFQUFFLEVBQUUsQ0FBQyxZQUFZLENBQUM7UUFDbEIsTUFBTSxFQUFFLEtBQUs7UUFDYixLQUFLLEVBQUUsb0JBQW9CO0tBQzVCO0NBQ0YsQ0FBQyxDQUFBO0FBRUosa0JBQWUsYUFBYSxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvZHVjdC1jaGFuZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvbW9kdWxlcy9wcm9kdWN0LWVkaXQvbW9kZWxzL3Byb2R1Y3QtY2hhbmdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEscURBQWlEO0FBQ2pELDJDQUFxRDtBQUVyRCxvRkFBeUQ7QUFFekQsTUFBTSxhQUFhLEdBQUcsYUFBSztLQUN4QixNQUFNLENBQUMsZUFBZSxFQUFFO0lBQ3ZCLEVBQUUsRUFBRSxhQUFLLENBQUMsRUFBRSxDQUFDLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxDQUFDLENBQUMsVUFBVSxFQUFFO0lBQy9DLFVBQVUsRUFBRSxhQUFLLENBQUMsSUFBSSxFQUFFO0lBQ3hCLE1BQU0sRUFBRSxhQUFLO1NBQ1YsSUFBSSxDQUFDLDJCQUFtQixDQUFDO1NBQ3pCLE9BQU8sQ0FBQywyQkFBbUIsQ0FBQyxPQUFPLENBQUM7SUFDdkMsYUFBYSxFQUFFLGFBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDdEMsYUFBYSxFQUFFLGFBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDdEMsVUFBVSxFQUFFLGFBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDbkMsWUFBWSxFQUFFLGFBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDckMsWUFBWSxFQUFFLGFBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDekMsV0FBVyxFQUFFLGFBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDcEMsV0FBVyxFQUFFLGFBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDeEMsZUFBZSxFQUFFLGFBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDeEMsV0FBVyxFQUFFLGFBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDcEMsV0FBVyxFQUFFLGFBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDeEMsa0JBQWtCLEVBQUUsYUFBSyxDQUFDLElBQUksRUFBRSxDQUFDLFFBQVEsRUFBRTtJQUMzQyxrQkFBa0IsRUFBRSxhQUFLLENBQUMsUUFBUSxFQUFFLENBQUMsUUFBUSxFQUFFO0lBQy9DLHNCQUFzQixFQUFFLGFBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDL0MsUUFBUSxFQUFFLGFBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFFakMsT0FBTyxFQUFFLGFBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsK0JBQW1CLEVBQUU7UUFDaEQsUUFBUSxFQUFFLGdCQUFnQjtLQUMzQixDQUFDO0NBQ0gsQ0FBQztLQUNELFFBQVEsQ0FBQztJQUNSLE1BQU0sRUFBRSxDQUFDLFNBQVMsQ0FBQztDQUNwQixDQUFDO0tBQ0QsT0FBTyxDQUFDO0lBQ1A7UUFDRSxJQUFJLEVBQUUsMkJBQTJCO1FBQ2pDLEVBQUUsRUFBRSxDQUFDLFFBQVEsQ0FBQztRQUNkLE1BQU0sRUFBRSxLQUFLO1FBQ2IsS0FBSyxFQUFFLG9CQUFvQjtLQUM1QjtJQUNEO1FBQ0UsSUFBSSxFQUFFLCtCQUErQjtRQUNyQyxFQUFFLEVBQUUsQ0FBQyxZQUFZLENBQUM7UUFDbEIsTUFBTSxFQUFFLEtBQUs7UUFDYixLQUFLLEVBQUUsb0JBQW9CO0tBQzVCO0lBQ0Q7UUFDRSxJQUFJLEVBQUUsc0NBQXNDO1FBQzVDLEVBQUUsRUFBRSxDQUFDLFlBQVksRUFBRSxRQUFRLENBQUM7UUFDNUIsTUFBTSxFQUFFLEtBQUs7UUFDYixLQUFLLEVBQUUsb0JBQW9CO0tBQzVCO0NBQ0YsQ0FBQyxDQUFBO0FBRUosa0JBQWUsYUFBYSxDQUFBIn0=

package/.medusa/server/src/patches/apply-patch.d.ts

@@ -0,0 +1,30 @@
+export type PatchedFile = {
+    /** Path of the patched file relative to the package root. */
+    relativePath: string;
+    source: string;
+};
+/**
+ * Reads every file a patch touches and returns their patched source. Nothing is
+ * written to disk — the results are handed to the module loader hook, which
+ * compiles them in place of the originals.
+ *
+ * Returns `null` when a hunk does not apply, which is the signal that upstream
+ * has moved and the patch must be regenerated.
+ */
+export declare function readPatchedFiles(packageDir: string, patchFilePath: string): PatchedFile[] | null;
+/**
+ * True when every hunk reverses cleanly, meaning the patch is already present —
+ * the equivalent of `git apply --reverse --check`. Someone may have applied the
+ * same diff through their own package manager, which is a supported outcome
+ * rather than a conflict.
+ */
+export declare function isPatchApplied(packageDir: string, patchFilePath: string): boolean;
+/**
+ * Applies whichever patch targets `absolutePath`, if any, returning the patched
+ * source or `null` when the file is not a patch target.
+ *
+ * This is the loader-agnostic half of the system: Node's require hook and the
+ * Jest transformer both funnel through it, so a patch means the same thing in
+ * production and under test.
+ */
+export declare function patchSourceForPath(absolutePath: string, source: string): string | null;

package/.medusa/server/src/patches/apply-patch.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readPatchedFiles = readPatchedFiles;
+exports.isPatchApplied = isPatchApplied;
+exports.patchSourceForPath = patchSourceForPath;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const manifest_1 = require("./manifest");
+const unified_diff_1 = require("./unified-diff");
+/**
+ * Reads every file a patch touches and returns their patched source. Nothing is
+ * written to disk — the results are handed to the module loader hook, which
+ * compiles them in place of the originals.
+ *
+ * Returns `null` when a hunk does not apply, which is the signal that upstream
+ * has moved and the patch must be regenerated.
+ */
+function readPatchedFiles(packageDir, patchFilePath) {
+    const files = (0, unified_diff_1.parseUnifiedDiff)((0, fs_1.readFileSync)(patchFilePath, "utf8"));
+    const patched = [];
+    for (const file of files) {
+        const filePath = (0, path_1.join)(packageDir, file.path);
+        if (!(0, fs_1.existsSync)(filePath))
+            return null;
+        const result = (0, unified_diff_1.applyHunks)((0, fs_1.readFileSync)(filePath, "utf8"), file.hunks);
+        if (result === null)
+            return null;
+        patched.push({ relativePath: file.path, source: result });
+    }
+    return patched.length ? patched : null;
+}
+/**
+ * True when every hunk reverses cleanly, meaning the patch is already present —
+ * the equivalent of `git apply --reverse --check`. Someone may have applied the
+ * same diff through their own package manager, which is a supported outcome
+ * rather than a conflict.
+ */
+function isPatchApplied(packageDir, patchFilePath) {
+    const files = (0, unified_diff_1.parseUnifiedDiff)((0, fs_1.readFileSync)(patchFilePath, "utf8"));
+    for (const file of files) {
+        const filePath = (0, path_1.join)(packageDir, file.path);
+        if (!(0, fs_1.existsSync)(filePath))
+            return false;
+        const source = (0, fs_1.readFileSync)(filePath, "utf8");
+        if ((0, unified_diff_1.applyHunks)(source, (0, unified_diff_1.reverse)(file.hunks)) === null)
+            return false;
+    }
+    return true;
+}
+/**
+ * Applies whichever patch targets `absolutePath`, if any, returning the patched
+ * source or `null` when the file is not a patch target.
+ *
+ * This is the loader-agnostic half of the system: Node's require hook and the
+ * Jest transformer both funnel through it, so a patch means the same thing in
+ * production and under test.
+ */
+function patchSourceForPath(absolutePath, source) {
+    const normalized = absolutePath.split(path_1.sep).join("/");
+    for (const entry of manifest_1.PATCHES) {
+        const patchFilePath = (0, path_1.join)(__dirname, "patches", entry.file);
+        if (!(0, fs_1.existsSync)(patchFilePath))
+            continue;
+        for (const file of (0, unified_diff_1.parseUnifiedDiff)((0, fs_1.readFileSync)(patchFilePath, "utf8"))) {
+            const suffix = `${entry.package}/${file.path}`;
+            if (!normalized.endsWith(suffix))
+                continue;
+            // Already patched (a package-manager patch, or a second pass): the
+            // forward hunks will not match, and that is not an error.
+            return (0, unified_diff_1.applyHunks)(source, file.hunks);
+        }
+    }
+    return null;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwbHktcGF0Y2guanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcGF0Y2hlcy9hcHBseS1wYXRjaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQW9CQSw0Q0FrQkM7QUFRRCx3Q0FlQztBQVVELGdEQXFCQztBQTVGRCwyQkFBNkM7QUFDN0MsK0JBQWdDO0FBRWhDLHlDQUFvQztBQUNwQyxpREFBc0U7QUFRdEU7Ozs7Ozs7R0FPRztBQUNILFNBQWdCLGdCQUFnQixDQUM5QixVQUFrQixFQUNsQixhQUFxQjtJQUVyQixNQUFNLEtBQUssR0FBRyxJQUFBLCtCQUFnQixFQUFDLElBQUEsaUJBQVksRUFBQyxhQUFhLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQTtJQUNuRSxNQUFNLE9BQU8sR0FBa0IsRUFBRSxDQUFBO0lBRWpDLEtBQUssTUFBTSxJQUFJLElBQUksS0FBSyxFQUFFLENBQUM7UUFDekIsTUFBTSxRQUFRLEdBQUcsSUFBQSxXQUFJLEVBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUM1QyxJQUFJLENBQUMsSUFBQSxlQUFVLEVBQUMsUUFBUSxDQUFDO1lBQUUsT0FBTyxJQUFJLENBQUE7UUFFdEMsTUFBTSxNQUFNLEdBQUcsSUFBQSx5QkFBVSxFQUFDLElBQUEsaUJBQVksRUFBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ3JFLElBQUksTUFBTSxLQUFLLElBQUk7WUFBRSxPQUFPLElBQUksQ0FBQTtRQUVoQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUsWUFBWSxFQUFFLElBQUksQ0FBQyxJQUFJLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUE7SUFDM0QsQ0FBQztJQUVELE9BQU8sT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUE7QUFDeEMsQ0FBQztBQUVEOzs7OztHQUtHO0FBQ0gsU0FBZ0IsY0FBYyxDQUM1QixVQUFrQixFQUNsQixhQUFxQjtJQUVyQixNQUFNLEtBQUssR0FBRyxJQUFBLCtCQUFnQixFQUFDLElBQUEsaUJBQVksRUFBQyxhQUFhLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQTtJQUVuRSxLQUFLLE1BQU0sSUFBSSxJQUFJLEtBQUssRUFBRSxDQUFDO1FBQ3pCLE1BQU0sUUFBUSxHQUFHLElBQUEsV0FBSSxFQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDNUMsSUFBSSxDQUFDLElBQUEsZUFBVSxFQUFDLFFBQVEsQ0FBQztZQUFFLE9BQU8sS0FBSyxDQUFBO1FBRXZDLE1BQU0sTUFBTSxHQUFHLElBQUEsaUJBQVksRUFBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUE7UUFDN0MsSUFBSSxJQUFBLHlCQUFVLEVBQUMsTUFBTSxFQUFFLElBQUEsc0JBQU8sRUFBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxJQUFJO1lBQUUsT0FBTyxLQUFLLENBQUE7SUFDcEUsQ0FBQztJQUVELE9BQU8sSUFBSSxDQUFBO0FBQ2IsQ0FBQztBQUVEOzs7Ozs7O0dBT0c7QUFDSCxTQUFnQixrQkFBa0IsQ0FDaEMsWUFBb0IsRUFDcEIsTUFBYztJQUVkLE1BQU0sVUFBVSxHQUFHLFlBQVksQ0FBQyxLQUFLLENBQUMsVUFBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBRXBELEtBQUssTUFBTSxLQUFLLElBQUksa0JBQU8sRUFBRSxDQUFDO1FBQzVCLE1BQU0sYUFBYSxHQUFHLElBQUEsV0FBSSxFQUFDLFNBQVMsRUFBRSxTQUFTLEVBQUUsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFBO1FBQzVELElBQUksQ0FBQyxJQUFBLGVBQVUsRUFBQyxhQUFhLENBQUM7WUFBRSxTQUFRO1FBRXhDLEtBQUssTUFBTSxJQUFJLElBQUksSUFBQSwrQkFBZ0IsRUFBQyxJQUFBLGlCQUFZLEVBQUMsYUFBYSxFQUFFLE1BQU0sQ0FBQyxDQUFDLEVBQUUsQ0FBQztZQUN6RSxNQUFNLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxPQUFPLElBQUksSUFBSSxDQUFDLElBQUksRUFBRSxDQUFBO1lBQzlDLElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQztnQkFBRSxTQUFRO1lBRTFDLG1FQUFtRTtZQUNuRSwwREFBMEQ7WUFDMUQsT0FBTyxJQUFBLHlCQUFVLEVBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUN2QyxDQUFDO0lBQ0gsQ0FBQztJQUVELE9BQU8sSUFBSSxDQUFBO0FBQ2IsQ0FBQyJ9

package/.medusa/server/src/patches/index.d.ts

@@ -0,0 +1,7 @@
+export type ApplyPatchesOptions = {
+    /** Patch file names to skip, for adopters who need to opt out of one. */
+    disabled?: string[];
+    logger?: Pick<Console, "info" | "warn">;
+};
+export declare function applyMercurPatches(options?: ApplyPatchesOptions): void;
+export { PATCHES } from "./manifest";

package/.medusa/server/src/patches/index.js

@@ -0,0 +1,110 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PATCHES = void 0;
+exports.applyMercurPatches = applyMercurPatches;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const apply_patch_1 = require("./apply-patch");
+const loader_1 = require("./loader");
+const manifest_1 = require("./manifest");
+const resolve_package_dirs_1 = require("./resolve-package-dirs");
+const version_1 = require("./version");
+// Mercur has to correct a handful of Medusa internals that expose no hook.
+// Shipping those corrections through a package manager is not an option:
+// `templates/basic` supports bun, yarn, pnpm and npm, whose patch mechanisms are
+// mutually incompatible, and none of them reach a marketplace that installed
+// `@mercurjs/core` into an existing Medusa app.
+//
+// So the diffs live in `patches/` and are applied here, from `withMercur()`,
+// which every project calls. They travel with the package version and arrive on
+// a normal upgrade.
+//
+// Patches are applied in memory, never written to `node_modules`: a boot has no
+// business mutating installed packages, workers would race doing it, and a file
+// that has already been required cannot be un-required cleanly.
+const PATCH_DIR = (0, path_1.join)(__dirname, "patches");
+function fail(entry, copy, detail) {
+    throw new Error(`[mercur] Patch "${entry.file}" ${detail} ` +
+        `(${entry.package}@${copy.version ?? "unknown"}, ${copy.dir}).\n` +
+        `It corrects: ${entry.reason}\n` +
+        `Regenerate the patch for the installed version, or skip it via ` +
+        `projectConfig.mercur.disabledPatches — skipping restores the bug above.`);
+}
+function resolveFile(packageDir, relativePath) {
+    const filePath = (0, path_1.join)(packageDir, relativePath);
+    try {
+        return (0, fs_1.realpathSync)(filePath);
+    }
+    catch {
+        return filePath;
+    }
+}
+/**
+ * Returns true when the copy was patched. A non-primary copy that does not
+ * match is skipped rather than fatal: package-manager stores are shared between
+ * checkouts, so a sweep turns up versions this project never loads.
+ */
+function applyToCopy(entry, copy, patchFilePath) {
+    if (copy.version && !(0, version_1.isWithinRange)(copy.version, entry.compatible)) {
+        if (!copy.primary)
+            return false;
+        fail(entry, copy, `was generated against ${entry.package} >=${entry.compatible.from} ` +
+            `<${entry.compatible.to}, but ${copy.version} is what this project resolves`);
+    }
+    // Someone may have applied the same diff through their package manager. That
+    // is a supported outcome, not a conflict.
+    if ((0, apply_patch_1.isPatchApplied)(copy.dir, patchFilePath)) {
+        return true;
+    }
+    const patched = (0, apply_patch_1.readPatchedFiles)(copy.dir, patchFilePath);
+    if (!patched) {
+        if (!copy.primary)
+            return false;
+        fail(entry, copy, "no longer applies — its context has changed upstream");
+    }
+    const paths = patched.map((file) => resolveFile(copy.dir, file.relativePath));
+    const stale = paths.filter((path) => (0, loader_1.isAlreadyLoaded)(path) && !(0, loader_1.isOverridden)(path));
+    (0, loader_1.registerOverrides)(copy.dir, patched, resolveFile);
+    // Something required these modules before `withMercur()` ran, so the cache
+    // holds their unpatched source. Evict them and compile the patched source in
+    // their place; a workflow module re-registers itself under the same id, which
+    // is what makes the patch take effect on an already-loaded package.
+    if (stale.length) {
+        (0, loader_1.purgeFiles)(stale);
+        (0, loader_1.reload)(copy.dir, stale);
+    }
+    return true;
+}
+function applyMercurPatches(options = {}) {
+    const disabled = new Set(options.disabled ?? []);
+    const logger = options.logger ?? console;
+    for (const entry of manifest_1.PATCHES) {
+        if (disabled.has(entry.file)) {
+            logger.warn(`[mercur] Skipping patch "${entry.file}" (disabled). This restores the ` +
+                `upstream behaviour it corrects: ${entry.reason}`);
+            continue;
+        }
+        const patchFilePath = (0, path_1.join)(PATCH_DIR, entry.file);
+        if (!(0, fs_1.existsSync)(patchFilePath)) {
+            throw new Error(`[mercur] Patch file is missing: ${patchFilePath}`);
+        }
+        const copies = (0, resolve_package_dirs_1.resolvePackageCopies)(entry.package);
+        if (!copies.length) {
+            throw new Error(`[mercur] Patch "${entry.file}" found no installed copy of ${entry.package}.`);
+        }
+        const patchedCount = copies.filter((copy) => applyToCopy(entry, copy, patchFilePath)).length;
+        if (!patchedCount) {
+            throw new Error(`[mercur] Patch "${entry.file}" matched no installed copy of ` +
+                `${entry.package}. It corrects: ${entry.reason}`);
+        }
+        logger.info(`[mercur] Applied patch "${entry.file}" to ${patchedCount} copy/copies of ` +
+            `${entry.package}`);
+        // Load the patched package now rather than leaving it to Medusa: the
+        // override only bites on first require, so failing here keeps the failure
+        // next to the patch that caused it.
+        require(entry.package);
+    }
+}
+var manifest_2 = require("./manifest");
+Object.defineProperty(exports, "PATCHES", { enumerable: true, get: function () { return manifest_2.PATCHES; } });
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcGF0Y2hlcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUEyR0EsZ0RBOENDO0FBekpELDJCQUE2QztBQUM3QywrQkFBMkI7QUFFM0IsK0NBQWdFO0FBQ2hFLHFDQU1pQjtBQUNqQix5Q0FBcUQ7QUFDckQsaUVBQStFO0FBQy9FLHVDQUF5QztBQUV6QywyRUFBMkU7QUFDM0UseUVBQXlFO0FBQ3pFLGlGQUFpRjtBQUNqRiw2RUFBNkU7QUFDN0UsZ0RBQWdEO0FBQ2hELEVBQUU7QUFDRiw2RUFBNkU7QUFDN0UsZ0ZBQWdGO0FBQ2hGLG9CQUFvQjtBQUNwQixFQUFFO0FBQ0YsZ0ZBQWdGO0FBQ2hGLGdGQUFnRjtBQUNoRixnRUFBZ0U7QUFFaEUsTUFBTSxTQUFTLEdBQUcsSUFBQSxXQUFJLEVBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxDQUFBO0FBUTVDLFNBQVMsSUFBSSxDQUFDLEtBQWlCLEVBQUUsSUFBaUIsRUFBRSxNQUFjO0lBQ2hFLE1BQU0sSUFBSSxLQUFLLENBQ2IsbUJBQW1CLEtBQUssQ0FBQyxJQUFJLEtBQUssTUFBTSxHQUFHO1FBQ3pDLElBQUksS0FBSyxDQUFDLE9BQU8sSUFBSSxJQUFJLENBQUMsT0FBTyxJQUFJLFNBQVMsS0FBSyxJQUFJLENBQUMsR0FBRyxNQUFNO1FBQ2pFLGdCQUFnQixLQUFLLENBQUMsTUFBTSxJQUFJO1FBQ2hDLGlFQUFpRTtRQUNqRSx5RUFBeUUsQ0FDNUUsQ0FBQTtBQUNILENBQUM7QUFFRCxTQUFTLFdBQVcsQ0FBQyxVQUFrQixFQUFFLFlBQW9CO0lBQzNELE1BQU0sUUFBUSxHQUFHLElBQUEsV0FBSSxFQUFDLFVBQVUsRUFBRSxZQUFZLENBQUMsQ0FBQTtJQUMvQyxJQUFJLENBQUM7UUFDSCxPQUFPLElBQUEsaUJBQVksRUFBQyxRQUFRLENBQUMsQ0FBQTtJQUMvQixDQUFDO0lBQUMsTUFBTSxDQUFD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