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

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export type { Loader, LoaderWithParser, LoaderContext, LoaderOptions, Writer, WriterOptions, DataType, SyncDataType, BatchableDataType, ReadableFile, WritableFile, Stat, FileSystem, RandomAccessFileSystem } from '@loaders.gl/loader-utils';
 export { fetchFile } from "./lib/fetch/fetch-file.js";
+export { FetchError } from "./lib/fetch/fetch-error.js";
 export { readArrayBuffer } from "./lib/fetch/read-array-buffer.js";
 export { setLoaderOptions, getLoaderOptions } from "./lib/api/loader-options.js";
 export { registerLoaders } from "./lib/api/register-loaders.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,YAAY,EACV,MAAM,EACN,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,MAAM,EACN,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACZ,IAAI,EACJ,UAAU,EACV,sBAAsB,EACvB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAC,SAAS,EAAC,kCAA+B;AAEjD,OAAO,EAAC,eAAe,EAAC,yCAAsC;AAK9D,OAAO,EAAC,gBAAgB,EAAE,gBAAgB,EAAC,oCAAiC;AAC5E,OAAO,EAAC,eAAe,EAAC,sCAAmC;AAC3D,OAAO,EAAC,YAAY,EAAE,gBAAgB,EAAC,mCAAgC;AAGvE,OAAO,EAAC,KAAK,EAAC,2BAAwB;AACtC,OAAO,EAAC,SAAS,EAAC,gCAA6B;AAC/C,OAAO,EAAC,cAAc,EAAC,sCAAmC;AAE1D,OAAO,EAAC,IAAI,EAAC,0BAAuB;AACpC,OAAO,EAAC,aAAa,EAAC,qCAAkC;AAGxD,OAAO,EAAC,WAAW,EAAE,iBAAiB,EAAE,oBAAoB,EAAC,kCAA+B;AAC5F,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAC,4BAAyB;AACrF,OAAO,EAAC,UAAU,EAAE,cAAc,EAAC,4BAAyB;AAG5D,OAAO,EAAC,aAAa,EAAE,aAAa,EAAE,WAAW,EAAC,MAAM,0BAA0B,CAAC;AACnF,OAAO,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAG1D,OAAO,EAAC,YAAY,EAAC,mDAAgD;AACrE,OAAO,EAAC,UAAU,EAAC,+CAA4C;AAG/D,OAAO,EAAC,gBAAgB,EAAE,UAAU,EAAC,yBAAsB;AAC3D,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AAGpD,OAAO,EAAC,aAAa,IAAI,cAAc,EAAC,yCAAsC;AAC9E,OAAO,EAAC,iBAAiB,IAAI,kBAAkB,EAAC,gDAA6C;AAG7F,OAAO,EAAC,kBAAkB,EAAC,sCAAmC;AAM9D,OAAO,EAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,0BAA0B,CAAC;AAC7F,OAAO,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAC,OAAO,EAAE,4BAA4B,EAAC,MAAM,0BAA0B,CAAC;AAE/E,OAAO,EACL,uBAAuB,EACvB,uBAAuB,EACvB,gBAAgB,EAChB,wBAAwB,EACzB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,YAAY,EACZ,SAAS,EACT,UAAU,EACV,eAAe,EACf,UAAU,EACV,UAAU,EACV,gBAAgB,EAChB,gBAAgB,EACjB,sCAAmC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,YAAY,EACV,MAAM,EACN,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,MAAM,EACN,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACZ,IAAI,EACJ,UAAU,EACV,sBAAsB,EACvB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAC,SAAS,EAAC,kCAA+B;AACjD,OAAO,EAAC,UAAU,EAAC,mCAAgC;AAEnD,OAAO,EAAC,eAAe,EAAC,yCAAsC;AAK9D,OAAO,EAAC,gBAAgB,EAAE,gBAAgB,EAAC,oCAAiC;AAC5E,OAAO,EAAC,eAAe,EAAC,sCAAmC;AAC3D,OAAO,EAAC,YAAY,EAAE,gBAAgB,EAAC,mCAAgC;AAGvE,OAAO,EAAC,KAAK,EAAC,2BAAwB;AACtC,OAAO,EAAC,SAAS,EAAC,gCAA6B;AAC/C,OAAO,EAAC,cAAc,EAAC,sCAAmC;AAE1D,OAAO,EAAC,IAAI,EAAC,0BAAuB;AACpC,OAAO,EAAC,aAAa,EAAC,qCAAkC;AAGxD,OAAO,EAAC,WAAW,EAAE,iBAAiB,EAAE,oBAAoB,EAAC,kCAA+B;AAC5F,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAC,4BAAyB;AACrF,OAAO,EAAC,UAAU,EAAE,cAAc,EAAC,4BAAyB;AAG5D,OAAO,EAAC,aAAa,EAAE,aAAa,EAAE,WAAW,EAAC,MAAM,0BAA0B,CAAC;AACnF,OAAO,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAG1D,OAAO,EAAC,YAAY,EAAC,mDAAgD;AACrE,OAAO,EAAC,UAAU,EAAC,+CAA4C;AAG/D,OAAO,EAAC,gBAAgB,EAAE,UAAU,EAAC,yBAAsB;AAC3D,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AAGpD,OAAO,EAAC,aAAa,IAAI,cAAc,EAAC,yCAAsC;AAC9E,OAAO,EAAC,iBAAiB,IAAI,kBAAkB,EAAC,gDAA6C;AAG7F,OAAO,EAAC,kBAAkB,EAAC,sCAAmC;AAM9D,OAAO,EAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,0BAA0B,CAAC;AAC7F,OAAO,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAC,OAAO,EAAE,4BAA4B,EAAC,MAAM,0BAA0B,CAAC;AAE/E,OAAO,EACL,uBAAuB,EACvB,uBAAuB,EACvB,gBAAgB,EAChB,wBAAwB,EACzB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,YAAY,EACZ,SAAS,EACT,UAAU,EACV,eAAe,EACf,UAAU,EACV,UAAU,EACV,gBAAgB,EAChB,gBAAgB,EACjB,sCAAmC"}

