@vuu-ui/vuu-utils 0.11.2 → 0.11.3

package/cjs/datasource/BaseDataSource.js

@@ -4,6 +4,7 @@ var vuuFilterParser = require('@vuu-ui/vuu-filter-parser');
 var eventEmitter = require('../event-emitter.js');
 var index = require('../nanoid/index.js');
 var datasourceUtils = require('./datasource-utils.js');
+var rangeUtils = require('../range-utils.js');
 
 var __defProp = Object.defineProperty;
 var __typeError = (msg) => {
@@ -33,7 +34,7 @@ class BaseDataSource extends eventEmitter.EventEmitter {
     __publicField(this, "_clientCallback");
     __publicField(this, "_config", datasourceUtils.vanillaConfig);
     __publicField(this, "_impendingConfig");
-    __publicField(this, "_range", { from: 0, to: 0 });
+    __publicField(this, "_range", rangeUtils.Range(0, 0));
     __publicField(this, "_size", 0);
     __publicField(this, "_title");
     __privateAdd(this, _pageCount, 0);
@@ -164,7 +165,9 @@ class BaseDataSource extends eventEmitter.EventEmitter {
       this._range = range;
       this.pageCount = Math.ceil(this._size / (range.to - range.from));
       this.rangeRequest(range);
-      this.emit("range", range);
+      requestAnimationFrame(() => {
+        this.emit("range", range);
+      });
     }
   }
   get size() {

package/cjs/datasource/BaseDataSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseDataSource.js","sources":["../../src/datasource/BaseDataSource.ts"],"sourcesContent":["import type {\n  DataSource,\n  DataSourceConfig,\n  DataSourceConstructorProps,\n  DataSourceEvents,\n  DataSourceFilter,\n  SubscribeCallback,\n  SubscribeProps,\n  WithBaseFilter,\n  WithFullConfig,\n} from \"@vuu-ui/vuu-data-types\";\nimport { parseFilter } from \"@vuu-ui/vuu-filter-parser\";\nimport {\n  LinkDescriptorWithLabel,\n  VuuAggregation,\n  VuuRange,\n  VuuSort,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport { EventEmitter } from \"../event-emitter\";\nimport { uuid } from \"../nanoid\";\nimport {\n  DataSourceConfigChanges,\n  isConfigChanged,\n  vanillaConfig,\n  withConfigDefaults,\n} from \"./datasource-utils\";\n\nexport type RuntimeConfig = WithBaseFilter<WithFullConfig> & {\n  visualLink?: LinkDescriptorWithLabel;\n};\n\nexport abstract class BaseDataSource\n  extends EventEmitter<DataSourceEvents>\n  implements Pick<DataSource, \"config\">\n{\n  // This should simply be id\n  public viewport: string;\n\n  protected _clientCallback: SubscribeCallback | undefined;\n  protected _config: RuntimeConfig = vanillaConfig;\n  protected _impendingConfig: RuntimeConfig | undefined = undefined;\n  protected _range: VuuRange = { from: 0, to: 0 };\n  protected _size = 0;\n  protected _title: string | undefined;\n\n  #pageCount = 0;\n\n  private awaitingConfirmationOfConfigChanges = false;\n\n  constructor({\n    aggregations,\n    baseFilterSpec,\n    columns,\n    filterSpec,\n    groupBy,\n    sort,\n    title,\n    viewport,\n  }: Omit<DataSourceConstructorProps, \"table\">) {\n    super();\n    this._config = {\n      ...this._config,\n      aggregations: aggregations || this._config.aggregations,\n      baseFilterSpec: baseFilterSpec || this._config.baseFilterSpec,\n      columns: columns || this._config.columns,\n      filterSpec: filterSpec || this._config.filterSpec,\n      groupBy: groupBy || this._config.groupBy,\n      sort: sort || this._config.sort,\n    };\n\n    this._title = title;\n    this.viewport = viewport ?? \"\";\n  }\n\n  subscribe(\n    {\n      baseFilterSpec,\n      columns,\n      aggregations,\n      range,\n      sort,\n      groupBy,\n      filterSpec,\n      viewport = this.viewport || (this.viewport = uuid()),\n    }: SubscribeProps,\n    callback: SubscribeCallback,\n  ) {\n    this._clientCallback = callback;\n    this.viewport = viewport;\n\n    if (\n      aggregations ||\n      baseFilterSpec ||\n      columns ||\n      filterSpec ||\n      groupBy ||\n      sort\n    ) {\n      this._config = {\n        ...this._config,\n        aggregations: aggregations || this._config.aggregations,\n        baseFilterSpec: baseFilterSpec || this._config.baseFilterSpec,\n        columns: columns || this._config.columns,\n        filterSpec: filterSpec || this._config.filterSpec,\n        groupBy: groupBy || this._config.groupBy,\n        sort: sort || this._config.sort,\n      };\n    }\n\n    // store the range before we await the server. It's is possible the\n    // range will be updated from the client before we have been able to\n    // subscribe. This ensures we will subscribe with latest value.\n    if (range) {\n      this._range = range;\n    }\n  }\n\n  get aggregations() {\n    return this._config.aggregations;\n  }\n\n  set aggregations(aggregations: VuuAggregation[]) {\n    this.config = {\n      ...this._config,\n      aggregations,\n    };\n    this.emit(\"config\", this._config, this.range);\n  }\n\n  get baseFilter() {\n    return this._config.baseFilterSpec;\n  }\n\n  set baseFilter(baseFilter: DataSourceFilter | undefined) {\n    this.config = {\n      ...this._config,\n      baseFilterSpec: baseFilter,\n    };\n  }\n\n  get columns() {\n    return this._config.columns;\n  }\n\n  set columns(columns: string[]) {\n    this.config = {\n      ...this._config,\n      columns,\n    };\n    this.emit(\"config\", this._config, this.range);\n  }\n\n  get filter() {\n    return this._config.filterSpec;\n  }\n\n  set filter(filter: DataSourceFilter) {\n    this.config = {\n      ...this._config,\n      filterSpec: filter,\n    };\n  }\n\n  get isAwaitingConfirmationOfConfigChange() {\n    return this._impendingConfig !== undefined;\n  }\n\n  protected confirmConfigChange() {\n    if (this._impendingConfig) {\n      this._config = this._impendingConfig;\n      this._impendingConfig = undefined;\n      this.emit(\"config\", this._config, this.range, true);\n    } else {\n      throw Error(\n        `[BaseDataSource], unexpected call to confirmConfigChange, no changes pending`,\n      );\n    }\n  }\n\n  get config() {\n    return this._impendingConfig ?? this._config;\n  }\n\n  set config(config: WithBaseFilter<WithFullConfig>) {\n    const confirmed = this.awaitingConfirmationOfConfigChanges\n      ? true\n      : undefined;\n    // TODO what happens if config is set and we still have an unconfirmed change ?\n    this.awaitingConfirmationOfConfigChanges = false;\n    const configChanges = this.applyConfig(config);\n    if (configChanges) {\n      this.emit(\"config\", this.config, this.range, confirmed, configChanges);\n    }\n  }\n\n  set impendingConfig(config: WithBaseFilter<WithFullConfig>) {\n    this.awaitingConfirmationOfConfigChanges = true;\n    const configChanges = this.applyConfig(config);\n    if (configChanges) {\n      this.emit(\"config\", this.config, this.range, false, configChanges);\n    }\n  }\n\n  get pageCount() {\n    return this.#pageCount;\n  }\n\n  set pageCount(pageCount: number) {\n    if (pageCount !== this.#pageCount) {\n      this.#pageCount = pageCount;\n      this.emit(\"page-count\", pageCount);\n    }\n  }\n\n  get range() {\n    return this._range;\n  }\n\n  set range(range: VuuRange) {\n    if (range.from !== this._range.from || range.to !== this._range.to) {\n      this._range = range;\n      this.pageCount = Math.ceil(this._size / (range.to - range.from));\n\n      this.rangeRequest(range);\n\n      this.emit(\"range\", range);\n    }\n  }\n\n  get size() {\n    return this._size;\n  }\n\n  set size(size: number) {\n    this._size = size;\n    if (this.range.to !== 0) {\n      const pageCount = Math.ceil(size / (this.range.to - this.range.from));\n      this.pageCount = pageCount;\n    }\n  }\n\n  get sort() {\n    return this._config.sort;\n  }\n\n  set sort(sort: VuuSort) {\n    this.config = {\n      ...this._config,\n      sort,\n    };\n    this.emit(\"config\", this._config, this.range);\n  }\n\n  get title() {\n    return this._title ?? \"\";\n  }\n\n  set title(title: string) {\n    this._title = title;\n    this.emit(\"title-changed\", this.viewport ?? \"\", title);\n  }\n\n  // Public while we use this from useSessionDataSource\n  public applyConfig(\n    config: WithBaseFilter<DataSourceConfig>,\n    preserveExistingConfigAttributes = false,\n  ): DataSourceConfigChanges | undefined {\n    const { noChanges, ...otherChanges } = isConfigChanged(\n      this._config,\n      config,\n    );\n    if (noChanges !== true) {\n      if (config) {\n        const newConfig: DataSourceConfig =\n          config?.filterSpec?.filter &&\n          config?.filterSpec.filterStruct === undefined\n            ? {\n                ...config,\n                filterSpec: {\n                  filter: config.filterSpec.filter,\n                  filterStruct: parseFilter(config.filterSpec.filter),\n                },\n              }\n            : config;\n        if (preserveExistingConfigAttributes) {\n          if (this.awaitingConfirmationOfConfigChanges) {\n            this._impendingConfig = {\n              ...this._config,\n              ...config,\n            };\n          } else {\n            this._impendingConfig = undefined;\n            this._config = {\n              ...this._config,\n              ...config,\n            };\n          }\n        } else {\n          if (this.awaitingConfirmationOfConfigChanges) {\n            this._impendingConfig = withConfigDefaults(newConfig);\n          } else {\n            this._impendingConfig = undefined;\n            this._config = withConfigDefaults(newConfig);\n          }\n        }\n        return otherChanges;\n      }\n    }\n  }\n\n  abstract rangeRequest(range: VuuRange): void;\n}\n"],"names":["EventEmitter","vanillaConfig","uuid","isConfigChanged","parseFilter","withConfigDefaults"],"mappings":"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"}
+{"version":3,"file":"BaseDataSource.js","sources":["../../src/datasource/BaseDataSource.ts"],"sourcesContent":["import type {\n  DataSource,\n  DataSourceConfig,\n  DataSourceConstructorProps,\n  DataSourceEvents,\n  DataSourceFilter,\n  DataSourceSubscribeCallback,\n  DataSourceSubscribeProps,\n  WithBaseFilter,\n  WithFullConfig,\n} from \"@vuu-ui/vuu-data-types\";\nimport { parseFilter } from \"@vuu-ui/vuu-filter-parser\";\nimport {\n  LinkDescriptorWithLabel,\n  VuuAggregation,\n  VuuRange,\n  VuuSort,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport { EventEmitter } from \"../event-emitter\";\nimport { uuid } from \"../nanoid\";\nimport {\n  DataSourceConfigChanges,\n  isConfigChanged,\n  vanillaConfig,\n  withConfigDefaults,\n} from \"./datasource-utils\";\nimport { Range } from \"../range-utils\";\n\nexport type RuntimeConfig = WithBaseFilter<WithFullConfig> & {\n  visualLink?: LinkDescriptorWithLabel;\n};\n\nexport abstract class BaseDataSource\n  extends EventEmitter<DataSourceEvents>\n  implements Pick<DataSource, \"config\">\n{\n  // This should simply be id\n  public viewport: string;\n\n  protected _clientCallback: DataSourceSubscribeCallback | undefined;\n  protected _config: RuntimeConfig = vanillaConfig;\n  protected _impendingConfig: RuntimeConfig | undefined = undefined;\n  protected _range = Range(0, 0);\n  protected _size = 0;\n  protected _title: string | undefined;\n\n  #pageCount = 0;\n\n  private awaitingConfirmationOfConfigChanges = false;\n\n  constructor({\n    aggregations,\n    baseFilterSpec,\n    columns,\n    filterSpec,\n    groupBy,\n    sort,\n    title,\n    viewport,\n  }: Omit<DataSourceConstructorProps, \"table\">) {\n    super();\n    this._config = {\n      ...this._config,\n      aggregations: aggregations || this._config.aggregations,\n      baseFilterSpec: baseFilterSpec || this._config.baseFilterSpec,\n      columns: columns || this._config.columns,\n      filterSpec: filterSpec || this._config.filterSpec,\n      groupBy: groupBy || this._config.groupBy,\n      sort: sort || this._config.sort,\n    };\n\n    this._title = title;\n    this.viewport = viewport ?? \"\";\n  }\n\n  subscribe(\n    {\n      baseFilterSpec,\n      columns,\n      aggregations,\n      range,\n      sort,\n      groupBy,\n      filterSpec,\n      viewport = this.viewport || (this.viewport = uuid()),\n    }: DataSourceSubscribeProps,\n    callback: DataSourceSubscribeCallback,\n  ) {\n    this._clientCallback = callback;\n    this.viewport = viewport;\n\n    if (\n      aggregations ||\n      baseFilterSpec ||\n      columns ||\n      filterSpec ||\n      groupBy ||\n      sort\n    ) {\n      this._config = {\n        ...this._config,\n        aggregations: aggregations || this._config.aggregations,\n        baseFilterSpec: baseFilterSpec || this._config.baseFilterSpec,\n        columns: columns || this._config.columns,\n        filterSpec: filterSpec || this._config.filterSpec,\n        groupBy: groupBy || this._config.groupBy,\n        sort: sort || this._config.sort,\n      };\n    }\n\n    // store the range before we await the server. It's is possible the\n    // range will be updated from the client before we have been able to\n    // subscribe. This ensures we will subscribe with latest value.\n    if (range) {\n      this._range = range;\n    }\n  }\n\n  get aggregations() {\n    return this._config.aggregations;\n  }\n\n  set aggregations(aggregations: VuuAggregation[]) {\n    this.config = {\n      ...this._config,\n      aggregations,\n    };\n    this.emit(\"config\", this._config, this.range);\n  }\n\n  get baseFilter() {\n    return this._config.baseFilterSpec;\n  }\n\n  set baseFilter(baseFilter: DataSourceFilter | undefined) {\n    this.config = {\n      ...this._config,\n      baseFilterSpec: baseFilter,\n    };\n  }\n\n  get columns() {\n    return this._config.columns;\n  }\n\n  set columns(columns: string[]) {\n    this.config = {\n      ...this._config,\n      columns,\n    };\n    this.emit(\"config\", this._config, this.range);\n  }\n\n  get filter() {\n    return this._config.filterSpec;\n  }\n\n  set filter(filter: DataSourceFilter) {\n    this.config = {\n      ...this._config,\n      filterSpec: filter,\n    };\n  }\n\n  get isAwaitingConfirmationOfConfigChange() {\n    return this._impendingConfig !== undefined;\n  }\n\n  protected confirmConfigChange() {\n    if (this._impendingConfig) {\n      this._config = this._impendingConfig;\n      this._impendingConfig = undefined;\n      this.emit(\"config\", this._config, this.range, true);\n    } else {\n      throw Error(\n        `[BaseDataSource], unexpected call to confirmConfigChange, no changes pending`,\n      );\n    }\n  }\n\n  get config() {\n    return this._impendingConfig ?? this._config;\n  }\n\n  set config(config: WithBaseFilter<WithFullConfig>) {\n    const confirmed = this.awaitingConfirmationOfConfigChanges\n      ? true\n      : undefined;\n    // TODO what happens if config is set and we still have an unconfirmed change ?\n    this.awaitingConfirmationOfConfigChanges = false;\n    const configChanges = this.applyConfig(config);\n    if (configChanges) {\n      this.emit(\"config\", this.config, this.range, confirmed, configChanges);\n    }\n  }\n\n  set impendingConfig(config: WithBaseFilter<WithFullConfig>) {\n    this.awaitingConfirmationOfConfigChanges = true;\n    const configChanges = this.applyConfig(config);\n    if (configChanges) {\n      this.emit(\"config\", this.config, this.range, false, configChanges);\n    }\n  }\n\n  get pageCount() {\n    return this.#pageCount;\n  }\n\n  set pageCount(pageCount: number) {\n    if (pageCount !== this.#pageCount) {\n      this.#pageCount = pageCount;\n      this.emit(\"page-count\", pageCount);\n    }\n  }\n\n  get range() {\n    return this._range;\n  }\n\n  set range(range: Range) {\n    if (range.from !== this._range.from || range.to !== this._range.to) {\n      this._range = range;\n      this.pageCount = Math.ceil(this._size / (range.to - range.from));\n      this.rangeRequest(range);\n      requestAnimationFrame(() => {\n        this.emit(\"range\", range);\n      });\n    }\n  }\n\n  get size() {\n    return this._size;\n  }\n\n  set size(size: number) {\n    this._size = size;\n    if (this.range.to !== 0) {\n      const pageCount = Math.ceil(size / (this.range.to - this.range.from));\n      this.pageCount = pageCount;\n    }\n  }\n\n  get sort() {\n    return this._config.sort;\n  }\n\n  set sort(sort: VuuSort) {\n    this.config = {\n      ...this._config,\n      sort,\n    };\n    this.emit(\"config\", this._config, this.range);\n  }\n\n  get title() {\n    return this._title ?? \"\";\n  }\n\n  set title(title: string) {\n    this._title = title;\n    this.emit(\"title-changed\", this.viewport ?? \"\", title);\n  }\n\n  // Public while we use this from useSessionDataSource\n  public applyConfig(\n    config: WithBaseFilter<DataSourceConfig>,\n    preserveExistingConfigAttributes = false,\n  ): DataSourceConfigChanges | undefined {\n    const { noChanges, ...otherChanges } = isConfigChanged(\n      this._config,\n      config,\n    );\n    if (noChanges !== true) {\n      if (config) {\n        const newConfig: DataSourceConfig =\n          config?.filterSpec?.filter &&\n          config?.filterSpec.filterStruct === undefined\n            ? {\n                ...config,\n                filterSpec: {\n                  filter: config.filterSpec.filter,\n                  filterStruct: parseFilter(config.filterSpec.filter),\n                },\n              }\n            : config;\n        if (preserveExistingConfigAttributes) {\n          if (this.awaitingConfirmationOfConfigChanges) {\n            this._impendingConfig = {\n              ...this._config,\n              ...config,\n            };\n          } else {\n            this._impendingConfig = undefined;\n            this._config = {\n              ...this._config,\n              ...config,\n            };\n          }\n        } else {\n          if (this.awaitingConfirmationOfConfigChanges) {\n            this._impendingConfig = withConfigDefaults(newConfig);\n          } else {\n            this._impendingConfig = undefined;\n            this._config = withConfigDefaults(newConfig);\n          }\n        }\n        return otherChanges;\n      }\n    }\n  }\n\n  abstract rangeRequest(range: VuuRange): void;\n}\n"],"names":["EventEmitter","vanillaConfig","Range","uuid","isConfigChanged","parseFilter","withConfigDefaults"],"mappings":"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"}

