@loaders.gl/textures 4.4.0-alpha.1 → 4.4.0-alpha.9

package/dist/compressed-texture-worker.js

@@ -27,8 +27,9 @@
           "loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN."
         );
         globalThis._loadersgl_.version = NPM_TAG;
+        warningIssued = true;
       } else {
-        globalThis._loadersgl_.version = "4.4.0-alpha.0";
+        globalThis._loadersgl_.version = "4.4.0-alpha.9";
       }
     }
     return globalThis._loadersgl_.version;
@@ -191,6 +192,9 @@
     return await loadLibraryPromises[libraryUrl];
   }
   function getLibraryUrl(library, moduleName, options = {}, libraryName = null) {
+    if (options?.core) {
+      throw new Error("loadLibrary: options.core must be pre-normalized");
+    }
     if (!options.useLocalLibraries && library.startsWith("http")) {
       return library;
     }
@@ -216,10 +220,20 @@
       return await loadAsArrayBuffer(libraryUrl);
     }
     if (!isBrowser) {
+      const { requireFromFile } = globalThis.loaders || {};
       try {
-        const { requireFromFile } = globalThis.loaders || {};
-        return await requireFromFile?.(libraryUrl);
+        const result = await requireFromFile?.(libraryUrl);
+        if (result || !libraryUrl.includes("/dist/libs/")) {
+          return result;
+        }
+        return await requireFromFile?.(libraryUrl.replace("/dist/libs/", "/src/libs/"));
       } catch (error) {
+        if (libraryUrl.includes("/dist/libs/")) {
+          try {
+            return await requireFromFile?.(libraryUrl.replace("/dist/libs/", "/src/libs/"));
+          } catch {
+          }
+        }
         console.error(error);
         return null;
       }
@@ -255,7 +269,14 @@
       const response = await fetch(url);
       return await response.arrayBuffer();
     }
-    return await readFileAsArrayBuffer(url);
+    try {
+      return await readFileAsArrayBuffer(url);
+    } catch {
+      if (url.includes("/dist/libs/")) {
+        return await readFileAsArrayBuffer(url.replace("/dist/libs/", "/src/libs/"));
+      }
+      throw new Error(`Failed to load ArrayBuffer from ${url}`);
+    }
   }
   async function loadAsText(url) {
     const { readFileAsText } = globalThis.loaders || {};
@@ -263,7 +284,14 @@
       const response = await fetch(url);
       return await response.text();
     }
-    return await readFileAsText(url);
+    try {
+      return await readFileAsText(url);
+    } catch {
+      if (url.includes("/dist/libs/")) {
+        return await readFileAsText(url.replace("/dist/libs/", "/src/libs/"));
+      }
+      throw new Error(`Failed to load text from ${url}`);
+    }
   }
 
   // ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
@@ -342,13 +370,16 @@
     options = {
       ...options,
       modules: loader && loader.options && loader.options.modules || {},
-      worker: false
+      core: {
+        ...options.core,
+        worker: false
+      }
     };
     return await parser(data, { ...options }, context, loader);
   }
 
   // src/lib/utils/version.ts
-  var VERSION2 = true ? "4.4.0-alpha.0" : "latest";
+  var VERSION2 = true ? "4.4.0-alpha.9" : "latest";
 
   // ../../node_modules/ktx-parse/dist/ktx-parse.modern.js
   var KHR_SUPERCOMPRESSION_NONE = 0;
@@ -1318,18 +1349,18 @@
     bgr565: { basisFormat: 15, compressed: false },
     rgba4444: { basisFormat: 16, compressed: false }
   };
