@vuu-ui/vuu-data-remote 0.8.96 → 0.8.97

package/esm/rest-data/{rest-data-source.js → RestDataSource.js}

@@ -1,5 +1,5 @@
-import { EventEmitter, buildColumnMap, NULL_RANGE, NO_CONFIG_CHANGES, uuid, vanillaConfig } from '@vuu-ui/vuu-utils';
-import { NDJsonReader, jsonToDataSourceRow } from './rest-utils.js';
+import { BaseDataSource, buildColumnMap, NULL_RANGE, hasSort, hasFilter } from '@vuu-ui/vuu-utils';
+import { NDJsonReader, sortToQueryString, filterToQueryString, jsonToDataSourceRow } from './rest-utils.js';
 import { MovingWindow } from './moving-window.js';
 
 var __defProp = Object.defineProperty;
@@ -11,16 +11,10 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 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"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-var _columnMap, _config, _data, _dataWindow, _range, _title;
-const _RestDataSource = class _RestDataSource extends EventEmitter {
-  constructor({
-    table,
-    title,
-    viewport = uuid()
-  }) {
-    super();
-    __publicField(this, "clientCallback");
+var _columnMap, _dataWindow;
+const _RestDataSource = class _RestDataSource extends BaseDataSource {
+  constructor(props) {
+    super(props);
     __privateAdd(this, _columnMap, buildColumnMap([
       "bbg",
       "currency",
@@ -29,20 +23,11 @@ const _RestDataSource = class _RestDataSource extends EventEmitter {
       "ric",
       "lotSize"
     ]));
-    __privateAdd(this, _config, vanillaConfig);
-    __privateAdd(this, _data, []);
     __privateAdd(this, _dataWindow, new MovingWindow(NULL_RANGE));
-    __privateAdd(this, _range, NULL_RANGE);
-    __privateAdd(this, _title);
-    __publicField(this, "aggregations", []);
-    __publicField(this, "filter", { filter: "" });
     __publicField(this, "groupBy", []);
     __publicField(this, "selectedRowsCount", 0);
-    __publicField(this, "size", 0);
-    __publicField(this, "sort", { sortDefs: [] });
     __publicField(this, "status", "initialising");
     __publicField(this, "table");
-    __publicField(this, "viewport");
     __publicField(this, "fetchData", async () => {
       const { recordCount } = await this.fetchMetaData();
       const pageCount = Math.ceil(recordCount / this.pageSize);
@@ -53,10 +38,10 @@ const _RestDataSource = class _RestDataSource extends EventEmitter {
         console.log(
           `processing ${__privateGet(this, _dataWindow).data.length} rows took ${end - start}ms`
         );
-        this.clientCallback?.({
+        this._clientCallback?.({
           clientViewportId: this.viewport,
           mode: "update",
-          range: __privateGet(this, _range),
+          range: this._range,
           rows: __privateGet(this, _dataWindow).data,
           size: recordCount,
           type: "viewport-update"
@@ -67,7 +52,7 @@ const _RestDataSource = class _RestDataSource extends EventEmitter {
         mode: "cors"
       }).then(
         NDJsonReader(
-          __privateGet(this, _range).from,
+          this._range.from,
           (index, json) => __privateGet(this, _dataWindow).add(
             jsonToDataSourceRow(index, json, __privateGet(this, _columnMap))
           ),
@@ -89,7 +74,6 @@ const _RestDataSource = class _RestDataSource extends EventEmitter {
     __publicField(this, "applyEdit", async () => {
       return "Method not implemented";
     });
-    __publicField(this, "applyConfig", () => NO_CONFIG_CHANGES);
     __publicField(this, "openTreeNode", () => {
       throw new Error("openTreeNode, Method not implemented.");
     });
@@ -106,25 +90,20 @@ const _RestDataSource = class _RestDataSource extends EventEmitter {
     __publicField(this, "select", () => {
       throw new Error("remoteProcedureCall, Method not implemented.");
     });
+    const { table } = props;
     if (!table) throw Error("RestDataSource constructor called without table");
     this.table = table;
-    this.viewport = viewport;
-    __privateSet(this, _config, {
-      ...__privateGet(this, _config),
-      columns: [
-        "bbg",
-        "currency",
-        "description",
-        "exchange",
-        "ric",
-        "isin",
-        "lotSize"
-      ]
-    });
-    __privateSet(this, _title, title);
+  }
+  async subscribe(subscribeProps, callback) {
+    super.subscribe(subscribeProps, callback);
+    console.log(`subscribe ${JSON.stringify(subscribeProps, null, 2)}`);
+    this.rangeRequest(this._range);
+  }
+  unsubscribe() {
+    console.log("unsubscribe");
   }
   get pageSize() {
-    return __privateGet(this, _range).to - __privateGet(this, _range).from;
+    return this._range.to - this._range.from;
   }
   static get api() {
     return this._api;
@@ -136,43 +115,40 @@ const _RestDataSource = class _RestDataSource extends EventEmitter {
     return `${_RestDataSource.api}/${this.table.table}`;
   }
   get dataUrl() {
-    const { from, to } = __privateGet(this, _range);
-    return `${this.url}?origin=${from}&limit=${to - from}`;
+    const { from, to } = this._range;
+    return `${this.url}?origin=${from}&limit=${to - from}${this.queryStringParameters}`;
   }
   get metaDataUrl() {
     return `${this.url}/summary`;
   }
+  get queryStringParameters() {
+    const params = [];
+    if (hasSort(this._config)) {
+      params.push(sortToQueryString(this._config.sort));
+    }
+    if (hasFilter(this._config)) {
+      params.push(filterToQueryString(this._config.filterSpec));
+    }
+    return params.join("");
+  }
   get title() {
-    return __privateGet(this, _title) ?? `${this.table.module} ${this.table.table}`;
+    return this._title ?? `${this.table.module} ${this.table.table}`;
   }
   set title(title) {
-    __privateSet(this, _title, title);
+    this._title = title;
   }
-  async subscribe({ range, ...props }, callback) {
-    if (range) {
-      this.range = range;
-    }
-    console.log(`subscribe ${JSON.stringify(props, null, 2)}`);
-    this.clientCallback = callback;
+  rangeRequest(range) {
+    console.log(`set range ${JSON.stringify(range)}`);
+    __privateGet(this, _dataWindow).setRange(range);
     this.fetchData();
   }
-  unsubscribe() {
-    console.log("unsubscribe");
-  }
-  get columns() {
-    return __privateGet(this, _config).columns;
-  }
   get config() {
-    return __privateGet(this, _config);
+    return super.config;
   }
-  get range() {
-    return __privateGet(this, _range);
-  }
-  set range(range) {
-    console.log(`set range ${JSON.stringify(range)}`);
-    if (range.from !== __privateGet(this, _range).from || range.to !== __privateGet(this, _range).to) {
-      __privateSet(this, _range, range);
-      __privateGet(this, _dataWindow).setRange(range);
+  set config(config) {
+    const previousConfig = this._config;
+    super.config = config;
+    if (this._config !== previousConfig) {
       this.fetchData();
     }
   }
@@ -181,13 +157,9 @@ const _RestDataSource = class _RestDataSource extends EventEmitter {
   }
 };
 _columnMap = new WeakMap();
-_config = new WeakMap();
-_data = new WeakMap();
 _dataWindow = new WeakMap();
-_range = new WeakMap();
-_title = new WeakMap();
 __publicField(_RestDataSource, "_api", "/api");
 let RestDataSource = _RestDataSource;
 
 export { RestDataSource };
-//# sourceMappingURL=rest-data-source.js.map
+//# sourceMappingURL=RestDataSource.js.map

package/esm/rest-data/RestDataSource.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RestDataSource.js","sources":["../../src/rest-data/RestDataSource.ts"],"sourcesContent":["import {\n  DataSource,\n  DataSourceConfig,\n  DataSourceConstructorProps,\n  DataSourceEditHandler,\n  DataSourceStatus,\n  SubscribeCallback,\n  SubscribeProps,\n} from \"@vuu-ui/vuu-data-types\";\nimport { VuuTable, VuuGroupBy, VuuRange } from \"@vuu-ui/vuu-protocol-types\";\nimport {\n  BaseDataSource,\n  ColumnMap,\n  NULL_RANGE,\n  buildColumnMap,\n  hasFilter,\n  hasSort,\n} from \"@vuu-ui/vuu-utils\";\nimport {\n  NDJsonReader,\n  filterToQueryString,\n  jsonToDataSourceRow,\n  sortToQueryString,\n} from \"./rest-utils\";\nimport { MovingWindow } from \"./moving-window\";\n\nexport type RestMetaData = {\n  recordCount: number;\n};\n\nexport class RestDataSource extends BaseDataSource implements DataSource {\n  private static _api = \"/api\";\n\n  #columnMap: ColumnMap = buildColumnMap([\n    \"bbg\",\n    \"currency\",\n    \"description\",\n    \"exchange\",\n    \"ric\",\n    \"lotSize\",\n  ]);\n  #dataWindow = new MovingWindow(NULL_RANGE);\n\n  groupBy: VuuGroupBy = [];\n  selectedRowsCount = 0;\n  status: DataSourceStatus = \"initialising\";\n  table: VuuTable;\n\n  constructor(props: DataSourceConstructorProps & { url?: string }) {\n    super(props);\n\n    const { table } = props;\n\n    if (!table) throw Error(\"RestDataSource constructor called without table\");\n    this.table = table;\n  }\n\n  async subscribe(subscribeProps: SubscribeProps, callback: SubscribeCallback) {\n    super.subscribe(subscribeProps, callback);\n\n    console.log(`subscribe ${JSON.stringify(subscribeProps, null, 2)}`);\n\n    this.rangeRequest(this._range);\n  }\n\n  unsubscribe() {\n    console.log(\"unsubscribe\");\n  }\n\n  private get pageSize() {\n    return this._range.to - this._range.from;\n  }\n\n  static get api() {\n    return this._api;\n  }\n\n  static set api(url: string) {\n    this._api = url;\n  }\n\n  get url() {\n    return `${RestDataSource.api}/${this.table.table}`;\n  }\n\n  get dataUrl() {\n    const { from, to } = this._range;\n    return `${this.url}?origin=${from}&limit=${to - from}${this.queryStringParameters}`;\n  }\n\n  get metaDataUrl() {\n    return `${this.url}/summary`;\n  }\n\n  private get queryStringParameters() {\n    const params: string[] = [];\n    if (hasSort(this._config)) {\n      params.push(sortToQueryString(this._config.sort));\n    }\n\n    if (hasFilter(this._config)) {\n      params.push(filterToQueryString(this._config.filterSpec));\n    }\n\n    return params.join(\"\");\n  }\n\n  get title() {\n    return this._title ?? `${this.table.module} ${this.table.table}`;\n  }\n\n  set title(title: string) {\n    this._title = title;\n  }\n\n  rangeRequest(range: VuuRange) {\n    console.log(`set range ${JSON.stringify(range)}`);\n    this.#dataWindow.setRange(range);\n    this.fetchData();\n  }\n\n  get config() {\n    return super.config;\n  }\n\n  set config(config: DataSourceConfig) {\n    const previousConfig = this._config;\n    super.config = config;\n\n    if (this._config !== previousConfig) {\n      this.fetchData();\n    }\n  }\n\n  private fetchData = async () => {\n    const { recordCount } = await this.fetchMetaData();\n\n    const pageCount = Math.ceil(recordCount / this.pageSize);\n    this.emit(\"page-count\", pageCount);\n\n    const start = performance.now();\n    const allDone = () => {\n      const end = performance.now();\n      console.log(\n        `processing ${this.#dataWindow.data.length} rows took ${end - start}ms`,\n      );\n      this._clientCallback?.({\n        clientViewportId: this.viewport,\n        mode: \"update\",\n        range: this._range,\n        rows: this.#dataWindow.data,\n        size: recordCount,\n        type: \"viewport-update\",\n      });\n    };\n\n    console.log(`base ${RestDataSource.api}`);\n\n    fetch(this.dataUrl, {\n      mode: \"cors\",\n    }).then(\n      NDJsonReader(\n        this._range.from,\n        (index, json) =>\n          this.#dataWindow.add(\n            jsonToDataSourceRow(index, json, this.#columnMap),\n          ),\n        allDone,\n      ),\n    );\n  };\n\n  private fetchMetaData = async () =>\n    new Promise<RestMetaData>((resolve, reject) => {\n      fetch(this.metaDataUrl, {\n        mode: \"cors\",\n      }).then((response) => {\n        if (response.ok) {\n          resolve(response.json());\n        } else {\n          reject(response.status);\n        }\n      });\n    });\n\n  private sendRowsToClient() {\n    console.log(`send rows to client`);\n  }\n\n  applyEdit: DataSourceEditHandler = async () => {\n    return \"Method not implemented\";\n  };\n\n  openTreeNode = () => {\n    throw new Error(\"openTreeNode, Method not implemented.\");\n  };\n  closeTreeNode = () => {\n    throw new Error(\"closeTreeNode, Method not implemented.\");\n  };\n\n  remoteProcedureCall = async <T>() => \"Method not implemented\" as T;\n  menuRpcCall = async () => {\n    return \"Method not supported\";\n  };\n  rpcCall = async <T>() => {\n    return \"Method not supported\" as T;\n  };\n\n  select = () => {\n    throw new Error(\"remoteProcedureCall, Method not implemented.\");\n  };\n}\n"],"names":[],"mappings":"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"}

package/esm/rest-data/rest-utils.js

@@ -44,6 +44,12 @@ const jsonToDataSourceRow = (rowIndex, json, columnMap) => {
   }
   return dataSourceRow;
 };
+const sortParamsToList = (sortDefs) => sortDefs.reduce(
+  (list, { column, sortType }) => list.concat([column, sortType]),
+  []
+);
+const sortToQueryString = (sort) => `&sort=[${sortParamsToList(sort.sortDefs)}]`;
+const filterToQueryString = (vuuFilter) => `&filter=[${vuuFilter.filter}]`;
 
-export { NDJsonReader, jsonToDataSourceRow };
+export { NDJsonReader, filterToQueryString, jsonToDataSourceRow, sortToQueryString };
 //# sourceMappingURL=rest-utils.js.map

package/esm/rest-data/rest-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"rest-utils.js","sources":["../../src/rest-data/rest-utils.ts"],"sourcesContent":["import { DataSourceRow } from \"@vuu-ui/vuu-data-types\";\nimport { VuuRowDataItemType } from \"@vuu-ui/vuu-protocol-types\";\nimport { ColumnMap } from \"@vuu-ui/vuu-utils\";\n\nexport type JsonPrimitive = string | number | boolean | null;\nexport type JsonArray = Json[];\nexport type JsonObject = { [key: string]: Json };\nexport type Json = JsonPrimitive | JsonArray | JsonObject;\nexport type JsonHandler = (rowIndex: number, json: JsonObject) => void;\n\nexport const NDJsonReader =\n  (startIndex: number, jsonHandler: JsonHandler, onEnd: () => void) =>\n  (response: Response) => {\n    if (response.ok && response.body) {\n      const stream = response.body.getReader();\n      const decoder = new TextDecoder();\n      const matcher = /\\r?\\n/;\n      let buf = \"\";\n      let index = startIndex;\n\n      const loop: () => void = () =>\n        stream.read().then(({ done, value }) => {\n          if (done) {\n            if (buf.length > 0) jsonHandler(index, JSON.parse(buf));\n            onEnd();\n          } else {\n            const chunk = decoder.decode(value, {\n              stream: true,\n            });\n            buf += chunk;\n\n            const jsonFragments = buf.split(matcher);\n            buf = jsonFragments.pop() ?? \"\";\n            for (const jsonFragment of jsonFragments) {\n              jsonHandler(index, JSON.parse(jsonFragment));\n              index += 1;\n            }\n            return loop();\n          }\n        });\n      return loop();\n    } else {\n      throw Error(`response invalid ${response.status} ${response.statusText}`);\n    }\n  };\n\nexport const jsonToDataSourceRow = (\n  rowIndex: number,\n  json: JsonObject,\n  columnMap: ColumnMap,\n): DataSourceRow => {\n  const dataSourceRow: DataSourceRow = [\n    rowIndex,\n    rowIndex,\n    true,\n    false,\n    0,\n    0,\n    json.ric as string,\n    0,\n  ];\n  for (const [column, colIdx] of Object.entries(columnMap)) {\n    dataSourceRow[colIdx] = json[column] as VuuRowDataItemType;\n  }\n  return dataSourceRow;\n};\n"],"names":[],"mappings":"AAUO,MAAM,eACX,CAAC,UAAA,EAAoB,WAA0B,EAAA,KAAA,KAC/C,CAAC,QAAuB,KAAA;AACtB,EAAI,IAAA,QAAA,CAAS,EAAM,IAAA,QAAA,CAAS,IAAM,EAAA;AAChC,IAAM,MAAA,MAAA,GAAS,QAAS,CAAA,IAAA,CAAK,SAAU,EAAA,CAAA;AACvC,IAAM,MAAA,OAAA,GAAU,IAAI,WAAY,EAAA,CAAA;AAChC,IAAA,MAAM,OAAU,GAAA,OAAA,CAAA;AAChB,IAAA,IAAI,GAAM,GAAA,EAAA,CAAA;AACV,IAAA,IAAI,KAAQ,GAAA,UAAA,CAAA;AAEZ,IAAM,MAAA,IAAA,GAAmB,MACvB,MAAA,CAAO,IAAK,EAAA,CAAE,KAAK,CAAC,EAAE,IAAM,EAAA,KAAA,EAAY,KAAA;AACtC,MAAA,IAAI,IAAM,EAAA;AACR,QAAI,IAAA,GAAA,CAAI,SAAS,CAAG,EAAA,WAAA,CAAY,OAAO,IAAK,CAAA,KAAA,CAAM,GAAG,CAAC,CAAA,CAAA;AACtD,QAAM,KAAA,EAAA,CAAA;AAAA,OACD,MAAA;AACL,QAAM,MAAA,KAAA,GAAQ,OAAQ,CAAA,MAAA,CAAO,KAAO,EAAA;AAAA,UAClC,MAAQ,EAAA,IAAA;AAAA,SACT,CAAA,CAAA;AACD,QAAO,GAAA,IAAA,KAAA,CAAA;AAEP,QAAM,MAAA,aAAA,GAAgB,GAAI,CAAA,KAAA,CAAM,OAAO,CAAA,CAAA;AACvC,QAAM,GAAA,GAAA,aAAA,CAAc,KAAS,IAAA,EAAA,CAAA;AAC7B,QAAA,KAAA,MAAW,gBAAgB,aAAe,EAAA;AACxC,UAAA,WAAA,CAAY,KAAO,EAAA,IAAA,CAAK,KAAM,CAAA,YAAY,CAAC,CAAA,CAAA;AAC3C,UAAS,KAAA,IAAA,CAAA,CAAA;AAAA,SACX;AACA,QAAA,OAAO,IAAK,EAAA,CAAA;AAAA,OACd;AAAA,KACD,CAAA,CAAA;AACH,IAAA,OAAO,IAAK,EAAA,CAAA;AAAA,GACP,MAAA;AACL,IAAA,MAAM,MAAM,CAAoB,iBAAA,EAAA,QAAA,CAAS,MAAM,CAAI,CAAA,EAAA,QAAA,CAAS,UAAU,CAAE,CAAA,CAAA,CAAA;AAAA,GAC1E;AACF,EAAA;AAEK,MAAM,mBAAsB,GAAA,CACjC,QACA,EAAA,IAAA,EACA,SACkB,KAAA;AAClB,EAAA,MAAM,aAA+B,GAAA;AAAA,IACnC,QAAA;AAAA,IACA,QAAA;AAAA,IACA,IAAA;AAAA,IACA,KAAA;AAAA,IACA,CAAA;AAAA,IACA,CAAA;AAAA,IACA,IAAK,CAAA,GAAA;AAAA,IACL,CAAA;AAAA,GACF,CAAA;AACA,EAAA,KAAA,MAAW,CAAC,MAAQ,EAAA,MAAM,KAAK,MAAO,CAAA,OAAA,CAAQ,SAAS,CAAG,EAAA;AACxD,IAAc,aAAA,CAAA,MAAM,CAAI,GAAA,IAAA,CAAK,MAAM,CAAA,CAAA;AAAA,GACrC;AACA,EAAO,OAAA,aAAA,CAAA;AACT;;;;"}
+{"version":3,"file":"rest-utils.js","sources":["../../src/rest-data/rest-utils.ts"],"sourcesContent":["import { DataSourceRow } from \"@vuu-ui/vuu-data-types\";\nimport {\n  VuuFilter,\n  VuuRowDataItemType,\n  VuuSort,\n  VuuSortCol,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport { ColumnMap } from \"@vuu-ui/vuu-utils\";\n\nexport type JsonPrimitive = string | number | boolean | null;\nexport type JsonArray = Json[];\nexport type JsonObject = { [key: string]: Json };\nexport type Json = JsonPrimitive | JsonArray | JsonObject;\nexport type JsonHandler = (rowIndex: number, json: JsonObject) => void;\n\nexport const NDJsonReader =\n  (startIndex: number, jsonHandler: JsonHandler, onEnd: () => void) =>\n  (response: Response) => {\n    if (response.ok && response.body) {\n      const stream = response.body.getReader();\n      const decoder = new TextDecoder();\n      const matcher = /\\r?\\n/;\n      let buf = \"\";\n      let index = startIndex;\n\n      const loop: () => void = () =>\n        stream.read().then(({ done, value }) => {\n          if (done) {\n            if (buf.length > 0) jsonHandler(index, JSON.parse(buf));\n            onEnd();\n          } else {\n            const chunk = decoder.decode(value, {\n              stream: true,\n            });\n            buf += chunk;\n\n            const jsonFragments = buf.split(matcher);\n            buf = jsonFragments.pop() ?? \"\";\n            for (const jsonFragment of jsonFragments) {\n              jsonHandler(index, JSON.parse(jsonFragment));\n              index += 1;\n            }\n            return loop();\n          }\n        });\n      return loop();\n    } else {\n      throw Error(`response invalid ${response.status} ${response.statusText}`);\n    }\n  };\n\nexport const jsonToDataSourceRow = (\n  rowIndex: number,\n  json: JsonObject,\n  columnMap: ColumnMap,\n): DataSourceRow => {\n  const dataSourceRow: DataSourceRow = [\n    rowIndex,\n    rowIndex,\n    true,\n    false,\n    0,\n    0,\n    json.ric as string,\n    0,\n  ];\n  for (const [column, colIdx] of Object.entries(columnMap)) {\n    dataSourceRow[colIdx] = json[column] as VuuRowDataItemType;\n  }\n  return dataSourceRow;\n};\n\nconst sortParamsToList = (sortDefs: VuuSortCol[]) =>\n  sortDefs.reduce<string[]>(\n    (list, { column, sortType }) => list.concat([column, sortType]),\n    [],\n  );\n\nexport const sortToQueryString = (sort: VuuSort) =>\n  `&sort=[${sortParamsToList(sort.sortDefs)}]`;\n\nexport const filterToQueryString = (vuuFilter: VuuFilter) =>\n  `&filter=[${vuuFilter.filter}]`;\n"],"names":[],"mappings":"AAeO,MAAM,eACX,CAAC,UAAA,EAAoB,WAA0B,EAAA,KAAA,KAC/C,CAAC,QAAuB,KAAA;AACtB,EAAI,IAAA,QAAA,CAAS,EAAM,IAAA,QAAA,CAAS,IAAM,EAAA;AAChC,IAAM,MAAA,MAAA,GAAS,QAAS,CAAA,IAAA,CAAK,SAAU,EAAA,CAAA;AACvC,IAAM,MAAA,OAAA,GAAU,IAAI,WAAY,EAAA,CAAA;AAChC,IAAA,MAAM,OAAU,GAAA,OAAA,CAAA;AAChB,IAAA,IAAI,GAAM,GAAA,EAAA,CAAA;AACV,IAAA,IAAI,KAAQ,GAAA,UAAA,CAAA;AAEZ,IAAM,MAAA,IAAA,GAAmB,MACvB,MAAA,CAAO,IAAK,EAAA,CAAE,KAAK,CAAC,EAAE,IAAM,EAAA,KAAA,EAAY,KAAA;AACtC,MAAA,IAAI,IAAM,EAAA;AACR,QAAI,IAAA,GAAA,CAAI,SAAS,CAAG,EAAA,WAAA,CAAY,OAAO,IAAK,CAAA,KAAA,CAAM,GAAG,CAAC,CAAA,CAAA;AACtD,QAAM,KAAA,EAAA,CAAA;AAAA,OACD,MAAA;AACL,QAAM,MAAA,KAAA,GAAQ,OAAQ,CAAA,MAAA,CAAO,KAAO,EAAA;AAAA,UAClC,MAAQ,EAAA,IAAA;AAAA,SACT,CAAA,CAAA;AACD,QAAO,GAAA,IAAA,KAAA,CAAA;AAEP,QAAM,MAAA,aAAA,GAAgB,GAAI,CAAA,KAAA,CAAM,OAAO,CAAA,CAAA;AACvC,QAAM,GAAA,GAAA,aAAA,CAAc,KAAS,IAAA,EAAA,CAAA;AAC7B,QAAA,KAAA,MAAW,gBAAgB,aAAe,EAAA;AACxC,UAAA,WAAA,CAAY,KAAO,EAAA,IAAA,CAAK,KAAM,CAAA,YAAY,CAAC,CAAA,CAAA;AAC3C,UAAS,KAAA,IAAA,CAAA,CAAA;AAAA,SACX;AACA,QAAA,OAAO,IAAK,EAAA,CAAA;AAAA,OACd;AAAA,KACD,CAAA,CAAA;AACH,IAAA,OAAO,IAAK,EAAA,CAAA;AAAA,GACP,MAAA;AACL,IAAA,MAAM,MAAM,CAAoB,iBAAA,EAAA,QAAA,CAAS,MAAM,CAAI,CAAA,EAAA,QAAA,CAAS,UAAU,CAAE,CAAA,CAAA,CAAA;AAAA,GAC1E;AACF,EAAA;AAEK,MAAM,mBAAsB,GAAA,CACjC,QACA,EAAA,IAAA,EACA,SACkB,KAAA;AAClB,EAAA,MAAM,aAA+B,GAAA;AAAA,IACnC,QAAA;AAAA,IACA,QAAA;AAAA,IACA,IAAA;AAAA,IACA,KAAA;AAAA,IACA,CAAA;AAAA,IACA,CAAA;AAAA,IACA,IAAK,CAAA,GAAA;AAAA,IACL,CAAA;AAAA,GACF,CAAA;AACA,EAAA,KAAA,MAAW,CAAC,MAAQ,EAAA,MAAM,KAAK,MAAO,CAAA,OAAA,CAAQ,SAAS,CAAG,EAAA;AACxD,IAAc,aAAA,CAAA,MAAM,CAAI,GAAA,IAAA,CAAK,MAAM,CAAA,CAAA;AAAA,GACrC;AACA,EAAO,OAAA,aAAA,CAAA;AACT,EAAA;AAEA,MAAM,gBAAA,GAAmB,CAAC,QAAA,KACxB,QAAS,CAAA,MAAA;AAAA,EACP,CAAC,IAAM,EAAA,EAAE,MAAQ,EAAA,QAAA,EAAe,KAAA,IAAA,CAAK,MAAO,CAAA,CAAC,MAAQ,EAAA,QAAQ,CAAC,CAAA;AAAA,EAC9D,EAAC;AACH,CAAA,CAAA;AAEK,MAAM,oBAAoB,CAAC,IAAA,KAChC,UAAU,gBAAiB,CAAA,IAAA,CAAK,QAAQ,CAAC,CAAA,CAAA,EAAA;AAEpC,MAAM,mBAAsB,GAAA,CAAC,SAClC,KAAA,CAAA,SAAA,EAAY,UAAU,MAAM,CAAA,CAAA;;;;"}

package/esm/vuu-data-source.js

@@ -1,5 +1,4 @@
-import { parseFilter } from '@vuu-ui/vuu-filter-parser';
-import { logger, EventEmitter, debounce, throttle, uuid, selectionCount, combineFilters, isConfigChanged, withConfigDefaults, itemsOrOrderChanged, vuuEditCellRequest, vuuAddRowRequest, vuuDeleteRowRequest, vanillaConfig, isViewportMenusAction, isVisualLinksAction } from '@vuu-ui/vuu-utils';
+import { logger, BaseDataSource, debounce, throttle, uuid, combineFilters, selectionCount, itemsOrOrderChanged, vuuEditCellRequest, vuuAddRowRequest, vuuDeleteRowRequest, isViewportMenusAction, isVisualLinksAction } from '@vuu-ui/vuu-utils';
 import ConnectionManager from './ConnectionManager.js';
 import { isDataSourceConfigMessage } from './data-source.js';
 
@@ -13,28 +12,15 @@ var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot
 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"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-var _config, _groupBy, _pendingVisualLink, _links, _menu, _optimize, _range, _selectedRowsCount, _size, _status, _tableSchema, _title;
+var _groupBy, _pendingVisualLink, _links, _menu, _optimize, _range, _selectedRowsCount, _status, _tableSchema;
 const { info } = logger("VuuDataSource");
-class VuuDataSource extends EventEmitter {
-  constructor({
-    bufferSize = 100,
-    aggregations,
-    columns,
-    filterSpec,
-    groupBy,
-    sort,
-    table,
-    title,
-    viewport,
-    visualLink
-  }) {
-    super();
+class VuuDataSource extends BaseDataSource {
+  constructor(props) {
+    super(props);
     __publicField(this, "bufferSize");
     __publicField(this, "server", null);
-    __publicField(this, "clientCallback");
     __publicField(this, "configChangePending");
     __publicField(this, "rangeRequest");
-    __privateAdd(this, _config, vanillaConfig);
     __privateAdd(this, _groupBy, []);
     __privateAdd(this, _pendingVisualLink);
     __privateAdd(this, _links);
@@ -42,17 +28,14 @@ class VuuDataSource extends EventEmitter {
     __privateAdd(this, _optimize, "throttle");
     __privateAdd(this, _range, { from: 0, to: 0 });
     __privateAdd(this, _selectedRowsCount, 0);
-    __privateAdd(this, _size, 0);
     __privateAdd(this, _status, "initialising");
     __privateAdd(this, _tableSchema);
-    __privateAdd(this, _title);
     __publicField(this, "table");
-    __publicField(this, "viewport");
     __publicField(this, "handleMessageFromServer", (message) => {
       if (message.type === "subscribed") {
         __privateSet(this, _status, "subscribed");
         this.tableSchema = message.tableSchema;
-        this.clientCallback?.(message);
+        this._clientCallback?.(message);
         if (__privateGet(this, _pendingVisualLink)) {
           this.visualLink = __privateGet(this, _pendingVisualLink);
           __privateSet(this, _pendingVisualLink, void 0);
@@ -67,11 +50,11 @@ class VuuDataSource extends EventEmitter {
       } else if (message.type === "debounce-begin") {
         this.optimize = "debounce";
       } else {
-        if (message.type === "viewport-update" && message.size !== void 0 && message.size !== __privateGet(this, _size)) {
-          __privateSet(this, _size, message.size);
+        if (message.type === "viewport-update" && message.size !== void 0 && message.size !== this._size) {
+          this._size = message.size;
           this.emit("resize", message.size);
         } else if (message.type === "viewport-clear") {
-          __privateSet(this, _size, 0);
+          this._size = 0;
           this.emit("resize", 0);
         }
         if (this.configChangePending) {
@@ -82,7 +65,7 @@ class VuuDataSource extends EventEmitter {
         } else if (isVisualLinksAction(message)) {
           __privateSet(this, _links, message.links);
         } else {
-          this.clientCallback?.(message);
+          this._clientCallback?.(message);
         }
         if (this.optimize === "debounce") {
           this.revertDebounce();
@@ -119,65 +102,36 @@ class VuuDataSource extends EventEmitter {
         });
       }
     }, 80));
+    const { bufferSize = 100, table, visualLink } = props;
     if (!table)
       throw Error("RemoteDataSource constructor called without table");
     this.bufferSize = bufferSize;
     this.table = table;
-    this.viewport = viewport ?? "";
-    __privateSet(this, _config, {
-      ...__privateGet(this, _config),
-      aggregations: aggregations || __privateGet(this, _config).aggregations,
-      columns: columns || __privateGet(this, _config).columns,
-      filterSpec: filterSpec || __privateGet(this, _config).filterSpec,
-      groupBy: groupBy || __privateGet(this, _config).groupBy,
-      sort: sort || __privateGet(this, _config).sort
-    });
     __privateSet(this, _pendingVisualLink, visualLink);
-    __privateSet(this, _title, title);
     this.rangeRequest = this.rawRangeRequest;
   }
-  async subscribe({
-    viewport = this.viewport || (this.viewport = uuid()),
-    columns,
-    aggregations,
-    range,
-    sort,
-    groupBy,
-    filterSpec
-  }, callback) {
+  async subscribe(subscribeProps, callback) {
+    super.subscribe(subscribeProps, callback);
+    const { viewport = this.viewport || (this.viewport = uuid()) } = subscribeProps;
     if (__privateGet(this, _status) === "disabled" || __privateGet(this, _status) === "disabling") {
       this.enable(callback);
       return;
     }
-    this.clientCallback = callback;
-    if (aggregations || columns || filterSpec || groupBy || sort) {
-      __privateSet(this, _config, {
-        ...__privateGet(this, _config),
-        aggregations: aggregations || __privateGet(this, _config).aggregations,
-        columns: columns || __privateGet(this, _config).columns,
-        filterSpec: filterSpec || __privateGet(this, _config).filterSpec,
-        groupBy: groupBy || __privateGet(this, _config).groupBy,
-        sort: sort || __privateGet(this, _config).sort
-      });
-    }
-    if (range) {
-      __privateSet(this, _range, range);
-    }
     if (__privateGet(this, _status) !== "initialising" && __privateGet(this, _status) !== "unsubscribed") {
       return;
     }
     __privateSet(this, _status, "subscribing");
-    this.viewport = viewport;
     this.server = await ConnectionManager.serverAPI;
     const { bufferSize } = this;
+    const dataSourceConfig = combineFilters(this._config);
     this.server?.subscribe(
       {
-        ...__privateGet(this, _config),
+        ...dataSourceConfig,
         bufferSize,
         viewport,
         table: this.table,
-        range: __privateGet(this, _range),
-        title: __privateGet(this, _title)
+        range: this._range,
+        title: this._title
       },
       this.handleMessageFromServer
     );
@@ -193,7 +147,7 @@ class VuuDataSource extends EventEmitter {
       this.server = null;
       this.removeAllListeners();
       __privateSet(this, _status, "unsubscribed");
-      this.viewport = void 0;
+      this.viewport = "";
       this.range = { from: 0, to: 0 };
     }
   }
@@ -215,7 +169,7 @@ class VuuDataSource extends EventEmitter {
     const isSuspended = __privateGet(this, _status) === "suspended";
     info?.(`resume #${this.viewport}, current status ${__privateGet(this, _status)}`);
     if (callback) {
-      this.clientCallback = callback;
+      this._clientCallback = callback;
     }
     if (this.viewport) {
       if (isDisabled) {
@@ -246,7 +200,7 @@ class VuuDataSource extends EventEmitter {
     if (this.viewport && (__privateGet(this, _status) === "disabled" || __privateGet(this, _status) === "disabling")) {
       __privateSet(this, _status, "enabling");
       if (callback) {
-        this.clientCallback = callback;
+        this._clientCallback = callback;
       }
       this.server?.send({
         viewport: this.viewport,
@@ -322,149 +276,32 @@ class VuuDataSource extends EventEmitter {
   get selectedRowsCount() {
     return __privateGet(this, _selectedRowsCount);
   }
-  get size() {
-    return __privateGet(this, _size);
-  }
-  get range() {
-    return __privateGet(this, _range);
-  }
-  set range(range) {
-    if (range.from !== __privateGet(this, _range).from || range.to !== __privateGet(this, _range).to) {
-      __privateSet(this, _range, range);
-      this.rangeRequest(range);
-    }
-  }
   get config() {
-    return __privateGet(this, _config);
+    return super.config;
   }
   set config(config) {
-    const configChanges = this.applyConfig(config);
-    if (configChanges) {
-      if (__privateGet(this, _config) && this.viewport) {
-        if (config) {
-          const newConfig = combineFilters(__privateGet(this, _config));
-          this.server?.send({
-            viewport: this.viewport,
-            type: "config",
-            config: newConfig
-          });
-        }
-      }
-      this.emit("config", __privateGet(this, _config), void 0, configChanges);
-    }
-  }
-  applyConfig(config, preserveExistingConfigAttributes = false) {
-    const { noChanges, ...otherChanges } = isConfigChanged(
-      __privateGet(this, _config),
-      config
-    );
-    if (noChanges !== true) {
-      if (config) {
-        const newConfig = config?.filterSpec?.filter && config?.filterSpec.filterStruct === void 0 ? {
-          ...config,
-          filterSpec: {
-            filter: config.filterSpec.filter,
-            filterStruct: parseFilter(config.filterSpec.filter)
-          }
-        } : config;
-        if (preserveExistingConfigAttributes) {
-          __privateSet(this, _config, {
-            ...__privateGet(this, _config),
-            ...config
-          });
-        } else {
-          __privateSet(this, _config, withConfigDefaults(newConfig));
-        }
-        return otherChanges;
-      }
-    }
-  }
-  //TODO replace all these individual server calls with calls to setConfig
-  get columns() {
-    return __privateGet(this, _config).columns;
-  }
-  set columns(columns) {
-    __privateSet(this, _config, {
-      ...__privateGet(this, _config),
-      columns
-    });
-    if (this.viewport) {
-      const message = {
-        viewport: this.viewport,
-        type: "setColumns",
-        columns
-      };
-      if (this.server) {
-        this.server.send(message);
-      }
-    }
-    this.emit("config", __privateGet(this, _config));
-  }
-  get aggregations() {
-    return __privateGet(this, _config).aggregations;
-  }
-  set aggregations(aggregations) {
-    __privateSet(this, _config, {
-      ...__privateGet(this, _config),
-      aggregations
-    });
-    if (this.viewport) {
+    const previousConfig = this._config;
+    super.config = config;
+    if (this._config !== previousConfig) {
       this.server?.send({
         viewport: this.viewport,
-        type: "aggregate",
-        aggregations
+        type: "config",
+        config: combineFilters(this._config)
       });
     }
-    this.emit("config", __privateGet(this, _config));
-  }
-  get sort() {
-    return __privateGet(this, _config).sort;
-  }
-  set sort(sort) {
-    __privateSet(this, _config, {
-      ...__privateGet(this, _config),
-      sort
-    });
-    if (this.viewport) {
-      const message = {
-        viewport: this.viewport,
-        type: "sort",
-        sort
-      };
-      this.server?.send(message);
-    }
-    this.emit("config", __privateGet(this, _config));
-  }
-  get baseFilter() {
-    return __privateGet(this, _config).baseFilterSpec;
-  }
-  set baseFilter(baseFilter) {
-    this.config = {
-      ...__privateGet(this, _config),
-      baseFilterSpec: baseFilter
-    };
-  }
-  get filter() {
-    return __privateGet(this, _config).filterSpec;
-  }
-  set filter(filter) {
-    this.config = {
-      ...__privateGet(this, _config),
-      filterSpec: filter
-    };
   }
   get groupBy() {
-    return __privateGet(this, _config).groupBy;
+    return this._config.groupBy;
   }
   set groupBy(groupBy) {
     if (itemsOrOrderChanged(this.groupBy, groupBy)) {
       const wasGrouped = this.groupBy.length > 0;
       this.config = {
-        ...__privateGet(this, _config),
+        ...this._config,
         groupBy
       };
       if (!wasGrouped && groupBy.length > 0 && this.viewport) {
-        this.clientCallback?.({
+        this._clientCallback?.({
           clientViewportId: this.viewport,
           mode: "batch",
           type: "viewport-update",
@@ -476,10 +313,10 @@ class VuuDataSource extends EventEmitter {
     }
   }
   get title() {
-    return __privateGet(this, _title) ?? `${this.table.module} ${this.table.table}`;
+    return this._title ?? `${this.table.module} ${this.table.table}`;
   }
   set title(title) {
-    __privateSet(this, _title, title);
+    this._title = title;
     if (this.viewport && title) {
       this.server?.send({
         type: "setTitle",
@@ -490,13 +327,13 @@ class VuuDataSource extends EventEmitter {
     this.emit("title-changed", this.viewport ?? "'", title);
   }
   get visualLink() {
-    return __privateGet(this, _config).visualLink;
+    return this._config.visualLink;
   }
   set visualLink(visualLink) {
-    __privateSet(this, _config, {
-      ...__privateGet(this, _config),
+    this._config = {
+      ...this._config,
       visualLink
-    });
+    };
     if (visualLink) {
       const {
         parentClientVpId,
@@ -523,7 +360,7 @@ class VuuDataSource extends EventEmitter {
         });
       }
     }
-    this.emit("config", __privateGet(this, _config));
+    this.emit("config", this._config);
   }
   setConfigPending(config) {
     const pendingConfig = this.configChangePending;
@@ -587,7 +424,6 @@ class VuuDataSource extends EventEmitter {
     });
   }
 }
-_config = new WeakMap();
 _groupBy = new WeakMap();
 _pendingVisualLink = new WeakMap();
 _links = new WeakMap();
@@ -595,10 +431,8 @@ _menu = new WeakMap();
 _optimize = new WeakMap();
 _range = new WeakMap();
 _selectedRowsCount = new WeakMap();
-_size = new WeakMap();
 _status = new WeakMap();
 _tableSchema = new WeakMap();
-_title = new WeakMap();
 
 export { VuuDataSource };
 //# sourceMappingURL=vuu-data-source.js.map