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

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.2";
+      }
+    }
+    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.2" : "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;

package/dist/dist.min.js

@@ -38,15 +38,24 @@
   });
 
   // ../worker-utils/src/lib/env-utils/version.ts
-  var DEFAULT_VERSION, VERSION2;
-  var init_version2 = __esm({
-    "../worker-utils/src/lib/env-utils/version.ts"() {
-      DEFAULT_VERSION = "beta";
-      VERSION2 = typeof __VERSION__ !== "undefined" ? __VERSION__ : DEFAULT_VERSION;
+  function getVersion() {
+    if (!globalThis._loadersgl_?.version) {
+      globalThis._loadersgl_ = globalThis._loadersgl_ || {};
       if (typeof __VERSION__ === "undefined") {
         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 = __VERSION__;
       }
     }
+    return globalThis._loadersgl_.version;
+  }
+  var NPM_TAG, VERSION2;
+  var init_version2 = __esm({
+    "../worker-utils/src/lib/env-utils/version.ts"() {
+      NPM_TAG = "beta";
+      VERSION2 = getVersion();
+    }
   });
 
   // ../worker-utils/src/lib/env-utils/assert.ts
@@ -89,37 +98,37 @@
   });
 
   // ../worker-utils/src/lib/library-utils/library-utils.ts
-  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) {
       assert(options.CDN.startsWith("http"));
-      return `${options.CDN}/${moduleName}@${VERSION3}/dist/libs/${library}`;
+      return `${options.CDN}/${moduleName}@${VERSION2}/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 {
@@ -131,8 +140,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) {
@@ -153,15 +161,27 @@
     document.body.appendChild(script);
     return null;
   }
-  var node, LATEST, VERSION3, loadLibraryPromises;
+  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);
+  }
+  var node, loadLibraryPromises;
   var init_library_utils = __esm({
     "../worker-utils/src/lib/library-utils/library-utils.ts"() {
       init_globals();
       node = __toModule(require_require_utils());
       init_assert();
       init_version2();
-      LATEST = "beta";
-      VERSION3 = typeof VERSION2 !== "undefined" ? VERSION2 : LATEST;
       loadLibraryPromises = {};
     }
   });
@@ -181,25 +201,25 @@
   });
 
   // src/lib/parsers/basis-module-loader.ts
-  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;
@@ -224,8 +244,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);
@@ -243,13 +263,16 @@
       });
     });
   }
-  var VERSION4, BASIS_CDN_ENCODER_WASM, BASIS_CDN_ENCODER_JS, loadBasisTranscoderPromise, loadBasisEncoderPromise;
+  var BASIS_EXTERNAL_LIBRARIES, loadBasisTranscoderPromise, loadBasisEncoderPromise;
   var init_basis_module_loader = __esm({
     "src/lib/parsers/basis-module-loader.ts"() {
       init_src();
-      VERSION4 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "beta";
-      BASIS_CDN_ENCODER_WASM = `https://unpkg.com/@loaders.gl/textures@${VERSION4}/dist/libs/basis_encoder.wasm`;
-      BASIS_CDN_ENCODER_JS = `https://unpkg.com/@loaders.gl/textures@${VERSION4}/dist/libs/basis_encoder.js`;
+      BASIS_EXTERNAL_LIBRARIES = {
+        TRANSCODER: "basis_transcoder.js",
+        TRANSCODER_WASM: "basis_transcoder.wasm",
+        ENCODER: "basis_encoder.js",
+        ENCODER_WASM: "basis_encoder.wasm"
+      };
     }
   });
 
@@ -625,7 +648,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) {
@@ -640,7 +663,7 @@
         }
       case "transcoder":
       default:
-        const { BasisFile } = await loadBasisTrascoderModule(options);
+        const { BasisFile } = await loadBasisTranscoderModule(options);
         return parseBasisFile(BasisFile, data, options);
     }
   }
