@vuu-ui/vuu-data-remote 0.13.41 → 0.13.43

package/esm/inlined-worker.js

@@ -18,28 +18,6 @@ function partition(array, test, pass = [], fail = []) {
   return [pass, fail];
 }
 
-// ../vuu-utils/src/column-utils.ts
-var KEY = 6;
-var metadataKeys = {
-  IDX: 0,
-  RENDER_IDX: 1,
-  IS_LEAF: 2,
-  IS_EXPANDED: 3,
-  DEPTH: 4,
-  COUNT: 5,
-  KEY,
-  SELECTED: 7,
-  TIMESTAMP: 8,
-  IS_NEW: 9,
-  count: 10,
-  // TODO following only used in datamodel
-  PARENT_IDX: "parent_idx",
-  IDX_POINTER: "idx_pointer",
-  FILTER_COUNT: "filter_count",
-  NEXT_FILTER_IDX: "next_filter_idx"
-};
-var { DEPTH, IS_LEAF } = metadataKeys;
-
 // ../vuu-utils/src/cookie-utils.ts
 var getCookieValue = (name) => {
   var _a, _b;
@@ -430,53 +408,6 @@ var KeySet = class {
   }
 };
 
-// ../vuu-utils/src/selection-utils.ts
-var { SELECTED } = metadataKeys;
-var RowSelected = {
-  False: 0,
-  True: 1,
-  First: 2,
-  Last: 4
-};
-var rangeIncludes = (range, index) => index >= range[0] && index <= range[1];
-var SINGLE_SELECTED_ROW = RowSelected.True + RowSelected.First + RowSelected.Last;
-var FIRST_SELECTED_ROW_OF_BLOCK = RowSelected.True + RowSelected.First;
-var LAST_SELECTED_ROW_OF_BLOCK = RowSelected.True + RowSelected.Last;
-var getSelectionStatus = (selected, itemIndex) => {
-  for (const item of selected) {
-    if (typeof item === "number") {
-      if (item === itemIndex) {
-        return SINGLE_SELECTED_ROW;
-      }
-    } else if (rangeIncludes(item, itemIndex)) {
-      if (itemIndex === item[0]) {
-        return FIRST_SELECTED_ROW_OF_BLOCK;
-      } else if (itemIndex === item[1]) {
-        return LAST_SELECTED_ROW_OF_BLOCK;
-      } else {
-        return RowSelected.True;
-      }
-    }
-  }
-  return RowSelected.False;
-};
-var expandSelection = (selected) => {
-  if (selected.every((selectedItem) => typeof selectedItem === "number")) {
-    return selected;
-  }
-  const expandedSelected = [];
-  for (const selectedItem of selected) {
-    if (typeof selectedItem === "number") {
-      expandedSelected.push(selectedItem);
-    } else {
-      for (let i = selectedItem[0]; i <= selectedItem[1]; i++) {
-        expandedSelected.push(i);
-      }
-    }
-  }
-  return expandedSelected;
-};
-
 // ../vuu-utils/src/promise-utils.ts
 var _promise, _resolve, _reject, _resolved;
 var DeferredPromise = class {
@@ -522,6 +453,7 @@ var MENU_RPC_TYPES = [
   "VP_EDIT_DELETE_ROW_RPC",
   "VP_EDIT_SUBMIT_FORM_RPC"
 ];
+var isSelectRequest = (message) => "type" in message && (message.type === "SELECT_ROW" || message.type === "DESELECT_ROW" || message.type === "SELECT_ROW_RANGE" || message.type === "SELECT_ALL" || message.type === "DESELECT_ALL");
 var isRpcServiceRequest = (message) => message.type === "RPC_REQUEST";
 var hasViewPortContext = (message) => message.context.type === "VIEWPORT_CONTEXT";
 var isVuuMenuRpcRequest = (message) => MENU_RPC_TYPES.includes(message["type"]);
@@ -541,6 +473,9 @@ function isSessionTableActionMessage(rpcResponse) {
 }
 
 // src/message-utils.ts
+var hasRequestId = (message) => {
+  return "requestId" in message;
+};
 var stripRequestId = ({
   requestId,
   ...rest
@@ -600,21 +535,34 @@ var createSchemaFromTableMetadata = ({
     key
   };
 };
-var gapBetweenLastRowSentToClient = (lastRowsReturnedToClient, pendingUpdates, clientRange) => {
+var gapBetweenLastRowSentToClient = (lastRowsReturnedToClient, pendingUpdates, clientRange, rowCount) => {
   const firstPendingUpdate = pendingUpdates.at(0);
   const lastPendingUpdate = pendingUpdates.at(-1);
   if (firstPendingUpdate && lastPendingUpdate) {
+    const maxTo = Math.min(rowCount, clientRange.to);
     const [firstRowIndex, lastRowIndex] = lastRowsReturnedToClient;
     if (lastRowIndex < firstPendingUpdate.rowIndex - 1 && clientRange.from < firstPendingUpdate.rowIndex) {
       return {
         from: Math.max(lastRowIndex + 1, clientRange.from),
         to: firstPendingUpdate.rowIndex
       };
-    } else if (firstRowIndex > lastPendingUpdate.rowIndex + 1 && clientRange.to > lastPendingUpdate.rowIndex) {
+    } else if (firstRowIndex > lastPendingUpdate.rowIndex + 1 && maxTo > lastPendingUpdate.rowIndex) {
       return {
         from: lastPendingUpdate.rowIndex + 1,
-        to: Math.min(clientRange.to, firstRowIndex)
+        to: Math.min(maxTo, firstRowIndex)
       };
+    } else if (firstRowIndex === -1 && lastRowIndex === -1) {
+      if (clientRange.from < firstPendingUpdate.rowIndex) {
+        return {
+          from: clientRange.from,
+          to: firstPendingUpdate.rowIndex
+        };
+      } else if (maxTo > lastPendingUpdate.rowIndex + 1) {
+        return {
+          from: lastPendingUpdate.rowIndex + 1,
+          to: maxTo
+        };
+      }
     }
   }
 };
@@ -636,7 +584,6 @@ var LOGIN = "LOGIN";
 var OPEN_TREE_NODE = "OPEN_TREE_NODE";
 var OPEN_TREE_SUCCESS = "OPEN_TREE_SUCCESS";
 var REMOVE_VP = "REMOVE_VP";
-var SET_SELECTION_SUCCESS = "SET_SELECTION_SUCCESS";
 
 // src/server-proxy/array-backed-moving-window.ts
 var EMPTY_ARRAY = [];
@@ -914,7 +861,6 @@ var Viewport = class {
     __publicField(this, "pendingRangeRequests", []);
     __publicField(this, "postMessageToClient");
     __publicField(this, "rowCountChanged", false);
-    __publicField(this, "selectedRows", []);
     __publicField(this, "lastUpdateStatus", NO_UPDATE_STATUS);
     __publicField(this, "updateThrottleTimer");
     __publicField(this, "lastRowsReturnedToClient", [-1, -1]);
@@ -933,6 +879,10 @@ var Viewport = class {
     // Records SIZE only updates
     __publicField(this, "setLastSizeOnlyUpdateSize", (size) => {
       this.lastUpdateStatus.size = size;
+      if (size === 0) {
+        this.lastRowsReturnedToClient[0] = -1;
+        this.lastRowsReturnedToClient[1] = -1;
+      }
     });
     __publicField(this, "setLastUpdate", (mode) => {
       const { ts: lastTS, mode: lastMode } = this.lastUpdateStatus;
@@ -1254,7 +1204,7 @@ var Viewport = class {
         return [
           serverRequest,
           clientRows.map((row) => {
-            return toClient(row, this.keys, this.selectedRows);
+            return toClient(row, this.keys);
           })
         ];
       } else if (debounceRequest) {
@@ -1338,7 +1288,7 @@ var Viewport = class {
       const toClient = this.isTree ? toClientRowTree : toClientRow;
       for (const row of records) {
         if (row) {
-          out.push(toClient(row, keys, this.selectedRows));
+          out.push(toClient(row, keys));
         }
       }
     }
@@ -1383,15 +1333,18 @@ var Viewport = class {
       true
     );
   }
-  selectRequest(requestId, selected) {
-    this.selectedRows = selected;
-    this.awaitOperation(requestId, { type: "selection", data: selected });
-    info == null ? void 0 : info(\`selectRequest: \${selected}\`);
-    return {
-      type: "SET_SELECTION",
-      vpId: this.serverViewportId,
-      selection: expandSelection(selected)
-    };
+  selectRequest(request) {
+    info == null ? void 0 : info(\`selectRequest: \${request.type}\`);
+    if (this.serverViewportId) {
+      return {
+        ...request,
+        vpId: this.serverViewportId
+      };
+    } else {
+      throw Error(
+        \`[Viewport] cannot process \${request.type} before serverViewportId has been set\`
+      );
+    }
   }
   removePendingRangeRequest(firstIndex, lastIndex) {
     for (let i = this.pendingRangeRequests.length - 1; i >= 0; i--) {
@@ -1459,7 +1412,7 @@ var Viewport = class {
       return NO_DATA_UPDATE;
     }
     if (this.hasUpdates) {
-      const { keys, selectedRows } = this;
+      const { keys } = this;
       const toClient = this.isTree ? toClientRowTree : toClientRow;
       if (this.updateThrottleTimer) {
         self.clearTimeout(this.updateThrottleTimer);
@@ -1471,30 +1424,34 @@ var Viewport = class {
         const missingRows = gapBetweenLastRowSentToClient(
           this.lastRowsReturnedToClient,
           this.pendingUpdates,
-          this.dataWindow.clientRange
+          this.dataWindow.clientRange,
+          this.dataWindow.rowCount
         );
         if (missingRows) {
           for (let i = missingRows.from; i < missingRows.to; i++) {
             const row = this.dataWindow.getAtIndex(i);
             if (row) {
-              out.push(toClient(row, keys, selectedRows));
+              out.push(toClient(row, keys));
             } else {
               console.warn("[Viewport] missing row not in data cache");
             }
           }
           for (const row of this.pendingUpdates) {
-            out.push(toClient(row, keys, selectedRows));
+            out.push(toClient(row, keys));
           }
           out.sort(
             ([idx1], [idx2]) => idx1 - idx2
           );
         } else {
           for (const row of this.pendingUpdates) {
-            out.push(toClient(row, keys, selectedRows));
+            out.push(toClient(row, keys));
           }
         }
         this.lastRowsReturnedToClient[0] = (_b = (_a = out.at(0)) == null ? void 0 : _a[0]) != null ? _b : -1;
         this.lastRowsReturnedToClient[1] = (_d = (_c = out.at(-1)) == null ? void 0 : _c[0]) != null ? _d : -1;
+      } else if (this.pendingUpdates.length > 0) {
+        this.lastRowsReturnedToClient[0] = -1;
+        this.lastRowsReturnedToClient[1] = -1;
       }
       this.pendingUpdates.length = 0;
       this.hasUpdates = false;
@@ -1531,7 +1488,7 @@ var Viewport = class {
 _status = new WeakMap();
 _clientRange = new WeakMap();
 var isNew = false;
-var toClientRow = ({ rowIndex, rowKey, sel: isSelected, data, ts }, keys, selectedRows) => {
+var toClientRow = ({ rowIndex, rowKey, sel: isSelected, data, ts }, keys) => {
   return [
     rowIndex,
     keys.keyFor(rowIndex),
@@ -1540,12 +1497,12 @@ var toClientRow = ({ rowIndex, rowKey, sel: isSelected, data, ts }, keys, select
     0,
     0,
     rowKey,
-    isSelected ? getSelectionStatus(selectedRows, rowIndex) : 0,
+    isSelected,
     ts,
     isNew
   ].concat(data);
 };
-var toClientRowTree = ({ rowIndex, rowKey, sel: isSelected, data, ts }, keys, selectedRows) => {
+var toClientRowTree = ({ rowIndex, rowKey, sel: isSelected, data, ts }, keys) => {
   const [depth, isExpanded, , isLeaf, , count, ...rest] = data;
   return [
     rowIndex,
@@ -1555,7 +1512,7 @@ var toClientRowTree = ({ rowIndex, rowKey, sel: isSelected, data, ts }, keys, se
     depth,
     count,
     rowKey,
-    isSelected ? getSelectionStatus(selectedRows, rowIndex) : 0,
+    isSelected,
     ts,
     isNew
   ].concat(rest);
@@ -1698,10 +1655,6 @@ var ServerProxy = class {
             );
           }
         }
-        if (message.selectedIndexValues) {
-          infoEnabled2 && info2(\`selected = \${JSON.stringify(message.selectedIndexValues)}\`);
-          this.select(viewport, { selected: message.selectedIndexValues });
-        }
         if (viewport.disabled) {
           this.disableViewport(viewport);
         }
@@ -1861,10 +1814,9 @@ var ServerProxy = class {
     }
   }
   select(viewport, message) {
-    const requestId = nextRequestId();
-    const { selected } = message;
-    const request = viewport.selectRequest(requestId, selected);
-    this.sendIfReady(request, requestId, viewport.status === "subscribed");
+    const [requestId, selectRequest] = stripRequestId(message);
+    const request = viewport.selectRequest(selectRequest);
+    this.sendMessageToServer(request, requestId);
   }
   disableViewport(viewport) {
     const requestId = nextRequestId();
@@ -2019,8 +1971,6 @@ var ServerProxy = class {
             return this.setViewRange(viewport, message);
           case "config":
             return this.setConfig(viewport, message);
-          case "select":
-            return this.select(viewport, message);
           case "suspend":
             return this.suspendViewport(viewport);
           case "resume":
@@ -2040,6 +1990,13 @@ var ServerProxy = class {
           default:
         }
       }
+    } else if (isSelectRequest(message)) {
+      if (hasRequestId(message)) {
+        const viewport = this.getViewportForClient(message.vpId);
+        return this.select(viewport, message);
+      } else {
+        console.warn(\`selectRequest must have requestId\`);
+      }
     } else if (isRpcServiceRequest(message)) {
       return this.rpcRequest(message);
     } else if (isVuuMenuRpcRequest(message)) {
@@ -2128,7 +2085,7 @@ var ServerProxy = class {
     }
   }
   handleMessageFromServer(message) {
-    var _a, _b, _c;
+    var _a;
     const { body, requestId, sessionId } = message;
     const pendingRequest = this.pendingRequests.get(requestId);
     if (pendingRequest) {
@@ -2168,13 +2125,33 @@ var ServerProxy = class {
           }
         }
         break;
-      case SET_SELECTION_SUCCESS:
-        {
-          const viewport = this.viewports.get(body.vpId);
-          if (viewport) {
-            viewport.completeOperation(requestId);
-          }
-        }
+      case "SELECT_ALL_SUCCESS":
+      case "SELECT_ROW_SUCCESS":
+      case "SELECT_ROW_RANGE_SUCCESS":
+      case "DESELECT_ROW_SUCCESS": {
+        const { type, selectedRowCount } = body;
+        this.postMessageToClient({
+          requestId,
+          type,
+          selectedRowCount
+        });
+        break;
+      }
+      case "DESELECT_ALL_SUCCESS": {
+        const { type } = body;
+        this.postMessageToClient({
+          requestId,
+          type,
+          selectedRowCount: 0
+        });
+        break;
+      }
+      case "SELECT_ROW_REJECT":
+      case "DESELECT_ROW_REJECT":
+      case "SELECT_ROW_RANGE_REJECT":
+      case "SELECT_ALL_REJECT":
+      case "DESELECT_ALL_REJECT":
+        console.warn(\`select error \${body.type} \${body.errorMsg}\`);
         break;
       case CHANGE_VP_SUCCESS:
       case DISABLE_VP_SUCCESS:
@@ -2214,7 +2191,7 @@ var ServerProxy = class {
         {
           const viewportRowMap = groupRowsByViewport(body.rows);
           if (debugEnabled3) {
-            const [firstRow, secondRow] = body.rows;
+            const [firstRow] = body.rows;
             if (body.rows.length === 0) {
               infoEnabled2 && info2("handleMessageFromServer TABLE_ROW 0 rows");
             } else if ((firstRow == null ? void 0 : firstRow.rowIndex) === -1) {
@@ -2223,9 +2200,6 @@ var ServerProxy = class {
                   infoEnabled2 && info2(
                     \`handleMessageFromServer [\${firstRow.viewPortId}] TABLE_ROW SIZE ONLY \${firstRow.vpSize}\`
                   );
-                  infoEnabled2 && info2(
-                    \`handleMessageFromServer [\${firstRow.viewPortId}] TABLE_ROW SIZE ONLY \${firstRow.vpSize}\`
-                  );
                 } else {
                   infoEnabled2 && info2(
                     \`handleMessageFromServer [\${firstRow.viewPortId}] TABLE_ROW SIZE \${firstRow.vpSize} rowIdx \${firstRow.rowIndex}\`
@@ -2233,12 +2207,12 @@ var ServerProxy = class {
                 }
               } else {
                 infoEnabled2 && info2(
-                  \`handleMessageFromServer TABLE_ROW \${body.rows.length} rows, SIZE \${firstRow.vpSize}, [\${secondRow == null ? void 0 : secondRow.rowIndex}] - [\${(_b = body.rows[body.rows.length - 1]) == null ? void 0 : _b.rowIndex}]\`
+                  \`handleMessageFromServer TABLE_ROW \${body.rows.length} rows, SIZE \${firstRow.vpSize}, [\${body.rows.map((r) => r.rowIndex).join(",")}]\`
                 );
               }
             } else {
               infoEnabled2 && info2(
-                \`handleMessageFromServer TABLE_ROW \${body.rows.length} rows [\${firstRow == null ? void 0 : firstRow.rowIndex}] - [\${(_c = body.rows[body.rows.length - 1]) == null ? void 0 : _c.rowIndex}]\`
+                \`handleMessageFromServer TABLE_ROW \${body.rows.length} rows [\${body.rows.map((r) => r.rowIndex).join(",")}]\`
               );
             }
           }