@unchainedshop/core-assortments 5.0.0-alpha.3 → 5.0.0-alpha.5

package/lib/db/AssortmentsCollection.js

@@ -37,18 +37,18 @@ export const AssortmentsCollection = async (db) => {
         { index: { locale: 1, assortmentId: 1 } },
     ]);
     await buildDbIndexes(AssortmentProducts, [
-        { index: { assortmentId: 1 } },
+        { index: { assortmentId: 1, productId: 1 } },
         { index: { productId: 1 } },
         { index: { tags: 1 } },
         { index: { assortmentId: 1, sortKey: 1 } },
-    ]);
+    ], { rebuild: false });
     await buildDbIndexes(AssortmentLinks, [
         { index: { parentAssortmentId: 1 } },
-        { index: { childAssortmentId: 1 } },
+        { index: { childAssortmentId: 1, sortKey: 1, parentAssortmentId: 1 } },
         { index: { tags: 1 } },
         { index: { parentAssortmentId: 1, sortKey: 1 } },
         { index: { childAssortmentId: 1, parentAssortmentId: 1, sortKey: 1 } },
-    ]);
+    ], { rebuild: false });
     await buildDbIndexes(AssortmentFilters, [
         { index: { assortmentId: 1 } },
         { index: { filterId: 1 } },

package/lib/module/configureAssortmentFiltersModule.js

@@ -18,7 +18,7 @@ export const configureAssortmentFiltersModule = ({ AssortmentFilters, }) => {
         },
         findFilterIds: async ({ assortmentId }) => {
             const filters = AssortmentFilters.find({ assortmentId }, {
-                sort: { sortKey: 1 },
+                sort: { sortKey: 1, _id: 1 },
                 projection: { filterId: 1 },
             }).map((filter) => filter.filterId);
             return filters.toArray();
@@ -41,7 +41,7 @@ export const configureAssortmentFiltersModule = ({ AssortmentFilters, }) => {
                 created: new Date(),
             };
             if (sortKey === undefined || sortKey === null) {
-                const lastAssortmentFilter = (await AssortmentFilters.findOne({ assortmentId }, { sort: { sortKey: -1 } })) || { sortKey: 0 };
+                const lastAssortmentFilter = (await AssortmentFilters.findOne({ assortmentId }, { sort: { sortKey: -1, _id: -1 } })) || { sortKey: 0 };
                 $setOnInsert.sortKey = lastAssortmentFilter.sortKey + 1;
             }
             else {

package/lib/module/configureAssortmentLinksModule.d.ts

@@ -9,11 +9,13 @@ export declare const configureAssortmentLinksModule: ({ AssortmentLinks, invalid
         parentAssortmentId?: string;
         childAssortmentId?: string;
     }) => Promise<mongodb.WithId<AssortmentLink> | null>;
-    findLinks: ({ assortmentId, assortmentIds, parentAssortmentId, parentAssortmentIds, }: {
+    findLinks: ({ assortmentId, assortmentIds, parentAssortmentId, parentAssortmentIds, childAssortmentId, childAssortmentIds, }: {
         assortmentId?: string;
         assortmentIds?: string[];
         parentAssortmentId?: string;
         parentAssortmentIds?: string[];
+        childAssortmentId?: string;
+        childAssortmentIds?: string[];
     }, options?: mongodb.FindOptions) => Promise<AssortmentLink[]>;
     create: (doc: Omit<AssortmentLink, "_id" | "created" | "sortKey"> & Pick<Partial<AssortmentLink>, "_id" | "created" | "sortKey">, options?: {
         skipInvalidation?: boolean;

package/lib/module/configureAssortmentLinksModule.js

@@ -15,19 +15,23 @@ export const configureAssortmentLinksModule = ({ AssortmentLinks, invalidateCach
                 ? generateDbFilterById(assortmentLinkId)
                 : { parentAssortmentId, childAssortmentId }, {});
         },
-        findLinks: async ({ assortmentId, assortmentIds, parentAssortmentId, parentAssortmentIds, }, options) => {
-            const selector = parentAssortmentId || parentAssortmentIds
-                ? {
-                    parentAssortmentId: parentAssortmentId || { $in: parentAssortmentIds },
-                }
-                : {
-                    $or: [
-                        { parentAssortmentId: assortmentId || { $in: assortmentIds } },
-                        { childAssortmentId: assortmentId || { $in: assortmentIds } },
-                    ],
-                };
+        findLinks: async ({ assortmentId, assortmentIds, parentAssortmentId, parentAssortmentIds, childAssortmentId, childAssortmentIds, }, options) => {
+            const selectors = [];
+            const parentIds = parentAssortmentId || (parentAssortmentIds && { $in: parentAssortmentIds });
+            const childIds = childAssortmentId || (childAssortmentIds && { $in: childAssortmentIds });
+            const bidirectionalIds = assortmentId || (assortmentIds && { $in: assortmentIds });
+            if (parentIds)
+                selectors.push({ parentAssortmentId: parentIds });
+            if (childIds)
+                selectors.push({ childAssortmentId: childIds });
+            if (bidirectionalIds) {
+                selectors.push({ parentAssortmentId: bidirectionalIds }, { childAssortmentId: bidirectionalIds });
+            }
+            if (!selectors.length)
+                return [];
+            const selector = selectors.length > 1 ? { $or: selectors } : selectors[0];
             const links = AssortmentLinks.find(selector, options || {
-                sort: { sortKey: 1 },
+                sort: { sortKey: 1, _id: 1 },
             });
             return links.toArray();
         },
@@ -37,7 +41,7 @@ export const configureAssortmentLinksModule = ({ AssortmentLinks, invalidateCach
                 resolveAssortmentLinks: async (id) => {
                     return AssortmentLinks.find({ childAssortmentId: id }, {
                         projection: { _id: 1, childAssortmentId: 1, parentAssortmentId: 1 },
-                        sort: { sortKey: 1, parentAssortmentId: 1 },
+                        sort: { sortKey: 1, parentAssortmentId: 1, _id: 1 },
                     }).toArray();
                 },
                 assortmentId: parentAssortmentId,
@@ -56,7 +60,7 @@ export const configureAssortmentLinksModule = ({ AssortmentLinks, invalidateCach
                 created: new Date(),
             };
             if (sortKey === undefined || sortKey === null) {
-                const lastAssortmentLink = (await AssortmentLinks.findOne({ parentAssortmentId }, { sort: { sortKey: -1 } })) || { sortKey: 0 };
+                const lastAssortmentLink = (await AssortmentLinks.findOne({ parentAssortmentId }, { sort: { sortKey: -1, _id: -1 } })) || { sortKey: 0 };
                 $setOnInsert.sortKey = lastAssortmentLink.sortKey + 1;
             }
             else {

package/lib/module/configureAssortmentMediaModule.js

@@ -54,7 +54,7 @@ export const configureAssortmentMediaModule = async ({ db }) => {
             const mediaList = AssortmentMedia.find(selector, {
                 skip: offset,
                 limit,
-                sort: { sortKey: 1 },
+                sort: { sortKey: 1, _id: 1 },
                 ...options,
             });
             return mediaList.toArray();
@@ -64,7 +64,7 @@ export const configureAssortmentMediaModule = async ({ db }) => {
                 const lastAssortmentMedia = (await AssortmentMedia.findOne({
                     assortmentId: doc.assortmentId,
                 }, {
-                    sort: { sortKey: -1 },
+                    sort: { sortKey: -1, _id: -1 },
                 })) || { sortKey: 0 };
                 sortKey = lastAssortmentMedia.sortKey + 1;
             }

package/lib/module/configureAssortmentProductsModule.d.ts

@@ -25,7 +25,7 @@ export declare const configureAssortmentProductsModule: ({ AssortmentProducts, i
         productId: string;
         assortmentIds: string[];
     }) => Promise<string[]>;
-    create: (doc: Omit<AssortmentProduct, "_id" | "created" | "sortKey"> & Partial<Pick<AssortmentProduct, "_id" | "created" | "sortKey">>, options?: {
+    create: (doc: Omit<AssortmentProduct, "_id" | "created" | "sortKey" | "tags"> & Partial<Pick<AssortmentProduct, "_id" | "created" | "sortKey" | "tags">>, options?: {
         skipInvalidation?: boolean;
     }) => Promise<mongodb.WithId<AssortmentProduct> | null>;
     delete: (assortmentProductId: string, options?: {

package/lib/module/configureAssortmentProductsModule.js

@@ -46,7 +46,7 @@ export const configureAssortmentProductsModule = ({ AssortmentProducts, invalida
                 assortmentId: { $in: assortmentIds },
                 productId: { $ne: productId },
             }, {
-                sort: { sortKey: 1 },
+                sort: { sortKey: 1, _id: 1 },
                 projection: { productId: 1 },
             }).toArray();
             return assortmentProducts.map((product) => product.productId);
@@ -69,7 +69,7 @@ export const configureAssortmentProductsModule = ({ AssortmentProducts, invalida
                 created: new Date(),
             };
             if (sortKey === undefined || sortKey === null) {
-                const lastAssortmentProduct = (await AssortmentProducts.findOne({ assortmentId }, { sort: { sortKey: -1 } })) || { sortKey: 0 };
+                const lastAssortmentProduct = (await AssortmentProducts.findOne({ assortmentId }, { sort: { sortKey: -1, _id: -1 } })) || { sortKey: 0 };
                 $setOnInsert.sortKey = lastAssortmentProduct.sortKey + 1;
             }
             else {

package/lib/module/configureAssortmentsModule.d.ts

@@ -52,6 +52,21 @@ export declare const configureAssortmentsModule: (moduleInput: ModuleInput<Assor
         skipInvalidation?: boolean;
     }) => Promise<mongodb.WithId<Assortment> | null>;
     invalidateCache: InvalidateCacheFn;
+    bulkDelete: (assortmentIds: string[]) => Promise<{
+        successIds: string[];
+        failedIds: string[];
+    }>;
+    bulkSetActive: (assortmentIds: string[], isActive: boolean) => Promise<{
+        successIds: string[];
+        failedIds: string[];
+    }>;
+    bulkUpdateTags: (assortmentIds: string[], { add, remove }: {
+        add?: string[];
+        remove?: string[];
+    }) => Promise<{
+        successIds: string[];
+        failedIds: string[];
+    }>;
     search: {
         findFilteredAssortments: ({ limit, offset, assortmentIds, assortmentSelector, sort, }: {
             assortmentIds: string[];
@@ -133,11 +148,13 @@ export declare const configureAssortmentsModule: (moduleInput: ModuleInput<Assor
             parentAssortmentId?: string;
             childAssortmentId?: string;
         }) => Promise<mongodb.WithId<AssortmentLink> | null>;
-        findLinks: ({ assortmentId, assortmentIds, parentAssortmentId, parentAssortmentIds, }: {
+        findLinks: ({ assortmentId, assortmentIds, parentAssortmentId, parentAssortmentIds, childAssortmentId, childAssortmentIds, }: {
             assortmentId?: string;
             assortmentIds?: string[];
             parentAssortmentId?: string;
             parentAssortmentIds?: string[];
+            childAssortmentId?: string;
+            childAssortmentIds?: string[];
         }, options?: mongodb.FindOptions) => Promise<AssortmentLink[]>;
         create: (doc: Omit<AssortmentLink, "_id" | "created" | "sortKey"> & Pick<Partial<AssortmentLink>, "_id" | "created" | "sortKey">, options?: {
             skipInvalidation?: boolean;
@@ -182,7 +199,7 @@ export declare const configureAssortmentsModule: (moduleInput: ModuleInput<Assor
             productId: string;
             assortmentIds: string[];
         }) => Promise<string[]>;
-        create: (doc: Omit<AssortmentProduct, "_id" | "created" | "sortKey"> & Partial<Pick<AssortmentProduct, "_id" | "created" | "sortKey">>, options?: {
+        create: (doc: Omit<AssortmentProduct, "_id" | "created" | "sortKey" | "tags"> & Partial<Pick<AssortmentProduct, "_id" | "created" | "sortKey" | "tags">>, options?: {
             skipInvalidation?: boolean;
         }) => Promise<mongodb.WithId<AssortmentProduct> | null>;
         delete: (assortmentProductId: string, options?: {

package/lib/module/configureAssortmentsModule.js

@@ -1,4 +1,4 @@
-import { SortDirection } from '@unchainedshop/utils';
+import { executeBulkOperation, SortDirection } from '@unchainedshop/utils';
 import { emit, registerEvents } from '@unchainedshop/events';
 import { generateDbFilterById, findPreservingIds, buildSortOptions, mongodb, generateDbObjectId, } from '@unchainedshop/mongodb';
 import { createLogger } from '@unchainedshop/logger';
@@ -49,12 +49,12 @@ export const configureAssortmentsModule = async (moduleInput) => {
         return AssortmentLinks.find({
             $or: [{ parentAssortmentId: assortment._id }, { childAssortmentId: assortment._id }],
         }, {
-            sort: { sortKey: 1 },
+            sort: { sortKey: 1, _id: 1 },
         }).toArray();
     };
     const findProductAssignments = async (assortmentId) => {
         return AssortmentProducts.find({ assortmentId }, {
-            sort: { sortKey: 1 },
+            sort: { sortKey: 1, _id: 1 },
         }).toArray();
     };
     const collectProductIdCacheTree = async (assortment) => {
@@ -123,6 +123,42 @@ export const configureAssortmentsModule = async (moduleInput) => {
         AssortmentTexts,
     });
     const assortmentMedia = await configureAssortmentMediaModule(moduleInput);
+    const updateAssortment = async (assortmentId, doc, options) => {
+        const assortment = await Assortments.findOneAndUpdate(generateDbFilterById(assortmentId), {
+            $set: {
+                updated: new Date(),
+                ...doc,
+            },
+        }, { returnDocument: 'after' });
+        if (!assortment)
+            return null;
+        await emit('ASSORTMENT_UPDATE', { assortmentId });
+        if (!options?.skipInvalidation) {
+            await invalidateCache({ assortmentIds: [assortmentId] });
+        }
+        return assortment;
+    };
+    const deleteAssortment = async (assortmentId, options) => {
+        await assortmentLinks.deleteMany({
+            $or: [{ parentAssortmentId: assortmentId }, { childAssortmentId: assortmentId }],
+        }, { skipInvalidation: true });
+        await assortmentProducts.deleteMany({ assortmentId }, { skipInvalidation: true });
+        await assortmentFilters.deleteMany({ assortmentId });
+        await assortmentTexts.deleteMany({ assortmentId });
+        await assortmentMedia.deleteMediaFiles({ assortmentId });
+        const deletedAssortment = await Assortments.findOneAndUpdate(generateDbFilterById(assortmentId), {
+            $set: {
+                deleted: new Date(),
+            },
+        }, { returnDocument: 'after' });
+        if (!deletedAssortment)
+            return null;
+        if (!options?.skipInvalidation) {
+            await invalidateCache({}, { skipUpstreamTraversal: true });
+        }
+        await emit('ASSORTMENT_REMOVE', { assortmentId });
+        return deletedAssortment;
+    };
     return {
         findAssortment: async ({ assortmentId, slug }) => {
             let selector = {};
@@ -166,7 +202,7 @@ export const configureAssortmentsModule = async (moduleInput) => {
         children: async ({ assortmentId, includeInactive, }) => {
             const links = await AssortmentLinks.find({ parentAssortmentId: assortmentId }, {
                 projection: { childAssortmentId: 1 },
-                sort: { sortKey: 1 },
+                sort: { sortKey: 1, _id: 1 },
             }).toArray();
             const assortmentIds = links.map(({ childAssortmentId }) => childAssortmentId);
             const selector = !includeInactive ? { isActive: true } : {};
@@ -182,12 +218,12 @@ export const configureAssortmentsModule = async (moduleInput) => {
         breadcrumbs: async (params, { resolveAssortmentLinks = async (id) => {
             return AssortmentLinks.find({ childAssortmentId: id }, {
                 projection: { _id: 1, childAssortmentId: 1, parentAssortmentId: 1 },
-                sort: { sortKey: 1, parentAssortmentId: 1 },
+                sort: { sortKey: 1, parentAssortmentId: 1, _id: 1 },
             }).toArray();
         }, resolveAssortmentProducts = async (id) => {
             return AssortmentProducts.find({ productId: id }, {
                 projection: { _id: true, assortmentId: true, productId: true },
-                sort: { sortKey: 1, productId: 1 },
+                sort: { sortKey: 1, productId: 1, _id: 1 },
             }).toArray();
         }, }) => {
             const buildBreadcrumbs = makeAssortmentBreadcrumbsBuilder({
@@ -212,43 +248,39 @@ export const configureAssortmentsModule = async (moduleInput) => {
             await emit('ASSORTMENT_CREATE', { assortment });
             return assortment;
         },
-        update: async (assortmentId, doc, options) => {
-            const assortment = await Assortments.findOneAndUpdate(generateDbFilterById(assortmentId), {
-                $set: {
-                    updated: new Date(),
-                    ...doc,
-                },
-            }, { returnDocument: 'after' });
-            if (!assortment)
-                return null;
-            await emit('ASSORTMENT_UPDATE', { assortmentId });
-            if (!options?.skipInvalidation) {
-                await invalidateCache({ assortmentIds: [assortmentId] });
-            }
-            return assortment;
+        update: updateAssortment,
+        delete: deleteAssortment,
+        invalidateCache,
+        bulkDelete: async (assortmentIds) => {
+            return executeBulkOperation(assortmentIds, async (assortmentId) => {
+                const assortment = await Assortments.findOne({ _id: assortmentId, deleted: null }, {});
+                if (!assortment)
+                    throw new Error('not-found');
+                if (!(await deleteAssortment(assortmentId))) {
+                    throw new Error('delete-failed');
+                }
+            });
         },
-        delete: async (assortmentId, options) => {
-            await assortmentLinks.deleteMany({
-                $or: [{ parentAssortmentId: assortmentId }, { childAssortmentId: assortmentId }],
-            }, { skipInvalidation: true });
-            await assortmentProducts.deleteMany({ assortmentId }, { skipInvalidation: true });
-            await assortmentFilters.deleteMany({ assortmentId });
-            await assortmentTexts.deleteMany({ assortmentId });
-            await assortmentMedia.deleteMediaFiles({ assortmentId });
-            const deletedAssortment = await Assortments.findOneAndUpdate(generateDbFilterById(assortmentId), {
-                $set: {
-                    deleted: new Date(),
-                },
-            }, { returnDocument: 'after' });
-            if (!deletedAssortment)
-                return null;
-            if (!options?.skipInvalidation) {
-                await invalidateCache({}, { skipUpstreamTraversal: true });
-            }
-            await emit('ASSORTMENT_REMOVE', { assortmentId });
-            return deletedAssortment;
+        bulkSetActive: async (assortmentIds, isActive) => executeBulkOperation(assortmentIds, async (assortmentId) => {
+            const assortment = await Assortments.findOne({ _id: assortmentId, deleted: null }, {});
+            if (!assortment)
+                throw new Error('not-found');
+            await updateAssortment(assortmentId, { isActive });
+        }),
+        bulkUpdateTags: async (assortmentIds, { add = [], remove = [] }) => {
+            const tagsToRemove = new Set(remove);
+            return executeBulkOperation(assortmentIds, async (assortmentId) => {
+                const assortment = await Assortments.findOne({ _id: assortmentId, deleted: null }, {});
+                if (!assortment)
+                    throw new Error('not-found');
+                const tags = (assortment.tags || []).filter((tag) => !tagsToRemove.has(tag));
+                for (const tag of add) {
+                    if (!tags.includes(tag))
+                        tags.push(tag);
+                }
+                await updateAssortment(assortmentId, { tags });
+            });
         },
-        invalidateCache,
         search: {
             findFilteredAssortments: async ({ limit, offset, assortmentIds, assortmentSelector, sort, }) => {
                 const assortments = await findPreservingIds(Assortments)(assortmentSelector, assortmentIds, {

package/lib/utils/tree-zipper/zipTreeByDeepness.js

@@ -59,5 +59,18 @@ export default (tree) => {
     const levels = divideTreeByLevels(tree);
     const concattedLevels = concatItemsByLevels(levels);
     const items = shuffleEachLevel(concattedLevels);
-    return items.flat(Infinity).filter(Boolean);
+    const result = [];
+    const stack = [...items].reverse();
+    while (stack.length > 0) {
+        const value = stack.pop();
+        if (Array.isArray(value)) {
+            for (let i = value.length - 1; i >= 0; i--) {
+                stack.push(value[i]);
+            }
+        }
+        else if (value) {
+            result.push(value);
+        }
+    }
+    return result;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unchainedshop/core-assortments",
   "description": "Assortment and category management module for the Unchained Engine",
-  "version": "5.0.0-alpha.3",
+  "version": "5.0.0-alpha.5",
   "main": "lib/assortments-index.js",
   "types": "lib/assortments-index.d.ts",
   "type": "module",
@@ -35,13 +35,13 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/events": "^5.0.0-alpha.1",
-    "@unchainedshop/logger": "^5.0.0-alpha.1",
-    "@unchainedshop/mongodb": "^5.0.0-alpha.1",
-    "@unchainedshop/utils": "^5.0.0-alpha.1"
+    "@unchainedshop/events": "^5.0.0-alpha.5",
+    "@unchainedshop/logger": "^5.0.0-alpha.5",
+    "@unchainedshop/mongodb": "^5.0.0-alpha.5",
+    "@unchainedshop/utils": "^5.0.0-alpha.5"
   },
   "devDependencies": {
     "@types/node": "^26.2.0",
-    "typescript": "^5.8.3"
+    "typescript": "^6.0.3"
   }
 }