@wix/bex-core 2.90.0 → 2.91.0
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.
- package/dist/cjs/state/CollectionOptimisticProcessor.js +14 -6
- package/dist/cjs/state/CollectionOptimisticProcessor.js.map +1 -1
- package/dist/esm/state/CollectionOptimisticProcessor.js +22 -11
- package/dist/esm/state/CollectionOptimisticProcessor.js.map +1 -1
- package/dist/types/state/CollectionOptimisticProcessor.d.ts.map +1 -1
- package/package.json +2 -2
|
@@ -10,6 +10,7 @@ var _CollectionOptimisticHelpers = require("./CollectionOptimisticHelpers");
|
|
|
10
10
|
var _optimisticSimulation = require("./optimistic-simulation");
|
|
11
11
|
var _orderByOrders = require("./optimistic-simulation/orderByOrders");
|
|
12
12
|
var _orderByMoves = require("./optimistic-simulation/orderByMoves");
|
|
13
|
+
var _filterByApplyAllPatches = require("./optimistic-simulation/filterByApplyAllPatches");
|
|
13
14
|
class CollectionOptimisticProcessor {
|
|
14
15
|
constructor(params) {
|
|
15
16
|
(0, _defineProperty2.default)(this, "collection", void 0);
|
|
@@ -75,7 +76,8 @@ class CollectionOptimisticProcessor {
|
|
|
75
76
|
const {
|
|
76
77
|
optimistic: {
|
|
77
78
|
state,
|
|
78
|
-
query
|
|
79
|
+
query,
|
|
80
|
+
_orderByMode
|
|
79
81
|
},
|
|
80
82
|
collection,
|
|
81
83
|
predicate,
|
|
@@ -94,19 +96,19 @@ class CollectionOptimisticProcessor {
|
|
|
94
96
|
return pages;
|
|
95
97
|
}
|
|
96
98
|
const itemPredicate = predicate(originQuery);
|
|
97
|
-
const orders =
|
|
99
|
+
const orders = _orderByMode === 'orders' ? orderByIteratee(originQuery) : [];
|
|
98
100
|
let finalPages = pages;
|
|
99
|
-
finalPages = finalPages.map(page => {
|
|
101
|
+
finalPages = _orderByMode !== 'moves' ? finalPages.map(page => {
|
|
100
102
|
return page.filter((0, _optimisticSimulation.filterPageByPatches)(patches, {
|
|
101
103
|
itemPredicate,
|
|
102
104
|
itemKey
|
|
103
105
|
})).map((0, _optimisticSimulation.transformItemByUpdateAllPatches)(patches));
|
|
104
|
-
});
|
|
106
|
+
}) : finalPages;
|
|
105
107
|
const itemToMerge = (0, _optimisticSimulation.prepareItemsToMergeIntoPage)(patches, {
|
|
106
108
|
itemPredicate,
|
|
107
109
|
currentItemsMap
|
|
108
110
|
});
|
|
109
|
-
if (!itemToMerge.all.size &&
|
|
111
|
+
if (!itemToMerge.all.size && _orderByMode === 'orders') {
|
|
110
112
|
return finalPages;
|
|
111
113
|
}
|
|
112
114
|
finalPages = finalPages.map((page, index) => {
|
|
@@ -119,7 +121,7 @@ class CollectionOptimisticProcessor {
|
|
|
119
121
|
}) : page.map(item => ({
|
|
120
122
|
item
|
|
121
123
|
}));
|
|
122
|
-
return
|
|
124
|
+
return _orderByMode === 'moves' ? (0, _orderByMoves.orderByMoves)({
|
|
123
125
|
pageWithPatchedItems,
|
|
124
126
|
pageIndex: index,
|
|
125
127
|
patches,
|
|
@@ -134,6 +136,12 @@ class CollectionOptimisticProcessor {
|
|
|
134
136
|
limit
|
|
135
137
|
});
|
|
136
138
|
});
|
|
139
|
+
const patchedItemPredicate = (0, _filterByApplyAllPatches.filterByApplyAllPatches)(patches, {
|
|
140
|
+
itemPredicate
|
|
141
|
+
});
|
|
142
|
+
finalPages = _orderByMode === 'moves' ? finalPages.map(page => {
|
|
143
|
+
return page.filter(patchedItemPredicate);
|
|
144
|
+
}) : finalPages;
|
|
137
145
|
return finalPages;
|
|
138
146
|
}
|
|
139
147
|
beforeSetTotal({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_mobx","require","_QueryResultSimulationDefault","_CollectionOptimisticHelpers","_optimisticSimulation","_orderByOrders","_orderByMoves","CollectionOptimisticProcessor","constructor","params","_defineProperty2","default","collection","processorHelpers","CollectionOptimisticProcessorHelpers","optimistic","resultSimulationDefault","QueryResultSimulationDefault","predicate","orderBy","makeObservable","reprocess","action","bound","beforeAddNewPages","beforeSetTotal","_register","emitter","on","events","removeSelectionIfExists","itemKey","bulkSelect","result","originQuery","state","patches","itemPredicate","filterItem","filterPageByPatches","select","filter","item","pages","currentItemsMap","query","orderByIteratee","limit","length","orders","_orderByMode","finalPages","map","page","transformItemByUpdateAllPatches","itemToMerge","prepareItemsToMergeIntoPage","all","size","index","pageWithPatchedItems","mergePatchedItems","orderByMoves","pageIndex","currentFiltersKeyHash","filtersKeyHash","toMerge","orderByOrders","total","processedTotal","reduce","prev","actionType","patchedItemsEntries","originalItems","originalTotal","key","originalItem","get","patchedItemsTotal","acc","value","Math","max","exports"],"sources":["../../../src/state/CollectionOptimisticProcessor.ts"],"sourcesContent":["import {\n ComputedQuery,\n ComputedQueryFull,\n FiltersMap,\n KeyedItem,\n} from '../model';\nimport { CollectionState } from './CollectionState';\nimport { action, makeObservable } from 'mobx';\nimport { Order, QueryResultSimulation } from './QueryResultSimulation';\nimport { QueryResultSimulationDefault } from './QueryResultSimulationDefault';\nimport { TypedEmitter } from '../util';\nimport { CollectionOptimisticProcessorHelpers } from './CollectionOptimisticHelpers';\nimport { CollectionOptimisticActionsState } from './CollectionOptimisticActionsState';\nimport {\n filterPageByPatches,\n mergePatchedItems,\n prepareItemsToMergeIntoPage,\n transformItemByUpdateAllPatches,\n} from './optimistic-simulation';\nimport { orderByOrders } from './optimistic-simulation/orderByOrders';\nimport { orderByMoves } from './optimistic-simulation/orderByMoves';\nimport { QueryState } from './QueryState';\n\ninterface Optimistic<T, F extends FiltersMap> {\n _orderByMode: 'orders' | 'moves';\n readonly state: CollectionOptimisticActionsState<T>;\n readonly events: TypedEmitter<{\n reprocess: () => void;\n updated: () => void;\n }>;\n readonly query: QueryState<F>;\n}\n\nexport interface CollectionOptimisticProcessorParams<T, F extends FiltersMap>\n extends Partial<QueryResultSimulation<T, F>> {\n readonly collection: CollectionState<T, F>;\n readonly optimistic: Optimistic<T, F>;\n}\n\nexport class CollectionOptimisticProcessor<T, F extends FiltersMap> {\n readonly collection: CollectionState<T, F>;\n readonly processorHelpers: CollectionOptimisticProcessorHelpers<T, F>;\n readonly optimistic: Optimistic<T, F>;\n\n readonly resultSimulationDefault: QueryResultSimulation<T, F>;\n readonly predicate: (computedQuery: ComputedQuery<F>) => (item: T) => boolean;\n readonly orderBy: (computedQuery: ComputedQuery<F>) => Order<T>[];\n\n constructor(params: CollectionOptimisticProcessorParams<T, F>) {\n this.collection = params.collection;\n this.processorHelpers = new CollectionOptimisticProcessorHelpers(\n this.collection,\n );\n this.optimistic = params.optimistic;\n\n this.resultSimulationDefault = new QueryResultSimulationDefault({\n collection: this.collection,\n });\n this.predicate = params.predicate ?? this.resultSimulationDefault.predicate;\n this.orderBy = params.orderBy ?? this.resultSimulationDefault.orderBy;\n\n makeObservable(this, {\n reprocess: action.bound,\n beforeAddNewPages: action.bound,\n beforeSetTotal: action.bound,\n });\n\n this._register();\n }\n\n _register() {\n this.collection.emitter.on('beforeAddNewPages', this.beforeAddNewPages);\n this.collection.emitter.on('beforeSetTotal', this.beforeSetTotal);\n this.optimistic.events.on('reprocess', this.reprocess);\n }\n\n reprocess() {\n this.removeSelectionIfExists();\n this.processorHelpers.reprocess();\n }\n\n removeSelectionIfExists() {\n const {\n collection: {\n itemKey,\n bulkSelect,\n result: { originQuery },\n },\n optimistic: {\n state: { patches },\n },\n predicate,\n } = this;\n\n const itemPredicate = predicate(originQuery);\n\n const filterItem = filterPageByPatches(patches, { itemPredicate, itemKey });\n bulkSelect.select.filter(({ item }) => filterItem(item));\n }\n\n beforeAddNewPages({\n pages,\n currentItemsMap,\n originQuery,\n }: {\n pages: T[][];\n currentItemsMap: Map<string, KeyedItem<T>>;\n originQuery: ComputedQueryFull<F>;\n }) {\n const {\n optimistic: { state, query },\n collection,\n predicate,\n orderBy: orderByIteratee,\n } = this;\n\n const { itemKey } = collection;\n\n const { patches } = state;\n\n const { limit } = originQuery;\n\n if (!patches.length) {\n return pages;\n }\n\n const itemPredicate = predicate(originQuery);\n const orders =\n this.optimistic._orderByMode === 'orders'\n ? orderByIteratee(originQuery)\n : [];\n\n let finalPages = pages;\n\n finalPages = finalPages.map((page) => {\n return page\n .filter(filterPageByPatches(patches, { itemPredicate, itemKey }))\n .map(transformItemByUpdateAllPatches(patches));\n });\n\n const itemToMerge = prepareItemsToMergeIntoPage(patches, {\n itemPredicate,\n currentItemsMap,\n });\n\n if (!itemToMerge.all.size && this.optimistic._orderByMode === 'orders') {\n return finalPages;\n }\n\n finalPages = finalPages.map((page, index) => {\n const pageWithPatchedItems = itemToMerge.all.size\n ? mergePatchedItems(itemToMerge, {\n page,\n limit,\n itemKey,\n orders,\n itemPredicate,\n })\n : page.map((item) => ({ item }));\n\n return this.optimistic._orderByMode === 'moves'\n ? orderByMoves({\n pageWithPatchedItems,\n pageIndex: index,\n patches,\n currentFiltersKeyHash: query.filtersKeyHash,\n itemKey,\n toMerge: itemToMerge,\n itemPredicate,\n limit,\n })\n : orderByOrders(pageWithPatchedItems, itemToMerge, {\n orders,\n itemKey,\n limit,\n });\n });\n\n return finalPages;\n }\n\n beforeSetTotal({\n total,\n originQuery,\n }: {\n total: number;\n originQuery: ComputedQuery<F>;\n }) {\n const {\n optimistic: { state },\n predicate,\n } = this;\n\n const { patches } = state;\n\n if (!patches.length) {\n return total;\n }\n\n const itemPredicate = predicate(originQuery);\n\n const processedTotal = patches.reduce(\n (\n prev,\n { actionType, patchedItemsEntries, originalItems, originalTotal },\n ) => {\n if (actionType === 'updateAllConst' || actionType === 'deleteAll') {\n const [[key, item] = []] = patchedItemsEntries;\n\n if (key == null || item == null) {\n return prev;\n }\n\n const originalItem = originalItems.get(key);\n\n if (\n itemPredicate(item) &&\n (originalItem == null || !itemPredicate(originalItem))\n ) {\n return prev + originalTotal;\n }\n\n if (\n // if action=deleteAll treat the item as filtered out, no need to check predicate\n (actionType === 'deleteAll' || !itemPredicate(item)) &&\n originalItem != null &&\n itemPredicate(originalItem)\n ) {\n return prev - originalTotal;\n }\n\n return prev;\n }\n\n const patchedItemsTotal = patchedItemsEntries.reduce(\n (acc, [key, item]) => {\n const originalItem = originalItems.get(key);\n const value = (() => {\n switch (actionType) {\n case 'deleteMany':\n if (originalItem != null && itemPredicate(originalItem)) {\n return -1;\n }\n\n return 0;\n case 'updateMany':\n case 'updateAll':\n case 'createMany':\n if (\n itemPredicate(item) &&\n (originalItem == null || !itemPredicate(originalItem))\n ) {\n return 1;\n }\n\n if (\n !itemPredicate(item) &&\n originalItem != null &&\n itemPredicate(originalItem)\n ) {\n return -1;\n }\n return 0;\n }\n\n return 0;\n })();\n return acc + value;\n },\n 0,\n );\n\n return prev + patchedItemsTotal;\n },\n total,\n );\n\n return Math.max(processedTotal, 0);\n }\n}\n"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_mobx","require","_QueryResultSimulationDefault","_CollectionOptimisticHelpers","_optimisticSimulation","_orderByOrders","_orderByMoves","_filterByApplyAllPatches","CollectionOptimisticProcessor","constructor","params","_defineProperty2","default","collection","processorHelpers","CollectionOptimisticProcessorHelpers","optimistic","resultSimulationDefault","QueryResultSimulationDefault","predicate","orderBy","makeObservable","reprocess","action","bound","beforeAddNewPages","beforeSetTotal","_register","emitter","on","events","removeSelectionIfExists","itemKey","bulkSelect","result","originQuery","state","patches","itemPredicate","filterItem","filterPageByPatches","select","filter","item","pages","currentItemsMap","query","_orderByMode","orderByIteratee","limit","length","orders","finalPages","map","page","transformItemByUpdateAllPatches","itemToMerge","prepareItemsToMergeIntoPage","all","size","index","pageWithPatchedItems","mergePatchedItems","orderByMoves","pageIndex","currentFiltersKeyHash","filtersKeyHash","toMerge","orderByOrders","patchedItemPredicate","filterByApplyAllPatches","total","processedTotal","reduce","prev","actionType","patchedItemsEntries","originalItems","originalTotal","key","originalItem","get","patchedItemsTotal","acc","value","Math","max","exports"],"sources":["../../../src/state/CollectionOptimisticProcessor.ts"],"sourcesContent":["import {\n ComputedQuery,\n ComputedQueryFull,\n FiltersMap,\n KeyedItem,\n} from '../model';\nimport { CollectionState } from './CollectionState';\nimport { action, makeObservable } from 'mobx';\nimport { Order, QueryResultSimulation } from './QueryResultSimulation';\nimport { QueryResultSimulationDefault } from './QueryResultSimulationDefault';\nimport { TypedEmitter } from '../util';\nimport { CollectionOptimisticProcessorHelpers } from './CollectionOptimisticHelpers';\nimport { CollectionOptimisticActionsState } from './CollectionOptimisticActionsState';\nimport {\n filterPageByPatches,\n mergePatchedItems,\n prepareItemsToMergeIntoPage,\n transformItemByUpdateAllPatches,\n} from './optimistic-simulation';\nimport { orderByOrders } from './optimistic-simulation/orderByOrders';\nimport { orderByMoves } from './optimistic-simulation/orderByMoves';\nimport { QueryState } from './QueryState';\nimport { filterByApplyAllPatches } from './optimistic-simulation/filterByApplyAllPatches';\n\ninterface Optimistic<T, F extends FiltersMap> {\n _orderByMode: 'orders' | 'moves';\n readonly state: CollectionOptimisticActionsState<T>;\n readonly events: TypedEmitter<{\n reprocess: () => void;\n updated: () => void;\n }>;\n readonly query: QueryState<F>;\n}\n\nexport interface CollectionOptimisticProcessorParams<T, F extends FiltersMap>\n extends Partial<QueryResultSimulation<T, F>> {\n readonly collection: CollectionState<T, F>;\n readonly optimistic: Optimistic<T, F>;\n}\n\nexport class CollectionOptimisticProcessor<T, F extends FiltersMap> {\n readonly collection: CollectionState<T, F>;\n readonly processorHelpers: CollectionOptimisticProcessorHelpers<T, F>;\n readonly optimistic: Optimistic<T, F>;\n\n readonly resultSimulationDefault: QueryResultSimulation<T, F>;\n readonly predicate: (computedQuery: ComputedQuery<F>) => (item: T) => boolean;\n readonly orderBy: (computedQuery: ComputedQuery<F>) => Order<T>[];\n\n constructor(params: CollectionOptimisticProcessorParams<T, F>) {\n this.collection = params.collection;\n this.processorHelpers = new CollectionOptimisticProcessorHelpers(\n this.collection,\n );\n this.optimistic = params.optimistic;\n\n this.resultSimulationDefault = new QueryResultSimulationDefault({\n collection: this.collection,\n });\n this.predicate = params.predicate ?? this.resultSimulationDefault.predicate;\n this.orderBy = params.orderBy ?? this.resultSimulationDefault.orderBy;\n\n makeObservable(this, {\n reprocess: action.bound,\n beforeAddNewPages: action.bound,\n beforeSetTotal: action.bound,\n });\n\n this._register();\n }\n\n _register() {\n this.collection.emitter.on('beforeAddNewPages', this.beforeAddNewPages);\n this.collection.emitter.on('beforeSetTotal', this.beforeSetTotal);\n this.optimistic.events.on('reprocess', this.reprocess);\n }\n\n reprocess() {\n this.removeSelectionIfExists();\n this.processorHelpers.reprocess();\n }\n\n removeSelectionIfExists() {\n const {\n collection: {\n itemKey,\n bulkSelect,\n result: { originQuery },\n },\n optimistic: {\n state: { patches },\n },\n predicate,\n } = this;\n\n const itemPredicate = predicate(originQuery);\n\n const filterItem = filterPageByPatches(patches, { itemPredicate, itemKey });\n bulkSelect.select.filter(({ item }) => filterItem(item));\n }\n\n beforeAddNewPages({\n pages,\n currentItemsMap,\n originQuery,\n }: {\n pages: T[][];\n currentItemsMap: Map<string, KeyedItem<T>>;\n originQuery: ComputedQueryFull<F>;\n }) {\n const {\n optimistic: { state, query, _orderByMode },\n collection,\n predicate,\n orderBy: orderByIteratee,\n } = this;\n\n const { itemKey } = collection;\n\n const { patches } = state;\n\n const { limit } = originQuery;\n\n if (!patches.length) {\n return pages;\n }\n\n const itemPredicate = predicate(originQuery);\n const orders =\n _orderByMode === 'orders' ? orderByIteratee(originQuery) : [];\n\n let finalPages = pages;\n\n finalPages =\n _orderByMode !== 'moves'\n ? finalPages.map((page) => {\n return page\n .filter(filterPageByPatches(patches, { itemPredicate, itemKey }))\n .map(transformItemByUpdateAllPatches(patches));\n })\n : finalPages;\n\n const itemToMerge = prepareItemsToMergeIntoPage(patches, {\n itemPredicate,\n currentItemsMap,\n });\n\n if (!itemToMerge.all.size && _orderByMode === 'orders') {\n return finalPages;\n }\n\n finalPages = finalPages.map((page, index) => {\n const pageWithPatchedItems = itemToMerge.all.size\n ? mergePatchedItems(itemToMerge, {\n page,\n limit,\n itemKey,\n orders,\n itemPredicate,\n })\n : page.map((item) => ({ item }));\n\n return _orderByMode === 'moves'\n ? orderByMoves({\n pageWithPatchedItems,\n pageIndex: index,\n patches,\n currentFiltersKeyHash: query.filtersKeyHash,\n itemKey,\n toMerge: itemToMerge,\n itemPredicate,\n limit,\n })\n : orderByOrders(pageWithPatchedItems, itemToMerge, {\n orders,\n itemKey,\n limit,\n });\n });\n\n const patchedItemPredicate = filterByApplyAllPatches(patches, {\n itemPredicate,\n });\n\n finalPages =\n _orderByMode === 'moves'\n ? finalPages.map((page) => {\n return page.filter(patchedItemPredicate);\n })\n : finalPages;\n\n return finalPages;\n }\n\n beforeSetTotal({\n total,\n originQuery,\n }: {\n total: number;\n originQuery: ComputedQuery<F>;\n }) {\n const {\n optimistic: { state },\n predicate,\n } = this;\n\n const { patches } = state;\n\n if (!patches.length) {\n return total;\n }\n\n const itemPredicate = predicate(originQuery);\n\n const processedTotal = patches.reduce(\n (\n prev,\n { actionType, patchedItemsEntries, originalItems, originalTotal },\n ) => {\n if (actionType === 'updateAllConst' || actionType === 'deleteAll') {\n const [[key, item] = []] = patchedItemsEntries;\n\n if (key == null || item == null) {\n return prev;\n }\n\n const originalItem = originalItems.get(key);\n\n if (\n itemPredicate(item) &&\n (originalItem == null || !itemPredicate(originalItem))\n ) {\n return prev + originalTotal;\n }\n\n if (\n // if action=deleteAll treat the item as filtered out, no need to check predicate\n (actionType === 'deleteAll' || !itemPredicate(item)) &&\n originalItem != null &&\n itemPredicate(originalItem)\n ) {\n return prev - originalTotal;\n }\n\n return prev;\n }\n\n const patchedItemsTotal = patchedItemsEntries.reduce(\n (acc, [key, item]) => {\n const originalItem = originalItems.get(key);\n const value = (() => {\n switch (actionType) {\n case 'deleteMany':\n if (originalItem != null && itemPredicate(originalItem)) {\n return -1;\n }\n\n return 0;\n case 'updateMany':\n case 'updateAll':\n case 'createMany':\n if (\n itemPredicate(item) &&\n (originalItem == null || !itemPredicate(originalItem))\n ) {\n return 1;\n }\n\n if (\n !itemPredicate(item) &&\n originalItem != null &&\n itemPredicate(originalItem)\n ) {\n return -1;\n }\n return 0;\n }\n\n return 0;\n })();\n return acc + value;\n },\n 0,\n );\n\n return prev + patchedItemsTotal;\n },\n total,\n );\n\n return Math.max(processedTotal, 0);\n }\n}\n"],"mappings":"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","ignoreList":[]}
|
|
@@ -4,6 +4,7 @@ import { CollectionOptimisticProcessorHelpers } from './CollectionOptimisticHelp
|
|
|
4
4
|
import { filterPageByPatches, mergePatchedItems, prepareItemsToMergeIntoPage, transformItemByUpdateAllPatches, } from './optimistic-simulation';
|
|
5
5
|
import { orderByOrders } from './optimistic-simulation/orderByOrders';
|
|
6
6
|
import { orderByMoves } from './optimistic-simulation/orderByMoves';
|
|
7
|
+
import { filterByApplyAllPatches } from './optimistic-simulation/filterByApplyAllPatches';
|
|
7
8
|
export class CollectionOptimisticProcessor {
|
|
8
9
|
constructor(params) {
|
|
9
10
|
this.collection = params.collection;
|
|
@@ -37,7 +38,7 @@ export class CollectionOptimisticProcessor {
|
|
|
37
38
|
bulkSelect.select.filter(({ item }) => filterItem(item));
|
|
38
39
|
}
|
|
39
40
|
beforeAddNewPages({ pages, currentItemsMap, originQuery, }) {
|
|
40
|
-
const { optimistic: { state, query }, collection, predicate, orderBy: orderByIteratee, } = this;
|
|
41
|
+
const { optimistic: { state, query, _orderByMode }, collection, predicate, orderBy: orderByIteratee, } = this;
|
|
41
42
|
const { itemKey } = collection;
|
|
42
43
|
const { patches } = state;
|
|
43
44
|
const { limit } = originQuery;
|
|
@@ -45,20 +46,21 @@ export class CollectionOptimisticProcessor {
|
|
|
45
46
|
return pages;
|
|
46
47
|
}
|
|
47
48
|
const itemPredicate = predicate(originQuery);
|
|
48
|
-
const orders =
|
|
49
|
-
? orderByIteratee(originQuery)
|
|
50
|
-
: [];
|
|
49
|
+
const orders = _orderByMode === 'orders' ? orderByIteratee(originQuery) : [];
|
|
51
50
|
let finalPages = pages;
|
|
52
|
-
finalPages =
|
|
53
|
-
|
|
54
|
-
.
|
|
55
|
-
|
|
56
|
-
|
|
51
|
+
finalPages =
|
|
52
|
+
_orderByMode !== 'moves'
|
|
53
|
+
? finalPages.map((page) => {
|
|
54
|
+
return page
|
|
55
|
+
.filter(filterPageByPatches(patches, { itemPredicate, itemKey }))
|
|
56
|
+
.map(transformItemByUpdateAllPatches(patches));
|
|
57
|
+
})
|
|
58
|
+
: finalPages;
|
|
57
59
|
const itemToMerge = prepareItemsToMergeIntoPage(patches, {
|
|
58
60
|
itemPredicate,
|
|
59
61
|
currentItemsMap,
|
|
60
62
|
});
|
|
61
|
-
if (!itemToMerge.all.size &&
|
|
63
|
+
if (!itemToMerge.all.size && _orderByMode === 'orders') {
|
|
62
64
|
return finalPages;
|
|
63
65
|
}
|
|
64
66
|
finalPages = finalPages.map((page, index) => {
|
|
@@ -71,7 +73,7 @@ export class CollectionOptimisticProcessor {
|
|
|
71
73
|
itemPredicate,
|
|
72
74
|
})
|
|
73
75
|
: page.map((item) => ({ item }));
|
|
74
|
-
return
|
|
76
|
+
return _orderByMode === 'moves'
|
|
75
77
|
? orderByMoves({
|
|
76
78
|
pageWithPatchedItems,
|
|
77
79
|
pageIndex: index,
|
|
@@ -88,6 +90,15 @@ export class CollectionOptimisticProcessor {
|
|
|
88
90
|
limit,
|
|
89
91
|
});
|
|
90
92
|
});
|
|
93
|
+
const patchedItemPredicate = filterByApplyAllPatches(patches, {
|
|
94
|
+
itemPredicate,
|
|
95
|
+
});
|
|
96
|
+
finalPages =
|
|
97
|
+
_orderByMode === 'moves'
|
|
98
|
+
? finalPages.map((page) => {
|
|
99
|
+
return page.filter(patchedItemPredicate);
|
|
100
|
+
})
|
|
101
|
+
: finalPages;
|
|
91
102
|
return finalPages;
|
|
92
103
|
}
|
|
93
104
|
beforeSetTotal({ total, originQuery, }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CollectionOptimisticProcessor.js","sourceRoot":"","sources":["../../../src/state/CollectionOptimisticProcessor.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAE9C,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAE9E,OAAO,EAAE,oCAAoC,EAAE,MAAM,+BAA+B,CAAC;AAErF,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,2BAA2B,EAC3B,+BAA+B,GAChC,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"CollectionOptimisticProcessor.js","sourceRoot":"","sources":["../../../src/state/CollectionOptimisticProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CollectionOptimisticProcessor.d.ts","sourceRoot":"","sources":["../../../src/state/CollectionOptimisticProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,UAAU,EACV,SAAS,EACV,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEvE,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,oCAAoC,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AAStF,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"CollectionOptimisticProcessor.d.ts","sourceRoot":"","sources":["../../../src/state/CollectionOptimisticProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,UAAU,EACV,SAAS,EACV,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEvE,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,oCAAoC,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AAStF,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,UAAU,UAAU,CAAC,CAAC,EAAE,CAAC,SAAS,UAAU;IAC1C,YAAY,EAAE,QAAQ,GAAG,OAAO,CAAC;IACjC,QAAQ,CAAC,KAAK,EAAE,gCAAgC,CAAC,CAAC,CAAC,CAAC;IACpD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;QAC5B,SAAS,EAAE,MAAM,IAAI,CAAC;QACtB,OAAO,EAAE,MAAM,IAAI,CAAC;KACrB,CAAC,CAAC;IACH,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,mCAAmC,CAAC,CAAC,EAAE,CAAC,SAAS,UAAU,CAC1E,SAAQ,OAAO,CAAC,qBAAqB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5C,QAAQ,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3C,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CACvC;AAED,qBAAa,6BAA6B,CAAC,CAAC,EAAE,CAAC,SAAS,UAAU;IAChE,QAAQ,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3C,QAAQ,CAAC,gBAAgB,EAAE,oCAAoC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACtE,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAEtC,QAAQ,CAAC,uBAAuB,EAAE,qBAAqB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9D,QAAQ,CAAC,SAAS,EAAE,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC;IAC9E,QAAQ,CAAC,OAAO,EAAE,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;gBAEtD,MAAM,EAAE,mCAAmC,CAAC,CAAC,EAAE,CAAC,CAAC;IAsB7D,SAAS;IAMT,SAAS;IAKT,uBAAuB;IAmBvB,iBAAiB,CAAC,EAChB,KAAK,EACL,eAAe,EACf,WAAW,GACZ,EAAE;QACD,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;QACb,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,WAAW,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;KACnC;IAqFD,cAAc,CAAC,EACb,KAAK,EACL,WAAW,GACZ,EAAE;QACD,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;KAC/B;CA4FF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@wix/bex-core",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.91.0",
|
|
4
4
|
"license": "UNLICENSED",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Kobi",
|
|
@@ -161,5 +161,5 @@
|
|
|
161
161
|
"wallaby": {
|
|
162
162
|
"autoDetect": true
|
|
163
163
|
},
|
|
164
|
-
"falconPackageHash": "
|
|
164
|
+
"falconPackageHash": "9449aa753356885b8187decc6fe2cc0e21ad3a1e532cc209b2a67e66"
|
|
165
165
|
}
|