@loaders.gl/arrow 4.2.0-alpha.6 → 4.2.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/arrow",
-  "version": "4.2.0-alpha.6",
+  "version": "4.2.0-beta.1",
   "description": "Simple columnar table loader for the Apache Arrow format",
   "license": "MIT",
   "type": "module",
@@ -53,16 +53,16 @@
     "build-worker2": "esbuild src/workers/arrow-worker.ts --bundle --outfile=dist/arrow-worker.js --platform=browser --external:{stream}"
   },
   "dependencies": {
-    "@loaders.gl/gis": "4.2.0-alpha.6",
-    "@loaders.gl/loader-utils": "4.2.0-alpha.6",
-    "@loaders.gl/schema": "4.2.0-alpha.6",
-    "@loaders.gl/wkt": "4.2.0-alpha.6",
-    "@loaders.gl/worker-utils": "4.2.0-alpha.6",
+    "@loaders.gl/gis": "4.2.0-beta.1",
+    "@loaders.gl/loader-utils": "4.2.0-beta.1",
+    "@loaders.gl/schema": "4.2.0-beta.1",
+    "@loaders.gl/wkt": "4.2.0-beta.1",
+    "@loaders.gl/worker-utils": "4.2.0-beta.1",
     "@math.gl/polygon": "4.0.0",
     "apache-arrow": ">= 15.0.0"
   },
   "peerDependencies": {
     "@loaders.gl/core": "^4.0.0"
   },
-  "gitHead": "37bd8ca71763529f18727ee4bf29dd176aa914ca"
+  "gitHead": "c386a9196516fe3ff24847b40e6c77be039cf905"
 }

package/src/arrow-loader.ts

@@ -17,15 +17,24 @@ import {parseArrowInBatches} from './parsers/parse-arrow-in-batches';
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
+/** ArrowLoader options */
 export type ArrowLoaderOptions = LoaderOptions & {
+  /** ArrowLoader options */
   arrow?: {
+    /** Shape of returned data */
     shape: 'arrow-table' | 'columnar-table' | 'array-row-table' | 'object-row-table';
+    /** Debounce time between batches (prevent excessive numbers of small batches) */
     batchDebounceMs?: number;
+    /** Override the URL to the worker bundle (by default loads from unpkg.com) */
+    workerUrl?: string;
   };
 };
 
 /** ArrowJS table loader */
-export const ArrowWorkerLoader: Loader<ArrowTable, never, ArrowLoaderOptions> = {
+export const ArrowWorkerLoader = {
+  dataType: null as unknown as ArrowTable,
+  batchType: null as never,
+
   name: 'Apache Arrow',
   id: 'arrow',
   module: 'arrow',
@@ -45,18 +54,18 @@ export const ArrowWorkerLoader: Loader<ArrowTable, never, ArrowLoaderOptions> =
       shape: 'columnar-table'
     }
   }
-};
+} as const satisfies Loader<ArrowTable, never, ArrowLoaderOptions>;
 
 /** ArrowJS table loader */
-export const ArrowLoader: LoaderWithParser<
-  ArrowTable | ColumnarTable | ObjectRowTable | ArrayRowTable,
-  ArrowTableBatch,
-  ArrowLoaderOptions
-> = {
+export const ArrowLoader = {
   ...ArrowWorkerLoader,
   parse: async (arraybuffer: ArrayBuffer, options?: ArrowLoaderOptions) =>
     parseArrowSync(arraybuffer, options?.arrow),
   parseSync: (arraybuffer: ArrayBuffer, options?: ArrowLoaderOptions) =>
     parseArrowSync(arraybuffer, options?.arrow),
   parseInBatches: parseArrowInBatches
-};
+} as const satisfies LoaderWithParser<
+  ArrowTable | ColumnarTable | ObjectRowTable | ArrayRowTable,
+  ArrowTableBatch,
+  ArrowLoaderOptions
+>;

package/src/arrow-writer.ts

@@ -13,7 +13,7 @@ type ArrowWriterOptions = WriterOptions & {
 };
 
 /** Apache Arrow writer */
