@loaders.gl/wkt 4.2.0-alpha.5 → 4.2.0-beta.1

package/src/twkb-loader.ts

@@ -16,7 +16,10 @@ export type WKBLoaderOptions = LoaderOptions & {
 /**
  * Worker loader for WKB (Well-Known Binary)
  */
-export const TWKBWorkerLoader: Loader<Geometry, never, WKBLoaderOptions> = {
+export const TWKBWorkerLoader = {
+  dataType: null as unknown as Geometry,
+  batchType: null as never,
+
   name: 'TWKB (Tiny Well-Known Binary)',
   id: 'twkb',
   module: 'wkt',
@@ -32,13 +35,13 @@ export const TWKBWorkerLoader: Loader<Geometry, never, WKBLoaderOptions> = {
       shape: 'binary-geometry' // 'geojson-geometry'
     }
   }
-};
+} as const satisfies Loader<Geometry, never, WKBLoaderOptions>;
 
 /**
  * Loader for WKB (Well-Known Binary)
  */
-export const TWKBLoader: LoaderWithParser<BinaryGeometry | Geometry, never, WKBLoaderOptions> = {
+export const TWKBLoader = {
   ...TWKBWorkerLoader,
   parse: async (arrayBuffer: ArrayBuffer) => parseTWKBGeometry(arrayBuffer),
   parseSync: parseTWKBGeometry
-};
+} as const satisfies LoaderWithParser<BinaryGeometry | Geometry, never, WKBLoaderOptions>;

package/src/twkb-writer.ts

@@ -17,7 +17,7 @@ export type TWKBWriterOptions = WriterOptions & {
 /**
  * WKB exporter
  */
-export const TWKBWriter: WriterWithEncoder<Geometry, never, TWKBWriterOptions> = {
+export const TWKBWriter = {
   name: 'TWKB (Tiny Well Known Binary)',
   id: 'twkb',
   module: 'wkt',
@@ -33,4 +33,4 @@ export const TWKBWriter: WriterWithEncoder<Geometry, never, TWKBWriterOptions> =
       hasM: false
     }
   }
-};
+} as const satisfies WriterWithEncoder<Geometry, never, TWKBWriterOptions>;

package/src/wkb-loader.ts

@@ -18,7 +18,9 @@ export type WKBLoaderOptions = LoaderOptions & {
 /**
  * Worker loader for WKB (Well-Known Binary)
  */
-export const WKBWorkerLoader: Loader<Geometry | BinaryGeometry, never, WKBLoaderOptions> = {
+export const WKBWorkerLoader = {
+  dataType: null as unknown as Geometry | BinaryGeometry,
+  batchType: null as never,
   name: 'WKB',
   id: 'wkb',
   module: 'wkt',
@@ -34,13 +36,13 @@ export const WKBWorkerLoader: Loader<Geometry | BinaryGeometry, never, WKBLoader
       shape: 'binary-geometry' // 'geojson-geometry'
     }
   }
-};
+} as const satisfies Loader<Geometry | BinaryGeometry, never, WKBLoaderOptions>;
 
 /**
  * Loader for WKB (Well-Known Binary)
  */
-export const WKBLoader: LoaderWithParser<BinaryGeometry | Geometry, never, WKBLoaderOptions> = {
+export const WKBLoader = {
   ...WKBWorkerLoader,
   parse: async (arrayBuffer: ArrayBuffer) => parseWKB(arrayBuffer),
   parseSync: parseWKB
-};
+} as const satisfies LoaderWithParser<BinaryGeometry | Geometry, never, WKBLoaderOptions>;

package/src/wkb-writer.ts