package/cjs/index.js

@@ -342,11 +342,10 @@ exports.vuuAddRowRequest = protocolMessageUtils.vuuAddRowRequest;
 exports.vuuDeleteRowRequest = protocolMessageUtils.vuuDeleteRowRequest;
 exports.vuuEditCellRequest = protocolMessageUtils.vuuEditCellRequest;
 exports.NULL_RANGE = rangeUtils.NULL_RANGE;
+exports.Range = rangeUtils.Range;
 exports.WindowRange = rangeUtils.WindowRange;
 exports.getFullRange = rangeUtils.getFullRange;
 exports.rangeNewItems = rangeUtils.rangeNewItems;
-exports.rangesAreSame = rangeUtils.rangesAreSame;
-exports.resetRange = rangeUtils.resetRange;
 exports.withinRange = rangeUtils.withinRange;
 exports.actualRowPositioning = rowUtils.actualRowPositioning;
 exports.asDataSourceRowObject = rowUtils.asDataSourceRowObject;

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/cjs/moving-window.js

@@ -27,6 +27,7 @@ class MovingWindow {
       }
       this.rowCount = rowCount;
     });
+    console.log(`[MovingWindow] new (${from}:${to})`);
     __privateSet(this, _range, new rangeUtils.WindowRange(from, to));
     this.data = new Array(Math.max(0, to - from));
     this.rowCount = 0;
