@loaders.gl/schema 4.0.0-alpha.24 → 4.0.0-alpha.26

package/dist/types/batch.d.ts

@@ -0,0 +1,34 @@
+import { Schema } from './schema';
+import type { RecordBatch } from 'apache-arrow';
+/**
+ * A batch of data (or metadata/schema), from a streaming loader
+ * @see parseInBatches()
+ * @see loadInBatches()
+ */
+export type Batch = {
+    /** A batch can contain metadata, data, or in case of unstructured data (JSON) */
+    batchType: 'data' | 'metadata' | 'partial-result' | 'final-result';
+    /** A string identifying the shape of data in this batch (table, etc) */
+    shape: string;
+    /** Schema of the data in this batch */
+    schema?: Schema;
+    /** Data in this batch */
+    data: unknown;
+    /**  If this is an arrow table. @deprecated Use `data` */
+    recordBatch?: RecordBatch;
+    /** Length of data in this batch */
+    length: number;
+    /** A count of batches received */
+    batch?: number;
+    /** A count of batches received */
+    count?: number;
+    /** Bytes used so far */
+    bytesUsed?: number;
+    /** cursor is the  */
+    cursor?: number;
+    /** MIME type of the data generating this batch */
+    mimeType?: string;
+    /** Any other data */
+    [key: string]: unknown;
+};
+//# sourceMappingURL=batch.d.ts.map

package/dist/types/batch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"batch.d.ts","sourceRoot":"","sources":["../../src/types/batch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,cAAc,CAAC;AAE9C;;;;GAIG;AACH,MAAM,MAAM,KAAK,GAAG;IAClB,iFAAiF;IACjF,SAAS,EAAE,MAAM,GAAG,UAAU,GAAG,gBAAgB,GAAG,cAAc,CAAC;IACnE,wEAAwE;IACxE,KAAK,EAAE,MAAM,CAAC;IACd,uCAAuC;IACvC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,yBAAyB;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,yDAAyD;IACzD,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,mCAAmC;IACnC,MAAM,EAAE,MAAM,CAAC;IAEf,kCAAkC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,kCAAkC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,wBAAwB;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qBAAqB;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,kDAAkD;IAClD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,qBAAqB;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,CAAC"}

package/dist/types/category-table.d.ts

@@ -1,10 +1,12 @@
-import type { Table as ApacheArrowTable, RecordBatch } from 'apache-arrow';
-import type { Batch, Schema } from './schema';
+import type { Schema } from './schema';
+import type { Batch } from './batch';
 import type { Feature } from './category-gis';
+type ApacheArrowTable = unknown;
+type ApacheRecordBatch = unknown;
 /** A general table */
-export type Table = RowTable | ArrayRowTable | ObjectRowTable | GeoJSONRowTable | ColumnarTable | ArrowTable;
+export type Table = RowTable | ArrayRowTable | ObjectRowTable | GeoJSONTable | ColumnarTable | ArrowTable;
 /** A table organized as an array of rows */
-export type RowTable = ArrayRowTable | ObjectRowTable | GeoJSONRowTable;
+export type RowTable = ArrayRowTable | ObjectRowTable | GeoJSONTable;
 /** A table organized as an array of rows, each row is an array of values */
 export type ArrayRowTable = {
     shape: 'array-row-table';
@@ -19,11 +21,17 @@ export type ObjectRowTable = {
         [columnName: string]: any;
     }[];
 };
