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

package/dist/crunch-worker.js

@@ -1,38 +1,5 @@
 "use strict";
 (() => {
-  var __create = Object.create;
-  var __defProp = Object.defineProperty;
-  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-  var __getOwnPropNames = Object.getOwnPropertyNames;
-  var __getProtoOf = Object.getPrototypeOf;
-  var __hasOwnProp = Object.prototype.hasOwnProperty;
-  var __commonJS = (cb, mod) => function __require() {
-    return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-  };
-  var __copyProps = (to, from, except, desc) => {
-    if (from && typeof from === "object" || typeof from === "function") {
-      for (let key of __getOwnPropNames(from))
-        if (!__hasOwnProp.call(to, key) && key !== except)
-          __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-    }
-    return to;
-  };
-  var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-    // If the importer is in node compatibility mode or this is not an ESM
-    // file that has been converted to a CommonJS file using a Babel-
-    // compatible transform (i.e. "__esModule" has not been set), then set
-    // "default" to the CommonJS "module.exports" for node compatibility.
-    isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-    mod
-  ));
-
-  // (disabled):../worker-utils/src/lib/node/require-utils.node
-  var require_require_utils = __commonJS({
-    "(disabled):../worker-utils/src/lib/node/require-utils.node"() {
-      "use strict";
-    }
-  });
-
   // ../loader-utils/src/lib/env-utils/assert.ts
   function assert(condition, message) {
     if (!condition) {
@@ -40,6 +7,17 @@
     }
   }
 
+  // ../loader-utils/src/lib/module-utils/js-module-utils.ts
+  function registerJSModules(modules) {
+    globalThis.loaders ||= {};
+    globalThis.loaders.modules ||= {};
+    Object.assign(globalThis.loaders.modules, modules);
+  }
+  function getJSModuleOrNull(name) {
+    const module = globalThis.loaders?.modules?.[name];
+    return module || null;
+  }
+
   // ../worker-utils/src/lib/env-utils/version.ts
   function getVersion() {
     if (!globalThis._loadersgl_?.version) {
@@ -50,7 +28,7 @@
         );
         globalThis._loadersgl_.version = NPM_TAG;
       } else {
-        globalThis._loadersgl_.version = "4.2.0-alpha.4";
+        globalThis._loadersgl_.version = "4.2.0-alpha.6";
       }
     }
     return globalThis._loadersgl_.version;
@@ -143,7 +121,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;
@@ -201,7 +181,6 @@
   }
 
   // ../worker-utils/src/lib/library-utils/library-utils.ts