@@ -52,6 +53,7 @@ class MovingWindow {
     return __privateGet(this, _range).isWithin(index);
   }
   setRange({ from, to }) {
+    console.log(`[MovingWindow] setRange (${from}:${to})`);
     if (from !== __privateGet(this, _range).from || to !== __privateGet(this, _range).to) {
       const [overlapFrom, overlapTo] = __privateGet(this, _range).overlap(from, to);
       const newData = new Array(Math.max(0, to - from));

package/cjs/moving-window.js.map

@@ -1 +1 @@
-{"version":3,"file":"moving-window.js","sources":["../src/moving-window.ts"],"sourcesContent":["import { DataSourceRow } from \"@vuu-ui/vuu-data-types\";\nimport {\n  isRowSelectedLast,\n  metadataKeys,\n  WindowRange,\n} from \"@vuu-ui/vuu-utils\";\nimport { VuuRange } from \"@vuu-ui/vuu-protocol-types\";\n\nconst { SELECTED } = metadataKeys;\n\nexport class MovingWindow {\n  public data: DataSourceRow[];\n  public rowCount = 0;\n  #range: WindowRange;\n\n  constructor({ from, to }: VuuRange) {\n    this.#range = new WindowRange(from, to);\n    //internal data is always 0 based, we add range.from to determine an offset\n    this.data = new Array(Math.max(0, to - from));\n    this.rowCount = 0;\n  }\n\n  setRowCount = (rowCount: number) => {\n    if (rowCount < this.data.length) {\n      this.data.length = rowCount;\n    }\n\n    this.rowCount = rowCount;\n  };\n\n  add(data: DataSourceRow) {\n    const [index] = data;\n    if (this.isWithinRange(index)) {\n      const internalIndex = index - this.#range.from;\n      this.data[internalIndex] = data;\n\n      // Hack until we can deal with this more elegantly. When we have a block\n      // select operation, first row is selected (and updated via server), then\n      // remaining rows are selected when we select the block-end row. We get an\n      // update for all rows except first. Because we're extending the select status\n      // on the client, we have to adjust the first row selected (its still selected\n      // but is no longer the 'last selected row in block')\n      // Maybe answer is to apply ALL the selection status code here, not in Viewport\n      if (data[SELECTED]) {\n        const previousRow = this.data[internalIndex - 1];\n        if (isRowSelectedLast(previousRow)) {\n          this.data[internalIndex - 1] = previousRow.slice() as DataSourceRow;\n          this.data[internalIndex - 1][SELECTED] -= 4;\n        }\n      }\n    }\n  }\n\n  getAtIndex(index: number) {\n    return this.#range.isWithin(index) &&\n      this.data[index - this.#range.from] != null\n      ? this.data[index - this.#range.from]\n      : undefined;\n  }\n\n  isWithinRange(index: number) {\n    return this.#range.isWithin(index);\n  }\n\n  setRange({ from, to }: VuuRange) {\n    if (from !== this.#range.from || to !== this.#range.to) {\n      const [overlapFrom, overlapTo] = this.#range.overlap(from, to);\n      const newData = new Array(Math.max(0, to - from));\n      for (let i = overlapFrom; i < overlapTo; i++) {\n        const data = this.getAtIndex(i);\n        if (data) {\n          const index = i - from;\n          newData[index] = data;\n        }\n      }\n      this.data = newData;\n      this.#range.from = from;\n      this.#range.to = to;\n    }\n  }\n\n  getSelectedRows() {\n    return this.data.filter((row) => row[SELECTED] !== 0);\n  }\n\n  get range() {\n    return this.#range;\n  }\n\n  slice(): DataSourceRow[] {\n    const data: DataSourceRow[] = [];\n    const { from } = this.range;\n    for (let i = 0; i < this.data.length; i++) {\n      if (this.data[i]) {\n        data.push(this.data[i]);\n      } else {\n        data.push([from + i, from + i, true, false, 1, 0, \"\", 0]);\n      }\n    }\n    return data;\n  }\n\n  // TODO make this more performant, see implementation in\n  // array-backed-moving-window - use same implementation\n  get hasAllRowsWithinRange(): boolean {\n    const { from, to } = this.#range;\n\n    for (let i = from; i < to; i++) {\n      if (this.getAtIndex(i) === undefined) {\n        return false;\n      }\n    }\n    return true;\n  }\n}\n"],"names":["metadataKeys","WindowRange","isRowSelectedLast"],"mappings":"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"}
+{"version":3,"file":"moving-window.js","sources":["../src/moving-window.ts"],"sourcesContent":["import { DataSourceRow } from \"@vuu-ui/vuu-data-types\";\nimport {\n  isRowSelectedLast,\n  metadataKeys,\n  WindowRange,\n} from \"@vuu-ui/vuu-utils\";\nimport { VuuRange } from \"@vuu-ui/vuu-protocol-types\";\n\nconst { SELECTED } = metadataKeys;\n\nexport class MovingWindow {\n  public data: DataSourceRow[];\n  public rowCount = 0;\n  #range: WindowRange;\n\n  constructor({ from, to }: VuuRange) {\n    console.log(`[MovingWindow] new (${from}:${to})`);\n    this.#range = new WindowRange(from, to);\n    //internal data is always 0 based, we add range.from to determine an offset\n    this.data = new Array(Math.max(0, to - from));\n    this.rowCount = 0;\n  }\n\n  setRowCount = (rowCount: number) => {\n    if (rowCount < this.data.length) {\n      this.data.length = rowCount;\n    }\n\n    this.rowCount = rowCount;\n  };\n\n  add(data: DataSourceRow) {\n    const [index] = data;\n    if (this.isWithinRange(index)) {\n      const internalIndex = index - this.#range.from;\n      this.data[internalIndex] = data;\n\n      // Hack until we can deal with this more elegantly. When we have a block\n      // select operation, first row is selected (and updated via server), then\n      // remaining rows are selected when we select the block-end row. We get an\n      // update for all rows except first. Because we're extending the select status\n      // on the client, we have to adjust the first row selected (its still selected\n      // but is no longer the 'last selected row in block')\n      // Maybe answer is to apply ALL the selection status code here, not in Viewport\n      if (data[SELECTED]) {\n        const previousRow = this.data[internalIndex - 1];\n        if (isRowSelectedLast(previousRow)) {\n          this.data[internalIndex - 1] = previousRow.slice() as DataSourceRow;\n          this.data[internalIndex - 1][SELECTED] -= 4;\n        }\n      }\n    }\n  }\n\n  getAtIndex(index: number) {\n    return this.#range.isWithin(index) &&\n      this.data[index - this.#range.from] != null\n      ? this.data[index - this.#range.from]\n      : undefined;\n  }\n\n  isWithinRange(index: number) {\n    return this.#range.isWithin(index);\n  }\n\n  setRange({ from, to }: VuuRange) {\n    console.log(`[MovingWindow] setRange (${from}:${to})`);\n\n    if (from !== this.#range.from || to !== this.#range.to) {\n      const [overlapFrom, overlapTo] = this.#range.overlap(from, to);\n      const newData = new Array(Math.max(0, to - from));\n      for (let i = overlapFrom; i < overlapTo; i++) {\n        const data = this.getAtIndex(i);\n        if (data) {\n          const index = i - from;\n          newData[index] = data;\n        }\n      }\n      this.data = newData;\n      this.#range.from = from;\n      this.#range.to = to;\n    }\n  }\n\n  getSelectedRows() {\n    return this.data.filter((row) => row[SELECTED] !== 0);\n  }\n\n  get range() {\n    return this.#range;\n  }\n\n  slice(): DataSourceRow[] {\n    const data: DataSourceRow[] = [];\n    const { from } = this.range;\n    for (let i = 0; i < this.data.length; i++) {\n      if (this.data[i]) {\n        data.push(this.data[i]);\n      } else {\n        data.push([from + i, from + i, true, false, 1, 0, \"\", 0]);\n      }\n    }\n    return data;\n  }\n\n  // TODO make this more performant, see implementation in\n  // array-backed-moving-window - use same implementation\n  get hasAllRowsWithinRange(): boolean {\n    const { from, to } = this.#range;\n\n    for (let i = from; i < to; i++) {\n      if (this.getAtIndex(i) === undefined) {\n        return false;\n      }\n    }\n    return true;\n  }\n}\n"],"names":["metadataKeys","WindowRange","isRowSelectedLast"],"mappings":"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"}

package/cjs/range-utils.js

@@ -1,12 +1,97 @@
 'use strict';
 
 var __defProp = Object.defineProperty;
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-const NULL_RANGE = { from: 0, to: 0 };
-const rangesAreSame = (r1, r2) => {
-  return r1?.from === r2?.from && r1?.to === r2?.to;
+var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
+var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
+var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), member.set(obj, value), value);
+var _baseFrom, _renderBufferSize, _rowCount, _baseTo;
+const defaultRangeOptions = {
+  renderBufferSize: 0,
+  rowCount: -1
 };
+const _RangeImpl = class _RangeImpl {
+  constructor(from, to, rangeOptions = defaultRangeOptions) {
+    __privateAdd(this, _baseFrom);
+    __privateAdd(this, _renderBufferSize, 0);
+    __privateAdd(this, _rowCount, -1);
+    __privateAdd(this, _baseTo);
+    // We have to keep these as simple public properties (not getters) so they survive structuredClone
+    __publicField(this, "from", 0);
+    __publicField(this, "to", 0);
+    __privateSet(this, _baseFrom, from);
+    __privateSet(this, _baseTo, to);
+    this.renderBufferSize = rangeOptions.renderBufferSize ?? defaultRangeOptions.renderBufferSize;
+    this.rowCount = rangeOptions.rowCount ?? defaultRangeOptions.rowCount;
+    console.log(
+      `[Range] new (${__privateGet(this, _baseFrom)}:${__privateGet(this, _baseTo)}) renderBuffer: ${this.renderBufferSize}, rowCount: ${this.rowCount}`
+    );
+  }
+  get firstRowInViewport() {
+    return __privateGet(this, _baseFrom) + 1;
+  }
+  get lastRowInViewport() {
+    if (__privateGet(this, _rowCount) > 0) {
+      return Math.min(__privateGet(this, _baseTo), __privateGet(this, _rowCount));
+    } else {
+      return __privateGet(this, _baseTo);
+    }
+  }
+  get renderBufferSize() {
+    return __privateGet(this, _renderBufferSize);
+  }
+  set renderBufferSize(value) {
+    __privateSet(this, _renderBufferSize, value);
+    this.from = Math.max(0, __privateGet(this, _baseFrom) - value);
+    if (__privateGet(this, _rowCount) > 0) {
+      this.to = Math.max(__privateGet(this, _baseTo) + __privateGet(this, _renderBufferSize), __privateGet(this, _rowCount));
+    } else {
+      this.to = __privateGet(this, _baseTo) + __privateGet(this, _renderBufferSize);
+    }
+  }
+  get rowCount() {
+    return __privateGet(this, _rowCount);
+  }
+  set rowCount(value) {
+    __privateSet(this, _rowCount, value);
+    if (value > 0) {
+      this.to = Math.min(__privateGet(this, _baseTo) + __privateGet(this, _renderBufferSize), value);
+    } else {
+      this.to = __privateGet(this, _baseTo) + __privateGet(this, _renderBufferSize);
+    }
+  }
+  get reset() {
+    return new _RangeImpl(0, __privateGet(this, _baseTo) - __privateGet(this, _baseFrom), {
+      rowCount: __privateGet(this, _rowCount),
+      renderBufferSize: __privateGet(this, _renderBufferSize)
+    });
+  }
+  equals(range) {
+    return range.from === __privateGet(this, _baseFrom) && range.to === __privateGet(this, _baseTo);
+  }
+  toJson() {
+    return {
+      from: this.from,
+      to: this.to,
+      baseFrom: __privateGet(this, _baseFrom),
+      baseTo: __privateGet(this, _baseTo),
+      renderBufferSize: __privateGet(this, _renderBufferSize),
+      rowCount: __privateGet(this, _rowCount)
+    };
+  }
+};
+_baseFrom = new WeakMap();
+_renderBufferSize = new WeakMap();
+_rowCount = new WeakMap();
+_baseTo = new WeakMap();
+let RangeImpl = _RangeImpl;
+const Range = (from, to, rangeOptions) => new RangeImpl(from, to, rangeOptions);
+const NULL_RANGE = Range(0, 0);
 function getFullRange({ from, to }, bufferSize = 0, totalRowCount = Number.MAX_SAFE_INTEGER) {
   if (from === 0 && to === 0) {
     return { from, to };
@@ -35,14 +120,6 @@ function getFullRange({ from, to }, bufferSize = 0, totalRowCount = Number.MAX_S
     }
   }
 }
-function resetRange({ from, to, bufferSize = 0 }) {
-  return {
-    from: 0,
-    to: to - from,
-    bufferSize,
-    reset: true
-  };
-}
 const withinRange = (value, { from, to }) => value >= from && value < to;
 const rangeNewItems = ({ from: from1, to: to1 }, newRange) => {
   const { from: from2, to: to2 } = newRange;
@@ -70,10 +147,9 @@ class WindowRange {
 }
 
 exports.NULL_RANGE = NULL_RANGE;
+exports.Range = Range;
 exports.WindowRange = WindowRange;
 exports.getFullRange = getFullRange;
 exports.rangeNewItems = rangeNewItems;
-exports.rangesAreSame = rangesAreSame;
-exports.resetRange = resetRange;
 exports.withinRange = withinRange;
 //# sourceMappingURL=range-utils.js.map

package/cjs/range-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"range-utils.js","sources":["../src/range-utils.ts"],"sourcesContent":["export interface VuuRange {\n  from: number;\n  to: number;\n  bufferSize?: number;\n  reset?: boolean;\n}\n\ninterface FromToRange {\n  from: number;\n  to: number;\n}\n\nexport const NULL_RANGE: VuuRange = { from: 0, to: 0 } as const;\n\nexport const rangesAreSame = (\n  r1: VuuRange | undefined,\n  r2: VuuRange | undefined\n) => {\n  return r1?.from === r2?.from && r1?.to === r2?.to;\n};\n\nexport function getFullRange(\n  { from, to }: VuuRange,\n  bufferSize = 0,\n  totalRowCount: number = Number.MAX_SAFE_INTEGER\n): FromToRange {\n  if (from === 0 && to === 0) {\n    return { from, to };\n  } else if (bufferSize === 0) {\n    if (totalRowCount < from) {\n      return { from: 0, to: 0 };\n    } else {\n      return { from, to: Math.min(to, totalRowCount) };\n    }\n  } else if (from === 0) {\n    return { from, to: Math.min(to + bufferSize, totalRowCount) };\n  } else {\n    const shortfallBefore = from - bufferSize < 0;\n    const shortfallAfter = totalRowCount - (to + bufferSize) < 0;\n    if (shortfallBefore && shortfallAfter) {\n      return { from: 0, to: totalRowCount };\n    } else if (shortfallBefore) {\n      return { from: 0, to: to + bufferSize };\n    } else if (shortfallAfter) {\n      return {\n        from: Math.max(0, from - bufferSize),\n        to: totalRowCount,\n      };\n    } else {\n      return { from: from - bufferSize, to: to + bufferSize };\n    }\n  }\n}\n\nexport function resetRange({ from, to, bufferSize = 0 }: VuuRange): VuuRange {\n  return {\n    from: 0,\n    to: to - from,\n    bufferSize,\n    reset: true,\n  };\n}\n\nexport const withinRange = (value: number, { from, to }: VuuRange) =>\n  value >= from && value < to;\n\n// export const rangeOverlap = (\n//   { from: from1, to: to1 }: VuuRange,\n//   { from: from2, to: to2 }: VuuRange\n// ): VuuRange => {\n//   return from2 >= to1 || to2 < from1\n//     ? { from: 0, to: 0 }\n//     : { from: Math.max(from2, from1), to: Math.min(to2, to1) };\n// };\n\nexport const rangeNewItems = (\n  { from: from1, to: to1 }: VuuRange,\n  newRange: VuuRange\n): VuuRange => {\n  const { from: from2, to: to2 } = newRange;\n  const noOverlap = from2 >= to1 || to2 <= from1;\n  const newFullySubsumesOld = from2 < from1 && to2 > to1;\n  return noOverlap || newFullySubsumesOld\n    ? newRange\n    : to2 > to1\n    ? { from: to1, to: to2 }\n    : { from: from2, to: from1 };\n};\n\nexport class WindowRange {\n  public from: number;\n  public to: number;\n\n  constructor(from: number, to: number) {\n    this.from = from;\n    this.to = to;\n  }\n\n  public isWithin(index: number) {\n    return withinRange(index, this);\n  }\n\n  //find the overlap of this range and a new one\n  public overlap(from: number, to: number): [number, number] {\n    return from >= this.to || to < this.from\n      ? [0, 0]\n      : [Math.max(from, this.from), Math.min(to, this.to)];\n  }\n\n  public copy(): WindowRange {\n    return new WindowRange(this.from, this.to);\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"range-utils.js","sources":["../src/range-utils.ts"],"sourcesContent":["import { VuuRange } from \"@vuu-ui/vuu-protocol-types\";\n\ninterface FromToRange {\n  from: number;\n  to: number;\n}\n\nexport interface Range extends VuuRange {\n  equals: (vuuRange: VuuRange) => boolean;\n  firstRowInViewport: number;\n  lastRowInViewport: number;\n  renderBufferSize?: number;\n  reset: Range;\n  rowCount?: number;\n}\n\nexport interface RangeOptions {\n  renderBufferSize?: number;\n  rowCount?: number;\n}\n\nconst defaultRangeOptions = {\n  renderBufferSize: 0,\n  rowCount: -1,\n};\nclass RangeImpl implements Range {\n  #baseFrom: number;\n  #renderBufferSize = 0;\n  #rowCount = -1;\n  #baseTo: number;\n\n  // We have to keep these as simple public properties (not getters) so they survive structuredClone\n  public from = 0;\n  public to = 0;\n\n  constructor(\n    /** Index position of first visible row in viewport */\n    from: number,\n    /** Index position of last visible row in viewport + 1 */\n    to: number,\n    rangeOptions: RangeOptions = defaultRangeOptions,\n  ) {\n    this.#baseFrom = from;\n    this.#baseTo = to;\n    this.renderBufferSize =\n      rangeOptions.renderBufferSize ?? defaultRangeOptions.renderBufferSize;\n    this.rowCount = rangeOptions.rowCount ?? defaultRangeOptions.rowCount;\n\n    console.log(\n      `[Range] new (${this.#baseFrom}:${this.#baseTo}) renderBuffer: ${this.renderBufferSize}, rowCount: ${this.rowCount}`,\n    );\n  }\n\n  get firstRowInViewport() {\n    return this.#baseFrom + 1;\n  }\n\n  get lastRowInViewport() {\n    if (this.#rowCount > 0) {\n      return Math.min(this.#baseTo, this.#rowCount);\n    } else {\n      return this.#baseTo;\n    }\n  }\n\n  get renderBufferSize() {\n    return this.#renderBufferSize;\n  }\n\n  set renderBufferSize(value: number) {\n    this.#renderBufferSize = value;\n    this.from = Math.max(0, this.#baseFrom - value);\n    if (this.#rowCount > 0) {\n      this.to = Math.max(this.#baseTo + this.#renderBufferSize, this.#rowCount);\n    } else {\n      this.to = this.#baseTo + this.#renderBufferSize;\n    }\n  }\n\n  get rowCount() {\n    return this.#rowCount;\n  }\n\n  set rowCount(value: number) {\n    this.#rowCount = value;\n    if (value > 0) {\n      this.to = Math.min(this.#baseTo + this.#renderBufferSize, value);\n    } else {\n      this.to = this.#baseTo + this.#renderBufferSize;\n    }\n  }\n\n  get reset() {\n    return new RangeImpl(0, this.#baseTo - this.#baseFrom, {\n      rowCount: this.#rowCount,\n      renderBufferSize: this.#renderBufferSize,\n    });\n  }\n\n  equals(range: VuuRange) {\n    return range.from === this.#baseFrom && range.to === this.#baseTo;\n  }\n\n  toJson() {\n    return {\n      from: this.from,\n      to: this.to,\n      baseFrom: this.#baseFrom,\n      baseTo: this.#baseTo,\n      renderBufferSize: this.#renderBufferSize,\n      rowCount: this.#rowCount,\n    };\n  }\n}\n\nexport const Range = (\n  from: number,\n  to: number,\n  rangeOptions?: RangeOptions,\n): Range => new RangeImpl(from, to, rangeOptions);\n\nexport const NULL_RANGE = Range(0, 0);\n\nexport function getFullRange(\n  { from, to }: VuuRange,\n  bufferSize = 0,\n  totalRowCount: number = Number.MAX_SAFE_INTEGER,\n): FromToRange {\n  if (from === 0 && to === 0) {\n    return { from, to };\n  } else if (bufferSize === 0) {\n    if (totalRowCount < from) {\n      return { from: 0, to: 0 };\n    } else {\n      return { from, to: Math.min(to, totalRowCount) };\n    }\n  } else if (from === 0) {\n    return { from, to: Math.min(to + bufferSize, totalRowCount) };\n  } else {\n    const shortfallBefore = from - bufferSize < 0;\n    const shortfallAfter = totalRowCount - (to + bufferSize) < 0;\n    if (shortfallBefore && shortfallAfter) {\n      return { from: 0, to: totalRowCount };\n    } else if (shortfallBefore) {\n      return { from: 0, to: to + bufferSize };\n    } else if (shortfallAfter) {\n      return {\n        from: Math.max(0, from - bufferSize),\n        to: totalRowCount,\n      };\n    } else {\n      return { from: from - bufferSize, to: to + bufferSize };\n    }\n  }\n}\n\nexport const withinRange = (value: number, { from, to }: VuuRange) =>\n  value >= from && value < to;\n\n// export const rangeOverlap = (\n//   { from: from1, to: to1 }: VuuRange,\n//   { from: from2, to: to2 }: VuuRange\n// ): VuuRange => {\n//   return from2 >= to1 || to2 < from1\n//     ? { from: 0, to: 0 }\n//     : { from: Math.max(from2, from1), to: Math.min(to2, to1) };\n// };\n\nexport const rangeNewItems = (\n  { from: from1, to: to1 }: VuuRange,\n  newRange: VuuRange,\n): VuuRange => {\n  const { from: from2, to: to2 } = newRange;\n  const noOverlap = from2 >= to1 || to2 <= from1;\n  const newFullySubsumesOld = from2 < from1 && to2 > to1;\n  return noOverlap || newFullySubsumesOld\n    ? newRange\n    : to2 > to1\n      ? { from: to1, to: to2 }\n      : { from: from2, to: from1 };\n};\n\nexport class WindowRange {\n  public from: number;\n  public to: number;\n\n  constructor(from: number, to: number) {\n    this.from = from;\n    this.to = to;\n  }\n\n  public isWithin(index: number) {\n    return withinRange(index, this);\n  }\n\n  //find the overlap of this range and a new one\n  public overlap(from: number, to: number): [number, number] {\n    return from >= this.to || to < this.from\n      ? [0, 0]\n      : [Math.max(from, this.from), Math.min(to, this.to)];\n  }\n\n  public copy(): WindowRange {\n    return new WindowRange(this.from, this.to);\n  }\n}\n"],"names":[],"mappings":"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"}

package/esm/datasource/BaseDataSource.js

@@ -2,6 +2,7 @@ import { parseFilter } from '@vuu-ui/vuu-filter-parser';
 import { EventEmitter } from '../event-emitter.js';
 import { uuid } from '../nanoid/index.js';
 import { isConfigChanged, withConfigDefaults, vanillaConfig } from './datasource-utils.js';
+import { Range } from '../range-utils.js';
 
 var __defProp = Object.defineProperty;
 var __typeError = (msg) => {
@@ -31,7 +32,7 @@ class BaseDataSource extends EventEmitter {
     __publicField(this, "_clientCallback");
     __publicField(this, "_config", vanillaConfig);
     __publicField(this, "_impendingConfig");
-    __publicField(this, "_range", { from: 0, to: 0 });
+    __publicField(this, "_range", Range(0, 0));
     __publicField(this, "_size", 0);
     __publicField(this, "_title");
     __privateAdd(this, _pageCount, 0);
@@ -162,7 +163,9 @@ class BaseDataSource extends EventEmitter {
       this._range = range;
       this.pageCount = Math.ceil(this._size / (range.to - range.from));
       this.rangeRequest(range);
-      this.emit("range", range);
+      requestAnimationFrame(() => {
+        this.emit("range", range);
+      });
     }
   }
   get size() {

package/esm/datasource/BaseDataSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseDataSource.js","sources":["../../src/datasource/BaseDataSource.ts"],"sourcesContent":["import type {\n  DataSource,\n  DataSourceConfig,\n  DataSourceConstructorProps,\n  DataSourceEvents,\n  DataSourceFilter,\n  SubscribeCallback,\n  SubscribeProps,\n  WithBaseFilter,\n  WithFullConfig,\n} from \"@vuu-ui/vuu-data-types\";\nimport { parseFilter } from \"@vuu-ui/vuu-filter-parser\";\nimport {\n  LinkDescriptorWithLabel,\n  VuuAggregation,\n  VuuRange,\n  VuuSort,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport { EventEmitter } from \"../event-emitter\";\nimport { uuid } from \"../nanoid\";\nimport {\n  DataSourceConfigChanges,\n  isConfigChanged,\n  vanillaConfig,\n  withConfigDefaults,\n} from \"./datasource-utils\";\n\nexport type RuntimeConfig = WithBaseFilter<WithFullConfig> & {\n  visualLink?: LinkDescriptorWithLabel;\n};\n\nexport abstract class BaseDataSource\n  extends EventEmitter<DataSourceEvents>\n  implements Pick<DataSource, \"config\">\n{\n  // This should simply be id\n  public viewport: string;\n\n  protected _clientCallback: SubscribeCallback | undefined;\n  protected _config: RuntimeConfig = vanillaConfig;\n  protected _impendingConfig: RuntimeConfig | undefined = undefined;\n  protected _range: VuuRange = { from: 0, to: 0 };\n  protected _size = 0;\n  protected _title: string | undefined;\n\n  #pageCount = 0;\n\n  private awaitingConfirmationOfConfigChanges = false;\n\n  constructor({\n    aggregations,\n    baseFilterSpec,\n    columns,\n    filterSpec,\n    groupBy,\n    sort,\n    title,\n    viewport,\n  }: Omit<DataSourceConstructorProps, \"table\">) {\n    super();\n    this._config = {\n      ...this._config,\n      aggregations: aggregations || this._config.aggregations,\n      baseFilterSpec: baseFilterSpec || this._config.baseFilterSpec,\n      columns: columns || this._config.columns,\n      filterSpec: filterSpec || this._config.filterSpec,\n      groupBy: groupBy || this._config.groupBy,\n      sort: sort || this._config.sort,\n    };\n\n    this._title = title;\n    this.viewport = viewport ?? \"\";\n  }\n\n  subscribe(\n    {\n      baseFilterSpec,\n      columns,\n      aggregations,\n      range,\n      sort,\n      groupBy,\n      filterSpec,\n      viewport = this.viewport || (this.viewport = uuid()),\n    }: SubscribeProps,\n    callback: SubscribeCallback,\n  ) {\n    this._clientCallback = callback;\n    this.viewport = viewport;\n\n    if (\n      aggregations ||\n      baseFilterSpec ||\n      columns ||\n      filterSpec ||\n      groupBy ||\n      sort\n    ) {\n      this._config = {\n        ...this._config,\n        aggregations: aggregations || this._config.aggregations,\n        baseFilterSpec: baseFilterSpec || this._config.baseFilterSpec,\n        columns: columns || this._config.columns,\n        filterSpec: filterSpec || this._config.filterSpec,\n        groupBy: groupBy || this._config.groupBy,\n        sort: sort || this._config.sort,\n      };\n    }\n\n    // store the range before we await the server. It's is possible the\n    // range will be updated from the client before we have been able to\n    // subscribe. This ensures we will subscribe with latest value.\n    if (range) {\n      this._range = range;\n    }\n  }\n\n  get aggregations() {\n    return this._config.aggregations;\n  }\n\n  set aggregations(aggregations: VuuAggregation[]) {\n    this.config = {\n      ...this._config,\n      aggregations,\n    };\n    this.emit(\"config\", this._config, this.range);\n  }\n\n  get baseFilter() {\n    return this._config.baseFilterSpec;\n  }\n\n  set baseFilter(baseFilter: DataSourceFilter | undefined) {\n    this.config = {\n      ...this._config,\n      baseFilterSpec: baseFilter,\n    };\n  }\n\n  get columns() {\n    return this._config.columns;\n  }\n\n  set columns(columns: string[]) {\n    this.config = {\n      ...this._config,\n      columns,\n    };\n    this.emit(\"config\", this._config, this.range);\n  }\n\n  get filter() {\n    return this._config.filterSpec;\n  }\n\n  set filter(filter: DataSourceFilter) {\n    this.config = {\n      ...this._config,\n      filterSpec: filter,\n    };\n  }\n\n  get isAwaitingConfirmationOfConfigChange() {\n    return this._impendingConfig !== undefined;\n  }\n\n  protected confirmConfigChange() {\n    if (this._impendingConfig) {\n      this._config = this._impendingConfig;\n      this._impendingConfig = undefined;\n      this.emit(\"config\", this._config, this.range, true);\n    } else {\n      throw Error(\n        `[BaseDataSource], unexpected call to confirmConfigChange, no changes pending`,\n      );\n    }\n  }\n\n  get config() {\n    return this._impendingConfig ?? this._config;\n  }\n\n  set config(config: WithBaseFilter<WithFullConfig>) {\n    const confirmed = this.awaitingConfirmationOfConfigChanges\n      ? true\n      : undefined;\n    // TODO what happens if config is set and we still have an unconfirmed change ?\n    this.awaitingConfirmationOfConfigChanges = false;\n    const configChanges = this.applyConfig(config);\n    if (configChanges) {\n      this.emit(\"config\", this.config, this.range, confirmed, configChanges);\n    }\n  }\n\n  set impendingConfig(config: WithBaseFilter<WithFullConfig>) {\n    this.awaitingConfirmationOfConfigChanges = true;\n    const configChanges = this.applyConfig(config);\n    if (configChanges) {\n      this.emit(\"config\", this.config, this.range, false, configChanges);\n    }\n  }\n\n  get pageCount() {\n    return this.#pageCount;\n  }\n\n  set pageCount(pageCount: number) {\n    if (pageCount !== this.#pageCount) {\n      this.#pageCount = pageCount;\n      this.emit(\"page-count\", pageCount);\n    }\n  }\n\n  get range() {\n    return this._range;\n  }\n\n  set range(range: VuuRange) {\n    if (range.from !== this._range.from || range.to !== this._range.to) {\n      this._range = range;\n      this.pageCount = Math.ceil(this._size / (range.to - range.from));\n\n      this.rangeRequest(range);\n\n      this.emit(\"range\", range);\n    }\n  }\n\n  get size() {\n    return this._size;\n  }\n\n  set size(size: number) {\n    this._size = size;\n    if (this.range.to !== 0) {\n      const pageCount = Math.ceil(size / (this.range.to - this.range.from));\n      this.pageCount = pageCount;\n    }\n  }\n\n  get sort() {\n    return this._config.sort;\n  }\n\n  set sort(sort: VuuSort) {\n    this.config = {\n      ...this._config,\n      sort,\n    };\n    this.emit(\"config\", this._config, this.range);\n  }\n\n  get title() {\n    return this._title ?? \"\";\n  }\n\n  set title(title: string) {\n    this._title = title;\n    this.emit(\"title-changed\", this.viewport ?? \"\", title);\n  }\n\n  // Public while we use this from useSessionDataSource\n  public applyConfig(\n    config: WithBaseFilter<DataSourceConfig>,\n    preserveExistingConfigAttributes = false,\n  ): DataSourceConfigChanges | undefined {\n    const { noChanges, ...otherChanges } = isConfigChanged(\n      this._config,\n      config,\n    );\n    if (noChanges !== true) {\n      if (config) {\n        const newConfig: DataSourceConfig =\n          config?.filterSpec?.filter &&\n          config?.filterSpec.filterStruct === undefined\n            ? {\n                ...config,\n                filterSpec: {\n                  filter: config.filterSpec.filter,\n                  filterStruct: parseFilter(config.filterSpec.filter),\n                },\n              }\n            : config;\n        if (preserveExistingConfigAttributes) {\n          if (this.awaitingConfirmationOfConfigChanges) {\n            this._impendingConfig = {\n              ...this._config,\n              ...config,\n            };\n          } else {\n            this._impendingConfig = undefined;\n            this._config = {\n              ...this._config,\n              ...config,\n            };\n          }\n        } else {\n          if (this.awaitingConfirmationOfConfigChanges) {\n            this._impendingConfig = withConfigDefaults(newConfig);\n          } else {\n            this._impendingConfig = undefined;\n            this._config = withConfigDefaults(newConfig);\n          }\n        }\n        return otherChanges;\n      }\n    }\n  }\n\n  abstract rangeRequest(range: VuuRange): void;\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"BaseDataSource.js","sources":["../../src/datasource/BaseDataSource.ts"],"sourcesContent":["import type {\n  DataSource,\n  DataSourceConfig,\n  DataSourceConstructorProps,\n  DataSourceEvents,\n  DataSourceFilter,\n  DataSourceSubscribeCallback,\n  DataSourceSubscribeProps,\n  WithBaseFilter,\n  WithFullConfig,\n} from \"@vuu-ui/vuu-data-types\";\nimport { parseFilter } from \"@vuu-ui/vuu-filter-parser\";\nimport {\n  LinkDescriptorWithLabel,\n  VuuAggregation,\n  VuuRange,\n  VuuSort,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport { EventEmitter } from \"../event-emitter\";\nimport { uuid } from \"../nanoid\";\nimport {\n  DataSourceConfigChanges,\n  isConfigChanged,\n  vanillaConfig,\n  withConfigDefaults,\n} from \"./datasource-utils\";\nimport { Range } from \"../range-utils\";\n\nexport type RuntimeConfig = WithBaseFilter<WithFullConfig> & {\n  visualLink?: LinkDescriptorWithLabel;\n};\n\nexport abstract class BaseDataSource\n  extends EventEmitter<DataSourceEvents>\n  implements Pick<DataSource, \"config\">\n{\n  // This should simply be id\n  public viewport: string;\n\n  protected _clientCallback: DataSourceSubscribeCallback | undefined;\n  protected _config: RuntimeConfig = vanillaConfig;\n  protected _impendingConfig: RuntimeConfig | undefined = undefined;\n  protected _range = Range(0, 0);\n  protected _size = 0;\n  protected _title: string | undefined;\n\n  #pageCount = 0;\n\n  private awaitingConfirmationOfConfigChanges = false;\n\n  constructor({\n    aggregations,\n    baseFilterSpec,\n    columns,\n    filterSpec,\n    groupBy,\n    sort,\n    title,\n    viewport,\n  }: Omit<DataSourceConstructorProps, \"table\">) {\n    super();\n    this._config = {\n      ...this._config,\n      aggregations: aggregations || this._config.aggregations,\n      baseFilterSpec: baseFilterSpec || this._config.baseFilterSpec,\n      columns: columns || this._config.columns,\n      filterSpec: filterSpec || this._config.filterSpec,\n      groupBy: groupBy || this._config.groupBy,\n      sort: sort || this._config.sort,\n    };\n\n    this._title = title;\n    this.viewport = viewport ?? \"\";\n  }\n\n  subscribe(\n    {\n      baseFilterSpec,\n      columns,\n      aggregations,\n      range,\n      sort,\n      groupBy,\n      filterSpec,\n      viewport = this.viewport || (this.viewport = uuid()),\n    }: DataSourceSubscribeProps,\n    callback: DataSourceSubscribeCallback,\n  ) {\n    this._clientCallback = callback;\n    this.viewport = viewport;\n\n    if (\n      aggregations ||\n      baseFilterSpec ||\n      columns ||\n      filterSpec ||\n      groupBy ||\n      sort\n    ) {\n      this._config = {\n        ...this._config,\n        aggregations: aggregations || this._config.aggregations,\n        baseFilterSpec: baseFilterSpec || this._config.baseFilterSpec,\n        columns: columns || this._config.columns,\n        filterSpec: filterSpec || this._config.filterSpec,\n        groupBy: groupBy || this._config.groupBy,\n        sort: sort || this._config.sort,\n      };\n    }\n\n    // store the range before we await the server. It's is possible the\n    // range will be updated from the client before we have been able to\n    // subscribe. This ensures we will subscribe with latest value.\n    if (range) {\n      this._range = range;\n    }\n  }\n\n  get aggregations() {\n    return this._config.aggregations;\n  }\n\n  set aggregations(aggregations: VuuAggregation[]) {\n    this.config = {\n      ...this._config,\n      aggregations,\n    };\n    this.emit(\"config\", this._config, this.range);\n  }\n\n  get baseFilter() {\n    return this._config.baseFilterSpec;\n  }\n\n  set baseFilter(baseFilter: DataSourceFilter | undefined) {\n    this.config = {\n      ...this._config,\n      baseFilterSpec: baseFilter,\n    };\n  }\n\n  get columns() {\n    return this._config.columns;\n  }\n\n  set columns(columns: string[]) {\n    this.config = {\n      ...this._config,\n      columns,\n    };\n    this.emit(\"config\", this._config, this.range);\n  }\n\n  get filter() {\n    return this._config.filterSpec;\n  }\n\n  set filter(filter: DataSourceFilter) {\n    this.config = {\n      ...this._config,\n      filterSpec: filter,\n    };\n  }\n\n  get isAwaitingConfirmationOfConfigChange() {\n    return this._impendingConfig !== undefined;\n  }\n\n  protected confirmConfigChange() {\n    if (this._impendingConfig) {\n      this._config = this._impendingConfig;\n      this._impendingConfig = undefined;\n      this.emit(\"config\", this._config, this.range, true);\n    } else {\n      throw Error(\n        `[BaseDataSource], unexpected call to confirmConfigChange, no changes pending`,\n      );\n    }\n  }\n\n  get config() {\n    return this._impendingConfig ?? this._config;\n  }\n\n  set config(config: WithBaseFilter<WithFullConfig>) {\n    const confirmed = this.awaitingConfirmationOfConfigChanges\n      ? true\n      : undefined;\n    // TODO what happens if config is set and we still have an unconfirmed change ?\n    this.awaitingConfirmationOfConfigChanges = false;\n    const configChanges = this.applyConfig(config);\n    if (configChanges) {\n      this.emit(\"config\", this.config, this.range, confirmed, configChanges);\n    }\n  }\n\n  set impendingConfig(config: WithBaseFilter<WithFullConfig>) {\n    this.awaitingConfirmationOfConfigChanges = true;\n    const configChanges = this.applyConfig(config);\n    if (configChanges) {\n      this.emit(\"config\", this.config, this.range, false, configChanges);\n    }\n  }\n\n  get pageCount() {\n    return this.#pageCount;\n  }\n\n  set pageCount(pageCount: number) {\n    if (pageCount !== this.#pageCount) {\n      this.#pageCount = pageCount;\n      this.emit(\"page-count\", pageCount);\n    }\n  }\n\n  get range() {\n    return this._range;\n  }\n\n  set range(range: Range) {\n    if (range.from !== this._range.from || range.to !== this._range.to) {\n      this._range = range;\n      this.pageCount = Math.ceil(this._size / (range.to - range.from));\n      this.rangeRequest(range);\n      requestAnimationFrame(() => {\n        this.emit(\"range\", range);\n      });\n    }\n  }\n\n  get size() {\n    return this._size;\n  }\n\n  set size(size: number) {\n    this._size = size;\n    if (this.range.to !== 0) {\n      const pageCount = Math.ceil(size / (this.range.to - this.range.from));\n      this.pageCount = pageCount;\n    }\n  }\n\n  get sort() {\n    return this._config.sort;\n  }\n\n  set sort(sort: VuuSort) {\n    this.config = {\n      ...this._config,\n      sort,\n    };\n    this.emit(\"config\", this._config, this.range);\n  }\n\n  get title() {\n    return this._title ?? \"\";\n  }\n\n  set title(title: string) {\n    this._title = title;\n    this.emit(\"title-changed\", this.viewport ?? \"\", title);\n  }\n\n  // Public while we use this from useSessionDataSource\n  public applyConfig(\n    config: WithBaseFilter<DataSourceConfig>,\n    preserveExistingConfigAttributes = false,\n  ): DataSourceConfigChanges | undefined {\n    const { noChanges, ...otherChanges } = isConfigChanged(\n      this._config,\n      config,\n    );\n    if (noChanges !== true) {\n      if (config) {\n        const newConfig: DataSourceConfig =\n          config?.filterSpec?.filter &&\n          config?.filterSpec.filterStruct === undefined\n            ? {\n                ...config,\n                filterSpec: {\n                  filter: config.filterSpec.filter,\n                  filterStruct: parseFilter(config.filterSpec.filter),\n                },\n              }\n            : config;\n        if (preserveExistingConfigAttributes) {\n          if (this.awaitingConfirmationOfConfigChanges) {\n            this._impendingConfig = {\n              ...this._config,\n              ...config,\n            };\n          } else {\n            this._impendingConfig = undefined;\n            this._config = {\n              ...this._config,\n              ...config,\n            };\n          }\n        } else {\n          if (this.awaitingConfirmationOfConfigChanges) {\n            this._impendingConfig = withConfigDefaults(newConfig);\n          } else {\n            this._impendingConfig = undefined;\n            this._config = withConfigDefaults(newConfig);\n          }\n        }\n        return otherChanges;\n      }\n    }\n  }\n\n  abstract rangeRequest(range: VuuRange): void;\n}\n"],"names":[],"mappings":"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"}

package/esm/index.js

@@ -43,7 +43,7 @@ export { roundDecimal } from './round-decimal.js';
 export { debounce, throttle } from './perf-utils.js';
 export { DeferredPromise } from './promise-utils.js';
 export { isActionMessage, isEditCellRequest, isOpenDialogAction, isOpenSessionTableDialogMessage, isRequestResponse, isRpcSuccess, isSessionTable, isSessionTableActionMessage, isViewportRpcRequest, isVuuMenuRpcRequest, viewportRpcRequest, vuuAddRowRequest, vuuDeleteRowRequest, vuuEditCellRequest } from './protocol-message-utils.js';
-export { NULL_RANGE, WindowRange, getFullRange, rangeNewItems, rangesAreSame, resetRange, withinRange } from './range-utils.js';
+export { NULL_RANGE, Range, WindowRange, getFullRange, rangeNewItems, withinRange } from './range-utils.js';
 export { actualRowPositioning, asDataSourceRowObject, virtualRowPositioning } from './row-utils.js';
 export { RowSelected, deselectItem, expandSelection, getSelectionStatus, isRowSelected, isRowSelectedLast, isSelected, selectItem, selectionCount } from './selection-utils.js';
 export { VuuShellLocation } from './shell-layout-types.js';

package/esm/moving-window.js

@@ -25,6 +25,7 @@ class MovingWindow {
       }
       this.rowCount = rowCount;
     });
