@vuu-ui/vuu-data-local 4.0.0-alpha.3 → 4.0.0-alpha.31

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.0.0-alpha.3",
+  "version": "4.0.0-alpha.31",
   "main": "./src/index.js",
   "author": "heswell",
   "type": "module",
@@ -11,14 +11,14 @@
     "type-defs": "node ../../scripts/build-type-defs.mjs"
   },
   "devDependencies": {
-    "@vuu-ui/vuu-data-types": "4.0.0-alpha.3",
-    "@vuu-ui/vuu-table-types": "4.0.0-alpha.3",
-    "@vuu-ui/vuu-filter-types": "4.0.0-alpha.3",
-    "@vuu-ui/vuu-protocol-types": "4.0.0-alpha.3"
+    "@vuu-ui/vuu-data-types": "4.0.0-alpha.31",
+    "@vuu-ui/vuu-table-types": "4.0.0-alpha.31",
+    "@vuu-ui/vuu-filter-types": "4.0.0-alpha.31",
+    "@vuu-ui/vuu-protocol-types": "4.0.0-alpha.31"
   },
   "dependencies": {
-    "@vuu-ui/vuu-filter-parser": "4.0.0-alpha.3",
-    "@vuu-ui/vuu-utils": "4.0.0-alpha.3"
+    "@vuu-ui/vuu-filter-parser": "4.0.0-alpha.31",
+    "@vuu-ui/vuu-utils": "4.0.0-alpha.31"
   },
   "sideEffects": false,
   "files": [
@@ -28,8 +28,9 @@
   ],
   "exports": {
     ".": {
+      "types": "./types/index.d.ts",
       "import": "./src/index.js",
-      "types": "./types/index.d.ts"
+      "default": "./src/index.js"
     }
   },
   "module": "./src/index.js",

package/src/array-data-source/array-data-source.js

@@ -1,5 +1,5 @@
 import { filterPredicate, parseFilter } from "@vuu-ui/vuu-filter-parser";
-import { EventEmitter, KeySet, NULL_RANGE, Range, buildColumnMap, combineFilters, filterAsQuery, getAddedItems, hasBaseFilter, hasFilter, hasGroupBy, hasSort, isConfigChanged, isGroupByChanged, logger, metadataKeys, rangeNewItems, toSchemaColumn, uuid, vanillaConfig, withConfigDefaults } from "@vuu-ui/vuu-utils";
+import { EventEmitter, KeySet, NULL_RANGE, Range, buildColumnMap, combineFilters, filterAsQuery, filterRequiresResolution, getAddedItems, getColumnsByName, getColumnsByNameForFilter, hasBaseFilter, hasFilter, hasGroupBy, hasSort, isConfigChanged, isGroupByChanged, logger, metadataKeys, rangeNewItems, toSchemaColumn, uuid, vanillaConfig, withConfigDefaults } from "@vuu-ui/vuu-utils";
 import { aggregateData } from "./aggregate-utils.js";
 import { buildDataToClientMap, toClientRow } from "./array-data-utils.js";
 import { collapseGroup, expandGroup, groupRows } from "./group-utils.js";