-  async function parseBasis(data, options) {
-    if (options.basis.containerFormat === "auto") {
+  async function parseBasis(data, options = {}) {
+    if (!options.basis?.containerFormat || options.basis.containerFormat === "auto") {
       if (isKTX(data)) {
-        const fileConstructors = await loadBasisEncoderModule(options);
+        const fileConstructors = await loadBasisEncoderModule(options?.core || {});
         return parseKTX2File(fileConstructors.KTX2File, data, options);
       }
-      const { BasisFile } = await loadBasisTranscoderModule(options);
+      const { BasisFile } = await loadBasisTranscoderModule(options?.core || {});
       return parseBasisFile(BasisFile, data, options);
     }
     switch (options.basis.module) {
       case "encoder":
-        const fileConstructors = await loadBasisEncoderModule(options);
+        const fileConstructors = await loadBasisEncoderModule(options?.core || {});
         switch (options.basis.containerFormat) {
           case "ktx2":
             return parseKTX2File(fileConstructors.KTX2File, data, options);
@@ -1339,7 +1370,7 @@
         }
       case "transcoder":
       default:
-        const { BasisFile } = await loadBasisTranscoderModule(options);
+        const { BasisFile } = await loadBasisTranscoderModule(options.core || {});
         return parseBasisFile(BasisFile, data, options);
     }
   }
@@ -1442,7 +1473,7 @@
     };
   }
   function getBasisOptions(options, hasAlpha) {
-    let format = options && options.basis && options.basis.format;
+    let format = options.basis?.format;
     if (format === "auto") {
       format = selectSupportedBasisFormat();
     }
@@ -1509,13 +1540,13 @@
   var CompressedTextureLoader = {
     ...CompressedTextureWorkerLoader,
     parse: async (arrayBuffer, options) => {
+      options = { ...options };
       if (options?.["compressed-texture"]?.useBasis) {
         options.basis = {
           format: {
             alpha: "BC3",
             noAlpha: "BC1"
           },
-          // @ts-expect-error TODO not allowed to modify inputs
           ...options.basis,
           containerFormat: "ktx2",
           module: "encoder"

package/dist/compressed-texture-worker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compressed-texture-worker.js","sourceRoot":"","sources":["../src/compressed-texture-worker.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAEpC,6EAA6E;AAC7E,MAAM,CAAC,IAAI,GAAG,CAAC,wCAAwC,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC"}

package/dist/compressed-texture-writer.js

@@ -28,3 +28,4 @@ export const CompressedTextureWriter = {
         throw new Error('Not implemented');
     }
 };
+//# sourceMappingURL=compressed-texture-writer.js.map

package/dist/compressed-texture-writer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compressed-texture-writer.js","sourceRoot":"","sources":["../src/compressed-texture-writer.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,OAAO,EAAC,+BAA4B;AAC5C,OAAO,EAAC,oCAAoC,EAAC,yCAAsC;AAiBnF;;GAEG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,IAAI,EAAE,uBAAuB;IAC7B,EAAE,EAAE,KAAK;IACT,MAAM,EAAE,UAAU;IAClB,OAAO,EAAE,OAAO;IAEhB,UAAU,EAAE,CAAC,KAAK,CAAC;IACnB,SAAS,EAAE,CAAC,kBAAkB,EAAE,aAAa,EAAE,0BAA0B,CAAC;IAE1E,OAAO,EAAE;QACP,OAAO,EAAE;YACP,MAAM,EAAE,MAAM;YACd,WAAW,EAAE,MAAM;YACnB,OAAO,EAAE,MAAM;YACf,MAAM,EAAE,KAAK;YACb,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,EAAE;SACd;KACF;IAED,cAAc,EAAE,oCAAoC;IACpD,MAAM;QACJ,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;CACqF,CAAC"}

package/dist/crunch-loader.js

@@ -23,3 +23,4 @@ export const CrunchLoader = {
         }
     }
 };
+//# sourceMappingURL=crunch-loader.js.map

package/dist/crunch-loader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"crunch-loader.js","sourceRoot":"","sources":["../src/crunch-loader.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAIpC,OAAO,EAAC,OAAO,EAAC,+BAA4B;AAa5C;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,QAAQ,EAAE,IAAiC;IAC3C,SAAS,EAAE,IAAa;IAExB,EAAE,EAAE,QAAQ;IACZ,IAAI,EAAE,QAAQ;IACd,MAAM,EAAE,UAAU;IAClB,OAAO,EAAE,OAAO;IAChB,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,CAAC,KAAK,CAAC;IACnB,SAAS,EAAE,CAAC,WAAW,EAAE,aAAa,EAAE,0BAA0B,CAAC;IACnE,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE;QACP,MAAM,EAAE;YACN,WAAW,EAAE,OAAO;SACrB;KACF;CACoE,CAAC"}

package/dist/crunch-worker.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=crunch-worker.d.ts.map

package/dist/crunch-worker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"crunch-worker.d.ts","sourceRoot":"","sources":["../src/crunch-worker.ts"],"names":[],"mappings":""}

package/dist/crunch-worker.js

@@ -27,8 +27,9 @@
           "loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN."
         );
         globalThis._loadersgl_.version = NPM_TAG;
+        warningIssued = true;
       } else {
-        globalThis._loadersgl_.version = "4.4.0-alpha.0";
+        globalThis._loadersgl_.version = "4.4.0-alpha.9";
       }
     }
     return globalThis._loadersgl_.version;
