@loaders.gl/textures 4.0.0-alpha.9 → 4.0.0-beta.1

package/dist/compressed-texture-worker.js

@@ -35,10 +35,19 @@
   }
 
   // ../worker-utils/src/lib/env-utils/version.ts
-  var VERSION = true ? "4.0.0-alpha.9" : DEFAULT_VERSION;
-  if (false) {
-    console.error("loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.");
+  function getVersion() {
+    if (!globalThis._loadersgl_?.version) {
+      globalThis._loadersgl_ = globalThis._loadersgl_ || {};
+      if (false) {
+        console.error("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;
+      } else {
+        globalThis._loadersgl_.version = "4.0.0-beta.1";
+      }
+    }
+    return globalThis._loadersgl_.version;
   }
+  var VERSION = getVersion();
 
   // ../worker-utils/src/lib/env-utils/assert.ts
   function assert2(condition, message) {
@@ -175,40 +184,38 @@
 
   // ../worker-utils/src/lib/library-utils/library-utils.ts
   var node = __toModule(require_require_utils());
-  var LATEST = "beta";
-  var VERSION2 = typeof VERSION !== "undefined" ? VERSION : LATEST;
   var loadLibraryPromises = {};
-  async function loadLibrary(libraryUrl, moduleName = null, options = {}) {
+  async function loadLibrary(libraryUrl, moduleName = null, options = {}, libraryName = null) {
     if (moduleName) {
-      libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);
+      libraryUrl = getLibraryUrl(libraryUrl, moduleName, options, libraryName);
     }
     loadLibraryPromises[libraryUrl] = loadLibraryPromises[libraryUrl] || loadLibraryFromFile(libraryUrl);
     return await loadLibraryPromises[libraryUrl];
   }
-  function getLibraryUrl(library, moduleName, options) {
-    if (library.startsWith("http")) {
+  function getLibraryUrl(library, moduleName, options = {}, libraryName = null) {
+    if (!options.useLocalLibraries && library.startsWith("http")) {
       return library;
     }
+    libraryName = libraryName || library;
     const modules = options.modules || {};
-    if (modules[library]) {
-      return modules[library];
+    if (modules[libraryName]) {
+      return modules[libraryName];
     }
     if (!isBrowser) {
-      return `modules/${moduleName}/dist/libs/${library}`;
+      return `modules/${moduleName}/dist/libs/${libraryName}`;
     }
     if (options.CDN) {
       assert2(options.CDN.startsWith("http"));
-      return `${options.CDN}/${moduleName}@${VERSION2}/dist/libs/${library}`;
+      return `${options.CDN}/${moduleName}@${VERSION}/dist/libs/${libraryName}`;
     }
     if (isWorker) {
-      return `../src/libs/${library}`;
+      return `../src/libs/${libraryName}`;
     }
-    return `modules/${moduleName}/src/libs/${library}`;
+    return `modules/${moduleName}/src/libs/${libraryName}`;
   }
   async function loadLibraryFromFile(libraryUrl) {
     if (libraryUrl.endsWith("wasm")) {
-      const response2 = await fetch(libraryUrl);
-      return await response2.arrayBuffer();
+      return await loadAsArrayBuffer(libraryUrl);
     }
     if (!isBrowser) {
       try {
@@ -220,8 +227,7 @@
     if (isWorker) {
       return importScripts(libraryUrl);
     }
-    const response = await fetch(libraryUrl);
-    const scriptSource = await response.text();
+    const scriptSource = await loadAsText(libraryUrl);
     return loadLibraryFromString(scriptSource, libraryUrl);
   }
   function loadLibraryFromString(scriptSource, id) {
@@ -242,6 +248,20 @@
     document.body.appendChild(script);
     return null;
   }
+  async function loadAsArrayBuffer(url) {
+    if (!node.readFileAsArrayBuffer || url.startsWith("http")) {
+      const response = await fetch(url);
+      return await response.arrayBuffer();
+    }
+    return await node.readFileAsArrayBuffer(url);
+  }
+  async function loadAsText(url) {
+    if (!node.readFileAsText || url.startsWith("http")) {
+      const response = await fetch(url);
+      return await response.text();
+    }
+    return await node.readFileAsText(url);
+  }
 
   // ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
   var requestId = 0;
@@ -260,7 +280,7 @@
               options,
               context: {
                 ...context,
-                parse: parseOnMainThread
+                _parse: parseOnMainThread
               }
             });
             WorkerBody.postMessage("done", { result });
@@ -273,7 +293,7 @@
       }
     };
   }
-  function parseOnMainThread(arrayBuffer, options) {
+  function parseOnMainThread(arrayBuffer, loader, options, context) {
     return new Promise((resolve, reject) => {
       const id = requestId++;
       const onMessage = (type, payload2) => {
@@ -297,7 +317,12 @@
       WorkerBody.postMessage("process", payload);
     });
   }
-  async function parseData({ loader, arrayBuffer, options, context }) {
+  async function parseData({
+    loader,
+    arrayBuffer,
+    options,
+    context
+  }) {
     let data;
     let parser;
     if (loader.parseSync || loader.parse) {
@@ -319,7 +344,7 @@
   }
 
   // src/lib/utils/version.ts
-  var VERSION3 = true ? "4.0.0-alpha.9" : "beta";
+  var VERSION2 = true ? "4.0.0-beta.1" : "beta";
 
   // ../../node_modules/ktx-parse/dist/ktx-parse.modern.js
   var t = new Uint8Array([0]);
@@ -907,29 +932,32 @@
   }
 
   // src/lib/parsers/basis-module-loader.ts
-  var VERSION4 = true ? "4.0.0-alpha.9" : "beta";
-  var BASIS_CDN_ENCODER_WASM = `https://unpkg.com/@loaders.gl/textures@${VERSION4}/dist/libs/basis_encoder.wasm`;
-  var BASIS_CDN_ENCODER_JS = `https://unpkg.com/@loaders.gl/textures@${VERSION4}/dist/libs/basis_encoder.js`;
+  var BASIS_EXTERNAL_LIBRARIES = {
+    TRANSCODER: "basis_transcoder.js",
+    TRANSCODER_WASM: "basis_transcoder.wasm",
+    ENCODER: "basis_encoder.js",
+    ENCODER_WASM: "basis_encoder.wasm"
+  };
   var loadBasisTranscoderPromise;
-  async function loadBasisTrascoderModule(options) {
+  async function loadBasisTranscoderModule(options) {
     const modules = options.modules || {};
     if (modules.basis) {
       return modules.basis;
     }
-    loadBasisTranscoderPromise = loadBasisTranscoderPromise || loadBasisTrascoder(options);
+    loadBasisTranscoderPromise = loadBasisTranscoderPromise || loadBasisTranscoder(options);
     return await loadBasisTranscoderPromise;
   }
-  async function loadBasisTrascoder(options) {
+  async function loadBasisTranscoder(options) {
     let BASIS = null;
     let wasmBinary = null;
     [BASIS, wasmBinary] = await Promise.all([
-      await loadLibrary("basis_transcoder.js", "textures", options),
-      await loadLibrary("basis_transcoder.wasm", "textures", options)
+      await loadLibrary(BASIS_EXTERNAL_LIBRARIES.TRANSCODER, "textures", options),
+      await loadLibrary(BASIS_EXTERNAL_LIBRARIES.TRANSCODER_WASM, "textures", options)
     ]);
     BASIS = BASIS || globalThis.BASIS;
-    return await initializeBasisTrascoderModule(BASIS, wasmBinary);
+    return await initializeBasisTranscoderModule(BASIS, wasmBinary);
   }
-  function initializeBasisTrascoderModule(BasisModule, wasmBinary) {
+  function initializeBasisTranscoderModule(BasisModule, wasmBinary) {
     const options = {};
     if (wasmBinary) {
       options.wasmBinary = wasmBinary;
@@ -955,8 +983,8 @@
     let BASIS_ENCODER = null;
     let wasmBinary = null;
     [BASIS_ENCODER, wasmBinary] = await Promise.all([
-      await loadLibrary(BASIS_CDN_ENCODER_JS, "textures", options),
-      await loadLibrary(BASIS_CDN_ENCODER_WASM, "textures", options)
+      await loadLibrary(BASIS_EXTERNAL_LIBRARIES.ENCODER, "textures", options),
+      await loadLibrary(BASIS_EXTERNAL_LIBRARIES.ENCODER_WASM, "textures", options)
     ]);
     BASIS_ENCODER = BASIS_ENCODER || globalThis.BASIS;
     return await initializeBasisEncoderModule(BASIS_ENCODER, wasmBinary);
@@ -1062,7 +1090,7 @@
         const fileConstructors = await loadBasisEncoderModule(options);
         return parseKTX2File(fileConstructors.KTX2File, data, options);
       }
-      const { BasisFile } = await loadBasisTrascoderModule(options);
+      const { BasisFile } = await loadBasisTranscoderModule(options);
       return parseBasisFile(BasisFile, data, options);
     }
     switch (options.basis.module) {
@@ -1077,7 +1105,7 @@
         }
       case "transcoder":
       default:
-        const { BasisFile } = await loadBasisTrascoderModule(options);
+        const { BasisFile } = await loadBasisTranscoderModule(options);
         return parseBasisFile(BasisFile, data, options);
     }
   }
@@ -1192,17 +1220,11 @@
   }
 
   // src/compressed-texture-loader.ts
-  var DEFAULT_TEXTURE_LOADER_OPTIONS = {
-    "compressed-texture": {
-      libraryPath: "libs/",
-      useBasis: false
-    }
-  };
   var CompressedTextureWorkerLoader = {
     name: "Texture Containers",
     id: "compressed-texture",
     module: "textures",
-    version: VERSION3,
+    version: VERSION2,
     worker: true,
     extensions: [
       "ktx",
@@ -1218,12 +1240,17 @@
       "application/octet-stream"
     ],
     binary: true,
-    options: DEFAULT_TEXTURE_LOADER_OPTIONS
+    options: {
+      "compressed-texture": {
+        libraryPath: "libs/",
+        useBasis: false
+      }
+    }
   };
   var CompressedTextureLoader = {
     ...CompressedTextureWorkerLoader,
     parse: async (arrayBuffer, options) => {
-      if (options["compressed-texture"].useBasis) {
+      if (options?.["compressed-texture"]?.useBasis) {
         options.basis = {
           format: {
             alpha: "BC3",
@@ -1233,7 +1260,8 @@
           containerFormat: "ktx2",
           module: "encoder"
         };
-        return (await parseBasis(arrayBuffer, options))[0];
+        const result = await parseBasis(arrayBuffer, options);
+        return result[0];
       }
       return parseCompressedTexture(arrayBuffer);
     }

package/dist/crunch-loader.d.ts

@@ -1,21 +1,13 @@
-import type { Loader } from '@loaders.gl/loader-utils';
+import type { Loader, LoaderOptions } from '@loaders.gl/loader-utils';
+import type { TextureLevel } from '@loaders.gl/schema';
+export type CrunchLoaderOptions = LoaderOptions & {
+    crunch?: {
+        libraryPath?: string;
+    };
+};
 /**
  * Worker loader for the Crunch compressed texture container format
+ * @note We avoid bundling crunch - it is a rare format and large lib, so we only offer worker loader
  */
-export declare const CrunchLoader: {
-    id: string;
-    name: string;
-    module: string;
-    version: any;
-    worker: boolean;
-    extensions: string[];
-    mimeTypes: string[];
-    binary: boolean;
-    options: {
-        crunch: {
-            libraryPath: string;
-        };
-    };
-};
-export declare const _TypecheckCrunchLoader: Loader;
+export declare const CrunchLoader: Loader<TextureLevel[], never, CrunchLoaderOptions>;
 //# sourceMappingURL=crunch-loader.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"crunch-loader.d.ts","sourceRoot":"","sources":["../src/crunch-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAGrD;;GAEG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;CAcxB,CAAC;AAKF,eAAO,MAAM,sBAAsB,EAAE,MAAqB,CAAC"}
+{"version":3,"file":"crunch-loader.d.ts","sourceRoot":"","sources":["../src/crunch-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACpE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAGrD,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG;IAChD,MAAM,CAAC,EAAE;QACP,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;CACH,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,mBAAmB,CAc3E,CAAC"}

package/dist/crunch-worker.js

@@ -35,10 +35,19 @@
   }
 
   // ../worker-utils/src/lib/env-utils/version.ts
-  var VERSION = true ? "4.0.0-alpha.9" : DEFAULT_VERSION;
-  if (false) {
-    console.error("loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.");
+  function getVersion() {
+    if (!globalThis._loadersgl_?.version) {
+      globalThis._loadersgl_ = globalThis._loadersgl_ || {};
+      if (false) {
+        console.error("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;
+      } else {
+        globalThis._loadersgl_.version = "4.0.0-beta.1";
+      }
+    }
+    return globalThis._loadersgl_.version;
   }
+  var VERSION = getVersion();
 
   // ../worker-utils/src/lib/env-utils/assert.ts
   function assert2(condition, message) {
@@ -175,40 +184,38 @@
 
   // ../worker-utils/src/lib/library-utils/library-utils.ts
   var node = __toModule(require_require_utils());
-  var LATEST = "beta";
-  var VERSION2 = typeof VERSION !== "undefined" ? VERSION : LATEST;
   var loadLibraryPromises = {};
-  async function loadLibrary(libraryUrl, moduleName = null, options = {}) {
+  async function loadLibrary(libraryUrl, moduleName = null, options = {}, libraryName = null) {
     if (moduleName) {
-      libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);
+      libraryUrl = getLibraryUrl(libraryUrl, moduleName, options, libraryName);
     }
     loadLibraryPromises[libraryUrl] = loadLibraryPromises[libraryUrl] || loadLibraryFromFile(libraryUrl);
     return await loadLibraryPromises[libraryUrl];
   }
-  function getLibraryUrl(library, moduleName, options) {
-    if (library.startsWith("http")) {
+  function getLibraryUrl(library, moduleName, options = {}, libraryName = null) {
+    if (!options.useLocalLibraries && library.startsWith("http")) {
       return library;
     }
+    libraryName = libraryName || library;
     const modules = options.modules || {};
-    if (modules[library]) {
-      return modules[library];
+    if (modules[libraryName]) {
+      return modules[libraryName];
     }
     if (!isBrowser) {
-      return `modules/${moduleName}/dist/libs/${library}`;
+      return `modules/${moduleName}/dist/libs/${libraryName}`;
     }
     if (options.CDN) {
       assert2(options.CDN.startsWith("http"));
-      return `${options.CDN}/${moduleName}@${VERSION2}/dist/libs/${library}`;
+      return `${options.CDN}/${moduleName}@${VERSION}/dist/libs/${libraryName}`;
     }
     if (isWorker) {
-      return `../src/libs/${library}`;
+      return `../src/libs/${libraryName}`;
     }
-    return `modules/${moduleName}/src/libs/${library}`;
+    return `modules/${moduleName}/src/libs/${libraryName}`;
   }
   async function loadLibraryFromFile(libraryUrl) {
     if (libraryUrl.endsWith("wasm")) {
-      const response2 = await fetch(libraryUrl);
-      return await response2.arrayBuffer();
+      return await loadAsArrayBuffer(libraryUrl);
     }
     if (!isBrowser) {
       try {
@@ -220,8 +227,7 @@
     if (isWorker) {
       return importScripts(libraryUrl);
     }
-    const response = await fetch(libraryUrl);
-    const scriptSource = await response.text();
+    const scriptSource = await loadAsText(libraryUrl);
     return loadLibraryFromString(scriptSource, libraryUrl);
   }
   function loadLibraryFromString(scriptSource, id) {
@@ -242,6 +248,20 @@
     document.body.appendChild(script);
     return null;
   }
+  async function loadAsArrayBuffer(url) {
+    if (!node.readFileAsArrayBuffer || url.startsWith("http")) {
+      const response = await fetch(url);
+      return await response.arrayBuffer();
+    }
+    return await node.readFileAsArrayBuffer(url);
+  }
+  async function loadAsText(url) {
+    if (!node.readFileAsText || url.startsWith("http")) {
+      const response = await fetch(url);
+      return await response.text();
+    }
+    return await node.readFileAsText(url);
+  }
 
   // ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
   var requestId = 0;
@@ -260,7 +280,7 @@
               options,
               context: {
                 ...context,
-                parse: parseOnMainThread
+                _parse: parseOnMainThread
               }
             });
             WorkerBody.postMessage("done", { result });
@@ -273,7 +293,7 @@
       }
     };
   }
-  function parseOnMainThread(arrayBuffer, options) {
+  function parseOnMainThread(arrayBuffer, loader, options, context) {
     return new Promise((resolve, reject) => {
       const id = requestId++;
       const onMessage = (type, payload2) => {
@@ -297,7 +317,12 @@
       WorkerBody.postMessage("process", payload);
     });
   }
-  async function parseData({ loader, arrayBuffer, options, context }) {
+  async function parseData({
+    loader,
+    arrayBuffer,
+    options,
+    context
+  }) {
     let data;
     let parser;
     if (loader.parseSync || loader.parse) {
@@ -319,14 +344,14 @@
   }
 
   // src/lib/utils/version.ts
-  var VERSION3 = true ? "4.0.0-alpha.9" : "beta";
+  var VERSION2 = true ? "4.0.0-beta.1" : "beta";
 
   // src/crunch-loader.ts
   var CrunchLoader = {
     id: "crunch",
     name: "Crunch",
     module: "textures",
-    version: VERSION3,
+    version: VERSION2,
     worker: true,
     extensions: ["crn"],
     mimeTypes: ["image/crn", "image/x-crn", "application/octet-stream"],
@@ -339,6 +364,9 @@
   };
 
   // src/lib/parsers/crunch-module-loader.ts
+  var CRUNCH_EXTERNAL_LIBRARIES = {
+    DECODER: "crunch.js"
+  };
   async function loadCrunchModule(options) {
     const modules = options.modules || {};
     if (modules.crunch) {
@@ -351,7 +379,7 @@
     if (crunchModule) {
       return crunchModule;
     }
-    let loadCrunchDecoder = await loadLibrary("crunch.js", "textures", options);
+    let loadCrunchDecoder = await loadLibrary(CRUNCH_EXTERNAL_LIBRARIES.DECODER, "textures", options);
     loadCrunchDecoder = loadCrunchDecoder || globalThis.LoadCrunchDecoder;
     crunchModule = loadCrunchDecoder();
     return crunchModule;