@mercurjs/core 2.1.6 → 2.2.0-canary.11

package/.medusa/server/src/api/admin/order-groups/apply-request-filter.js

@@ -0,0 +1,140 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyRequestFilter = void 0;
+const utils_1 = require("@medusajs/framework/utils");
+const REQUEST_TYPES = ["edit", "return", "exchange", "claim"];
+const isOpenOrderChange = { status: ["requested", "pending"] };
+const isRequestedStatus = { status: "requested" };
+const respondEmpty = (req, res) => {
+    const pagination = (req.queryConfig?.pagination ?? {});
+    res.json({
+        order_groups: [],
+        count: 0,
+        offset: pagination.skip ?? 0,
+        limit: pagination.take ?? 0,
+    });
+};
+const parseRequestParam = (raw) => {
+    if (!raw) {
+        return undefined;
+    }
+    const values = Array.isArray(raw)
+        ? raw.flatMap((v) => String(v).split(","))
+        : String(raw).split(",");
+    const filtered = values
+        .map((v) => v.trim())
+        .filter((v) => REQUEST_TYPES.includes(v));
+    return filtered.length ? filtered : undefined;
+};
+const applyRequestFilter = async (req, res, next) => {
+    // Medusa's validator strips unknown query keys, so the value never lands in
+    // `filterableFields`. Read it from the raw query — same pattern used on
+    // `/admin/orders`.
+    const request = parseRequestParam(req.query.request);
+    if (!request) {
+        return next();
+    }
+    const filterableFields = req.filterableFields ?? {};
+    const query = req.scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
+    // Scope request lookups to the seller's orders when the caller also filters
+    // by seller — otherwise we scan every open order_change/return/exchange/claim
+    // row in the marketplace before narrowing.
+    const sellerId = req.query.seller_id;
+    let sellerOrderIds;
+    if (sellerId) {
+        const { data: sellerLinks } = await query.graph({
+            entity: "order_seller",
+            fields: ["order_id"],
+            filters: { seller_id: sellerId },
+        });
+        sellerOrderIds = sellerLinks.map((l) => l.order_id);
+        if (sellerOrderIds.length === 0) {
+            return respondEmpty(req, res);
+        }
+    }
+    const wantsEdit = request.includes("edit");
+    const wantsReturn = request.includes("return");
+    const wantsExchange = request.includes("exchange");
+    const wantsClaim = request.includes("claim");
+    const emptyResult = Promise.resolve({ data: [] });
+    const scopedOrderFilter = sellerOrderIds
+        ? { order_id: sellerOrderIds }
+        : {};
+    const [editRes, returnRes, exchangeRes, claimRes] = await (0, utils_1.promiseAll)([
+        wantsEdit
+            ? query.graph({
+                entity: "order_change",
+                fields: ["order_id"],
+                filters: {
+                    ...isOpenOrderChange,
+                    change_type: "edit",
+                    ...scopedOrderFilter,
+                },
+            })
+            : emptyResult,
+        wantsReturn
+            ? query.graph({
+                entity: "return",
+                fields: ["order_id"],
+                filters: { ...isRequestedStatus, ...scopedOrderFilter },
+            })
+            : emptyResult,
+        wantsExchange
+            ? query.graph({
+                entity: "order_exchange",
+                fields: ["order_id"],
+                filters: { ...isRequestedStatus, ...scopedOrderFilter },
+            })
+            : emptyResult,
+        wantsClaim
+            ? query.graph({
+                entity: "order_claim",
+                fields: ["order_id"],
+                filters: { ...isRequestedStatus, ...scopedOrderFilter },
+            })
+            : emptyResult,
+    ]);
+    const matchingOrderIds = Array.from(new Set([
+        ...editRes.data.map((c) => c.order_id),
+        ...returnRes.data.map((r) => r.order_id),
+        ...exchangeRes.data.map((e) => e.order_id),
+        ...claimRes.data.map((c) => c.order_id),
+    ]));
+    if (matchingOrderIds.length === 0) {
+        return respondEmpty(req, res);
+    }
+    // Resolve those orders back to their owning order_group via the link table.
+    const { data: links } = await query.graph({
+        entity: "order_group_order",
+        fields: ["order_group_id"],
+        filters: { order_id: matchingOrderIds },
+    });
+    const matchingOrderGroupIds = Array.from(new Set(links.map((l) => l.order_group_id)));
+    if (matchingOrderGroupIds.length === 0) {
+        return respondEmpty(req, res);
+    }
+    const existingId = filterableFields.id;
+    if (existingId !== undefined) {
+        filterableFields.$and = [
+            { id: existingId },
+            { id: matchingOrderGroupIds },
+        ];
+        delete filterableFields.id;
+    }
+    else {
+        // Medusa's QueryGraph for `order_group` treats a plain array as IN.
+        // `{$in: [...]}` returns no matches here (the entity doesn't honour
+        // the operator map for the primary key) — pass the array directly.
+        filterableFields.id = matchingOrderGroupIds;
+    }
+    // The raw `request` query param landed on `filterableFields` via the
+    // validator; the underlying order_group query doesn't recognise it.
+    // Strip it now that the filter has been turned into an `id` lookup —
+    // otherwise Medusa's QueryGraph silently filters on an unknown field and
+    // returns nothing.
+    delete filterableFields.request;
+    req.filterableFields = filterableFields;
+    return next();
+};
+exports.applyRequestFilter = applyRequestFilter;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwbHktcmVxdWVzdC1maWx0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL29yZGVyLWdyb3Vwcy9hcHBseS1yZXF1ZXN0LWZpbHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFLQSxxREFHa0M7QUFJbEMsTUFBTSxhQUFhLEdBQWtCLENBQUMsTUFBTSxFQUFFLFFBQVEsRUFBRSxVQUFVLEVBQUUsT0FBTyxDQUFDLENBQUE7QUFDNUUsTUFBTSxpQkFBaUIsR0FBRyxFQUFFLE1BQU0sRUFBRSxDQUFDLFdBQVcsRUFBRSxTQUFTLENBQUMsRUFBRSxDQUFBO0FBQzlELE1BQU0saUJBQWlCLEdBQUcsRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLENBQUE7QUFFakQsTUFBTSxZQUFZLEdBQUcsQ0FBQyxHQUErQixFQUFFLEdBQW1CLEVBQUUsRUFBRTtJQUM1RSxNQUFNLFVBQVUsR0FBRyxDQUFDLEdBQUcsQ0FBQyxXQUFXLEVBQUUsVUFBVSxJQUFJLEVBQUUsQ0FHcEQsQ0FBQTtJQUNELEdBQUcsQ0FBQyxJQUFJLENBQUM7UUFDUCxZQUFZLEVBQUUsRUFBRTtRQUNoQixLQUFLLEVBQUUsQ0FBQztRQUNSLE1BQU0sRUFBRSxVQUFVLENBQUMsSUFBSSxJQUFJLENBQUM7UUFDNUIsS0FBSyxFQUFFLFVBQVUsQ0FBQyxJQUFJLElBQUksQ0FBQztLQUM1QixDQUFDLENBQUE7QUFDSixDQUFDLENBQUE7QUFFRCxNQUFNLGlCQUFpQixHQUFHLENBQUMsR0FBWSxFQUE2QixFQUFFO0lBQ3BFLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUNULE9BQU8sU0FBUyxDQUFBO0lBQ2xCLENBQUM7SUFDRCxNQUFNLE1BQU0sR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQztRQUMvQixDQUFDLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMs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

