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

package/dist/shp-loader.d.ts

@@ -1,9 +1,34 @@
-import type { Loader, LoaderWithParser } from '@loaders.gl/loader-utils';
+import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
 export declare const SHP_MAGIC_NUMBER: number[];
+/** SHPLoader */
+export type SHPLoaderOptions = LoaderOptions & {
+    dbf?: {
+        _maxDimensions?: number;
+        /** Override the URL to the worker bundle (by default loads from unpkg.com) */
+        workerUrl?: string;
+    };
+};
 /**
  * SHP file loader
  */
-export declare const SHPWorkerLoader: Loader;
+export declare const SHPWorkerLoader: {
+    readonly dataType: unknown;
+    readonly batchType: never;
+    readonly name: "SHP";
+    readonly id: "shp";
+    readonly module: "shapefile";
+    readonly version: any;
+    readonly worker: true;
+    readonly category: "geometry";
+    readonly extensions: ["shp"];
+    readonly mimeTypes: ["application/octet-stream"];
+    readonly tests: [ArrayBufferLike];
+    readonly options: {
+        readonly shp: {
+            readonly _maxDimensions: 4;
+        };
+    };
+};
 /** SHP file loader */
 export declare const SHPLoader: LoaderWithParser;
 //# sourceMappingURL=shp-loader.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"shp-loader.d.ts","sourceRoot":"","sources":["../src/shp-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAOvE,eAAO,MAAM,gBAAgB,UAA2B,CAAC;AAEzD;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,MAgB7B,CAAC;AAEF,sBAAsB;AACtB,eAAO,MAAM,SAAS,EAAE,gBAQvB,CAAC"}
