@loaders.gl/json 4.0.0-alpha.24 → 4.0.0-alpha.25

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

@@ -1 +1 @@
-{"version":3,"file":"geojson-encoder.js","names":["getTableLength","getTableRowAsObject","detectGeometryColumnIndex","getRowPropertyObject","Utf8ArrayBufferEncoder","encodeTableAsGeojsonInBatches","batchIterator","inputOpts","arguments","length","undefined","options","geojson","chunkSize","utf8Encoder","featureArray","push","geometryColumn","isFirstLine","batch","table","start","end","rowIndex","encodeRow","isFull","getArrayBufferBatch","arrayBufferBatch","byteLength","e","Promise","reject","geometryColumnIndex","row","featureWithProperties","getFeatureFromRow","featureString","JSON","stringify","_table$schema","_featureOrGeometry","_featureOrGeometry2","properties","columnName","schema","fields","name","featureOrGeometry","type","geometry","parse","err","Error"],"sources":["../../../../src/lib/encoders/geojson-encoder.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright 2022 Foursquare Labs, Inc.\n\nimport {Feature, getTableLength} from '@loaders.gl/schema';\nimport {Table, TableBatch, getTableRowAsObject} from '@loaders.gl/schema';\nimport {detectGeometryColumnIndex, getRowPropertyObject} from './encode-utils';\nimport {Utf8ArrayBufferEncoder} from './utf8-encoder';\n\ntype Row = {[key: string]: unknown};\n\nexport type GeoJSONWriterOptions = {\n  geojson?: {\n    featureArray?: boolean;\n    geometryColumn?: number | null;\n  };\n  chunkSize?: number;\n};\n\n/**\n * Encode a table as GeoJSON\n */\n// eslint-disable-next-line max-statements\nexport async function* encodeTableAsGeojsonInBatches(\n  batchIterator: AsyncIterable<TableBatch>, // | Iterable<TableBatch>,\n  inputOpts: GeoJSONWriterOptions = {}\n): AsyncIterable<ArrayBuffer> {\n  const options: Required<GeoJSONWriterOptions> = {geojson: {}, chunkSize: 10000, ...inputOpts};\n\n  const utf8Encoder = new Utf8ArrayBufferEncoder(options.chunkSize);\n\n  if (!options.geojson.featureArray) {\n    utf8Encoder.push('{\\n', '\"type\": \"FeatureCollection\",\\n', '\"features\":\\n');\n  }\n  utf8Encoder.push('['); // Note no newline\n\n  let geometryColumn = options.geojson.geometryColumn;\n\n  let isFirstLine = true;\n\n  for await (const batch of batchIterator) {\n    const {table, start, end = getTableLength(batch.table) - start} = batch;\n\n    // Deduce geometry column if not already done\n    if (!geometryColumn) {\n      geometryColumn = geometryColumn || detectGeometryColumnIndex(table);\n    }\n\n    for (let rowIndex = start; rowIndex < end; ++rowIndex) {\n      // Add a comma except on final feature\n      if (!isFirstLine) {\n        utf8Encoder.push(',');\n      }\n      utf8Encoder.push('\\n');\n      isFirstLine = false;\n\n      encodeRow(table, rowIndex, geometryColumn, utf8Encoder);\n\n      // eslint-disable-next-line max-depth\n      if (utf8Encoder.isFull()) {\n        yield utf8Encoder.getArrayBufferBatch();\n      }\n    }\n    const arrayBufferBatch = utf8Encoder.getArrayBufferBatch();\n    if (arrayBufferBatch.byteLength > 0) {\n      yield arrayBufferBatch;\n    }\n  }\n\n  utf8Encoder.push('\\n');\n\n  // Add completing rows and emit final batch\n  utf8Encoder.push(']\\n');\n  if (!options.geojson.featureArray) {\n    utf8Encoder.push('}');\n  }\n\n  // Note: Since we pushed a few final lines, the last batch will always exist, no need to check first\n  yield utf8Encoder.getArrayBufferBatch();\n}\n\n// Helpers\n\n/**\n * Encode a row. Currently this ignores properties in the geometry column.\n */\nfunction encodeRow(\n  table: Table,\n  rowIndex: number,\n  geometryColumnIndex: number,\n  utf8Encoder: Utf8ArrayBufferEncoder\n): void {\n  const row = getTableRowAsObject(table, rowIndex);\n  if (!row) return;\n  const featureWithProperties = getFeatureFromRow(table, row, geometryColumnIndex);\n  const featureString = JSON.stringify(featureWithProperties);\n  utf8Encoder.push(featureString);\n}\n\n/**\n * Encode a row as a Feature. Currently this ignores properties objects in the geometry column.\n */\nfunction getFeatureFromRow(table: Table, row: Row, geometryColumnIndex: number): Feature {\n  // Extract non-feature/geometry properties\n  const properties = getRowPropertyObject(table, row, [geometryColumnIndex]);\n\n  // Extract geometry feature\n  const columnName = table.schema?.fields[geometryColumnIndex].name;\n  let featureOrGeometry =\n    columnName && (row[columnName] as {[key: string]: unknown} | string | null | undefined);\n\n  // GeoJSON support null geometries\n  if (!featureOrGeometry) {\n    // @ts-ignore Feature type does not support null geometries\n    return {type: 'Feature', geometry: null, properties};\n  }\n\n  // Support string geometries?\n  // TODO: This assumes GeoJSON strings, which may not be the correct format\n  // (could be WKT, encoded WKB...)\n  if (typeof featureOrGeometry === 'string') {\n    try {\n      featureOrGeometry = JSON.parse(featureOrGeometry);\n    } catch (err) {\n      throw new Error('Invalid string geometry');\n    }\n  }\n\n  if (typeof featureOrGeometry !== 'object' || typeof featureOrGeometry?.type !== 'string') {\n    throw new Error('invalid geometry column value');\n  }\n\n  if (featureOrGeometry?.type === 'Feature') {\n    // @ts-ignore Feature type does not support null geometries\n    return {...featureOrGeometry, properties};\n  }\n\n  // @ts-ignore Feature type does not support null geometries\n  return {type: 'Feature', geometry: featureOrGeometry, properties};\n}\n"],"mappings":"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"}
+{"version":3,"file":"geojson-encoder.js","names":["getTableLength","detectGeometryColumnIndex","encodeTableRow","Utf8ArrayBufferEncoder","encodeTableAsGeojsonInBatches","batchIterator","inputOpts","arguments","length","undefined","options","geojson","chunkSize","utf8Encoder","featureArray","push","geometryColumn","isFirstLine","start","tableBatch","end","rowIndex","isFull","getArrayBufferBatch","arrayBufferBatch","byteLength","e","Promise","reject"],"sources":["../../../../src/lib/encoders/geojson-encoder.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright 2022 Foursquare Labs, Inc.\n\nimport type {TableBatch} from '@loaders.gl/schema';\nimport {getTableLength} from '@loaders.gl/schema';\nimport {detectGeometryColumnIndex} from '../encoder-utils/encode-utils';\nimport {encodeTableRow} from '../encoder-utils/encode-table-row';\nimport {Utf8ArrayBufferEncoder} from '../encoder-utils/utf8-encoder';\nimport type {GeoJSONWriterOptions} from '../../geojson-writer';\n\n/**\n * Encode a table as GeoJSON\n */\n// eslint-disable-next-line max-statements\nexport async function* encodeTableAsGeojsonInBatches(\n  batchIterator: AsyncIterable<TableBatch>, // | Iterable<TableBatch>,\n  inputOpts: GeoJSONWriterOptions = {}\n): AsyncIterable<ArrayBuffer> {\n  // @ts-expect-error\n  const options: Required<GeoJSONWriterOptions> = {geojson: {}, chunkSize: 10000, ...inputOpts};\n\n  const utf8Encoder = new Utf8ArrayBufferEncoder(options.chunkSize);\n\n  if (!options.geojson.featureArray) {\n    utf8Encoder.push('{\\n', '\"type\": \"FeatureCollection\",\\n', '\"features\":\\n');\n  }\n  utf8Encoder.push('['); // Note no newline\n\n  let geometryColumn = options.geojson.geometryColumn;\n\n  let isFirstLine = true;\n\n  let start = 0;\n  for await (const tableBatch of batchIterator) {\n    const end = start + getTableLength(tableBatch);\n\n    // Deduce geometry column if not already done\n    if (!geometryColumn) {\n      geometryColumn = geometryColumn || detectGeometryColumnIndex(tableBatch);\n    }\n\n    for (let rowIndex = start; rowIndex < end; ++rowIndex) {\n      // Add a comma except on final feature\n      if (!isFirstLine) {\n        utf8Encoder.push(',');\n      }\n      utf8Encoder.push('\\n');\n      isFirstLine = false;\n\n      encodeTableRow(tableBatch, rowIndex, geometryColumn, utf8Encoder);\n\n      // eslint-disable-next-line max-depth\n      if (utf8Encoder.isFull()) {\n        yield utf8Encoder.getArrayBufferBatch();\n      }\n\n      start = end;\n    }\n\n    const arrayBufferBatch = utf8Encoder.getArrayBufferBatch();\n    if (arrayBufferBatch.byteLength > 0) {\n      yield arrayBufferBatch;\n    }\n  }\n\n  utf8Encoder.push('\\n');\n\n  // Add completing rows and emit final batch\n  utf8Encoder.push(']\\n');\n  if (!options.geojson.featureArray) {\n    utf8Encoder.push('}');\n  }\n\n  // Note: Since we pushed a few final lines, the last batch will always exist, no need to check first\n  yield utf8Encoder.getArrayBufferBatch();\n}\n"],"mappings":"AAIA,SAAQA,cAAc,QAAO,oBAAoB;AACjD,SAAQC,yBAAyB,QAAO,+BAA+B;AACvE,SAAQC,cAAc,QAAO,mCAAmC;AAChE,SAAQC,sBAAsB,QAAO,+BAA+B;AAOpE,OAAO,SAAgBC,6BAA6BA,CAClDC,aAAwC;EAAA;IAAA,IACxCC,SAA+B,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;IAAA,0BACR;MAE5B,MAAMG,OAAuC,GAAG;QAACC,OAAO,EAAE,CAAC,CAAC;QAAEC,SAAS,EAAE,KAAK;QAAE,GAAGN;MAAS,CAAC;MAE7F,MAAMO,WAAW,GAAG,IAAIV,sBAAsB,CAACO,OAAO,CAACE,SAAS,CAAC;MAEjE,IAAI,CAACF,OAAO,CAACC,OAAO,CAACG,YAAY,EAAE;QACjCD,WAAW,CAACE,IAAI,CAAC,KAAK,EAAE,gCAAgC,EAAE,eAAe,CAAC;MAC5E;MACAF,WAAW,CAACE,IAAI,CAAC,GAAG,CAAC;MAErB,IAAIC,cAAc,GAAGN,OAAO,CAACC,OAAO,CAACK,cAAc;MAEnD,IAAIC,WAAW,GAAG,IAAI;MAEtB,IAAIC,KAAK,GAAG,CAAC;MACb,WAAW,MAAMC,UAAU,IAAId,aAAa,EAAE;QAC5C,MAAMe,GAAG,GAAGF,KAAK,GAAGlB,cAAc,CAACmB,UAAU,CAAC;QAG9C,IAAI,CAACH,cAAc,EAAE;UACnBA,cAAc,GAAGA,cAAc,IAAIf,yBAAyB,CAACkB,UAAU,CAAC;QAC1E;QAEA,KAAK,IAAIE,QAAQ,GAAGH,KAAK,EAAEG,QAAQ,GAAGD,GAAG,EAAE,EAAEC,QAAQ,EAAE;UAErD,IAAI,CAACJ,WAAW,EAAE;YAChBJ,WAAW,CAACE,IAAI,CAAC,GAAG,CAAC;UACvB;UACAF,WAAW,CAACE,IAAI,CAAC,IAAI,CAAC;UACtBE,WAAW,GAAG,KAAK;UAEnBf,cAAc,CAACiB,UAAU,EAAEE,QAAQ,EAAEL,cAAc,EAAEH,WAAW,CAAC;UAGjE,IAAIA,WAAW,CAACS,MAAM,CAAC,CAAC,EAAE;YACxB,MAAMT,WAAW,CAACU,mBAAmB,CAAC,CAAC;UACzC;UAEAL,KAAK,GAAGE,GAAG;QACb;QAEA,MAAMI,gBAAgB,GAAGX,WAAW,CAACU,mBAAmB,CAAC,CAAC;QAC1D,IAAIC,gBAAgB,CAACC,UAAU,GAAG,CAAC,EAAE;UACnC,MAAMD,gBAAgB;QACxB;MACF;MAEAX,WAAW,CAACE,IAAI,CAAC,IAAI,CAAC;MAGtBF,WAAW,CAACE,IAAI,CAAC,KAAK,CAAC;MACvB,IAAI,CAACL,OAAO,CAACC,OAAO,CAACG,YAAY,EAAE;QACjCD,WAAW,CAACE,IAAI,CAAC,GAAG,CAAC;MACvB;MAGA,MAAMF,WAAW,CAACU,mBAAmB,CAAC,CAAC;IACzC,CAAC;EAAA,SAAAG,CAAA;IAAA,OAAAC,OAAA,CAAAC,MAAA,CAAAF,CAAA;EAAA;AAAA"}