package/.medusa/server/src/api/admin/order-groups/middlewares.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.adminOrderGroupsMiddlewares = void 0;
 const framework_1 = require("@medusajs/framework");
+const apply_request_filter_1 = require("./apply-request-filter");
 const query_config_1 = require("./query-config");
 const validators_1 = require("./validators");
 exports.adminOrderGroupsMiddlewares = [
@@ -10,6 +11,7 @@ exports.adminOrderGroupsMiddlewares = [
         matcher: "/admin/order-groups",
         middlewares: [
             (0, framework_1.validateAndTransformQuery)(validators_1.AdminGetOrderGroupsParams, query_config_1.adminOrderGroupQueryConfig.list),
+            apply_request_filter_1.applyRequestFilter,
         ],
     },
     {
@@ -20,4 +22,4 @@ exports.adminOrderGroupsMiddlewares = [
         ],
     },
 ];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL29yZGVyLWdyb3Vwcy9taWRkbGV3YXJlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtREFFNEI7QUFHNUIsaURBQTJEO0FBQzNELDZDQUdxQjtBQUVSLFFBQUEsMkJBQTJCLEdBQXNCO0lBQzVEO1FBQ0UsTUFBTSxFQUFFLENBQUMsS0FBSyxDQUFDO1FBQ2YsT0FBTyxFQUFFLHFCQUFxQjtRQUM5QixXQUFXLEVBQUU7WUFDWCxJQUFBLHFDQUF5QixFQUN2QixzQ0FBeUIsRUFDekIseUNBQTBCLENBQUMsSUFBSSxDQUNoQztTQUNGO0tBQ0Y7SUFDRDtRQUNFLE1BQU0sRUFBRSxDQUFDLEtBQUssQ0FBQztRQUNmLE9BQU8sRUFBRSx5QkFBeUI7UUFDbEMsV0FBVyxFQUFFO1lBQ1gsSUFBQSxxQ0FBeUIsRUFDdkIscUNBQXdCLEVBQ3hCLHlDQUEwQixDQUFDLFFBQVEsQ0FDcEM7U0FDRjtLQUNGO0NBQ0YsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL29yZGVyLWdyb3Vwcy9taWRkbGV3YXJlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtREFFNEI7QUFHNUIsaUVBQTJEO0FBQzNELGlEQUEyRDtBQUMzRCw2Q0FHcUI7QUFFUixRQUFBLDJCQUEyQixHQUFzQjtJQUM1RDtRQUNFLE1BQU0sRUFBRSxDQUFDLEtBQUssQ0FBQztRQUNmLE9BQU8sRUFBRSxxQkFBcUI7UUFDOUIsV0FBVyxFQUFFO1lBQ1gsSUFBQSxxQ0FBeUIsRUFDdkIsc0NBQXlCLEVBQ3pCLHlDQUEwQixDQUFDLElBQUksQ0FDaEM7WUFDRCx5Q0FBa0I7U0FDbkI7S0FDRjtJQUNEO1FBQ0UsTUFBTSxFQUFFLENBQUMsS0FBSyxDQUFDO1FBQ2YsT0FBTyxFQUFFLHlCQUF5QjtRQUNsQyxXQUFXLEVBQUU7WUFDWCxJQUFBLHFDQUF5QixFQUN2QixxQ0FBd0IsRUFDeEIseUNBQTBCLENBQUMsUUFBUSxDQUNwQztTQUNGO0tBQ0Y7Q0FDRixDQUFBIn0=