package/dist/index.js

@@ -3,6 +3,7 @@
 // Copyright (c) vis.gl contributors
 // FILE READING AND WRITING
 export { fetchFile } from "./lib/fetch/fetch-file.js";
+export { FetchError } from "./lib/fetch/fetch-error.js";
 export { readArrayBuffer } from "./lib/fetch/read-array-buffer.js";
 // export {readFileSync} from './lib/fetch/read-file';
 // export {writeFile, writeFileSync} from './lib/fetch/write-file';

package/dist/lib/api/parse-in-batches.js

@@ -100,6 +100,7 @@ async function* parseChunkInBatches(transformedIterator, loader, options, contex
  * @todo run through batch builder to apply options etc...
  */
 function convertDataToBatch(parsedData, loader) {
+    // prettier-ignore
     const batch = isTable(parsedData)
         ? makeBatchFromTable(parsedData)
         : {

package/dist/lib/api/select-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"select-loader.d.ts","sourceRoot":"","sources":["../../../src/lib/api/select-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAgBnF;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,WAAW,GAAG,MAAM,EAC5C,OAAO,GAAE,MAAM,EAAE,GAAG,MAAW,EAC/B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwBxB;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,WAAW,GAAG,MAAM,EAC5C,OAAO,GAAE,MAAM,EAAE,GAAG,MAAW,EAC/B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,MAAM,GAAG,IAAI,CAmCf"}
+{"version":3,"file":"select-loader.d.ts","sourceRoot":"","sources":["../../../src/lib/api/select-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAiBnF;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,WAAW,GAAG,MAAM,EAC5C,OAAO,GAAE,MAAM,EAAE,GAAG,MAAW,EAC/B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwBxB;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,QAAQ,GAAG,IAAI,GAAG,WAAW,GAAG,MAAM,EAC5C,OAAO,GAAE,MAAM,EAAE,GAAG,MAAW,EAC/B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,MAAM,GAAG,IAAI,CAmCf"}

package/dist/lib/api/select-loader.js

@@ -5,6 +5,7 @@ import { compareArrayBuffers, path } from '@loaders.gl/loader-utils';
 import { normalizeLoader } from "../loader-utils/normalize-loader.js";
 import { log } from "../utils/log.js";
 import { getResourceUrl, getResourceMIMEType } from "../utils/resource-utils.js";
+import { compareMIMETypes } from "../utils/mime-type-utils.js";
 import { getRegisteredLoaders } from "./register-loaders.js";
 import { isBlob } from "../../javascript-utils/is-type.js";
 import { stripQueryString } from "../utils/url-utils.js";
@@ -166,12 +167,12 @@ function findLoaderByExtension(loaders, extension) {
 }
 function findLoaderByMIMEType(loaders, mimeType) {
     for (const loader of loaders) {
-        if (loader.mimeTypes && loader.mimeTypes.includes(mimeType)) {
+        if (loader.mimeTypes?.some((mimeType1) => compareMIMETypes(mimeType, mimeType1))) {
             return loader;
         }
         // Support referring to loaders using the "unregistered tree"
         // https://en.wikipedia.org/wiki/Media_type#Unregistered_tree
-        if (mimeType === `application/x.${loader.id}`) {
+        if (compareMIMETypes(mimeType, `application/x.${loader.id}`)) {
             return loader;
         }
     }

package/dist/lib/fetch/fetch-error-message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-error-message.d.ts","sourceRoot":"","sources":["../../../src/lib/fetch/fetch-error-message.ts"],"names":[],"mappings":"AAIA,wBAAgB,+BAA+B,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAE1E;AAED,wBAAsB,2BAA2B,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAcrF"}
+{"version":3,"file":"fetch-error-message.d.ts","sourceRoot":"","sources":["../../../src/lib/fetch/fetch-error-message.ts"],"names":[],"mappings":"AAKA,wBAAgB,+BAA+B,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAE1E;AAGD,wBAAsB,2BAA2B,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAcrF"}

package/dist/lib/fetch/fetch-error-message.js

@@ -1,9 +1,11 @@
 // loaders.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
+// TODO - duplicates response-utils code
 export function getErrorMessageFromResponseSync(response) {
     return `Failed to fetch resource ${response.url}(${response.status}): ${response.statusText} `;
 }
+// TODO - duplicates response-utils code
 export async function getErrorMessageFromResponse(response) {
     let message = `Failed to fetch resource ${response.url} (${response.status}): `;
     try {

package/dist/lib/fetch/fetch-error.d.ts

@@ -0,0 +1,14 @@
+export declare class FetchError extends Error {
+    constructor(message: string, info: {
+        url: string;
+        reason: string;
+        response?: Response;
+    });
+    /** A best effort reason for why the fetch failed */
+    reason: string;
+    /** The URL that failed to load. Empty string if not available. */
+    url: string;
+    /** The Response object, if any. */
+    response?: Response;
+}
+//# sourceMappingURL=fetch-error.d.ts.map

package/dist/lib/fetch/fetch-error.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetch-error.d.ts","sourceRoot":"","sources":["../../../src/lib/fetch/fetch-error.ts"],"names":[],"mappings":"AAIA,qBAAa,UAAW,SAAQ,KAAK;gBACvB,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,QAAQ,CAAA;KAAC;IAMrF,oDAAoD;IACpD,MAAM,EAAE,MAAM,CAAC;IACf,kEAAkE;IAClE,GAAG,EAAE,MAAM,CAAC;IACZ,mCAAmC;IACnC,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB"}

package/dist/lib/fetch/fetch-error.js

@@ -0,0 +1,17 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+export class FetchError extends Error {
+    constructor(message, info) {
+        super(message);
+        this.reason = info.reason;
+        this.url = info.url;
+        this.response = info.response;
+    }
+    /** A best effort reason for why the fetch failed */
+    reason;
+    /** The URL that failed to load. Empty string if not available. */
+    url;
+    /** The Response object, if any. */
+    response;
+}

package/dist/lib/fetch/fetch-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-file.d.ts","sourceRoot":"","sources":["../../../src/lib/fetch/fetch-file.ts"],"names":[],"mappings":"AAOA,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAE/C;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEjD;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAE9C;AAED;;;;GAIG;AACH,wBAAsB,SAAS,CAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,YAAY,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC,QAAQ,CAAC,CAoBnB"}
+{"version":3,"file":"fetch-file.d.ts","sourceRoot":"","sources":["../../../src/lib/fetch/fetch-file.ts"],"names":[],"mappings":"AAQA,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAE/C;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEjD;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAE9C;AAED;;;;GAIG;AACH,wBAAsB,SAAS,CAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,YAAY,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC,QAAQ,CAAC,CAoBnB"}

package/dist/lib/fetch/fetch-file.js

@@ -3,6 +3,7 @@
 // Copyright (c) vis.gl contributors
 import { resolvePath } from '@loaders.gl/loader-utils';
 import { makeResponse } from "../utils/response-utils.js";
+// import {FetchError} from './fetch-error';
 export function isNodePath(url) {
     return !isRequestURL(url) && !isDataURL(url);
 }

package/dist/lib/filesystems/browser-filesystem.js

@@ -7,15 +7,16 @@ import { BlobFile } from '@loaders.gl/loader-utils';
  * Holds a list of browser 'File' objects.
  */
 export class BrowserFileSystem {
+    _fetch;
+    files = {};
+    lowerCaseFiles = {};
+    usedFiles = {};
     /**
      * A FileSystem API wrapper around a list of browser 'File' objects
      * @param files
      * @param options
      */
     constructor(files, options) {
-        this.files = {};
-        this.lowerCaseFiles = {};
-        this.usedFiles = {};
         this._fetch = options?.fetch || fetch;
         for (let i = 0; i < files.length; ++i) {
             const file = files[i];

package/dist/lib/init.js

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 import { log } from "./utils/log.js";
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const version = typeof "4.2.0-alpha.4" !== 'undefined' ? "4.2.0-alpha.4" : '';
+const version = typeof "4.2.0-alpha.6" !== 'undefined' ? "4.2.0-alpha.6" : '';
 // @ts-ignore
 if (!globalThis.loaders) {
     log.log(1, `loaders.gl ${version}`)();

package/dist/lib/loader-utils/loggers.js

@@ -21,6 +21,7 @@ export class NullLog {
 }
 // Logs to console
 export class ConsoleLog {
+    console;
     constructor() {
         this.console = console; // eslint-disable-line
     }

package/dist/lib/loader-utils/option-utils.d.ts

@@ -1,4 +1,4 @@
-import type { Loader, LoaderOptions } from '@loaders.gl/loader-utils';
+import { Loader, LoaderOptions } from '@loaders.gl/loader-utils';
 /**
  * Global state for loaders.gl. Stored on `globalThis.loaders._state`
  */

package/dist/lib/loader-utils/option-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"option-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/option-utils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAKpE;;GAEG;AACH,KAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,iBAAiB,CAWxD;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,IAAI,aAAa,CAKtD;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAK7D;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,GAAG,CAAC,EAAE,MAAM,GACX,aAAa,CAMf"}
+{"version":3,"file":"option-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/option-utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAE,aAAa,EAAoB,MAAM,0BAA0B,CAAC;AAKlF;;GAEG;AACH,KAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,iBAAiB,CAWxD;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,IAAI,aAAa,CAKtD;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAO7D;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,GAAG,CAAC,EAAE,MAAM,GACX,aAAa,CAMf"}

package/dist/lib/loader-utils/option-utils.js

@@ -1,6 +1,7 @@
 // loaders.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
+import { registerJSModules } from '@loaders.gl/loader-utils';
 import { isPureObject, isObject } from "../../javascript-utils/is-type.js";
 import { probeLog, NullLog } from "./loggers.js";
 import { DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS } from "./option-defaults.js";
@@ -39,6 +40,8 @@ export function setGlobalOptions(options) {
     const globalOptions = getGlobalLoaderOptions();
     // @ts-expect-error First param looks incorrect
     state.globalOptions = normalizeOptionsInternal(globalOptions, options);
+    // Make sure any new modules are registered
+    registerJSModules(options.modules);
 }
 /**
  * Merges options with global opts and loader defaults, also injects baseUri

package/dist/lib/utils/mime-type-utils.d.ts

@@ -1,3 +1,11 @@
+/**
+ * Compare two MIME types, case insensitively etc.
+ * @param mimeType1
+ * @param mimeType2
+ * @returns true if the MIME types are equivalent
+ * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types#structure_of_a_mime_type
+ */
+export declare function compareMIMETypes(mimeType1: string, mimeType2: string): boolean;
 /**
  * Remove extra data like `charset` from MIME types
  * @param mimeString

package/dist/lib/utils/mime-type-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mime-type-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/mime-type-utils.ts"],"names":[],"mappings":"AAUA;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAOxD;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAOxD"}
+{"version":3,"file":"mime-type-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/mime-type-utils.ts"],"names":[],"mappings":"AAUA;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAK9E;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAOxD;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAOxD"}

package/dist/lib/utils/mime-type-utils.js

@@ -5,6 +5,19 @@
 // https://mimesniff.spec.whatwg.org/
 const DATA_URL_PATTERN = /^data:([-\w.]+\/[-\w.+]+)(;|,)/;
 const MIME_TYPE_PATTERN = /^([-\w.]+\/[-\w.+]+)/;
+/**
+ * Compare two MIME types, case insensitively etc.
+ * @param mimeType1
+ * @param mimeType2
+ * @returns true if the MIME types are equivalent
+ * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types#structure_of_a_mime_type
+ */
+export function compareMIMETypes(mimeType1, mimeType2) {
+    if (mimeType1.toLowerCase() === mimeType2.toLowerCase()) {
+        return true;
+    }
+    return false;
+}
 /**
  * Remove extra data like `charset` from MIME types
  * @param mimeString

package/dist/lib/utils/response-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"response-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/response-utils.ts"],"names":[],"mappings":"AAOA;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAuCvE;AAED;;;GAGG;AACH,wBAAsB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAKrE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAM1D"}
+{"version":3,"file":"response-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/response-utils.ts"],"names":[],"mappings":"AASA;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAuCvE;AAED;;;GAGG;AACH,wBAAsB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAKrE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAM1D"}

package/dist/lib/utils/response-utils.js

@@ -2,7 +2,9 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { isResponse } from "../../javascript-utils/is-type.js";
+import { FetchError } from "../fetch/fetch-error.js";
 import { getResourceContentLength, getResourceUrl, getResourceMIMEType } from "./resource-utils.js";
+import { shortenUrlForDisplay } from "./url-utils.js";
 /**
  * Returns a Response object
  * Adds content-length header when possible
@@ -49,8 +51,8 @@ export async function makeResponse(resource) {
  */
 export async function checkResponse(response) {
     if (!response.ok) {
-        const message = await getResponseError(response);
-        throw new Error(message);
+        const error = await getResponseError(response);
+        throw error;
     }
 }
 /**
@@ -66,20 +68,24 @@ export function checkResponseSync(response) {
 }
 // HELPERS
 async function getResponseError(response) {
-    let message = `Failed to fetch resource ${response.url} (${response.status}): `;
+    const shortUrl = shortenUrlForDisplay(response.url);
+    let message = `Failed to fetch resource (${response.status}) ${response.statusText}: ${shortUrl}`;
+    message = message.length > 100 ? `${message.slice(0, 100)}...` : message;
+    const info = {
+        reason: response.statusText,
+        url: response.url,
+        response
+    };
     try {
         const contentType = response.headers.get('Content-Type');
-        let text = response.statusText;
-        if (contentType?.includes('application/json')) {
-            text += ` ${await response.text()}`;
-        }
-        message += text;
-        message = message.length > 60 ? `${message.slice(0, 60)}...` : message;
+        info.reason = contentType?.includes('application/json')
+            ? await response.json()
+            : response.text();
     }
     catch (error) {
         // eslint forbids return in a finally statement, so we just catch here
     }
-    return message;
+    return new FetchError(message, info);
 }
 async function getInitialDataUrl(resource) {
     const INITIAL_DATA_LENGTH = 5;

package/dist/lib/utils/url-utils.d.ts

@@ -1,3 +1,4 @@
 export declare function extractQueryString(url: any): string;
 export declare function stripQueryString(url: any): string;
+export declare function shortenUrlForDisplay(url: string): string;
 //# sourceMappingURL=url-utils.d.ts.map

package/dist/lib/utils/url-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"url-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/url-utils.ts"],"names":[],"mappings":"AAMA,wBAAgB,kBAAkB,CAAC,GAAG,KAAA,GAAG,MAAM,CAG9C;AAED,wBAAgB,gBAAgB,CAAC,GAAG,KAAA,GAAG,MAAM,CAE5C"}
+{"version":3,"file":"url-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/url-utils.ts"],"names":[],"mappings":"AAMA,wBAAgB,kBAAkB,CAAC,GAAG,KAAA,GAAG,MAAM,CAG9C;AAED,wBAAgB,gBAAgB,CAAC,GAAG,KAAA,GAAG,MAAM,CAE5C;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAOxD"}

package/dist/lib/utils/url-utils.js

@@ -9,3 +9,11 @@ export function extractQueryString(url) {
 export function stripQueryString(url) {
     return url.replace(QUERY_STRING_PATTERN, '');
 }
+export function shortenUrlForDisplay(url) {
+    if (url.length < 50) {
+        return url;
+    }
+    const urlEnd = url.slice(url.length - 15);
+    const urlStart = url.substr(0, 32);
+    return `${urlStart}...${urlEnd}`;
+}

package/dist/null-loader.d.ts

@@ -1,13 +1,50 @@
-import type { Loader, LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
+import type { LoaderOptions } from '@loaders.gl/loader-utils';
+import { LoaderContext } 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<null, never, NullLoaderOptions>;
+export declare const NullWorkerLoader: {
+    readonly dataType: null;
+    readonly batchType: never;
+    readonly name: "Null loader";
+    readonly id: "null";
+    readonly module: "core";
+    readonly version: any;
+    readonly worker: true;
+    readonly mimeTypes: ["application/x.empty"];
+    readonly extensions: ["null"];
+    readonly tests: [() => false];
+    readonly options: {
+        readonly null: {};
+    };
+};
 /**
  * Loads any data and returns null (or optionally passes through data unparsed)
  */
-export declare const NullLoader: LoaderWithParser<null, null, NullLoaderOptions>;
+export declare const NullLoader: {
+    readonly dataType: null;
+    readonly batchType: null;
+    readonly name: "Null loader";
+    readonly id: "null";
+    readonly module: "core";
+    readonly version: any;
+    readonly mimeTypes: ["application/x.empty"];
+    readonly extensions: ["null"];
+    readonly parse: (arrayBuffer: ArrayBuffer, options?: NullLoaderOptions, context?: LoaderContext) => Promise<null>;
+    readonly parseSync: typeof parseSync;
+    readonly parseInBatches: (asyncIterator: Iterable<ArrayBuffer> | AsyncIterable<ArrayBuffer>, options: NullLoaderOptions | undefined, context: LoaderContext | undefined) => AsyncGenerator<null, void, undefined>;
+    readonly tests: [() => false];
+    readonly options: {
+        readonly 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.
+ */
+declare function parseSync(arrayBuffer: ArrayBuffer, options?: NullLoaderOptions, context?: LoaderContext): null;
+export {};
 //# 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":"AAQA,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"}
+{"version":3,"file":"null-loader.d.ts","sourceRoot":"","sources":["../src/null-loader.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAA2B,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACtF,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAEvD,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAC9C,IAAI,CAAC,EAAE,EAAE,CAAC;CACX,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;CAc8B,CAAC;AAE5D;;GAEG;AACH,eAAO,MAAM,UAAU;;;;;;;;;kCAUM,WAAW,YAAY,iBAAiB,YAAY,aAAa;;;;;;;CAY1B,CAAC;AAErE;;;GAGG;AACH,iBAAS,SAAS,CAChB,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE,iBAAiB,EAC3B,OAAO,CAAC,EAAE,aAAa,GACtB,IAAI,CAEN"}

package/dist/null-loader.js

@@ -3,11 +3,13 @@
 // Copyright (c) vis.gl contributors
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.2.0-alpha.4" !== 'undefined' ? "4.2.0-alpha.4" : 'latest';
+const VERSION = typeof "4.2.0-alpha.6" !== 'undefined' ? "4.2.0-alpha.6" : 'latest';
 /**
  * Loads any data and returns null (or optionally passes through data unparsed)
  */
 export const NullWorkerLoader = {
+    dataType: null,
+    batchType: null,
     name: 'Null loader',
     id: 'null',
     module: 'core',
@@ -24,6 +26,8 @@ export const NullWorkerLoader = {
  * Loads any data and returns null (or optionally passes through data unparsed)
  */
 export const NullLoader = {
+    dataType: null,
+    batchType: null,
     name: 'Null loader',
     id: 'null',
     module: 'core',

package/dist/null-worker-node.js

@@ -94,7 +94,9 @@ var WorkerBody = class {
     }
     getParentPort().then((parentPort2) => {
       if (parentPort2) {
-        parentPort2.on("message", handleMessage);
+        parentPort2.on("message", (message) => {
+          handleMessage(message);
+        });
         parentPort2.on("exit", () => console.debug("Node worker closing"));
       } else {
         globalThis.onmessage = handleMessage;
@@ -233,8 +235,10 @@ async function parseData({
 }
 
 // src/null-loader.ts
-var VERSION = true ? "4.2.0-alpha.4" : "latest";
+var VERSION = true ? "4.2.0-alpha.6" : "latest";
 var NullLoader = {
+  dataType: null,
+  batchType: null,
   name: "Null loader",
   id: "null",
   module: "core",

package/dist/null-worker.js

@@ -59,7 +59,9 @@
       }
       getParentPort().then((parentPort2) => {
         if (parentPort2) {
-          parentPort2.on("message", handleMessage);
+          parentPort2.on("message", (message) => {
+            handleMessage(message);
+          });
           parentPort2.on("exit", () => console.debug("Node worker closing"));
         } else {
           globalThis.onmessage = handleMessage;
@@ -198,8 +200,10 @@
   }
 
   // src/null-loader.ts
-  var VERSION = true ? "4.2.0-alpha.4" : "latest";
+  var VERSION = true ? "4.2.0-alpha.6" : "latest";
   var NullLoader = {
+    dataType: null,
+    batchType: null,
     name: "Null loader",
     id: "null",
     module: "core",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/core",
-  "version": "4.2.0-alpha.5",
+  "version": "4.2.0-beta.1",
   "description": "The core API for working with loaders.gl loaders and writers",
   "license": "MIT",
   "type": "module",
@@ -36,11 +36,11 @@
   },
   "sideEffects": false,
   "browser": {
-    "fs": false,
-    "stream": false,
-    "./src/iterators/make-stream/make-node-stream.ts": "./src/iterators/make-stream/make-dom-stream.ts",
+    "./dist/iterators/make-stream/make-node-stream.js": "./dist/iterators/make-stream/make-dom-stream.js",
     "./src/iterators/make-stream/make-node-stream.js": "./src/iterators/make-stream/make-dom-stream.js",
-    "./dist/iterators/make-stream/make-node-stream.js": "./dist/iterators/make-stream/make-dom-stream.js"
+    "./src/iterators/make-stream/make-node-stream.ts": "./src/iterators/make-stream/make-dom-stream.ts",
+    "fs": false,
+    "stream": false
   },
   "files": [
     "src",
@@ -55,9 +55,10 @@
     "build-worker-node": "esbuild src/workers/null-worker.ts --outfile=dist/null-worker-node.js --bundle --platform=node --target=node16 --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/loader-utils": "4.2.0-alpha.5",
-    "@loaders.gl/worker-utils": "4.2.0-alpha.5",
+    "@loaders.gl/loader-utils": "4.2.0-beta.1",
+    "@loaders.gl/schema": "4.2.0-beta.1",
+    "@loaders.gl/worker-utils": "4.2.0-beta.1",
     "@probe.gl/log": "^4.0.2"
   },
-  "gitHead": "32d95a81971f104e4dfeb88ab57065f05321a76a"
+  "gitHead": "c386a9196516fe3ff24847b40e6c77be039cf905"
 }

package/src/index.ts

@@ -22,6 +22,7 @@ export type {
 
 // FILE READING AND WRITING
 export {fetchFile} from './lib/fetch/fetch-file';
+export {FetchError} from './lib/fetch/fetch-error';
 
 export {readArrayBuffer} from './lib/fetch/read-array-buffer';
 // export {readFileSync} from './lib/fetch/read-file';

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

@@ -186,14 +186,15 @@ async function* parseChunkInBatches(
  * @todo run through batch builder to apply options etc...
  */
 function convertDataToBatch(parsedData: unknown, loader: Loader): Batch {
+  // prettier-ignore
   const batch: Batch = isTable(parsedData)
     ? makeBatchFromTable(parsedData)
     : {
-        shape: 'unknown',
-        batchType: 'data',
-        data: parsedData,
-        length: Array.isArray(parsedData) ? parsedData.length : 1
-      };
+      shape: 'unknown',
+      batchType: 'data',
+      data: parsedData,
+      length: Array.isArray(parsedData) ? parsedData.length : 1
+    };
 
   batch.mimeType = loader.mimeTypes[0];
 

package/src/lib/api/select-loader.ts

@@ -7,6 +7,7 @@ import {compareArrayBuffers, path} from '@loaders.gl/loader-utils';
 import {normalizeLoader} from '../loader-utils/normalize-loader';
 import {log} from '../utils/log';
 import {getResourceUrl, getResourceMIMEType} from '../utils/resource-utils';
+import {compareMIMETypes} from '../utils/mime-type-utils';
 import {getRegisteredLoaders} from './register-loaders';
 import {isBlob} from '../../javascript-utils/is-type';
 import {stripQueryString} from '../utils/url-utils';
@@ -216,13 +217,13 @@ function findLoaderByExtension(loaders: Loader[], extension: string): Loader | n
 
 function findLoaderByMIMEType(loaders: Loader[], mimeType: string): Loader | null {
   for (const loader of loaders) {
-    if (loader.mimeTypes && loader.mimeTypes.includes(mimeType)) {
+    if (loader.mimeTypes?.some((mimeType1) => compareMIMETypes(mimeType, mimeType1))) {
       return loader;
     }
 
     // Support referring to loaders using the "unregistered tree"
     // https://en.wikipedia.org/wiki/Media_type#Unregistered_tree
-    if (mimeType === `application/x.${loader.id}`) {
+    if (compareMIMETypes(mimeType, `application/x.${loader.id}`)) {
       return loader;
     }
   }

package/src/lib/fetch/fetch-error-message.ts

@@ -2,10 +2,12 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
+// TODO - duplicates response-utils code
 export function getErrorMessageFromResponseSync(response: Response): string {
   return `Failed to fetch resource ${response.url}(${response.status}): ${response.statusText} `;
 }
 
+// TODO - duplicates response-utils code
 export async function getErrorMessageFromResponse(response: Response): Promise<string> {
   let message = `Failed to fetch resource ${response.url} (${response.status}): `;
   try {

package/src/lib/fetch/fetch-error.ts

@@ -0,0 +1,18 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+export class FetchError extends Error {
+  constructor(message: string, info: {url: string; reason: string; response?: Response}) {
+    super(message);
+    this.reason = info.reason;
+    this.url = info.url;
+    this.response = info.response;
+  }
+  /** A best effort reason for why the fetch failed */
+  reason: string;
+  /** The URL that failed to load. Empty string if not available. */
+  url: string;
+  /** The Response object, if any. */
+  response?: Response;
+}

package/src/lib/fetch/fetch-file.ts

@@ -4,6 +4,7 @@
 
 import {resolvePath} from '@loaders.gl/loader-utils';
 import {makeResponse} from '../utils/response-utils';
+// import {FetchError} from './fetch-error';
 
 export function isNodePath(url: string): boolean {
   return !isRequestURL(url) && !isDataURL(url);

package/src/lib/loader-utils/option-utils.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {Loader, LoaderOptions} from '@loaders.gl/loader-utils';
+import {Loader, LoaderOptions, registerJSModules} from '@loaders.gl/loader-utils';
 import {isPureObject, isObject} from '../../javascript-utils/is-type';
 import {probeLog, NullLog} from './loggers';
 import {DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS} from './option-defaults';
@@ -53,6 +53,8 @@ export function setGlobalOptions(options: LoaderOptions): void {
   const globalOptions = getGlobalLoaderOptions();
   // @ts-expect-error First param looks incorrect
   state.globalOptions = normalizeOptionsInternal(globalOptions, options);
+  // Make sure any new modules are registered
+  registerJSModules(options.modules);
 }
 
 /**