@loaders.gl/shapefile 3.1.8 → 3.2.0-alpha.3

package/dist/lib/parsers/parse-dbf.js

@@ -53,15 +53,22 @@ class DBFParser {
  * @returns DBFTable or rows
  */
 function parseDBF(arrayBuffer, options = {}) {
-    const loaderOptions = options.dbf || {};
-    const { encoding } = loaderOptions;
+    const { encoding = 'latin1' } = options.dbf || {};
     const dbfParser = new DBFParser({ encoding });
     dbfParser.write(arrayBuffer);
     dbfParser.end();
     const { data, schema } = dbfParser.result;
-    switch (options.tables && options.tables.format) {
+    const shape = options?.tables?.format || options?.dbf?.shape;
+    switch (shape) {
+        case 'object-row-table': {
+            const table = {
+                shape: 'object-row-table',
+                schema,
+                data
+            };
+            return table;
+        }
         case 'table':
-            // TODO - parse columns
             return { schema, rows: data };
         case 'rows':
         default:
@@ -74,8 +81,7 @@ exports.parseDBF = parseDBF;
  * @param options
  */
 async function* parseDBFInBatches(asyncIterator, options = {}) {
-    const loaderOptions = options.dbf || {};
-    const { encoding } = loaderOptions;
+    const { encoding = 'latin1' } = options.dbf || {};
     const parser = new DBFParser({ encoding });
     let headerReturned = false;
     for await (const arrayBuffer of asyncIterator) {
@@ -114,7 +120,8 @@ function parseState(state, result, binaryReader, textDecoder) {
                     return state;
                 case STATE.START:
                     // Parse initial file header
-                    const dataView = binaryReader.getDataView(DBF_HEADER_SIZE, 'DBF header');
+                    // DBF Header
+                    const dataView = binaryReader.getDataView(DBF_HEADER_SIZE);
                     if (!dataView) {
                         return state;
                     }
@@ -130,7 +137,7 @@ function parseState(state, result, binaryReader, textDecoder) {
                     // Parse DBF field descriptors (schema)
                     const fieldDescriptorView = binaryReader.getDataView(
                     // @ts-ignore
-                    result.dbfHeader.headerLength - DBF_HEADER_SIZE, 'DBF field descriptors');
+                    result.dbfHeader.headerLength - DBF_HEADER_SIZE);
                     if (!fieldDescriptorView) {
                         return state;
                     }

package/dist/lib/parsers/parse-shapefile.d.ts

@@ -1,6 +1,7 @@
 import type { SHXOutput } from './parse-shx';
 import type { SHPHeader } from './parse-shp-header';
 import type { LoaderContext } from '@loaders.gl/loader-utils';
+import type { ShapefileLoaderOptions } from './types';
 interface ShapefileOutput {
     encoding?: string;
     prj?: string;
@@ -10,12 +11,8 @@ interface ShapefileOutput {
 }
 /**
  * Parsing of file in batches
- *
- * @param asyncIterator
- * @param options
- * @param context
  */
-export declare function parseShapefileInBatches(asyncIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>, options?: any, context?: LoaderContext): AsyncIterable<ShapefileOutput>;
+export declare function parseShapefileInBatches(asyncIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>, options?: ShapefileLoaderOptions, context?: LoaderContext): AsyncIterable<ShapefileOutput>;
 /**
  * Parse shapefile
  *
@@ -24,9 +21,7 @@ export declare function parseShapefileInBatches(asyncIterator: AsyncIterable<Arr
  * @param context
  * @returns output of shapefile
  */
-export declare function parseShapefile(arrayBuffer: ArrayBuffer, options?: {
-    [key: string]: any;
-}, context?: LoaderContext): Promise<ShapefileOutput>;
+export declare function parseShapefile(arrayBuffer: ArrayBuffer, options?: ShapefileLoaderOptions, context?: LoaderContext): Promise<ShapefileOutput>;
 /**
  *
  * @param options

package/dist/lib/parsers/parse-shapefile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-shapefile.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-shapefile.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAU5D,UAAU,eAAe;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,SAAS,CAAC;IAClB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AACD;;;;;;GAMG;AAEH,wBAAuB,uBAAuB,CAC5C,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,EACjE,OAAO,CAAC,EAAE,GAAG,EACb,OAAO,CAAC,EAAE,aAAa,GACtB,aAAa,CAAC,eAAe,CAAC,CAmEhC;AAED;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAClC,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,EAC9B,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,eAAe,CAAC,CAgC1B;AAwDD;;;;;GAKG;AAEH,wBAAsB,yBAAyB,CAC7C,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC;IACT,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC,CAkCD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAQ1E"}
+{"version":3,"file":"parse-shapefile.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-shapefile.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,SAAS,CAAC;AAUpD,UAAU,eAAe;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,SAAS,CAAC;IAClB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AACD;;GAEG;AAEH,wBAAuB,uBAAuB,CAC5C,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,EACjE,OAAO,CAAC,EAAE,sBAAsB,EAChC,OAAO,CAAC,EAAE,aAAa,GACtB,aAAa,CAAC,eAAe,CAAC,CAmEhC;AAED;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAClC,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE,sBAAsB,EAChC,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,eAAe,CAAC,CAgC1B;AAwDD;;;;;GAKG;AAEH,wBAAsB,yBAAyB,CAC7C,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC;IACT,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC,CAkCD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAQ1E"}

package/dist/lib/parsers/parse-shapefile.js

@@ -9,10 +9,6 @@ const shp_loader_1 = require("../../shp-loader");
 const dbf_loader_1 = require("../../dbf-loader");
 /**
  * Parsing of file in batches
- *
- * @param asyncIterator
- * @param options
- * @param context
  */
 // eslint-disable-next-line max-statements, complexity
 async function* parseShapefileInBatches(asyncIterator, options, context) {

package/dist/lib/parsers/parse-shp-geometry.d.ts

@@ -1,11 +1,10 @@
 import { BinaryGeometry } from '@loaders.gl/schema';
+import { SHPLoaderOptions } from './types';
 /**
  * Parse individual record
  *
  * @param view Record data
  * @return Binary Geometry Object
  */
-export declare function parseRecord(view: DataView, options?: {
-    shp?: any;
-}): BinaryGeometry | null;
+export declare function parseRecord(view: DataView, options?: SHPLoaderOptions): BinaryGeometry | null;
 //# sourceMappingURL=parse-shp-geometry.d.ts.map

package/dist/lib/parsers/parse-shp-geometry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-shp-geometry.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-shp-geometry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAqB,MAAM,oBAAoB,CAAC;AAItE;;;;;GAKG;AAEH,wBAAgB,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE;IAAC,GAAG,CAAC,EAAE,GAAG,CAAA;CAAC,GAAG,cAAc,GAAG,IAAI,CAoDxF"}
+{"version":3,"file":"parse-shp-geometry.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-shp-geometry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAqB,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAC,gBAAgB,EAAC,MAAM,SAAS,CAAC;AAIzC;;;;;GAKG;AAEH,wBAAgB,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,cAAc,GAAG,IAAI,CAoD7F"}

package/dist/lib/parsers/parse-shp-geometry.js

@@ -10,7 +10,7 @@ const LITTLE_ENDIAN = true;
  */
 // eslint-disable-next-line complexity
 function parseRecord(view, options) {
-    const { _maxDimensions } = options?.shp || {};
+    const { _maxDimensions = 4 } = options?.shp || {};
     let offset = 0;
     const type = view.getInt32(offset, LITTLE_ENDIAN);
     offset += Int32Array.BYTES_PER_ELEMENT;

package/dist/lib/parsers/parse-shp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-shp.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-shp.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAsDvD,wBAAgB,QAAQ,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,cAAc,EAAE,CAOrF;AAED;;;;GAIG;AACH,wBAAuB,iBAAiB,CACtC,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,EACjE,OAAO,CAAC,EAAE,MAAM,GACf,aAAa,CAAC,cAAc,GAAG,MAAM,CAAC,CAqBxC"}
+{"version":3,"file":"parse-shp.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-shp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAqEvD,wBAAgB,QAAQ,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,cAAc,EAAE,CAOrF;AAED;;;;GAIG;AACH,wBAAuB,iBAAiB,CACtC,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,EACjE,OAAO,CAAC,EAAE,MAAM,GACf,aAAa,CAAC,cAAc,GAAG,MAAM,CAAC,CAqBxC"}

package/dist/lib/parsers/parse-shp.js

@@ -25,7 +25,15 @@ class SHPParser {
         this.binaryReader = new binary_chunk_reader_1.default({ maxRewindBytes: SHP_RECORD_HEADER_SIZE });
         this.state = STATE.EXPECTING_HEADER;
         this.result = {
-            geometries: []
+            geometries: [],
+            // Initialize with number values to make TS happy
+            // These are initialized for real in STATE.EXPECTING_HEADER
+            progress: {
+                bytesTotal: NaN,
+                bytesUsed: NaN,
+                rows: NaN
+            },
+            currentIndex: NaN
         };
         this.options = options;
     }
@@ -130,7 +138,7 @@ function parseState(state, result, binaryReader, options) {
                             return state;
                         }
                         const invalidRecord = recordHeader.byteLength < 4 ||
-                            recordHeader.type !== result.header.type ||
+                            recordHeader.type !== result.header?.type ||
                             recordHeader.recordNumber !== result.currentIndex;
                         // All records must have at least four bytes (for the record shape type)
                         if (invalidRecord) {

package/dist/lib/parsers/types.d.ts

@@ -0,0 +1,63 @@
+import { Schema, ObjectRowTable } from '@loaders.gl/schema';
+import type { LoaderOptions } from '@loaders.gl/loader-utils';
+export declare type SHPLoaderOptions = LoaderOptions & {
+    shp?: {
+        _maxDimensions?: number;
+    };
+};
+export declare type DBFLoaderOptions = LoaderOptions & {
+    dbf?: {
+        encoding?: string;
+        shape?: 'rows' | 'table' | 'object-row-table';
+    };
+};
+export declare type ShapefileLoaderOptions = LoaderOptions & SHPLoaderOptions & {
+    shapefile?: {
+        shape?: 'geojson';
+    };
+    gis?: {
+        reproject?: boolean;
+        _targetCrs?: string;
+        /** @deprecated. Use options.shapefile.shape */
+        format?: 'geojson';
+    };
+};
+export declare type DBFRowsOutput = ObjectRowTable['data'];
+/**
+ * DBF Table output. Deprecated in favor of ObjectRowTable
+ * @deprecated
+ */
+export interface DBFTableOutput {
+    schema?: Schema;
+    rows: DBFRowsOutput;
+}
+export declare type DBFHeader = {
+    year: number;
+    month: number;
+    day: number;
+    nRecords: number;
+    headerLength: number;
+    recordLength: number;
+    languageDriver: number;
+};
+export declare type DBFField = {
+    name: string;
+    dataType: string;
+    fieldLength: number;
+    decimal: number;
+};
+export declare type DBFResult = {
+    data: {
+        [key: string]: any;
+    }[];
+    schema?: Schema;
+    error?: string;
+    dbfHeader?: DBFHeader;
+    dbfFields?: DBFField[];
+    progress?: {
+        bytesUsed: number;
+        rowsTotal: number;
+        rows: number;
+    };
+};
+//# sourceMappingURL=types.d.ts.map

package/dist/lib/parsers/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAE5D,oBAAY,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE;QACJ,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;CACH,CAAC;AAEF,oBAAY,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE;QACJ,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,kBAAkB,CAAC;KAC/C,CAAC;CACH,CAAC;AAEF,oBAAY,sBAAsB,GAAG,aAAa,GAChD,gBAAgB,GAAG;IACjB,SAAS,CAAC,EAAE;QACV,KAAK,CAAC,EAAE,SAAS,CAAC;KACnB,CAAC;IACF,GAAG,CAAC,EAAE;QACJ,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,+CAA+C;QAC/C,MAAM,CAAC,EAAE,SAAS,CAAC;KACpB,CAAC;CACH,CAAC;AAEJ,oBAAY,aAAa,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;AAEnD;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,aAAa,CAAC;CACrB;AAED,oBAAY,SAAS,GAAG;IAEtB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IAEZ,QAAQ,EAAE,MAAM,CAAC;IAEjB,YAAY,EAAE,MAAM,CAAC;IAErB,YAAY,EAAE,MAAM,CAAC;IAErB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,oBAAY,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,SAAS,GAAG;IACtB,IAAI,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,EAAE,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE;QACT,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;CACH,CAAC"}

package/dist/lib/parsers/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/lib/streaming/binary-chunk-reader.d.ts

@@ -1,11 +1,12 @@
+declare type BinaryChunkReaderOptions = {
+    maxRewindBytes: number;
+};
 export default class BinaryChunkReader {
     offset: number;
     arrayBuffers: ArrayBuffer[];
     ended: boolean;
     maxRewindBytes: number;
-    constructor(options?: {
-        [key: string]: any;
-    });
+    constructor(options?: BinaryChunkReaderOptions);
     /**
      * @param arrayBuffer
      */
@@ -56,4 +57,5 @@ export default class BinaryChunkReader {
      */
     rewind(bytes: number): void;
 }
+export {};
 //# sourceMappingURL=binary-chunk-reader.d.ts.map

package/dist/lib/streaming/binary-chunk-reader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"binary-chunk-reader.d.ts","sourceRoot":"","sources":["../../../src/lib/streaming/binary-chunk-reader.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;gBAEX,OAAO,CAAC,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC;IAY1C;;OAEG;IACH,KAAK,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAIrC,GAAG,IAAI,IAAI;IAKX;;;;;OAKG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAWzC;;;;;OAKG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,IAAI;IAwC9C;;;;;OAKG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IA+B3C;;OAEG;IACH,cAAc,IAAI,IAAI;IAUtB;;;;;;;;;OASG;IACH,oBAAoB,CAAC,aAAa,EAAE,GAAG,EAAE,GAAG,eAAe;IAoB3D;;OAEG;IACH,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAGzB;;OAEG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAI5B"}
+{"version":3,"file":"binary-chunk-reader.d.ts","sourceRoot":"","sources":["../../../src/lib/streaming/binary-chunk-reader.ts"],"names":[],"mappings":"AAAA,aAAK,wBAAwB,GAAG;IAC9B,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;gBAEX,OAAO,CAAC,EAAE,wBAAwB;IAY9C;;OAEG;IACH,KAAK,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAIrC,GAAG,IAAI,IAAI;IAKX;;;;;OAKG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAWzC;;;;;OAKG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,IAAI;IAwC9C;;;;;OAKG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IA+B3C;;OAEG;IACH,cAAc,IAAI,IAAI;IAUtB;;;;;;;;;OASG;IACH,oBAAoB,CAAC,aAAa,EAAE,GAAG,EAAE,GAAG,eAAe;IAoB3D;;OAEG;IACH,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAGzB;;OAEG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAI5B"}

package/dist/shp-worker.js

@@ -132,7 +132,7 @@
   // src/lib/parsers/parse-shp-geometry.ts
   var LITTLE_ENDIAN2 = true;
   function parseRecord(view, options) {
-    const { _maxDimensions } = options?.shp || {};
+    const { _maxDimensions = 4 } = options?.shp || {};
     let offset = 0;
     const type = view.getInt32(offset, LITTLE_ENDIAN2);
     offset += Int32Array.BYTES_PER_ELEMENT;
@@ -318,7 +318,13 @@
       this.binaryReader = new BinaryChunkReader({ maxRewindBytes: SHP_RECORD_HEADER_SIZE });
       this.state = STATE.EXPECTING_HEADER;
       this.result = {
-        geometries: []
+        geometries: [],
+        progress: {
+          bytesTotal: NaN,
+          bytesUsed: NaN,
+          rows: NaN
+        },
+        currentIndex: NaN
       };
       this.options = options;
     }
@@ -394,7 +400,7 @@
                 binaryReader.rewind(SHP_RECORD_HEADER_SIZE);
                 return state;
               }
-              const invalidRecord = recordHeader.byteLength < 4 || recordHeader.type !== result.header.type || recordHeader.recordNumber !== result.currentIndex;
+              const invalidRecord = recordHeader.byteLength < 4 || recordHeader.type !== result.header?.type || recordHeader.recordNumber !== result.currentIndex;
               if (invalidRecord) {
                 binaryReader.rewind(SHP_RECORD_HEADER_SIZE - 4);
               } else {
@@ -424,7 +430,7 @@
   }
 
   // src/shp-loader.ts
-  var VERSION = true ? "3.1.8" : "latest";
+  var VERSION = true ? "3.2.0-alpha.3" : "latest";
   var SHP_MAGIC_NUMBER2 = [0, 0, 39, 10];
   var SHPWorkerLoader = {
     name: "SHP",
@@ -485,16 +491,33 @@
   }
 
   // ../worker-utils/src/lib/worker-farm/worker-body.ts
+  function getParentPort() {
+    let parentPort;
+    try {
+      eval("globalThis.parentPort = require('worker_threads').parentPort");
+      parentPort = globalThis.parentPort;
+    } catch {
+    }
+    return parentPort;
+  }
   var onMessageWrapperMap = new Map();
   var WorkerBody = class {
+    static inWorkerThread() {
+      return typeof self !== "undefined" || Boolean(getParentPort());
+    }
     static set onmessage(onMessage) {
-      self.onmessage = (message) => {
-        if (!isKnownMessage(message)) {
-          return;
-        }
-        const { type, payload } = message.data;
+      function handleMessage(message) {
+        const parentPort3 = getParentPort();
+        const { type, payload } = parentPort3 ? message : message.data;
         onMessage(type, payload);
-      };
+      }
+      const parentPort2 = getParentPort();
+      if (parentPort2) {
+        parentPort2.on("message", handleMessage);
+        parentPort2.on("exit", () => console.debug("Node worker closing"));
+      } else {
+        globalThis.onmessage = handleMessage;
+      }
     }
     static addEventListener(onMessage) {
       let onMessageWrapper = onMessageWrapperMap.get(onMessage);
@@ -503,22 +526,36 @@
           if (!isKnownMessage(message)) {
             return;
           }
-          const { type, payload } = message.data;
+          const parentPort3 = getParentPort();
+          const { type, payload } = parentPort3 ? message : message.data;
           onMessage(type, payload);
         };
       }
-      self.addEventListener("message", onMessageWrapper);
+      const parentPort2 = getParentPort();
+      if (parentPort2) {
+        console.error("not implemented");
+      } else {
+        globalThis.addEventListener("message", onMessageWrapper);
+      }
     }
     static removeEventListener(onMessage) {
       const onMessageWrapper = onMessageWrapperMap.get(onMessage);
       onMessageWrapperMap.delete(onMessage);
-      self.removeEventListener("message", onMessageWrapper);
+      const parentPort2 = getParentPort();
+      if (parentPort2) {
+        console.error("not implemented");
+      } else {
+        globalThis.removeEventListener("message", onMessageWrapper);
+      }
     }
     static postMessage(type, payload) {
-      if (self) {
-        const data = { source: "loaders.gl", type, payload };
-        const transferList = getTransferList(payload);
-        self.postMessage(data, transferList);
+      const data = { source: "loaders.gl", type, payload };
+      const transferList = getTransferList(payload);
+      const parentPort2 = getParentPort();
+      if (parentPort2) {
+        parentPort2.postMessage(data, transferList);
+      } else {
+        globalThis.postMessage(data, transferList);
       }
     }
   };
@@ -530,19 +567,20 @@
   // ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
   var requestId = 0;
   function createLoaderWorker(loader) {
-    if (typeof self === "undefined") {
+    if (!WorkerBody.inWorkerThread()) {
       return;
     }
     WorkerBody.onmessage = async (type, payload) => {
       switch (type) {
         case "process":
           try {
-            const { input, options = {} } = payload;
+            const { input, options = {}, context = {} } = payload;
             const result = await parseData({
               loader,
               arrayBuffer: input,
               options,
               context: {
+                ...context,
                 parse: parseOnMainThread
               }
             });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@loaders.gl/shapefile",
   "description": "Loader for the Shapefile Format",
-  "version": "3.1.8",
+  "version": "3.2.0-alpha.3",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -37,10 +37,10 @@
     "build-worker-dbf": "esbuild src/workers/dbf-worker.ts --bundle --outfile=dist/dbf-worker.js --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/gis": "3.1.8",
-    "@loaders.gl/loader-utils": "3.1.8",
-    "@loaders.gl/schema": "3.1.8",
+    "@loaders.gl/gis": "3.2.0-alpha.3",
+    "@loaders.gl/loader-utils": "3.2.0-alpha.3",
+    "@loaders.gl/schema": "3.2.0-alpha.3",
     "@math.gl/proj4": "^3.5.1"
   },
-  "gitHead": "0ef07b4e9fc20f5a882224cf241c6fd1bad898d8"
+  "gitHead": "f0d4b801efeb7094283106352ee759eccfb21f10"
 }

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

@@ -1,47 +1,21 @@
-import {Schema, Field, Bool, Utf8, Float64, TimestampMillisecond} from '@loaders.gl/schema';
+import {
+  Schema,
+  Field,
+  Bool,
+  Utf8,
+  Float64,
+  TimestampMillisecond,
+  ObjectRowTable
+} from '@loaders.gl/schema';
 import BinaryChunkReader from '../streaming/binary-chunk-reader';
-
-type DBFRowsOutput = object[];
-
-interface DBFTableOutput {
-  schema?: Schema;
-  rows: DBFRowsOutput;
-}
-
-type DBFHeader = {
-  // Last updated date
-  year: number;
-  month: number;
-  day: number;
-  // Number of records in data file
-  nRecords: number;
-  // Length of header in bytes
-  headerLength: number;
-  // Length of each record
-  recordLength: number;
-  // Not sure if this is usually set
-  languageDriver: number;
-};
-
-type DBFField = {
-  name: string;
-  dataType: string;
-  fieldLength: number;
-  decimal: number;
-};
-
-type DBFResult = {
-  data: {[key: string]: any}[];
-  schema?: Schema;
-  error?: string;
-  dbfHeader?: DBFHeader;
-  dbfFields?: DBFField[];
-  progress?: {
-    bytesUsed: number;
-    rowsTotal: number;
-    rows: number;
-  };
-};
+import {
+  DBFLoaderOptions,
+  DBFResult,
+  DBFTableOutput,
+  DBFHeader,
+  DBFRowsOutput,
+  DBFField
+} from './types';
 
 const LITTLE_ENDIAN = true;
 const DBF_HEADER_SIZE = 32;
@@ -98,21 +72,27 @@ class DBFParser {
  */
 export function parseDBF(
   arrayBuffer: ArrayBuffer,
-  options: any = {}
-): DBFRowsOutput | DBFTableOutput {
-  const loaderOptions = options.dbf || {};
-  const {encoding} = loaderOptions;
+  options: DBFLoaderOptions = {}
+): DBFRowsOutput | DBFTableOutput | ObjectRowTable {
+  const {encoding = 'latin1'} = options.dbf || {};
 
   const dbfParser = new DBFParser({encoding});
   dbfParser.write(arrayBuffer);
   dbfParser.end();
 
   const {data, schema} = dbfParser.result;
-  switch (options.tables && options.tables.format) {
+  const shape = options?.tables?.format || options?.dbf?.shape;
+  switch (shape) {
+    case 'object-row-table': {
+      const table: ObjectRowTable = {
+        shape: 'object-row-table',
+        schema,
+        data
+      };
+      return table;
+    }
     case 'table':
-      // TODO - parse columns
       return {schema, rows: data};
-
     case 'rows':
     default:
       return data;
@@ -124,10 +104,9 @@ export function parseDBF(
  */
 export async function* parseDBFInBatches(
   asyncIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>,
-  options: any = {}
+  options: DBFLoaderOptions = {}
 ): AsyncIterable<DBFHeader | DBFRowsOutput | DBFTableOutput> {
-  const loaderOptions = options.dbf || {};
-  const {encoding} = loaderOptions;
+  const {encoding = 'latin1'} = options.dbf || {};
 
   const parser = new DBFParser({encoding});
   let headerReturned = false;
@@ -160,7 +139,7 @@ export async function* parseDBFInBatches(
 function parseState(
   state: STATE,
   result: DBFResult,
-  binaryReader: {[key: string]: any},
+  binaryReader: BinaryChunkReader,
   textDecoder: TextDecoder
 ): STATE {
   // eslint-disable-next-line no-constant-condition
@@ -173,7 +152,8 @@ function parseState(
 
         case STATE.START:
           // Parse initial file header
-          const dataView = binaryReader.getDataView(DBF_HEADER_SIZE, 'DBF header');
+          // DBF Header
+          const dataView = binaryReader.getDataView(DBF_HEADER_SIZE);
           if (!dataView) {
             return state;
           }
@@ -190,8 +170,7 @@ function parseState(
           // Parse DBF field descriptors (schema)
           const fieldDescriptorView = binaryReader.getDataView(
             // @ts-ignore
-            result.dbfHeader.headerLength - DBF_HEADER_SIZE,
-            'DBF field descriptors'
+            result.dbfHeader.headerLength - DBF_HEADER_SIZE
           );
           if (!fieldDescriptorView) {
             return state;
@@ -398,7 +377,7 @@ function parseCharacter(text: string): string | null {
  * @returns Field
  */
 // eslint-disable
-function makeField({name, dataType, fieldLength, decimal}): Field {
+function makeField({name, dataType, fieldLength, decimal}: DBFField): Field {
   switch (dataType) {
     case 'B':
       return new Field(name, new Float64(), true);

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

@@ -2,6 +2,7 @@
 import type {SHXOutput} from './parse-shx';
 import type {SHPHeader} from './parse-shp-header';
 import type {LoaderContext} from '@loaders.gl/loader-utils';
+import type {ShapefileLoaderOptions} from './types';
 
 import {binaryToGeometry, transformGeoJsonCoords} from '@loaders.gl/gis';
 import {Proj4Projection} from '@math.gl/proj4';
@@ -20,15 +21,11 @@ interface ShapefileOutput {
 }
 /**
  * Parsing of file in batches
- *
- * @param asyncIterator
- * @param options
- * @param context
  */
 // eslint-disable-next-line max-statements, complexity
 export async function* parseShapefileInBatches(
   asyncIterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>,
-  options?: any,
+  options?: ShapefileLoaderOptions,
   context?: LoaderContext
 ): AsyncIterable<ShapefileOutput> {
   const {reproject = false, _targetCrs = 'WGS84'} = options?.gis || {};
@@ -109,7 +106,7 @@ export async function* parseShapefileInBatches(
  */
 export async function parseShapefile(
   arrayBuffer: ArrayBuffer,
-  options?: {[key: string]: any},
+  options?: ShapefileLoaderOptions,
   context?: LoaderContext
 ): Promise<ShapefileOutput> {
   const {reproject = false, _targetCrs = 'WGS84'} = options?.gis || {};

package/src/lib/parsers/parse-shp-geometry.ts

@@ -1,4 +1,5 @@
 import {BinaryGeometry, BinaryGeometryType} from '@loaders.gl/schema';
+import {SHPLoaderOptions} from './types';
 
 const LITTLE_ENDIAN = true;
 
@@ -9,8 +10,8 @@ const LITTLE_ENDIAN = true;
  * @return Binary Geometry Object
  */
 // eslint-disable-next-line complexity
-export function parseRecord(view: DataView, options?: {shp?: any}): BinaryGeometry | null {
-  const {_maxDimensions} = options?.shp || {};
+export function parseRecord(view: DataView, options?: SHPLoaderOptions): BinaryGeometry | null {
+  const {_maxDimensions = 4} = options?.shp || {};
 
   let offset = 0;
   const type: number = view.getInt32(offset, LITTLE_ENDIAN);