package/.medusa/server/src/api/admin/order-groups/validators.d.ts

@@ -102,21 +102,26 @@ export declare const AdminGetOrderGroupsParams: z.ZodObject<{
         $lt?: any;
         $lte?: any;
     }>]>>;
+    request: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
 }, "strip", z.ZodTypeAny, {
     offset: number;
     limit: number;
+    request?: string | string[] | undefined;
+    order?: string | undefined;
+    seller_id?: string | string[] | undefined;
     id?: string | string[] | undefined;
     customer_id?: string | string[] | undefined;
     created_at?: any;
     updated_at?: any;
     status?: string | string[] | undefined;
     q?: string | undefined;
-    seller_id?: string | string[] | undefined;
     sales_channel_id?: string | string[] | undefined;
     fields?: string | undefined;
-    order?: string | undefined;
     with_deleted?: boolean | undefined;
 }, {
+    request?: string | string[] | undefined;
+    order?: string | undefined;
+    seller_id?: string | string[] | undefined;
     id?: string | string[] | undefined;
     customer_id?: string | string[] | undefined;
     created_at?: any;
@@ -125,9 +130,7 @@ export declare const AdminGetOrderGroupsParams: z.ZodObject<{
     offset?: unknown;
     limit?: unknown;
     q?: string | undefined;
-    seller_id?: string | string[] | undefined;
     sales_channel_id?: string | string[] | undefined;
     fields?: string | undefined;
-    order?: string | undefined;
     with_deleted?: unknown;
 }>;

package/.medusa/server/src/api/admin/order-groups/validators.js

@@ -16,5 +16,11 @@ exports.AdminGetOrderGroupsParams = (0, validators_1.createFindParams)({
     sales_channel_id: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
     created_at: (0, validators_1.createOperatorMap)().optional(),
     updated_at: (0, validators_1.createOperatorMap)().optional(),
+    // Mercur extension consumed by `applyRequestFilter` — filters order
+    // groups by whether any child order has an open edit / return /
+    // exchange / claim. Declared as a permissive string|array on the
+    // schema so the validator doesn't reject the raw query; the
+    // middleware does enum parsing via `parseRequestParam`.
+    request: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
 }));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9hcGkvYWRtaW4vb3JkZXItZ3JvdXBzL3ZhbGlkYXRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkJBQXVCO0FBQ3ZCLHNFQUk4QztBQUdqQyxRQUFBLHdCQUF3QixHQUFHLElBQUEsK0JBQWtCLEdBQUUsQ0FBQTtBQUcvQyxRQUFBLHlCQUF5QixHQUFHLElBQUEsNkJBQWdCLEVBQUM7SUFDeEQsTUFBTSxFQUFFLENBQUM7SUFDVCxLQUFLLEVBQUUsRUFBRTtDQUNWLENBQUMsQ0FBQyxLQUFLLENBQ04sT0FBQyxDQUFDLE1BQU0sQ0FBQztJQUNQLENBQUMsRUFBRSxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxFQUFFO0lBQ3hCLEVBQUUsRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRTtJQUN6RCxXQUFXLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLE9BQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLE9BQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUU7SUFDbEUsU0FBUyxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxPQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFO0lBQ2hFLE1BQU0sRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRTtJQUM3RCxnQkFBZ0IsRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRTtJQUN2RSxVQUFVLEVBQUUsSUFBQSw4QkFBaUIsR0FBRSxDQUFDLFFBQVEsRUFBRTtJQUMxQyxVQUFVLEVBQUUsSUFBQSw4QkFBaUIsR0FBRSxDQUFDLFFBQVEsRUFBRTtDQUMzQyxDQUFDLENBQ0gsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9hcGkvYWRtaW4vb3JkZXItZ3JvdXBzL3ZhbGlkYXRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkJBQXVCO0FBQ3ZCLHNFQUk4QztBQUdqQyxRQUFBLHdCQUF3QixHQUFHLElBQUEsK0JBQWtCLEdBQUUsQ0FBQTtBQUcvQyxRQUFBLHlCQUF5QixHQUFHLElBQUEsNkJBQWdCLEVBQUM7SUFDeEQsTUFBTSxFQUFFLENBQUM7SUFDVCxLQUFLLEVBQUUsRUFBRTtDQUNWLENBQUMsQ0FBQyxLQUFLLENBQ04sT0FBQyxDQUFDLE1BQU0sQ0FBQztJQUNQLENBQUMsRUFBRSxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxFQUFFO0lBQ3hCLEVBQUUsRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRTtJQUN6RCxXQUFXLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLE9BQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLE9BQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUU7SUFDbEUsU0FBUyxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxPQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFO0lBQ2hFLE1BQU0sRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRTtJQUM3RCxnQkFBZ0IsRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRTtJQUN2RSxVQUFVLEVBQUUsSUFBQSw4QkFBaUIsR0FBRSxDQUFDLFFBQVEsRUFBRTtJQUMxQyxVQUFVLEVBQUUsSUFBQSw4QkFBaUIsR0FBRSxDQUFDLFFBQVEsRUFBRTtJQUMxQyxvRUFBb0U7SUFDcEUsZ0VBQWdFO0lBQ2hFLGlFQUFpRTtJQUNqRSw0REFBNEQ7SUFDNUQsd0RBQXdEO0lBQ3hELE9BQU8sRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRTtDQUMvRCxDQUFDLENBQ0gsQ0FBQSJ9

package/.medusa/server/src/api/admin/orders/middlewares.d.ts

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

