@loaders.gl/schema 4.2.0-alpha.4 → 4.2.0-alpha.6

package/dist/lib/table/batches/row-table-batch-aggregator.js

@@ -1,76 +1,85 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { convertToArrayRow, convertToObjectRow, inferHeadersFromArrayRow, inferHeadersFromObjectRow } from "../simple-table/row-utils.js";
 const DEFAULT_ROW_COUNT = 100;
 export class RowTableBatchAggregator {
-  constructor(schema, options) {
-    this.schema = void 0;
-    this.options = void 0;
-    this.length = 0;
-    this.objectRows = null;
-    this.arrayRows = null;
-    this.cursor = 0;
-    this._headers = null;
-    this.options = options;
-    this.schema = schema;
-    if (schema) {
-      this._headers = [];
-      for (const key in schema) {
-        this._headers[schema[key].index] = schema[key].name;
-      }
+    schema;
+    options;
+    length = 0;
+    objectRows = null;
+    arrayRows = null;
+    cursor = 0;
+    _headers = null;
+    constructor(schema, options) {
+        this.options = options;
+        this.schema = schema;
+        // schema is an array if there're no headers
+        // object if there are headers
+        if (schema) {
+            this._headers = [];
+            for (const key in schema) {
+                this._headers[schema[key].index] = schema[key].name;
+            }
+        }
     }
-  }
-  rowCount() {
-    return this.length;
-  }
-  addArrayRow(row, cursor) {
-    if (Number.isFinite(cursor)) {
-      this.cursor = cursor;
+    rowCount() {
+        return this.length;
     }
-    this._headers || (this._headers = inferHeadersFromArrayRow(row));
-    switch (this.options.shape) {
-      case 'object-row-table':
-        const rowObject = convertToObjectRow(row, this._headers);
-        this.addObjectRow(rowObject, cursor);
-        break;
-      case 'array-row-table':
-        this.arrayRows = this.arrayRows || new Array(DEFAULT_ROW_COUNT);
-        this.arrayRows[this.length] = row;
-        this.length++;
-        break;
+    addArrayRow(row, cursor) {
+        if (Number.isFinite(cursor)) {
+            this.cursor = cursor;
+        }
+        // TODO - infer schema at a higher level, instead of hacking headers here?
+        this._headers ||= inferHeadersFromArrayRow(row);
+        // eslint-disable-next-line default-case
+        switch (this.options.shape) {
+            case 'object-row-table':
+                const rowObject = convertToObjectRow(row, this._headers);
+                this.addObjectRow(rowObject, cursor);
+                break;
+            case 'array-row-table':
+                this.arrayRows = this.arrayRows || new Array(DEFAULT_ROW_COUNT);
+                this.arrayRows[this.length] = row;
+                this.length++;
+                break;
+        }
     }
-  }
-  addObjectRow(row, cursor) {
-    if (Number.isFinite(cursor)) {
-      this.cursor = cursor;
+    addObjectRow(row, cursor) {
+        if (Number.isFinite(cursor)) {
+            this.cursor = cursor;
+        }
+        // TODO - infer schema at a higher level, instead of hacking headers here?
+        this._headers ||= inferHeadersFromObjectRow(row);
+        // eslint-disable-next-line default-case
+        switch (this.options.shape) {
+            case 'array-row-table':
+                const rowArray = convertToArrayRow(row, this._headers);
+                this.addArrayRow(rowArray, cursor);
+                break;
+            case 'object-row-table':
+                this.objectRows = this.objectRows || new Array(DEFAULT_ROW_COUNT);
+                this.objectRows[this.length] = row;
+                this.length++;
+                break;
+        }
     }
-    this._headers || (this._headers = inferHeadersFromObjectRow(row));
-    switch (this.options.shape) {
-      case 'array-row-table':
-        const rowArray = convertToArrayRow(row, this._headers);
-        this.addArrayRow(rowArray, cursor);
-        break;
-      case 'object-row-table':
-        this.objectRows = this.objectRows || new Array(DEFAULT_ROW_COUNT);
-        this.objectRows[this.length] = row;
-        this.length++;
-        break;
+    getBatch() {
+        let rows = this.arrayRows || this.objectRows;
+        if (!rows) {
+            return null;
+        }
+        rows = rows.slice(0, this.length);
+        this.arrayRows = null;
+        this.objectRows = null;
+        return {
+            shape: this.options.shape,
+            batchType: 'data',
+            data: rows,
+            length: this.length,
+            // @ts-expect-error we should infer a schema
+            schema: this.schema,
+            cursor: this.cursor
+        };
     }
-  }
-  getBatch() {
-    let rows = this.arrayRows || this.objectRows;
-    if (!rows) {
-      return null;
-    }
-    rows = rows.slice(0, this.length);
-    this.arrayRows = null;
-    this.objectRows = null;
-    return {
-      shape: this.options.shape,
-      batchType: 'data',
-      data: rows,
-      length: this.length,
-      schema: this.schema,
-      cursor: this.cursor
-    };
-  }
 }
-//# sourceMappingURL=row-table-batch-aggregator.js.map

package/dist/lib/table/batches/table-batch-aggregator.d.ts

@@ -1,5 +1,5 @@
-import type { Schema } from '../../../types/schema';
-import type { TableBatch } from '../../../types/category-table';
+import type { Schema } from "../../../types/schema.js";
+import type { TableBatch } from "../../../types/category-table.js";
 export interface TableBatchOptions {
     batchSize: number | string;
     [key: string]: any;

package/dist/lib/table/batches/table-batch-aggregator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table-batch-aggregator.d.ts","sourceRoot":"","sources":["../../../../src/lib/table/batches/table-batch-aggregator.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,+BAA+B,CAAC;AAE9D,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,qBAAqB;IACpC,KAAK,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,GAAG,oBAAoB,CAAC;CACxE;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,qBAAqB;IACrB,QAAQ,IAAI,MAAM,CAAC;IACnB,kBAAkB;IAClB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC9B,kBAAkB;IAClB,YAAY,CAAC,GAAG,EAAE;QAAC,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,GAAG,IAAI,CAAC;IACrD,4BAA4B;IAC5B,QAAQ,IAAI,UAAU,GAAG,IAAI,CAAC;CAC/B"}
+{"version":3,"file":"table-batch-aggregator.d.ts","sourceRoot":"","sources":["../../../../src/lib/table/batches/table-batch-aggregator.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,iCAA8B;AAClD,OAAO,KAAK,EAAC,UAAU,EAAC,yCAAsC;AAE9D,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,qBAAqB;IACpC,KAAK,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,GAAG,oBAAoB,CAAC;CACxE;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,qBAAqB;IACrB,QAAQ,IAAI,MAAM,CAAC;IACnB,kBAAkB;IAClB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC9B,kBAAkB;IAClB,YAAY,CAAC,GAAG,EAAE;QAAC,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,GAAG,IAAI,CAAC;IACrD,4BAA4B;IAC5B,QAAQ,IAAI,UAAU,GAAG,IAAI,CAAC;CAC/B"}

package/dist/lib/table/batches/table-batch-aggregator.js

@@ -1,2 +1,4 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 export {};
-//# sourceMappingURL=table-batch-aggregator.js.map

package/dist/lib/table/batches/table-batch-builder.d.ts

@@ -1,6 +1,6 @@
-import type { Schema } from '../../../types/schema';
-import type { TableBatch } from '../../../types/category-table';
-import type { TableBatchConstructor } from './table-batch-aggregator';
+import type { Schema } from "../../../types/schema.js";
+import type { TableBatch } from "../../../types/category-table.js";
+import type { TableBatchConstructor } from "./table-batch-aggregator.js";
 type TableBatchBuilderOptions = {
     shape?: 'array-row-table' | 'object-row-table' | 'columnar-table' | 'arrow-table';
     batchSize?: number | 'auto';

package/dist/lib/table/batches/table-batch-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table-batch-builder.d.ts","sourceRoot":"","sources":["../../../../src/lib/table/batches/table-batch-builder.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,+BAA+B,CAAC;AAC9D,OAAO,KAAK,EAAuB,qBAAqB,EAAC,MAAM,0BAA0B,CAAC;AAM1F,KAAK,wBAAwB,GAAG;IAC9B,KAAK,CAAC,EAAE,iBAAiB,GAAG,kBAAkB,GAAG,gBAAgB,GAAG,aAAa,CAAC;IAClF,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAYF,yDAAyD;AACzD,qBAAa,iBAAiB;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,QAAQ,CAAC,wBAAwB,CAAC,CAAC;IAE5C,OAAO,CAAC,UAAU,CAAqC;IACvD,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,kBAAkB,CAAsB;IAChD,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,QAAQ,CAAa;IAE7B,MAAM,CAAC,UAAU,CAAC,EAAE,qBAAqB,CAAC;gBAE9B,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,wBAAwB;IAK9D,YAAY,IAAI,OAAO;IAUvB,kDAAkD;IAClD,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG;QAAC,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,GAAG,IAAI;IActD,+BAA+B;IAC/B,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE;IAQhC,+BAA+B;IAC/B,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE;QAAC,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,GAAG,IAAI;IAQ9D,sDAAsD;IACtD,aAAa,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI;IAUhD,YAAY,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,UAAU,GAAG,IAAI;IAI1D,aAAa,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,UAAU,GAAG,IAAI;IAM3D,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,MAAM,GAAG,MAAM;IAI3C,OAAO,CAAC,OAAO;IA2Bf;;OAEG;IACH,OAAO,CAAC,SAAS;IAmBjB,OAAO,CAAC,kBAAkB;CAgB3B"}
+{"version":3,"file":"table-batch-builder.d.ts","sourceRoot":"","sources":["../../../../src/lib/table/batches/table-batch-builder.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,iCAA8B;AAClD,OAAO,KAAK,EAAC,UAAU,EAAC,yCAAsC;AAC9D,OAAO,KAAK,EAAuB,qBAAqB,EAAC,oCAAiC;AAM1F,KAAK,wBAAwB,GAAG;IAC9B,KAAK,CAAC,EAAE,iBAAiB,GAAG,kBAAkB,GAAG,gBAAgB,GAAG,aAAa,CAAC;IAClF,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAYF,yDAAyD;AACzD,qBAAa,iBAAiB;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,QAAQ,CAAC,wBAAwB,CAAC,CAAC;IAE5C,OAAO,CAAC,UAAU,CAAqC;IACvD,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,kBAAkB,CAAsB;IAChD,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,QAAQ,CAAa;IAE7B,MAAM,CAAC,UAAU,CAAC,EAAE,qBAAqB,CAAC;gBAE9B,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,wBAAwB;IAK9D,YAAY,IAAI,OAAO;IAUvB,kDAAkD;IAClD,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG;QAAC,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,GAAG,IAAI;IActD,+BAA+B;IAC/B,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE;IAQhC,+BAA+B;IAC/B,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE;QAAC,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,GAAG,IAAI;IAQ9D,sDAAsD;IACtD,aAAa,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI;IAUhD,YAAY,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,UAAU,GAAG,IAAI;IAI1D,aAAa,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,UAAU,GAAG,IAAI;IAM3D,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,MAAM,GAAG,MAAM;IAI3C,OAAO,CAAC,OAAO;IA2Bf;;OAEG;IACH,OAAO,CAAC,SAAS;IAmBjB,OAAO,CAAC,kBAAkB;CAgB3B"}

package/dist/lib/table/batches/table-batch-builder.js

@@ -1,136 +1,151 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { BaseTableBatchAggregator } from "./base-table-batch-aggregator.js";
 import { RowTableBatchAggregator } from "./row-table-batch-aggregator.js";
 import { ColumnarTableBatchAggregator } from "./columnar-table-batch-aggregator.js";
 const DEFAULT_OPTIONS = {
-  shape: undefined,
-  batchSize: 'auto',
-  batchDebounceMs: 0,
-  limit: 0,
-  _limitMB: 0
+    shape: undefined,
+    batchSize: 'auto',
+    batchDebounceMs: 0,
+    limit: 0,
+    _limitMB: 0
 };
 const ERR_MESSAGE = 'TableBatchBuilder';
+/** Incrementally builds batches from a stream of rows */
 export class TableBatchBuilder {
-  constructor(schema, options) {
-    this.schema = void 0;
-    this.options = void 0;
-    this.aggregator = null;
-    this.batchCount = 0;
-    this.bytesUsed = 0;
-    this.isChunkComplete = false;
-    this.lastBatchEmittedMs = Date.now();
-    this.totalLength = 0;
-    this.totalBytes = 0;
-    this.rowBytes = 0;
-    this.schema = schema;
-    this.options = {
-      ...DEFAULT_OPTIONS,
-      ...options
-    };
-  }
-  limitReached() {
-    var _this$options, _this$options2;
-    if (Boolean((_this$options = this.options) === null || _this$options === void 0 ? void 0 : _this$options.limit) && this.totalLength >= this.options.limit) {
-      return true;
+    schema;
+    options;
+    aggregator = null;
+    batchCount = 0;
+    bytesUsed = 0;
+    isChunkComplete = false;
+    lastBatchEmittedMs = Date.now();
+    totalLength = 0;
+    totalBytes = 0;
+    rowBytes = 0;
+    static ArrowBatch;
+    constructor(schema, options) {
+        this.schema = schema;
+        this.options = { ...DEFAULT_OPTIONS, ...options };
     }
-    if (Boolean((_this$options2 = this.options) === null || _this$options2 === void 0 ? void 0 : _this$options2._limitMB) && this.totalBytes / 1e6 >= this.options._limitMB) {
-      return true;
-    }
-    return false;
-  }
-  addRow(row) {
-    if (this.limitReached()) {
-      return;
-    }
-    this.totalLength++;
-    this.rowBytes = this.rowBytes || this._estimateRowMB(row);
-    this.totalBytes += this.rowBytes;
-    if (Array.isArray(row)) {
-      this.addArrayRow(row);
-    } else {
-      this.addObjectRow(row);
+    limitReached() {
+        if (Boolean(this.options?.limit) && this.totalLength >= this.options.limit) {
+            return true;
+        }
+        if (Boolean(this.options?._limitMB) && this.totalBytes / 1e6 >= this.options._limitMB) {
+            return true;
+        }
+        return false;
     }
-  }
-  addArrayRow(row) {
-    if (!this.aggregator) {
-      const TableBatchType = this._getTableBatchType();
-      this.aggregator = new TableBatchType(this.schema, this.options);
+    /** @deprecated Use addArrayRow or addObjectRow */
+    addRow(row) {
+        if (this.limitReached()) {
+            return;
+        }
+        this.totalLength++;
+        this.rowBytes = this.rowBytes || this._estimateRowMB(row);
+        this.totalBytes += this.rowBytes;
+        if (Array.isArray(row)) {
+            this.addArrayRow(row);
+        }
+        else {
+            this.addObjectRow(row);
+        }
     }
-    this.aggregator.addArrayRow(row);
-  }
-  addObjectRow(row) {
-    if (!this.aggregator) {
-      const TableBatchType = this._getTableBatchType();
-      this.aggregator = new TableBatchType(this.schema, this.options);
+    /** Add one row to the batch */
+    addArrayRow(row) {
+        if (!this.aggregator) {
+            const TableBatchType = this._getTableBatchType();
+            this.aggregator = new TableBatchType(this.schema, this.options);
+        }
+        this.aggregator.addArrayRow(row);
     }
-    this.aggregator.addObjectRow(row);
-  }
-  chunkComplete(chunk) {
-    if (chunk instanceof ArrayBuffer) {
-      this.bytesUsed += chunk.byteLength;
+    /** Add one row to the batch */
+    addObjectRow(row) {
+        if (!this.aggregator) {
+            const TableBatchType = this._getTableBatchType();
+            this.aggregator = new TableBatchType(this.schema, this.options);
+        }
+        this.aggregator.addObjectRow(row);
     }
-    if (typeof chunk === 'string') {
-      this.bytesUsed += chunk.length;
+    /** Mark an incoming raw memory chunk has completed */
+    chunkComplete(chunk) {
+        if (chunk instanceof ArrayBuffer) {
+            this.bytesUsed += chunk.byteLength;
+        }
+        if (typeof chunk === 'string') {
+            this.bytesUsed += chunk.length;
+        }
+        this.isChunkComplete = true;
     }
-    this.isChunkComplete = true;
-  }
-  getFullBatch(options) {
-    return this._isFull() ? this._getBatch(options) : null;
-  }
-  getFinalBatch(options) {
-    return this._getBatch(options);
-  }
-  _estimateRowMB(row) {
-    return Array.isArray(row) ? row.length * 8 : Object.keys(row).length * 8;
-  }
-  _isFull() {
-    if (!this.aggregator || this.aggregator.rowCount() === 0) {
-      return false;
+    getFullBatch(options) {
+        return this._isFull() ? this._getBatch(options) : null;
     }
-    if (this.options.batchSize === 'auto') {
-      if (!this.isChunkComplete) {
-        return false;
-      }
-    } else if (this.options.batchSize > this.aggregator.rowCount()) {
-      return false;
+    getFinalBatch(options) {
+        return this._getBatch(options);
     }
-    if (this.options.batchDebounceMs > Date.now() - this.lastBatchEmittedMs) {
-      return false;
+    // INTERNAL
+    _estimateRowMB(row) {
+        return Array.isArray(row) ? row.length * 8 : Object.keys(row).length * 8;
     }
-    this.isChunkComplete = false;
-    this.lastBatchEmittedMs = Date.now();
-    return true;
-  }
-  _getBatch(options) {
-    if (!this.aggregator) {
-      return null;
+    _isFull() {
+        // No batch, not ready
+        if (!this.aggregator || this.aggregator.rowCount() === 0) {
+            return false;
+        }
+        // if batchSize === 'auto' we wait for chunk to complete
+        // if batchSize === number, ensure we have enough rows
+        if (this.options.batchSize === 'auto') {
+            if (!this.isChunkComplete) {
+                return false;
+            }
+        }
+        else if (this.options.batchSize > this.aggregator.rowCount()) {
+            return false;
+        }
+        // Debounce batches
+        if (this.options.batchDebounceMs > Date.now() - this.lastBatchEmittedMs) {
+            return false;
+        }
+        // Emit batch
+        this.isChunkComplete = false;
+        this.lastBatchEmittedMs = Date.now();
+        return true;
     }
-    if (options !== null && options !== void 0 && options.bytesUsed) {
-      this.bytesUsed = options.bytesUsed;
+    /**
+     * bytesUsed can be set via chunkComplete or via getBatch*
+     */
+    _getBatch(options) {
+        if (!this.aggregator) {
+            return null;
+        }
+        // TODO - this can overly increment bytes used?
+        if (options?.bytesUsed) {
+            this.bytesUsed = options.bytesUsed;
+        }
+        const normalizedBatch = this.aggregator.getBatch();
+        normalizedBatch.count = this.batchCount;
+        normalizedBatch.bytesUsed = this.bytesUsed;
+        Object.assign(normalizedBatch, options);
+        this.batchCount++;
+        this.aggregator = null;
+        return normalizedBatch;
     }
-    const normalizedBatch = this.aggregator.getBatch();
-    normalizedBatch.count = this.batchCount;
-    normalizedBatch.bytesUsed = this.bytesUsed;
-    Object.assign(normalizedBatch, options);
-    this.batchCount++;
-    this.aggregator = null;
-    return normalizedBatch;
-  }
-  _getTableBatchType() {
-    switch (this.options.shape) {
-      case 'array-row-table':
-      case 'object-row-table':
-        return RowTableBatchAggregator;
-      case 'columnar-table':
-        return ColumnarTableBatchAggregator;
-      case 'arrow-table':
-        if (!TableBatchBuilder.ArrowBatch) {
-          throw new Error(ERR_MESSAGE);
-        }
-        return TableBatchBuilder.ArrowBatch;
-      default:
-        return BaseTableBatchAggregator;
+    _getTableBatchType() {
+        switch (this.options.shape) {
+            case 'array-row-table':
+            case 'object-row-table':
+                return RowTableBatchAggregator;
+            case 'columnar-table':
+                return ColumnarTableBatchAggregator;
+            case 'arrow-table':
+                if (!TableBatchBuilder.ArrowBatch) {
+                    throw new Error(ERR_MESSAGE);
+                }
+                return TableBatchBuilder.ArrowBatch;
+            default:
+                return BaseTableBatchAggregator;
+        }
     }
-  }
 }
-TableBatchBuilder.ArrowBatch = void 0;
-//# sourceMappingURL=table-batch-builder.js.map

package/dist/lib/table/simple-table/convert-table.d.ts

@@ -1,4 +1,4 @@
-import { Table, ArrayRowTable, ObjectRowTable, ColumnarTable, ArrowTable } from '../../../types/category-table';
+import { Table, ArrayRowTable, ObjectRowTable, ColumnarTable, ArrowTable } from "../../../types/category-table.js";
 export declare function convertTable(table: Table, shape: 'object-row-table'): ObjectRowTable;
 export declare function convertTable(table: Table, shape: 'array-row-table'): ArrayRowTable;
 export declare function convertTable(table: Table, shape: 'columnar-table'): ColumnarTable;

package/dist/lib/table/simple-table/convert-table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-table.d.ts","sourceRoot":"","sources":["../../../../src/lib/table/simple-table/convert-table.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,KAAK,EACL,aAAa,EACb,cAAc,EACd,aAAa,EACb,UAAU,EACX,MAAM,+BAA+B,CAAC;AAIvC,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,kBAAkB,GAAG,cAAc,CAAC;AACtF,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,iBAAiB,GAAG,aAAa,CAAC;AACpF,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,GAAG,aAAa,CAAC;AACnF,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,aAAa,GAAG,UAAU,CAAC;AA0B7E;;;GAGG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAMlD;AAED,oDAAoD;AACpD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,aAAa,CAyB7D;AAED,8CAA8C;AAC9C,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,aAAa,CAc7D;AAED,+CAA+C;AAC/C,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,cAAc,CAc/D;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG"}
+{"version":3,"file":"convert-table.d.ts","sourceRoot":"","sources":["../../../../src/lib/table/simple-table/convert-table.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,KAAK,EACL,aAAa,EACb,cAAc,EACd,aAAa,EACb,UAAU,EACX,yCAAsC;AAIvC,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,kBAAkB,GAAG,cAAc,CAAC;AACtF,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,iBAAiB,GAAG,aAAa,CAAC;AACpF,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,GAAG,aAAa,CAAC;AACnF,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,aAAa,GAAG,UAAU,CAAC;AA0B7E;;;GAGG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAMlD;AAED,oDAAoD;AACpD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,aAAa,CAyB7D;AAED,8CAA8C;AAC9C,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,aAAa,CAc7D;AAED,+CAA+C;AAC/C,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,cAAc,CAc/D;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG"}

package/dist/lib/table/simple-table/convert-table.js

@@ -1,81 +1,116 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { getTableCell, getTableLength, getTableRowAsArray, getTableRowAsObject } from "./table-accessors.js";
 import { deduceTableSchema } from "./table-schema.js";
 import { makeColumnFromField } from "./table-column.js";
+/**
+ * Convert a table to a different shape
+ * @param table
+ * @param shape
+ * @returns
+ */
 export function convertTable(table, shape) {
-  switch (shape) {
-    case 'object-row-table':
-      return makeObjectRowTable(table);
-    case 'array-row-table':
-      return makeArrayRowTable(table);
-    case 'columnar-table':
-      return makeColumnarTable(table);
-    case 'arrow-table':
-      return makeArrowTable(table);
-    default:
-      throw new Error(shape);
-  }
+    switch (shape) {
+        case 'object-row-table':
+            return makeObjectRowTable(table);
+        case 'array-row-table':
+            return makeArrayRowTable(table);
+        case 'columnar-table':
+            return makeColumnarTable(table);
+        case 'arrow-table':
+            return makeArrowTable(table);
+        default:
+            throw new Error(shape);
+    }
 }
+/**
+ * Convert a table to apache arrow format
+ * @note this depends on the `@loaders.gl/arrow module being imported
+ */
 export function makeArrowTable(table) {
-  var _globalThis$__loaders;
-  const _makeArrowTable = (_globalThis$__loaders = globalThis.__loaders) === null || _globalThis$__loaders === void 0 ? void 0 : _globalThis$__loaders._makeArrowTable;
-  if (!_makeArrowTable) {
-    throw new Error('');
-  }
-  return _makeArrowTable(table);
+    const _makeArrowTable = globalThis.__loaders?._makeArrowTable;
+    if (!_makeArrowTable) {
+        throw new Error('');
+    }
+    return _makeArrowTable(table);
 }
+/** Convert any simple table into columnar format */
 export function makeColumnarTable(table) {
-  var _table$schema;
-  const schema = table.schema || deduceTableSchema(table);
-  const fields = ((_table$schema = table.schema) === null || _table$schema === void 0 ? void 0 : _table$schema.fields) || [];
-  if (table.shape === 'columnar-table') {
+    // TODO - should schema really be optional?
+    const schema = table.schema || deduceTableSchema(table);
+    const fields = table.schema?.fields || [];
+    if (table.shape === 'columnar-table') {
+        return { ...table, schema };
+    }
+    const length = getTableLength(table);
+    const columns = {};
+    for (const field of fields) {
+        const column = makeColumnFromField(field, length);
+        columns[field.name] = column;
+        for (let rowIndex = 0; rowIndex < length; rowIndex++) {
+            column[rowIndex] = getTableCell(table, rowIndex, field.name);
+        }
+    }
     return {
-      ...table,
-      schema
+        shape: 'columnar-table',
+        schema,
+        data: columns
     };
-  }
-  const length = getTableLength(table);
-  const columns = {};
-  for (const field of fields) {
-    const column = makeColumnFromField(field, length);
-    columns[field.name] = column;
-    for (let rowIndex = 0; rowIndex < length; rowIndex++) {
-      column[rowIndex] = getTableCell(table, rowIndex, field.name);
-    }
-  }
-  return {
-    shape: 'columnar-table',
-    schema,
-    data: columns
-  };
 }
+/** Convert any table into array row format */
 export function makeArrayRowTable(table) {
-  if (table.shape === 'array-row-table') {
-    return table;
-  }
-  const length = getTableLength(table);
-  const data = new Array(length);
-  for (let rowIndex = 0; rowIndex < length; rowIndex++) {
-    data[rowIndex] = getTableRowAsArray(table, rowIndex);
-  }
-  return {
-    shape: 'array-row-table',
-    schema: table.schema,
-    data
-  };
+    if (table.shape === 'array-row-table') {
+        return table;
+    }
+    const length = getTableLength(table);
+    const data = new Array(length);
+    for (let rowIndex = 0; rowIndex < length; rowIndex++) {
+        data[rowIndex] = getTableRowAsArray(table, rowIndex);
+    }
+    return {
+        shape: 'array-row-table',
+        schema: table.schema,
+        data
+    };
 }
+/** Convert any table into object row format */
 export function makeObjectRowTable(table) {
-  if (table.shape === 'object-row-table') {
-    return table;
-  }
-  const length = getTableLength(table);
-  const data = new Array(length);
-  for (let rowIndex = 0; rowIndex < length; rowIndex++) {
-    data[rowIndex] = getTableRowAsObject(table, rowIndex);
+    if (table.shape === 'object-row-table') {
+        return table;
+    }
+    const length = getTableLength(table);
+    const data = new Array(length);
+    for (let rowIndex = 0; rowIndex < length; rowIndex++) {
+        data[rowIndex] = getTableRowAsObject(table, rowIndex);
+    }
+    return {
+        shape: 'object-row-table',
+        schema: table.schema,
+        data
+    };
+}
+/**
+/**
+ *
+ * @note - should be part of schema module
+export function convertColumnarToRowFormatTable(columnarTable: ColumnarTable): ObjectRowTable {
+  const tableKeys = ;
+  const tableRowsCount = columnarTable[tableKeys[0]].length;
+
+  const objectRows: ObjectRowTable['data'] = [];
+
+  for (let index = 0; index < tableRowsCount; index++) {
+    const objectRow = {};
+    for (const fieldName of Object.keys(columnarTable.data)) {
+      objectRow[fieldName] = columnarTable[fieldName][index];
+    }
+    objectRows.push(objectRow);
   }
+
   return {
     shape: 'object-row-table',
-    schema: table.schema,
-    data
+    data: objectRows
   };
 }
-//# sourceMappingURL=convert-table.js.map
+ */