+{"version":3,"file":"shp-loader.d.ts","sourceRoot":"","sources":["../src/shp-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAS,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAOtF,eAAO,MAAM,gBAAgB,UAA2B,CAAC;AAEzD,gBAAgB;AAChB,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE;QACJ,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,8EAA8E;QAC9E,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;CAmB2B,CAAC;AAExD,sBAAsB;AACtB,eAAO,MAAM,SAAS,EAAE,gBAQvB,CAAC"}

package/dist/shp-loader.js

@@ -1,12 +1,17 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { parseSHP, parseSHPInBatches } from "./lib/parsers/parse-shp.js";
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.2.0-alpha.5" !== 'undefined' ? "4.2.0-alpha.5" : 'latest';
+const VERSION = typeof "4.2.0-alpha.6" !== 'undefined' ? "4.2.0-alpha.6" : 'latest';
 export const SHP_MAGIC_NUMBER = [0x00, 0x00, 0x27, 0x0a];
 /**
  * SHP file loader
  */
 export const SHPWorkerLoader = {
+    dataType: null,
+    batchType: null,
     name: 'SHP',
     id: 'shp',
     module: 'shapefile',

package/dist/shp-worker.js

@@ -484,9 +484,11 @@
   }
 
   // src/shp-loader.ts
-  var VERSION = true ? "4.2.0-alpha.5" : "latest";
+  var VERSION = true ? "4.2.0-alpha.6" : "latest";
   var SHP_MAGIC_NUMBER2 = [0, 0, 39, 10];
   var SHPWorkerLoader = {
+    dataType: null,
+    batchType: null,
     name: "SHP",
     id: "shp",
     module: "shapefile",

package/dist/workers/dbf-worker.js

@@ -1,3 +1,6 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { DBFLoader } from "../dbf-loader.js";
 import { createLoaderWorker } from '@loaders.gl/loader-utils';
 createLoaderWorker(DBFLoader);

package/dist/workers/shp-worker.js

@@ -1,3 +1,6 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { SHPLoader } from "../shp-loader.js";
 import { createLoaderWorker } from '@loaders.gl/loader-utils';
 createLoaderWorker(SHPLoader);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@loaders.gl/shapefile",
   "description": "Loader for the Shapefile Format",
-  "version": "4.2.0-alpha.6",
+  "version": "4.2.0-beta.1",
   "license": "MIT",
   "type": "module",
   "publishConfig": {
@@ -45,13 +45,13 @@
     "build-worker-dbf": "esbuild src/workers/dbf-worker.ts --bundle --outfile=dist/dbf-worker.js --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "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/gis": "4.2.0-beta.1",
+    "@loaders.gl/loader-utils": "4.2.0-beta.1",
+    "@loaders.gl/schema": "4.2.0-beta.1",
     "@math.gl/proj4": "^4.0.0"
   },
   "peerDependencies": {
     "@loaders.gl/core": "^4.0.0"
   },
-  "gitHead": "37bd8ca71763529f18727ee4bf29dd176aa914ca"
+  "gitHead": "c386a9196516fe3ff24847b40e6c77be039cf905"
 }

package/src/dbf-loader.ts

@@ -1,15 +1,30 @@
-import type {Loader, LoaderWithParser} from '@loaders.gl/loader-utils';
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+import type {Loader, LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
 import {parseDBF, parseDBFInBatches} from './lib/parsers/parse-dbf';
 
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
+export type DBFLoaderOptions = LoaderOptions & {
+  dbf?: {
+    encoding?: string;
+    /** Override the URL to the worker bundle (by default loads from unpkg.com) */
+    workerUrl?: string;
+  };
+};
+
 /**
  * DBFLoader - DBF files are used to contain non-geometry columns in Shapefiles
  */
-export const DBFWorkerLoader: Loader = {
+export const DBFWorkerLoader = {
   name: 'DBF',
+  dataType: null as unknown,
+  batchType: null as never,
+
   id: 'dbf',
   module: 'shapefile',
   version: VERSION,
@@ -22,7 +37,7 @@ export const DBFWorkerLoader: Loader = {
       encoding: 'latin1'
     }
   }
-};
+} as const satisfies Loader<any, any, DBFLoaderOptions>;
 
 /** DBF file loader */
 export const DBFLoader: LoaderWithParser = {

package/src/index.ts

@@ -1,5 +1,14 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+export type {ShapefileLoaderOptions} from './shapefile-loader';
 export {ShapefileLoader} from './shapefile-loader';
+
+export type {DBFLoaderOptions} from './dbf-loader';
 export {DBFLoader, DBFWorkerLoader} from './dbf-loader';
+
+export type {SHPLoaderOptions} from './shp-loader';
 export {SHPLoader, SHPWorkerLoader} from './shp-loader';
 
 // EXPERIMENTAL

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

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {Field, ObjectRowTable} from '@loaders.gl/schema';
 import {BinaryChunkReader} from '../streaming/binary-chunk-reader';
 import {

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

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 // import type {Feature} from '@loaders.gl/gis';
 import {LoaderContext, parseInBatchesFromContext, parseFromContext} from '@loaders.gl/loader-utils';
 import {binaryToGeometry, transformGeoJsonCoords} from '@loaders.gl/gis';

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

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {BinaryGeometry, BinaryGeometryType} from '@loaders.gl/schema';
 import {SHPLoaderOptions} from './types';
 

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

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 export interface SHPHeader {
   /** SHP Magic number */
   magic: number;

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

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import type {BinaryGeometry} from '@loaders.gl/schema';
 import {BinaryChunkReader} from '../streaming/binary-chunk-reader';
 import {parseSHPHeader, SHPHeader} from './parse-shp-header';

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

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {parseSHPHeader} from './parse-shp-header';
 
 export interface SHXOutput {

package/src/lib/parsers/types.ts

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

package/src/shapefile-loader.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
 import {SHP_MAGIC_NUMBER} from './shp-loader';
 import {parseShapefile, parseShapefileInBatches} from './lib/parsers/parse-shapefile';
@@ -10,6 +14,8 @@ const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 export type ShapefileLoaderOptions = LoaderOptions & {
   shapefile?: {
     shape?: 'geojson-table' | 'v3';
+    /** @deprecated Worker URLs must be specified with .dbf.workerUrl * .shp.workerUrl */
+    workerUrl?: never;
   };
 };
 
@@ -17,7 +23,7 @@ export type ShapefileLoaderOptions = LoaderOptions & {
  * Shapefile loader
  * @note Shapefile is multifile format and requires providing additional files
  */
-export const ShapefileLoader: LoaderWithParser<GeoJSONTable, Batch, ShapefileLoaderOptions> = {
+export const ShapefileLoader = {
   name: 'Shapefile',
   id: 'shapefile',
   module: 'shapefile',
@@ -38,4 +44,4 @@ export const ShapefileLoader: LoaderWithParser<GeoJSONTable, Batch, ShapefileLoa
   parse: parseShapefile,
   // @ts-expect-error
   parseInBatches: parseShapefileInBatches
-};
+} as const satisfies LoaderWithParser<GeoJSONTable, Batch, ShapefileLoaderOptions>;

package/src/shp-loader.ts

@@ -1,4 +1,8 @@
-import type {Loader, LoaderWithParser} from '@loaders.gl/loader-utils';
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+import type {Loader, LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
 import {parseSHP, parseSHPInBatches} from './lib/parsers/parse-shp';
 
 // __VERSION__ is injected by babel-plugin-version-inline
@@ -7,10 +11,22 @@ const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
 export const SHP_MAGIC_NUMBER = [0x00, 0x00, 0x27, 0x0a];
 
+/** SHPLoader */
+export type SHPLoaderOptions = LoaderOptions & {
+  dbf?: {
+    _maxDimensions?: number;
+    /** Override the URL to the worker bundle (by default loads from unpkg.com) */
+    workerUrl?: string;
+  };
+};
+
 /**
  * SHP file loader
  */
-export const SHPWorkerLoader: Loader = {
+export const SHPWorkerLoader = {
+  dataType: null as unknown,
+  batchType: null as never,
+
   name: 'SHP',
   id: 'shp',
   module: 'shapefile',
@@ -26,7 +42,7 @@ export const SHPWorkerLoader: Loader = {
       _maxDimensions: 4
     }
   }
-};
+} as const satisfies Loader<any, any, SHPLoaderOptions>;
 
 /** SHP file loader */
 export const SHPLoader: LoaderWithParser = {

package/src/workers/dbf-worker.ts

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

package/src/workers/shp-worker.ts

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