@loaders.gl/core 4.0.0-alpha.19 → 4.0.0-alpha.21

package/dist/lib/api/parse-sync.js

@@ -10,10 +10,6 @@ const loader_context_1 = require("../loader-utils/loader-context");
 const resource_utils_1 = require("../utils/resource-utils");
 /**
  * Parses `data` synchronously using a specified loader
- * @param data
- * @param loaders
- * @param options
- * @param context
  */
 function parseSync(data, loaders, options, context) {
     (0, loader_utils_1.assert)(!context || typeof context === 'object'); // parseSync no longer accepts final url

package/dist/lib/api/parse.d.ts

@@ -1,6 +1,16 @@
-import type { DataType, Loader, LoaderContext, LoaderOptions } from '@loaders.gl/loader-utils';
+import type { Loader, LoaderContext, LoaderOptions } from '@loaders.gl/loader-utils';
+import type { DataType } from '@loaders.gl/loader-utils';
 import type { LoaderOptionsType, LoaderReturnType } from '@loaders.gl/loader-utils';
+/**
+ * Parses `data` asynchronously using the supplied loaders
+ */
 export declare function parse<LoaderT extends Loader, OptionsT extends LoaderOptions = LoaderOptionsType<LoaderT>>(data: DataType | Promise<DataType>, loader: LoaderT, options?: OptionsT, context?: LoaderContext): Promise<LoaderReturnType<LoaderT>>;
+/**
+ * Parses `data` asynchronously by matching one of the supplied loaders
+ */
 export declare function parse(data: DataType | Promise<DataType>, loaders: Loader[], options?: LoaderOptions, context?: LoaderContext): Promise<any>;
+/**
+ * Parses data asynchronously by matching a pre-registered loader
+ */
 export declare function parse(data: DataType | Promise<DataType>, options?: LoaderOptions): Promise<any>;
 //# sourceMappingURL=parse.d.ts.map

package/dist/lib/api/parse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../../src/lib/api/parse.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC7F,OAAO,KAAK,EAAC,iBAAiB,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAalF,wBAAsB,KAAK,CACzB,OAAO,SAAS,MAAM,EACtB,QAAQ,SAAS,aAAa,GAAG,iBAAiB,CAAC,OAAO,CAAC,EAE3D,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,EAClC,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;AAEtC,wBAAsB,KAAK,CACzB,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,EAClC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,GAAG,CAAC,CAAC;AAEhB,wBAAsB,KAAK,CACzB,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,EAClC,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,GAAG,CAAC,CAAC"}
+{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../../src/lib/api/parse.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACnF,OAAO,KAAK,EAAC,QAAQ,EAAmB,MAAM,0BAA0B,CAAC;AACzE,OAAO,KAAK,EAAC,iBAAiB,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAalF;;GAEG;AACH,wBAAsB,KAAK,CACzB,OAAO,SAAS,MAAM,EACtB,QAAQ,SAAS,aAAa,GAAG,iBAAiB,CAAC,OAAO,CAAC,EAE3D,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,EAClC,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;AAEtC;;GAEG;AACH,wBAAsB,KAAK,CACzB,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,EAClC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,GAAG,CAAC,CAAC;AAEhB;;GAEG;AACH,wBAAsB,KAAK,CACzB,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,EAClC,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,GAAG,CAAC,CAAC"}

package/dist/lib/api/parse.js

@@ -2,8 +2,8 @@
 // loaders.gl, MIT license
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parse = void 0;
-const worker_utils_1 = require("@loaders.gl/worker-utils");
 const loader_utils_1 = require("@loaders.gl/loader-utils");
+const worker_utils_1 = require("@loaders.gl/worker-utils");
 const normalize_loader_1 = require("../loader-utils/normalize-loader");
 const is_type_1 = require("../../javascript-utils/is-type");
 const option_utils_1 = require("../loader-utils/option-utils");
@@ -58,27 +58,28 @@ async function parseWithLoader(loader, data, options, context) {
         const response = data;
         const { ok, redirected, status, statusText, type, url } = response;
         const headers = Object.fromEntries(response.headers.entries());
+        // @ts-expect-error TODO - fix this
         context.response = { headers, ok, redirected, status, statusText, type, url };
     }
     data = await (0, get_data_1.getArrayBufferOrStringFromData)(data, loader, options);
+    const loaderWithParser = loader;
     // First check for synchronous text parser, wrap results in promises
-    if (loader.parseTextSync && typeof data === 'string') {
-        options.dataType = 'text';
-        return loader.parseTextSync(data, options, context, loader);
+    if (loaderWithParser.parseTextSync && typeof data === 'string') {
+        return loaderWithParser.parseTextSync(data, options, context);
     }
     // If we have a workerUrl and the loader can parse the given options efficiently in a worker
     if ((0, loader_utils_1.canParseWithWorker)(loader, options)) {
         return await (0, loader_utils_1.parseWithWorker)(loader, data, options, context, parse);
     }
     // Check for asynchronous parser
-    if (loader.parseText && typeof data === 'string') {
-        return await loader.parseText(data, options, context, loader);
+    if (loaderWithParser.parseText && typeof data === 'string') {
+        return await loaderWithParser.parseText(data, options, context);
     }
-    if (loader.parse) {
-        return await loader.parse(data, options, context, loader);
+    if (loaderWithParser.parse) {
+        return await loaderWithParser.parse(data, options, context);
     }
     // This should not happen, all sync loaders should also offer `parse` function
-    (0, worker_utils_1.assert)(!loader.parseSync);
+    (0, worker_utils_1.assert)(!loaderWithParser.parseSync);
     // TBD - If asynchronous parser not available, return null
     throw new Error(`${loader.id} loader - no parser found and worker is disabled`);
 }

package/dist/lib/filesystems/filesystem.d.ts

@@ -35,9 +35,9 @@ export interface FileSystem {
  * A random access file system
  */
 export interface RandomAccessReadFileSystem extends FileSystem {
-    open(path: string, flags: any, mode?: any): Promise<any>;
-    close(fd: any): Promise<void>;
-    fstat(fd: any): Promise<Stat>;
+    open(path: string, flags: unknown, mode?: unknown): Promise<any>;
+    close(fd: unknown): Promise<void>;
+    fstat(fd: unknown): Promise<Stat>;
     read(fd: any, buffer: ArrayBuffer | ArrayBufferView, offset?: number, length?: number, position?: number): Promise<{
         bytesRead: number;
         buffer: ArrayBuffer;

package/dist/lib/filesystems/filesystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filesystem.d.ts","sourceRoot":"","sources":["../../../src/lib/filesystems/filesystem.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,EAAE,CAAC;AAE7B,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,OAAO,CAAC;CAC5B,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB;;;OAGG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAE9E;;;;;OAKG;IACH,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAAC;IAElE;;;;OAIG;IACH,KAAK,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CACxE;AAED;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,UAAU;IAC5D,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,KAAA,EAAE,IAAI,CAAC,KAAA,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/C,KAAK,CAAC,EAAE,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,CACF,EAAE,EAAE,GAAG,EACP,MAAM,EAAE,WAAW,GAAG,eAAe,EACrC,MAAM,CAAC,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,WAAW,CAAA;KAAC,CAAC,CAAC;CACtD"}
+{"version":3,"file":"filesystem.d.ts","sourceRoot":"","sources":["../../../src/lib/filesystems/filesystem.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,EAAE,CAAC;AAE7B,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,OAAO,CAAC;CAC5B,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB;;;OAGG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAE9E;;;;;OAKG;IACH,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC,CAAC;IAElE;;;;OAIG;IACH,KAAK,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CACxE;AAED;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,UAAU;IAC5D,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IACjE,KAAK,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,KAAK,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI,CACF,EAAE,EAAE,GAAG,EACP,MAAM,EAAE,WAAW,GAAG,eAAe,EACrC,MAAM,CAAC,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,WAAW,CAAA;KAAC,CAAC,CAAC;CACtD"}

package/dist/lib/loader-utils/get-fetch-function.d.ts

@@ -1,8 +1,8 @@
-import type { LoaderContext, LoaderOptions } from '@loaders.gl/loader-utils';
+import type { LoaderContext, LoaderOptions, FetchLike } from '@loaders.gl/loader-utils';
 /**
  * Gets the current fetch function from options and context
  * @param options
  * @param context
  */
-export declare function getFetchFunction(options?: LoaderOptions, context?: Omit<LoaderContext, 'fetch'> & Partial<Pick<LoaderContext, 'fetch'>>): (url: string, options?: RequestInit | undefined) => Promise<Response>;
+export declare function getFetchFunction(options?: LoaderOptions, context?: Omit<LoaderContext, 'fetch'> & Partial<Pick<LoaderContext, 'fetch'>>): FetchLike;
 //# sourceMappingURL=get-fetch-function.d.ts.map

package/dist/lib/loader-utils/get-fetch-function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-fetch-function.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/get-fetch-function.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAK3E;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,yEAuB/E"}
+{"version":3,"file":"get-fetch-function.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/get-fetch-function.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAE,SAAS,EAAC,MAAM,0BAA0B,CAAC;AAKtF;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,GAC7E,SAAS,CAsBX"}

package/dist/lib/loader-utils/get-fetch-function.js

@@ -12,14 +12,14 @@ const option_utils_1 = require("./option-utils");
  */
 function getFetchFunction(options, context) {
     const globalOptions = (0, option_utils_1.getGlobalLoaderOptions)();
-    const fetchOptions = options || globalOptions;
+    const loaderOptions = options || globalOptions;
     // options.fetch can be a function
-    if (typeof fetchOptions.fetch === 'function') {
-        return fetchOptions.fetch;
+    if (typeof loaderOptions.fetch === 'function') {
+        return loaderOptions.fetch;
     }
     // options.fetch can be an options object
-    if ((0, is_type_1.isObject)(fetchOptions.fetch)) {
-        return (url) => (0, fetch_file_1.fetchFile)(url, fetchOptions);
+    if ((0, is_type_1.isObject)(loaderOptions.fetch)) {
+        return (url) => (0, fetch_file_1.fetchFile)(url, loaderOptions.fetch);
     }
     // else refer to context (from parent loader) if available
     if (context?.fetch) {

package/dist/null-loader.d.ts

@@ -1,10 +1,13 @@
-import { Loader, LoaderWithParser } from '@loaders.gl/loader-utils';
+import type { Loader, LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
+export type NullLoaderOptions = LoaderOptions & {
+    null?: {};
+};
 /**
  * Loads any data and returns null (or optionally passes through data unparsed)
  */
-export declare const NullWorkerLoader: Loader;
+export declare const NullWorkerLoader: Loader<null, never, NullLoaderOptions>;
 /**
  * Loads any data and returns null (or optionally passes through data unparsed)
  */
-export declare const NullLoader: LoaderWithParser;
+export declare const NullLoader: LoaderWithParser<null, null, NullLoaderOptions>;
 //# sourceMappingURL=null-loader.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"null-loader.d.ts","sourceRoot":"","sources":["../src/null-loader.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAElE;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAY9B,CAAC;AAYF;;GAEG;AACH,eAAO,MAAM,UAAU,EAAE,gBAoBxB,CAAC"}
+{"version":3,"file":"null-loader.d.ts","sourceRoot":"","sources":["../src/null-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAGtF,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAC9C,IAAI,CAAC,EAAE,EAAE,CAAC;CACX,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,iBAAiB,CAYnE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,EAAE,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,iBAAiB,CAmBtE,CAAC"}

package/dist/null-loader.js

@@ -20,16 +20,6 @@ exports.NullWorkerLoader = {
         null: {}
     }
 };
-/**
- * Returns arguments passed to the parse API in a format that can be transfered to a
- * web worker. The `context` parameter is stripped using JSON.stringify & parse.
- */
-function parseSync(arrayBuffer, options, context) {
-    if (!options.null.echoParameters)
-        return null;
-    context = context && JSON.parse(JSON.stringify(context));
-    return { arrayBuffer, options, context };
-}
 /**
  * Loads any data and returns null (or optionally passes through data unparsed)
  */
@@ -40,7 +30,7 @@ exports.NullLoader = {
     version: VERSION,
     mimeTypes: ['application/x.empty'],
     extensions: ['null'],
-    parse: async (arrayBuffer, options, context) => parseSync(arrayBuffer, options, context),
+    parse: async (arrayBuffer, options, context) => parseSync(arrayBuffer, options || {}, context),
     parseSync,
     parseInBatches: async function* generator(asyncIterator, options, context) {
         for await (const batch of asyncIterator) {
@@ -49,8 +39,13 @@ exports.NullLoader = {
     },
     tests: [() => false],
     options: {
-        null: {
-            echoParameters: false
-        }
+        null: {}
     }
 };
+/**
+ * Returns arguments passed to the parse API in a format that can be transferred to a
+ * web worker. The `context` parameter is stripped using JSON.stringify & parse.
+ */
+function parseSync(arrayBuffer, options, context) {
+    return null;
+}

package/dist/null-worker-node.js

@@ -201,13 +201,7 @@ async function parseData({ loader, arrayBuffer, options, context }) {
 }
 
 // src/null-loader.ts
-var VERSION = true ? "4.0.0-alpha.19" : "latest";
-function parseSync(arrayBuffer, options, context) {
-  if (!options.null.echoParameters)
-    return null;
-  context = context && JSON.parse(JSON.stringify(context));
-  return { arrayBuffer, options, context };
-}
+var VERSION = true ? "4.0.0-alpha.21" : "latest";
 var NullLoader = {
   name: "Null loader",
   id: "null",
@@ -215,7 +209,7 @@ var NullLoader = {
   version: VERSION,
   mimeTypes: ["application/x.empty"],
   extensions: ["null"],
-  parse: async (arrayBuffer, options, context) => parseSync(arrayBuffer, options, context),
+  parse: async (arrayBuffer, options, context) => parseSync(arrayBuffer, options || {}, context),
   parseSync,
   parseInBatches: async function* generator(asyncIterator, options, context) {
     for await (const batch of asyncIterator) {
@@ -224,11 +218,12 @@ var NullLoader = {
   },
   tests: [() => false],
   options: {
-    null: {
-      echoParameters: false
-    }
+    null: {}
   }
 };
+function parseSync(arrayBuffer, options, context) {
+  return null;
+}
 
 // src/workers/null-worker.ts
 createLoaderWorker(NullLoader);

package/dist/null-worker.js

@@ -184,13 +184,7 @@
   }
 
   // src/null-loader.ts
-  var VERSION = true ? "4.0.0-alpha.19" : "latest";
-  function parseSync(arrayBuffer, options, context) {
-    if (!options.null.echoParameters)
-      return null;
-    context = context && JSON.parse(JSON.stringify(context));
-    return { arrayBuffer, options, context };
-  }
+  var VERSION = true ? "4.0.0-alpha.21" : "latest";
   var NullLoader = {
     name: "Null loader",
     id: "null",
@@ -198,7 +192,7 @@
     version: VERSION,
     mimeTypes: ["application/x.empty"],
     extensions: ["null"],
-    parse: async (arrayBuffer, options, context) => parseSync(arrayBuffer, options, context),
+    parse: async (arrayBuffer, options, context) => parseSync(arrayBuffer, options || {}, context),
     parseSync,
     parseInBatches: async function* generator(asyncIterator, options, context) {
       for await (const batch of asyncIterator) {
@@ -207,11 +201,12 @@
     },
     tests: [() => false],
     options: {
-      null: {
-        echoParameters: false
-      }
+      null: {}
     }
   };
+  function parseSync(arrayBuffer, options, context) {
+    return null;
+  }
 
   // src/workers/null-worker.ts
   createLoaderWorker(NullLoader);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/core",
-  "version": "4.0.0-alpha.19",
+  "version": "4.0.0-alpha.21",
   "description": "The core API for working with loaders.gl loaders and writers",
   "license": "MIT",
   "publishConfig": {
@@ -47,9 +47,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.3.1",
-    "@loaders.gl/loader-utils": "4.0.0-alpha.19",
-    "@loaders.gl/worker-utils": "4.0.0-alpha.19",
+    "@loaders.gl/loader-utils": "4.0.0-alpha.21",
+    "@loaders.gl/worker-utils": "4.0.0-alpha.21",
     "@probe.gl/log": "^4.0.2"
   },
-  "gitHead": "2ca50ec4e1d312c124eb7c93c60ab6fd17ee833e"
+  "gitHead": "df5d670b136192b26941396e944f9c46be788e83"
 }

package/src/index.ts

@@ -55,6 +55,7 @@ export {JSONLoader} from '@loaders.gl/loader-utils';
 // EXPERIMENTAL
 export {default as _fetchProgress} from './lib/progress/fetch-progress';
 export {default as _BrowserFileSystem} from './lib/filesystems/browser-filesystem';
+export {FileSystem} from './lib/filesystems/filesystem';
 
 // FOR TESTING
 export {_unregisterLoaders} from './lib/api/register-loaders';

package/src/iterators/batch-iterators/timed-batch-iterator.ts

@@ -1,7 +1,10 @@
 /**
  * "Debounces" batches and returns them in groups
  */
-export async function* timedBatchIterator<Batch>(batchIterator: AsyncIterable<Batch>, timeout) {
+export async function* timedBatchIterator<Batch>(
+  batchIterator: AsyncIterable<Batch>,
+  timeout: number
+): AsyncIterable<Batch[]> {
   let start = Date.now();
   let batches: Batch[] = [];
   for await (const batch of batchIterator) {

package/src/iterators/make-stream/make-dom-stream.ts

@@ -15,7 +15,8 @@ export function makeStream<ArrayBuffer>(
   source: Iterable<ArrayBuffer> | AsyncIterable<ArrayBuffer>,
   options?: MakeStreamOptions
 ): ReadableStream {
-  const iterator = source[Symbol.asyncIterator]
+  // TODO - add AsyncGenerator to parameter types?
+  const iterator = (source as AsyncGenerator<ArrayBuffer>)[Symbol.asyncIterator]
     ? (source as AsyncIterable<ArrayBuffer>)[Symbol.asyncIterator]()
     : (source as Iterable<ArrayBuffer>)[Symbol.iterator]();
 

package/src/javascript-utils/is-type.ts

@@ -1,17 +1,19 @@
+// luma.gl, MIT license
 import type {Readable} from 'stream';
 
 /** A DOM or Node readable stream */
 export type ReadableStreamType = ReadableStream | Readable;
 
-const isBoolean: (x: any) => boolean = (x) => typeof x === 'boolean';
-const isFunction: (x: any) => boolean = (x) => typeof x === 'function';
+const isBoolean: (x: unknown) => boolean = (x) => typeof x === 'boolean';
+const isFunction: (x: unknown) => boolean = (x) => typeof x === 'function';
 
-export const isObject: (x: any) => boolean = (x) => x !== null && typeof x === 'object';
+export const isObject: (x: unknown) => boolean = (x) => x !== null && typeof x === 'object';
 export const isPureObject: (x: any) => boolean = (x) =>
   isObject(x) && x.constructor === {}.constructor;
 export const isPromise: (x: any) => boolean = (x) => isObject(x) && isFunction(x.then);
 
-export const isIterable: (x: any) => boolean = (x) => x && typeof x[Symbol.iterator] === 'function';
+export const isIterable: (x: any) => boolean = (x) =>
+  Boolean(x) && typeof x[Symbol.iterator] === 'function';
 export const isAsyncIterable: (x: any) => boolean = (x) =>
   x && typeof x[Symbol.asyncIterator] === 'function';
 export const isIterator: (x: any) => boolean = (x) => x && isFunction(x.next);
@@ -20,8 +22,10 @@ export const isResponse: (x: any) => boolean = (x) =>
   (typeof Response !== 'undefined' && x instanceof Response) ||
   (x && x.arrayBuffer && x.text && x.json);
 
-export const isFile: (x: any) => boolean = (x) => typeof File !== 'undefined' && x instanceof File;
-export const isBlob: (x: any) => boolean = (x) => typeof Blob !== 'undefined' && x instanceof Blob;
+export const isFile: (x: unknown) => boolean = (x) =>
+  typeof File !== 'undefined' && x instanceof File;
+export const isBlob: (x: unknown) => boolean = (x) =>
+  typeof Blob !== 'undefined' && x instanceof Blob;
 
 /** Check for Node.js `Buffer` without triggering bundler to include buffer polyfill */
 export const isBuffer: (x: any) => boolean = (x) => x && typeof x === 'object' && x.isBuffer;
@@ -38,7 +42,7 @@ export const isWritableNodeStream: (x: any) => boolean = (x) =>
   isObject(x) && isFunction(x.end) && isFunction(x.write) && isBoolean(x.writable);
 export const isReadableNodeStream: (x: any) => boolean = (x) =>
   isObject(x) && isFunction(x.read) && isFunction(x.pipe) && isBoolean(x.readable);
-export const isReadableStream: (x: any) => boolean = (x) =>
+export const isReadableStream: (x: unknown) => boolean = (x) =>
   isReadableDOMStream(x) || isReadableNodeStream(x);
-export const isWritableStream: (x: any) => boolean = (x) =>
+export const isWritableStream: (x: unknown) => boolean = (x) =>
   isWritableDOMStream(x) || isWritableNodeStream(x);

package/src/lib/api/encode-table.ts

@@ -65,7 +65,7 @@ export function encodeTableInBatches<WriterT extends Writer = Writer>(
   throw new Error('Writer could not encode data in batches');
 }
 
-function getIterator(data) {
+function getIterator(data: any): Iterable<{table: any; start: number; end: number}> {
   const dataIterator = [{table: data, start: 0, end: data.length}];
   return dataIterator;
 }

package/src/lib/api/encode.ts

@@ -10,7 +10,7 @@ import {getLoaderOptions} from './loader-options';
  * Encode loaded data into a binary ArrayBuffer using the specified Writer.
  */
 export async function encode(
-  data: any,
+  data: unknown,
   writer: Writer,
   options?: WriterOptions
 ): Promise<ArrayBuffer> {
@@ -40,7 +40,7 @@ export async function encode(
     const batches = encodeInBatches(data, writer, options);
 
     // Concatenate the output
-    const chunks: any[] = [];
+    const chunks: unknown[] = [];
     for await (const batch of batches) {
       chunks.push(batch);
     }
@@ -51,7 +51,7 @@ export async function encode(
   if (!isBrowser && writer.encodeURLtoURL) {
     // TODO - how to generate filenames with correct extensions?
     const tmpInputFilename = getTemporaryFilename('input');
-    await writeFile(tmpInputFilename, data);
+    await writeFile(tmpInputFilename, data as ArrayBuffer);
 
     const tmpOutputFilename = getTemporaryFilename('output');
 
@@ -72,7 +72,7 @@ export async function encode(
 /**
  * Encode loaded data into a binary ArrayBuffer using the specified Writer.
  */
-export function encodeSync(data: any, writer: Writer, options?: WriterOptions): ArrayBuffer {
+export function encodeSync(data: unknown, writer: Writer, options?: WriterOptions): ArrayBuffer {
   if (writer.encodeSync) {
     return writer.encodeSync(data, options);
   }
@@ -86,7 +86,7 @@ export function encodeSync(data: any, writer: Writer, options?: WriterOptions):
  * @throws if the writer does not generate text output
  */
 export async function encodeText(
-  data: any,
+  data: unknown,
   writer: Writer,
   options?: WriterOptions
 ): Promise<string> {
@@ -106,7 +106,7 @@ export async function encodeText(
  * Encode loaded data into a sequence (iterator) of binary ArrayBuffers using the specified Writer.
  */
 export function encodeInBatches(
-  data: any,
+  data: unknown,
   writer: Writer,
   options?: WriterOptions
 ): AsyncIterable<ArrayBuffer> {
@@ -124,10 +124,10 @@ export function encodeInBatches(
  * @note Node.js only. This function enables using command-line converters as "writers".
  */
 export async function encodeURLtoURL(
-  inputUrl,
-  outputUrl,
+  inputUrl: string,
+  outputUrl: string,
   writer: Writer,
-  options
+  options?: WriterOptions
 ): Promise<string> {
   inputUrl = resolvePath(inputUrl);
   outputUrl = resolvePath(outputUrl);
@@ -141,7 +141,7 @@ export async function encodeURLtoURL(
 /**
  * @todo TODO - this is an unacceptable hack!!!
  */
-function getIterator(data) {
+function getIterator(data: any): Iterable<{table: any; start: number; end: number}> {
   const dataIterator = [{table: data, start: 0, end: data.length}];
   return dataIterator;
 }

package/src/lib/api/load-in-batches.ts

@@ -1,4 +1,12 @@
-import type {LoaderWithParser, LoaderOptions, LoaderContext} from '@loaders.gl/loader-utils';
+// loaders.gl, MIT license
+
+import type {
+  LoaderWithParser,
+  LoaderOptions,
+  LoaderContext,
+  FetchLike
+} from '@loaders.gl/loader-utils';
+import type {LoaderBatchType, LoaderOptionsType} from '@loaders.gl/loader-utils';
 import {isLoaderObject} from '../loader-utils/normalize-loader';
 import {getFetchFunction} from '../loader-utils/get-fetch-function';
 
@@ -6,6 +14,19 @@ import {parseInBatches} from './parse-in-batches';
 
 type FileType = string | File | Blob | Response | (string | File | Blob | Response)[] | FileList;
 
+/**
+ * Parses `data` synchronously using a specified loader
+ */
+export async function loadInBatches<
+  LoaderT extends LoaderWithParser,
+  OptionsT extends LoaderOptions = LoaderOptionsType<LoaderT>
+>(
+  files: FileType,
+  loader: LoaderT,
+  options?: OptionsT,
+  context?: LoaderContext
+): Promise<AsyncIterable<LoaderBatchType<LoaderT>>>;
+
 /**
  * Parses `data` using a specified loader
  * @param data
@@ -27,12 +48,20 @@ export function loadInBatches(
   context?: LoaderContext
 ): Promise<AsyncIterable<any>>;
 
-export function loadInBatches(files, loaders, options, context) {
+export function loadInBatches(
+  files: FileType | FileType[] | FileList,
+  loaders?: LoaderWithParser | LoaderWithParser[] | LoaderOptions,
+  options?: LoaderOptions,
+  context?: LoaderContext
+) {
+  let loadersArray: LoaderWithParser | LoaderWithParser[] | undefined;
   // Signature: load(url, options)
   if (!Array.isArray(loaders) && !isLoaderObject(loaders)) {
     context = undefined; // context not supported in short signature
-    options = loaders;
-    loaders = null;
+    options = loaders as LoaderOptions;
+    loadersArray = undefined;
+  } else {
+    loadersArray = loaders as LoaderWithParser | LoaderWithParser[] | undefined;
   }
 
   // Select fetch function
@@ -40,21 +69,30 @@ export function loadInBatches(files, loaders, options, context) {
 
   // Single url/file
   if (!Array.isArray(files)) {
-    return loadOneFileInBatches(files, loaders, options, fetch);
+    return loadOneFileInBatches(files, loadersArray!, options || {}, fetch);
   }
 
   // Multiple URLs / files
-  const promises = files.map((file) => loadOneFileInBatches(file, loaders, options, fetch));
+  const promises = files.map((file) =>
+    loadOneFileInBatches(file, loadersArray!, options || {}, fetch)
+  );
 
   // No point in waiting here for all responses before starting to stream individual streams?
   return promises;
 }
 
-async function loadOneFileInBatches(file, loaders, options, fetch) {
+async function loadOneFileInBatches(
+  file: FileType,
+  loaders: LoaderWithParser | LoaderWithParser[],
+  options: LoaderOptions,
+  fetch: FetchLike
+) {
   if (typeof file === 'string') {
     const url = file;
     const response = await fetch(url);
+    // @ts-expect-error
     return await parseInBatches(response, loaders, options);
   }
+  // @ts-expect-error TODO
   return await parseInBatches(file, loaders, options);
 }

package/src/lib/api/load.ts

@@ -25,10 +25,7 @@ export async function load<LoaderT extends Loader>(
   context?: LoaderContext
 ): Promise<LoaderReturnType<LoaderT>>;
 
-export async function load<
-  LoaderT extends Loader, // eslint-disable-line  @typescript-eslint/no-unused-vars
-  LoaderOptionsT extends LoaderOptions = LoaderOptions
->(
+export async function load<LoaderOptionsT extends LoaderOptions = LoaderOptions>(
   url: string | DataType,
   loaders: Loader[] | LoaderOptions,
   options?: LoaderOptionsT,
@@ -36,7 +33,7 @@ export async function load<
 ): Promise<any>;
 
 // implementation signature
-export async function load<LoaderOptionsT extends LoaderOptions>(
+export async function load<LoaderOptionsT extends LoaderOptions = LoaderOptions>(
   url: string | DataType,
   loaders?: Loader[] | LoaderOptions,
   options?: LoaderOptionsT,