package/.medusa/server/src/api/admin/orders/middlewares.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.adminOrdersMiddlewares = void 0;
+const http_1 = require("@medusajs/framework/http");
+const framework_1 = require("@medusajs/framework");
+const query_config_1 = require("@medusajs/medusa/api/admin/orders/query-config");
+const disable_medusa_middlewares_1 = require("../../../utils/disable-medusa-middlewares");
+const validators_1 = require("./validators");
+const LIST_MATCHER = "/admin/orders";
+const capturedBase = (disable_medusa_middlewares_1.ORIGINAL_MIDDLEWARES["dist/api/admin/orders/middlewares.js"] ?? []);
+const baseWithoutListGet = capturedBase.filter((route) => {
+    if (route.matcher !== LIST_MATCHER)
+        return true;
+    const methods = Array.isArray(route.method)
+        ? route.method
+        : route.method
+            ? [route.method]
+            : [];
+    return !methods.includes("GET");
+});
+const maybeApplySellerOrderFilter = (req, res, next) => {
+    if (!req.filterableFields.seller_id) {
+        return next();
+    }
+    return (0, http_1.maybeApplyLinkFilter)({
+        entryPoint: "order_seller",
+        resourceId: "order_id",
+        filterableField: "seller_id",
+    })(req, res, next);
+};
+exports.adminOrdersMiddlewares = [
+    ...baseWithoutListGet,
+    {
+        method: ["GET"],
+        matcher: LIST_MATCHER,
+        middlewares: [
+            (0, framework_1.validateAndTransformQuery)(validators_1.AdminGetOrdersParams, query_config_1.listTransformQueryConfig),
+            maybeApplySellerOrderFilter,
+        ],
+    },
+];
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL29yZGVycy9taWRkbGV3YXJlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtREFNaUM7QUFDakMsbURBQStEO0FBQy9ELGlGQUF5RjtBQUV6RiwwRkFBZ0Y7QUFDaEYsNkNBQW1EO0FBRW5ELE1BQU0sWUFBWSxHQUFHLGVBQWUsQ0FBQTtBQUVwQyxNQUFNLFlBQVksR0FBRyxDQUFDLGlEQUFvQixDQUN4QyxzQ0FBc0MsQ0FDdkMsSUFBSSxFQUFFLENBQXNCLENBQUE7QUFFN0IsTUFBTSxrQkFBa0IsR0FBRyxZQUFZLENBQUMsTUFBTSxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUU7SUFDdkQsSUFBSSxLQUFLLENBQUMsT0FBTyxLQUFLLFlBQVk7UUFBRSxPQUFPLElBQUksQ0FBQTtJQUMvQyxNQUFNLE9BQU8sR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUM7UUFDekMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxNQUFNO1FBQ2QsQ0FBQyxDQUFDLEtBQUssQ0FBQyxNQUFNO1lBQ2QsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQztZQUNoQixDQUFDLENBQUMsRUFBRSxDQUFBO0lBQ04sT0FBTyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUE7QUFDakMsQ0FBQyxDQUFDLENBQUE7QUFFRixNQUFNLDJCQUEyQixHQUFHLENBQ2xDLEdBQStCLEVBQy9CLEdBQW1CLEVBQ25CLElBQXdCLEVBQ3hCLEVBQUU7SUFDRixJQUFJLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLFNBQVMsRUFBRSxDQUFDO1FBQ3BDLE9BQU8sSUFBSSxFQUFFLENBQUE7SUFDZixDQUFDO0lBRUQsT0FBTyxJQUFBLDJCQUFvQixFQUFDO1FBQzFCLFVBQVUsRUFBRSxjQUFjO1FBQzFCLFVBQVUsRUFBRSxVQUFVO1FBQ3RCLGVBQWUsRUFBRSxXQUFXO0tBQzdCLENBQUMsQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFBO0FBQ3BCLENBQUMsQ0FBQTtBQUVZLFFBQUEsc0JBQXNCLEdBQXNCO0lBQ3ZELEdBQUcsa0JBQWtCO0lBQ3JCO1FBQ0UsTUFBTSxFQUFFLENBQUMsS0FBSyxDQUFDO1FBQ2YsT0FBTyxFQUFFLFlBQVk7UUFDckIsV0FBVyxFQUFFO1lBQ1gsSUFBQSxxQ0FBeUIsRUFBQyxpQ0FBb0IsRUFBRSx1Q0FBd0IsQ0FBQztZQUN6RSwyQkFBMkI7U0FDNUI7S0FDRjtDQUNGLENBQUEifQ==

package/.medusa/server/src/api/admin/orders/resolve-order-seller-id.d.ts

@@ -0,0 +1,11 @@
+import { MedusaContainer } from "@medusajs/framework/types";
+/**
+ * Look up the seller that owns an order via the `order_seller` link.
+ * Used by admin routes that want to apply offer-aware logic for a specific
+ * seller (e.g. when resolving an `offer_id` payload — admin still needs to
+ * confirm the offer belongs to the order's seller).
+ *
+ * Returns `undefined` when the order has no seller link (legacy / unlinked
+ * orders), so callers can fall back to non-seller-scoped resolution.
+ */
+export declare const resolveOrderSellerId: (container: MedusaContainer, orderId: string) => Promise<string | undefined>;