-/** A table organized as an array of rows, each row is a GeoJSON Feature */
-export type GeoJSONRowTable = {
-    shape: 'geojson-row-table';
+/**
+ * A table organized as an array of rows, each row is a GeoJSON Feature
+ * @note For compatibility with GeoJSON, rows are stored in `table.features` instead of `table.data`
+ */
+export type GeoJSONTable = {
+    shape: 'geojson-table';
     schema?: Schema;
-    data: Feature[];
+    /** For compatibility with GeoJSON, the type field must always be set to `FeatureCollection` */
+    type: 'FeatureCollection';
+    /** For compatibility with GeoJSON, rows are stored in `table.features` instead of `table.data` */
+    features: Feature[];
 };
 /** A table organized as a map of columns, each column is an array of value */
 export type ColumnarTable = {
@@ -48,7 +56,7 @@ export type Tables<TableType = Table> = {
     }[];
 };
 /** Batch for a general table */
-export type TableBatch = ArrayRowTableBatch | ObjectRowTableBatch | GeoJSONRowTableBatch | ColumnarTableBatch | ArrowTableBatch;
+export type TableBatch = ArrayRowTableBatch | ObjectRowTableBatch | GeoJSONTableBatch | ColumnarTableBatch | ArrowTableBatch;
 /** Batch for a table organized as an array of rows, each row is an array of values */
 export type ArrayRowTableBatch = Batch & {
     shape: 'array-row-table';
@@ -68,11 +76,12 @@ export type ObjectRowTableBatch = Batch & {
     length: number;
 };
 /** Batch for a table organized as an array of rows, each row is an array of values */
-export type GeoJSONRowTableBatch = Batch & {
-    shape: 'geojson-row-table';
+export type GeoJSONTableBatch = Batch & {
+    shape: 'geojson-table';
     schema?: Schema;
     schemaType?: 'explicit' | 'deduced';
-    data: Feature[];
+    type: 'FeatureCollection';
+    features: Feature[];
     length: number;
 };
 /** Batch for a table organized as a map of columns, each column is an array of value */
@@ -90,7 +99,8 @@ export type ArrowTableBatch = Batch & {
     shape: 'arrow-table';
     schemaType?: 'explicit' | 'deduced';
     schema?: Schema;
-    data: RecordBatch;
+    data: ApacheRecordBatch;
     length: number;
 };
+export {};
 //# sourceMappingURL=category-table.d.ts.map

package/dist/types/category-table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"category-table.d.ts","sourceRoot":"","sources":["../../src/types/category-table.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"category-table.d.ts","sourceRoot":"","sources":["../../src/types/category-table.ts"],"names":[],"mappings":"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"}

package/dist/types/schema.d.ts

@@ -1,4 +1,3 @@
-import type { RecordBatch } from 'apache-arrow';
 /** For dictionary type */
 export type KeyType = 'int8' | 'int16' | 'int32' | 'uint8' | 'uint16' | 'uint32';
 /** ArrowLike DataType class */
@@ -60,18 +59,4 @@ export type Schema = {
     fields: Field[];
     metadata: SchemaMetadata;
 };
-export type Batch = {
-    batchType: 'data' | 'metadata' | 'partial-result' | 'final-result';
-    batch?: number;
-    mimeType?: string;
-    shape: string;
-    data: any;
-    recordBatch?: RecordBatch;
-    length: number;
-    schema?: Schema;
-    bytesUsed?: number;
-    count?: number;
-    cursor?: number;
-    [key: string]: any;
-};
 //# sourceMappingURL=schema.d.ts.map

package/dist/types/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/types/schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/types/schema.ts"],"names":[],"mappings":"AAEA,0BAA0B;AAC1B,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEjF,+BAA+B;AAC/B,MAAM,MAAM,QAAQ,GAChB,MAAM,GAEN,MAAM,GACN,KAAK,GACL,MAAM,GACN,OAAO,GACP,OAAO,GACP,OAAO,GACP,OAAO,GACP,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,OAAO,GACP,SAAS,GACT,SAAS,GACT,SAAS,GACT,QAAQ,GACR,MAAM,GACN,UAAU,GACV,kBAAkB,GAClB,aAAa,GACb,kBAAkB,GAClB,kBAAkB,GAClB,iBAAiB,GACjB,kBAAkB,GAClB,uBAAuB,GACvB,uBAAuB,GACvB,sBAAsB,GACtB,kBAAkB,GAClB,oBAAoB,GAEpB;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,KAAK,EAAE,CAAA;CAAC,GACjC;IAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,EAAE,KAAK,EAAE,CAAA;CAAC,GACnC;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,OAAO,EAAE,UAAU,CAAC;IACpB,QAAQ,EAAE,KAAK,EAAE,CAAC;IAClB,kBAAkB,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAC;CAC7C,GACD;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,OAAO,EAAE,UAAU,CAAC;IACpB,QAAQ,EAAE,KAAK,EAAE,CAAC;IAClB,kBAAkB,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAC;CAC7C,GACD;IAAC,IAAI,EAAE,mBAAmB,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAC,GAC9C;IAAC,IAAI,EAAE,iBAAiB,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,KAAK,EAAE,CAAA;CAAC,GAC9D;IAAC,IAAI,EAAE,KAAK,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,KAAK,EAAE,CAAA;CAAC,GACrD;IAAC,IAAI,EAAE,YAAY,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAC,CAAC;AAGjG;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AACpD,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAEnD,MAAM,MAAM,KAAK,GAAG;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,MAAM,GAAG;IACnB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,QAAQ,EAAE,cAAc,CAAC;CAC1B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/schema",
-  "version": "4.0.0-alpha.24",
+  "version": "4.0.0-alpha.26",
   "description": "Table format APIs for JSON, CSV, etc...",
   "license": "MIT",
   "publishConfig": {
@@ -34,5 +34,5 @@
   "dependencies": {
     "@types/geojson": "^7946.0.7"
   },
-  "gitHead": "97a8990595c132fb14e3445a8768d9f4cb98ff05"
+  "gitHead": "91adce71f74dacc7c8bfc379f0d122f2beae70d9"
 }

package/src/index.ts

@@ -9,7 +9,9 @@ export type {
   AnyArray
 } from './types/types';
 
-export type {Schema, Field, DataType, Batch, SchemaMetadata, FieldMetadata} from './types/schema';
+export type {Schema, Field, DataType, SchemaMetadata, FieldMetadata} from './types/schema';
+
+export type {Batch} from './types/batch';
 
 // TABLE CATEGORY TYPES
 export type {
@@ -17,7 +19,7 @@ export type {
   RowTable,
   ArrayRowTable,
   ObjectRowTable,
-  GeoJSONRowTable,
+  GeoJSONTable,
   ColumnarTable,
   ArrowTable,
   Tables
@@ -26,7 +28,7 @@ export type {
   TableBatch,
   ArrayRowTableBatch,
   ObjectRowTableBatch,
-  GeoJSONRowTableBatch,
+  GeoJSONTableBatch,
   ColumnarTableBatch,
   ArrowTableBatch
 } from './types/category-table';

package/src/lib/table/arrow-api/arrow-like-table.ts

@@ -34,7 +34,8 @@ class ArrowLikeVector {
   toArray(): ArrayLike<unknown> {
     switch (this.table.shape) {
       case 'arrow-table':
-        return this.table.data.getChild(this.columnName)?.toArray();
+        const arrowTable = this.table.data as any;
+        return arrowTable.getChild(this.columnName)?.toArray();
       case 'columnar-table':
         return this.table.data[this.columnName];
       default:
@@ -62,7 +63,7 @@ export class ArrowLikeTable {
   // }
 
   get data() {
-    return this.table.data;
+    return this.table.shape === 'geojson-table' ? this.table.features : this.table.data;
   }
 
   get numCols(): number {

package/src/lib/table/batches/row-table-batch-aggregator.ts

@@ -13,8 +13,8 @@ export class RowTableBatchAggregator implements TableBatchAggregator {
   options: TableBatchOptions;
 
   length: number = 0;
-  objectRows: {[columnName: string]: any} | null = null;
-  arrayRows: any[] | null = null;
+  objectRows: {[columnName: string]: unknown}[] | null = null;
+  arrayRows: unknown[][] | null = null;
   cursor: number = 0;
   private _headers: string[] = [];
 

package/src/lib/table/simple-table/table-accessors.ts

@@ -11,11 +11,14 @@ export function getTableLength(table: Table): number {
   switch (table.shape) {
     case 'array-row-table':
     case 'object-row-table':
-    case 'geojson-row-table':
       return table.data.length;
 
+    case 'geojson-table':
+      return table.features.length;
+
     case 'arrow-table':
-      return table.data.numRows;
+      const arrowTable = table.data as any;
+      return arrowTable.numRows;
 
     case 'columnar-table':
       for (const column of Object.values(table.data)) {
@@ -42,14 +45,14 @@ export function getTableNumCols(table: Table): number {
     case 'array-row-table':
       return table.data[0].length;
     case 'object-row-table':
-    case 'geojson-row-table':
       return Object.keys(table.data[0]).length;
-
+    case 'geojson-table':
+      return Object.keys(table.features[0]).length;
     case 'columnar-table':
       return Object.keys(table.data).length;
-
     case 'arrow-table':
-      return table.data.numCols;
+      const arrowTable = table.data as any;
+      return arrowTable.numCols;
     default:
       throw new Error('table');
   }
@@ -63,18 +66,21 @@ export function getTableCell(table: Table, rowIndex: number, columnName: string)
       return table.data[rowIndex][columnIndex];
 
     case 'object-row-table':
-    case 'geojson-row-table':
       return table.data[rowIndex][columnName];
 
+    case 'geojson-table':
+      return table.features[rowIndex][columnName];
+
     case 'columnar-table':
       const column = table.data[columnName];
       return column[rowIndex];
 
     case 'arrow-table':
-      const arrowColumnIndex = table.data.schema.fields.findIndex(
+      const arrowTable = table.data as any;
+      const arrowColumnIndex = arrowTable.schema.fields.findIndex(
         (field) => field.name === columnName
       );
-      return table.data.getChildAt(arrowColumnIndex)?.get(rowIndex);
+      return arrowTable.getChildAt(arrowColumnIndex)?.get(rowIndex);
 
     default:
       throw new Error('todo');
@@ -88,17 +94,21 @@ export function getTableCellAt(table: Table, rowIndex: number, columnIndex: numb
       return table.data[rowIndex][columnIndex];
 
     case 'object-row-table':
-    case 'geojson-row-table':
-      let columnName = getTableColumnName(table, columnIndex);
-      return table.data[rowIndex][columnName];
+      const columnName1 = getTableColumnName(table, columnIndex);
+      return table.data[rowIndex][columnName1];
+
+    case 'geojson-table':
+      const columnName2 = getTableColumnName(table, columnIndex);
+      return table.features[rowIndex][columnName2];
 
     case 'columnar-table':
-      columnName = getTableColumnName(table, columnIndex);
-      const column = table.data[columnName];
+      const columnName3 = getTableColumnName(table, columnIndex);
+      const column = table.data[columnName3];
       return column[rowIndex];
 
     case 'arrow-table':
-      return table.data.getChildAt(columnIndex)?.get(rowIndex);
+      const arrowTable = table.data as any;
+      return arrowTable.getChildAt(columnIndex)?.get(rowIndex);
 
     default:
       throw new Error('todo');
@@ -112,7 +122,8 @@ export function getTableRowShape(table: Table): 'array-row-table' | 'object-row-
     case 'object-row-table':
       return table.shape;
 
-    case 'geojson-row-table':
+    case 'geojson-table':
+      // TODO - this is not correct, geojson-table is not a row table
       return 'object-row-table';
 
     case 'columnar-table':
@@ -156,7 +167,6 @@ export function getTableRowAsObject(
       return copy ? Object.fromEntries(Object.entries(table.data[rowIndex])) : table.data[rowIndex];
 
     case 'array-row-table':
-    case 'geojson-row-table':
       if (table.schema) {
         const objectRow: {[columnName: string]: unknown} = target || {};
         for (let i = 0; i < table.schema.fields.length; i++) {
@@ -166,6 +176,17 @@ export function getTableRowAsObject(
       }
       throw new Error('no schema');
 
+    case 'geojson-table':
+      if (table.schema) {
+        const objectRow: {[columnName: string]: unknown} = target || {};
+        // TODO - should lift properties to top level
+        for (let i = 0; i < table.schema.fields.length; i++) {
+          objectRow[table.schema.fields[i].name] = table.features[rowIndex][i];
+        }
+        return objectRow;
+      }
+      throw new Error('no schema');
+
     case 'columnar-table':
       if (table.schema) {
         const objectRow: {[columnName: string]: unknown} = target || {};
@@ -184,9 +205,10 @@ export function getTableRowAsObject(
       }
 
     case 'arrow-table':
+      const arrowTable = table.data as any;
       const objectRow: {[columnName: string]: unknown} = target || {};
-      const row = table.data.get(rowIndex);
-      const schema = table.data.schema;
+      const row = arrowTable.get(rowIndex);
+      const schema = arrowTable.schema;
       for (let i = 0; i < schema.fields.length; i++) {
         objectRow[schema.fields[i].name] = row?.[schema.fields[i].name];
       }
@@ -214,7 +236,6 @@ export function getTableRowAsArray(
       return copy ? Array.from(table.data[rowIndex]) : table.data[rowIndex];
 
     case 'object-row-table':
-    case 'geojson-row-table':
       if (table.schema) {
         const arrayRow: unknown[] = target || [];
         for (let i = 0; i < table.schema.fields.length; i++) {
@@ -225,6 +246,18 @@ export function getTableRowAsArray(
       // Warning: just slap on the values, this risks mismatches between rows
       return Object.values(table.data[rowIndex]);
 
+    case 'geojson-table':
+      if (table.schema) {
+        const arrayRow: unknown[] = target || [];
+        // TODO - should lift properties to top level
+        for (let i = 0; i < table.schema.fields.length; i++) {
+          arrayRow[i] = table.features[rowIndex][table.schema.fields[i].name];
+        }
+        return arrayRow;
+      }
+      // Warning: just slap on the values, this risks mismatches between rows
+      return Object.values(table.features[rowIndex]);
+
     case 'columnar-table':
       if (table.schema) {
         const arrayRow: unknown[] = target || [];
@@ -244,9 +277,10 @@ export function getTableRowAsArray(
       }
 
     case 'arrow-table':
+      const arrowTable = table.data as any;
       const arrayRow: unknown[] = target || [];
-      const row = table.data.get(rowIndex);
-      const schema = table.data.schema;
+      const row = arrowTable.get(rowIndex);
+      const schema = arrowTable.schema;
       for (let i = 0; i < schema.fields.length; i++) {
         arrayRow[i] = row?.[schema.fields[i].name];
       }

package/src/types/batch.ts

@@ -0,0 +1,41 @@
+// loaders.gl, MIT license
+
+import {Schema} from './schema';
+import type {RecordBatch} from 'apache-arrow';
+
+/**
+ * A batch of data (or metadata/schema), from a streaming loader
+ * @see parseInBatches()
+ * @see loadInBatches()
+ */
+export type Batch = {
+  /** A batch can contain metadata, data, or in case of unstructured data (JSON) */
+  batchType: 'data' | 'metadata' | 'partial-result' | 'final-result';
+  /** A string identifying the shape of data in this batch (table, etc) */
+  shape: string;
+  /** Schema of the data in this batch */
+  schema?: Schema;
+  /** Data in this batch */
+  data: unknown;
+  /**  If this is an arrow table. @deprecated Use `data` */
+  recordBatch?: RecordBatch;
+  /** Length of data in this batch */
+  length: number;
+
+  /** A count of batches received */
+  batch?: number;
+
+  /** A count of batches received */
+  count?: number;
+
+  /** Bytes used so far */
+  bytesUsed?: number;
+  /** cursor is the  */
+  cursor?: number;
+
+  /** MIME type of the data generating this batch */
+  mimeType?: string;
+
+  /** Any other data */
+  [key: string]: unknown;
+};

package/src/types/category-table.ts

@@ -1,26 +1,26 @@
 // loaders.gl, MIT license
 
-import type {Table as ApacheArrowTable, RecordBatch} from 'apache-arrow';
-import type {Batch, Schema} from './schema';
+import type {Schema} from './schema';
+import type {Batch} from './batch';
 import type {Feature} from './category-gis';
 
-// Idea was to just import types, but it seems
-// Seems this triggers more bundling and build issues than it is worth...
-// import type {Table as ApacheArrowTable, RecordBatch} from 'apache-arrow';
-// type ApacheArrowTable = any;
-// type RecordBatch = any;
+// Avoid a big dependency, apparently even a type import can pull in a lot of code
+// import type {Table as ApacheArrowTable} from 'apache-arrow';
+
+type ApacheArrowTable = unknown;
+type ApacheRecordBatch = unknown;
 
 /** A general table */
 export type Table =
   | RowTable
   | ArrayRowTable
   | ObjectRowTable
-  | GeoJSONRowTable
+  | GeoJSONTable
   | ColumnarTable
   | ArrowTable;
 
 /** A table organized as an array of rows */
-export type RowTable = ArrayRowTable | ObjectRowTable | GeoJSONRowTable;
+export type RowTable = ArrayRowTable | ObjectRowTable | GeoJSONTable;
 
 /** A table organized as an array of rows, each row is an array of values */
 export type ArrayRowTable = {
@@ -36,11 +36,17 @@ export type ObjectRowTable = {
   data: {[columnName: string]: any}[];
 };
 
-/** A table organized as an array of rows, each row is a GeoJSON Feature */
-export type GeoJSONRowTable = {
-  shape: 'geojson-row-table';
+/**
+ * A table organized as an array of rows, each row is a GeoJSON Feature
+ * @note For compatibility with GeoJSON, rows are stored in `table.features` instead of `table.data`
+ */
+export type GeoJSONTable = {
+  shape: 'geojson-table';
   schema?: Schema;
-  data: Feature[];
+  /** For compatibility with GeoJSON, the type field must always be set to `FeatureCollection` */
+  type: 'FeatureCollection';
+  /** For compatibility with GeoJSON, rows are stored in `table.features` instead of `table.data` */
+  features: Feature[];
 };
 
 /** A table organized as a map of columns, each column is an array of value */
@@ -69,7 +75,7 @@ export type Tables<TableType = Table> = {
 export type TableBatch =
   | ArrayRowTableBatch
   | ObjectRowTableBatch
-  | GeoJSONRowTableBatch
+  | GeoJSONTableBatch
   | ColumnarTableBatch
   | ArrowTableBatch;
 
@@ -92,11 +98,12 @@ export type ObjectRowTableBatch = Batch & {
 };
 
 /** Batch for a table organized as an array of rows, each row is an array of values */
-export type GeoJSONRowTableBatch = Batch & {
-  shape: 'geojson-row-table';
+export type GeoJSONTableBatch = Batch & {
+  shape: 'geojson-table';
   schema?: Schema;
   schemaType?: 'explicit' | 'deduced';
-  data: Feature[];
+  type: 'FeatureCollection';
+  features: Feature[];
   length: number;
 };
 
@@ -114,6 +121,6 @@ export type ArrowTableBatch = Batch & {
   shape: 'arrow-table';
   schemaType?: 'explicit' | 'deduced';
   schema?: Schema;
-  data: RecordBatch;
+  data: ApacheRecordBatch;
   length: number;
 };

package/src/types/schema.ts

@@ -1,7 +1,5 @@
 // loaders.gl, MIT license
 
-import type {RecordBatch} from 'apache-arrow';
-
 /** For dictionary type */
 export type KeyType = 'int8' | 'int16' | 'int32' | 'uint8' | 'uint16' | 'uint32';
 
@@ -80,18 +78,3 @@ export type Schema = {
   fields: Field[];
   metadata: SchemaMetadata;
 };
-
-export type Batch = {
-  batchType: 'data' | 'metadata' | 'partial-result' | 'final-result';
-  batch?: number;
-  mimeType?: string;
-  shape: string;
-  data: any;
-  recordBatch?: RecordBatch;
-  length: number;
-  schema?: Schema;
-  bytesUsed?: number;
-  count?: number;
-  cursor?: number;
-  [key: string]: any;
-};