@loaders.gl/json 4.1.0-alpha.2 → 4.1.0-alpha.3

package/dist/dist.dev.js

@@ -62,6 +62,7 @@ var __exports__ = (() => {
       if (Number.isFinite(cursor)) {
         this.cursor = cursor;
       }
+      this.shape = "array-row-table";
       this.rows = this.rows || new Array(DEFAULT_ROW_COUNT);
       this.rows[this.length] = row;
       this.length++;
@@ -70,6 +71,7 @@ var __exports__ = (() => {
       if (Number.isFinite(cursor)) {
         this.cursor = cursor;
       }
+      this.shape = "object-row-table";
       this.rows = this.rows || new Array(DEFAULT_ROW_COUNT);
       this.rows[this.length] = row;
       this.length++;
@@ -82,7 +84,7 @@ var __exports__ = (() => {
       rows = rows.slice(0, this.length);
       this.rows = null;
       const batch = {
-        shape: this.options.shape,
+        shape: this.shape || "array-row-table",
         batchType: "data",
         data: rows,
         length: this.length,
@@ -98,12 +100,16 @@ var __exports__ = (() => {
     if (!arrayRow) {
       throw new Error("null row");
     }
-    if (!headers) {
-      throw new Error("no headers");
-    }
     const objectRow = {};
-    for (let i = 0; i < headers.length; i++) {
-      objectRow[headers[i]] = arrayRow[i];
+    if (headers) {
+      for (let i = 0; i < headers.length; i++) {
+        objectRow[headers[i]] = arrayRow[i];
+      }
+    } else {
+      for (let i = 0; i < arrayRow.length; i++) {
+        const columnName = `column-${i}`;
+        objectRow[columnName] = arrayRow[i];
+      }
     }
     return objectRow;
   }
@@ -111,14 +117,25 @@ var __exports__ = (() => {
     if (!objectRow) {
       throw new Error("null row");
     }
-    if (!headers) {
-      throw new Error("no headers");
+    if (headers) {
+      const arrayRow = new Array(headers.length);
+      for (let i = 0; i < headers.length; i++) {
+        arrayRow[i] = objectRow[headers[i]];
+      }
+      return arrayRow;
     }
-    const arrayRow = new Array(headers.length);
-    for (let i = 0; i < headers.length; i++) {
-      arrayRow[i] = objectRow[headers[i]];
+    return Object.values(objectRow);
+  }
+  function inferHeadersFromArrayRow(arrayRow) {
+    const headers = [];
+    for (let i = 0; i < arrayRow.length; i++) {
+      const columnName = `column-${i}`;
+      headers.push(columnName);
     }
-    return arrayRow;
+    return headers;
+  }
+  function inferHeadersFromObjectRow(row) {
+    return Object.keys(row);
   }
 
   // ../schema/src/lib/table/batches/row-table-batch-aggregator.ts
@@ -128,11 +145,11 @@ var __exports__ = (() => {
     objectRows = null;
     arrayRows = null;
     cursor = 0;
-    _headers = [];
+    _headers = null;
     constructor(schema, options) {
       this.options = options;
       this.schema = schema;
-      if (!Array.isArray(schema)) {
+      if (schema) {
         this._headers = [];
         for (const key in schema) {
           this._headers[schema[key].index] = schema[key].name;
@@ -146,6 +163,7 @@ var __exports__ = (() => {
       if (Number.isFinite(cursor)) {
         this.cursor = cursor;
       }
+      this._headers ||= inferHeadersFromArrayRow(row);
       switch (this.options.shape) {
         case "object-row-table":
           const rowObject = convertToObjectRow(row, this._headers);
@@ -162,6 +180,7 @@ var __exports__ = (() => {
       if (Number.isFinite(cursor)) {
         this.cursor = cursor;
       }
+      this._headers ||= inferHeadersFromObjectRow(row);
       switch (this.options.shape) {
         case "array-row-table":
           const rowArray = convertToArrayRow(row, this._headers);
@@ -271,7 +290,7 @@ var __exports__ = (() => {
 
   // ../schema/src/lib/table/batches/table-batch-builder.ts
   var DEFAULT_OPTIONS = {
-    shape: "array-row-table",
+    shape: void 0,
     batchSize: "auto",
     batchDebounceMs: 0,
     limit: 0,
@@ -383,8 +402,6 @@ var __exports__ = (() => {
     }
     _getTableBatchType() {
       switch (this.options.shape) {
-        case "row-table":
-          return BaseTableBatchAggregator;
         case "array-row-table":
         case "object-row-table":
           return RowTableBatchAggregator;
@@ -396,7 +413,7 @@ var __exports__ = (() => {
           }
           return TableBatchBuilder.ArrowBatch;
         default:
-          throw new Error(ERR_MESSAGE);
+          return BaseTableBatchAggregator;
       }
     }
   };
@@ -781,6 +798,19 @@ var __exports__ = (() => {
     }
   }
 
+  // ../loader-utils/src/lib/binary-utils/array-buffer-utils.ts
+  function concatenateArrayBuffers(...sources) {
+    const sourceArrays = sources.map((source2) => source2 instanceof ArrayBuffer ? new Uint8Array(source2) : source2);
+    const byteLength = sourceArrays.reduce((length, typedArray) => length + typedArray.byteLength, 0);
+    const result = new Uint8Array(byteLength);
+    let offset = 0;
+    for (const sourceArray of sourceArrays) {
+      result.set(sourceArray, offset);
+      offset += sourceArray.byteLength;
+    }
+    return result.buffer;
+  }
+
   // ../loader-utils/src/lib/iterators/text-iterators.ts
   async function* makeTextDecoderIterator(arrayBufferIterator, options = {}) {
     const textDecoder = new TextDecoder(void 0, options);
@@ -816,6 +846,15 @@ var __exports__ = (() => {
     }
   }
 
+  // ../loader-utils/src/lib/iterators/async-iteration.ts
+  async function concatenateArrayBuffersAsync(asyncIterator) {
+    const arrayBuffers = [];
+    for await (const chunk of asyncIterator) {
+      arrayBuffers.push(chunk);
+    }
+    return concatenateArrayBuffers(...arrayBuffers);
+  }
+
   // ../../node_modules/@babel/runtime/helpers/esm/typeof.js
   function _typeof(obj) {
     "@babel/helpers - typeof";
@@ -1605,11 +1644,7 @@ Char: ${this.c}`;
     } = options.json || {};
     let isFirstChunk = true;
     const schema = null;
-    const shape = options?.json?.shape || "object-row-table";
-    const tableBatchBuilder = new TableBatchBuilder(schema, {
-      ...options,
-      shape
-    });
+    const tableBatchBuilder = new TableBatchBuilder(schema, options);
     const parser = new StreamingJSONParser({
       jsonpaths
     });
@@ -1619,7 +1654,7 @@ Char: ${this.c}`;
       if (rows.length > 0 && isFirstChunk) {
         if (metadata) {
           const initialBatch = {
-            shape,
+            shape: options?.json?.shape || "array-row-table",
             batchType: "partial-result",
             data: [],
             length: 0,
@@ -1657,7 +1692,7 @@ Char: ${this.c}`;
     }
     if (metadata) {
       const finalBatch = {
-        shape,
+        shape: "json",
         batchType: "final-result",
         container: parser.getPartialResult(),
         jsonpath: parser.getStreamingJsonPathAsString(),
@@ -1682,14 +1717,7 @@ Char: ${this.c}`;
   }
 
   // src/json-loader.ts
-  var VERSION = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
-  var DEFAULT_JSON_LOADER_OPTIONS = {
-    json: {
-      shape: "object-row-table",
-      table: false,
-      jsonpaths: []
-    }
-  };
+  var VERSION = true ? "4.1.0-alpha.3" : "latest";
   var JSONLoader = {
     name: "JSON",
     id: "json",
@@ -1699,10 +1727,16 @@ Char: ${this.c}`;
     mimeTypes: ["application/json"],
     category: "table",
     text: true,
+    options: {
+      json: {
+        shape: void 0,
+        table: false,
+        jsonpaths: []
+      }
+    },
     parse,
     parseTextSync,
-    parseInBatches,
-    options: DEFAULT_JSON_LOADER_OPTIONS
+    parseInBatches
   };
   async function parse(arrayBuffer, options) {
     return parseTextSync(new TextDecoder().decode(arrayBuffer), options);
@@ -1711,7 +1745,7 @@ Char: ${this.c}`;
     const jsonOptions = {
       ...options,
       json: {
-        ...DEFAULT_JSON_LOADER_OPTIONS.json,
+        ...JSONLoader.options.json,
         ...options?.json
       }
     };
@@ -1721,7 +1755,7 @@ Char: ${this.c}`;
     const jsonOptions = {
       ...options,
       json: {
-        ...DEFAULT_JSON_LOADER_OPTIONS.json,
+        ...JSONLoader.options.json,
         ...options?.json
       }
     };
@@ -1775,7 +1809,7 @@ Char: ${this.c}`;
   }
 
   // src/ndjson-loader.ts
-  var VERSION2 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
+  var VERSION2 = true ? "4.1.0-alpha.3" : "latest";
   var NDJSONLoader = {
     name: "NDJSON",
     id: "ndjson",
@@ -2844,7 +2878,7 @@ Char: ${this.c}`;
   }
 
   // src/geojson-loader.ts
-  var VERSION3 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
+  var VERSION3 = true ? "4.1.0-alpha.3" : "latest";
   var GeoJSONWorkerLoader = {
     name: "GeoJSON",
     id: "geojson",
@@ -3081,13 +3115,18 @@ Char: ${this.c}`;
     name: "GeoJSON",
     extensions: ["geojson"],
     mimeTypes: ["application/geo+json"],
+    text: true,
     options: {
       geojson: {
         featureArray: false,
         geometryColumn: null
       }
     },
-    text: true,
+    async encode(table, options) {
+      const tableIterator = [table];
+      const batches = encodeTableAsGeojsonInBatches(tableIterator, options);
+      return await concatenateArrayBuffersAsync(batches);
+    },
     encodeInBatches: (tableIterator, options) => encodeTableAsGeojsonInBatches(tableIterator, options)
   };
   return __toCommonJS(src_exports);

package/dist/geojson-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geojson-loader.d.ts","sourceRoot":"","sources":["../src/geojson-loader.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AACvE,OAAO,KAAK,EAAC,OAAO,EAAgB,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAC1E,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AASrD,MAAM,MAAM,oBAAoB,GAAG,iBAAiB,GAAG;IACrD,OAAO,CAAC,EAAE;QACR,KAAK,CAAC,EAAE,kBAAkB,CAAC;KAC5B,CAAC;IACF,GAAG,CAAC,EAAE;QACJ,MAAM,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC;KAC/B,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,oBAAoB,CAsBjF,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE,oBAAoB,CAOrF,CAAC"}
+{"version":3,"file":"geojson-loader.d.ts","sourceRoot":"","sources":["../src/geojson-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AACvE,OAAO,KAAK,EAAC,OAAO,EAAgB,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAC1E,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AASrD,MAAM,MAAM,oBAAoB,GAAG,iBAAiB,GAAG;IACrD,OAAO,CAAC,EAAE;QACR,KAAK,CAAC,EAAE,kBAAkB,CAAC;KAC5B,CAAC;IACF,GAAG,CAAC,EAAE;QACJ,MAAM,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC;KAC/B,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,oBAAoB,CAsBjF,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE,oBAAoB,CAOrF,CAAC"}

package/dist/geojson-loader.js

@@ -1,6 +1,6 @@
 import { geojsonToBinary } from '@loaders.gl/gis';
 import { parseJSONInBatches } from "./lib/parsers/parse-json-in-batches.js";
-const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
+const VERSION = typeof "4.1.0-alpha.3" !== 'undefined' ? "4.1.0-alpha.3" : 'latest';
 export const GeoJSONWorkerLoader = {
   name: 'GeoJSON',
   id: 'geojson',

package/dist/geojson-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"geojson-loader.js","names":["geojsonToBinary","parseJSONInBatches","VERSION","__VERSION__","GeoJSONWorkerLoader","name","id","module","version","worker","extensions","mimeTypes","category","text","options","geojson","shape","json","jsonpaths","gis","format","GeoJSONLoader","parse","parseTextSync","parseInBatches","arrayBuffer","TextDecoder","decode","_geojson","JSON","table","type","features","asyncIterator","geojsonIterator","makeBinaryGeometryIterator","batch","data"],"sources":["../src/geojson-loader.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport type {Loader, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport type {GeoJSON, GeoJSONTable, TableBatch} from '@loaders.gl/schema';\nimport type {JSONLoaderOptions} from './json-loader';\nimport {geojsonToBinary} from '@loaders.gl/gis';\n// import {parseJSONSync} from './lib/parsers/parse-json';\nimport {parseJSONInBatches} from './lib/parsers/parse-json-in-batches';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport type GeoJSONLoaderOptions = JSONLoaderOptions & {\n  geojson?: {\n    shape?: 'object-row-table';\n  };\n  gis?: {\n    format?: 'geojson' | 'binary';\n  };\n};\n\n/**\n * GeoJSON loader\n */\nexport const GeoJSONWorkerLoader: Loader<GeoJSON, TableBatch, GeoJSONLoaderOptions> = {\n  name: 'GeoJSON',\n  id: 'geojson',\n  module: 'geojson',\n  version: VERSION,\n  worker: true,\n  extensions: ['geojson'],\n  mimeTypes: ['application/geo+json'],\n  category: 'geometry',\n  text: true,\n  options: {\n    geojson: {\n      shape: 'object-row-table'\n    },\n    json: {\n      shape: 'object-row-table',\n      jsonpaths: ['$', '$.features']\n    },\n    gis: {\n      format: 'geojson'\n    }\n  }\n};\n\nexport const GeoJSONLoader: LoaderWithParser<GeoJSON, TableBatch, GeoJSONLoaderOptions> = {\n  ...GeoJSONWorkerLoader,\n  // @ts-expect-error\n  parse,\n  // @ts-expect-error\n  parseTextSync,\n  parseInBatches\n};\n\nasync function parse(arrayBuffer: ArrayBuffer, options?: GeoJSONLoaderOptions) {\n  return parseTextSync(new TextDecoder().decode(arrayBuffer), options);\n}\n\nfunction parseTextSync(text: string, options?: GeoJSONLoaderOptions) {\n  // Apps can call the parse method directly, we so apply default options here\n  options = {...GeoJSONLoader.options, ...options};\n  options.geojson = {...GeoJSONLoader.options.geojson, ...options.geojson};\n  options.gis = options.gis || {};\n\n  let geojson;\n  try {\n    geojson = JSON.parse(text);\n  } catch {\n    geojson = {};\n  }\n\n  const table: GeoJSONTable = {\n    shape: 'geojson-table',\n    // TODO - deduce schema from geojson\n    // TODO check that parsed data is of type FeatureCollection\n    type: 'FeatureCollection',\n    features: geojson?.features || []\n  };\n\n  switch (options.gis.format) {\n    case 'binary':\n      return geojsonToBinary(table.features);\n    default:\n      return table;\n  }\n}\n\nfunction parseInBatches(asyncIterator, options): AsyncIterable<TableBatch> {\n  // Apps can call the parse method directly, we so apply default options here\n  options = {...GeoJSONLoader.options, ...options};\n  options.json = {...GeoJSONLoader.options.geojson, ...options.geojson};\n\n  const geojsonIterator = parseJSONInBatches(asyncIterator, options);\n\n  switch (options.gis.format) {\n    case 'binary':\n      return makeBinaryGeometryIterator(geojsonIterator);\n    default:\n      return geojsonIterator;\n  }\n}\n\nasync function* makeBinaryGeometryIterator(geojsonIterator) {\n  for await (const batch of geojsonIterator) {\n    batch.data = geojsonToBinary(batch.data);\n    yield batch;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"geojson-loader.js","names":["geojsonToBinary","parseJSONInBatches","VERSION","GeoJSONWorkerLoader","name","id","module","version","worker","extensions","mimeTypes","category","text","options","geojson","shape","json","jsonpaths","gis","format","GeoJSONLoader","parse","parseTextSync","parseInBatches","arrayBuffer","TextDecoder","decode","_geojson","JSON","table","type","features","asyncIterator","geojsonIterator","makeBinaryGeometryIterator","batch","data"],"sources":["../src/geojson-loader.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport type {Loader, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport type {GeoJSON, GeoJSONTable, TableBatch} from '@loaders.gl/schema';\nimport type {JSONLoaderOptions} from './json-loader';\nimport {geojsonToBinary} from '@loaders.gl/gis';\n// import {parseJSONSync} from './lib/parsers/parse-json';\nimport {parseJSONInBatches} from './lib/parsers/parse-json-in-batches';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport type GeoJSONLoaderOptions = JSONLoaderOptions & {\n  geojson?: {\n    shape?: 'object-row-table';\n  };\n  gis?: {\n    format?: 'geojson' | 'binary';\n  };\n};\n\n/**\n * GeoJSON loader\n */\nexport const GeoJSONWorkerLoader: Loader<GeoJSON, TableBatch, GeoJSONLoaderOptions> = {\n  name: 'GeoJSON',\n  id: 'geojson',\n  module: 'geojson',\n  version: VERSION,\n  worker: true,\n  extensions: ['geojson'],\n  mimeTypes: ['application/geo+json'],\n  category: 'geometry',\n  text: true,\n  options: {\n    geojson: {\n      shape: 'object-row-table'\n    },\n    json: {\n      shape: 'object-row-table',\n      jsonpaths: ['$', '$.features']\n    },\n    gis: {\n      format: 'geojson'\n    }\n  }\n};\n\nexport const GeoJSONLoader: LoaderWithParser<GeoJSON, TableBatch, GeoJSONLoaderOptions> = {\n  ...GeoJSONWorkerLoader,\n  // @ts-expect-error\n  parse,\n  // @ts-expect-error\n  parseTextSync,\n  parseInBatches\n};\n\nasync function parse(arrayBuffer: ArrayBuffer, options?: GeoJSONLoaderOptions) {\n  return parseTextSync(new TextDecoder().decode(arrayBuffer), options);\n}\n\nfunction parseTextSync(text: string, options?: GeoJSONLoaderOptions) {\n  // Apps can call the parse method directly, we so apply default options here\n  options = {...GeoJSONLoader.options, ...options};\n  options.geojson = {...GeoJSONLoader.options.geojson, ...options.geojson};\n  options.gis = options.gis || {};\n\n  let geojson;\n  try {\n    geojson = JSON.parse(text);\n  } catch {\n    geojson = {};\n  }\n\n  const table: GeoJSONTable = {\n    shape: 'geojson-table',\n    // TODO - deduce schema from geojson\n    // TODO check that parsed data is of type FeatureCollection\n    type: 'FeatureCollection',\n    features: geojson?.features || []\n  };\n\n  switch (options.gis.format) {\n    case 'binary':\n      return geojsonToBinary(table.features);\n    default:\n      return table;\n  }\n}\n\nfunction parseInBatches(asyncIterator, options): AsyncIterable<TableBatch> {\n  // Apps can call the parse method directly, we so apply default options here\n  options = {...GeoJSONLoader.options, ...options};\n  options.json = {...GeoJSONLoader.options.geojson, ...options.geojson};\n\n  const geojsonIterator = parseJSONInBatches(asyncIterator, options);\n\n  switch (options.gis.format) {\n    case 'binary':\n      return makeBinaryGeometryIterator(geojsonIterator);\n    default:\n      return geojsonIterator as AsyncIterable<TableBatch>;\n  }\n}\n\nasync function* makeBinaryGeometryIterator(geojsonIterator) {\n  for await (const batch of geojsonIterator) {\n    batch.data = geojsonToBinary(batch.data);\n    yield batch;\n  }\n}\n"],"mappings":"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"}

package/dist/geojson-worker.js

@@ -275,6 +275,7 @@
       if (Number.isFinite(cursor)) {
         this.cursor = cursor;
       }
+      this.shape = "array-row-table";
       this.rows = this.rows || new Array(DEFAULT_ROW_COUNT);
       this.rows[this.length] = row;
       this.length++;
@@ -283,6 +284,7 @@
       if (Number.isFinite(cursor)) {
         this.cursor = cursor;
       }
+      this.shape = "object-row-table";
       this.rows = this.rows || new Array(DEFAULT_ROW_COUNT);
       this.rows[this.length] = row;
       this.length++;
@@ -295,7 +297,7 @@
       rows = rows.slice(0, this.length);
       this.rows = null;
       const batch = {
-        shape: this.options.shape,
+        shape: this.shape || "array-row-table",
         batchType: "data",
         data: rows,
         length: this.length,
@@ -311,12 +313,16 @@
     if (!arrayRow) {
       throw new Error("null row");
     }
-    if (!headers) {
-      throw new Error("no headers");
-    }
     const objectRow = {};
-    for (let i = 0; i < headers.length; i++) {
-      objectRow[headers[i]] = arrayRow[i];
+    if (headers) {
+      for (let i = 0; i < headers.length; i++) {
+        objectRow[headers[i]] = arrayRow[i];
+      }
+    } else {
+      for (let i = 0; i < arrayRow.length; i++) {
+        const columnName = `column-${i}`;
+        objectRow[columnName] = arrayRow[i];
+      }
     }
     return objectRow;
   }
@@ -324,14 +330,25 @@
     if (!objectRow) {
       throw new Error("null row");
     }
-    if (!headers) {
-      throw new Error("no headers");
+    if (headers) {
+      const arrayRow = new Array(headers.length);
+      for (let i = 0; i < headers.length; i++) {
+        arrayRow[i] = objectRow[headers[i]];
+      }
+      return arrayRow;
     }
-    const arrayRow = new Array(headers.length);
-    for (let i = 0; i < headers.length; i++) {
-      arrayRow[i] = objectRow[headers[i]];
+    return Object.values(objectRow);
+  }
+  function inferHeadersFromArrayRow(arrayRow) {
+    const headers = [];
+    for (let i = 0; i < arrayRow.length; i++) {
+      const columnName = `column-${i}`;
+      headers.push(columnName);
     }
-    return arrayRow;
+    return headers;
+  }
+  function inferHeadersFromObjectRow(row) {
+    return Object.keys(row);
   }
 
   // ../schema/src/lib/table/batches/row-table-batch-aggregator.ts
@@ -342,10 +359,10 @@
       this.objectRows = null;
       this.arrayRows = null;
       this.cursor = 0;
-      this._headers = [];
+      this._headers = null;
       this.options = options;
       this.schema = schema;
-      if (!Array.isArray(schema)) {
+      if (schema) {
         this._headers = [];
         for (const key in schema) {
           this._headers[schema[key].index] = schema[key].name;
@@ -359,6 +376,7 @@
       if (Number.isFinite(cursor)) {
         this.cursor = cursor;
       }
+      this._headers || (this._headers = inferHeadersFromArrayRow(row));
       switch (this.options.shape) {
         case "object-row-table":
           const rowObject = convertToObjectRow(row, this._headers);
@@ -375,6 +393,7 @@
       if (Number.isFinite(cursor)) {
         this.cursor = cursor;
       }
+      this._headers || (this._headers = inferHeadersFromObjectRow(row));
       switch (this.options.shape) {
         case "array-row-table":
           const rowArray = convertToArrayRow(row, this._headers);
@@ -400,6 +419,7 @@
         batchType: "data",
         data: rows,
         length: this.length,
+        // @ts-expect-error we should infer a schema
         schema: this.schema,
         cursor: this.cursor
       };
@@ -485,7 +505,7 @@
 
   // ../schema/src/lib/table/batches/table-batch-builder.ts
   var DEFAULT_OPTIONS = {
-    shape: "array-row-table",
+    shape: void 0,
     batchSize: "auto",
     batchDebounceMs: 0,
     limit: 0,
@@ -602,8 +622,6 @@
     }
     _getTableBatchType() {
       switch (this.options.shape) {
-        case "row-table":
-          return BaseTableBatchAggregator;
         case "array-row-table":
         case "object-row-table":
           return RowTableBatchAggregator;
@@ -615,7 +633,7 @@
           }
           return TableBatchBuilder.ArrowBatch;
         default:
-          throw new Error(ERR_MESSAGE);
+          return BaseTableBatchAggregator;
       }
     }
   };
@@ -2356,11 +2374,7 @@ Char: ${this.c}`;
     const { jsonpaths } = options.json || {};
     let isFirstChunk = true;
     const schema = null;
-    const shape = options?.json?.shape || "object-row-table";
-    const tableBatchBuilder = new TableBatchBuilder(schema, {
-      ...options,
-      shape
-    });
+    const tableBatchBuilder = new TableBatchBuilder(schema, options);
     const parser = new StreamingJSONParser({ jsonpaths });
     for await (const chunk of asyncIterator) {
       const rows = parser.write(chunk);
@@ -2369,7 +2383,7 @@ Char: ${this.c}`;
         if (metadata) {
           const initialBatch = {
             // Common fields
-            shape,
+            shape: options?.json?.shape || "array-row-table",
             batchType: "partial-result",
             data: [],
             length: 0,
@@ -2402,10 +2416,11 @@ Char: ${this.c}`;
     }
     if (metadata) {
       const finalBatch = {
-        shape,
+        shape: "json",
         batchType: "final-result",
         container: parser.getPartialResult(),
         jsonpath: parser.getStreamingJsonPathAsString(),
+        /** Data Just to avoid crashing? */
         data: [],
         length: 0
         // schema: null
@@ -2415,7 +2430,7 @@ Char: ${this.c}`;
   }
 
   // src/geojson-loader.ts
-  var VERSION = true ? "4.1.0-alpha.2" : "latest";
+  var VERSION = true ? "4.1.0-alpha.3" : "latest";
   var GeoJSONWorkerLoader = {
     name: "GeoJSON",
     id: "geojson",

package/dist/geojson-writer.d.ts

@@ -1,4 +1,4 @@
-import type { WriterWithEncoder, WriterOptions } from '@loaders.gl/loader-utils';
+import { type WriterWithEncoder, type WriterOptions } from '@loaders.gl/loader-utils';
 import type { Table, TableBatch } from '@loaders.gl/schema';
 export type GeoJSONWriterOptions = WriterOptions & {
     geojson?: {

package/dist/geojson-writer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geojson-writer.d.ts","sourceRoot":"","sources":["../src/geojson-writer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,iBAAiB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC/E,OAAO,KAAK,EAAC,KAAK,EAAE,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAG1D,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG;IACjD,OAAO,CAAC,EAAE;QACR,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAChC,CAAC;IACF,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,iBAAiB,CAAC,KAAK,EAAE,UAAU,EAAE,oBAAoB,CAgBpF,CAAC"}
+{"version":3,"file":"geojson-writer.d.ts","sourceRoot":"","sources":["../src/geojson-writer.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,aAAa,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAC,KAAK,EAAE,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAG1D,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG;IACjD,OAAO,CAAC,EAAE;QACR,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAChC,CAAC;IACF,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,iBAAiB,CAAC,KAAK,EAAE,UAAU,EAAE,oBAAoB,CAuBpF,CAAC"}

package/dist/geojson-writer.js

@@ -1,3 +1,4 @@
+import { concatenateArrayBuffersAsync } from '@loaders.gl/loader-utils';
 import { encodeTableAsGeojsonInBatches } from "./lib/encoders/geojson-encoder.js";
 export const GeoJSONWriter = {
   id: 'geojson',
@@ -6,13 +7,18 @@ export const GeoJSONWriter = {
   name: 'GeoJSON',
   extensions: ['geojson'],
   mimeTypes: ['application/geo+json'],
+  text: true,
   options: {
     geojson: {
       featureArray: false,
       geometryColumn: null
     }
   },
-  text: true,
+  async encode(table, options) {
+    const tableIterator = [table];
+    const batches = encodeTableAsGeojsonInBatches(tableIterator, options);
+    return await concatenateArrayBuffersAsync(batches);
+  },
   encodeInBatches: (tableIterator, options) => encodeTableAsGeojsonInBatches(tableIterator, options)
 };
 //# sourceMappingURL=geojson-writer.js.map

package/dist/geojson-writer.js.map

@@ -1 +1 @@
-{"version":3,"file":"geojson-writer.js","names":["encodeTableAsGeojsonInBatches","GeoJSONWriter","id","version","module","name","extensions","mimeTypes","options","geojson","featureArray","geometryColumn","text","encodeInBatches","tableIterator"],"sources":["../src/geojson-writer.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n// Copyright Foursquare, Inc 20222\n\nimport type {WriterWithEncoder, WriterOptions} from '@loaders.gl/loader-utils';\nimport type {Table, TableBatch} from '@loaders.gl/schema';\nimport {encodeTableAsGeojsonInBatches} from './lib/encoders/geojson-encoder';\n\nexport type GeoJSONWriterOptions = WriterOptions & {\n  geojson?: {\n    featureArray?: boolean;\n    geometryColumn?: number | null;\n  };\n  chunkSize?: number;\n};\n\nexport const GeoJSONWriter: WriterWithEncoder<Table, TableBatch, GeoJSONWriterOptions> = {\n  id: 'geojson',\n  version: 'latest',\n  module: 'geojson',\n  name: 'GeoJSON',\n  extensions: ['geojson'],\n  mimeTypes: ['application/geo+json'],\n  options: {\n    geojson: {\n      featureArray: false,\n      geometryColumn: null\n    }\n  },\n  text: true,\n  encodeInBatches: (tableIterator: AsyncIterable<TableBatch>, options) =>\n    encodeTableAsGeojsonInBatches(tableIterator, options)\n};\n"],"mappings":"SAMQA,6BAA6B;AAUrC,OAAO,MAAMC,aAAyE,GAAG;EACvFC,EAAE,EAAE,SAAS;EACbC,OAAO,EAAE,QAAQ;EACjBC,MAAM,EAAE,SAAS;EACjBC,IAAI,EAAE,SAAS;EACfC,UAAU,EAAE,CAAC,SAAS,CAAC;EACvBC,SAAS,EAAE,CAAC,sBAAsB,CAAC;EACnCC,OAAO,EAAE;IACPC,OAAO,EAAE;MACPC,YAAY,EAAE,KAAK;MACnBC,cAAc,EAAE;IAClB;EACF,CAAC;EACDC,IAAI,EAAE,IAAI;EACVC,eAAe,EAAEA,CAACC,aAAwC,EAAEN,OAAO,KACjER,6BAA6B,CAACc,aAAa,EAAEN,OAAO;AACxD,CAAC"}
+{"version":3,"file":"geojson-writer.js","names":["concatenateArrayBuffersAsync","encodeTableAsGeojsonInBatches","GeoJSONWriter","id","version","module","name","extensions","mimeTypes","text","options","geojson","featureArray","geometryColumn","encode","table","tableIterator","batches","encodeInBatches"],"sources":["../src/geojson-writer.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n// Copyright Foursquare, Inc 20222\n\nimport {\n  type WriterWithEncoder,\n  type WriterOptions,\n  concatenateArrayBuffersAsync\n} from '@loaders.gl/loader-utils';\nimport type {Table, TableBatch} from '@loaders.gl/schema';\nimport {encodeTableAsGeojsonInBatches} from './lib/encoders/geojson-encoder';\n\nexport type GeoJSONWriterOptions = WriterOptions & {\n  geojson?: {\n    featureArray?: boolean;\n    geometryColumn?: number | null;\n  };\n  chunkSize?: number;\n};\n\nexport const GeoJSONWriter: WriterWithEncoder<Table, TableBatch, GeoJSONWriterOptions> = {\n  id: 'geojson',\n  version: 'latest',\n  module: 'geojson',\n  name: 'GeoJSON',\n  extensions: ['geojson'],\n  mimeTypes: ['application/geo+json'],\n  text: true,\n  options: {\n    geojson: {\n      featureArray: false,\n      geometryColumn: null\n    }\n  },\n\n  async encode(table: Table, options: GeoJSONWriterOptions): Promise<ArrayBuffer> {\n    const tableIterator = [table] as TableBatch[];\n    const batches = encodeTableAsGeojsonInBatches(tableIterator, options);\n    return await concatenateArrayBuffersAsync(batches);\n  },\n\n  encodeInBatches: (tableIterator: AsyncIterable<TableBatch> | Iterable<TableBatch>, options) =>\n    encodeTableAsGeojsonInBatches(tableIterator, options)\n};\n"],"mappings":"AAKA,SAGEA,4BAA4B,QACvB,0BAA0B;AAAC,SAE1BC,6BAA6B;AAUrC,OAAO,MAAMC,aAAyE,GAAG;EACvFC,EAAE,EAAE,SAAS;EACbC,OAAO,EAAE,QAAQ;EACjBC,MAAM,EAAE,SAAS;EACjBC,IAAI,EAAE,SAAS;EACfC,UAAU,EAAE,CAAC,SAAS,CAAC;EACvBC,SAAS,EAAE,CAAC,sBAAsB,CAAC;EACnCC,IAAI,EAAE,IAAI;EACVC,OAAO,EAAE;IACPC,OAAO,EAAE;MACPC,YAAY,EAAE,KAAK;MACnBC,cAAc,EAAE;IAClB;EACF,CAAC;EAED,MAAMC,MAAMA,CAACC,KAAY,EAAEL,OAA6B,EAAwB;IAC9E,MAAMM,aAAa,GAAG,CAACD,KAAK,CAAiB;IAC7C,MAAME,OAAO,GAAGhB,6BAA6B,CAACe,aAAa,EAAEN,OAAO,CAAC;IACrE,OAAO,MAAMV,4BAA4B,CAACiB,OAAO,CAAC;EACpD,CAAC;EAEDC,eAAe,EAAEA,CAACF,aAA+D,EAAEN,OAAO,KACxFT,6BAA6B,CAACe,aAAa,EAAEN,OAAO;AACxD,CAAC"}