@loaders.gl/json 4.0.0-alpha.9 → 4.0.0-beta.2

package/src/geojson-loader.ts

@@ -1,11 +1,11 @@
 // loaders.gl, MIT license
 
 import type {Loader, LoaderWithParser} from '@loaders.gl/loader-utils';
+import type {GeoJSON, GeoJSONTable, TableBatch} from '@loaders.gl/schema';
 import type {JSONLoaderOptions} from './json-loader';
 import {geojsonToBinary} from '@loaders.gl/gis';
-import {parseJSONSync} from './lib/parsers/parse-json';
+// import {parseJSONSync} from './lib/parsers/parse-json';
 import {parseJSONInBatches} from './lib/parsers/parse-json-in-batches';
-import {GeoJSONRowTable} from '@loaders.gl/schema';
 
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
@@ -20,22 +20,10 @@ export type GeoJSONLoaderOptions = JSONLoaderOptions & {
   };
 };
 
-const DEFAULT_GEOJSON_LOADER_OPTIONS = {
-  geojson: {
-    shape: 'object-row-table'
-  },
-  json: {
-    jsonpaths: ['$', '$.features']
-  },
-  gis: {
-    format: 'geojson'
-  }
-};
-
 /**
  * GeoJSON loader
  */
-export const GeoJSONWorkerLoader: Loader = {
+export const GeoJSONWorkerLoader: Loader<GeoJSON, TableBatch, GeoJSONLoaderOptions> = {
   name: 'GeoJSON',
   id: 'geojson',
   module: 'geojson',
@@ -45,39 +33,66 @@ export const GeoJSONWorkerLoader: Loader = {
   mimeTypes: ['application/geo+json'],
   category: 'geometry',
   text: true,
-  options: DEFAULT_GEOJSON_LOADER_OPTIONS
+  options: {
+    geojson: {
+      shape: 'object-row-table'
+    },
+    json: {
+      shape: 'object-row-table',
+      jsonpaths: ['$', '$.features']
+    },
+    gis: {
+      format: 'geojson'
+    }
+  }
 };
 
-export const GeoJSONLoader: LoaderWithParser = {
+export const GeoJSONLoader: LoaderWithParser<GeoJSON, TableBatch, GeoJSONLoaderOptions> = {
   ...GeoJSONWorkerLoader,
+  // @ts-expect-error
   parse,
+  // @ts-expect-error
   parseTextSync,
   parseInBatches
 };
 
-async function parse(arrayBuffer, options) {
+async function parse(arrayBuffer: ArrayBuffer, options?: GeoJSONLoaderOptions) {
   return parseTextSync(new TextDecoder().decode(arrayBuffer), options);
 }
 
-function parseTextSync(text, options) {
+function parseTextSync(text: string, options?: GeoJSONLoaderOptions) {
   // Apps can call the parse method directly, we so apply default options here
-  options = {...DEFAULT_GEOJSON_LOADER_OPTIONS, ...options};
-  options.json = {...DEFAULT_GEOJSON_LOADER_OPTIONS.geojson, ...options.geojson};
+  options = {...GeoJSONLoader.options, ...options};
+  options.geojson = {...GeoJSONLoader.options.geojson, ...options.geojson};
   options.gis = options.gis || {};
-  const table = parseJSONSync(text, options) as GeoJSONRowTable;
-  table.shape = 'geojson-row-table';
+
+  let geojson;
+  try {
+    geojson = JSON.parse(text);
+  } catch {
+    geojson = {};
+  }
+
+  const table: GeoJSONTable = {
+    shape: 'geojson-table',
+    // TODO - deduce schema from geojson
+    // TODO check that parsed data is of type FeatureCollection
+    type: 'FeatureCollection',
+    features: geojson?.features || []
+  };
+
   switch (options.gis.format) {
     case 'binary':
-      return geojsonToBinary(table.data);
+      return geojsonToBinary(table.features);
     default:
       return table;
   }
 }
 
-function parseInBatches(asyncIterator, options): AsyncIterable<any> {
+function parseInBatches(asyncIterator, options): AsyncIterable<TableBatch> {
   // Apps can call the parse method directly, we so apply default options here
-  options = {...DEFAULT_GEOJSON_LOADER_OPTIONS, ...options};
-  options.json = {...DEFAULT_GEOJSON_LOADER_OPTIONS.geojson, ...options.geojson};
+  options = {...GeoJSONLoader.options, ...options};
+  options.json = {...GeoJSONLoader.options.geojson, ...options.geojson};
 
   const geojsonIterator = parseJSONInBatches(asyncIterator, options);
 

package/src/geojson-writer.ts

@@ -1,12 +1,17 @@
 // loaders.gl, MIT license
 // Copyright Foursquare, Inc 20222
 
-import type {Writer} from '@loaders.gl/loader-utils';
+import type {Writer, WriterOptions} from '@loaders.gl/loader-utils';
 import type {Table, TableBatch} from '@loaders.gl/schema';
-import type {GeoJSONWriterOptions} from './lib/encoders/geojson-encoder';
 import {encodeTableAsGeojsonInBatches} from './lib/encoders/geojson-encoder';
 
-export type {GeoJSONWriterOptions};
+export type GeoJSONWriterOptions = WriterOptions & {
+  geojson?: {
+    featureArray?: boolean;
+    geometryColumn?: number | null;
+  };
+  chunkSize?: number;
+};
 
 export const GeoJSONWriter: Writer<Table, TableBatch, GeoJSONWriterOptions> = {
   id: 'geojson',

package/src/json-loader.ts

@@ -10,7 +10,7 @@ import {parseJSONInBatches} from './lib/parsers/parse-json-in-batches';
 const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
 type ParseJSONOptions = {
-  shape?: 'row-table';
+  shape: 'object-row-table'; // TODO - 'auto'?
   table?: boolean;
   jsonpaths?: string[];
 };
@@ -25,7 +25,7 @@ export type JSONLoaderOptions = LoaderOptions & {
 
 const DEFAULT_JSON_LOADER_OPTIONS: {json: Required<ParseJSONOptions>} = {
   json: {
-    shape: 'row-table',
+    shape: 'object-row-table',
     table: false,
     jsonpaths: []
     // batchSize: 'auto'

package/src/json-writer.ts

@@ -2,12 +2,20 @@
 // Copyright 2022 Foursquare Labs, Inc.
 
 /* global TextEncoder */
-import type {Writer} from '@loaders.gl/loader-utils';
+import type {Writer, WriterOptions} from '@loaders.gl/loader-utils';
 import type {Table, TableBatch} from '@loaders.gl/schema';
-import type {JSONWriterOptions} from './lib/encoders/json-encoder';
 import {encodeTableAsJSON} from './lib/encoders/json-encoder';
 
-export type {JSONWriterOptions};
+export type JSONWriterOptions = WriterOptions & {
+  json?: {
+    shape?: 'object-row-table' | 'array-row-table';
+    wrapper?: (table: TableJSON) => unknown;
+  };
+};
+
+type RowArray = unknown[];
+type RowObject = {[key: string]: unknown};
+type TableJSON = RowArray[] | RowObject[];
 
 export const JSONWriter: Writer<Table, TableBatch, JSONWriterOptions> = {
   id: 'json',
@@ -20,5 +28,5 @@ export const JSONWriter: Writer<Table, TableBatch, JSONWriterOptions> = {
   text: true,
   encode: async (table: Table, options: JSONWriterOptions) =>
     new TextEncoder().encode(encodeTableAsJSON(table, options)).buffer,
-  encodeText: (table: Table, options: JSONWriterOptions) => encodeTableAsJSON(table, options)
+  encodeTextSync: (table: Table, options: JSONWriterOptions) => encodeTableAsJSON(table, options)
 };

package/src/lib/encoder-utils/encode-table-row.ts

@@ -0,0 +1,69 @@
+// loaders.gl, MIT license
+// Copyright 2022 Foursquare Labs, Inc.
+
+import {Feature} from '@loaders.gl/schema';
+import {Table, getTableRowAsObject} from '@loaders.gl/schema';
+import {getRowPropertyObject} from './encode-utils';
+import {Utf8ArrayBufferEncoder} from './utf8-encoder';
+
+type Row = {[key: string]: unknown};
+
+// Helpers
+
+/**
+ * Encode a row. Currently this ignores properties in the geometry column.
+ */
+export function encodeTableRow(
+  table: Table,
+  rowIndex: number,
+  geometryColumnIndex: number,
+  utf8Encoder: Utf8ArrayBufferEncoder
+): void {
+  const row = getTableRowAsObject(table, rowIndex);
+  if (!row) return;
+  const featureWithProperties = getFeatureFromRow(table, row, geometryColumnIndex);
+  const featureString = JSON.stringify(featureWithProperties);
+  utf8Encoder.push(featureString);
+}
+
+/**
+ * Encode a row as a Feature. Currently this ignores properties objects in the geometry column.
+ */
+function getFeatureFromRow(table: Table, row: Row, geometryColumnIndex: number): Feature {
+  // Extract non-feature/geometry properties
+  const properties = getRowPropertyObject(table, row, [geometryColumnIndex]);
+
+  // Extract geometry feature
+  const columnName = table.schema?.fields[geometryColumnIndex].name;
+  let featureOrGeometry =
+    columnName && (row[columnName] as {[key: string]: unknown} | string | null | undefined);
+
+  // GeoJSON support null geometries
+  if (!featureOrGeometry) {
+    // @ts-ignore Feature type does not support null geometries
+    return {type: 'Feature', geometry: null, properties};
+  }
+
+  // Support string geometries?
+  // TODO: This assumes GeoJSON strings, which may not be the correct format
+  // (could be WKT, encoded WKB...)
+  if (typeof featureOrGeometry === 'string') {
+    try {
+      featureOrGeometry = JSON.parse(featureOrGeometry);
+    } catch (err) {
+      throw new Error('Invalid string geometry');
+    }
+  }
+
+  if (typeof featureOrGeometry !== 'object' || typeof featureOrGeometry?.type !== 'string') {
+    throw new Error('invalid geometry column value');
+  }
+
+  if (featureOrGeometry?.type === 'Feature') {
+    // @ts-ignore Feature type does not support null geometries
+    return {...featureOrGeometry, properties};
+  }
+
+  // @ts-ignore Feature type does not support null geometries
+  return {type: 'Feature', geometry: featureOrGeometry, properties};
+}

package/src/lib/encoders/geojson-encoder.ts

@@ -1,20 +1,12 @@
 // loaders.gl, MIT license
 // Copyright 2022 Foursquare Labs, Inc.
 
-import {Feature, getTableLength} from '@loaders.gl/schema';
-import {Table, TableBatch, getTableRowAsObject} from '@loaders.gl/schema';
-import {detectGeometryColumnIndex, getRowPropertyObject} from './encode-utils';
-import {Utf8ArrayBufferEncoder} from './utf8-encoder';
-
-type Row = {[key: string]: unknown};
-
-export type GeoJSONWriterOptions = {
-  geojson?: {
-    featureArray?: boolean;
-    geometryColumn?: number | null;
-  };
-  chunkSize?: number;
-};
+import type {TableBatch} from '@loaders.gl/schema';
+import {getTableLength} from '@loaders.gl/schema';
+import {detectGeometryColumnIndex} from '../encoder-utils/encode-utils';
+import {encodeTableRow} from '../encoder-utils/encode-table-row';
+import {Utf8ArrayBufferEncoder} from '../encoder-utils/utf8-encoder';
+import type {GeoJSONWriterOptions} from '../../geojson-writer';
 
 /**
  * Encode a table as GeoJSON
@@ -24,6 +16,7 @@ export async function* encodeTableAsGeojsonInBatches(
   batchIterator: AsyncIterable<TableBatch>, // | Iterable<TableBatch>,
   inputOpts: GeoJSONWriterOptions = {}
 ): AsyncIterable<ArrayBuffer> {
+  // @ts-expect-error
   const options: Required<GeoJSONWriterOptions> = {geojson: {}, chunkSize: 10000, ...inputOpts};
 
   const utf8Encoder = new Utf8ArrayBufferEncoder(options.chunkSize);
@@ -37,12 +30,13 @@ export async function* encodeTableAsGeojsonInBatches(
 
   let isFirstLine = true;
 
-  for await (const batch of batchIterator) {
-    const {table, start, end = getTableLength(batch.table) - start} = batch;
+  let start = 0;
+  for await (const tableBatch of batchIterator) {
+    const end = start + getTableLength(tableBatch);
 
     // Deduce geometry column if not already done
     if (!geometryColumn) {
-      geometryColumn = geometryColumn || detectGeometryColumnIndex(table);
+      geometryColumn = geometryColumn || detectGeometryColumnIndex(tableBatch);
     }
 
     for (let rowIndex = start; rowIndex < end; ++rowIndex) {
@@ -53,13 +47,16 @@ export async function* encodeTableAsGeojsonInBatches(
       utf8Encoder.push('\n');
       isFirstLine = false;
 
-      encodeRow(table, rowIndex, geometryColumn, utf8Encoder);
+      encodeTableRow(tableBatch, rowIndex, geometryColumn, utf8Encoder);
 
       // eslint-disable-next-line max-depth
       if (utf8Encoder.isFull()) {
         yield utf8Encoder.getArrayBufferBatch();
       }
+
+      start = end;
     }
+
     const arrayBufferBatch = utf8Encoder.getArrayBufferBatch();
     if (arrayBufferBatch.byteLength > 0) {
       yield arrayBufferBatch;
@@ -77,63 +74,3 @@ export async function* encodeTableAsGeojsonInBatches(
   // Note: Since we pushed a few final lines, the last batch will always exist, no need to check first
   yield utf8Encoder.getArrayBufferBatch();
 }
-
-// Helpers
-
-/**
- * Encode a row. Currently this ignores properties in the geometry column.
- */
-function encodeRow(
-  table: Table,
-  rowIndex: number,
-  geometryColumnIndex: number,
-  utf8Encoder: Utf8ArrayBufferEncoder
-): void {
-  const row = getTableRowAsObject(table, rowIndex);
-  if (!row) return;
-  const featureWithProperties = getFeatureFromRow(table, row, geometryColumnIndex);
-  const featureString = JSON.stringify(featureWithProperties);
-  utf8Encoder.push(featureString);
-}
-
-/**
- * Encode a row as a Feature. Currently this ignores properties objects in the geometry column.
- */
-function getFeatureFromRow(table: Table, row: Row, geometryColumnIndex: number): Feature {
-  // Extract non-feature/geometry properties
-  const properties = getRowPropertyObject(table, row, [geometryColumnIndex]);
-
-  // Extract geometry feature
-  const columnName = table.schema?.fields[geometryColumnIndex].name;
-  let featureOrGeometry =
-    columnName && (row[columnName] as {[key: string]: unknown} | string | null | undefined);
-
-  // GeoJSON support null geometries
-  if (!featureOrGeometry) {
-    // @ts-ignore Feature type does not support null geometries
-    return {type: 'Feature', geometry: null, properties};
-  }
-
-  // Support string geometries?
-  // TODO: This assumes GeoJSON strings, which may not be the correct format
-  // (could be WKT, encoded WKB...)
-  if (typeof featureOrGeometry === 'string') {
-    try {
-      featureOrGeometry = JSON.parse(featureOrGeometry);
-    } catch (err) {
-      throw new Error('Invalid string geometry');
-    }
-  }
-
-  if (typeof featureOrGeometry !== 'object' || typeof featureOrGeometry?.type !== 'string') {
-    throw new Error('invalid geometry column value');
-  }
-
-  if (featureOrGeometry?.type === 'Feature') {
-    // @ts-ignore Feature type does not support null geometries
-    return {...featureOrGeometry, properties};
-  }
-
-  // @ts-ignore Feature type does not support null geometries
-  return {type: 'Feature', geometry: featureOrGeometry, properties};
-}

package/src/lib/encoders/json-encoder.ts

@@ -2,21 +2,13 @@
 // Copyright 2022 Foursquare Labs, Inc.
 
 import {Table, makeRowIterator} from '@loaders.gl/schema';
-
-type RowArray = unknown[];
-type RowObject = {[key: string]: unknown};
-type TableJSON = RowArray[] | RowObject[];
-
-export type JSONWriterOptions = {
-  shape?: 'object-row-table' | 'array-row-table';
-  wrapper?: (table: TableJSON) => unknown;
-};
+import type {JSONWriterOptions} from '../../json-writer';
 
 /**
  * Encode a table as a JSON string
  */
-export function encodeTableAsJSON(table: Table, options: JSONWriterOptions = {}): string {
-  const shape = options.shape || 'object-row-table';
+export function encodeTableAsJSON(table: Table, options?: JSONWriterOptions): string {
+  const shape = options?.json?.shape || 'object-row-table';
 
   const strings: string[] = [];
   const rowIterator = makeRowIterator(table, shape);

package/src/lib/parsers/parse-json-in-batches.ts

@@ -20,7 +20,8 @@ export async function* parseJSONInBatches(
 
   // TODO fix Schema deduction
   const schema = null; // new Schema([]);
-  const shape = options?.json?.shape || 'row-table';
+  // TODO - detect shape from data?
+  const shape = options?.json?.shape || 'object-row-table';
   // @ts-ignore
   const tableBatchBuilder = new TableBatchBuilder(schema, {
     ...options,

package/src/lib/parsers/parse-ndjson-in-batches.ts

@@ -1,4 +1,4 @@
-import type {Batch} from '@loaders.gl/schema';
+import type {TableBatch} from '@loaders.gl/schema';
 import {TableBatchBuilder} from '@loaders.gl/schema';
 import {
   LoaderOptions,
@@ -10,7 +10,7 @@ import {
 export async function* parseNDJSONInBatches(
   binaryAsyncIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>,
   options?: LoaderOptions
-): AsyncIterable<Batch> {
+): AsyncIterable<TableBatch> {
   const textIterator = makeTextDecoderIterator(binaryAsyncIterator);
   const lineIterator = makeLineIterator(textIterator);
   const numberedLineIterator = makeNumberedLineIterator(lineIterator);

package/src/ndgeoson-loader.ts

@@ -1,11 +1,13 @@
 import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
 import {parseNDJSONSync} from './lib/parsers/parse-ndjson';
 import {parseNDJSONInBatches} from './lib/parsers/parse-ndjson-in-batches';
+import {ArrayRowTable, ObjectRowTable, Batch} from '@loaders.gl/schema';
 
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
+/** Options for NDGeoJSONLoader */
 export type NDGeoJSONLoaderOptions = LoaderOptions & {
   geojson?: {
     shape?: 'object-row-table';
@@ -15,16 +17,12 @@ export type NDGeoJSONLoaderOptions = LoaderOptions & {
   };
 };
 
-const DEFAULT_NDGEOJSON_LOADER_OPTIONS = {
-  geojson: {
-    shape: 'object-row-table'
-  },
-  gis: {
-    format: 'geojson'
-  }
-};
-
-export const NDJSONLoader = {
+/** NDGeoJSONLoader */
+export const NDJSONLoader: LoaderWithParser<
+  ArrayRowTable | ObjectRowTable,
+  Batch,
+  NDGeoJSONLoaderOptions
+> = {
   name: 'NDJSON',
   id: 'ndjson',
   module: 'json',
@@ -42,7 +40,12 @@ export const NDJSONLoader = {
   parse: async (arrayBuffer: ArrayBuffer) => parseNDJSONSync(new TextDecoder().decode(arrayBuffer)),
   parseTextSync: parseNDJSONSync,
   parseInBatches: parseNDJSONInBatches,
-  options: DEFAULT_NDGEOJSON_LOADER_OPTIONS
+  options: {
+    geojson: {
+      shape: 'object-row-table'
+    },
+    gis: {
+      format: 'geojson'
+    }
+  }
 };
-
-export const _typecheckNDJSONLoader: LoaderWithParser = NDJSONLoader;

package/dist/bundle.js

@@ -1,5 +0,0 @@
-"use strict";
-// @ts-nocheck
-const moduleExports = require('./index');
-globalThis.loaders = globalThis.loaders || {};
-module.exports = Object.assign(globalThis.loaders, moduleExports);

package/dist/es5/lib/encoders/encode-utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"encode-utils.js","names":["_schema","require","detectGeometryColumnIndex","table","_table$schema$fields$","_table$schema","geometryIndex","schema","fields","findIndex","field","name","getTableLength","row","getTableRowAsArray","columnIndex","getTableNumCols","value","_typeof2","default","Error","getRowPropertyObject","excludeColumnIndices","arguments","length","undefined","properties","_table$schema2","columnName","includes"],"sources":["../../../../src/lib/encoders/encode-utils.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright 2022 Foursquare Labs, Inc.\n\nimport {Table, getTableLength, getTableNumCols, getTableRowAsArray} from '@loaders.gl/schema';\n\ntype Row = {[key: string]: unknown};\n\n/**\n * Attempts to identify which column contains geometry\n * Currently just returns name (key) of first object-valued column\n * @todo look for hints in schema metadata\n * @todo look for WKB\n */\nexport function detectGeometryColumnIndex(table: Table): number {\n  // TODO - look for hints in schema metadata\n\n  // look for a column named geometry\n  const geometryIndex = table.schema?.fields.findIndex((field) => field.name === 'geometry') ?? -1;\n  if (geometryIndex > -1) {\n    return geometryIndex;\n  }\n\n  // look at the data\n  // TODO - this drags in the indices\n  if (getTableLength(table) > 0) {\n    const row = getTableRowAsArray(table, 0);\n    for (let columnIndex = 0; columnIndex < getTableNumCols(table); columnIndex++) {\n      const value = row?.[columnIndex];\n      if (value && typeof value === 'object') {\n        return columnIndex;\n      }\n    }\n  }\n\n  throw new Error('Failed to detect geometry column');\n}\n\n/**\n * Return a row as a property (key/value) object, excluding selected columns\n */\nexport function getRowPropertyObject(\n  table: Table,\n  row: Row,\n  excludeColumnIndices: number[] = []\n): {[columnName: string]: unknown} {\n  const properties = {};\n  for (let columnIndex = 0; columnIndex < getTableNumCols(table); ++columnIndex) {\n    const columnName = table.schema?.fields[columnIndex].name;\n    if (columnName && !excludeColumnIndices.includes(columnIndex)) {\n      properties[columnName] = row[columnName];\n    }\n  }\n  return properties;\n}\n"],"mappings":";;;;;;;;;AAGA,IAAAA,OAAA,GAAAC,OAAA;AAUO,SAASC,yBAAyBA,CAACC,KAAY,EAAU;EAAA,IAAAC,qBAAA,EAAAC,aAAA;EAI9D,IAAMC,aAAa,IAAAF,qBAAA,IAAAC,aAAA,GAAGF,KAAK,CAACI,MAAM,cAAAF,aAAA,uBAAZA,aAAA,CAAcG,MAAM,CAACC,SAAS,CAAC,UAACC,KAAK;IAAA,OAAKA,KAAK,CAACC,IAAI,KAAK,UAAU;EAAA,EAAC,cAAAP,qBAAA,cAAAA,qBAAA,GAAI,CAAC,CAAC;EAChG,IAAIE,aAAa,GAAG,CAAC,CAAC,EAAE;IACtB,OAAOA,aAAa;EACtB;EAIA,IAAI,IAAAM,sBAAc,EAACT,KAAK,CAAC,GAAG,CAAC,EAAE;IAC7B,IAAMU,GAAG,GAAG,IAAAC,0BAAkB,EAACX,KAAK,EAAE,CAAC,CAAC;IACxC,KAAK,IAAIY,WAAW,GAAG,CAAC,EAAEA,WAAW,GAAG,IAAAC,uBAAe,EAACb,KAAK,CAAC,EAAEY,WAAW,EAAE,EAAE;MAC7E,IAAME,KAAK,GAAGJ,GAAG,aAAHA,GAAG,uBAAHA,GAAG,CAAGE,WAAW,CAAC;MAChC,IAAIE,KAAK,IAAI,IAAAC,QAAA,CAAAC,OAAA,EAAOF,KAAK,MAAK,QAAQ,EAAE;QACtC,OAAOF,WAAW;MACpB;IACF;EACF;EAEA,MAAM,IAAIK,KAAK,CAAC,kCAAkC,CAAC;AACrD;AAKO,SAASC,oBAAoBA,CAClClB,KAAY,EACZU,GAAQ,EAEyB;EAAA,IADjCS,oBAA8B,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,EAAE;EAEnC,IAAMG,UAAU,GAAG,CAAC,CAAC;EACrB,KAAK,IAAIX,WAAW,GAAG,CAAC,EAAEA,WAAW,GAAG,IAAAC,uBAAe,EAACb,KAAK,CAAC,EAAE,EAAEY,WAAW,EAAE;IAAA,IAAAY,cAAA;IAC7E,IAAMC,WAAU,IAAAD,cAAA,GAAGxB,KAAK,CAACI,MAAM,cAAAoB,cAAA,uBAAZA,cAAA,CAAcnB,MAAM,CAACO,WAAW,CAAC,CAACJ,IAAI;IACzD,IAAIiB,WAAU,IAAI,CAACN,oBAAoB,CAACO,QAAQ,CAACd,WAAW,CAAC,EAAE;MAC7DW,UAAU,CAACE,WAAU,CAAC,GAAGf,GAAG,CAACe,WAAU,CAAC;IAC1C;EACF;EACA,OAAOF,UAAU;AACnB"}

package/dist/es5/lib/encoders/utf8-encoder.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utf8-encoder.js","names":["Utf8ArrayBufferEncoder","chunkSize","_classCallCheck2","default","_defineProperty2","TextEncoder","_createClass2","key","value","push","_len","arguments","length","strings","Array","_key","_i","_strings","string","totalLength","isFull","getArrayBufferBatch","textEncoder","encode","getStringBatch","buffer","stringChunk","join","exports"],"sources":["../../../../src/lib/encoders/utf8-encoder.ts"],"sourcesContent":["// loaders.gl, MIT License\n\n/* global TextEncoder */\nexport class Utf8ArrayBufferEncoder {\n  private readonly chunkSize: number;\n  private strings: string[] = [];\n  private totalLength = 0;\n  private textEncoder: TextEncoder = new TextEncoder();\n\n  constructor(chunkSize: number) {\n    this.chunkSize = chunkSize;\n  }\n\n  push(...strings: string[]): void {\n    for (const string of strings) {\n      this.strings.push(string);\n      this.totalLength += string.length;\n    }\n  }\n\n  isFull(): boolean {\n    return this.totalLength >= this.chunkSize;\n  }\n\n  getArrayBufferBatch(): ArrayBufferLike {\n    return this.textEncoder.encode(this.getStringBatch()).buffer;\n  }\n\n  getStringBatch(): string {\n    const stringChunk = this.strings.join('');\n    this.strings = [];\n    this.totalLength = 0;\n    return stringChunk;\n  }\n}\n"],"mappings":";;;;;;;;;;IAGaA,sBAAsB;EAMjC,SAAAA,uBAAYC,SAAiB,EAAE;IAAA,IAAAC,gBAAA,CAAAC,OAAA,QAAAH,sBAAA;IAAA,IAAAI,gBAAA,CAAAD,OAAA;IAAA,IAAAC,gBAAA,CAAAD,OAAA,mBAJH,EAAE;IAAA,IAAAC,gBAAA,CAAAD,OAAA,uBACR,CAAC;IAAA,IAAAC,gBAAA,CAAAD,OAAA,uBACY,IAAIE,WAAW,CAAC,CAAC;IAGlD,IAAI,CAACJ,SAAS,GAAGA,SAAS;EAC5B;EAAC,IAAAK,aAAA,CAAAH,OAAA,EAAAH,sBAAA;IAAAO,GAAA;IAAAC,KAAA,EAED,SAAAC,KAAA,EAAiC;MAAA,SAAAC,IAAA,GAAAC,SAAA,CAAAC,MAAA,EAAzBC,OAAO,OAAAC,KAAA,CAAAJ,IAAA,GAAAK,IAAA,MAAAA,IAAA,GAAAL,IAAA,EAAAK,IAAA;QAAPF,OAAO,CAAAE,IAAA,IAAAJ,SAAA,CAAAI,IAAA;MAAA;MACb,SAAAC,EAAA,MAAAC,QAAA,GAAqBJ,OAAO,EAAAG,EAAA,GAAAC,QAAA,CAAAL,MAAA,EAAAI,EAAA,IAAE;QAAzB,IAAME,MAAM,GAAAD,QAAA,CAAAD,EAAA;QACf,IAAI,CAACH,OAAO,CAACJ,IAAI,CAACS,MAAM,CAAC;QACzB,IAAI,CAACC,WAAW,IAAID,MAAM,CAACN,MAAM;MACnC;IACF;EAAC;IAAAL,GAAA;IAAAC,KAAA,EAED,SAAAY,OAAA,EAAkB;MAChB,OAAO,IAAI,CAACD,WAAW,IAAI,IAAI,CAAClB,SAAS;IAC3C;EAAC;IAAAM,GAAA;IAAAC,KAAA,EAED,SAAAa,oBAAA,EAAuC;MACrC,OAAO,IAAI,CAACC,WAAW,CAACC,MAAM,CAAC,IAAI,CAACC,cAAc,CAAC,CAAC,CAAC,CAACC,MAAM;IAC9D;EAAC;IAAAlB,GAAA;IAAAC,KAAA,EAED,SAAAgB,eAAA,EAAyB;MACvB,IAAME,WAAW,GAAG,IAAI,CAACb,OAAO,CAACc,IAAI,CAAC,EAAE,CAAC;MACzC,IAAI,CAACd,OAAO,GAAG,EAAE;MACjB,IAAI,CAACM,WAAW,GAAG,CAAC;MACpB,OAAOO,WAAW;IACpB;EAAC;EAAA,OAAA1B,sBAAA;AAAA;AAAA4B,OAAA,CAAA5B,sBAAA,GAAAA,sBAAA"}

package/dist/esm/lib/encoders/encode-utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"encode-utils.js","names":["getTableLength","getTableNumCols","getTableRowAsArray","detectGeometryColumnIndex","table","_table$schema$fields$","_table$schema","geometryIndex","schema","fields","findIndex","field","name","row","columnIndex","value","Error","getRowPropertyObject","excludeColumnIndices","arguments","length","undefined","properties","_table$schema2","columnName","includes"],"sources":["../../../../src/lib/encoders/encode-utils.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright 2022 Foursquare Labs, Inc.\n\nimport {Table, getTableLength, getTableNumCols, getTableRowAsArray} from '@loaders.gl/schema';\n\ntype Row = {[key: string]: unknown};\n\n/**\n * Attempts to identify which column contains geometry\n * Currently just returns name (key) of first object-valued column\n * @todo look for hints in schema metadata\n * @todo look for WKB\n */\nexport function detectGeometryColumnIndex(table: Table): number {\n  // TODO - look for hints in schema metadata\n\n  // look for a column named geometry\n  const geometryIndex = table.schema?.fields.findIndex((field) => field.name === 'geometry') ?? -1;\n  if (geometryIndex > -1) {\n    return geometryIndex;\n  }\n\n  // look at the data\n  // TODO - this drags in the indices\n  if (getTableLength(table) > 0) {\n    const row = getTableRowAsArray(table, 0);\n    for (let columnIndex = 0; columnIndex < getTableNumCols(table); columnIndex++) {\n      const value = row?.[columnIndex];\n      if (value && typeof value === 'object') {\n        return columnIndex;\n      }\n    }\n  }\n\n  throw new Error('Failed to detect geometry column');\n}\n\n/**\n * Return a row as a property (key/value) object, excluding selected columns\n */\nexport function getRowPropertyObject(\n  table: Table,\n  row: Row,\n  excludeColumnIndices: number[] = []\n): {[columnName: string]: unknown} {\n  const properties = {};\n  for (let columnIndex = 0; columnIndex < getTableNumCols(table); ++columnIndex) {\n    const columnName = table.schema?.fields[columnIndex].name;\n    if (columnName && !excludeColumnIndices.includes(columnIndex)) {\n      properties[columnName] = row[columnName];\n    }\n  }\n  return properties;\n}\n"],"mappings":"AAGA,SAAeA,cAAc,EAAEC,eAAe,EAAEC,kBAAkB,QAAO,oBAAoB;AAU7F,OAAO,SAASC,yBAAyBA,CAACC,KAAY,EAAU;EAAA,IAAAC,qBAAA,EAAAC,aAAA;EAI9D,MAAMC,aAAa,IAAAF,qBAAA,IAAAC,aAAA,GAAGF,KAAK,CAACI,MAAM,cAAAF,aAAA,uBAAZA,aAAA,CAAcG,MAAM,CAACC,SAAS,CAAEC,KAAK,IAAKA,KAAK,CAACC,IAAI,KAAK,UAAU,CAAC,cAAAP,qBAAA,cAAAA,qBAAA,GAAI,CAAC,CAAC;EAChG,IAAIE,aAAa,GAAG,CAAC,CAAC,EAAE;IACtB,OAAOA,aAAa;EACtB;EAIA,IAAIP,cAAc,CAACI,KAAK,CAAC,GAAG,CAAC,EAAE;IAC7B,MAAMS,GAAG,GAAGX,kBAAkB,CAACE,KAAK,EAAE,CAAC,CAAC;IACxC,KAAK,IAAIU,WAAW,GAAG,CAAC,EAAEA,WAAW,GAAGb,eAAe,CAACG,KAAK,CAAC,EAAEU,WAAW,EAAE,EAAE;MAC7E,MAAMC,KAAK,GAAGF,GAAG,aAAHA,GAAG,uBAAHA,GAAG,CAAGC,WAAW,CAAC;MAChC,IAAIC,KAAK,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;QACtC,OAAOD,WAAW;MACpB;IACF;EACF;EAEA,MAAM,IAAIE,KAAK,CAAC,kCAAkC,CAAC;AACrD;AAKA,OAAO,SAASC,oBAAoBA,CAClCb,KAAY,EACZS,GAAQ,EAEyB;EAAA,IADjCK,oBAA8B,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,EAAE;EAEnC,MAAMG,UAAU,GAAG,CAAC,CAAC;EACrB,KAAK,IAAIR,WAAW,GAAG,CAAC,EAAEA,WAAW,GAAGb,eAAe,CAACG,KAAK,CAAC,EAAE,EAAEU,WAAW,EAAE;IAAA,IAAAS,cAAA;IAC7E,MAAMC,UAAU,IAAAD,cAAA,GAAGnB,KAAK,CAACI,MAAM,cAAAe,cAAA,uBAAZA,cAAA,CAAcd,MAAM,CAACK,WAAW,CAAC,CAACF,IAAI;IACzD,IAAIY,UAAU,IAAI,CAACN,oBAAoB,CAACO,QAAQ,CAACX,WAAW,CAAC,EAAE;MAC7DQ,UAAU,CAACE,UAAU,CAAC,GAAGX,GAAG,CAACW,UAAU,CAAC;IAC1C;EACF;EACA,OAAOF,UAAU;AACnB"}

package/dist/esm/lib/encoders/utf8-encoder.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utf8-encoder.js","names":["Utf8ArrayBufferEncoder","constructor","chunkSize","_defineProperty","TextEncoder","push","_len","arguments","length","strings","Array","_key","string","totalLength","isFull","getArrayBufferBatch","textEncoder","encode","getStringBatch","buffer","stringChunk","join"],"sources":["../../../../src/lib/encoders/utf8-encoder.ts"],"sourcesContent":["// loaders.gl, MIT License\n\n/* global TextEncoder */\nexport class Utf8ArrayBufferEncoder {\n  private readonly chunkSize: number;\n  private strings: string[] = [];\n  private totalLength = 0;\n  private textEncoder: TextEncoder = new TextEncoder();\n\n  constructor(chunkSize: number) {\n    this.chunkSize = chunkSize;\n  }\n\n  push(...strings: string[]): void {\n    for (const string of strings) {\n      this.strings.push(string);\n      this.totalLength += string.length;\n    }\n  }\n\n  isFull(): boolean {\n    return this.totalLength >= this.chunkSize;\n  }\n\n  getArrayBufferBatch(): ArrayBufferLike {\n    return this.textEncoder.encode(this.getStringBatch()).buffer;\n  }\n\n  getStringBatch(): string {\n    const stringChunk = this.strings.join('');\n    this.strings = [];\n    this.totalLength = 0;\n    return stringChunk;\n  }\n}\n"],"mappings":";AAGA,OAAO,MAAMA,sBAAsB,CAAC;EAMlCC,WAAWA,CAACC,SAAiB,EAAE;IAAAC,eAAA;IAAAA,eAAA,kBAJH,EAAE;IAAAA,eAAA,sBACR,CAAC;IAAAA,eAAA,sBACY,IAAIC,WAAW,CAAC,CAAC;IAGlD,IAAI,CAACF,SAAS,GAAGA,SAAS;EAC5B;EAEAG,IAAIA,CAAA,EAA6B;IAAA,SAAAC,IAAA,GAAAC,SAAA,CAAAC,MAAA,EAAzBC,OAAO,OAAAC,KAAA,CAAAJ,IAAA,GAAAK,IAAA,MAAAA,IAAA,GAAAL,IAAA,EAAAK,IAAA;MAAPF,OAAO,CAAAE,IAAA,IAAAJ,SAAA,CAAAI,IAAA;IAAA;IACb,KAAK,MAAMC,MAAM,IAAIH,OAAO,EAAE;MAC5B,IAAI,CAACA,OAAO,CAACJ,IAAI,CAACO,MAAM,CAAC;MACzB,IAAI,CAACC,WAAW,IAAID,MAAM,CAACJ,MAAM;IACnC;EACF;EAEAM,MAAMA,CAAA,EAAY;IAChB,OAAO,IAAI,CAACD,WAAW,IAAI,IAAI,CAACX,SAAS;EAC3C;EAEAa,mBAAmBA,CAAA,EAAoB;IACrC,OAAO,IAAI,CAACC,WAAW,CAACC,MAAM,CAAC,IAAI,CAACC,cAAc,CAAC,CAAC,CAAC,CAACC,MAAM;EAC9D;EAEAD,cAAcA,CAAA,EAAW;IACvB,MAAME,WAAW,GAAG,IAAI,CAACX,OAAO,CAACY,IAAI,CAAC,EAAE,CAAC;IACzC,IAAI,CAACZ,OAAO,GAAG,EAAE;IACjB,IAAI,CAACI,WAAW,GAAG,CAAC;IACpB,OAAOO,WAAW;EACpB;AACF"}

package/dist/geojson-loader.js

@@ -1,77 +0,0 @@
-"use strict";
-// loaders.gl, MIT license
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GeoJSONLoader = exports.GeoJSONWorkerLoader = void 0;
-const gis_1 = require("@loaders.gl/gis");
-const parse_json_1 = require("./lib/parsers/parse-json");
-const parse_json_in_batches_1 = require("./lib/parsers/parse-json-in-batches");
-// __VERSION__ is injected by babel-plugin-version-inline
-// @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
-const DEFAULT_GEOJSON_LOADER_OPTIONS = {
-    geojson: {
-        shape: 'object-row-table'
-    },
-    json: {
-        jsonpaths: ['$', '$.features']
-    },
-    gis: {
-        format: 'geojson'
-    }
-};
-/**
- * GeoJSON loader
- */
-exports.GeoJSONWorkerLoader = {
-    name: 'GeoJSON',
-    id: 'geojson',
-    module: 'geojson',
-    version: VERSION,
-    worker: true,
-    extensions: ['geojson'],
-    mimeTypes: ['application/geo+json'],
-    category: 'geometry',
-    text: true,
-    options: DEFAULT_GEOJSON_LOADER_OPTIONS
-};
-exports.GeoJSONLoader = {
-    ...exports.GeoJSONWorkerLoader,
-    parse,
-    parseTextSync,
-    parseInBatches
-};
-async function parse(arrayBuffer, options) {
-    return parseTextSync(new TextDecoder().decode(arrayBuffer), options);
-}
-function parseTextSync(text, options) {
-    // Apps can call the parse method directly, we so apply default options here
-    options = { ...DEFAULT_GEOJSON_LOADER_OPTIONS, ...options };
-    options.json = { ...DEFAULT_GEOJSON_LOADER_OPTIONS.geojson, ...options.geojson };
-    options.gis = options.gis || {};
-    const table = (0, parse_json_1.parseJSONSync)(text, options);
-    table.shape = 'geojson-row-table';
-    switch (options.gis.format) {
-        case 'binary':
-            return (0, gis_1.geojsonToBinary)(table.data);
-        default:
-            return table;
-    }
-}
-function parseInBatches(asyncIterator, options) {
-    // Apps can call the parse method directly, we so apply default options here
-    options = { ...DEFAULT_GEOJSON_LOADER_OPTIONS, ...options };
-    options.json = { ...DEFAULT_GEOJSON_LOADER_OPTIONS.geojson, ...options.geojson };
-    const geojsonIterator = (0, parse_json_in_batches_1.parseJSONInBatches)(asyncIterator, options);
-    switch (options.gis.format) {
-        case 'binary':
-            return makeBinaryGeometryIterator(geojsonIterator);
-        default:
-            return geojsonIterator;
-    }
-}
-async function* makeBinaryGeometryIterator(geojsonIterator) {
-    for await (const batch of geojsonIterator) {
-        batch.data = (0, gis_1.geojsonToBinary)(batch.data);
-        yield batch;
-    }
-}

package/dist/geojson-writer.js

@@ -1,22 +0,0 @@
-"use strict";
-// loaders.gl, MIT license
-// Copyright Foursquare, Inc 20222
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GeoJSONWriter = void 0;
-const geojson_encoder_1 = require("./lib/encoders/geojson-encoder");
-exports.GeoJSONWriter = {
-    id: 'geojson',
-    version: 'latest',
-    module: 'geojson',
-    name: 'GeoJSON',
-    extensions: ['geojson'],
-    mimeTypes: ['application/geo+json'],
-    options: {
-        geojson: {
-            featureArray: false,
-            geometryColumn: null
-        }
-    },
-    text: true,
-    encodeInBatches: (tableIterator, options) => (0, geojson_encoder_1.encodeTableAsGeojsonInBatches)(tableIterator, options)
-};