package/.medusa/server/src/api/admin/orders/resolve-order-seller-id.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveOrderSellerId = void 0;
+const utils_1 = require("@medusajs/framework/utils");
+/**
+ * Look up the seller that owns an order via the `order_seller` link.
+ * Used by admin routes that want to apply offer-aware logic for a specific
+ * seller (e.g. when resolving an `offer_id` payload — admin still needs to
+ * confirm the offer belongs to the order's seller).
+ *
+ * Returns `undefined` when the order has no seller link (legacy / unlinked
+ * orders), so callers can fall back to non-seller-scoped resolution.
+ */
+const resolveOrderSellerId = async (container, orderId) => {
+    const query = container.resolve(utils_1.ContainerRegistrationKeys.QUERY);
+    const { data: links } = await query.graph({
+        entity: "order_seller",
+        fields: ["seller_id"],
+        filters: { order_id: orderId },
+    });
+    return links?.[0]?.seller_id;
+};
+exports.resolveOrderSellerId = resolveOrderSellerId;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzb2x2ZS1vcmRlci1zZWxsZXItaWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL29yZGVycy9yZXNvbHZlLW9yZGVyLXNlbGxlci1pZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSxxREFBcUU7QUFFckU7Ozs7Ozs7O0dBUUc7QUFDSSxNQUFNLG9CQUFvQixHQUFHLEtBQUssRUFDdkMsU0FBMEIsRUFDMUIsT0FBZSxFQUNjLEVBQUU7SUFDL0IsTUFBTSxLQUFLLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FBQyxpQ0FBeUIsQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUNoRSxNQUFNLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUN4QyxNQUFNLEVBQUUsY0FBYztRQUN0QixNQUFNLEVBQUUsQ0FBQyxXQUFXLENBQUM7UUFDckIsT0FBTyxFQUFFLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRTtLQUMvQixDQUFDLENBQUE7SUFDRixPQUFRLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBd0MsRUFBRSxTQUFTLENBQUE7QUFDdEUsQ0FBQyxDQUFBO0FBWFksUUFBQSxvQkFBb0Isd0JBV2hDIn0=

