npm - @mercurjs/b2c-core - Versions diffs - 1.5.0 → 1.5.1 - Mend

@mercurjs/b2c-core 1.5.0 → 1.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (72) hide show

package/.medusa/server/src/api/vendor/product-collections/validators.d.ts CHANGED Viewed

@@ -1,25 +1,414 @@
 import { z } from 'zod';
 import { VendorGetProductCategoriesProductsParams } from '../product-categories/validators';
-export type VendorGetProductCollectionsParamsType = z.infer<typeof VendorGetProductCollectionsParams>;
-export declare const VendorGetProductCollectionsParams: z.ZodObject<{
+export type VendorGetProductCollectionParamsType = z.infer<typeof VendorGetProductCollectionParams>;
+export declare const VendorGetProductCollectionParams: z.ZodObject<{
     fields: z.ZodOptional<z.ZodString>;
-} & {
-    offset: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodNumber>>, number, unknown>;
-    limit: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodNumber>>, number, unknown>;
-    order: z.ZodOptional<z.ZodString> | z.ZodDefault<z.ZodOptional<z.ZodString>>;
-    with_deleted: z.ZodEffects<z.ZodOptional<z.ZodBoolean>, boolean | undefined, unknown>;
 }, "strip", z.ZodTypeAny, {
-    offset: number;
-    limit: number;
-    order?: string | undefined;
     fields?: string | undefined;
-    with_deleted?: boolean | undefined;
 }, {
-    order?: string | undefined;
     fields?: string | undefined;
-    offset?: unknown;
-    limit?: unknown;
-    with_deleted?: unknown;
+}>;
+export declare const VendorGetProductCollectionsParamsFields: z.ZodObject<{
+    q: z.ZodOptional<z.ZodString>;
+    id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
+    title: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
+    handle: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
+    created_at: z.ZodOptional<z.ZodEffects<z.ZodOptional<z.ZodObject<{
+        $gte: z.ZodOptional<z.ZodString>;
+        $lte: z.ZodOptional<z.ZodString>;
+        $gt: z.ZodOptional<z.ZodString>;
+        $lt: z.ZodOptional<z.ZodString>;
+        $eq: z.ZodOptional<z.ZodString>;
+        $ne: z.ZodOptional<z.ZodString>;
+    }, "strip", z.ZodTypeAny, {
+        $gte?: string | undefined;
+        $lte?: string | undefined;
+        $gt?: string | undefined;
+        $lt?: string | undefined;
+        $eq?: string | undefined;
+        $ne?: string | undefined;
+    }, {
+        $gte?: string | undefined;
+        $lte?: string | undefined;
+        $gt?: string | undefined;
+        $lt?: string | undefined;
+        $eq?: string | undefined;
+        $ne?: string | undefined;
+    }>>, {
+        $gte?: string | undefined;
+        $lte?: string | undefined;
+        $gt?: string | undefined;
+        $lt?: string | undefined;
+        $eq?: string | undefined;
+        $ne?: string | undefined;
+    } | undefined, unknown>>;
+    updated_at: z.ZodOptional<z.ZodEffects<z.ZodOptional<z.ZodObject<{
+        $gte: z.ZodOptional<z.ZodString>;
+        $lte: z.ZodOptional<z.ZodString>;
+        $gt: z.ZodOptional<z.ZodString>;
+        $lt: z.ZodOptional<z.ZodString>;
+        $eq: z.ZodOptional<z.ZodString>;
+        $ne: z.ZodOptional<z.ZodString>;
+    }, "strip", z.ZodTypeAny, {
+        $gte?: string | undefined;
+        $lte?: string | undefined;
+        $gt?: string | undefined;
+        $lt?: string | undefined;
+        $eq?: string | undefined;
+        $ne?: string | undefined;
+    }, {
+        $gte?: string | undefined;
+        $lte?: string | undefined;
+        $gt?: string | undefined;
+        $lt?: string | undefined;
+        $eq?: string | undefined;
+        $ne?: string | undefined;
+    }>>, {
+        $gte?: string | undefined;
+        $lte?: string | undefined;
+        $gt?: string | undefined;
+        $lt?: string | undefined;
+        $eq?: string | undefined;
+        $ne?: string | undefined;
+    } | undefined, unknown>>;
+    deleted_at: z.ZodOptional<z.ZodEffects<z.ZodOptional<z.ZodObject<{
+        $gte: z.ZodOptional<z.ZodString>;
+        $lte: z.ZodOptional<z.ZodString>;
+        $gt: z.ZodOptional<z.ZodString>;
+        $lt: z.ZodOptional<z.ZodString>;
+        $eq: z.ZodOptional<z.ZodString>;
+        $ne: z.ZodOptional<z.ZodString>;
+    }, "strip", z.ZodTypeAny, {
+        $gte?: string | undefined;
+        $lte?: string | undefined;
+        $gt?: string | undefined;
+        $lt?: string | undefined;
+        $eq?: string | undefined;
+        $ne?: string | undefined;
+    }, {
+        $gte?: string | undefined;
+        $lte?: string | undefined;
+        $gt?: string | undefined;
+        $lt?: string | undefined;
+        $eq?: string | undefined;
+        $ne?: string | undefined;
+    }>>, {
+        $gte?: string | undefined;
+        $lte?: string | undefined;
+        $gt?: string | undefined;
+        $lt?: string | undefined;
+        $eq?: string | undefined;
+        $ne?: string | undefined;
+    } | undefined, unknown>>;
+}, "strip", z.ZodTypeAny, {
+    id?: string | string[] | undefined;
+    created_at?: {
+        $gte?: string | undefined;
+        $lte?: string | undefined;
+        $gt?: string | undefined;
+        $lt?: string | undefined;
+        $eq?: string | undefined;
+        $ne?: string | undefined;
+    } | undefined;
+    updated_at?: {
+        $gte?: string | undefined;
+        $lte?: string | undefined;
+        $gt?: string | undefined;
+        $lt?: string | undefined;
+        $eq?: string | undefined;
+        $ne?: string | undefined;
+    } | undefined;
+    deleted_at?: {
+        $gte?: string | undefined;
+        $lte?: string | undefined;
+        $gt?: string | undefined;
+        $lt?: string | undefined;
+        $eq?: string | undefined;
+        $ne?: string | undefined;
+    } | undefined;
+    handle?: string | string[] | undefined;
+    title?: string | string[] | undefined;
+    q?: string | undefined;
+}, {
+    id?: string | string[] | undefined;
+    created_at?: unknown;
+    updated_at?: unknown;
+    deleted_at?: unknown;
+    handle?: string | string[] | undefined;
+    title?: string | string[] | undefined;
+    q?: string | undefined;
+}>;
+export type VendorGetProductCollectionsParamsType = z.infer<typeof VendorGetProductCollectionsParams>;
+export declare const VendorGetProductCollectionsParams: z.ZodObject<{} & {
+    [x: string]: any;
+    $and: 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.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
+        handle: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
+        created_at: z.ZodOptional<z.ZodEffects<z.ZodOptional<z.ZodObject<{
+            $gte: z.ZodOptional<z.ZodString>;
+            $lte: z.ZodOptional<z.ZodString>;
+            $gt: z.ZodOptional<z.ZodString>;
+            $lt: z.ZodOptional<z.ZodString>;
+            $eq: z.ZodOptional<z.ZodString>;
+            $ne: z.ZodOptional<z.ZodString>;
+        }, "strip", z.ZodTypeAny, {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        }, {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        }>>, {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        } | undefined, unknown>>;
+        updated_at: z.ZodOptional<z.ZodEffects<z.ZodOptional<z.ZodObject<{
+            $gte: z.ZodOptional<z.ZodString>;
+            $lte: z.ZodOptional<z.ZodString>;
+            $gt: z.ZodOptional<z.ZodString>;
+            $lt: z.ZodOptional<z.ZodString>;
+            $eq: z.ZodOptional<z.ZodString>;
+            $ne: z.ZodOptional<z.ZodString>;
+        }, "strip", z.ZodTypeAny, {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        }, {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        }>>, {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        } | undefined, unknown>>;
+        deleted_at: z.ZodOptional<z.ZodEffects<z.ZodOptional<z.ZodObject<{
+            $gte: z.ZodOptional<z.ZodString>;
+            $lte: z.ZodOptional<z.ZodString>;
+            $gt: z.ZodOptional<z.ZodString>;
+            $lt: z.ZodOptional<z.ZodString>;
+            $eq: z.ZodOptional<z.ZodString>;
+            $ne: z.ZodOptional<z.ZodString>;
+        }, "strip", z.ZodTypeAny, {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        }, {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        }>>, {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        } | undefined, unknown>>;
+    }, "strip", z.ZodTypeAny, {
+        id?: string | string[] | undefined;
+        created_at?: {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        } | undefined;
+        updated_at?: {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        } | undefined;
+        deleted_at?: {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        } | undefined;
+        handle?: string | string[] | undefined;
+        title?: string | string[] | undefined;
+        q?: string | undefined;
+    }, {
+        id?: string | string[] | undefined;
+        created_at?: unknown;
+        updated_at?: unknown;
+        deleted_at?: unknown;
+        handle?: string | string[] | undefined;
+        title?: string | string[] | undefined;
+        q?: string | undefined;
+    }>, "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.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
+        handle: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
+        created_at: z.ZodOptional<z.ZodEffects<z.ZodOptional<z.ZodObject<{
+            $gte: z.ZodOptional<z.ZodString>;
+            $lte: z.ZodOptional<z.ZodString>;
+            $gt: z.ZodOptional<z.ZodString>;
+            $lt: z.ZodOptional<z.ZodString>;
+            $eq: z.ZodOptional<z.ZodString>;
+            $ne: z.ZodOptional<z.ZodString>;
+        }, "strip", z.ZodTypeAny, {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        }, {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        }>>, {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        } | undefined, unknown>>;
+        updated_at: z.ZodOptional<z.ZodEffects<z.ZodOptional<z.ZodObject<{
+            $gte: z.ZodOptional<z.ZodString>;
+            $lte: z.ZodOptional<z.ZodString>;
+            $gt: z.ZodOptional<z.ZodString>;
+            $lt: z.ZodOptional<z.ZodString>;
+            $eq: z.ZodOptional<z.ZodString>;
+            $ne: z.ZodOptional<z.ZodString>;
+        }, "strip", z.ZodTypeAny, {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        }, {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        }>>, {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        } | undefined, unknown>>;
+        deleted_at: z.ZodOptional<z.ZodEffects<z.ZodOptional<z.ZodObject<{
+            $gte: z.ZodOptional<z.ZodString>;
+            $lte: z.ZodOptional<z.ZodString>;
+            $gt: z.ZodOptional<z.ZodString>;
+            $lt: z.ZodOptional<z.ZodString>;
+            $eq: z.ZodOptional<z.ZodString>;
+            $ne: z.ZodOptional<z.ZodString>;
+        }, "strip", z.ZodTypeAny, {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        }, {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        }>>, {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        } | undefined, unknown>>;
+    }, "strip", z.ZodTypeAny, {
+        id?: string | string[] | undefined;
+        created_at?: {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        } | undefined;
+        updated_at?: {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        } | undefined;
+        deleted_at?: {
+            $gte?: string | undefined;
+            $lte?: string | undefined;
+            $gt?: string | undefined;
+            $lt?: string | undefined;
+            $eq?: string | undefined;
+            $ne?: string | undefined;
+        } | undefined;
+        handle?: string | string[] | undefined;
+        title?: string | string[] | undefined;
+        q?: string | undefined;
+    }, {
+        id?: string | string[] | undefined;
+        created_at?: unknown;
+        updated_at?: unknown;
+        deleted_at?: unknown;
+        handle?: string | string[] | undefined;
+        title?: string | string[] | undefined;
+        q?: string | undefined;
+    }>, "many">>>;
+}, "strip", z.ZodTypeAny, {
+    [x: string]: any;
+    $and?: unknown;
+    $or?: unknown;
+}, {
+    [x: string]: any;
+    $and?: unknown;
+    $or?: unknown;
 }>;
 export type VendorGetProductCollectionsProductsParamsType = z.infer<typeof VendorGetProductCategoriesProductsParams>;
 export declare const VendorGetProductCollectionsProductsParams: z.ZodObject<{

package/.medusa/server/src/api/vendor/product-collections/validators.js CHANGED Viewed

@@ -1,13 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VendorGetProductCollectionsProductsParams = exports.VendorGetProductCollectionsParams = void 0;
+exports.VendorGetProductCollectionsProductsParams = exports.VendorGetProductCollectionsParams = exports.VendorGetProductCollectionsParamsFields = exports.VendorGetProductCollectionParams = void 0;
+const zod_1 = require("zod");
+const common_1 = require("@medusajs/medusa/api/utils/common-validators/common");
 const validators_1 = require("@medusajs/medusa/api/utils/validators");
+const utils_1 = require("../../../shared/infra/http/utils");
+exports.VendorGetProductCollectionParams = (0, validators_1.createSelectParams)();
+exports.VendorGetProductCollectionsParamsFields = zod_1.z.object({
+    q: zod_1.z.string().optional(),
+    id: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
+    title: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
+    handle: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
+    created_at: utils_1.dateFilterSchema,
+    updated_at: utils_1.dateFilterSchema,
+    deleted_at: utils_1.dateFilterSchema
+});
 exports.VendorGetProductCollectionsParams = (0, validators_1.createFindParams)({
     limit: 20,
     offset: 0
-});
+})
+    .merge(exports.VendorGetProductCollectionsParamsFields)
+    .merge((0, common_1.applyAndAndOrOperators)(exports.VendorGetProductCollectionsParamsFields));
 exports.VendorGetProductCollectionsProductsParams = (0, validators_1.createFindParams)({
     offset: 0,
     limit: 10
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9hcGkvdmVuZG9yL3Byb2R1Y3QtY29sbGVjdGlvbnMvdmFsaWRhdG9ycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFQSxzRUFBd0U7QUFPM0QsUUFBQSxpQ0FBaUMsR0FBRyxJQUFBLDZCQUFnQixFQUFDO0lBQ2hFLEtBQUssRUFBRSxFQUFFO0lBQ1QsTUFBTSxFQUFFLENBQUM7Q0FDVixDQUFDLENBQUE7QUFLVyxRQUFBLHlDQUF5QyxHQUFHLElBQUEsNkJBQWdCLEVBQUM7SUFDeEUsTUFBTSxFQUFFLENBQUM7SUFDVCxLQUFLLEVBQUUsRUFBRTtDQUNWLENBQUMsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9hcGkvdmVuZG9yL3Byb2R1Y3QtY29sbGVjdGlvbnMvdmFsaWRhdG9ycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2QkFBdUI7QUFFdkIsZ0ZBQTRGO0FBQzVGLHNFQUc4QztBQUU5Qyw0REFBbUU7QUFNdEQsUUFBQSxnQ0FBZ0MsR0FBRyxJQUFBLCtCQUFrQixHQUFFLENBQUE7QUFFdkQsUUFBQSx1Q0FBdUMsR0FBRyxPQUFDLENBQUMsTUFBTSxDQUFDO0lBQzlELENBQUMsRUFBRSxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxFQUFFO0lBQ3hCLEVBQUUsRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsT0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRTtJQUN6RCxLQUFLLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLE9BQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxPQUFDLENBQUMsS0FBSyxDQUFDLE9BQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUU7SUFDNUQsTUFBTSxFQUFFLE9BQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxPQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFO0lBQzdELFVBQVUsRUFBRSx3QkFBZ0I7SUFDNUIsVUFBVSxFQUFFLHdCQUFnQjtJQUM1QixVQUFVLEVBQUUsd0JBQWdCO0NBQzdCLENBQUMsQ0FBQTtBQUtXLFFBQUEsaUNBQWlDLEdBQUcsSUFBQSw2QkFBZ0IsRUFBQztJQUNoRSxLQUFLLEVBQUUsRUFBRTtJQUNULE1BQU0sRUFBRSxDQUFDO0NBQ1YsQ0FBQztLQUNDLEtBQUssQ0FBQywrQ0FBdUMsQ0FBQztLQUM5QyxLQUFLLENBQUMsSUFBQSwrQkFBc0IsRUFBQywrQ0FBdUMsQ0FBQyxDQUFDLENBQUE7QUFLNUQsUUFBQSx5Q0FBeUMsR0FBRyxJQUFBLDZCQUFnQixFQUFDO0lBQ3hFLE1BQU0sRUFBRSxDQUFDO0lBQ1QsS0FBSyxFQUFFLEVBQUU7Q0FDVixDQUFDLENBQUEifQ==

package/.medusa/server/src/api/vendor/product-tags/route.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import { AuthenticatedMedusaRequest, MedusaResponse } from '@medusajs/framework';
+import { HttpTypes } from '@medusajs/framework/types';
 /**
  * @oas [get] /vendor/product-tags
  * operationId: "VendorListProductTags"
@@ -50,4 +51,6 @@ import { AuthenticatedMedusaRequest, MedusaResponse } from '@medusajs/framework'
  *   - api_token: []
  *   - cookie_auth: []
  */
-export declare const GET: (req: AuthenticatedMedusaRequest, res: MedusaResponse) => Promise<void>;
+export declare const GET: (req: AuthenticatedMedusaRequest, res: MedusaResponse<HttpTypes.PaginatedResponse<{
+    product_tags: HttpTypes.AdminProductTag[];
+}>>) => Promise<void>;

package/.medusa/server/src/api/vendor/product-tags/route.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GET = void 0;
-const framework_1 = require("@medusajs/framework");
+const utils_1 = require("@medusajs/framework/utils");
 /**
  * @oas [get] /vendor/product-tags
  * operationId: "VendorListProductTags"
@@ -54,19 +54,19 @@ const framework_1 = require("@medusajs/framework");
  *   - cookie_auth: []
  */
 const GET = async (req, res) => {
-    const { data: product_tags, metadata } = await (0, framework_1.refetchEntities)({
+    const query = req.scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
+    const { data: product_tags, metadata } = await query.graph({
         entity: 'product_tag',
-        idOrFilter: req.filterableFields,
-        scope: req.scope,
         fields: req.queryConfig.fields,
+        filters: req.filterableFields,
         pagination: req.queryConfig.pagination
     });
     res.json({
         product_tags,
-        count: metadata?.count,
-        offset: metadata?.skip,
-        limit: metadata?.take
+        count: metadata?.count ?? product_tags.length,
+        offset: metadata?.skip ?? req.queryConfig.pagination?.skip ?? 0,
+        limit: metadata?.take ?? req.queryConfig.pagination?.take ?? 0
     });
 };
 exports.GET = GET;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3ZlbmRvci9wcm9kdWN0LXRhZ3Mvcm91dGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsbURBSTRCO0FBRTVCOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQWtERztBQUNJLE1BQU0sR0FBRyxHQUFHLEtBQUssRUFDdEIsR0FBK0IsRUFDL0IsR0FBbUIsRUFDbkIsRUFBRTtJQUNGLE1BQU0sRUFBRSxJQUFJLEVBQUUsWUFBWSxFQUFFLFFBQVEsRUFBRSxHQUFHLE1BQU0sSUFBQSwyQkFBZSxFQUFDO1FBQzdELE1BQU0sRUFBRSxhQUFhO1FBQ3JCLFVBQVUsRUFBRSxHQUFHLENBQUMsZ0JBQWdCO1FBQ2hDLEtBQUssRUFBRSxHQUFHLENBQUMsS0FBSztRQUNoQixNQUFNLEVBQUUsR0FBRyxDQUFDLFdBQVcsQ0FBQyxNQUFNO1FBQzlCLFVBQVUsRUFBRSxHQUFHLENBQUMsV0FBVyxDQUFDLFVBQVU7S0FDdkMsQ0FBQyxDQUFBO0lBRUYsR0FBRyxDQUFDLElBQUksQ0FBQztRQUNQLFlBQVk7UUFDWixLQUFLLEVBQUUsUUFBUSxFQUFFLEtBQUs7UUFDdEIsTUFBTSxFQUFFLFFBQVEsRUFBRSxJQUFJO1FBQ3RCLEtBQUssRUFBRSxRQUFRLEVBQUUsSUFBSTtLQUN0QixDQUFDLENBQUE7QUFDSixDQUFDLENBQUE7QUFsQlksUUFBQSxHQUFHLE9Ba0JmIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3ZlbmRvci9wcm9kdWN0LXRhZ3Mvcm91dGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBRUEscURBQXFFO0FBRXJFOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQWtERztBQUNJLE1BQU0sR0FBRyxHQUFHLEtBQUssRUFDdEIsR0FBK0IsRUFDL0IsR0FBK0YsRUFDL0YsRUFBRTtJQUNGLE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLEtBQUssQ0FBQyxDQUFBO0lBRWhFLE1BQU0sRUFBRSxJQUFJLEVBQUUsWUFBWSxFQUFFLFFBQVEsRUFBRSxHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUN6RCxNQUFNLEVBQUUsYUFBYTtRQUNyQixNQUFNLEVBQUUsR0FBRyxDQUFDLFdBQVcsQ0FBQyxNQUFNO1FBQzlCLE9BQU8sRUFBRSxHQUFHLENBQUMsZ0JBQWdCO1FBQzdCLFVBQVUsRUFBRSxHQUFHLENBQUMsV0FBVyxDQUFDLFVBQVU7S0FDdkMsQ0FBQyxDQUFBO0lBRUYsR0FBRyxDQUFDLElBQUksQ0FBQztRQUNQLFlBQVk7UUFDWixLQUFLLEVBQUUsUUFBUSxFQUFFLEtBQUssSUFBSSxZQUFZLENBQUMsTUFBTTtRQUM3QyxNQUFNLEVBQUUsUUFBUSxFQUFFLElBQUksSUFBSSxHQUFHLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxJQUFJLElBQUksQ0FBQztRQUMvRCxLQUFLLEVBQUUsUUFBUSxFQUFFLElBQUksSUFBSSxHQUFHLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxJQUFJLElBQUksQ0FBQztLQUMvRCxDQUFDLENBQUE7QUFDSixDQUFDLENBQUE7QUFuQlksUUFBQSxHQUFHLE9BbUJmIn0=

package/.medusa/server/src/api/vendor/products/route.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
-import { AuthenticatedMedusaRequest, MedusaRequest, MedusaResponse } from "@medusajs/framework";
-import { VendorCreateProductType, VendorGetProductParamsType } from "./validators";
+import { AuthenticatedMedusaRequest, MedusaRequest, MedusaResponse } from '@medusajs/framework';
+import { VendorCreateProductType, VendorGetProductParamsType } from './validators';
 /**
  * @oas [get] /vendor/products
  * operationId: "VendorListProducts"
@@ -7,6 +7,12 @@ import { VendorCreateProductType, VendorGetProductParamsType } from "./validator
  * description: "Retrieves a list of products for the authenticated vendor."
  * x-authenticated: true
  * parameters:
+ *   - name: q
+ *     in: query
+ *     schema:
+ *       type: string
+ *     required: false
+ *     description: Search term to filter products by title or ID.
  *   - name: offset
  *     in: query
  *     schema:

package/.medusa/server/src/api/vendor/products/route.js CHANGED Viewed

@@ -13,6 +13,12 @@ const utils_3 = require("./utils");
  * description: "Retrieves a list of products for the authenticated vendor."
  * x-authenticated: true
  * parameters:
+ *   - name: q
+ *     in: query
+ *     schema:
+ *       type: string
+ *     required: false
+ *     description: Search term to filter products by title or ID.
  *   - name: offset
  *     in: query
  *     schema:
@@ -66,14 +72,13 @@ const utils_3 = require("./utils");
  */
 const GET = async (req, res) => {
     const query = req.scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
-    const { productIds, count } = await (0, utils_3.filterProductsBySeller)(req.scope, req.filterableFields.seller_id, req.queryConfig.pagination?.skip || 0, req.queryConfig.pagination?.take || 10, req.filterableFields.sales_channel_id, req.queryConfig.pagination?.order);
-    const { seller_id, ...filters } = req.filterableFields;
+    const { productIds, count } = await (0, utils_3.filterProductsBySeller)(req.scope, req.filterableFields.seller_id, req.queryConfig.pagination?.skip || 0, req.queryConfig.pagination?.take || 10, req.filterableFields.sales_channel_id, req.queryConfig.pagination?.order, req.filterableFields.q);
     const { data: sellerProducts } = await query.graph({
-        entity: "product",
+        entity: 'product',
         fields: req.queryConfig.fields,
         filters: {
-            ...filters,
-            id: productIds,
+            ...(0, utils_1.omitDeep)(req.filterableFields, ['q', 'seller_id']),
+            id: { $in: productIds }
         },
         pagination: {
             order: req.queryConfig.pagination?.order
@@ -118,19 +123,22 @@ exports.GET = GET;
 const POST = async (req, res) => {
     const query = req.scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
     const seller = await (0, utils_2.fetchSellerByAuthActorId)(req.auth_context?.actor_id, req.scope);
-    const { additional_data, ...validatedBody } = req.validatedBody;
-    const { result: [createdProduct], } = await core_flows_1.createProductsWorkflow.run({
+    const { additional_data, variants_images, ...validatedBody } = req.validatedBody;
+    const mergedImages = (0, utils_3.mergeVariantImages)(validatedBody.images, variants_images);
+    const { result: [createdProduct] } = await core_flows_1.createProductsWorkflow.run({
         container: req.scope,
         input: {
             products: [
                 {
                     ...validatedBody,
-                    status: validatedBody.status === "draft" ? "draft" : "proposed",
-                },
+                    images: mergedImages.length ? mergedImages : undefined,
+                    status: validatedBody.status === 'draft' ? 'draft' : 'proposed'
+                }
             ],
-            additional_data: { ...additional_data, seller_id: seller.id },
-        },
+            additional_data: { ...additional_data, seller_id: seller.id }
+        }
     });
+    await (0, utils_3.assignVariantImages)(req.scope, variants_images, createdProduct);
     const eventBus = req.scope.resolve(utils_1.Modules.EVENT_BUS);
     await eventBus.emit({
         name: framework_1.ProductRequestUpdatedEvent.TO_CREATE,
@@ -139,21 +147,21 @@ const POST = async (req, res) => {
             data: {
                 data: {
                     ...createdProduct,
-                    product_id: createdProduct.id,
+                    product_id: createdProduct.id
                 },
                 submitter_id: req.auth_context.actor_id,
-                type: "product",
-                status: createdProduct.status === "draft" ? "draft" : "pending",
-            },
-        },
+                type: 'product',
+                status: createdProduct.status === 'draft' ? 'draft' : 'pending'
+            }
+        }
     });
     const product_id = createdProduct.id;
-    const { data: [product], } = await query.graph({
-        entity: "product",
+    const { data: [product] } = await query.graph({
+        entity: 'product',
         fields: req.queryConfig.fields,
-        filters: { id: product_id },
+        filters: { id: product_id }
     }, { throwIfKeyNotFound: true });
     res.status(201).json({ product });
 };
 exports.POST = POST;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3ZlbmRvci9wcm9kdWN0cy9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFLQSxxREFBK0U7QUFFL0UsNERBQXFFO0FBQ3JFLG1EQUFpRTtBQUNqRSw0REFBNEU7QUFDNUUsbUNBQThEO0FBTTlEOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0F5REc7QUFDSSxNQUFNLEdBQUcsR0FBRyxLQUFLLEVBQ3RCLEdBQThDLEVBQzlDLEdBQW1CLEVBQ25CLEVBQUU7SUFDRixNQUFNLEtBQUssR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxpQ0FBeUIsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUVqRSxNQUFNLEVBQUUsVUFBVSxFQUFFLEtBQUssRUFBRSxHQUFHLE1BQU0sSUFBQSw4QkFBc0IsRUFDeEQsR0FBRyxDQUFDLEtBQUssRUFDVCxHQUFHLENBQUMsZ0JBQWdCLENBQUMsU0FBbUIsRUFDeEMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxVQUFVLEVBQUUsSUFBSSxJQUFJLENBQUMsRUFDckMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxVQUFVLEVBQUUsSUFBSSxJQUFJLEVBQUUsRUFDdEMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLGdCQUEwQixFQUMvQyxHQUFHLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxLQUFnQyxDQUM3RCxDQUFDO0lBRUYsTUFBTSxFQUFDLFNBQVMsRUFBRSxHQUFHLE9BQU8sRUFBQyxHQUFHLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQztJQUVyRCxNQUFNLEVBQUUsSUFBSSxFQUFFLGNBQWMsRUFBRSxHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztRQUNqRCxNQUFNLEVBQUUsU0FBUztRQUNqQixNQUFNLEVBQUUsR0FBRyxDQUFDLFdBQVcsQ0FBQyxN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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3ZlbmRvci9wcm9kdWN0cy9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFLQSxxREFJa0M7QUFDbEMsNERBQW9FO0FBRXBFLG1EQUFnRTtBQUVoRSw0REFBMkU7QUFDM0UsbUNBS2dCO0FBTWhCOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0ErREc7QUFDSSxNQUFNLEdBQUcsR0FBRyxLQUFLLEVBQ3RCLEdBQThDLEVBQzlDLEdBQW1CLEVBQ25CLEVBQUU7SUFDRixNQUFNLEtBQUssR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxpQ0FBeUIsQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUVoRSxNQUFNLEVBQUUsVUFBVSxFQUFFLEtBQUssRUFBRSxHQUFHLE1BQU0sSUFBQSw4QkFBc0IsRUFDeEQsR0FBRyxDQUFDLEtBQUssRUFDVCxHQUFHLENBQUMsZ0JBQWdCLENBQUMsU0FBbUIsRUFDeEMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxVQUFVLEVBQUUsSUFBSSxJQUFJLENBQUMsRUFDckMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxVQUFVLEVBQUUsSUFBSSxJQUFJLEVBQUUsRUFDdEMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLGdCQUEwQixFQUMvQyxHQUFHLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSxLQUFnQyxFQUM1RCxHQUFHLENBQUMsZ0JBQWdCLENBQUMsQ0FBdUIsQ0FDN0MsQ0FBQTtJQUVELE1BQU0sRUFBRSxJQUFJLEVBQUUsY0FBYyxFQUFFLEdBQUcsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDO1FBQ2pELE1BQU0sRUFBRSxTQUFTO1FBQ2pCLE1BQU0sRUFBRSxHQUFHLENBQUMsV0FBVyxDQUFDLE1BQU07UUFDOUIsT0FBTyxFQUFFO1lBQ1AsR0FB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