@@ -1204,18 +1227,12 @@
   });
 
   // src/compressed-texture-loader.ts
-  var DEFAULT_TEXTURE_LOADER_OPTIONS, CompressedTextureWorkerLoader, CompressedTextureLoader;
+  var CompressedTextureWorkerLoader, CompressedTextureLoader;
   var init_compressed_texture_loader = __esm({
     "src/compressed-texture-loader.ts"() {
       init_version();
       init_parse_compressed_texture();
       init_parse_basis();
-      DEFAULT_TEXTURE_LOADER_OPTIONS = {
-        "compressed-texture": {
-          libraryPath: "libs/",
-          useBasis: false
-        }
-      };
       CompressedTextureWorkerLoader = {
         name: "Texture Containers",
         id: "compressed-texture",
@@ -1236,12 +1253,17 @@
           "application/octet-stream"
         ],
         binary: true,
-        options: DEFAULT_TEXTURE_LOADER_OPTIONS
+        options: {
+          "compressed-texture": {
+            libraryPath: "libs/",
+            useBasis: false
+          }
+        }
       };
       CompressedTextureLoader = {
         ...CompressedTextureWorkerLoader,
         parse: async (arrayBuffer, options) => {
-          if (options["compressed-texture"].useBasis) {
+          if (options?.["compressed-texture"]?.useBasis) {
             options.basis = {
               format: {
                 alpha: "BC3",
@@ -1251,7 +1273,8 @@
               containerFormat: "ktx2",
               module: "encoder"
             };
-            return (await parseBasis(arrayBuffer, options))[0];
+            const result = await parseBasis(arrayBuffer, options);
+            return result[0];
           }
           return parseCompressedTexture(arrayBuffer);
         }
@@ -1372,6 +1395,16 @@
     }
   });
 
+  // src/lib/parsers/crunch-module-loader.ts
+  var CRUNCH_EXTERNAL_LIBRARIES;
+  var init_crunch_module_loader = __esm({
+    "src/lib/parsers/crunch-module-loader.ts"() {
+      CRUNCH_EXTERNAL_LIBRARIES = {
+        DECODER: "crunch.js"
+      };
+    }
+  });
+
   // src/lib/encoders/encode-texture.ts
   async function encodeImageURLToCompressedTextureURL(inputUrl, outputUrl, options) {
     const args = [
@@ -1430,7 +1463,12 @@
 
   // src/lib/encoders/encode-ktx2-basis-texture.ts
   async function encodeKTX2BasisTexture(image, options = {}) {
-    const { useSRGB = false, qualityLevel = 10, encodeUASTC = false, mipmaps = false } = options;
+    const {
+      useSRGB = false,
+      qualityLevel = 10,
+      encodeUASTC = false,
+      mipmaps = false
+    } = options?.["ktx2-basis-writer"] || {};
     const { BasisEncoder } = await loadBasisEncoderModule(options);
     const basisEncoder = new BasisEncoder();
     try {
@@ -1473,10 +1511,12 @@
         version: VERSION,
         extensions: ["ktx2"],
         options: {
-          useSRGB: false,
-          qualityLevel: 10,
-          encodeUASTC: false,
-          mipmaps: false
+          ["ktx2-basis-writer"]: {
+            useSRGB: false,
+            qualityLevel: 10,
+            encodeUASTC: false,
+            mipmaps: false
+          }
         },
         encode: encodeKTX2BasisTexture
       };
@@ -1484,10 +1524,10 @@
   });
 
   // ../images/src/lib/utils/version.ts
-  var VERSION5;
+  var VERSION3;
   var init_version3 = __esm({
     "../images/src/lib/utils/version.ts"() {
-      VERSION5 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
+      VERSION3 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
     }
   });
 
@@ -1939,7 +1979,7 @@
         id: "image",
         module: "images",
         name: "Images",
-        version: VERSION5,
+        version: VERSION3,
         mimeTypes: MIME_TYPES,
         extensions: EXTENSIONS,
         parse: parseImage,
@@ -2128,8 +2168,10 @@
   // src/index.ts
   var src_exports = {};
   __export(src_exports, {
+    BASIS_EXTERNAL_LIBRARIES: () => BASIS_EXTERNAL_LIBRARIES,
     BasisLoader: () => BasisLoader,
     BasisWorkerLoader: () => BasisWorkerLoader,
+    CRUNCH_EXTERNAL_LIBRARIES: () => CRUNCH_EXTERNAL_LIBRARIES,
     CompressedTextureLoader: () => CompressedTextureLoader,
     CompressedTextureWorkerLoader: () => CompressedTextureWorkerLoader,
     CompressedTextureWriter: () => CompressedTextureWriter,
@@ -2154,6 +2196,8 @@
       init_compressed_texture_loader();
       init_crunch_loader();
       init_npy_loader();
+      init_basis_module_loader();
+      init_crunch_module_loader();
       init_compressed_texture_writer();
       init_ktx2_basis_writer();
       init_load_image();

package/dist/es5/compressed-texture-loader.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._TypecheckCompressedTextureWorkerLoader = exports._TypecheckCompressedTextureLoader = exports.CompressedTextureWorkerLoader = exports.CompressedTextureLoader = void 0;
+exports.CompressedTextureWorkerLoader = exports.CompressedTextureLoader = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -13,12 +13,6 @@ var _parseCompressedTexture = require("./lib/parsers/parse-compressed-texture");
 var _parseBasis = _interopRequireDefault(require("./lib/parsers/parse-basis"));
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-var DEFAULT_TEXTURE_LOADER_OPTIONS = {
-  'compressed-texture': {
-    libraryPath: 'libs/',
-    useBasis: false
-  }
-};
 var CompressedTextureWorkerLoader = {
   name: 'Texture Containers',
   id: 'compressed-texture',
@@ -28,17 +22,24 @@ var CompressedTextureWorkerLoader = {
   extensions: ['ktx', 'ktx2', 'dds', 'pvr'],
   mimeTypes: ['image/ktx2', 'image/ktx', 'image/vnd-ms.dds', 'image/x-dds', 'application/octet-stream'],
   binary: true,
-  options: DEFAULT_TEXTURE_LOADER_OPTIONS
+  options: {
+    'compressed-texture': {
+      libraryPath: 'libs/',
+      useBasis: false
+    }
+  }
 };
 exports.CompressedTextureWorkerLoader = CompressedTextureWorkerLoader;
 var CompressedTextureLoader = _objectSpread(_objectSpread({}, CompressedTextureWorkerLoader), {}, {
   parse: function () {
     var _parse = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(arrayBuffer, options) {
+      var _options$compressedT;
+      var result;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (!options['compressed-texture'].useBasis) {
-              _context.next = 5;
+            if (!(options !== null && options !== void 0 && (_options$compressedT = options['compressed-texture']) !== null && _options$compressedT !== void 0 && _options$compressedT.useBasis)) {
+              _context.next = 6;
               break;
             }
             options.basis = _objectSpread(_objectSpread({
@@ -53,10 +54,11 @@ var CompressedTextureLoader = _objectSpread(_objectSpread({}, CompressedTextureW
             _context.next = 4;
             return (0, _parseBasis.default)(arrayBuffer, options);
           case 4:
-            return _context.abrupt("return", _context.sent[0]);
-          case 5:
-            return _context.abrupt("return", (0, _parseCompressedTexture.parseCompressedTexture)(arrayBuffer));
+            result = _context.sent;
+            return _context.abrupt("return", result[0]);
           case 6:
+            return _context.abrupt("return", (0, _parseCompressedTexture.parseCompressedTexture)(arrayBuffer));
+          case 7:
           case "end":
             return _context.stop();
         }
@@ -69,8 +71,4 @@ var CompressedTextureLoader = _objectSpread(_objectSpread({}, CompressedTextureW
   }()
 });
 exports.CompressedTextureLoader = CompressedTextureLoader;
-var _TypecheckCompressedTextureWorkerLoader = CompressedTextureWorkerLoader;
-exports._TypecheckCompressedTextureWorkerLoader = _TypecheckCompressedTextureWorkerLoader;
-var _TypecheckCompressedTextureLoader = CompressedTextureLoader;
-exports._TypecheckCompressedTextureLoader = _TypecheckCompressedTextureLoader;
 //# sourceMappingURL=compressed-texture-loader.js.map

package/dist/es5/compressed-texture-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"compressed-texture-loader.js","names":["_version","require","_parseCompressedTexture","_parseBasis","_interopRequireDefault","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","DEFAULT_TEXTURE_LOADER_OPTIONS","libraryPath","useBasis","CompressedTextureWorkerLoader","name","id","module","version","VERSION","worker","extensions","mimeTypes","binary","options","exports","CompressedTextureLoader","parse","_parse","_asyncToGenerator2","_regenerator","mark","_callee","arrayBuffer","wrap","_callee$","_context","prev","next","basis","format","alpha","noAlpha","containerFormat","parseBasis","abrupt","sent","parseCompressedTexture","stop","_x","_x2","_TypecheckCompressedTextureWorkerLoader","_TypecheckCompressedTextureLoader"],"sources":["../../src/compressed-texture-loader.ts"],"sourcesContent":["import type {Loader, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {VERSION} from './lib/utils/version';\nimport {parseCompressedTexture} from './lib/parsers/parse-compressed-texture';\nimport parseBasis from './lib/parsers/parse-basis';\n\nexport type TextureLoaderOptions = {\n  'compressed-texture'?: {\n    libraryPath?: string;\n    useBasis?: boolean;\n  };\n};\n\nconst DEFAULT_TEXTURE_LOADER_OPTIONS = {\n  'compressed-texture': {\n    libraryPath: 'libs/',\n    useBasis: false\n  }\n};\n\n/**\n * Worker Loader for KTX, DDS, and PVR texture container formats\n */\nexport const CompressedTextureWorkerLoader = {\n  name: 'Texture Containers',\n  id: 'compressed-texture',\n  module: 'textures',\n  version: VERSION,\n  worker: true,\n  extensions: [\n    'ktx',\n    'ktx2',\n    'dds', // WEBGL_compressed_texture_s3tc, WEBGL_compressed_texture_atc\n    'pvr' // WEBGL_compressed_texture_pvrtc\n  ],\n  mimeTypes: [\n    'image/ktx2',\n    'image/ktx',\n    'image/vnd-ms.dds',\n    'image/x-dds',\n    'application/octet-stream'\n  ],\n  binary: true,\n  options: DEFAULT_TEXTURE_LOADER_OPTIONS\n};\n\n/**\n * Loader for KTX, DDS, and PVR texture container formats\n */\nexport const CompressedTextureLoader = {\n  ...CompressedTextureWorkerLoader,\n  parse: async (arrayBuffer, options) => {\n    if (options['compressed-texture'].useBasis) {\n      options.basis = {\n        format: {\n          alpha: 'BC3',\n          noAlpha: 'BC1'\n        },\n        ...options.basis,\n        containerFormat: 'ktx2',\n        module: 'encoder'\n      };\n      return (await parseBasis(arrayBuffer, options))[0];\n    }\n    return parseCompressedTexture(arrayBuffer);\n  }\n};\n\n// TYPE TESTS - TODO find a better way than exporting junk\nexport const _TypecheckCompressedTextureWorkerLoader: Loader = CompressedTextureWorkerLoader;\nexport const _TypecheckCompressedTextureLoader: LoaderWithParser = CompressedTextureLoader;\n"],"mappings":"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"}
+{"version":3,"file":"compressed-texture-loader.js","names":["_version","require","_parseCompressedTexture","_parseBasis","_interopRequireDefault","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","CompressedTextureWorkerLoader","name","id","module","version","VERSION","worker","extensions","mimeTypes","binary","options","libraryPath","useBasis","exports","CompressedTextureLoader","parse","_parse","_asyncToGenerator2","_regenerator","mark","_callee","arrayBuffer","_options$compressedT","result","wrap","_callee$","_context","prev","next","basis","format","alpha","noAlpha","containerFormat","parseBasis","sent","abrupt","parseCompressedTexture","stop","_x","_x2"],"sources":["../../src/compressed-texture-loader.ts"],"sourcesContent":["import type {Loader, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {VERSION} from './lib/utils/version';\nimport {parseCompressedTexture} from './lib/parsers/parse-compressed-texture';\nimport parseBasis from './lib/parsers/parse-basis';\n\nexport type TextureLoaderOptions = {\n  'compressed-texture'?: {\n    libraryPath?: string;\n    useBasis?: boolean;\n  };\n};\n\n/**\n * Worker Loader for KTX, DDS, and PVR texture container formats\n */\nexport const CompressedTextureWorkerLoader: Loader<any, never, TextureLoaderOptions> = {\n  name: 'Texture Containers',\n  id: 'compressed-texture',\n  module: 'textures',\n  version: VERSION,\n  worker: true,\n  extensions: [\n    'ktx',\n    'ktx2',\n    'dds', // WEBGL_compressed_texture_s3tc, WEBGL_compressed_texture_atc\n    'pvr' // WEBGL_compressed_texture_pvrtc\n  ],\n  mimeTypes: [\n    'image/ktx2',\n    'image/ktx',\n    'image/vnd-ms.dds',\n    'image/x-dds',\n    'application/octet-stream'\n  ],\n  binary: true,\n  options: {\n    'compressed-texture': {\n      libraryPath: 'libs/',\n      useBasis: false\n    }\n  }\n};\n\n/**\n * Loader for KTX, DDS, and PVR texture container formats\n */\nexport const CompressedTextureLoader: LoaderWithParser<any, never, TextureLoaderOptions> = {\n  ...CompressedTextureWorkerLoader,\n  parse: async (arrayBuffer: ArrayBuffer, options?: TextureLoaderOptions) => {\n    if (options?.['compressed-texture']?.useBasis) {\n      // @ts-expect-error TODO not allowed to modify inputs\n      options.basis = {\n        format: {\n          alpha: 'BC3',\n          noAlpha: 'BC1'\n        },\n        // @ts-expect-error TODO not allowed to modify inputs\n        ...options.basis,\n        containerFormat: 'ktx2',\n        module: 'encoder'\n      };\n      const result = await parseBasis(arrayBuffer, options);\n      return result[0];\n    }\n    return parseCompressedTexture(arrayBuffer);\n  }\n};\n"],"mappings":"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"}

package/dist/es5/crunch-loader.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._TypecheckCrunchLoader = exports.CrunchLoader = void 0;
+exports.CrunchLoader = void 0;
 var _version = require("./lib/utils/version");
 var CrunchLoader = {
   id: 'crunch',
@@ -21,6 +21,4 @@ var CrunchLoader = {
   }
 };
 exports.CrunchLoader = CrunchLoader;
-var _TypecheckCrunchLoader = CrunchLoader;
-exports._TypecheckCrunchLoader = _TypecheckCrunchLoader;
 //# sourceMappingURL=crunch-loader.js.map

package/dist/es5/crunch-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"crunch-loader.js","names":["_version","require","CrunchLoader","id","name","module","version","VERSION","worker","extensions","mimeTypes","binary","options","crunch","libraryPath","exports","_TypecheckCrunchLoader"],"sources":["../../src/crunch-loader.ts"],"sourcesContent":["import type {Loader} from '@loaders.gl/loader-utils';\nimport {VERSION} from './lib/utils/version';\n\n/**\n * Worker loader for the Crunch compressed texture container format\n */\nexport const CrunchLoader = {\n  id: 'crunch',\n  name: 'Crunch',\n  module: 'textures',\n  version: VERSION,\n  worker: true,\n  extensions: ['crn'],\n  mimeTypes: ['image/crn', 'image/x-crn', 'application/octet-stream'],\n  binary: true,\n  options: {\n    crunch: {\n      libraryPath: 'libs/'\n    }\n  }\n};\n\n// We avoid bundling crunch - rare format, only offer worker loader\n\n// TYPE TESTS - TODO find a better way than exporting junk\nexport const _TypecheckCrunchLoader: Loader = CrunchLoader;\n"],"mappings":";;;;;;AACA,IAAAA,QAAA,GAAAC,OAAA;AAKO,IAAMC,YAAY,GAAG;EAC1BC,EAAE,EAAE,QAAQ;EACZC,IAAI,EAAE,QAAQ;EACdC,MAAM,EAAE,UAAU;EAClBC,OAAO,EAAEC,gBAAO;EAChBC,MAAM,EAAE,IAAI;EACZC,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,SAAS,EAAE,CAAC,WAAW,EAAE,aAAa,EAAE,0BAA0B,CAAC;EACnEC,MAAM,EAAE,IAAI;EACZC,OAAO,EAAE;IACPC,MAAM,EAAE;MACNC,WAAW,EAAE;IACf;EACF;AACF,CAAC;AAACC,OAAA,CAAAb,YAAA,GAAAA,YAAA;AAKK,IAAMc,sBAA8B,GAAGd,YAAY;AAACa,OAAA,CAAAC,sBAAA,GAAAA,sBAAA"}
+{"version":3,"file":"crunch-loader.js","names":["_version","require","CrunchLoader","id","name","module","version","VERSION","worker","extensions","mimeTypes","binary","options","crunch","libraryPath","exports"],"sources":["../../src/crunch-loader.ts"],"sourcesContent":["import type {Loader, LoaderOptions} from '@loaders.gl/loader-utils';\nimport type {TextureLevel} from '@loaders.gl/schema';\nimport {VERSION} from './lib/utils/version';\n\nexport type CrunchLoaderOptions = LoaderOptions & {\n  crunch?: {\n    libraryPath?: string;\n  };\n};\n\n/**\n * Worker loader for the Crunch compressed texture container format\n * @note We avoid bundling crunch - it is a rare format and large lib, so we only offer worker loader\n */\nexport const CrunchLoader: Loader<TextureLevel[], never, CrunchLoaderOptions> = {\n  id: 'crunch',\n  name: 'Crunch',\n  module: 'textures',\n  version: VERSION,\n  worker: true,\n  extensions: ['crn'],\n  mimeTypes: ['image/crn', 'image/x-crn', 'application/octet-stream'],\n  binary: true,\n  options: {\n    crunch: {\n      libraryPath: 'libs/'\n    }\n  }\n};\n"],"mappings":";;;;;;AAEA,IAAAA,QAAA,GAAAC,OAAA;AAYO,IAAMC,YAAgE,GAAG;EAC9EC,EAAE,EAAE,QAAQ;EACZC,IAAI,EAAE,QAAQ;EACdC,MAAM,EAAE,UAAU;EAClBC,OAAO,EAAEC,gBAAO;EAChBC,MAAM,EAAE,IAAI;EACZC,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,SAAS,EAAE,CAAC,WAAW,EAAE,aAAa,EAAE,0BAA0B,CAAC;EACnEC,MAAM,EAAE,IAAI;EACZC,OAAO,EAAE;IACPC,MAAM,EAAE;MACNC,WAAW,EAAE;IACf;EACF;AACF,CAAC;AAACC,OAAA,CAAAb,YAAA,GAAAA,YAAA"}