@unchainedshop/core-assortments 4.4.0 → 4.6.0

package/lib/assortments-settings.d.ts

@@ -7,5 +7,5 @@ export interface AssortmentsSettings {
     getCachedProductIds: (assortmentId: string) => Promise<string[] | undefined>;
     configureSettings: (options: AssortmentsSettingsOptions, db: mongodb.Db) => void;
 }
-export type AssortmentsSettingsOptions = Partial<Omit<AssortmentsSettings, 'configureSettings'>>;
+export type AssortmentsSettingsOptions = Omit<Partial<AssortmentsSettings>, 'configureSettings'>;
 export declare const assortmentsSettings: AssortmentsSettings;

package/lib/db/AssortmentsCollection.d.ts

@@ -39,7 +39,6 @@ export type AssortmentFilter = {
 export type Assortment = {
     _id: string;
     isActive: boolean;
-    isBase: boolean;
     isRoot: boolean;
     meta?: any;
     sequence: number;

package/lib/db/AssortmentsCollection.js

@@ -17,6 +17,7 @@ export const AssortmentsCollection = async (db) => {
         ]);
     }
     await buildDbIndexes(Assortments, [
+        { index: { deleted: 1 } },
         { index: { isActive: 1 } },
         { index: { isRoot: 1 } },
         { index: { sequence: 1 } },

package/lib/module/configureAssortmentMediaModule.d.ts

@@ -4,8 +4,9 @@ export declare const configureAssortmentMediaModule: ({ db }: ModuleInput<Record
     findAssortmentMedia: ({ assortmentMediaId }: {
         assortmentMediaId: string;
     }) => Promise<mongodb.WithId<AssortmentMediaType> | null>;
-    findAssortmentMedias: ({ assortmentId, tags, offset, limit, }: {
-        assortmentId?: mongodb.Filter<AssortmentMediaType>["assortmentId"];
+    findAssortmentMedias: ({ assortmentId, assortmentIds, tags, offset, limit, }: {
+        assortmentId?: string;
+        assortmentIds?: string[];
         limit?: number;
         offset?: number;
         tags?: string[];
@@ -25,7 +26,10 @@ export declare const configureAssortmentMediaModule: ({ db }: ModuleInput<Record
         }[];
     }) => Promise<AssortmentMediaType[]>;
     texts: {
-        findMediaTexts: ({ assortmentMediaId }: mongodb.Filter<AssortmentMediaText>, options?: mongodb.FindOptions) => Promise<AssortmentMediaText[]>;
+        findMediaTexts: (query: {
+            assortmentMediaId?: string;
+            assortmentMediaIds?: string[];
+        }, options?: mongodb.FindOptions) => Promise<AssortmentMediaText[]>;
         findLocalizedMediaText: ({ assortmentMediaId, locale, }: {
             assortmentMediaId: string;
             locale: Intl.Locale;

package/lib/module/configureAssortmentMediaModule.js

@@ -40,8 +40,14 @@ export const configureAssortmentMediaModule = async ({ db }) => {
         findAssortmentMedia: async ({ assortmentMediaId }) => {
             return AssortmentMedia.findOne(generateDbFilterById(assortmentMediaId), {});
         },
-        findAssortmentMedias: async ({ assortmentId, tags, offset, limit, }, options) => {
-            const selector = assortmentId ? { assortmentId } : {};
+        findAssortmentMedias: async ({ assortmentId, assortmentIds, tags, offset, limit, }, options) => {
+            const selector = {};
+            if (assortmentId) {
+                selector.assortmentId = assortmentId;
+            }
+            if (assortmentIds) {
+                selector.assortmentId = { $in: assortmentIds };
+            }
             if (tags && tags.length > 0) {
                 selector.tags = { $all: tags };
             }
@@ -126,8 +132,15 @@ export const configureAssortmentMediaModule = async ({ db }) => {
             return assortmentMedias;
         },
         texts: {
-            findMediaTexts: async ({ assortmentMediaId }, options) => {
-                return AssortmentMediaTexts.find({ assortmentMediaId }, options).toArray();
+            findMediaTexts: async (query, options) => {
+                const selector = {};
+                if (query.assortmentMediaId) {
+                    selector.assortmentMediaId = query.assortmentMediaId;
+                }
+                if (query.assortmentMediaIds) {
+                    selector.assortmentMediaId = { $in: query.assortmentMediaIds };
+                }
+                return AssortmentMediaTexts.find(selector, options).toArray();
             },
             findLocalizedMediaText: async ({ assortmentMediaId, locale, }) => {
                 const text = await findLocalizedText(AssortmentMediaTexts, { assortmentMediaId }, locale);

package/lib/module/configureAssortmentTextsModule.d.ts

@@ -4,7 +4,11 @@ export declare const configureAssortmentTextsModule: ({ Assortments, AssortmentT
     Assortments: mongodb.Collection<Assortment>;
     AssortmentTexts: mongodb.Collection<AssortmentText>;
 }) => {
-    findTexts: (query: mongodb.Filter<AssortmentText>, options?: mongodb.FindOptions) => Promise<AssortmentText[]>;
+    findTexts: (query: {
+        assortmentId?: string;
+        assortmentIds?: string[];
+        queryString?: string;
+    }, options?: mongodb.FindOptions) => Promise<AssortmentText[]>;
     findLocalizedText: ({ assortmentId, locale, }: {
         assortmentId: string;
         locale: Intl.Locale;

package/lib/module/configureAssortmentTextsModule.js

@@ -74,7 +74,17 @@ export const configureAssortmentTextsModule = ({ Assortments, AssortmentTexts, }
     };
     return {
         findTexts: async (query, options) => {
-            const texts = AssortmentTexts.find(query, options);
+            const selector = {};
+            if (query.assortmentId) {
+                selector.assortmentId = query.assortmentId;
+            }
+            if (query.assortmentIds) {
+                selector.assortmentId = { $in: query.assortmentIds };
+            }
+            if (query.queryString) {
+                selector.$text = { $search: query.queryString };
+            }
+            const texts = AssortmentTexts.find(selector, options);
             return texts.toArray();
         },
         findLocalizedText: async ({ assortmentId, locale, }) => {

package/lib/module/configureAssortmentsModule.d.ts

@@ -44,7 +44,7 @@ export declare const configureAssortmentsModule: (moduleInput: ModuleInput<Assor
     }) => Promise<{
         links: AssortmentPathLink[];
     }[]>;
-    create: ({ _id, isActive, isBase, isRoot, meta, sequence, ...rest }: Omit<Assortment, "_id" | "created"> & Pick<Partial<Assortment>, "_id">) => Promise<Assortment>;
+    create: ({ _id, isActive, isRoot, meta, sequence, ...rest }: Omit<Assortment, "_id" | "created"> & Pick<Partial<Assortment>, "_id">) => Promise<Assortment>;
     update: (assortmentId: string, doc: Partial<Assortment>, options?: {
         skipInvalidation?: boolean;
     }) => Promise<mongodb.WithId<Assortment> | null>;
@@ -52,7 +52,6 @@ export declare const configureAssortmentsModule: (moduleInput: ModuleInput<Assor
         skipInvalidation?: boolean;
     }) => Promise<mongodb.WithId<Assortment> | null>;
     invalidateCache: InvalidateCacheFn;
-    setBase: (assortmentId: string) => Promise<void>;
     search: {
         findFilteredAssortments: ({ limit, offset, assortmentIds, assortmentSelector, sort, }: {
             assortmentIds: string[];
@@ -66,8 +65,9 @@ export declare const configureAssortmentsModule: (moduleInput: ModuleInput<Assor
         findAssortmentMedia: ({ assortmentMediaId }: {
             assortmentMediaId: string;
         }) => Promise<mongodb.WithId<import("../assortments-index.ts").AssortmentMediaType> | null>;
-        findAssortmentMedias: ({ assortmentId, tags, offset, limit, }: {
-            assortmentId?: mongodb.Filter<import("../assortments-index.ts").AssortmentMediaType>["assortmentId"];
+        findAssortmentMedias: ({ assortmentId, assortmentIds, tags, offset, limit, }: {
+            assortmentId?: string;
+            assortmentIds?: string[];
             limit?: number;
             offset?: number;
             tags?: string[];
@@ -87,7 +87,10 @@ export declare const configureAssortmentsModule: (moduleInput: ModuleInput<Assor
             }[];
         }) => Promise<import("../assortments-index.ts").AssortmentMediaType[]>;
         texts: {
-            findMediaTexts: ({ assortmentMediaId }: mongodb.Filter<import("../assortments-index.ts").AssortmentMediaText>, options?: mongodb.FindOptions) => Promise<import("../assortments-index.ts").AssortmentMediaText[]>;
+            findMediaTexts: (query: {
+                assortmentMediaId?: string;
+                assortmentMediaIds?: string[];
+            }, options?: mongodb.FindOptions) => Promise<import("../assortments-index.ts").AssortmentMediaText[]>;
             findLocalizedMediaText: ({ assortmentMediaId, locale, }: {
                 assortmentMediaId: string;
                 locale: Intl.Locale;
@@ -201,7 +204,11 @@ export declare const configureAssortmentsModule: (moduleInput: ModuleInput<Assor
         }) => Promise<AssortmentProduct[]>;
     };
     texts: {
-        findTexts: (query: mongodb.Filter<import("../db/AssortmentsCollection.ts").AssortmentText>, options?: mongodb.FindOptions) => Promise<import("../db/AssortmentsCollection.ts").AssortmentText[]>;
+        findTexts: (query: {
+            assortmentId?: string;
+            assortmentIds?: string[];
+            queryString?: string;
+        }, options?: mongodb.FindOptions) => Promise<import("../db/AssortmentsCollection.ts").AssortmentText[]>;
         findLocalizedText: ({ assortmentId, locale, }: {
             assortmentId: string;
             locale: Intl.Locale;

package/lib/module/configureAssortmentsModule.js

@@ -11,12 +11,7 @@ import { configureAssortmentTextsModule } from "./configureAssortmentTextsModule
 import { configureAssortmentMediaModule } from "./configureAssortmentMediaModule.js";
 import { makeAssortmentBreadcrumbsBuilder } from "../utils/breadcrumbs/makeAssortmentBreadcrumbsBuilder.js";
 const logger = createLogger('unchained:core');
-const ASSORTMENT_EVENTS = [
-    'ASSORTMENT_CREATE',
-    'ASSORTMENT_REMOVE',
-    'ASSORTMENT_SET_BASE',
-    'ASSORTMENT_UPDATE',
-];
+const ASSORTMENT_EVENTS = ['ASSORTMENT_CREATE', 'ASSORTMENT_REMOVE', 'ASSORTMENT_UPDATE'];
 export const buildFindSelector = ({ assortmentIds, assortmentSelector, slugs, tags, includeLeaves = false, includeInactive = false, queryString, }) => {
     const selector = assortmentSelector || {};
     selector.deleted = null;
@@ -202,14 +197,13 @@ export const configureAssortmentsModule = async (moduleInput) => {
             });
             return buildBreadcrumbs(params);
         },
-        create: async ({ _id, isActive = true, isBase = false, isRoot = false, meta = {}, sequence, ...rest }) => {
+        create: async ({ _id, isActive = true, isRoot = false, meta = {}, sequence, ...rest }) => {
             if (_id)
                 await Assortments.deleteOne({ _id, deleted: { $ne: null } });
             const { insertedId: assortmentId } = await Assortments.insertOne({
                 _id: _id || generateDbObjectId(),
                 created: new Date(),
                 sequence: sequence || (await Assortments.countDocuments({})) + 10,
-                isBase,
                 isActive,
                 isRoot,
                 meta,
@@ -256,21 +250,6 @@ export const configureAssortmentsModule = async (moduleInput) => {
             return deletedAssortment;
         },
         invalidateCache,
-        setBase: async (assortmentId) => {
-            await Assortments.updateMany({ isBase: true }, {
-                $set: {
-                    isBase: false,
-                    updated: new Date(),
-                },
-            });
-            await Assortments.updateOne(generateDbFilterById(assortmentId), {
-                $set: {
-                    isBase: true,
-                    updated: new Date(),
-                },
-            });
-            await emit('ASSORTMENT_SET_BASE', { assortmentId });
-        },
         search: {
             findFilteredAssortments: async ({ limit, offset, assortmentIds, assortmentSelector, sort, }) => {
                 const assortments = await findPreservingIds(Assortments)(assortmentSelector, assortmentIds, {

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@unchainedshop/core-assortments",
-  "version": "4.4.0",
+  "description": "Assortment and category management module for the Unchained Engine",
+  "version": "4.6.0",
   "main": "lib/assortments-index.js",
   "types": "lib/assortments-index.d.ts",
   "type": "module",
@@ -34,10 +35,10 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/events": "^4.4.0",
-    "@unchainedshop/file-upload": "^4.4.0",
-    "@unchainedshop/logger": "^4.4.0",
-    "@unchainedshop/utils": "^4.4.0"
+    "@unchainedshop/events": "^4.6.0",
+    "@unchainedshop/file-upload": "^4.6.0",
+    "@unchainedshop/logger": "^4.6.0",
+    "@unchainedshop/utils": "^4.6.0"
   },
   "devDependencies": {
     "@types/node": "^25.0.0",