-export const ArrowWriter: WriterWithEncoder<ColumnarTable, never, ArrowWriterOptions> = {
+export const ArrowWriter = {
   name: 'Apache Arrow',
   id: 'arrow',
   module: 'arrow',
@@ -32,4 +32,4 @@ export const ArrowWriter: WriterWithEncoder<ColumnarTable, never, ArrowWriterOpt
   encodeSync(data, options?) {
     return encodeArrowSync(data);
   }
-};
+} as const satisfies WriterWithEncoder<ColumnarTable, never, ArrowWriterOptions>;

package/src/geoarrow/convert-geoarrow-to-geojson-geometry.ts

@@ -77,14 +77,14 @@ function arrowWKBToFeature(arrowCellValue: any) {
     arrowCellValue.byteOffset,
     arrowCellValue.byteOffset + arrowCellValue.byteLength
   );
-  const binaryGeometry = WKBLoader.parseSync?.(arrayBuffer)! as BinaryGeometry;
+  const binaryGeometry = WKBLoader.parseSync?.(arrayBuffer) as BinaryGeometry;
   const geometry = binaryToGeometry(binaryGeometry);
   return geometry;
 }
 
 function arrowWKTToFeature(arrowCellValue: any) {
   const string: string = arrowCellValue;
-  return WKTLoader.parseTextSync?.(string)!;
+  return WKTLoader.parseTextSync?.(string);
 }
 
 /**

package/src/geoarrow-loader.ts

@@ -11,42 +11,34 @@ import {parseGeoArrowInBatches} from './parsers/parse-geoarrow-in-batches';
 
 export type GeoArrowLoaderOptions = LoaderOptions & {
   arrow?: {
-    shape: 'arrow-table' | 'binary-geometry';
+    shape?: 'arrow-table' | 'binary-geometry';
   };
 };
 
 /** ArrowJS table loader */
-export const GeoArrowWorkerLoader: Loader<
-  ArrowTable | BinaryGeometry,
-  never,
-  GeoArrowLoaderOptions
-> = {
+export const GeoArrowWorkerLoader = {
   ...ArrowWorkerLoader,
   options: {
     arrow: {
       shape: 'arrow-table'
     }
   }
-};
+} as const satisfies Loader<ArrowTable | BinaryGeometry, never, GeoArrowLoaderOptions>;
 
 /**
  * GeoArrowLoader loads an Apache Arrow table, parses GeoArrow type extension data
  * to convert it to a GeoJSON table or a BinaryGeometry
  */
-export const GeoArrowLoader: LoaderWithParser<
-  ArrowTable | GeoJSONTable, // | BinaryGeometry,
-  ArrowTableBatch | GeoJSONTableBatch, // | BinaryGeometry,
-  GeoArrowLoaderOptions
-> = {
-  ...ArrowWorkerLoader,
-  options: {
-    arrow: {
-      shape: 'arrow-table'
-    }
-  },
+export const GeoArrowLoader = {
+  ...GeoArrowWorkerLoader,
+
   parse: async (arraybuffer: ArrayBuffer, options?: GeoArrowLoaderOptions) =>
     parseGeoArrowSync(arraybuffer, options?.arrow),
   parseSync: (arraybuffer: ArrayBuffer, options?: GeoArrowLoaderOptions) =>
     parseGeoArrowSync(arraybuffer, options?.arrow),
   parseInBatches: parseGeoArrowInBatches
-};
+} as const satisfies LoaderWithParser<
+  ArrowTable | GeoJSONTable, // | BinaryGeometry,
+  ArrowTableBatch | GeoJSONTableBatch, // | BinaryGeometry,
+  GeoArrowLoaderOptions
+>;

package/src/geoarrow-writer.ts

@@ -13,11 +13,7 @@ type ArrowWriterOptions = WriterOptions & {
 };
 
 /** Apache Arrow writer */
-export const GeoArrowWriter: WriterWithEncoder<
-  GeoJSONTable | BinaryGeometry,
-  never,
-  ArrowWriterOptions
-> = {
+export const GeoArrowWriter = {
   name: 'Apache Arrow',
   id: 'arrow',
   module: 'arrow',
@@ -38,4 +34,4 @@ export const GeoArrowWriter: WriterWithEncoder<
     // @ts-expect-error
     return encodeGeoArrowSync(data);
   }
-};
+} as const satisfies WriterWithEncoder<GeoJSONTable | BinaryGeometry, never, ArrowWriterOptions>;