+    console.log(`[MovingWindow] new (${from}:${to})`);
     __privateSet(this, _range, new WindowRange(from, to));
     this.data = new Array(Math.max(0, to - from));
     this.rowCount = 0;
@@ -50,6 +51,7 @@ class MovingWindow {
     return __privateGet(this, _range).isWithin(index);
   }
   setRange({ from, to }) {
+    console.log(`[MovingWindow] setRange (${from}:${to})`);
     if (from !== __privateGet(this, _range).from || to !== __privateGet(this, _range).to) {
       const [overlapFrom, overlapTo] = __privateGet(this, _range).overlap(from, to);
       const newData = new Array(Math.max(0, to - from));

package/esm/moving-window.js.map

@@ -1 +1 @@
-{"version":3,"file":"moving-window.js","sources":["../src/moving-window.ts"],"sourcesContent":["import { DataSourceRow } from \"@vuu-ui/vuu-data-types\";\nimport {\n  isRowSelectedLast,\n  metadataKeys,\n  WindowRange,\n} from \"@vuu-ui/vuu-utils\";\nimport { VuuRange } from \"@vuu-ui/vuu-protocol-types\";\n\nconst { SELECTED } = metadataKeys;\n\nexport class MovingWindow {\n  public data: DataSourceRow[];\n  public rowCount = 0;\n  #range: WindowRange;\n\n  constructor({ from, to }: VuuRange) {\n    this.#range = new WindowRange(from, to);\n    //internal data is always 0 based, we add range.from to determine an offset\n    this.data = new Array(Math.max(0, to - from));\n    this.rowCount = 0;\n  }\n\n  setRowCount = (rowCount: number) => {\n    if (rowCount < this.data.length) {\n      this.data.length = rowCount;\n    }\n\n    this.rowCount = rowCount;\n  };\n\n  add(data: DataSourceRow) {\n    const [index] = data;\n    if (this.isWithinRange(index)) {\n      const internalIndex = index - this.#range.from;\n      this.data[internalIndex] = data;\n\n      // Hack until we can deal with this more elegantly. When we have a block\n      // select operation, first row is selected (and updated via server), then\n      // remaining rows are selected when we select the block-end row. We get an\n      // update for all rows except first. Because we're extending the select status\n      // on the client, we have to adjust the first row selected (its still selected\n      // but is no longer the 'last selected row in block')\n      // Maybe answer is to apply ALL the selection status code here, not in Viewport\n      if (data[SELECTED]) {\n        const previousRow = this.data[internalIndex - 1];\n        if (isRowSelectedLast(previousRow)) {\n          this.data[internalIndex - 1] = previousRow.slice() as DataSourceRow;\n          this.data[internalIndex - 1][SELECTED] -= 4;\n        }\n      }\n    }\n  }\n\n  getAtIndex(index: number) {\n    return this.#range.isWithin(index) &&\n      this.data[index - this.#range.from] != null\n      ? this.data[index - this.#range.from]\n      : undefined;\n  }\n\n  isWithinRange(index: number) {\n    return this.#range.isWithin(index);\n  }\n\n  setRange({ from, to }: VuuRange) {\n    if (from !== this.#range.from || to !== this.#range.to) {\n      const [overlapFrom, overlapTo] = this.#range.overlap(from, to);\n      const newData = new Array(Math.max(0, to - from));\n      for (let i = overlapFrom; i < overlapTo; i++) {\n        const data = this.getAtIndex(i);\n        if (data) {\n          const index = i - from;\n          newData[index] = data;\n        }\n      }\n      this.data = newData;\n      this.#range.from = from;\n      this.#range.to = to;\n    }\n  }\n\n  getSelectedRows() {\n    return this.data.filter((row) => row[SELECTED] !== 0);\n  }\n\n  get range() {\n    return this.#range;\n  }\n\n  slice(): DataSourceRow[] {\n    const data: DataSourceRow[] = [];\n    const { from } = this.range;\n    for (let i = 0; i < this.data.length; i++) {\n      if (this.data[i]) {\n        data.push(this.data[i]);\n      } else {\n        data.push([from + i, from + i, true, false, 1, 0, \"\", 0]);\n      }\n    }\n    return data;\n  }\n\n  // TODO make this more performant, see implementation in\n  // array-backed-moving-window - use same implementation\n  get hasAllRowsWithinRange(): boolean {\n    const { from, to } = this.#range;\n\n    for (let i = from; i < to; i++) {\n      if (this.getAtIndex(i) === undefined) {\n        return false;\n      }\n    }\n    return true;\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"moving-window.js","sources":["../src/moving-window.ts"],"sourcesContent":["import { DataSourceRow } from \"@vuu-ui/vuu-data-types\";\nimport {\n  isRowSelectedLast,\n  metadataKeys,\n  WindowRange,\n} from \"@vuu-ui/vuu-utils\";\nimport { VuuRange } from \"@vuu-ui/vuu-protocol-types\";\n\nconst { SELECTED } = metadataKeys;\n\nexport class MovingWindow {\n  public data: DataSourceRow[];\n  public rowCount = 0;\n  #range: WindowRange;\n\n  constructor({ from, to }: VuuRange) {\n    console.log(`[MovingWindow] new (${from}:${to})`);\n    this.#range = new WindowRange(from, to);\n    //internal data is always 0 based, we add range.from to determine an offset\n    this.data = new Array(Math.max(0, to - from));\n    this.rowCount = 0;\n  }\n\n  setRowCount = (rowCount: number) => {\n    if (rowCount < this.data.length) {\n      this.data.length = rowCount;\n    }\n\n    this.rowCount = rowCount;\n  };\n\n  add(data: DataSourceRow) {\n    const [index] = data;\n    if (this.isWithinRange(index)) {\n      const internalIndex = index - this.#range.from;\n      this.data[internalIndex] = data;\n\n      // Hack until we can deal with this more elegantly. When we have a block\n      // select operation, first row is selected (and updated via server), then\n      // remaining rows are selected when we select the block-end row. We get an\n      // update for all rows except first. Because we're extending the select status\n      // on the client, we have to adjust the first row selected (its still selected\n      // but is no longer the 'last selected row in block')\n      // Maybe answer is to apply ALL the selection status code here, not in Viewport\n      if (data[SELECTED]) {\n        const previousRow = this.data[internalIndex - 1];\n        if (isRowSelectedLast(previousRow)) {\n          this.data[internalIndex - 1] = previousRow.slice() as DataSourceRow;\n          this.data[internalIndex - 1][SELECTED] -= 4;\n        }\n      }\n    }\n  }\n\n  getAtIndex(index: number) {\n    return this.#range.isWithin(index) &&\n      this.data[index - this.#range.from] != null\n      ? this.data[index - this.#range.from]\n      : undefined;\n  }\n\n  isWithinRange(index: number) {\n    return this.#range.isWithin(index);\n  }\n\n  setRange({ from, to }: VuuRange) {\n    console.log(`[MovingWindow] setRange (${from}:${to})`);\n\n    if (from !== this.#range.from || to !== this.#range.to) {\n      const [overlapFrom, overlapTo] = this.#range.overlap(from, to);\n      const newData = new Array(Math.max(0, to - from));\n      for (let i = overlapFrom; i < overlapTo; i++) {\n        const data = this.getAtIndex(i);\n        if (data) {\n          const index = i - from;\n          newData[index] = data;\n        }\n      }\n      this.data = newData;\n      this.#range.from = from;\n      this.#range.to = to;\n    }\n  }\n\n  getSelectedRows() {\n    return this.data.filter((row) => row[SELECTED] !== 0);\n  }\n\n  get range() {\n    return this.#range;\n  }\n\n  slice(): DataSourceRow[] {\n    const data: DataSourceRow[] = [];\n    const { from } = this.range;\n    for (let i = 0; i < this.data.length; i++) {\n      if (this.data[i]) {\n        data.push(this.data[i]);\n      } else {\n        data.push([from + i, from + i, true, false, 1, 0, \"\", 0]);\n      }\n    }\n    return data;\n  }\n\n  // TODO make this more performant, see implementation in\n  // array-backed-moving-window - use same implementation\n  get hasAllRowsWithinRange(): boolean {\n    const { from, to } = this.#range;\n\n    for (let i = from; i < to; i++) {\n      if (this.getAtIndex(i) === undefined) {\n        return false;\n      }\n    }\n    return true;\n  }\n}\n"],"names":[],"mappings":"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"}

package/esm/range-utils.js

@@ -1,10 +1,95 @@
 var __defProp = Object.defineProperty;
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-const NULL_RANGE = { from: 0, to: 0 };
-const rangesAreSame = (r1, r2) => {
-  return r1?.from === r2?.from && r1?.to === r2?.to;
+var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
+var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
+var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), member.set(obj, value), value);
+var _baseFrom, _renderBufferSize, _rowCount, _baseTo;
+const defaultRangeOptions = {
+  renderBufferSize: 0,
+  rowCount: -1
 };
+const _RangeImpl = class _RangeImpl {
+  constructor(from, to, rangeOptions = defaultRangeOptions) {
+    __privateAdd(this, _baseFrom);
+    __privateAdd(this, _renderBufferSize, 0);
+    __privateAdd(this, _rowCount, -1);
+    __privateAdd(this, _baseTo);
+    // We have to keep these as simple public properties (not getters) so they survive structuredClone
+    __publicField(this, "from", 0);
+    __publicField(this, "to", 0);
+    __privateSet(this, _baseFrom, from);
+    __privateSet(this, _baseTo, to);
+    this.renderBufferSize = rangeOptions.renderBufferSize ?? defaultRangeOptions.renderBufferSize;
+    this.rowCount = rangeOptions.rowCount ?? defaultRangeOptions.rowCount;
+    console.log(
+      `[Range] new (${__privateGet(this, _baseFrom)}:${__privateGet(this, _baseTo)}) renderBuffer: ${this.renderBufferSize}, rowCount: ${this.rowCount}`
+    );
+  }
+  get firstRowInViewport() {
+    return __privateGet(this, _baseFrom) + 1;
+  }
+  get lastRowInViewport() {
+    if (__privateGet(this, _rowCount) > 0) {
+      return Math.min(__privateGet(this, _baseTo), __privateGet(this, _rowCount));
+    } else {
+      return __privateGet(this, _baseTo);
+    }
+  }
+  get renderBufferSize() {
+    return __privateGet(this, _renderBufferSize);
+  }
+  set renderBufferSize(value) {
+    __privateSet(this, _renderBufferSize, value);
+    this.from = Math.max(0, __privateGet(this, _baseFrom) - value);
+    if (__privateGet(this, _rowCount) > 0) {
+      this.to = Math.max(__privateGet(this, _baseTo) + __privateGet(this, _renderBufferSize), __privateGet(this, _rowCount));
+    } else {
+      this.to = __privateGet(this, _baseTo) + __privateGet(this, _renderBufferSize);
+    }
+  }
+  get rowCount() {
+    return __privateGet(this, _rowCount);
+  }
+  set rowCount(value) {
+    __privateSet(this, _rowCount, value);
+    if (value > 0) {
+      this.to = Math.min(__privateGet(this, _baseTo) + __privateGet(this, _renderBufferSize), value);
+    } else {
+      this.to = __privateGet(this, _baseTo) + __privateGet(this, _renderBufferSize);
+    }
+  }
+  get reset() {
+    return new _RangeImpl(0, __privateGet(this, _baseTo) - __privateGet(this, _baseFrom), {
+      rowCount: __privateGet(this, _rowCount),
+      renderBufferSize: __privateGet(this, _renderBufferSize)
+    });
+  }
+  equals(range) {
+    return range.from === __privateGet(this, _baseFrom) && range.to === __privateGet(this, _baseTo);
+  }
+  toJson() {
+    return {
+      from: this.from,
+      to: this.to,
+      baseFrom: __privateGet(this, _baseFrom),
+      baseTo: __privateGet(this, _baseTo),
+      renderBufferSize: __privateGet(this, _renderBufferSize),
+      rowCount: __privateGet(this, _rowCount)
+    };
+  }
+};
+_baseFrom = new WeakMap();
+_renderBufferSize = new WeakMap();
+_rowCount = new WeakMap();
+_baseTo = new WeakMap();
+let RangeImpl = _RangeImpl;
+const Range = (from, to, rangeOptions) => new RangeImpl(from, to, rangeOptions);
+const NULL_RANGE = Range(0, 0);
 function getFullRange({ from, to }, bufferSize = 0, totalRowCount = Number.MAX_SAFE_INTEGER) {
   if (from === 0 && to === 0) {
     return { from, to };
@@ -33,14 +118,6 @@ function getFullRange({ from, to }, bufferSize = 0, totalRowCount = Number.MAX_S
     }
   }
 }
-function resetRange({ from, to, bufferSize = 0 }) {
-  return {
-    from: 0,
-    to: to - from,
-    bufferSize,
-    reset: true
-  };
-}
 const withinRange = (value, { from, to }) => value >= from && value < to;
 const rangeNewItems = ({ from: from1, to: to1 }, newRange) => {
   const { from: from2, to: to2 } = newRange;
@@ -67,5 +144,5 @@ class WindowRange {
   }
 }
 
-export { NULL_RANGE, WindowRange, getFullRange, rangeNewItems, rangesAreSame, resetRange, withinRange };
+export { NULL_RANGE, Range, WindowRange, getFullRange, rangeNewItems, withinRange };
 //# sourceMappingURL=range-utils.js.map

package/esm/range-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"range-utils.js","sources":["../src/range-utils.ts"],"sourcesContent":["export interface VuuRange {\n  from: number;\n  to: number;\n  bufferSize?: number;\n  reset?: boolean;\n}\n\ninterface FromToRange {\n  from: number;\n  to: number;\n}\n\nexport const NULL_RANGE: VuuRange = { from: 0, to: 0 } as const;\n\nexport const rangesAreSame = (\n  r1: VuuRange | undefined,\n  r2: VuuRange | undefined\n) => {\n  return r1?.from === r2?.from && r1?.to === r2?.to;\n};\n\nexport function getFullRange(\n  { from, to }: VuuRange,\n  bufferSize = 0,\n  totalRowCount: number = Number.MAX_SAFE_INTEGER\n): FromToRange {\n  if (from === 0 && to === 0) {\n    return { from, to };\n  } else if (bufferSize === 0) {\n    if (totalRowCount < from) {\n      return { from: 0, to: 0 };\n    } else {\n      return { from, to: Math.min(to, totalRowCount) };\n    }\n  } else if (from === 0) {\n    return { from, to: Math.min(to + bufferSize, totalRowCount) };\n  } else {\n    const shortfallBefore = from - bufferSize < 0;\n    const shortfallAfter = totalRowCount - (to + bufferSize) < 0;\n    if (shortfallBefore && shortfallAfter) {\n      return { from: 0, to: totalRowCount };\n    } else if (shortfallBefore) {\n      return { from: 0, to: to + bufferSize };\n    } else if (shortfallAfter) {\n      return {\n        from: Math.max(0, from - bufferSize),\n        to: totalRowCount,\n      };\n    } else {\n      return { from: from - bufferSize, to: to + bufferSize };\n    }\n  }\n}\n\nexport function resetRange({ from, to, bufferSize = 0 }: VuuRange): VuuRange {\n  return {\n    from: 0,\n    to: to - from,\n    bufferSize,\n    reset: true,\n  };\n}\n\nexport const withinRange = (value: number, { from, to }: VuuRange) =>\n  value >= from && value < to;\n\n// export const rangeOverlap = (\n//   { from: from1, to: to1 }: VuuRange,\n//   { from: from2, to: to2 }: VuuRange\n// ): VuuRange => {\n//   return from2 >= to1 || to2 < from1\n//     ? { from: 0, to: 0 }\n//     : { from: Math.max(from2, from1), to: Math.min(to2, to1) };\n// };\n\nexport const rangeNewItems = (\n  { from: from1, to: to1 }: VuuRange,\n  newRange: VuuRange\n): VuuRange => {\n  const { from: from2, to: to2 } = newRange;\n  const noOverlap = from2 >= to1 || to2 <= from1;\n  const newFullySubsumesOld = from2 < from1 && to2 > to1;\n  return noOverlap || newFullySubsumesOld\n    ? newRange\n    : to2 > to1\n    ? { from: to1, to: to2 }\n    : { from: from2, to: from1 };\n};\n\nexport class WindowRange {\n  public from: number;\n  public to: number;\n\n  constructor(from: number, to: number) {\n    this.from = from;\n    this.to = to;\n  }\n\n  public isWithin(index: number) {\n    return withinRange(index, this);\n  }\n\n  //find the overlap of this range and a new one\n  public overlap(from: number, to: number): [number, number] {\n    return from >= this.to || to < this.from\n      ? [0, 0]\n      : [Math.max(from, this.from), Math.min(to, this.to)];\n  }\n\n  public copy(): WindowRange {\n    return new WindowRange(this.from, this.to);\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"range-utils.js","sources":["../src/range-utils.ts"],"sourcesContent":["import { VuuRange } from \"@vuu-ui/vuu-protocol-types\";\n\ninterface FromToRange {\n  from: number;\n  to: number;\n}\n\nexport interface Range extends VuuRange {\n  equals: (vuuRange: VuuRange) => boolean;\n  firstRowInViewport: number;\n  lastRowInViewport: number;\n  renderBufferSize?: number;\n  reset: Range;\n  rowCount?: number;\n}\n\nexport interface RangeOptions {\n  renderBufferSize?: number;\n  rowCount?: number;\n}\n\nconst defaultRangeOptions = {\n  renderBufferSize: 0,\n  rowCount: -1,\n};\nclass RangeImpl implements Range {\n  #baseFrom: number;\n  #renderBufferSize = 0;\n  #rowCount = -1;\n  #baseTo: number;\n\n  // We have to keep these as simple public properties (not getters) so they survive structuredClone\n  public from = 0;\n  public to = 0;\n\n  constructor(\n    /** Index position of first visible row in viewport */\n    from: number,\n    /** Index position of last visible row in viewport + 1 */\n    to: number,\n    rangeOptions: RangeOptions = defaultRangeOptions,\n  ) {\n    this.#baseFrom = from;\n    this.#baseTo = to;\n    this.renderBufferSize =\n      rangeOptions.renderBufferSize ?? defaultRangeOptions.renderBufferSize;\n    this.rowCount = rangeOptions.rowCount ?? defaultRangeOptions.rowCount;\n\n    console.log(\n      `[Range] new (${this.#baseFrom}:${this.#baseTo}) renderBuffer: ${this.renderBufferSize}, rowCount: ${this.rowCount}`,\n    );\n  }\n\n  get firstRowInViewport() {\n    return this.#baseFrom + 1;\n  }\n\n  get lastRowInViewport() {\n    if (this.#rowCount > 0) {\n      return Math.min(this.#baseTo, this.#rowCount);\n    } else {\n      return this.#baseTo;\n    }\n  }\n\n  get renderBufferSize() {\n    return this.#renderBufferSize;\n  }\n\n  set renderBufferSize(value: number) {\n    this.#renderBufferSize = value;\n    this.from = Math.max(0, this.#baseFrom - value);\n    if (this.#rowCount > 0) {\n      this.to = Math.max(this.#baseTo + this.#renderBufferSize, this.#rowCount);\n    } else {\n      this.to = this.#baseTo + this.#renderBufferSize;\n    }\n  }\n\n  get rowCount() {\n    return this.#rowCount;\n  }\n\n  set rowCount(value: number) {\n    this.#rowCount = value;\n    if (value > 0) {\n      this.to = Math.min(this.#baseTo + this.#renderBufferSize, value);\n    } else {\n      this.to = this.#baseTo + this.#renderBufferSize;\n    }\n  }\n\n  get reset() {\n    return new RangeImpl(0, this.#baseTo - this.#baseFrom, {\n      rowCount: this.#rowCount,\n      renderBufferSize: this.#renderBufferSize,\n    });\n  }\n\n  equals(range: VuuRange) {\n    return range.from === this.#baseFrom && range.to === this.#baseTo;\n  }\n\n  toJson() {\n    return {\n      from: this.from,\n      to: this.to,\n      baseFrom: this.#baseFrom,\n      baseTo: this.#baseTo,\n      renderBufferSize: this.#renderBufferSize,\n      rowCount: this.#rowCount,\n    };\n  }\n}\n\nexport const Range = (\n  from: number,\n  to: number,\n  rangeOptions?: RangeOptions,\n): Range => new RangeImpl(from, to, rangeOptions);\n\nexport const NULL_RANGE = Range(0, 0);\n\nexport function getFullRange(\n  { from, to }: VuuRange,\n  bufferSize = 0,\n  totalRowCount: number = Number.MAX_SAFE_INTEGER,\n): FromToRange {\n  if (from === 0 && to === 0) {\n    return { from, to };\n  } else if (bufferSize === 0) {\n    if (totalRowCount < from) {\n      return { from: 0, to: 0 };\n    } else {\n      return { from, to: Math.min(to, totalRowCount) };\n    }\n  } else if (from === 0) {\n    return { from, to: Math.min(to + bufferSize, totalRowCount) };\n  } else {\n    const shortfallBefore = from - bufferSize < 0;\n    const shortfallAfter = totalRowCount - (to + bufferSize) < 0;\n    if (shortfallBefore && shortfallAfter) {\n      return { from: 0, to: totalRowCount };\n    } else if (shortfallBefore) {\n      return { from: 0, to: to + bufferSize };\n    } else if (shortfallAfter) {\n      return {\n        from: Math.max(0, from - bufferSize),\n        to: totalRowCount,\n      };\n    } else {\n      return { from: from - bufferSize, to: to + bufferSize };\n    }\n  }\n}\n\nexport const withinRange = (value: number, { from, to }: VuuRange) =>\n  value >= from && value < to;\n\n// export const rangeOverlap = (\n//   { from: from1, to: to1 }: VuuRange,\n//   { from: from2, to: to2 }: VuuRange\n// ): VuuRange => {\n//   return from2 >= to1 || to2 < from1\n//     ? { from: 0, to: 0 }\n//     : { from: Math.max(from2, from1), to: Math.min(to2, to1) };\n// };\n\nexport const rangeNewItems = (\n  { from: from1, to: to1 }: VuuRange,\n  newRange: VuuRange,\n): VuuRange => {\n  const { from: from2, to: to2 } = newRange;\n  const noOverlap = from2 >= to1 || to2 <= from1;\n  const newFullySubsumesOld = from2 < from1 && to2 > to1;\n  return noOverlap || newFullySubsumesOld\n    ? newRange\n    : to2 > to1\n      ? { from: to1, to: to2 }\n      : { from: from2, to: from1 };\n};\n\nexport class WindowRange {\n  public from: number;\n  public to: number;\n\n  constructor(from: number, to: number) {\n    this.from = from;\n    this.to = to;\n  }\n\n  public isWithin(index: number) {\n    return withinRange(index, this);\n  }\n\n  //find the overlap of this range and a new one\n  public overlap(from: number, to: number): [number, number] {\n    return from >= this.to || to < this.from\n      ? [0, 0]\n      : [Math.max(from, this.from), Math.min(to, this.to)];\n  }\n\n  public copy(): WindowRange {\n    return new WindowRange(this.from, this.to);\n  }\n}\n"],"names":[],"mappings":"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"}

