@vuu-ui/vuu-data-remote 3.5.12 → 3.5.13

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.5.12",
+  "version": "3.5.13",
   "main": "./src/index.js",
   "author": "heswell",
   "license": "Apache-2.0",
@@ -11,14 +11,14 @@
     "type-defs": "node ../../scripts/build-type-defs.mjs"
   },
   "devDependencies": {
-    "@vuu-ui/vuu-data-types": "3.5.12",
-    "@vuu-ui/vuu-table-types": "3.5.12",
-    "@vuu-ui/vuu-filter-types": "3.5.12",
-    "@vuu-ui/vuu-protocol-types": "3.5.12"
+    "@vuu-ui/vuu-data-types": "3.5.13",
+    "@vuu-ui/vuu-table-types": "3.5.13",
+    "@vuu-ui/vuu-filter-types": "3.5.13",
+    "@vuu-ui/vuu-protocol-types": "3.5.13"
   },
   "dependencies": {
-    "@vuu-ui/vuu-filter-parser": "3.5.12",
-    "@vuu-ui/vuu-utils": "3.5.12"
+    "@vuu-ui/vuu-filter-parser": "3.5.13",
+    "@vuu-ui/vuu-utils": "3.5.13"
   },
   "files": [
     "README.md",

package/src/VuuDataSource.js

@@ -4,19 +4,15 @@ import { isDataSourceConfigMessage } from "./data-source.js";
 const { info: info, infoEnabled: infoEnabled } = logger("VuuDataSource");
 const combineColumnsWithAutosubscribeColumns = (columns, autosubscribeColumns = [])=>{
     if (0 === autosubscribeColumns.length) return columns;
-    {
-        const out = columns.slice();
-        autosubscribeColumns.forEach((name)=>{
-            if (!out.includes(name)) out.push(name);
-        });
-        return out;
-    }
+    return Array.from(new Set([
+        ...columns,
+        ...autosubscribeColumns
+    ]));
 };
 class VuuDataSource extends BaseDataSource {
     bufferSize;
     server = null;
     rangeRequest;
-    #allColumns;
     #autosubscribeColumns = [];
     #pendingVisualLink;
     #links;
@@ -32,8 +28,11 @@ class VuuDataSource extends BaseDataSource {
     #tableSchema;
     isRemote = true;
     table;
-    constructor({ session, sessionTableMessageColumn, ...props }){
-        super(props);
+    constructor({ autosubscribeColumns, columns, session, sessionTableMessageColumn, ...props }){
+        super({
+            ...props,
+            columns: autosubscribeColumns ? combineColumnsWithAutosubscribeColumns(columns ?? [], autosubscribeColumns) : columns
+        });
         const { bufferSize = 100, table, visualLink } = props;
         if (!table) throw Error("RemoteDataSource constructor called without table");
         this.bufferSize = bufferSize;
@@ -42,13 +41,13 @@ class VuuDataSource extends BaseDataSource {
         this.#session = session;
         this.#sessionTableMessageColumn = sessionTableMessageColumn;
         this.rangeRequest = this.rawRangeRequest;
-        if (props.autosubscribeColumns) {
-            this.#autosubscribeColumns = props.autosubscribeColumns;
-            this.#allColumns = combineColumnsWithAutosubscribeColumns(super.columns, props.autosubscribeColumns);
-        }
+        if (autosubscribeColumns) this.#autosubscribeColumns = autosubscribeColumns;
     }
     async subscribe(subscribeProps, callback) {
-        super.subscribe(subscribeProps, callback);
+        super.subscribe(subscribeProps.columns && this.#autosubscribeColumns.length ? {
+            ...subscribeProps,
+            columns: combineColumnsWithAutosubscribeColumns(subscribeProps.columns, this.#autosubscribeColumns)
+        } : subscribeProps, callback);
         const { viewport = this.viewport || (this.viewport = uuid()) } = subscribeProps;
         if ("disabled" === this.#status || "disabling" === this.#status || "enabling" === this.#status) return void this.enable(callback);
         if ("initialising" !== this.#status && "unsubscribed" !== this.#status) throw Error(`[VuuDataSource] invalid status ${this.#status} for subscribe`);
@@ -252,11 +251,10 @@ class VuuDataSource extends BaseDataSource {
         }
     }
     get columns() {
-        return this.#allColumns ?? super.columns;
+        return super.columns;
     }
     set columns(columns) {
-        super.columns = columns;
-        if (this.#autosubscribeColumns.length) this.#allColumns = combineColumnsWithAutosubscribeColumns(columns, this.#autosubscribeColumns);
+        super.columns = combineColumnsWithAutosubscribeColumns(columns, this.#autosubscribeColumns);
     }
     get tableSchema() {
         return this.#tableSchema;
@@ -327,19 +325,17 @@ class VuuDataSource extends BaseDataSource {
         return super.config;
     }
     set config(config) {
-        const { noChanges, columnsChanged } = isConfigChanged(this.config, config);
+        const nextConfig = this.#autosubscribeColumns.length ? {
+            ...config,
+            columns: combineColumnsWithAutosubscribeColumns(config.columns, this.#autosubscribeColumns)
+        } : config;
+        const { noChanges } = isConfigChanged(this.config, nextConfig);
         if (!noChanges) {
-            super.config = config;
-            const { columns, ...dataSourceConfig } = combineFilters(this.config);
-            const serverConfig = {
-                ...dataSourceConfig,
-                columns: combineColumnsWithAutosubscribeColumns(columns, this.#autosubscribeColumns)
-            };
-            if (columnsChanged && this.#autosubscribeColumns.length) this.#allColumns = combineColumnsWithAutosubscribeColumns(columns, this.#autosubscribeColumns);
+            super.config = nextConfig;
             this.server?.send({
                 viewport: this.viewport,
                 type: "config",
-                config: serverConfig
+                config: combineFilters(this.config)
             });
         }
     }

package/types/VuuDataSource.d.ts

@@ -10,7 +10,7 @@ export declare class VuuDataSource extends BaseDataSource implements DataSourceB
     rangeRequest: RangeRequest;
     readonly isRemote = true;
     table: VuuTable;
-    constructor({ session, sessionTableMessageColumn, ...props }: DataSourceConstructorProps);
+    constructor({ autosubscribeColumns, columns, session, sessionTableMessageColumn, ...props }: DataSourceConstructorProps);
     subscribe(subscribeProps: DataSourceSubscribeProps, callback: DataSourceSubscribeCallback): Promise<void>;
     handleMessageFromServer: (message: DataSourceCallbackMessage) => void;
     handleSessionMessageFromServer: (msg: DataSourceCallbackMessage) => void;