package/dist/esm/lib/encoders/json-encoder.js

@@ -1,7 +1,7 @@
 import { makeRowIterator } from '@loaders.gl/schema';
-export function encodeTableAsJSON(table) {
-  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  const shape = options.shape || 'object-row-table';
+export function encodeTableAsJSON(table, options) {
+  var _options$json;
+  const shape = (options === null || options === void 0 ? void 0 : (_options$json = options.json) === null || _options$json === void 0 ? void 0 : _options$json.shape) || 'object-row-table';
   const strings = [];
   const rowIterator = makeRowIterator(table, shape);
   for (const row of rowIterator) {

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

@@ -1 +1 @@
-{"version":3,"file":"json-encoder.js","names":["makeRowIterator","encodeTableAsJSON","table","options","arguments","length","undefined","shape","strings","rowIterator","row","push","JSON","stringify","concat","join"],"sources":["../../../../src/lib/encoders/json-encoder.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright 2022 Foursquare Labs, Inc.\n\nimport {Table, makeRowIterator} from '@loaders.gl/schema';\n\ntype RowArray = unknown[];\ntype RowObject = {[key: string]: unknown};\ntype TableJSON = RowArray[] | RowObject[];\n\nexport type JSONWriterOptions = {\n  shape?: 'object-row-table' | 'array-row-table';\n  wrapper?: (table: TableJSON) => unknown;\n};\n\n/**\n * Encode a table as a JSON string\n */\nexport function encodeTableAsJSON(table: Table, options: JSONWriterOptions = {}): string {\n  const shape = options.shape || 'object-row-table';\n\n  const strings: string[] = [];\n  const rowIterator = makeRowIterator(table, shape);\n  for (const row of rowIterator) {\n    // Round elements etc\n    // processRow(wrappedRow, table.schema);\n    // const wrappedRow = options.wrapper ? options.wrapper(row) : row;\n    strings.push(JSON.stringify(row));\n  }\n  return `[${strings.join(',')}]`;\n}\n"],"mappings":"AAGA,SAAeA,eAAe,QAAO,oBAAoB;AAczD,OAAO,SAASC,iBAAiBA,CAACC,KAAY,EAA2C;EAAA,IAAzCC,OAA0B,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EAC7E,MAAMG,KAAK,GAAGJ,OAAO,CAACI,KAAK,IAAI,kBAAkB;EAEjD,MAAMC,OAAiB,GAAG,EAAE;EAC5B,MAAMC,WAAW,GAAGT,eAAe,CAACE,KAAK,EAAEK,KAAK,CAAC;EACjD,KAAK,MAAMG,GAAG,IAAID,WAAW,EAAE;IAI7BD,OAAO,CAACG,IAAI,CAACC,IAAI,CAACC,SAAS,CAACH,GAAG,CAAC,CAAC;EACnC;EACA,WAAAI,MAAA,CAAWN,OAAO,CAACO,IAAI,CAAC,GAAG,CAAC;AAC9B"}
+{"version":3,"file":"json-encoder.js","names":["makeRowIterator","encodeTableAsJSON","table","options","_options$json","shape","json","strings","rowIterator","row","push","JSON","stringify","concat","join"],"sources":["../../../../src/lib/encoders/json-encoder.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright 2022 Foursquare Labs, Inc.\n\nimport {Table, makeRowIterator} from '@loaders.gl/schema';\nimport type {JSONWriterOptions} from '../../json-writer';\n\n/**\n * Encode a table as a JSON string\n */\nexport function encodeTableAsJSON(table: Table, options?: JSONWriterOptions): string {\n  const shape = options?.json?.shape || 'object-row-table';\n\n  const strings: string[] = [];\n  const rowIterator = makeRowIterator(table, shape);\n  for (const row of rowIterator) {\n    // Round elements etc\n    // processRow(wrappedRow, table.schema);\n    // const wrappedRow = options.wrapper ? options.wrapper(row) : row;\n    strings.push(JSON.stringify(row));\n  }\n  return `[${strings.join(',')}]`;\n}\n"],"mappings":"AAGA,SAAeA,eAAe,QAAO,oBAAoB;AAMzD,OAAO,SAASC,iBAAiBA,CAACC,KAAY,EAAEC,OAA2B,EAAU;EAAA,IAAAC,aAAA;EACnF,MAAMC,KAAK,GAAG,CAAAF,OAAO,aAAPA,OAAO,wBAAAC,aAAA,GAAPD,OAAO,CAAEG,IAAI,cAAAF,aAAA,uBAAbA,aAAA,CAAeC,KAAK,KAAI,kBAAkB;EAExD,MAAME,OAAiB,GAAG,EAAE;EAC5B,MAAMC,WAAW,GAAGR,eAAe,CAACE,KAAK,EAAEG,KAAK,CAAC;EACjD,KAAK,MAAMI,GAAG,IAAID,WAAW,EAAE;IAI7BD,OAAO,CAACG,IAAI,CAACC,IAAI,CAACC,SAAS,CAACH,GAAG,CAAC,CAAC;EACnC;EACA,WAAAI,MAAA,CAAWN,OAAO,CAACO,IAAI,CAAC,GAAG,CAAC;AAC9B"}

package/dist/esm/ndgeoson-loader.js

@@ -1,6 +1,6 @@
 import { parseNDJSONSync } from './lib/parsers/parse-ndjson';
 import { parseNDJSONInBatches } from './lib/parsers/parse-ndjson-in-batches';
-const VERSION = typeof "4.0.0-alpha.24" !== 'undefined' ? "4.0.0-alpha.24" : 'latest';
+const VERSION = typeof "4.0.0-alpha.25" !== 'undefined' ? "4.0.0-alpha.25" : 'latest';
 export const NDJSONLoader = {
   name: 'NDJSON',
   id: 'ndjson',

package/dist/esm/ndjson-loader.js

@@ -1,6 +1,6 @@
 import { parseNDJSONSync } from './lib/parsers/parse-ndjson';
 import { parseNDJSONInBatches } from './lib/parsers/parse-ndjson-in-batches';
-const VERSION = typeof "4.0.0-alpha.24" !== 'undefined' ? "4.0.0-alpha.24" : 'latest';
+const VERSION = typeof "4.0.0-alpha.25" !== 'undefined' ? "4.0.0-alpha.25" : 'latest';
 export const NDJSONLoader = {
   name: 'NDJSON',
   id: 'ndjson',

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

@@ -1 +1 @@
-{"version":3,"file":"geojson-loader.d.ts","sourceRoot":"","sources":["../src/geojson-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AACvE,OAAO,KAAK,EAAC,OAAO,EAAmB,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAC7E,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":"AAEA,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-worker.js

@@ -1479,184 +1479,6 @@
     }
   };
 
-  // ../schema/src/lib/table/simple-table/data-type.ts
-  function getDataTypeFromValue(value, defaultNumberType = "float32") {
-    if (value instanceof Date) {
-      return "date-millisecond";
-    }
-    if (value instanceof Number) {
-      return defaultNumberType;
-    }
-    if (typeof value === "string") {
-      return "utf8";
-    }
-    if (value === null || value === "undefined") {
-      return "null";
-    }
-    return "null";
-  }
-  function getDataTypeFromArray(array) {
-    let type = getDataTypeFromTypedArray(array);
-    if (type !== "null") {
-      return { type, nullable: false };
-    }
-    if (array.length > 0) {
-      type = getDataTypeFromValue(array[0]);
-      return { type, nullable: true };
-    }
-    return { type: "null", nullable: true };
-  }
-  function getDataTypeFromTypedArray(array) {
-    switch (array.constructor) {
-      case Int8Array:
-        return "int8";
-      case Uint8Array:
-      case Uint8ClampedArray:
-        return "uint8";
-      case Int16Array:
-        return "int16";
-      case Uint16Array:
-        return "uint16";
-      case Int32Array:
-        return "int32";
-      case Uint32Array:
-        return "uint32";
-      case Float32Array:
-        return "float32";
-      case Float64Array:
-        return "float64";
-      default:
-        return "null";
-    }
-  }
-
-  // ../schema/src/lib/table/simple-table/table-schema.ts
-  function deduceTableSchema(table) {
-    switch (table.shape) {
-      case "array-row-table":
-      case "object-row-table":
-        return deduceSchemaFromRows(table.data);
-      case "columnar-table":
-        return deduceSchemaFromColumns(table.data);
-      case "arrow-table":
-      default:
-        throw new Error("Deduce schema");
-    }
-  }
-  function deduceSchemaFromColumns(columnarTable) {
-    const fields = [];
-    for (const [columnName, column] of Object.entries(columnarTable)) {
-      const field = deduceFieldFromColumn(column, columnName);
-      fields.push(field);
-    }
-    return { fields, metadata: {} };
-  }
-  function deduceSchemaFromRows(rowTable) {
-    if (!rowTable.length) {
-      throw new Error("deduce from empty table");
-    }
-    const fields = [];
-    const row0 = rowTable[0];
-    for (const [columnName, value] of Object.entries(row0)) {
-      fields.push(deduceFieldFromValue(value, columnName));
-    }
-    return { fields, metadata: {} };
-  }
-  function deduceFieldFromColumn(column, name) {
-    if (ArrayBuffer.isView(column)) {
-      const type = getDataTypeFromArray(column);
-      return {
-        name,
-        type: type.type || "null",
-        nullable: type.nullable
-      };
-    }
-    if (Array.isArray(column) && column.length > 0) {
-      const value = column[0];
-      const type = getDataTypeFromValue(value);
-      return {
-        name,
-        type,
-        nullable: true
-      };
-    }
-    throw new Error("empty table");
-  }
-  function deduceFieldFromValue(value, name) {
-    const type = getDataTypeFromValue(value);
-    return {
-      name,
-      type,
-      nullable: true
-    };
-  }
-
-  // ../schema/src/lib/table/simple-table/make-table.ts
-  function makeTableFromData(data) {
-    let table;
-    switch (getTableShapeFromData(data)) {
-      case "array-row-table":
-        table = { shape: "array-row-table", data };
-        break;
-      case "object-row-table":
-        table = { shape: "object-row-table", data };
-        break;
-      case "columnar-table":
-        table = { shape: "columnar-table", data };
-        break;
-      default:
-        throw new Error("table");
-    }
-    const schema = deduceTableSchema(table);
-    return { ...table, schema };
-  }
-  function getTableShapeFromData(data) {
-    if (Array.isArray(data)) {
-      if (data.length === 0) {
-        throw new Error("cannot deduce type of empty table");
-      }
-      const firstRow = data[0];
-      if (Array.isArray(firstRow)) {
-        return "array-row-table";
-      }
-      if (firstRow && typeof firstRow === "object") {
-        return "object-row-table";
-      }
-    }
-    if (data && typeof data === "object") {
-      return "columnar-table";
-    }
-    throw new Error("invalid table");
-  }
-
-  // src/lib/parsers/parse-json.ts
-  function parseJSONSync(jsonText, options) {
-    try {
-      const json = JSON.parse(jsonText);
-      if (options.json?.table) {
-        const data = getFirstArray(json) || json;
-        return makeTableFromData(data);
-      }
-      return json;
-    } catch (error) {
-      throw new Error("JSONLoader: failed to parse JSON");
-    }
-  }
-  function getFirstArray(json) {
-    if (Array.isArray(json)) {
-      return json;
-    }
-    if (json && typeof json === "object") {
-      for (const value of Object.values(json)) {
-        const array = getFirstArray(value);
-        if (array) {
-          return array;
-        }
-      }
-    }
-    return null;
-  }
-
   // src/lib/clarinet/clarinet.ts
   var MAX_BUFFER_LENGTH = Number.MAX_SAFE_INTEGER;
   var STATE;
@@ -2432,7 +2254,7 @@ Char: ${this.c}`;
   }
 
   // src/geojson-loader.ts
-  var VERSION = true ? "4.0.0-alpha.24" : "latest";
+  var VERSION = true ? "4.0.0-alpha.25" : "latest";
   var GeoJSONWorkerLoader = {
     name: "GeoJSON",
     id: "geojson",
@@ -2469,11 +2291,20 @@ Char: ${this.c}`;
     options = { ...GeoJSONLoader.options, ...options };
     options.geojson = { ...GeoJSONLoader.options.geojson, ...options.geojson };
     options.gis = options.gis || {};
-    const table = parseJSONSync(text, options);
-    table.shape = "geojson-row-table";
+    let geojson;
+    try {
+      geojson = JSON.parse(text);
+    } catch {
+      geojson = {};
+    }
+    const table = {
+      shape: "geojson-table",
+      type: "FeatureCollection",
+      features: geojson?.features || []
+    };
     switch (options.gis.format) {
       case "binary":
-        return geojsonToBinary(table.data);
+        return geojsonToBinary(table.features);
       default:
         return table;
     }

package/dist/geojson-writer.d.ts

@@ -1,6 +1,11 @@
-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';
-export type { GeoJSONWriterOptions };
+export type GeoJSONWriterOptions = WriterOptions & {
+    geojson?: {
+        featureArray?: boolean;
+        geometryColumn?: number | null;
+    };
+    chunkSize?: number;
+};
 export declare const GeoJSONWriter: Writer<Table, TableBatch, GeoJSONWriterOptions>;
 //# sourceMappingURL=geojson-writer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"geojson-writer.d.ts","sourceRoot":"","sources":["../src/geojson-writer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AACrD,OAAO,KAAK,EAAC,KAAK,EAAE,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AAGzE,YAAY,EAAC,oBAAoB,EAAC,CAAC;AAEnC,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,oBAAoB,CAgBzE,CAAC"}
+{"version":3,"file":"geojson-writer.d.ts","sourceRoot":"","sources":["../src/geojson-writer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACpE,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,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,oBAAoB,CAgBzE,CAAC"}

package/dist/json-writer.d.ts

@@ -1,6 +1,16 @@
-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';
-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 declare const JSONWriter: Writer<Table, TableBatch, JSONWriterOptions>;
+export {};
 //# sourceMappingURL=json-writer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"json-writer.d.ts","sourceRoot":"","sources":["../src/json-writer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AACrD,OAAO,KAAK,EAAC,KAAK,EAAE,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AAGnE,YAAY,EAAC,iBAAiB,EAAC,CAAC;AAEhC,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,iBAAiB,CAYnE,CAAC"}
+{"version":3,"file":"json-writer.d.ts","sourceRoot":"","sources":["../src/json-writer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACpE,OAAO,KAAK,EAAC,KAAK,EAAE,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAG1D,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAC9C,IAAI,CAAC,EAAE;QACL,KAAK,CAAC,EAAE,kBAAkB,GAAG,iBAAiB,CAAC;QAC/C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC;KACzC,CAAC;CACH,CAAC;AAEF,KAAK,QAAQ,GAAG,OAAO,EAAE,CAAC;AAC1B,KAAK,SAAS,GAAG;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAC,CAAC;AAC1C,KAAK,SAAS,GAAG,QAAQ,EAAE,GAAG,SAAS,EAAE,CAAC;AAE1C,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,iBAAiB,CAYnE,CAAC"}

package/dist/lib/encoder-utils/encode-table-row.d.ts

@@ -0,0 +1,7 @@
+import { Table } from '@loaders.gl/schema';
+import { Utf8ArrayBufferEncoder } from './utf8-encoder';
+/**
+ * Encode a row. Currently this ignores properties in the geometry column.
+ */
+export declare function encodeTableRow(table: Table, rowIndex: number, geometryColumnIndex: number, utf8Encoder: Utf8ArrayBufferEncoder): void;
+//# sourceMappingURL=encode-table-row.d.ts.map

package/dist/lib/encoder-utils/encode-table-row.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"encode-table-row.d.ts","sourceRoot":"","sources":["../../../src/lib/encoder-utils/encode-table-row.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,KAAK,EAAsB,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAC,sBAAsB,EAAC,MAAM,gBAAgB,CAAC;AAMtD;;GAEG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,MAAM,EAChB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,sBAAsB,GAClC,IAAI,CAMN"}

package/dist/lib/encoder-utils/encode-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"encode-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/encoder-utils/encode-utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,KAAK,EAAsD,MAAM,oBAAoB,CAAC;AAE9F,KAAK,GAAG,GAAG;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAC,CAAC;AAEpC;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAsB9D;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,KAAK,EACZ,GAAG,EAAE,GAAG,EACR,oBAAoB,GAAE,MAAM,EAAO,GAClC;IAAC,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAA;CAAC,CASjC"}

package/dist/lib/encoder-utils/utf8-encoder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utf8-encoder.d.ts","sourceRoot":"","sources":["../../../src/lib/encoder-utils/utf8-encoder.ts"],"names":[],"mappings":"AAGA,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,WAAW,CAAkC;gBAEzC,SAAS,EAAE,MAAM;IAI7B,IAAI,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAOhC,MAAM,IAAI,OAAO;IAIjB,mBAAmB,IAAI,eAAe;IAItC,cAAc,IAAI,MAAM;CAMzB"}

package/dist/lib/encoders/geojson-encoder.d.ts

@@ -1,11 +1,5 @@
-import { TableBatch } from '@loaders.gl/schema';
-export type GeoJSONWriterOptions = {
-    geojson?: {
-        featureArray?: boolean;
-        geometryColumn?: number | null;
-    };
-    chunkSize?: number;
-};
+import type { TableBatch } from '@loaders.gl/schema';
+import type { GeoJSONWriterOptions } from '../../geojson-writer';
 /**
  * Encode a table as GeoJSON
  */

package/dist/lib/encoders/geojson-encoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geojson-encoder.d.ts","sourceRoot":"","sources":["../../../src/lib/encoders/geojson-encoder.ts"],"names":[],"mappings":"AAIA,OAAO,EAAQ,UAAU,EAAsB,MAAM,oBAAoB,CAAC;AAM1E,MAAM,MAAM,oBAAoB,GAAG;IACjC,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;;GAEG;AAEH,wBAAuB,6BAA6B,CAClD,aAAa,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE,0BAA0B;AACpE,SAAS,GAAE,oBAAyB,GACnC,aAAa,CAAC,WAAW,CAAC,CAqD5B"}
+{"version":3,"file":"geojson-encoder.d.ts","sourceRoot":"","sources":["../../../src/lib/encoders/geojson-encoder.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAKnD,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAE/D;;GAEG;AAEH,wBAAuB,6BAA6B,CAClD,aAAa,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE,0BAA0B;AACpE,SAAS,GAAE,oBAAyB,GACnC,aAAa,CAAC,WAAW,CAAC,CA0D5B"}

package/dist/lib/encoders/json-encoder.d.ts

@@ -1,16 +1,7 @@
 import { Table } 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 declare function encodeTableAsJSON(table: Table, options?: JSONWriterOptions): string;
-export {};
 //# sourceMappingURL=json-encoder.d.ts.map

package/dist/lib/encoders/json-encoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json-encoder.d.ts","sourceRoot":"","sources":["../../../src/lib/encoders/json-encoder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,KAAK,EAAkB,MAAM,oBAAoB,CAAC;AAE1D,KAAK,QAAQ,GAAG,OAAO,EAAE,CAAC;AAC1B,KAAK,SAAS,GAAG;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAC,CAAC;AAC1C,KAAK,SAAS,GAAG,QAAQ,EAAE,GAAG,SAAS,EAAE,CAAC;AAE1C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,CAAC,EAAE,kBAAkB,GAAG,iBAAiB,CAAC;IAC/C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,GAAE,iBAAsB,GAAG,MAAM,CAYvF"}
+{"version":3,"file":"json-encoder.d.ts","sourceRoot":"","sources":["../../../src/lib/encoders/json-encoder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,KAAK,EAAkB,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAEzD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,MAAM,CAYnF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/json",
-  "version": "4.0.0-alpha.24",
+  "version": "4.0.0-alpha.25",
   "description": "Framework-independent loader for JSON and streaming JSON formats",
   "license": "MIT",
   "publishConfig": {
@@ -35,9 +35,9 @@
     "build-worker": "esbuild src/workers/geojson-worker.ts --bundle --outfile=dist/geojson-worker.js --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/gis": "4.0.0-alpha.24",
-    "@loaders.gl/loader-utils": "4.0.0-alpha.24",
-    "@loaders.gl/schema": "4.0.0-alpha.24"
+    "@loaders.gl/gis": "4.0.0-alpha.25",
+    "@loaders.gl/loader-utils": "4.0.0-alpha.25",
+    "@loaders.gl/schema": "4.0.0-alpha.25"
   },
-  "gitHead": "97a8990595c132fb14e3445a8768d9f4cb98ff05"
+  "gitHead": "40135f391b869388dbbcd615bbe51178d0c370be"
 }

package/src/geojson-loader.ts

@@ -1,10 +1,10 @@
 // loaders.gl, MIT license
 
 import type {Loader, LoaderWithParser} from '@loaders.gl/loader-utils';
-import type {GeoJSON, GeoJSONRowTable, TableBatch} from '@loaders.gl/schema';
+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';
 
 // __VERSION__ is injected by babel-plugin-version-inline
@@ -65,11 +65,25 @@ function parseTextSync(text: string, options?: GeoJSONLoaderOptions) {
   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;
   }

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-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};
+}