@vuu-ui/vuu-data-remote 3.5.0-beta.4 → 3.5.1

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.5.0-beta.4",
+  "version": "3.5.1",
   "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.0-beta.4",
-    "@vuu-ui/vuu-table-types": "3.5.0-beta.4",
-    "@vuu-ui/vuu-filter-types": "3.5.0-beta.4",
-    "@vuu-ui/vuu-protocol-types": "3.5.0-beta.4"
+    "@vuu-ui/vuu-data-types": "3.5.1",
+    "@vuu-ui/vuu-table-types": "3.5.1",
+    "@vuu-ui/vuu-filter-types": "3.5.1",
+    "@vuu-ui/vuu-protocol-types": "3.5.1"
   },
   "dependencies": {
-    "@vuu-ui/vuu-filter-parser": "3.5.0-beta.4",
-    "@vuu-ui/vuu-utils": "3.5.0-beta.4"
+    "@vuu-ui/vuu-filter-parser": "3.5.1",
+    "@vuu-ui/vuu-utils": "3.5.1"
   },
   "files": [
     "README.md",

package/src/inlined-worker.js

@@ -348,9 +348,10 @@ var EMPTY = [];
 var KeySet = class {
   constructor(range) {
     __publicField(this, "keys", /* @__PURE__ */ new Map());
+    __publicField(this, "freeKeys", []);
     __publicField(this, "nextKeyValue", 0);
     __publicField(this, "range");
-    this.range = range;
+    this.range = { from: range.from, to: range.to };
     this.init(range);
   }
   next(free = EMPTY) {
@@ -362,6 +363,7 @@ var KeySet = class {
   }
   init({ from, to }) {
     this.keys.clear();
+    this.freeKeys.length = 0;
     this.nextKeyValue = 0;
     for (let rowIndex = from; rowIndex < to; rowIndex++) {
       const nextKeyValue = this.next();
@@ -369,27 +371,34 @@ var KeySet = class {
     }
     return true;
   }
-  reset(range) {
-    const { from, to } = range;
-    const newSize = to - from;
-    const currentSize = this.range.to - this.range.from;
-    this.range = range;
-    if (currentSize > newSize) {
-      return this.init(range);
-    }
-    const freeKeys = [];
+  /**
+   * Keys assigned to rows that remain within range are never changed, keys
+   * released by rows leaving the range are recycled for rows entering the
+   * range. Keys are never re-sequenced, clients may retain rows (and their
+   * keys) that remain within range, so re-assigning keys to those rows would
+   * risk duplicate keys on the client.
+   * Note: range is copied, callers may mutate the range object they pass.
+   * Returns false, keys are never resequenced.
+   */
+  reset({ from, to }) {
+    this.range = { from, to };
+    const { freeKeys } = this;
     this.keys.forEach((keyValue, rowIndex) => {
       if (rowIndex < from || rowIndex >= to) {
         freeKeys.push(keyValue);
         this.keys.delete(rowIndex);
       }
     });
+    let freeKeyIndex = 0;
     for (let rowIndex = from; rowIndex < to; rowIndex++) {
       if (!this.keys.has(rowIndex)) {
-        const nextKeyValue = this.next(freeKeys);
+        const nextKeyValue = freeKeyIndex < freeKeys.length ? freeKeys[freeKeyIndex++] : this.nextKeyValue++;
         this.keys.set(rowIndex, nextKeyValue);
       }
     }
+    if (freeKeyIndex > 0) {
+      freeKeys.splice(0, freeKeyIndex);
+    }
     return false;
   }
   keyFor(rowIndex) {
@@ -571,8 +580,9 @@ var ArrayBackedMovingWindow = class {
     __publicField(this, "setRowCount", (rowCount) => {
       var _a;
       (_a = log.info) == null ? void 0 : _a.call(log, \`setRowCount \${rowCount}\`);
-      if (rowCount < this.internalData.length) {
-        this.internalData.length = rowCount;
+      const dataLength = Math.max(0, rowCount - __privateGet(this, _range).from);
+      if (dataLength < this.internalData.length) {
+        this.internalData.length = dataLength;
       }
       if (rowCount < this.rowCount) {
         this.rowsWithinRange = 0;
@@ -655,6 +665,7 @@ var ArrayBackedMovingWindow = class {
     const currentFrom = this.clientRange.from;
     const currentTo = Math.min(this.clientRange.to, this.rowCount);
     if (from === currentFrom && to === currentTo) {
+      this.clientRange.to = to;
       return [false, EMPTY_ARRAY];
     }
     const originalRange = this.clientRange.copy();
@@ -669,18 +680,9 @@ var ArrayBackedMovingWindow = class {
     }
     const clientRows = [];
     const offset = __privateGet(this, _range).from;
-    if (to > originalRange.to) {
-      const start = Math.max(from, originalRange.to);
-      for (let i = start - offset; i < to - offset; i++) {
-        const row = this.internalData[i];
-        if (row) {
-          clientRows.push(row);
-        }
-      }
-    } else {
-      const end = Math.min(originalRange.from, to);
-      for (let i = from - offset; i < end - offset; i++) {
-        const row = this.internalData[i];
+    for (let i = from; i < to; i++) {
+      if (i < originalRange.from || i >= originalRange.to) {
+        const row = this.internalData[i - offset];
         if (row) {
           clientRows.push(row);
         }

package/src/server-proxy/array-backed-moving-window.js

@@ -33,7 +33,8 @@ class ArrayBackedMovingWindow {
     }
     setRowCount = (rowCount)=>{
         log.info?.(`setRowCount ${rowCount}`);
-        if (rowCount < this.internalData.length) this.internalData.length = rowCount;
+        const dataLength = Math.max(0, rowCount - this.#range.from);
+        if (dataLength < this.internalData.length) this.internalData.length = dataLength;
         if (rowCount < this.rowCount) {
             this.rowsWithinRange = 0;
             const end = Math.min(rowCount, this.clientRange.to);
@@ -68,10 +69,13 @@ class ArrayBackedMovingWindow {
         log.debug?.(`setClientRange ${from} - ${to}`);
         const currentFrom = this.clientRange.from;
         const currentTo = Math.min(this.clientRange.to, this.rowCount);
-        if (from === currentFrom && to === currentTo) return [
-            false,
-            EMPTY_ARRAY
-        ];
+        if (from === currentFrom && to === currentTo) {
+            this.clientRange.to = to;
+            return [
+                false,
+                EMPTY_ARRAY
+            ];
+        }
         const originalRange = this.clientRange.copy();
         this.clientRange.from = from;
         this.clientRange.to = to;
@@ -82,18 +86,9 @@ class ArrayBackedMovingWindow {
         }
         const clientRows = [];
         const offset = this.#range.from;
-        if (to > originalRange.to) {
-            const start = Math.max(from, originalRange.to);
-            for(let i = start - offset; i < to - offset; i++){
-                const row = this.internalData[i];
-                if (row) clientRows.push(row);
-            }
-        } else {
-            const end = Math.min(originalRange.from, to);
-            for(let i = from - offset; i < end - offset; i++){
-                const row = this.internalData[i];
-                if (row) clientRows.push(row);
-            }
+        for(let i = from; i < to; i++)if (i < originalRange.from || i >= originalRange.to) {
+            const row = this.internalData[i - offset];
+            if (row) clientRows.push(row);
         }
         const serverDataRequired = this.bufferBreakout(from, to);
         return [