-  var node = __toESM(require_require_utils(), 1);
   var loadLibraryPromises = {};
   async function loadLibrary(libraryUrl, moduleName = null, options = {}, libraryName = null) {
     if (moduleName) {
@@ -238,7 +217,8 @@
     }
     if (!isBrowser) {
       try {
-        return node && void 0 && await (void 0)(libraryUrl);
+        const { requireFromFile } = globalThis.loaders || {};
+        return await requireFromFile?.(libraryUrl);
       } catch (error) {
         console.error(error);
         return null;
@@ -252,7 +232,8 @@
   }
   function loadLibraryFromString(scriptSource, id) {
     if (!isBrowser) {
-      return void 0 && (void 0)(scriptSource, id);
+      const { requireFromString } = globalThis.loaders || {};
+      return requireFromString?.(scriptSource, id);
     }
     if (isWorker) {
       eval.call(globalThis, scriptSource);
@@ -269,18 +250,20 @@
     return null;
   }
   async function loadAsArrayBuffer(url) {
-    if (isBrowser || !void 0 || url.startsWith("http")) {
+    const { readFileAsArrayBuffer } = globalThis.loaders || {};
+    if (isBrowser || !readFileAsArrayBuffer || url.startsWith("http")) {
       const response = await fetch(url);
       return await response.arrayBuffer();
     }
-    return await (void 0)(url);
+    return await readFileAsArrayBuffer(url);
   }
   async function loadAsText(url) {
-    if (isBrowser || !void 0 || url.startsWith("http")) {
+    const { readFileAsText } = globalThis.loaders || {};
+    if (isBrowser || !readFileAsText || url.startsWith("http")) {
       const response = await fetch(url);
       return await response.text();
     }
-    return await (void 0)(url);
+    return await readFileAsText(url);
   }
 
   // ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
@@ -365,10 +348,12 @@
   }
 
   // src/lib/utils/version.ts
-  var VERSION2 = true ? "4.2.0-alpha.4" : "latest";
+  var VERSION2 = true ? "4.2.0-alpha.6" : "latest";
 
   // src/crunch-loader.ts
   var CrunchLoader = {
+    dataType: null,
+    batchType: null,
     id: "crunch",
     name: "Crunch",
     module: "textures",
@@ -390,9 +375,10 @@
     DECODER: "crunch.js"
   };
   async function loadCrunchModule(options) {
-    const modules = options.modules || {};
-    if (modules.crunch) {
-      return modules.crunch;
+    registerJSModules(options.modules);
+    const crunch = getJSModuleOrNull("crunch");
+    if (crunch) {
+      return crunch;
     }
     return loadCrunch(options);
   }
@@ -402,7 +388,7 @@
       return crunchModule;
     }
     let loadCrunchDecoder = await loadLibrary(CRUNCH_EXTERNAL_LIBRARIES.DECODER, "textures", options);
-    loadCrunchDecoder = loadCrunchDecoder || globalThis.LoadCrunchDecoder;
+    loadCrunchDecoder ||= globalThis.LoadCrunchDecoder;
     crunchModule = loadCrunchDecoder();
     return crunchModule;
   }

package/dist/dist.dev.js

@@ -45,13 +45,6 @@ var __exports__ = (() => {
     }
   });
 
-  // (disabled):../worker-utils/src/lib/node/require-utils.node
-  var require_require_utils = __commonJS({
-    "(disabled):../worker-utils/src/lib/node/require-utils.node"() {
-      "use strict";
-    }
-  });
-
   // (disabled):../worker-utils/src/lib/process-utils/child-process-proxy
   var require_child_process_proxy = __commonJS({
     "(disabled):../worker-utils/src/lib/process-utils/child-process-proxy"() {
@@ -87,6 +80,42 @@ var __exports__ = (() => {
   // src/lib/utils/version.ts
   var VERSION = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
 
+  // ../loader-utils/src/lib/env-utils/assert.ts
+  function assert(condition, message) {
+    if (!condition) {
+      throw new Error(message || "loader assertion failed.");
+    }
+  }
+
+  // ../loader-utils/src/lib/env-utils/globals.ts
+  var globals = {
+    self: typeof self !== "undefined" && self,
+    window: typeof window !== "undefined" && window,
+    global: typeof global !== "undefined" && global,
+    document: typeof document !== "undefined" && document
+  };
+  var self_ = globals.self || globals.window || globals.global || {};
+  var window_ = globals.window || globals.self || globals.global || {};
+  var global_ = globals.global || globals.self || globals.window || {};
+  var document_ = globals.document || {};
+  var isBrowser = (
+    // @ts-ignore process does not exist on browser
+    Boolean(typeof process !== "object" || String(process) !== "[object process]" || process.browser)
+  );
+  var matches = typeof process !== "undefined" && process.version && /v([0-9]*)/.exec(process.version);
+  var nodeVersion = matches && parseFloat(matches[1]) || 0;
+
+  // ../loader-utils/src/lib/module-utils/js-module-utils.ts
+  function registerJSModules(modules) {
+    globalThis.loaders ||= {};
+    globalThis.loaders.modules ||= {};
+    Object.assign(globalThis.loaders.modules, modules);
+  }
+  function getJSModuleOrNull(name) {
+    const module = globalThis.loaders?.modules?.[name];
+    return module || null;
+  }
+
   // ../worker-utils/src/lib/env-utils/version.ts
   var NPM_TAG = "latest";
   function getVersion() {
@@ -106,34 +135,33 @@ var __exports__ = (() => {
   var VERSION2 = getVersion();
 
   // ../worker-utils/src/lib/env-utils/assert.ts
-  function assert(condition, message) {
+  function assert2(condition, message) {
     if (!condition) {
       throw new Error(message || "loaders.gl assertion failed.");
     }
   }
 
   // ../worker-utils/src/lib/env-utils/globals.ts
-  var globals = {
+  var globals2 = {
     self: typeof self !== "undefined" && self,
     window: typeof window !== "undefined" && window,
     global: typeof global !== "undefined" && global,
     document: typeof document !== "undefined" && document
   };
-  var self_ = globals.self || globals.window || globals.global || {};
-  var window_ = globals.window || globals.self || globals.global || {};
-  var global_ = globals.global || globals.self || globals.window || {};
-  var document_ = globals.document || {};
-  var isBrowser = (
+  var self_2 = globals2.self || globals2.window || globals2.global || {};
+  var window_2 = globals2.window || globals2.self || globals2.global || {};
+  var global_2 = globals2.global || globals2.self || globals2.window || {};
+  var document_2 = globals2.document || {};
+  var isBrowser2 = (
     // @ts-ignore process.browser
     typeof process !== "object" || String(process) !== "[object process]" || process.browser
   );
   var isWorker = typeof importScripts === "function";
   var isMobile = typeof window !== "undefined" && typeof window.orientation !== "undefined";
-  var matches = typeof process !== "undefined" && process.version && /v([0-9]*)/.exec(process.version);
-  var nodeVersion = matches && parseFloat(matches[1]) || 0;
+  var matches2 = typeof process !== "undefined" && process.version && /v([0-9]*)/.exec(process.version);
+  var nodeVersion2 = matches2 && parseFloat(matches2[1]) || 0;
 
   // ../worker-utils/src/lib/library-utils/library-utils.ts
-  var node = __toESM(require_require_utils(), 1);
   var loadLibraryPromises = {};
   async function loadLibrary(libraryUrl, moduleName = null, options = {}, libraryName = null) {
     if (moduleName) {
@@ -152,11 +180,11 @@ var __exports__ = (() => {
     if (modules[libraryName]) {
       return modules[libraryName];
     }
-    if (!isBrowser) {
+    if (!isBrowser2) {
       return `modules/${moduleName}/dist/libs/${libraryName}`;
     }
     if (options.CDN) {
-      assert(options.CDN.startsWith("http"));
+      assert2(options.CDN.startsWith("http"));
       return `${options.CDN}/${moduleName}@${VERSION2}/dist/libs/${libraryName}`;
     }
     if (isWorker) {
@@ -168,9 +196,10 @@ var __exports__ = (() => {
     if (libraryUrl.endsWith("wasm")) {
       return await loadAsArrayBuffer(libraryUrl);
     }
-    if (!isBrowser) {
+    if (!isBrowser2) {
       try {
-        return node && void 0 && await (void 0)(libraryUrl);
+        const { requireFromFile } = globalThis.loaders || {};
+        return await requireFromFile?.(libraryUrl);
       } catch (error) {
         console.error(error);
         return null;
@@ -183,8 +212,9 @@ var __exports__ = (() => {
     return loadLibraryFromString(scriptSource, libraryUrl);
   }
   function loadLibraryFromString(scriptSource, id) {
-    if (!isBrowser) {
-      return void 0 && (void 0)(scriptSource, id);
+    if (!isBrowser2) {
+      const { requireFromString } = globalThis.loaders || {};
+      return requireFromString?.(scriptSource, id);
     }
     if (isWorker) {
       eval.call(globalThis, scriptSource);
@@ -201,23 +231,41 @@ var __exports__ = (() => {
     return null;
   }
   async function loadAsArrayBuffer(url) {
-    if (isBrowser || !void 0 || url.startsWith("http")) {
+    const { readFileAsArrayBuffer } = globalThis.loaders || {};
+    if (isBrowser2 || !readFileAsArrayBuffer || url.startsWith("http")) {
       const response = await fetch(url);
       return await response.arrayBuffer();
     }
-    return await (void 0)(url);
+    return await readFileAsArrayBuffer(url);
   }
   async function loadAsText(url) {
-    if (isBrowser || !void 0 || url.startsWith("http")) {
+    const { readFileAsText } = globalThis.loaders || {};
+    if (isBrowser2 || !readFileAsText || url.startsWith("http")) {
       const response = await fetch(url);
       return await response.text();
     }
-    return await (void 0)(url);
+    return await readFileAsText(url);
   }
 
   // ../worker-utils/src/index.ts
   var import_child_process_proxy = __toESM(require_child_process_proxy(), 1);
 
+  // ../loader-utils/src/lib/path-utils/file-aliases.ts
+  var pathPrefix = "";
+  var fileAliases = {};
+  function resolvePath(filename) {
+    for (const alias in fileAliases) {
+      if (filename.startsWith(alias)) {
+        const replacement = fileAliases[alias];
+        filename = filename.replace(alias, replacement);
+      }
+    }
+    if (!filename.startsWith("http://") && !filename.startsWith("https://")) {
+      filename = `${pathPrefix}${filename}`;
+    }
+    return filename;
+  }
+
   // src/lib/parsers/basis-module-loader.ts
   var BASIS_EXTERNAL_LIBRARIES = {
     /** Basis transcoder, javascript wrapper part */
@@ -231,11 +279,12 @@ var __exports__ = (() => {
   };
   var loadBasisTranscoderPromise;
   async function loadBasisTranscoderModule(options) {
-    const modules = options.modules || {};
-    if (modules.basis) {
-      return modules.basis;
+    registerJSModules(options.modules);
+    const basis = getJSModuleOrNull("basis");
+    if (basis) {
+      return basis;
     }
-    loadBasisTranscoderPromise = loadBasisTranscoderPromise || loadBasisTranscoder(options);
+    loadBasisTranscoderPromise ||= loadBasisTranscoder(options);
     return await loadBasisTranscoderPromise;
   }
   async function loadBasisTranscoder(options) {
@@ -901,6 +950,8 @@ var __exports__ = (() => {
 
   // src/basis-loader.ts
   var BasisWorkerLoader = {
+    dataType: null,
+    batchType: null,
     name: "Basis",
     id: "basis",
     module: "textures",
@@ -913,12 +964,9 @@ var __exports__ = (() => {
     options: {
       basis: {
         format: "auto",
-        // gl context doesn't exist on a worker thread
         libraryPath: "libs/",
         containerFormat: "auto",
-        // 'basis' || 'ktx2' || 'auto'
         module: "transcoder"
-        // 'transcoder' || 'encoder'
       }
     }
   };
@@ -927,47 +975,6 @@ var __exports__ = (() => {
     parse: parseBasis
   };
 
-  // ../loader-utils/src/lib/env-utils/assert.ts
-  function assert2(condition, message) {
-    if (!condition) {
-      throw new Error(message || "loader assertion failed.");
-    }
-  }
-
-  // ../loader-utils/src/lib/env-utils/globals.ts
-  var globals2 = {
-    self: typeof self !== "undefined" && self,
-    window: typeof window !== "undefined" && window,
-    global: typeof global !== "undefined" && global,
-    document: typeof document !== "undefined" && document
-  };
-  var self_2 = globals2.self || globals2.window || globals2.global || {};
-  var window_2 = globals2.window || globals2.self || globals2.global || {};
-  var global_2 = globals2.global || globals2.self || globals2.window || {};
-  var document_2 = globals2.document || {};
-  var isBrowser2 = (
-    // @ts-ignore process does not exist on browser
-    Boolean(typeof process !== "object" || String(process) !== "[object process]" || process.browser)
-  );
-  var matches2 = typeof process !== "undefined" && process.version && /v([0-9]*)/.exec(process.version);
-  var nodeVersion2 = matches2 && parseFloat(matches2[1]) || 0;
-
-  // ../loader-utils/src/lib/path-utils/file-aliases.ts
-  var pathPrefix = "";
-  var fileAliases = {};
-  function resolvePath(filename) {
-    for (const alias in fileAliases) {
-      if (filename.startsWith(alias)) {
-        const replacement = fileAliases[alias];
-        filename = filename.replace(alias, replacement);
-      }
-    }
-    if (!filename.startsWith("http://") && !filename.startsWith("https://")) {
-      filename = `${pathPrefix}${filename}`;
-    }
-    return filename;
-  }
-
   // src/lib/parsers/parse-dds.ts
   var DDS_CONSTANTS = {
     MAGIC_NUMBER: 542327876,
@@ -1010,14 +1017,14 @@ var __exports__ = (() => {
   function parseDDS(data) {
     const header = new Int32Array(data, 0, DDS_CONSTANTS.HEADER_LENGTH);
     const pixelFormatNumber = header[DDS_CONSTANTS.HEADER_PF_FOURCC_INDEX];
-    assert2(
+    assert(
       Boolean(header[DDS_CONSTANTS.HEADER_PF_FLAGS_INDEX] & DDS_CONSTANTS.DDPF_FOURCC),
       "DDS: Unsupported format, must contain a FourCC code"
     );
     const fourCC = int32ToFourCC(pixelFormatNumber);
     const internalFormat = DDS_PIXEL_FORMATS[fourCC];
     const sizeFunction = DDS_SIZE_FUNCTIONS[fourCC];
-    assert2(internalFormat && sizeFunction, `DDS: Unknown pixel format ${pixelFormatNumber}`);
+    assert(internalFormat && sizeFunction, `DDS: Unknown pixel format ${pixelFormatNumber}`);
     let mipMapLevels = 1;
     if (header[DDS_CONSTANTS.HEADER_FLAGS_INDEX] & DDS_CONSTANTS.DDSD_MIPMAPCOUNT) {
       mipMapLevels = Math.max(1, header[DDS_CONSTANTS.MIPMAPCOUNT_INDEX]);
@@ -1260,6 +1267,8 @@ var __exports__ = (() => {
 
   // src/compressed-texture-loader.ts
   var CompressedTextureWorkerLoader = {
+    dataType: null,
+    batchType: null,
     name: "Texture Containers",
     id: "compressed-texture",
     module: "textures",
@@ -1311,6 +1320,8 @@ var __exports__ = (() => {
 
   // src/crunch-loader.ts
   var CrunchLoader = {
+    dataType: null,
+    batchType: null,
     id: "crunch",
     name: "Crunch",
     module: "textures",
@@ -1388,6 +1399,8 @@ var __exports__ = (() => {
   // src/npy-loader.ts
   var NPY_MAGIC_NUMBER = new Uint8Array([147, 78, 85, 77, 80, 89]);
   var NPYWorkerLoader = {
+    dataType: null,
+    batchType: null,
     name: "NPY",
     id: "npy",
     module: "textures",
@@ -1518,7 +1531,7 @@ var __exports__ = (() => {
   var IMAGE_SUPPORTED = typeof Image !== "undefined";
   var IMAGE_BITMAP_SUPPORTED = typeof ImageBitmap !== "undefined";
   var NODE_IMAGE_SUPPORTED = Boolean(parseImageNode);
-  var DATA_SUPPORTED = isBrowser2 ? true : NODE_IMAGE_SUPPORTED;
+  var DATA_SUPPORTED = isBrowser ? true : NODE_IMAGE_SUPPORTED;
   function isImageTypeSupported(type) {
     switch (type) {
       case "auto":
@@ -1845,7 +1858,7 @@ var __exports__ = (() => {
   async function parseToNodeImage(arrayBuffer, options) {
     const { mimeType } = getBinaryImageMetadata(arrayBuffer) || {};
     const parseImageNode2 = globalThis.loaders?.parseImageNode;
-    assert2(parseImageNode2);
+    assert(parseImageNode2);
     return await parseImageNode2(arrayBuffer, mimeType);
   }
 
@@ -1868,7 +1881,7 @@ var __exports__ = (() => {
         image = await parseToNodeImage(arrayBuffer, options);
         break;
       default:
-        assert2(false);
+        assert(false);
     }
     if (imageType === "data") {
       image = getImageData(image);
@@ -1907,6 +1920,8 @@ var __exports__ = (() => {
     // imagebitmap: {} - passes (platform dependent) parameters to ImageBitmap constructor
   };
   var ImageLoader = {
+    dataType: null,
+    batchType: null,
     id: "image",
     module: "images",
     name: "Images",
@@ -1990,7 +2005,7 @@ var __exports__ = (() => {
       mipLevels = getMipLevels({ width, height });
       urls.push(url);
     }
-    assert2(mipLevels > 0);
+    assert(mipLevels > 0);
     for (let mipLevel = urls.length; mipLevel < mipLevels; ++mipLevel) {
       const url = generateUrl(getUrl, options, { ...urlOptions, lod: mipLevel });
       urls.push(url);