@loaders.gl/csv 4.4.0-alpha.2 → 4.4.0-alpha.9

package/dist/papaparse/papaparse.js

@@ -22,3 +22,4 @@ export default {
     Parser,
     ParserHandle
 };
+//# sourceMappingURL=papaparse.js.map

package/dist/papaparse/papaparse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"papaparse.js","sourceRoot":"","sources":["../../src/papaparse/papaparse.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AACpC,kCAAkC;AAElC,8DAA8D;AAC9D,qCAAqC;AAErC,gBAAgB;AAChB,sBAAsB;AACtB,wCAAwC;AACxC,6EAA6E;AAC7E,yEAAyE;AACzE,wCAAwC;AAExC,OAAO,EAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAC,yBAAsB;AAC7E,OAAO,EAAC,SAAS,EAAC,yBAAsB;AACxC,OAAO,EAAC,IAAI,EAAC,4BAAyB;AAKtC,eAAe;IACb,GAAG,IAAI;IAEP,KAAK,EAAE,SAAS;IAChB,OAAO,EAAE,SAAS;IAElB,aAAa;IAEb,2CAA2C;IAC3C,MAAM;IACN,YAAY;CACb,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/csv",
-  "version": "4.4.0-alpha.2",
+  "version": "4.4.0-alpha.9",
   "description": "Framework-independent loader for CSV and DSV table formats",
   "license": "MIT",
   "type": "module",
@@ -44,12 +44,12 @@
     "build-bundle-dev": "ocular-bundle ./bundle.ts --env=dev --output=dist/dist.dev.js"
   },
   "dependencies": {
-    "@loaders.gl/loader-utils": "4.4.0-alpha.2",
-    "@loaders.gl/schema": "4.4.0-alpha.2",
+    "@loaders.gl/loader-utils": "4.4.0-alpha.9",
+    "@loaders.gl/schema": "4.4.0-alpha.9",
     "d3-dsv": "^1.2.0"
   },
   "peerDependencies": {
     "@loaders.gl/core": "4.4.0-alpha.1"
   },
-  "gitHead": "3d9fed050eabdc0812ddf2f4d5fb9914a34ee0c2"
+  "gitHead": "e9e6710379718c7663e97eba868c76e15de4cb84"
 }

package/src/csv-arrow-loader.ts

@@ -33,7 +33,9 @@ async function parseCSVToArrow(csvText: string, options?: CSVLoaderOptions): Pro
 }
 
 function parseCSVToArrowBatches(
-  asyncIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>,
+  asyncIterator:
+    | AsyncIterable<ArrayBufferLike | ArrayBufferView>
+    | Iterable<ArrayBufferLike | ArrayBufferView>,
   options?: CSVArrowLoaderOptions
 ): AsyncIterable<ArrowTableBatch> {
   const tableIterator = CSVLoader.parseInBatches(asyncIterator, options);

package/src/csv-loader.ts

@@ -5,7 +5,7 @@
 import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
 import type {Schema, ArrayRowTable, ObjectRowTable, TableBatch} from '@loaders.gl/schema';
 
-import {log} from '@loaders.gl/loader-utils';
+import {log, toArrayBufferIterator} from '@loaders.gl/loader-utils';
 import {
   AsyncQueue,
   deduceTableSchema,
@@ -133,14 +133,16 @@ async function parseCSV(
 
 // TODO - support batch size 0 = no batching/single batch?
 function parseCSVInBatches(
-  asyncIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>,
+  asyncIterator:
+    | AsyncIterable<ArrayBufferLike | ArrayBufferView>
+    | Iterable<ArrayBufferLike | ArrayBufferView>,
   options?: CSVLoaderOptions
 ): AsyncIterable<TableBatch> {
   // Papaparse does not support standard batch size handling
   // TODO - investigate papaparse chunks mode
   options = {...options};
-  if (options.batchSize === 'auto') {
-    options.batchSize = 4000;
+  if (options?.core?.batchSize === 'auto') {
+    options.core.batchSize = 4000;
   }
 
   // Apps can call the parse method directly, we so apply default options here
@@ -208,7 +210,7 @@ function parseCSVInBatches(
         row = JSON.parse(JSON.stringify(row));
       }
 
-      const shape = csvOptions.shape || DEFAULT_CSV_SHAPE;
+      const shape = (options as any)?.shape || csvOptions.shape || DEFAULT_CSV_SHAPE;
 
       // Add the row
       tableBatchBuilder =
@@ -218,7 +220,7 @@ function parseCSVInBatches(
           schema,
           {
             shape,
-            ...options
+            ...(options?.core || {})
           }
         );
 
@@ -251,7 +253,7 @@ function parseCSVInBatches(
     }
   };
 
-  Papa.parse(asyncIterator, config, AsyncIteratorStreamer);
+  Papa.parse(toArrayBufferIterator(asyncIterator), config, AsyncIteratorStreamer);
 
   // TODO - Does it matter if we return asyncIterable or asyncIterator
   // return asyncQueue[Symbol.asyncIterator]();