package/.medusa/server/src/api/admin/orders/validators.d.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-export declare const AdminGetOrdersParams: z.ZodEffects<z.ZodObject<{
+export declare const AdminGetOrdersParams: z.ZodEffects<z.ZodIntersection<z.ZodEffects<z.ZodObject<{
     fields: z.ZodOptional<z.ZodString>;
 } & {
     offset: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodNumber>>, number, unknown>;
@@ -212,42 +212,84 @@ export declare const AdminGetOrdersParams: z.ZodEffects<z.ZodObject<{
         $lt?: any;
         $lte?: any;
     }>]>>;
-    seller_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
 }, "strip", z.ZodTypeAny, {
     offset: number;
     limit: number;
+    total?: any;
+    order?: string | undefined;
     id?: any;
+    fields?: string | undefined;
+    name?: string | string[] | undefined;
+    created_at?: any;
+    updated_at?: any;
+    sales_channel_id?: string[] | undefined;
+    status?: any;
+    with_deleted?: boolean | undefined;
+    q?: string | undefined;
     customer_id?: string | string[] | undefined;
+    region_id?: string | string[] | undefined;
+}, {
     total?: any;
+    order?: string | undefined;
+    id?: any;
+    fields?: string | undefined;
+    name?: string | string[] | undefined;
     created_at?: any;
     updated_at?: any;
+    sales_channel_id?: string[] | undefined;
     status?: any;
+    offset?: unknown;
+    limit?: unknown;
+    with_deleted?: unknown;
     q?: string | undefined;
-    seller_id?: string | string[] | undefined;
-    sales_channel_id?: string[] | undefined;
-    fields?: string | undefined;
+    customer_id?: string | string[] | undefined;
+    region_id?: string | string[] | undefined;
+}>, {
+    summary?: {
+        totals: {
+            current_order_total: any;
+        };
+    } | undefined;
+    offset: number;
+    limit: number;
     order?: string | undefined;
-    with_deleted?: boolean | undefined;
+    id?: any;
+    fields?: string | undefined;
     name?: string | string[] | undefined;
+    created_at?: any;
+    updated_at?: any;
+    sales_channel_id?: string[] | undefined;
+    status?: any;
+    with_deleted?: boolean | undefined;
+    q?: string | undefined;
+    customer_id?: string | string[] | undefined;
     region_id?: string | string[] | undefined;
 }, {
-    id?: any;
-    customer_id?: string | string[] | undefined;
     total?: any;
+    order?: string | undefined;
+    id?: any;
+    fields?: string | undefined;
+    name?: string | string[] | undefined;
     created_at?: any;
     updated_at?: any;
+    sales_channel_id?: string[] | undefined;
     status?: any;
     offset?: unknown;
     limit?: unknown;
+    with_deleted?: unknown;
     q?: string | undefined;
+    customer_id?: string | string[] | undefined;
+    region_id?: string | string[] | undefined;
+}>, z.ZodObject<{
+    seller_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
+    name: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
+}, "strip", z.ZodTypeAny, {
     seller_id?: string | string[] | undefined;
-    sales_channel_id?: string[] | undefined;
-    fields?: string | undefined;
-    order?: string | undefined;
-    with_deleted?: unknown;
     name?: string | string[] | undefined;
-    region_id?: string | string[] | undefined;
-}>, {
+}, {
+    seller_id?: string | string[] | undefined;
+    name?: string | string[] | undefined;
+}>>, {
     summary?: {
         totals: {
             current_order_total: any;
@@ -255,35 +297,39 @@ export declare const AdminGetOrdersParams: z.ZodEffects<z.ZodObject<{
     } | undefined;
     offset: number;
     limit: number;
+    order?: string | undefined;
     id?: any;
-    customer_id?: string | string[] | undefined;
+    fields?: string | undefined;
+    name?: string | string[] | undefined;
     created_at?: any;
     updated_at?: any;
+    sales_channel_id?: string[] | undefined;
     status?: any;
+    with_deleted?: boolean | undefined;
     q?: string | undefined;
+    customer_id?: string | string[] | undefined;
+    region_id?: string | string[] | undefined;
+} & {
     seller_id?: string | string[] | undefined;
-    sales_channel_id?: string[] | undefined;
-    fields?: string | undefined;
-    order?: string | undefined;
-    with_deleted?: boolean | undefined;
     name?: string | string[] | undefined;
-    region_id?: string | string[] | undefined;
 }, {
-    id?: any;
-    customer_id?: string | string[] | undefined;
     total?: any;
+    order?: string | undefined;
+    id?: any;
+    fields?: string | undefined;
+    name?: string | string[] | undefined;
     created_at?: any;
     updated_at?: any;
+    sales_channel_id?: string[] | undefined;
     status?: any;
     offset?: unknown;
     limit?: unknown;
+    with_deleted?: unknown;
     q?: string | undefined;
+    customer_id?: string | string[] | undefined;
+    region_id?: string | string[] | undefined;
+} & {
     seller_id?: string | string[] | undefined;
-    sales_channel_id?: string[] | undefined;
-    fields?: string | undefined;
-    order?: string | undefined;
-    with_deleted?: unknown;
     name?: string | string[] | undefined;
-    region_id?: string | string[] | undefined;
 }>;
 export type AdminGetOrdersParamsType = z.infer<typeof AdminGetOrdersParams>;

package/.medusa/server/src/api/admin/orders/validators.js

@@ -2,33 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdminGetOrdersParams = void 0;
 const zod_1 = require("zod");
-const validators_1 = require("@medusajs/medusa/api/utils/validators");
-const AdminGetOrdersParamsBase = (0, validators_1.createFindParams)({
-    limit: 15,
-    offset: 0,
-}).merge(zod_1.z.object({
-    id: zod_1.z
-        .union([zod_1.z.string(), zod_1.z.array(zod_1.z.string()), (0, validators_1.createOperatorMap)()])
-        .optional(),
-    status: zod_1.z
-        .union([zod_1.z.string(), zod_1.z.array(zod_1.z.string()), (0, validators_1.createOperatorMap)()])
-        .optional(),
-    name: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
-    sales_channel_id: zod_1.z.array(zod_1.z.string()).optional(),
-    region_id: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
-    customer_id: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
-    q: zod_1.z.string().optional(),
-    created_at: (0, validators_1.createOperatorMap)().optional(),
-    updated_at: (0, validators_1.createOperatorMap)().optional(),
-    total: (0, validators_1.createOperatorMap)().optional(),
+const validators_1 = require("@medusajs/medusa/api/admin/orders/validators");
+// Core's schema is a `.transform(...)` (ZodEffects), so we can't `.merge()` on
+// it directly. Compose via intersection, then re-wrap in a noop `.transform()`
+// so `validateAndTransformQuery` accepts it (its signature requires ZodObject
+// or ZodEffects).
+exports.AdminGetOrdersParams = validators_1.AdminGetOrdersParams.and(zod_1.z.object({
     seller_id: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
-}));
-const AdminGetOrdersParamsTransform = (v) => {
-    const { total, ...rest } = v;
-    return {
-        ...rest,
-        ...(total ? { summary: { totals: { current_order_total: total } } } : {}),
-    };
-};
-exports.AdminGetOrdersParams = AdminGetOrdersParamsBase.transform(AdminGetOrdersParamsTransform);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9hcGkvYWRtaW4vb3JkZXJzL3ZhbGlkYXRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkJBQXVCO0FBQ3ZCLHNFQUEyRjtBQUUzRixNQUFNLHdCQUF3QixHQUFHLElBQUEsNkJBQWdCLEVBQUM7SUFDaEQsS0FBSyxFQUFFLEVBQUU7SUFDVCxNQUFNLEVBQUUsQ0FBQztDQUNWLENBQUMsQ0FBQyxLQUFLLENBQ04sT0FBQyxDQUFDLE1BQU0sQ0FBQztJQUNQLEVBQUUsRUFBRSxPQUFDO1NBQ0YsS0FBSyxDQUFDLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsSUFBQSw4QkFBaUIsR0FBRSxDQUFDLENBQUM7U0FDN0QsUUFBUSxFQUFFO0lBQ2IsTUFBTSxFQUFFLE9BQUM7U0FDTixLQUFLLENBQUMsQ0FBQyxPQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxJQUFBLDhCQUFpQixHQUFFLENBQUMsQ0FBQztTQUM3RCxRQUFRLEVBQUU7SUFDYixJQUFJLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLE9BQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLE9BQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUU7SUFDM0QsZ0JBQWdCLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxRQUFRLEVBQUU7SUFDaEQsU0FBUyxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxPQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFO0lBQ2hFLFdBQVcsRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRTtJQUNsRSxDQUFDLEVBQUUsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtJQUN4QixVQUFVLEVBQUUsSUFBQSw4QkFBaUIsR0FBRSxDQUFDLFFBQVEsRUFBRTtJQUMxQyxVQUFVLEVBQUUsSUFBQSw4QkFBaUIsR0FBRSxDQUFDLFFBQVEsRUFBRTtJQUMxQyxLQUFLLEVBQUUsSUFBQSw4QkFBaUIsR0FBRSxDQUFDLFFBQVEsRUFBRTtJQUNyQyxTQUFTLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLE9BQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLE9BQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUU7Q0FDakUsQ0FBQyxDQUNILENBQUE7QUFJRCxNQUFNLDZCQUE2QixHQUFHLENBQUMsQ0FBNEIsRUFBRSxFQUFFO0lBQ3JFLE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUE7SUFDNUIsT0FBTztRQUNMLEdBQUcsSUFBSTtRQUNQLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLEVBQUUsTUFBTSxFQUFFLEVBQUUsbUJBQW1CLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7S0FDMUUsQ0FBQTtBQUNILENBQUMsQ0FBQTtBQUVZLFFBQUEsb0JBQW9CLEdBQUcsd0JBQXdCLENBQUMsU0FBUyxDQUNwRSw2QkFBNkIsQ0FDOUIsQ0FBQSJ9
+    name: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
+})).transform((v) => v);
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9hcGkvYWRtaW4vb3JkZXJzL3ZhbGlkYXRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkJBQXVCO0FBRXZCLDZFQUErRztBQUUvRywrRUFBK0U7QUFDL0UsK0VBQStFO0FBQy9FLDhFQUE4RTtBQUM5RSxrQkFBa0I7QUFDTCxRQUFBLG9CQUFvQixHQUFHLGlDQUF3QixDQUFDLEdBQUcsQ0FDOUQsT0FBQyxDQUFDLE1BQU0sQ0FBQztJQUNQLFNBQVMsRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRTtJQUNoRSxJQUFJLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLE9BQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLE9BQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUU7Q0FDNUQsQ0FBQyxDQUNILENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQSJ9

package/.medusa/server/src/api/admin/payouts/validators.d.ts

@@ -102,15 +102,16 @@ export declare const AdminGetPayoutsParams: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     offset: number;
     limit: number;
+    order?: string | undefined;
     id?: string | string[] | undefined;
     created_at?: any;
     updated_at?: any;
     status?: string | string[] | undefined;
     fields?: string | undefined;
-    order?: string | undefined;
     with_deleted?: boolean | undefined;
     account_id?: string | string[] | undefined;
 }, {
+    order?: string | undefined;
     id?: string | string[] | undefined;
     created_at?: any;
     updated_at?: any;
@@ -118,7 +119,6 @@ export declare const AdminGetPayoutsParams: z.ZodObject<{
     offset?: unknown;
     limit?: unknown;
     fields?: string | undefined;
-    order?: string | undefined;
     with_deleted?: unknown;
     account_id?: string | string[] | undefined;
 }>;

package/.medusa/server/src/api/admin/product-attributes/[id]/route.d.ts

@@ -0,0 +1,7 @@
+import { AuthenticatedMedusaRequest, MedusaResponse } from "@medusajs/framework/http";
+import { AdditionalData } from "@medusajs/framework/types";
+import { HttpTypes } from "@mercurjs/types";
+import { AdminUpdateProductAttributeType } from "../validators";
+export declare const GET: (req: AuthenticatedMedusaRequest, res: MedusaResponse<HttpTypes.AdminProductAttributeResponse>) => Promise<void>;
+export declare const POST: (req: AuthenticatedMedusaRequest<AdminUpdateProductAttributeType & AdditionalData>, res: MedusaResponse<HttpTypes.AdminProductAttributeResponse>) => Promise<void>;
+export declare const DELETE: (req: AuthenticatedMedusaRequest, res: MedusaResponse<HttpTypes.AdminProductAttributeDeleteResponse>) => Promise<void>;

package/.medusa/server/src/api/admin/product-attributes/[id]/route.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DELETE = exports.POST = exports.GET = void 0;
+const utils_1 = require("@medusajs/framework/utils");
+const delete_product_attributes_1 = require("../../../../workflows/product-attribute/workflows/delete-product-attributes");
+const update_product_attributes_1 = require("../../../../workflows/product-attribute/workflows/update-product-attributes");
+const GET = async (req, res) => {
+    const query = req.scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
+    const { data: [product_attribute], } = await query.graph({
+        entity: "product_attribute",
+        fields: req.queryConfig.fields,
+        filters: { id: req.params.id },
+    });
+    if (!product_attribute) {
+        throw new utils_1.MedusaError(utils_1.MedusaError.Types.NOT_FOUND, `Product attribute with id ${req.params.id} was not found`);
+    }
+    res.json({ product_attribute });
+};
+exports.GET = GET;
+const POST = async (req, res) => {
+    const query = req.scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
+    const { additional_data, ...update } = req.validatedBody;
+    await (0, update_product_attributes_1.updateProductAttributesWorkflow)(req.scope).run({
+        input: {
+            selector: { id: req.params.id },
+            update: update,
+        },
+    });
+    const { data: [product_attribute], } = await query.graph({
+        entity: "product_attribute",
+        fields: req.queryConfig.fields,
+        filters: { id: req.params.id },
+    });
+    if (!product_attribute) {
+        throw new utils_1.MedusaError(utils_1.MedusaError.Types.NOT_FOUND, `Product attribute with id ${req.params.id} was not found`);
+    }
+    res.json({ product_attribute });
+};
+exports.POST = POST;
+const DELETE = async (req, res) => {
+    await (0, delete_product_attributes_1.deleteProductAttributesWorkflow)(req.scope).run({
+        input: { ids: [req.params.id] },
+    });
+    res.status(200).json({
+        id: req.params.id,
+        object: "product_attribute",
+        deleted: true,
+    });
+};
+exports.DELETE = DELETE;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3Byb2R1Y3QtYXR0cmlidXRlcy9baWRdL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUlBLHFEQUdrQztBQUtsQywySEFBNkg7QUFDN0gsMkhBQTZIO0FBR3RILE1BQU0sR0FBRyxHQUFHLEtBQUssRUFDdEIsR0FBK0IsRUFDL0IsR0FBNEQsRUFDNUQsRUFBRTtJQUNGLE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLEtBQUssQ0FBQyxDQUFBO0lBRWhFLE1BQU0sRUFDSixJQUFJLEVBQUUsQ0FBQyxpQkFBaUIsQ0FBQyxHQUMxQixHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUNwQixNQUFNLEVBQUUsbUJBQW1CO1FBQzNCLE1BQU0sRUFBRSxHQUFHLENBQUMsV0FBVyxDQUFDLE1BQU07UUFDOUIsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFO0tBQy9CLENBQUMsQ0FBQTtJQUVGLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO1FBQ3ZCLE1BQU0sSUFBSSxtQkFBVyxDQUNuQixtQkFBVyxDQUFDLEtBQUssQ0FBQyxTQUFTLEVBQzNCLDZCQUE2QixHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUUsZ0JBQWdCLENBQzNELENBQUE7SUFDSCxDQUFDO0lBRUQsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLGlCQUFpQixFQUFFLENBQUMsQ0FBQTtBQUNqQyxDQUFDLENBQUE7QUF0QlksUUFBQSxHQUFHLE9Bc0JmO0FBRU0sTUFBTSxJQUFJLEdBQUcsS0FBSyxFQUN2QixHQUFpRixFQUNqRixHQUE0RCxFQUM1RCxFQUFFO0lBQ0YsTUFBTSxLQUFLLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsaUNBQXlCLENBQUMsS0FBSyxDQUFDLENBQUE7SUFFaEUsTUFBTSxFQUFFLGVBQWUsRUFBRSxHQUFHLE1BQU0sRUFBRSxHQUFHLEdBQUcsQ0FBQyxhQUFhLENBQUE7SUFFeEQsTUFBTSxJQUFBLDJEQUErQixFQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUM7UUFDbkQsS0FBSyxFQUFFO1lBQ0wsUUFBUSxFQUFFLEVBQUUsRUFBRSxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFO1lBQy9CLE1BQU0sRUFBRSxNQUFNO1NBQ2Y7S0FDRixDQUFDLENBQUE7SUFFRixNQUFNLEVBQ0osSUFBSSxFQUFFLENBQUMsaUJBQWlCLENBQUMsR0FDMUIsR0FBRyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUM7UUFDcEIsTUFBTSxFQUFFLG1CQUFtQjtRQUMzQixNQUFNLEVBQUUsR0FBRyxDQUFDLFdBQVcsQ0FBQyxNQUFNO1FBQzlCLE9BQU8sRUFBRSxFQUFFLEVBQUUsRUFBRSxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRTtLQUMvQixDQUFDLENBQUE7SUFFRixJQUFJLENBQUMsaUJBQWlCLEVBQUUsQ0FBQztRQUN2QixNQUFNLElBQUksbUJBQVcsQ0FDbkIsbUJBQVcsQ0FBQyxLQUFLLENBQUMsU0FBUyxFQUMzQiw2QkFBNkIsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLGdCQUFnQixDQUMzRCxDQUFBO0lBQ0gsQ0FBQztJQUVELEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxpQkFBaUIsRUFBRSxDQUFDLENBQUE7QUFDakMsQ0FBQyxDQUFBO0FBL0JZLFFBQUEsSUFBSSxRQStCaEI7QUFFTSxNQUFNLE1BQU0sR0FBRyxLQUFLLEVBQ3pCLEdBQStCLEVBQy9CLEdBQWtFLEVBQ2xFLEVBQUU7SUFDRixNQUFNLElBQUEsMkRBQStCLEVBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQztRQUNuRCxLQUFLLEVBQUUsRUFBRSxHQUFHLEVBQUUsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxFQUFFO0tBQ2hDLENBQUMsQ0FBQTtJQUVGLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDO1FBQ25CLEVBQUUsRUFBRSxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUU7UUFDakIsTUFBTSxFQUFFLG1CQUFtQjtRQUMzQixPQUFPLEVBQUUsSUFBSTtLQUNkLENBQUMsQ0FBQTtBQUNKLENBQUMsQ0FBQTtBQWJZLFFBQUEsTUFBTSxVQWFsQiJ9

package/.medusa/server/src/api/admin/product-attributes/[id]/values/[value_id]/route.d.ts

@@ -0,0 +1,6 @@
+import { AuthenticatedMedusaRequest, MedusaResponse } from "@medusajs/framework/http";
+import { AdditionalData } from "@medusajs/framework/types";
+import { HttpTypes } from "@mercurjs/types";
+import { AdminUpdateProductAttributeValueType } from "../../../validators";
+export declare const POST: (req: AuthenticatedMedusaRequest<AdminUpdateProductAttributeValueType & AdditionalData>, res: MedusaResponse<HttpTypes.AdminProductAttributeResponse>) => Promise<void>;
+export declare const DELETE: (req: AuthenticatedMedusaRequest, res: MedusaResponse<HttpTypes.AdminProductAttributeResponse>) => Promise<void>;