@vuu-ui/vuu-data-local 3.5.17 → 3.5.18

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/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "3.5.17",
2
+ "version": "3.5.18",
3
3
  "main": "./src/index.js",
4
4
  "author": "heswell",
5
5
  "license": "Apache-2.0",
@@ -10,14 +10,14 @@
10
10
  "type-defs": "node ../../scripts/build-type-defs.mjs"
11
11
  },
12
12
  "devDependencies": {
13
- "@vuu-ui/vuu-data-types": "3.5.17",
14
- "@vuu-ui/vuu-table-types": "3.5.17",
15
- "@vuu-ui/vuu-filter-types": "3.5.17",
16
- "@vuu-ui/vuu-protocol-types": "3.5.17"
13
+ "@vuu-ui/vuu-data-types": "3.5.18",
14
+ "@vuu-ui/vuu-table-types": "3.5.18",
15
+ "@vuu-ui/vuu-filter-types": "3.5.18",
16
+ "@vuu-ui/vuu-protocol-types": "3.5.18"
17
17
  },
18
18
  "dependencies": {
19
- "@vuu-ui/vuu-filter-parser": "3.5.17",
20
- "@vuu-ui/vuu-utils": "3.5.17"
19
+ "@vuu-ui/vuu-filter-parser": "3.5.18",
20
+ "@vuu-ui/vuu-utils": "3.5.18"
21
21
  },
22
22
  "sideEffects": false,
23
23
  "files": [
@@ -319,15 +319,16 @@ class ArrayDataSource extends EventEmitter {
319
319
  }
320
320
  getFilterPredicate() {
321
321
  const { filterSpec: { filter, filterStruct: rawFilterStruct } } = combineFilters(this._config);
322
- const filterStruct = rawFilterStruct && filter && filterRequiresResolution(rawFilterStruct, getColumnsByNameForFilter(this.tableSchema, this.#filterColumnsByName)) ? parseFilter(filter) : rawFilterStruct;
322
+ const columnsByName = getColumnsByNameForFilter(this.tableSchema, this.#filterColumnsByName);
323
+ const filterStruct = rawFilterStruct && filter && filterRequiresResolution(rawFilterStruct, columnsByName) ? parseFilter(filter) : rawFilterStruct;
323
324
  if (filterStruct) {
324
325
  if (this.dataMap) {
325
326
  const { count: offset } = metadataKeys;
326
327
  const actualColumnMap = {};
327
328
  for (const [col, idx] of Object.entries(this.dataMap))actualColumnMap[col] = offset + idx;
328
- return filterPredicate(actualColumnMap, filterStruct);
329
+ return filterPredicate(actualColumnMap, filterStruct, columnsByName);
329
330
  }
330
- return filterPredicate(this.#columnMap, filterStruct);
331
+ return filterPredicate(this.#columnMap, filterStruct, columnsByName);
331
332
  }
332
333
  throw Error("filter must include filterStruct");
333
334
  }