@@ -191,6 +192,9 @@
     return await loadLibraryPromises[libraryUrl];
   }
   function getLibraryUrl(library, moduleName, options = {}, libraryName = null) {
+    if (options?.core) {
+      throw new Error("loadLibrary: options.core must be pre-normalized");
+    }
     if (!options.useLocalLibraries && library.startsWith("http")) {
       return library;
     }
@@ -216,10 +220,20 @@
       return await loadAsArrayBuffer(libraryUrl);
     }
     if (!isBrowser) {
+      const { requireFromFile } = globalThis.loaders || {};
       try {
-        const { requireFromFile } = globalThis.loaders || {};
-        return await requireFromFile?.(libraryUrl);
+        const result = await requireFromFile?.(libraryUrl);
+        if (result || !libraryUrl.includes("/dist/libs/")) {
+          return result;
+        }
+        return await requireFromFile?.(libraryUrl.replace("/dist/libs/", "/src/libs/"));
       } catch (error) {
+        if (libraryUrl.includes("/dist/libs/")) {
+          try {
+            return await requireFromFile?.(libraryUrl.replace("/dist/libs/", "/src/libs/"));
+          } catch {
+          }
+        }
         console.error(error);
         return null;
       }
@@ -255,7 +269,14 @@
       const response = await fetch(url);
       return await response.arrayBuffer();
     }
-    return await readFileAsArrayBuffer(url);
+    try {
+      return await readFileAsArrayBuffer(url);
+    } catch {
+      if (url.includes("/dist/libs/")) {
+        return await readFileAsArrayBuffer(url.replace("/dist/libs/", "/src/libs/"));
+      }
+      throw new Error(`Failed to load ArrayBuffer from ${url}`);
+    }
   }
   async function loadAsText(url) {
     const { readFileAsText } = globalThis.loaders || {};
@@ -263,7 +284,14 @@
       const response = await fetch(url);
       return await response.text();
     }
-    return await readFileAsText(url);
+    try {
+      return await readFileAsText(url);
+    } catch {
+      if (url.includes("/dist/libs/")) {
+        return await readFileAsText(url.replace("/dist/libs/", "/src/libs/"));
+      }
+      throw new Error(`Failed to load text from ${url}`);
+    }
   }
 
   // ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
@@ -342,13 +370,16 @@
     options = {
       ...options,
       modules: loader && loader.options && loader.options.modules || {},
-      worker: false
+      core: {
+        ...options.core,
+        worker: false
+      }
     };
     return await parser(data, { ...options }, context, loader);
   }
 
   // src/lib/utils/version.ts