@@ -23,7 +23,7 @@ export type WKBWriterOptions = WriterOptions & {
 /**
  * WKB exporter
  */
-export const WKBWriter: WriterWithEncoder<Geometry | Feature, never, WriterOptions> = {
+export const WKBWriter = {
   name: 'WKB (Well Known Binary)',
   id: 'wkb',
   module: 'wkt',
@@ -41,4 +41,4 @@ export const WKBWriter: WriterWithEncoder<Geometry | Feature, never, WriterOptio
   encodeSync(data: Geometry | Feature, options?: WriterOptions): ArrayBuffer {
     return encodeWKB(data, options?.wkb);
   }
-};
+} as const satisfies WriterWithEncoder<Geometry | Feature, never, WriterOptions>;

package/src/wkt-crs-loader.ts

@@ -16,7 +16,9 @@ export type WKTCRSLoaderOptions = LoaderOptions & {
  * @see OGC Standard: https://www.ogc.org/standards/wkt-crs
  * @see Wikipedia Page: https://en.wikipedia.org/wiki/Well-known_text_representation_of_coordinate_reference_systems
  */
-export const WKTCRSLoader: LoaderWithParser<WKTCRS, never, WKTCRSLoaderOptions> = {
+export const WKTCRSLoader = {
+  dataType: null as unknown as WKTCRS,
+  batchType: null as never,
   name: 'WKT CRS (Well-Known Text Coordinate Reference System)',
   id: 'wkt-crs',
   module: 'wkt-crs',
@@ -32,4 +34,4 @@ export const WKTCRSLoader: LoaderWithParser<WKTCRS, never, WKTCRSLoaderOptions>
   parse: async (arrayBuffer, options) =>
     parseWKTCRS(new TextDecoder().decode(arrayBuffer), options?.['wkt-crs']),
   parseTextSync: (string, options) => parseWKTCRS(string, options?.['wkt-crs'])
-};
+} as const satisfies LoaderWithParser<WKTCRS, never, WKTCRSLoaderOptions>;

package/src/wkt-crs-writer.ts

@@ -18,7 +18,7 @@ export type WKTCRSWriterOptions = WriterOptions & {
  * @see OGC Standard: https://www.ogc.org/standards/wkt-crs
  * @see Wikipedia Page: https://en.wikipedia.org/wiki/Well-known_text_representation_of_coordinate_reference_systems
  */
-export const WKTCRSWriter: WriterWithEncoder<WKTCRS, never, WKTCRSWriterOptions> = {
+export const WKTCRSWriter = {
   name: 'WKT CRS (Well-Known Text Coordinate Reference System)',
   id: 'wkt-crs',
   module: 'wkt-crs',
@@ -36,4 +36,4 @@ export const WKTCRSWriter: WriterWithEncoder<WKTCRS, never, WKTCRSWriterOptions>
   encodeSync: (wktcrs, options) =>
     new TextEncoder().encode(encodeWKTCRS(wktcrs, options?.['wkt-crs'])),
   encodeTextSync: (wktcrs, options) => encodeWKTCRS(wktcrs, options?.['wkt-crs'])
-};
+} as const satisfies WriterWithEncoder<WKTCRS, never, WKTCRSWriterOptions>;

package/src/wkt-loader.ts

@@ -9,18 +9,24 @@ import {Geometry} from '@loaders.gl/schema';
 import {isWKT, WKT_MAGIC_STRINGS} from './lib/parse-wkt';
 
 export type WKTLoaderOptions = LoaderOptions & {
-  /** Options for the WKT parser */
+  /** Options for the WKTLoader */
   wkt?: {
+    /** Shape of returned geometry */
     shape?: 'geojson-geometry'; // 'binary-geometry'
     /** Whether to add any CRS, if found, as undocumented CRS property on the returned geometry */
     crs?: boolean;
+    /** Override the URL to the worker bundle (by default loads from unpkg.com) */
+    workerUrl?: string;
   };
 };
 
 /**
  * Well-Known text worker loader
  */
-export const WKTWorkerLoader: Loader<Geometry, never, WKTLoaderOptions> = {
+export const WKTWorkerLoader = {
+  dataType: null as unknown as Geometry,
+  batchType: null as never,
+
   name: 'WKT (Well-Known Text)',
   id: 'wkt',
   module: 'wkt',
@@ -38,13 +44,13 @@ export const WKTWorkerLoader: Loader<Geometry, never, WKTLoaderOptions> = {
       crs: true
     }
   }
-};
+} as const satisfies Loader<Geometry, never, WKTLoaderOptions>;
 
 /**
  * Well-Known text loader
  */
-export const WKTLoader: LoaderWithParser<Geometry, never, WKTLoaderOptions> = {
+export const WKTLoader = {
   ...WKTWorkerLoader,
-  parse: async (arrayBuffer, options) => parseWKT(new TextDecoder().decode(arrayBuffer), options),
-  parseTextSync: parseWKT
-};
+  parse: async (arrayBuffer, options?) => parseWKT(new TextDecoder().decode(arrayBuffer), options),
+  parseTextSync: (string: string, options?) => parseWKT(string, options)
+} as const satisfies LoaderWithParser<Geometry, never, WKTLoaderOptions>;

package/src/wkt-writer.ts

@@ -14,7 +14,7 @@ export type WKTWriterOptions = WriterOptions & {
 /**
  * WKT exporter
  */
-export const WKTWriter: WriterWithEncoder<Geometry, never, WKTWriterOptions> = {
+export const WKTWriter = {
   name: 'WKT (Well Known Text)',
   id: 'wkt',
   module: 'wkt',
@@ -27,7 +27,7 @@ export const WKTWriter: WriterWithEncoder<Geometry, never, WKTWriterOptions> = {
   options: {
     wkt: {}
   }
-};
+} as const satisfies WriterWithEncoder<Geometry, never, WKTWriterOptions>;
 
 function encodeWKTSync(geometry: Geometry): ArrayBuffer {
   return new TextEncoder().encode(encodeWKT(geometry)).buffer;