package/package.json

@@ -1,17 +1,17 @@
 {
-  "version": "0.11.2",
+  "version": "0.11.3",
   "author": "heswell",
   "license": "Apache-2.0",
   "types": "types/index.d.ts",
   "devDependencies": {
-    "@vuu-ui/vuu-data-types": "0.11.2",
-    "@vuu-ui/vuu-table-types": "0.11.2",
-    "@vuu-ui/vuu-filter-types": "0.11.2",
-    "@vuu-ui/vuu-protocol-types": "0.11.2"
+    "@vuu-ui/vuu-data-types": "0.11.3",
+    "@vuu-ui/vuu-table-types": "0.11.3",
+    "@vuu-ui/vuu-filter-types": "0.11.3",
+    "@vuu-ui/vuu-protocol-types": "0.11.3"
   },
   "peerDependencies": {
     "@internationalized/date": "^3.0.0",
-    "@vuu-ui/vuu-filter-parser": "0.11.2",
+    "@vuu-ui/vuu-filter-parser": "0.11.3",
     "clsx": "^2.0.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"

package/types/datasource/BaseDataSource.d.ts

@@ -1,22 +1,23 @@
-import type { DataSource, DataSourceConfig, DataSourceConstructorProps, DataSourceEvents, DataSourceFilter, SubscribeCallback, SubscribeProps, WithBaseFilter, WithFullConfig } from "@vuu-ui/vuu-data-types";
+import type { DataSource, DataSourceConfig, DataSourceConstructorProps, DataSourceEvents, DataSourceFilter, DataSourceSubscribeCallback, DataSourceSubscribeProps, WithBaseFilter, WithFullConfig } from "@vuu-ui/vuu-data-types";
 import { LinkDescriptorWithLabel, VuuAggregation, VuuRange, VuuSort } from "@vuu-ui/vuu-protocol-types";
 import { EventEmitter } from "../event-emitter";
 import { DataSourceConfigChanges } from "./datasource-utils";
+import { Range } from "../range-utils";
 export type RuntimeConfig = WithBaseFilter<WithFullConfig> & {
     visualLink?: LinkDescriptorWithLabel;
 };
 export declare abstract class BaseDataSource extends EventEmitter<DataSourceEvents> implements Pick<DataSource, "config"> {
     #private;
     viewport: string;
-    protected _clientCallback: SubscribeCallback | undefined;
+    protected _clientCallback: DataSourceSubscribeCallback | undefined;
     protected _config: RuntimeConfig;
     protected _impendingConfig: RuntimeConfig | undefined;
-    protected _range: VuuRange;
+    protected _range: Range;
     protected _size: number;
     protected _title: string | undefined;
     private awaitingConfirmationOfConfigChanges;
     constructor({ aggregations, baseFilterSpec, columns, filterSpec, groupBy, sort, title, viewport, }: Omit<DataSourceConstructorProps, "table">);
-    subscribe({ baseFilterSpec, columns, aggregations, range, sort, groupBy, filterSpec, viewport, }: SubscribeProps, callback: SubscribeCallback): void;
+    subscribe({ baseFilterSpec, columns, aggregations, range, sort, groupBy, filterSpec, viewport, }: DataSourceSubscribeProps, callback: DataSourceSubscribeCallback): void;
     get aggregations(): VuuAggregation[];
     set aggregations(aggregations: VuuAggregation[]);
     get baseFilter(): DataSourceFilter | undefined;
@@ -32,8 +33,8 @@ export declare abstract class BaseDataSource extends EventEmitter<DataSourceEven
     set impendingConfig(config: WithBaseFilter<WithFullConfig>);
     get pageCount(): number;
     set pageCount(pageCount: number);
-    get range(): VuuRange;
-    set range(range: VuuRange);
+    get range(): Range;
+    set range(range: Range);
     get size(): number;
     set size(size: number);
     get sort(): VuuSort;

package/types/range-utils.d.ts

@@ -1,17 +1,23 @@
-export interface VuuRange {
-    from: number;
-    to: number;
-    bufferSize?: number;
-    reset?: boolean;
-}
+import { VuuRange } from "@vuu-ui/vuu-protocol-types";
 interface FromToRange {
     from: number;
     to: number;
 }
-export declare const NULL_RANGE: VuuRange;
-export declare const rangesAreSame: (r1: VuuRange | undefined, r2: VuuRange | undefined) => boolean;
+export interface Range extends VuuRange {
+    equals: (vuuRange: VuuRange) => boolean;
+    firstRowInViewport: number;
+    lastRowInViewport: number;
+    renderBufferSize?: number;
+    reset: Range;
+    rowCount?: number;
+}
+export interface RangeOptions {
+    renderBufferSize?: number;
+    rowCount?: number;
+}
+export declare const Range: (from: number, to: number, rangeOptions?: RangeOptions) => Range;
+export declare const NULL_RANGE: Range;
 export declare function getFullRange({ from, to }: VuuRange, bufferSize?: number, totalRowCount?: number): FromToRange;
-export declare function resetRange({ from, to, bufferSize }: VuuRange): VuuRange;
 export declare const withinRange: (value: number, { from, to }: VuuRange) => boolean;
 export declare const rangeNewItems: ({ from: from1, to: to1 }: VuuRange, newRange: VuuRange) => VuuRange;
 export declare class WindowRange {