@loaders.gl/parquet 4.0.4 → 4.1.0-alpha.10

package/dist/polyfills/buffer/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/polyfills/buffer/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,IAAI,cAAc,EAAC,MAAM,UAAU,CAAC;AAClD,OAAO,EAAC,MAAM,EAAC,MAAM,2BAA2B,CAAC;AACjD,OAAO,EAAC,qBAAqB,EAAC,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/polyfills/buffer/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,MAAM,IAAI,cAAc,EAAC,MAAM,UAAU,CAAC;AAClD,OAAO,EAAC,MAAM,EAAC,MAAM,2BAA2B,CAAC;AACjD,OAAO,EAAC,qBAAqB,EAAC,MAAM,wBAAwB,CAAC"}

package/dist/polyfills/buffer/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["Buffer","BufferPolyfill","installBufferPolyfill"],"sources":["../../../src/polyfills/buffer/index.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\nexport {Buffer as BufferPolyfill} from './buffer';\nexport {Buffer} from './install-buffer-polyfill';\nexport {installBufferPolyfill} from './buffer-polyfill.node';\n\n// import { installBufferPolyfill } from \"./buffer-polyfill.node\";\n\n// installBufferPolyfill();\n"],"mappings":"SAEQA,MAAM,IAAIC,cAAc;AAAA,SACxBD,MAAM;AAAA,SACNE,qBAAqB"}
+{"version":3,"file":"index.js","names":["Buffer","BufferPolyfill","installBufferPolyfill"],"sources":["../../../src/polyfills/buffer/index.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\nexport {Buffer as BufferPolyfill} from './buffer';\nexport {Buffer} from './install-buffer-polyfill';\nexport {installBufferPolyfill} from './buffer-polyfill.node';\n\n// import { installBufferPolyfill } from \"./buffer-polyfill.node\";\n\n// installBufferPolyfill();\n"],"mappings":"SAGQA,MAAM,IAAIC,cAAc;AAAA,SACxBD,MAAM;AAAA,SACNE,qBAAqB"}

package/dist/polyfills/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/polyfills/util.js"],"names":[],"mappings":"AAKA;;;EAAkD;AAClD;;;EAAkD"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/polyfills/util.js"],"names":[],"mappings":"AAMA;;;EAAkD;AAClD;;;EAAkD"}

package/dist/polyfills/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","names":["TextEncoder","globalThis","TextDecoder"],"sources":["../../src/polyfills/util.js"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\n// Polyfill for Node.js util library\n\nexport const TextEncoder = globalThis.TextEncoder;\nexport const TextDecoder = globalThis.TextDecoder;\n"],"mappings":"AAKA,OAAO,MAAMA,WAAW,GAAGC,UAAU,CAACD,WAAW;AACjD,OAAO,MAAME,WAAW,GAAGD,UAAU,CAACC,WAAW"}
+{"version":3,"file":"util.js","names":["TextEncoder","globalThis","TextDecoder"],"sources":["../../src/polyfills/util.js"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\n// Polyfill for Node.js util library\n\nexport const TextEncoder = globalThis.TextEncoder;\nexport const TextDecoder = globalThis.TextDecoder;\n"],"mappings":"AAMA,OAAO,MAAMA,WAAW,GAAGC,UAAU,CAACD,WAAW;AACjD,OAAO,MAAME,WAAW,GAAGD,UAAU,CAACC,WAAW"}

package/dist/workers/parquet-worker.js

@@ -1,4 +1,4 @@
 import { createLoaderWorker } from '@loaders.gl/loader-utils';
-import { ParquetLoader } from "../index.js";
+import { ParquetLoader } from "../parquet-loader.js";
 createLoaderWorker(ParquetLoader);
 //# sourceMappingURL=parquet-worker.js.map

package/dist/workers/parquet-worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"parquet-worker.js","names":["createLoaderWorker","ParquetLoader"],"sources":["../../src/workers/parquet-worker.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport {createLoaderWorker} from '@loaders.gl/loader-utils';\nimport {ParquetLoader} from '../index';\n\ncreateLoaderWorker(ParquetLoader);\n"],"mappings":"AAGA,SAAQA,kBAAkB,QAAO,0BAA0B;AAAC,SACpDC,aAAa;AAErBD,kBAAkB,CAACC,aAAa,CAAC"}
+{"version":3,"file":"parquet-worker.js","names":["createLoaderWorker","ParquetLoader"],"sources":["../../src/workers/parquet-worker.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {createLoaderWorker} from '@loaders.gl/loader-utils';\nimport {ParquetLoader} from '../parquet-loader';\n\ncreateLoaderWorker(ParquetLoader);\n"],"mappings":"AAIA,SAAQA,kBAAkB,QAAO,0BAA0B;AAAC,SACpDC,aAAa;AAErBD,kBAAkB,CAACC,aAAa,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/parquet",
-  "version": "4.0.4",
+  "version": "4.1.0-alpha.10",
   "description": "Framework-independent loader for Apache Parquet files",
   "license": "MIT",
   "type": "module",
@@ -12,21 +12,24 @@
     "url": "https://github.com/visgl/loaders.gl"
   },
   "keywords": [
-    "webgl",
     "loader",
     "parser",
     "table",
-    "Parquet",
-    "Apache Parquet"
+    "parquet",
+    "streaming",
+    "cloud native",
+    "geoparquet",
+    "Apache Parquet",
+    "apache-parquet"
   ],
   "types": "dist/index.d.ts",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
-      "require": "./dist/index.cjs",
-      "types": "./dist/index.d.ts"
+      "require": "./dist/index.cjs"
     }
   },
   "sideEffects": false,
