@loaders.gl/json 4.2.0-alpha.6 → 4.2.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/json",
-  "version": "4.2.0-alpha.6",
+  "version": "4.2.0-beta.2",
   "description": "Framework-independent loader for JSON and streaming JSON formats",
   "license": "MIT",
   "type": "module",
@@ -44,12 +44,12 @@
     "build-worker": "esbuild src/workers/geojson-worker.ts --bundle --outfile=dist/geojson-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.2",
+    "@loaders.gl/loader-utils": "4.2.0-beta.2",
+    "@loaders.gl/schema": "4.2.0-beta.2"
   },
   "peerDependencies": {
     "@loaders.gl/core": "^4.0.0"
   },
-  "gitHead": "37bd8ca71763529f18727ee4bf29dd176aa914ca"
+  "gitHead": "13c03663fec365a4d24c06377d50035cebd7ba9f"
 }

package/src/geojson-loader.ts

@@ -25,7 +25,10 @@ export type GeoJSONLoaderOptions = JSONLoaderOptions & {
 /**
  * GeoJSON loader
  */
-export const GeoJSONWorkerLoader: Loader<GeoJSON, TableBatch, GeoJSONLoaderOptions> = {
+export const GeoJSONWorkerLoader = {
+  dataType: null as unknown as GeoJSON,
+  batchType: null as unknown as TableBatch,
+
   name: 'GeoJSON',
   id: 'geojson',
   module: 'geojson',
@@ -47,16 +50,16 @@ export const GeoJSONWorkerLoader: Loader<GeoJSON, TableBatch, GeoJSONLoaderOptio
       format: 'geojson'
     }
   }
-};
+} as const satisfies Loader<GeoJSON, TableBatch, GeoJSONLoaderOptions>;
 
-export const GeoJSONLoader: LoaderWithParser<GeoJSON, TableBatch, GeoJSONLoaderOptions> = {
+export const GeoJSONLoader = {
   ...GeoJSONWorkerLoader,
   // @ts-expect-error
   parse,
   // @ts-expect-error
   parseTextSync,
   parseInBatches
-};
+} as const satisfies LoaderWithParser<GeoJSON, TableBatch, GeoJSONLoaderOptions>;
 
 async function parse(arrayBuffer: ArrayBuffer, options?: GeoJSONLoaderOptions) {
   return parseTextSync(new TextDecoder().decode(arrayBuffer), options);

package/src/geojson-writer.ts

@@ -19,7 +19,7 @@ export type GeoJSONWriterOptions = WriterOptions & {
   chunkSize?: number;
 };
 
-export const GeoJSONWriter: WriterWithEncoder<Table, TableBatch, GeoJSONWriterOptions> = {
+export const GeoJSONWriter = {
   id: 'geojson',
   version: 'latest',
   module: 'geojson',
@@ -42,4 +42,4 @@ export const GeoJSONWriter: WriterWithEncoder<Table, TableBatch, GeoJSONWriterOp
 
   encodeInBatches: (tableIterator: AsyncIterable<TableBatch> | Iterable<TableBatch>, options) =>
     encodeTableAsGeojsonInBatches(tableIterator, options)
-};
+} as const satisfies WriterWithEncoder<Table, TableBatch, GeoJSONWriterOptions>;

package/src/json-loader.ts

@@ -34,11 +34,10 @@ export type JSONLoaderOptions = LoaderOptions & {
   };
 };
 
-export const JSONLoader: LoaderWithParser<
-  Table,
-  TableBatch | MetadataBatch | JSONBatch,
-  JSONLoaderOptions
-> = {
+export const JSONLoader = {
+  dataType: null as unknown as Table,
+  batchType: null as unknown as TableBatch | MetadataBatch | JSONBatch,
+
   name: 'JSON',
   id: 'json',
   module: 'json',
@@ -58,7 +57,11 @@ export const JSONLoader: LoaderWithParser<
   parse,
   parseTextSync,
   parseInBatches
-};
+} as const satisfies LoaderWithParser<
+  Table,
+  TableBatch | MetadataBatch | JSONBatch,
+  JSONLoaderOptions
+>;
 
 async function parse(arrayBuffer: ArrayBuffer, options?: JSONLoaderOptions) {
   return parseTextSync(new TextDecoder().decode(arrayBuffer), options);

package/src/json-writer.ts

@@ -19,7 +19,7 @@ type RowArray = unknown[];
 type RowObject = {[key: string]: unknown};
 type TableJSON = RowArray[] | RowObject[];
 
-export const JSONWriter: WriterWithEncoder<Table, TableBatch, JSONWriterOptions> = {
+export const JSONWriter = {
   id: 'json',
   version: 'latest',
   module: 'json',
@@ -31,4 +31,4 @@ export const JSONWriter: WriterWithEncoder<Table, TableBatch, JSONWriterOptions>
   encode: async (table: Table, options: JSONWriterOptions) =>
     new TextEncoder().encode(encodeTableAsJSON(table, options)).buffer,
   encodeTextSync: (table: Table, options: JSONWriterOptions) => encodeTableAsJSON(table, options)
-};
+} as const satisfies WriterWithEncoder<Table, TableBatch, JSONWriterOptions>;

package/src/ndgeoson-loader.ts

@@ -18,11 +18,10 @@ export type NDGeoJSONLoaderOptions = LoaderOptions & {
 };
 
 /** NDGeoJSONLoader */
-export const NDJSONLoader: LoaderWithParser<
-  ArrayRowTable | ObjectRowTable,
-  Batch,
-  NDGeoJSONLoaderOptions
-> = {
+export const NDJSONLoader = {
+  dataType: null as unknown as ArrayRowTable | ObjectRowTable,
+  batchType: null as unknown as Batch,
+
   name: 'NDJSON',
   id: 'ndjson',
   module: 'json',
@@ -48,4 +47,8 @@ export const NDJSONLoader: LoaderWithParser<
       format: 'geojson'
     }
   }
-};
+} as const satisfies LoaderWithParser<
+  ArrayRowTable | ObjectRowTable,
+  Batch,
+  NDGeoJSONLoaderOptions
+>;

package/src/ndjson-loader.ts

@@ -11,11 +11,10 @@ import {parseNDJSONInBatches} from './lib/parsers/parse-ndjson-in-batches';
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
-export const NDJSONLoader: LoaderWithParser<
-  ObjectRowTable | ArrayRowTable,
-  TableBatch,
-  LoaderOptions
-> = {
+export const NDJSONLoader = {
+  dataType: null as unknown as ArrayRowTable | ObjectRowTable,
+  batchType: null as unknown as TableBatch,
+
   name: 'NDJSON',
   id: 'ndjson',
   module: 'json',
@@ -32,4 +31,4 @@ export const NDJSONLoader: LoaderWithParser<
   parseTextSync: parseNDJSONSync,
   parseInBatches: parseNDJSONInBatches,
   options: {}
-};
+} as const satisfies LoaderWithParser<ObjectRowTable | ArrayRowTable, TableBatch, LoaderOptions>;