-  var VERSION2 = true ? "4.4.0-alpha.0" : "latest";
+  var VERSION2 = true ? "4.4.0-alpha.9" : "latest";
 
   // src/crunch-loader.ts
   var CrunchLoader = {

package/dist/crunch-worker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"crunch-worker.js","sourceRoot":"","sources":["../src/crunch-worker.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAEpC,6EAA6E;AAC7E,MAAM,CAAC,IAAI,GAAG,CAAC,4BAA4B,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC"}

package/dist/dist.dev.js

@@ -120,14 +120,16 @@ var __exports__ = (() => {
   var NPM_TAG = "beta";
 
   // ../worker-utils/src/lib/env-utils/version.ts
+  var warningIssued = false;
   function getVersion() {
     if (!globalThis._loadersgl_?.version) {
       globalThis._loadersgl_ = globalThis._loadersgl_ || {};
-      if (typeof __VERSION__ === "undefined") {
+      if (typeof __VERSION__ === "undefined" && !warningIssued) {
         console.warn(
           "loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN."
         );
         globalThis._loadersgl_.version = NPM_TAG;
+        warningIssued = true;
       } else {
         globalThis._loadersgl_.version = __VERSION__;
       }
@@ -174,6 +176,9 @@ var __exports__ = (() => {
     return await loadLibraryPromises[libraryUrl];
   }
   function getLibraryUrl(library, moduleName, options = {}, libraryName = null) {
+    if (options?.core) {
+      throw new Error("loadLibrary: options.core must be pre-normalized");
+    }
     if (!options.useLocalLibraries && library.startsWith("http")) {
       return library;
     }
@@ -199,10 +204,20 @@ var __exports__ = (() => {
       return await loadAsArrayBuffer(libraryUrl);
     }
     if (!isBrowser2) {
+      const { requireFromFile } = globalThis.loaders || {};
       try {
-        const { requireFromFile } = globalThis.loaders || {};
-        return await requireFromFile?.(libraryUrl);
+        const result = await requireFromFile?.(libraryUrl);
+        if (result || !libraryUrl.includes("/dist/libs/")) {
+          return result;
+        }
+        return await requireFromFile?.(libraryUrl.replace("/dist/libs/", "/src/libs/"));
       } catch (error) {
+        if (libraryUrl.includes("/dist/libs/")) {
+          try {
+            return await requireFromFile?.(libraryUrl.replace("/dist/libs/", "/src/libs/"));
+          } catch {
+          }
+        }
         console.error(error);
         return null;
       }
@@ -238,7 +253,14 @@ var __exports__ = (() => {
       const response = await fetch(url);
       return await response.arrayBuffer();
     }
-    return await readFileAsArrayBuffer(url);
+    try {
+      return await readFileAsArrayBuffer(url);
+    } catch {
+      if (url.includes("/dist/libs/")) {
+        return await readFileAsArrayBuffer(url.replace("/dist/libs/", "/src/libs/"));
+      }
+      throw new Error(`Failed to load ArrayBuffer from ${url}`);
+    }
   }
   async function loadAsText(url) {
     const { readFileAsText } = globalThis.loaders || {};
@@ -246,7 +268,14 @@ var __exports__ = (() => {
       const response = await fetch(url);
       return await response.text();
     }
-    return await readFileAsText(url);
+    try {
+      return await readFileAsText(url);
+    } catch {
+      if (url.includes("/dist/libs/")) {
+        return await readFileAsText(url.replace("/dist/libs/", "/src/libs/"));
+      }
+      throw new Error(`Failed to load text from ${url}`);
+    }
   }
 
   // ../worker-utils/src/index.ts
@@ -946,18 +975,18 @@ var __exports__ = (() => {
     bgr565: { basisFormat: 15, compressed: false },
     rgba4444: { basisFormat: 16, compressed: false }
   };
-  async function parseBasis(data, options) {
-    if (options.basis.containerFormat === "auto") {
+  async function parseBasis(data, options = {}) {
+    if (!options.basis?.containerFormat || options.basis.containerFormat === "auto") {
       if (isKTX(data)) {
-        const fileConstructors = await loadBasisEncoderModule(options);
+        const fileConstructors = await loadBasisEncoderModule(options?.core || {});
         return parseKTX2File(fileConstructors.KTX2File, data, options);
       }
-      const { BasisFile } = await loadBasisTranscoderModule(options);
+      const { BasisFile } = await loadBasisTranscoderModule(options?.core || {});
       return parseBasisFile(BasisFile, data, options);
     }
     switch (options.basis.module) {
       case "encoder":
-        const fileConstructors = await loadBasisEncoderModule(options);
+        const fileConstructors = await loadBasisEncoderModule(options?.core || {});
         switch (options.basis.containerFormat) {
           case "ktx2":
             return parseKTX2File(fileConstructors.KTX2File, data, options);
@@ -967,7 +996,7 @@ var __exports__ = (() => {
         }
       case "transcoder":
       default:
-        const { BasisFile } = await loadBasisTranscoderModule(options);
+        const { BasisFile } = await loadBasisTranscoderModule(options.core || {});
         return parseBasisFile(BasisFile, data, options);
     }
   }
@@ -1070,7 +1099,7 @@ var __exports__ = (() => {
     };
   }
   function getBasisOptions(options, hasAlpha) {
-    let format = options && options.basis && options.basis.format;
+    let format = options.basis?.format;
     if (format === "auto") {
       format = selectSupportedBasisFormat();
     }
@@ -1454,13 +1483,13 @@ var __exports__ = (() => {
   var CompressedTextureLoader = {
     ...CompressedTextureWorkerLoader,
     parse: async (arrayBuffer, options) => {
+      options = { ...options };
       if (options?.["compressed-texture"]?.useBasis) {
         options.basis = {
           format: {
             alpha: "BC3",
             noAlpha: "BC1"
           },
-          // @ts-expect-error TODO not allowed to modify inputs
           ...options.basis,
           containerFormat: "ktx2",
           module: "encoder"
@@ -1636,7 +1665,7 @@ var __exports__ = (() => {
       encodeUASTC = false,
       mipmaps = false
     } = options?.["ktx2-basis-writer"] || {};
-    const { BasisEncoder } = await loadBasisEncoderModule(options);
+    const { BasisEncoder } = await loadBasisEncoderModule(options.core || {});
     const basisEncoder = new BasisEncoder();
     try {
       const basisFileData = new Uint8Array(image.width * image.height * 4);
@@ -1821,7 +1850,6 @@ var __exports__ = (() => {
   }
 
   // ../images/src/lib/parsers/parse-to-image-bitmap.ts
-  var EMPTY_OBJECT = {};
   var imagebitmapOptionsSupported = true;
   async function parseToImageBitmap(arrayBuffer, options, url) {
     let blob;
@@ -1849,8 +1877,13 @@ var __exports__ = (() => {
     return await createImageBitmap(blob);
   }
   function isEmptyObject(object) {
-    for (const key in object || EMPTY_OBJECT) {
-      return false;
+    if (!object) {
+      return true;
+    }
+    for (const key in object) {
+      if (Object.prototype.hasOwnProperty.call(object, key)) {
+        return false;
+      }
     }
     return true;
   }