@@ -49,6 +49,7 @@ class ArrayDataSource extends EventEmitter {
     openTreeNodes = [];
     preserveScrollPositionAcrossConfigChange = false;
     #columnMap;
+    #filterColumnsByName;
     _config = vanillaConfig;
     #data;
     #freezeTimestamp = void 0;
@@ -68,8 +69,9 @@ class ArrayDataSource extends EventEmitter {
         super();
         if (!data || !columnDescriptors) throw Error("ArrayDataSource constructor called without data or without columnDescriptors");
         this.columnDescriptors = columnDescriptors;
+        this.#filterColumnsByName = getColumnsByName(columnDescriptors);
         this.dataMap = dataMap;
-        this.key = keyColumn ? this.columnDescriptors.findIndex((col)=>col.name === keyColumn) : 0;
+        this.key = keyColumn ? dataMap?.[keyColumn] ?? this.columnDescriptors.findIndex((col)=>col.name === keyColumn) : 0;
         this.rangeChangeRowset = rangeChangeRowset;
         this.tableSchema = buildTableSchema(columnDescriptors, keyColumn);
         this.viewport = viewport || uuid();
@@ -118,8 +120,15 @@ class ArrayDataSource extends EventEmitter {
         };
         this.clientCallback?.(subscribedMessage);
         this.emit("subscribed", subscribedMessage);
-        if (hasConfigProps) this.config = config;
-        else {
+        if (hasConfigProps) {
+            if (range) {
+                this.constrainRangeToMaxRangeEnd(range);
+                this.#range = range;
+                this.#keys.reset(this.rangeWithBufferWithinMaxRangeEnd);
+            }
+            this.config = config;
+            this.sendRowsToClient(true);
+        } else {
             this.sendSizeUpdateToClient();
             this.emit("resize", this.processedData ? this.processedData.length : this.#data.length, this.#maxRangeEnd);
             if (range && !this.#range.equals(range)) this.range = range;
@@ -316,7 +325,8 @@ class ArrayDataSource extends EventEmitter {
         });
     }
     getFilterPredicate() {
-        const { filterSpec: { filterStruct } } = combineFilters(this._config);
+        const { filterSpec: { filter, filterStruct: rawFilterStruct } } = combineFilters(this._config);
+        const filterStruct = rawFilterStruct && filter && filterRequiresResolution(rawFilterStruct, getColumnsByNameForFilter(this.tableSchema, this.#filterColumnsByName)) ? parseFilter(filter) : rawFilterStruct;
         if (filterStruct) {
             if (this.dataMap) {
                 const { count: offset } = metadataKeys;
@@ -458,7 +468,7 @@ class ArrayDataSource extends EventEmitter {
         if (-1 !== dataIndex) {
             const dataSourceRow = toDataSourceRow(this.key)(row, dataIndex);
             this.#data[dataIndex] = dataSourceRow;
-            const { from, to } = this.#range;
+            const { from, to } = this.rangeWithBufferWithinMaxRangeEnd;
             const isFiltered = hasFilter(this.config) || hasBaseFilter(this.config);
             const isSorted = hasSort(this.config);
             if (isFiltered) {
@@ -617,9 +627,15 @@ class ArrayDataSource extends EventEmitter {
             filterSpec: filter
         };
     }
-    setFilter(filter) {
+    setFilter(filter, options) {
+        this.#filterColumnsByName = {
+            ...getColumnsByName(this.columnDescriptors),
+            ...options?.columnsByName
+        };
         const dataSourceFilter = {
-            filter: filterAsQuery(filter),
+            filter: filterAsQuery(filter, {
+                columnsByName: getColumnsByNameForFilter(this.tableSchema, this.#filterColumnsByName)
+            }),
             filterStruct: filter
         };
         this.filter = dataSourceFilter;

package/src/tree-data-source/TreeDataSource.js

@@ -1,39 +1,17 @@
 import { BaseDataSource, KeySet, NULL_RANGE, getParentRow, isSingleValueFilter, lastPathSegment, metadataKeys, missingAncestor, treeToDataSourceRows, uuid } from "@vuu-ui/vuu-utils";
 import { IconProvider } from "./IconProvider.js";
 import { parseFilter } from "@vuu-ui/vuu-filter-parser";
-const TREE_SCHEMA = {
-    columns: [
-        {
-            name: "nodeData",
-            serverDataType: "string"
-        },
-        {
-            name: "Level 1",
-            serverDataType: "string"
-        },
-        {
-            name: "Level 2",
-            serverDataType: "string"
-        },
-        {
-            name: "Level 3",
-            serverDataType: "string"
-        },
-        {
-            name: "Level 4",
-            serverDataType: "string"
-        },
-        {
-            name: "Level 5",
-            serverDataType: "string"
+const treeSchema = (columns)=>({
+        columns: columns.map(({ name })=>({
+                name,
+                serverDataType: "string"
+            })),
+        key: "",
+        table: {
+            module: "",
+            table: ""
         }
-    ],
-    key: "",
-    table: {
-        module: "",
-        table: ""
-    }
-};
+    });
 const { COUNT: COUNT, DEPTH: DEPTH, IDX: IDX, IS_EXPANDED: IS_EXPANDED, IS_LEAF: IS_LEAF, KEY: KEY, SELECTED: SELECTED } = metadataKeys;
 const toClientRow = (row, keys)=>{
     const [rowIndex] = row;
@@ -61,6 +39,8 @@ class TreeDataSource extends BaseDataSource {
         if (!data) throw Error("TreeDataSource constructor called without data");
         this.#iconProvider = new IconProvider();
         [this.columnDescriptors, this.#data] = treeToDataSourceRows(data, this.#iconProvider);
+        this.expandedRows = getInitiallyExpandedKeys(data);
+        console.table(this.#data);
         if (this.columnDescriptors) {
             const columns = this.columnDescriptors.map((c)=>c.name);
             this._configWithVisualLink = {
@@ -92,7 +72,7 @@ class TreeDataSource extends BaseDataSource {
             groupBy: this._configWithVisualLink.groupBy,
             range: this.range,
             sort: this.sort,
-            tableSchema: TREE_SCHEMA
+            tableSchema: treeSchema(this.columnDescriptors)
         });
         this.clientCallback({
             clientViewportId: this.viewport,
@@ -163,6 +143,7 @@ class TreeDataSource extends BaseDataSource {
     applySelectedKeyValues(keys, revealSelected = false) {
         keys.forEach((key)=>{
             const rowIdx = this.indexOfRowWithKey(key);
+            if (-1 === rowIdx) return;
             const row = this.#data[rowIdx];
             row[SELECTED] = 1;
             if (revealSelected && 1 !== row[DEPTH]) {
@@ -305,6 +286,14 @@ class TreeDataSource extends BaseDataSource {
         return this.visibleRows[rowIdx];
     }
 }
+const getInitiallyExpandedKeys = (treeSourceNodes, keyBase = "$root", expandedKeys = new Set())=>{
+    for (const { childNodes, expanded, label } of treeSourceNodes){
+        const key = `${keyBase}|${label}`;
+        if (expanded) expandedKeys.add(key);
+        if (childNodes) getInitiallyExpandedKeys(childNodes, key, expandedKeys);
+    }
+    return expandedKeys;
+};
 function getVisibleRows(rows, expandedKeys, filterset) {
     const visibleRows = [];
     const visibleRowIndex = {};

package/types/array-data-source/array-data-source.d.ts

@@ -1,4 +1,4 @@
-import type { DataSourceBase, DataSourceConstructorProps, DataSourceEvents, DataSourceFilter, DataSourceRow, DataSourceRowWithBigint, DataSourceStatus, DataSourceSubscribeCallback, DataSourceSubscribeProps, TableSchema, WithBaseFilter, WithFullConfig } from "@vuu-ui/vuu-data-types";
+import type { DataSourceBase, DataSourceConstructorProps, DataSourceEvents, DataSourceFilter, DataSourceRow, DataSourceRowWithBigint, DataSourceStatus, DataSourceSubscribeCallback, DataSourceSubscribeProps, SetFilterOptions, TableSchema, WithBaseFilter, WithFullConfig } from "@vuu-ui/vuu-data-types";
 import type { Filter } from "@vuu-ui/vuu-filter-types";
 import type { LinkDescriptorWithLabel, SelectRequest, VuuAggregation, VuuGroupBy, VuuMenu, VuuRowDataItemType, VuuRpcRequest, VuuRpcResponse, VuuSort } from "@vuu-ui/vuu-protocol-types";
 import type { ColumnDescriptor } from "@vuu-ui/vuu-table-types";
@@ -93,7 +93,7 @@ export declare class ArrayDataSource extends EventEmitter<DataSourceEvents> impl
     set baseFilter(baseFilter: DataSourceFilter | undefined);
     get filter(): DataSourceFilter;
     set filter(filter: DataSourceFilter);
-    setFilter(filter: Filter): void;
+    setFilter(filter: Filter, options?: SetFilterOptions): void;
     clearFilter(): void;
     get groupBy(): VuuGroupBy;
     set groupBy(groupBy: VuuGroupBy);