@@ -58,13 +61,13 @@
     "base64-js and ieee754 are used by buffer polyfill"
   ],
   "dependencies": {
-    "@loaders.gl/arrow": "4.0.4",
-    "@loaders.gl/bson": "4.0.4",
-    "@loaders.gl/compression": "4.0.4",
-    "@loaders.gl/gis": "4.0.4",
-    "@loaders.gl/loader-utils": "4.0.4",
-    "@loaders.gl/schema": "4.0.4",
-    "@loaders.gl/wkt": "4.0.4",
+    "@loaders.gl/arrow": "4.1.0-alpha.10",
+    "@loaders.gl/bson": "4.1.0-alpha.10",
+    "@loaders.gl/compression": "4.1.0-alpha.10",
+    "@loaders.gl/gis": "4.1.0-alpha.10",
+    "@loaders.gl/loader-utils": "4.1.0-alpha.10",
+    "@loaders.gl/schema": "4.1.0-alpha.10",
+    "@loaders.gl/wkt": "4.1.0-alpha.10",
     "async-mutex": "^0.2.2",
     "base64-js": "^1.3.1",
     "brotli": "^1.3.2",
@@ -90,5 +93,5 @@
     "@types/varint": "^5.0.0",
     "apache-arrow": "^13.0.0"
   },
-  "gitHead": "4dc810fa04bb400f4aedfef98a83c7ef882ed3d7"
+  "gitHead": "19f43c2d90d8b50860c3f8e487429779a386287d"
 }

package/src/constants.ts

@@ -1,4 +1,5 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 // Forked from https://github.com/kbajalc/parquets under MIT license (Copyright (c) 2017 ironSource Ltd.)

package/src/index.ts

@@ -1,76 +1,24 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 export {Buffer} from './polyfills/buffer/install-buffer-polyfill';
 
-import type {LoaderWithParser} from '@loaders.gl/loader-utils';
-import type {
-  ObjectRowTable,
-  ObjectRowTableBatch,
-  ColumnarTable,
-  ColumnarTableBatch,
-  GeoJSONTable,
-  GeoJSONTableBatch
-} from '@loaders.gl/schema';
-
 // import {ArrowTable, ArrowTableBatch} from '@loaders.gl/arrow';
 
