@unchainedshop/core-assortments 5.0.0-alpha.2 → 5.0.0-alpha.4

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 (10) hide show
  1. package/lib/db/AssortmentsCollection.js +4 -4
  2. package/lib/module/configureAssortmentFiltersModule.js +2 -2
  3. package/lib/module/configureAssortmentLinksModule.d.ts +3 -1
  4. package/lib/module/configureAssortmentLinksModule.js +18 -14
  5. package/lib/module/configureAssortmentMediaModule.js +2 -2
  6. package/lib/module/configureAssortmentProductsModule.js +2 -2
  7. package/lib/module/configureAssortmentsModule.d.ts +3 -1
  8. package/lib/module/configureAssortmentsModule.js +5 -5
  9. package/lib/utils/tree-zipper/zipTreeByDeepness.js +14 -1
  10. package/package.json +4 -3
package/lib/db/AssortmentsCollection.js CHANGED
@@ -37,18 +37,18 @@ export const AssortmentsCollection = async (db) => {
37
37
  { index: { locale: 1, assortmentId: 1 } },
38
38
  ]);
39
39
  await buildDbIndexes(AssortmentProducts, [
40
- { index: { assortmentId: 1 } },
40
+ { index: { assortmentId: 1, productId: 1 } },
41
41
  { index: { productId: 1 } },
42
42
  { index: { tags: 1 } },
43
43
  { index: { assortmentId: 1, sortKey: 1 } },
44
- ]);
44
+ ], { rebuild: false });
45
45
  await buildDbIndexes(AssortmentLinks, [
46
46
  { index: { parentAssortmentId: 1 } },
47
- { index: { childAssortmentId: 1 } },
47
+ { index: { childAssortmentId: 1, sortKey: 1, parentAssortmentId: 1 } },
48
48
  { index: { tags: 1 } },
49
49
  { index: { parentAssortmentId: 1, sortKey: 1 } },
50
50
  { index: { childAssortmentId: 1, parentAssortmentId: 1, sortKey: 1 } },
51
- ]);
51
+ ], { rebuild: false });
52
52
  await buildDbIndexes(AssortmentFilters, [
53
53
  { index: { assortmentId: 1 } },
54
54
  { index: { filterId: 1 } },
package/lib/module/configureAssortmentFiltersModule.js CHANGED
@@ -18,7 +18,7 @@ export const configureAssortmentFiltersModule = ({ AssortmentFilters, }) => {
18
18
  },
19
19
  findFilterIds: async ({ assortmentId }) => {
20
20
  const filters = AssortmentFilters.find({ assortmentId }, {
21
- sort: { sortKey: 1 },
21
+ sort: { sortKey: 1, _id: 1 },
22
22
  projection: { filterId: 1 },
23
23
  }).map((filter) => filter.filterId);
24
24
  return filters.toArray();
@@ -41,7 +41,7 @@ export const configureAssortmentFiltersModule = ({ AssortmentFilters, }) => {
41
41
  created: new Date(),
42
42
  };
43
43
  if (sortKey === undefined || sortKey === null) {
44
- const lastAssortmentFilter = (await AssortmentFilters.findOne({ assortmentId }, { sort: { sortKey: -1 } })) || { sortKey: 0 };
44
+ const lastAssortmentFilter = (await AssortmentFilters.findOne({ assortmentId }, { sort: { sortKey: -1, _id: -1 } })) || { sortKey: 0 };
45
45
  $setOnInsert.sortKey = lastAssortmentFilter.sortKey + 1;
46
46
  }
47
47
  else {
package/lib/module/configureAssortmentLinksModule.d.ts CHANGED
@@ -9,11 +9,13 @@ export declare const configureAssortmentLinksModule: ({ AssortmentLinks, invalid
9
9
  parentAssortmentId?: string;
10
10
  childAssortmentId?: string;
11
11
  }) => Promise<mongodb.WithId<AssortmentLink> | null>;
12
- findLinks: ({ assortmentId, assortmentIds, parentAssortmentId, parentAssortmentIds, }: {
12
+ findLinks: ({ assortmentId, assortmentIds, parentAssortmentId, parentAssortmentIds, childAssortmentId, childAssortmentIds, }: {
13
13
  assortmentId?: string;
14
14
  assortmentIds?: string[];
15
15
  parentAssortmentId?: string;
16
16
  parentAssortmentIds?: string[];
17
+ childAssortmentId?: string;
18
+ childAssortmentIds?: string[];
17
19
  }, options?: mongodb.FindOptions) => Promise<AssortmentLink[]>;
18
20
  create: (doc: Omit<AssortmentLink, "_id" | "created" | "sortKey"> & Pick<Partial<AssortmentLink>, "_id" | "created" | "sortKey">, options?: {
19
21
  skipInvalidation?: boolean;
package/lib/module/configureAssortmentLinksModule.js CHANGED
@@ -15,19 +15,23 @@ export const configureAssortmentLinksModule = ({ AssortmentLinks, invalidateCach
15
15
  ? generateDbFilterById(assortmentLinkId)
16
16
  : { parentAssortmentId, childAssortmentId }, {});
17
17
  },
18
- findLinks: async ({ assortmentId, assortmentIds, parentAssortmentId, parentAssortmentIds, }, options) => {
19
- const selector = parentAssortmentId || parentAssortmentIds
20
- ? {
21
- parentAssortmentId: parentAssortmentId || { $in: parentAssortmentIds },
22
- }
23
- : {
24
- $or: [
25
- { parentAssortmentId: assortmentId || { $in: assortmentIds } },
26
- { childAssortmentId: assortmentId || { $in: assortmentIds } },
27
- ],
28
- };
18
+ findLinks: async ({ assortmentId, assortmentIds, parentAssortmentId, parentAssortmentIds, childAssortmentId, childAssortmentIds, }, options) => {
19
+ const selectors = [];
20
+ const parentIds = parentAssortmentId || (parentAssortmentIds && { $in: parentAssortmentIds });
21
+ const childIds = childAssortmentId || (childAssortmentIds && { $in: childAssortmentIds });
22
+ const bidirectionalIds = assortmentId || (assortmentIds && { $in: assortmentIds });
23
+ if (parentIds)
24
+ selectors.push({ parentAssortmentId: parentIds });
25
+ if (childIds)
26
+ selectors.push({ childAssortmentId: childIds });
27
+ if (bidirectionalIds) {
28
+ selectors.push({ parentAssortmentId: bidirectionalIds }, { childAssortmentId: bidirectionalIds });
29
+ }
30
+ if (!selectors.length)
31
+ return [];
32
+ const selector = selectors.length > 1 ? { $or: selectors } : selectors[0];
29
33
  const links = AssortmentLinks.find(selector, options || {
30
- sort: { sortKey: 1 },
34
+ sort: { sortKey: 1, _id: 1 },
31
35
  });
32
36
  return links.toArray();
33
37
  },
@@ -37,7 +41,7 @@ export const configureAssortmentLinksModule = ({ AssortmentLinks, invalidateCach
37
41
  resolveAssortmentLinks: async (id) => {
38
42
  return AssortmentLinks.find({ childAssortmentId: id }, {
39
43
  projection: { _id: 1, childAssortmentId: 1, parentAssortmentId: 1 },
40
- sort: { sortKey: 1, parentAssortmentId: 1 },
44
+ sort: { sortKey: 1, parentAssortmentId: 1, _id: 1 },
41
45
  }).toArray();
42
46
  },
43
47
  assortmentId: parentAssortmentId,
@@ -56,7 +60,7 @@ export const configureAssortmentLinksModule = ({ AssortmentLinks, invalidateCach
56
60
  created: new Date(),
57
61
  };
58
62
  if (sortKey === undefined || sortKey === null) {
59
- const lastAssortmentLink = (await AssortmentLinks.findOne({ parentAssortmentId }, { sort: { sortKey: -1 } })) || { sortKey: 0 };
63
+ const lastAssortmentLink = (await AssortmentLinks.findOne({ parentAssortmentId }, { sort: { sortKey: -1, _id: -1 } })) || { sortKey: 0 };
60
64
  $setOnInsert.sortKey = lastAssortmentLink.sortKey + 1;
61
65
  }
62
66
  else {
package/lib/module/configureAssortmentMediaModule.js CHANGED
@@ -54,7 +54,7 @@ export const configureAssortmentMediaModule = async ({ db }) => {
54
54
  const mediaList = AssortmentMedia.find(selector, {
55
55
  skip: offset,
56
56
  limit,
57
- sort: { sortKey: 1 },
57
+ sort: { sortKey: 1, _id: 1 },
58
58
  ...options,
59
59
  });
60
60
  return mediaList.toArray();
@@ -64,7 +64,7 @@ export const configureAssortmentMediaModule = async ({ db }) => {
64
64
  const lastAssortmentMedia = (await AssortmentMedia.findOne({
65
65
  assortmentId: doc.assortmentId,
66
66
  }, {
67
- sort: { sortKey: -1 },
67
+ sort: { sortKey: -1, _id: -1 },
68
68
  })) || { sortKey: 0 };
69
69
  sortKey = lastAssortmentMedia.sortKey + 1;
70
70
  }
package/lib/module/configureAssortmentProductsModule.js CHANGED
@@ -46,7 +46,7 @@ export const configureAssortmentProductsModule = ({ AssortmentProducts, invalida
46
46
  assortmentId: { $in: assortmentIds },
47
47
  productId: { $ne: productId },
48
48
  }, {
49
- sort: { sortKey: 1 },
49
+ sort: { sortKey: 1, _id: 1 },
50
50
  projection: { productId: 1 },
51
51
  }).toArray();
52
52
  return assortmentProducts.map((product) => product.productId);
@@ -69,7 +69,7 @@ export const configureAssortmentProductsModule = ({ AssortmentProducts, invalida
69
69
  created: new Date(),
70
70
  };
71
71
  if (sortKey === undefined || sortKey === null) {
72
- const lastAssortmentProduct = (await AssortmentProducts.findOne({ assortmentId }, { sort: { sortKey: -1 } })) || { sortKey: 0 };
72
+ const lastAssortmentProduct = (await AssortmentProducts.findOne({ assortmentId }, { sort: { sortKey: -1, _id: -1 } })) || { sortKey: 0 };
73
73
  $setOnInsert.sortKey = lastAssortmentProduct.sortKey + 1;
74
74
  }
75
75
  else {
package/lib/module/configureAssortmentsModule.d.ts CHANGED
@@ -133,11 +133,13 @@ export declare const configureAssortmentsModule: (moduleInput: ModuleInput<Assor
133
133
  parentAssortmentId?: string;
134
134
  childAssortmentId?: string;
135
135
  }) => Promise<mongodb.WithId<AssortmentLink> | null>;
136
- findLinks: ({ assortmentId, assortmentIds, parentAssortmentId, parentAssortmentIds, }: {
136
+ findLinks: ({ assortmentId, assortmentIds, parentAssortmentId, parentAssortmentIds, childAssortmentId, childAssortmentIds, }: {
137
137
  assortmentId?: string;
138
138
  assortmentIds?: string[];
139
139
  parentAssortmentId?: string;
140
140
  parentAssortmentIds?: string[];
141
+ childAssortmentId?: string;
142
+ childAssortmentIds?: string[];
141
143
  }, options?: mongodb.FindOptions) => Promise<AssortmentLink[]>;
142
144
  create: (doc: Omit<AssortmentLink, "_id" | "created" | "sortKey"> & Pick<Partial<AssortmentLink>, "_id" | "created" | "sortKey">, options?: {
143
145
  skipInvalidation?: boolean;
package/lib/module/configureAssortmentsModule.js CHANGED
@@ -49,12 +49,12 @@ export const configureAssortmentsModule = async (moduleInput) => {
49
49
  return AssortmentLinks.find({
50
50
  $or: [{ parentAssortmentId: assortment._id }, { childAssortmentId: assortment._id }],
51
51
  }, {
52
- sort: { sortKey: 1 },
52
+ sort: { sortKey: 1, _id: 1 },
53
53
  }).toArray();
54
54
  };
55
55
  const findProductAssignments = async (assortmentId) => {
56
56
  return AssortmentProducts.find({ assortmentId }, {
57
- sort: { sortKey: 1 },
57
+ sort: { sortKey: 1, _id: 1 },
58
58
  }).toArray();
59
59
  };
60
60
  const collectProductIdCacheTree = async (assortment) => {
@@ -166,7 +166,7 @@ export const configureAssortmentsModule = async (moduleInput) => {
166
166
  children: async ({ assortmentId, includeInactive, }) => {
167
167
  const links = await AssortmentLinks.find({ parentAssortmentId: assortmentId }, {
168
168
  projection: { childAssortmentId: 1 },
169
- sort: { sortKey: 1 },
169
+ sort: { sortKey: 1, _id: 1 },
170
170
  }).toArray();
171
171
  const assortmentIds = links.map(({ childAssortmentId }) => childAssortmentId);
172
172
  const selector = !includeInactive ? { isActive: true } : {};
@@ -182,12 +182,12 @@ export const configureAssortmentsModule = async (moduleInput) => {
182
182
  breadcrumbs: async (params, { resolveAssortmentLinks = async (id) => {
183
183
  return AssortmentLinks.find({ childAssortmentId: id }, {
184
184
  projection: { _id: 1, childAssortmentId: 1, parentAssortmentId: 1 },
185
- sort: { sortKey: 1, parentAssortmentId: 1 },
185
+ sort: { sortKey: 1, parentAssortmentId: 1, _id: 1 },
186
186
  }).toArray();
187
187
  }, resolveAssortmentProducts = async (id) => {
188
188
  return AssortmentProducts.find({ productId: id }, {
189
189
  projection: { _id: true, assortmentId: true, productId: true },
190
- sort: { sortKey: 1, productId: 1 },
190
+ sort: { sortKey: 1, productId: 1, _id: 1 },
191
191
  }).toArray();
192
192
  }, }) => {
193
193
  const buildBreadcrumbs = makeAssortmentBreadcrumbsBuilder({
package/lib/utils/tree-zipper/zipTreeByDeepness.js CHANGED
@@ -59,5 +59,18 @@ export default (tree) => {
59
59
  const levels = divideTreeByLevels(tree);
60
60
  const concattedLevels = concatItemsByLevels(levels);
61
61
  const items = shuffleEachLevel(concattedLevels);
62
- return items.flat(Infinity).filter(Boolean);
62
+ const result = [];
63
+ const stack = [...items].reverse();
64
+ while (stack.length > 0) {
65
+ const value = stack.pop();
66
+ if (Array.isArray(value)) {
67
+ for (let i = value.length - 1; i >= 0; i--) {
68
+ stack.push(value[i]);
69
+ }
70
+ }
71
+ else if (value) {
72
+ result.push(value);
73
+ }
74
+ }
75
+ return result;
63
76
  };
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@unchainedshop/core-assortments",
3
3
  "description": "Assortment and category management module for the Unchained Engine",
4
- "version": "5.0.0-alpha.2",
4
+ "version": "5.0.0-alpha.4",
5
5
  "main": "lib/assortments-index.js",
6
6
  "types": "lib/assortments-index.d.ts",
7
7
  "type": "module",
@@ -37,10 +37,11 @@
37
37
  "dependencies": {
38
38
  "@unchainedshop/events": "^5.0.0-alpha.1",
39
39
  "@unchainedshop/logger": "^5.0.0-alpha.1",
40
+ "@unchainedshop/mongodb": "^5.0.0-alpha.1",
40
41
  "@unchainedshop/utils": "^5.0.0-alpha.1"
41
42
  },
42
43
  "devDependencies": {
43
- "@types/node": "^25.0.0",
44
- "typescript": "^5.8.3"
44
+ "@types/node": "^26.2.0",
45
+ "typescript": "^6.0.3"
45
46
  }
46
47
  }