-// ParquetLoader
-
-import {BlobFile} from '@loaders.gl/loader-utils';
-import {
-  ParquetLoader as ParquetWorkerLoader,
-  ParquetColumnarLoader as ParquetColumnarWorkerLoader,
-  ParquetLoaderOptions
+export {
+  ParquetWorkerLoader,
+  ParquetLoader,
+  GeoParquetWorkerLoader,
+  GeoParquetLoader,
+  ParquetColumnarWorkerLoader,
+  ParquetColumnarLoader
 } from './parquet-loader';
-import {parseParquetFile, parseParquetFileInBatches} from './lib/parsers/parse-parquet-to-rows';
-import {
-  parseParquetFileInColumns,
-  parseParquetFileInColumnarBatches
-} from './lib/parsers/parse-parquet-to-columns';
 
 // import type {ParquetWasmLoaderOptions} from './lib/wasm/parse-parquet-wasm';
 // import {parseParquetWasm} from './lib/wasm/parse-parquet-wasm';
 // import {ParquetWasmLoader as ParquetWasmWorkerLoader} from './parquet-wasm-loader';
 
-export {ParquetWorkerLoader};
-// export {ParquetWasmWorkerLoader};
-
-/** ParquetJS table loader */
-export const ParquetLoader: LoaderWithParser<
-  ObjectRowTable | GeoJSONTable,
-  ObjectRowTableBatch | GeoJSONTableBatch,
-  ParquetLoaderOptions
-> = {
-  ...ParquetWorkerLoader,
-  parse(arrayBuffer: ArrayBuffer, options?: ParquetLoaderOptions) {
-    return parseParquetFile(new BlobFile(arrayBuffer), options);
-  },
-  parseFile: parseParquetFile,
-  parseFileInBatches: parseParquetFileInBatches
-};
-
-/** ParquetJS table loader */
-export const ParquetColumnarLoader: LoaderWithParser<
-  ColumnarTable,
-  ColumnarTableBatch,
-  ParquetLoaderOptions
-> = {
-  ...ParquetColumnarWorkerLoader,
-  parse(arrayBuffer: ArrayBuffer, options?: ParquetLoaderOptions) {
-    return parseParquetFileInColumns(new BlobFile(arrayBuffer), options);
-  },
-  parseFile: parseParquetFileInColumns,
-  parseFileInBatches: parseParquetFileInColumnarBatches
-};
-
-// export const ParquetWasmLoader: LoaderWithParser<ArrowTable, never, ParquetWasmLoaderOptions> = {
-//   ...ParquetWasmWorkerLoader,
-//   parse: parseParquetWasm
-// };
-
-// ParquetWriter
-
 export {ParquetWriter as _ParquetWriter} from './parquet-writer';
 // export {ParquetWasmWriter} from './parquet-wasm-writer';
 

package/src/lib/arrow/convert-row-group-to-columns.ts

@@ -1,4 +1,5 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import {Schema} from '@loaders.gl/schema';

package/src/lib/arrow/convert-schema-from-parquet.ts

@@ -1,4 +1,5 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import {Schema, Field, DataType} from '@loaders.gl/schema';

package/src/lib/arrow/convert-schema-to-parquet.ts

@@ -1,4 +1,5 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 // import type {ParquetSchema} from '../../parquetjs/schema/schema';

package/src/lib/parsers/get-parquet-schema.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 // loaders.gl
 import {Schema} from '@loaders.gl/schema';
 import {ParquetReader} from '../../parquetjs/parser/parquet-reader';

package/src/lib/parsers/parse-geoparquet.ts

@@ -0,0 +1,88 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+import type {ReadableFile} from '@loaders.gl/loader-utils';
+import type {
+  GeoJSONTable,
+  GeoJSONTableBatch,
+  ObjectRowTable,
+  ObjectRowTableBatch
+} from '@loaders.gl/schema';
+import {convertWKBTableToGeoJSON} from '@loaders.gl/gis';
+import {WKTLoader, WKBLoader} from '@loaders.gl/wkt';
+
+import type {ParquetLoaderOptions} from '../../parquet-loader';
+
+import {parseParquetFile, parseParquetFileInBatches} from './parse-parquet';
+
+export async function parseGeoParquetFile(
+  file: ReadableFile,
+  options?: ParquetLoaderOptions
+): Promise<ObjectRowTable | GeoJSONTable> {
+  const table = await parseParquetFile(file, {...options, shape: 'object-row-table'});
+  const shape = options?.parquet?.shape;
+  return convertTable(table, shape);
+}
+
+export async function* parseGeoParquetFileInBatches(
+  file: ReadableFile,
+  options?: ParquetLoaderOptions
+): AsyncIterable<ObjectRowTableBatch | GeoJSONTableBatch> {
+  const tableBatches = parseParquetFileInBatches(file, {...options, shape: 'object-row-table'});
+
+  for await (const batch of tableBatches) {
+    const shape = options?.parquet?.shape;
+    yield convertBatch(batch, shape);
+  }
+}
+
+function convertTable(
+  objectRowTable: ObjectRowTable,
+  shape?: 'object-row-table' | 'geojson-table'
+): ObjectRowTable | GeoJSONTable {
+  switch (shape) {
+    case 'object-row-table':
+      return objectRowTable;
+
+    case 'geojson-table':
+      try {
+        return convertWKBTableToGeoJSON(objectRowTable, objectRowTable.schema!, [
+          WKTLoader,
+          WKBLoader
+        ]);
+      } catch (error) {
+        return objectRowTable;
+      }
+
+    default:
+      throw new Error(shape);
+  }
+}
+
+function convertBatch(
+  objectRowBatch: ObjectRowTableBatch,
+  shape?: 'object-row-table' | 'geojson-table'
+): ObjectRowTableBatch | GeoJSONTableBatch {
+  switch (shape) {
+    case 'object-row-table':
+      return objectRowBatch;
+
+    case 'geojson-table':
+      try {
+        const geojsonTable = convertWKBTableToGeoJSON(objectRowBatch, objectRowBatch.schema!, [
+          WKTLoader,
+          WKBLoader
+        ]);
+        return {
+          ...objectRowBatch,
+          ...geojsonTable
+        };
+      } catch (error) {
+        return objectRowBatch;
+      }
+
+    default:
+      throw new Error(shape);
+  }
+}

package/src/lib/parsers/parse-parquet-to-columns.ts

@@ -1,4 +1,5 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import type {ColumnarTable, ColumnarTableBatch, Schema} from '@loaders.gl/schema';
@@ -11,6 +12,9 @@ import {materializeColumns} from '../../parquetjs/schema/shred';
 import {getSchemaFromParquetReader} from './get-parquet-schema';
 import {installBufferPolyfill} from '../../polyfills/buffer';
 
+/**
+ * @deprecated
+ */
 export async function parseParquetFileInColumns(
   file: ReadableFile,
   options?: ParquetLoaderOptions
@@ -26,6 +30,9 @@ export async function parseParquetFileInColumns(
   throw new Error('empty table');
 }
 
+/**
+ * @deprecated
+ */
 export async function* parseParquetFileInColumnarBatches(
   file: ReadableFile,
   options?: ParquetLoaderOptions

package/src/lib/parsers/{parse-parquet-to-rows.ts → parse-parquet.ts}

@@ -1,14 +1,9 @@
-// import type {LoaderWithParser, Loader, LoaderOptions} from '@loaders.gl/loader-utils';
-// import {ColumnarTableBatch} from '@loaders.gl/schema';
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import type {ReadableFile} from '@loaders.gl/loader-utils';
-import type {
-  GeoJSONTable,
-  GeoJSONTableBatch,
-  ObjectRowTable,
-  ObjectRowTableBatch
-} from '@loaders.gl/schema';
-import {convertWKBTableToGeoJSON} from '@loaders.gl/gis';
-import {WKTLoader, WKBLoader} from '@loaders.gl/wkt';
+import type {ObjectRowTable, ObjectRowTableBatch} from '@loaders.gl/schema';
 
 import type {ParquetLoaderOptions} from '../../parquet-loader';
 import type {ParquetRow} from '../../parquetjs/schema/declare';
@@ -16,10 +11,16 @@ import {ParquetReader} from '../../parquetjs/parser/parquet-reader';
 import {getSchemaFromParquetReader} from './get-parquet-schema';
 import {installBufferPolyfill} from '../../polyfills/buffer';
 
+/**
+ *  * Parse a parquet file using parquetjs
+ * @param file
+ * @param options
+ * @returns
+ */
 export async function parseParquetFile(
   file: ReadableFile,
   options?: ParquetLoaderOptions
-): Promise<ObjectRowTable | GeoJSONTable> {
+): Promise<ObjectRowTable> {
   installBufferPolyfill();
 
   const reader = new ParquetReader(file, {
@@ -47,10 +48,15 @@ export async function parseParquetFile(
   return convertTable(objectRowTable, shape);
 }
 
+/**
+ * Parse a parquet file in batches using parquetjs
+ * @param file
+ * @param options
+ */
 export async function* parseParquetFileInBatches(
   file: ReadableFile,
   options?: ParquetLoaderOptions
-): AsyncIterable<ObjectRowTableBatch | GeoJSONTableBatch> {
+): AsyncIterable<ObjectRowTableBatch> {
   const reader = new ParquetReader(file, {
     preserveBinary: options?.parquet?.preserveBinary
   });
@@ -78,20 +84,14 @@ export async function* parseParquetFileInBatches(
 function convertTable(
   objectRowTable: ObjectRowTable,
   shape?: 'object-row-table' | 'geojson-table'
-): ObjectRowTable | GeoJSONTable {
+): ObjectRowTable {
   switch (shape) {
     case 'object-row-table':
       return objectRowTable;
 
+    // Hack until geoparquet fixes up forwarded shape
     case 'geojson-table':
-      try {
-        return convertWKBTableToGeoJSON(objectRowTable, objectRowTable.schema!, [
-          WKTLoader,
-          WKBLoader
-        ]);
-      } catch (error) {
-        return objectRowTable;
-      }
+      return objectRowTable;
 
     default:
       throw new Error(shape);

package/src/lib/wasm/encode-parquet-wasm.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import type {WriterOptions} from '@loaders.gl/loader-utils';
 import type {ArrowTable} from '@loaders.gl/arrow';
 

package/src/lib/wasm/load-wasm-browser.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import * as wasmEsm from 'parquet-wasm/esm2/arrow1';
 
 let cached: typeof wasmEsm | null = null;

package/src/lib/wasm/load-wasm-node.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import * as wasmNode from 'parquet-wasm/node/arrow1';
 
 export async function loadWasm(wasmUrl?: string) {

package/src/lib/wasm/load-wasm.ts

@@ -1 +1,5 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 export {loadWasm} from './load-wasm-node';

package/src/lib/wasm/parse-parquet-wasm.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 // eslint-disable
 import type {LoaderOptions} from '@loaders.gl/loader-utils';
 import type {ArrowTable} from '@loaders.gl/arrow';

package/src/parquet-loader.ts

@@ -1,13 +1,24 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {Loader, LoaderOptions} from '@loaders.gl/loader-utils';
+import type {Loader, LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
 import type {
   ObjectRowTable,
   ObjectRowTableBatch,
+  GeoJSONTable,
+  GeoJSONTableBatch,
   ColumnarTable,
   ColumnarTableBatch
 } from '@loaders.gl/schema';
+import {BlobFile} from '@loaders.gl/loader-utils';
+
+import {parseParquetFile, parseParquetFileInBatches} from './lib/parsers/parse-parquet';
+import {parseGeoParquetFile, parseGeoParquetFileInBatches} from './lib/parsers/parse-geoparquet';
+import {
+  parseParquetFileInColumns,
+  parseParquetFileInColumnarBatches
+} from './lib/parsers/parse-parquet-to-columns';
 
 export {Buffer} from './polyfills/buffer/install-buffer-polyfill';
 
@@ -32,8 +43,14 @@ export type ParquetLoaderOptions = LoaderOptions & {
   };
 };
 
-/** ParquetJS table loader */
-export const ParquetLoader: Loader<ObjectRowTable, ObjectRowTableBatch, ParquetLoaderOptions> = {
+/**
+ * ParquetJS table loader
+ */
+export const ParquetWorkerLoader: Loader<
+  ObjectRowTable,
+  ObjectRowTableBatch,
+  ParquetLoaderOptions
+> = {
   name: 'Apache Parquet',
   id: 'parquet',
   module: 'parquet',
@@ -55,7 +72,63 @@ export const ParquetLoader: Loader<ObjectRowTable, ObjectRowTableBatch, ParquetL
   }
 };
 
-export const ParquetColumnarLoader: Loader<
+/** ParquetJS table loader */
+export const ParquetLoader: LoaderWithParser<
+  ObjectRowTable | GeoJSONTable,
+  ObjectRowTableBatch | GeoJSONTableBatch,
+  ParquetLoaderOptions
+> = {
+  ...ParquetWorkerLoader,
+  parse: (arrayBuffer: ArrayBuffer, options?: ParquetLoaderOptions) =>
+    parseParquetFile(new BlobFile(arrayBuffer), options),
+
+  parseFile: parseParquetFile,
+  parseFileInBatches: parseParquetFileInBatches
+};
+
+// Defeat tree shaking
+// @ts-ignore
+ParquetLoader.Buffer = Buffer;
+
+export const GeoParquetWorkerLoader: Loader<GeoJSONTable, GeoJSONTableBatch, ParquetLoaderOptions> =
+  {
+    name: 'Apache Parquet',
+    id: 'parquet',
+    module: 'parquet',
+    version: VERSION,
+    worker: true,
+    category: 'table',
+    extensions: ['parquet'],
+    mimeTypes: ['application/octet-stream'],
+    binary: true,
+    tests: ['PAR1', 'PARE'],
+    options: {
+      parquet: {
+        shape: 'geojson-table',
+        columnList: [],
+        geoparquet: true,
+        url: undefined,
+        preserveBinary: false
+      }
+    }
+  };
+
+/** ParquetJS table loader */
+export const GeoParquetLoader: LoaderWithParser<
+  ObjectRowTable | GeoJSONTable,
+  ObjectRowTableBatch | GeoJSONTableBatch,
+  ParquetLoaderOptions
+> = {
+  ...GeoParquetWorkerLoader,
+  parse(arrayBuffer: ArrayBuffer, options?: ParquetLoaderOptions) {
+    return parseGeoParquetFile(new BlobFile(arrayBuffer), options);
+  },
+  parseFile: parseGeoParquetFile,
+  parseFileInBatches: parseGeoParquetFileInBatches
+};
+
+/** @deprecated Test to see if we can improve perf of parquetjs loader */
+export const ParquetColumnarWorkerLoader: Loader<
   ColumnarTable,
   ColumnarTableBatch,
   ParquetLoaderOptions
@@ -73,8 +146,16 @@ export const ParquetColumnarLoader: Loader<
   options: ParquetLoader.options
 };
 
-// Defeat tree shaking
-// @ts-ignore
-ParquetLoader.Buffer = Buffer;
-// @ts-ignore
-ParquetColumnarLoader.Buffer = Buffer;
+/** @deprecated Test to see if we can improve perf of parquetjs loader */
+export const ParquetColumnarLoader: LoaderWithParser<
+  ColumnarTable,
+  ColumnarTableBatch,
+  ParquetLoaderOptions
+> = {
+  ...ParquetColumnarWorkerLoader,
+  parse(arrayBuffer: ArrayBuffer, options?: ParquetLoaderOptions) {
+    return parseParquetFileInColumns(new BlobFile(arrayBuffer), options);
+  },
+  parseFile: parseParquetFileInColumns,
+  parseFileInBatches: parseParquetFileInColumnarBatches
+};

package/src/parquet-wasm-loader.ts

@@ -1,9 +1,12 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {Loader, LoaderOptions} from '@loaders.gl/loader-utils';
+import type {Loader, LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
 import type {ArrowTable} from '@loaders.gl/arrow';
 
+import {parseParquetWasm} from './lib/wasm/parse-parquet-wasm';
+
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
@@ -17,7 +20,7 @@ export type ParquetWasmLoaderOptions = LoaderOptions & {
 };
 
 /** Parquet WASM table loader */
-export const ParquetWasmLoader: Loader<ArrowTable, never, ParquetWasmLoaderOptions> = {
+export const ParquetWasmWorkerLoader: Loader<ArrowTable, never, ParquetWasmLoaderOptions> = {
   name: 'Apache Parquet',
   id: 'parquet-wasm',
   module: 'parquet',
@@ -35,3 +38,9 @@ export const ParquetWasmLoader: Loader<ArrowTable, never, ParquetWasmLoaderOptio
     }
   }
 };
+
+/** Parquet WASM table loader */
+export const ParquetWasmLoader: LoaderWithParser<ArrowTable, never, ParquetWasmLoaderOptions> = {
+  ...ParquetWasmWorkerLoader,
+  parse: parseParquetWasm
+};

package/src/parquet-wasm-writer.ts

@@ -1,4 +1,5 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import type {WriterWithEncoder} from '@loaders.gl/loader-utils';

package/src/parquet-writer.ts

@@ -1,4 +1,5 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
 import type {WriterWithEncoder} from '@loaders.gl/loader-utils';

package/src/polyfills/buffer/buffer-polyfill.browser.ts

@@ -1,4 +1,6 @@
-// luma.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
 
 import {Buffer as BufferPolyfill} from './buffer';
 

package/src/polyfills/buffer/buffer-polyfill.node.ts

@@ -1,4 +1,6 @@
-// luma.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
 
 import {Buffer as BufferPolyfill} from './buffer';