@loaders.gl/textures 4.0.0-beta.2 → 4.0.0-beta.3

package/dist/basis-worker.js

@@ -1,3 +1,4 @@
+"use strict";
 (() => {
   var __create = Object.create;
   var __defProp = Object.defineProperty;
@@ -5,25 +6,30 @@
   var __getOwnPropNames = Object.getOwnPropertyNames;
   var __getProtoOf = Object.getPrototypeOf;
   var __hasOwnProp = Object.prototype.hasOwnProperty;
-  var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
   var __commonJS = (cb, mod) => function __require() {
-    return mod || (0, cb[Object.keys(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+    return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
   };
-  var __reExport = (target, module, desc) => {
-    if (module && typeof module === "object" || typeof module === "function") {
-      for (let key of __getOwnPropNames(module))
-        if (!__hasOwnProp.call(target, key) && key !== "default")
-          __defProp(target, key, { get: () => module[key], enumerable: !(desc = __getOwnPropDesc(module, key)) || desc.enumerable });
+  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 target;
-  };
-  var __toModule = (module) => {
-    return __reExport(__markAsModule(__defProp(module != null ? __create(__getProtoOf(module)) : {}, "default", module && module.__esModule && "default" in module ? { get: () => module.default, enumerable: true } : { value: module, enumerable: true })), module);
+    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";
     }
   });
 
@@ -32,10 +38,12 @@
     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.");
+        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";
+        globalThis._loadersgl_.version = "4.0.0-beta.3";
       }
     }
     return globalThis._loadersgl_.version;
@@ -60,7 +68,10 @@
   var window_ = globals.window || globals.self || globals.global || {};
   var global_ = globals.global || globals.self || globals.window || {};
   var document_ = globals.document || {};
-  var isBrowser = typeof process !== "object" || String(process) !== "[object process]" || process.browser;
+  var isBrowser = (
+    // @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);
@@ -68,7 +79,7 @@
 
   // ../worker-utils/src/lib/worker-utils/get-transfer-list.ts
   function getTransferList(object, recursive = true, transfers) {
-    const transfersSet = transfers || new Set();
+    const transfersSet = transfers || /* @__PURE__ */ new Set();
     if (!object) {
     } else if (isTransferable(object)) {
       transfersSet.add(object);
@@ -111,11 +122,15 @@
     }
     return parentPort;
   }
-  var onMessageWrapperMap = new Map();
+  var onMessageWrapperMap = /* @__PURE__ */ new Map();
   var WorkerBody = class {
+    /** Check that we are actually in a worker thread */
     static inWorkerThread() {
       return typeof self !== "undefined" || Boolean(getParentPort());
     }
+    /*
+     * (type: WorkerMessageType, payload: WorkerMessagePayload) => any
+     */
     static set onmessage(onMessage) {
       function handleMessage(message) {
         const parentPort3 = getParentPort();
@@ -159,6 +174,11 @@
         globalThis.removeEventListener("message", onMessageWrapper);
       }
     }
+    /**
+     * Send a message from a worker to creating thread (main thread)
+     * @param type
+     * @param payload
+     */
     static postMessage(type, payload) {
       const data = { source: "loaders.gl", type, payload };
       const transferList = getTransferList(payload);
@@ -176,13 +196,14 @@
   }
 
   // ../worker-utils/src/lib/library-utils/library-utils.ts
-  var node = __toModule(require_require_utils());
+  var node = __toESM(require_require_utils(), 1);
   var loadLibraryPromises = {};
   async function loadLibrary(libraryUrl, moduleName = null, options = {}, libraryName = null) {
     if (moduleName) {
       libraryUrl = getLibraryUrl(libraryUrl, moduleName, options, libraryName);
     }
-    loadLibraryPromises[libraryUrl] = loadLibraryPromises[libraryUrl] || loadLibraryFromFile(libraryUrl);
+    loadLibraryPromises[libraryUrl] = // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    loadLibraryPromises[libraryUrl] || loadLibraryFromFile(libraryUrl);
     return await loadLibraryPromises[libraryUrl];
   }
   function getLibraryUrl(library, moduleName, options = {}, libraryName = null) {
@@ -212,8 +233,9 @@
     }
     if (!isBrowser) {
       try {
-        return node && node.requireFromFile && await node.requireFromFile(libraryUrl);
-      } catch {
+        return node && void 0 && await (void 0)(libraryUrl);
+      } catch (error) {
+        console.error(error);
         return null;
       }
     }
@@ -225,7 +247,7 @@
   }
   function loadLibraryFromString(scriptSource, id) {
     if (!isBrowser) {
-      return node.requireFromString && node.requireFromString(scriptSource, id);
+      return void 0 && (void 0)(scriptSource, id);
     }
     if (isWorker) {
       eval.call(global_, scriptSource);
@@ -242,18 +264,18 @@
     return null;
   }
   async function loadAsArrayBuffer(url) {
-    if (!node.readFileAsArrayBuffer || url.startsWith("http")) {
+    if (!void 0 || url.startsWith("http")) {
       const response = await fetch(url);
       return await response.arrayBuffer();
     }
-    return await node.readFileAsArrayBuffer(url);
+    return await (void 0)(url);
   }
   async function loadAsText(url) {
-    if (!node.readFileAsText || url.startsWith("http")) {
+    if (!void 0 || url.startsWith("http")) {
       const response = await fetch(url);
       return await response.text();
     }
-    return await node.readFileAsText(url);
+    return await (void 0)(url);
   }
 
   // ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
@@ -271,6 +293,7 @@
               loader,
               arrayBuffer: input,
               options,
+              // @ts-expect-error fetch missing
               context: {
                 ...context,
                 _parse: parseOnMainThread
@@ -337,13 +360,17 @@
   }
 
   // src/lib/utils/version.ts
-  var VERSION2 = true ? "4.0.0-beta.2" : "beta";
+  var VERSION2 = true ? "4.0.0-beta.3" : "beta";
 
   // src/lib/parsers/basis-module-loader.ts
   var BASIS_EXTERNAL_LIBRARIES = {
+    /** Basis transcoder, javascript wrapper part */
     TRANSCODER: "basis_transcoder.js",
+    /** Basis transcoder, compiled web assembly part */
     TRANSCODER_WASM: "basis_transcoder.wasm",
+    /** Basis encoder, javascript wrapper part */
     ENCODER: "basis_encoder.js",
+    /** Basis encoder, compiled web assembly part */
     ENCODER_WASM: "basis_encoder.wasm"
   };
   var loadBasisTranscoderPromise;
@@ -413,10 +440,12 @@
 
   // src/lib/gl-extensions.ts
   var GL_EXTENSIONS_CONSTANTS = {
+    // WEBGL_compressed_texture_s3tc
     COMPRESSED_RGB_S3TC_DXT1_EXT: 33776,
     COMPRESSED_RGBA_S3TC_DXT1_EXT: 33777,
     COMPRESSED_RGBA_S3TC_DXT3_EXT: 33778,
     COMPRESSED_RGBA_S3TC_DXT5_EXT: 33779,
+    // WEBGL_compressed_texture_es3
     COMPRESSED_R11_EAC: 37488,
     COMPRESSED_SIGNED_R11_EAC: 37489,
     COMPRESSED_RG11_EAC: 37490,
@@ -427,14 +456,18 @@
     COMPRESSED_SRGB8_ALPHA8_ETC2_EAC: 37495,
     COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2: 37496,
     COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2: 37497,
+    // WEBGL_compressed_texture_pvrtc
     COMPRESSED_RGB_PVRTC_4BPPV1_IMG: 35840,
     COMPRESSED_RGBA_PVRTC_4BPPV1_IMG: 35842,
     COMPRESSED_RGB_PVRTC_2BPPV1_IMG: 35841,
     COMPRESSED_RGBA_PVRTC_2BPPV1_IMG: 35843,
+    // WEBGL_compressed_texture_etc1
     COMPRESSED_RGB_ETC1_WEBGL: 36196,
+    // WEBGL_compressed_texture_atc
     COMPRESSED_RGB_ATC_WEBGL: 35986,
     COMPRESSED_RGBA_ATC_EXPLICIT_ALPHA_WEBGL: 35987,
     COMPRESSED_RGBA_ATC_INTERPOLATED_ALPHA_WEBGL: 34798,
+    // WEBGL_compressed_texture_astc
     COMPRESSED_RGBA_ASTC_4X4_KHR: 37808,
     COMPRESSED_RGBA_ASTC_5X4_KHR: 37809,
     COMPRESSED_RGBA_ASTC_5X5_KHR: 37810,
@@ -463,10 +496,12 @@
     COMPRESSED_SRGB8_ALPHA8_ASTC_10X10_KHR: 37851,
     COMPRESSED_SRGB8_ALPHA8_ASTC_12X10_KHR: 37852,
     COMPRESSED_SRGB8_ALPHA8_ASTC_12X12_KHR: 37853,
+    // EXT_texture_compression_rgtc
     COMPRESSED_RED_RGTC1_EXT: 36283,
     COMPRESSED_SIGNED_RED_RGTC1_EXT: 36284,
     COMPRESSED_RED_GREEN_RGTC2_EXT: 36285,
     COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT: 36286,
+    // WEBGL_compressed_texture_s3tc_srgb
     COMPRESSED_SRGB_S3TC_DXT1_EXT: 35916,
     COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT: 35917,
     COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT: 35918,
@@ -476,6 +511,7 @@
   // src/lib/utils/texture-formats.ts
   var BROWSER_PREFIXES = ["", "WEBKIT_", "MOZ_"];
   var WEBGL_EXTENSIONS = {
+    /* eslint-disable camelcase */
     WEBGL_compressed_texture_s3tc: "dxt",
     WEBGL_compressed_texture_s3tc_srgb: "dxt-srgb",
     WEBGL_compressed_texture_etc1: "etc1",
@@ -484,12 +520,13 @@
     WEBGL_compressed_texture_atc: "atc",
     WEBGL_compressed_texture_astc: "astc",
     EXT_texture_compression_rgtc: "rgtc"
+    /* eslint-enable camelcase */
   };
   var formats = null;
   function getSupportedGPUTextureFormats(gl) {
     if (!formats) {
       gl = gl || getWebGLContext() || void 0;
-      formats = new Set();
+      formats = /* @__PURE__ */ new Set();
       for (const prefix of BROWSER_PREFIXES) {
         for (const extension in WEBGL_EXTENSIONS) {
           if (gl && gl.getExtension(`${prefix}${extension}`)) {
@@ -540,6 +577,7 @@
 
   // src/lib/parsers/parse-ktx.ts
   var KTX2_ID = [
+    // '´', 'K', 'T', 'X', '2', '0', 'ª', '\r', '\n', '\x1A', '\n'
     171,
     75,
     84,
@@ -555,7 +593,18 @@
   ];
   function isKTX(data) {
     const id = new Uint8Array(data);
-    const notKTX = id.byteLength < KTX2_ID.length || id[0] !== KTX2_ID[0] || id[1] !== KTX2_ID[1] || id[2] !== KTX2_ID[2] || id[3] !== KTX2_ID[3] || id[4] !== KTX2_ID[4] || id[5] !== KTX2_ID[5] || id[6] !== KTX2_ID[6] || id[7] !== KTX2_ID[7] || id[8] !== KTX2_ID[8] || id[9] !== KTX2_ID[9] || id[10] !== KTX2_ID[10] || id[11] !== KTX2_ID[11];
+    const notKTX = id.byteLength < KTX2_ID.length || id[0] !== KTX2_ID[0] || // '´'
+    id[1] !== KTX2_ID[1] || // 'K'
+    id[2] !== KTX2_ID[2] || // 'T'
+    id[3] !== KTX2_ID[3] || // 'X'
+    id[4] !== KTX2_ID[4] || // ' '
+    id[5] !== KTX2_ID[5] || // '2'
+    id[6] !== KTX2_ID[6] || // '0'
+    id[7] !== KTX2_ID[7] || // 'ª'
+    id[8] !== KTX2_ID[8] || // '\r'
+    id[9] !== KTX2_ID[9] || // '\n'
+    id[10] !== KTX2_ID[10] || // '\x1A'
+    id[11] !== KTX2_ID[11];
     return !notKTX;
   }
 
@@ -653,7 +702,9 @@
   function transcodeImage(basisFile, imageIndex, levelIndex, options) {
     const width = basisFile.getImageWidth(imageIndex, levelIndex);
     const height = basisFile.getImageHeight(imageIndex, levelIndex);
-    const hasAlpha = basisFile.getHasAlpha();
+    const hasAlpha = basisFile.getHasAlpha(
+      /* imageIndex, levelIndex */
+    );
     const { compressed, format, basisFormat } = getBasisOptions(options, hasAlpha);
     const decodedSize = basisFile.getImageTranscodedSizeInBytes(imageIndex, levelIndex, basisFormat);
     const decodedData = new Uint8Array(decodedSize);
@@ -661,11 +712,14 @@
       throw new Error("failed to start Basis transcoding");
     }
     return {
+      // standard loaders.gl image category payload
       width,
       height,
       data: decodedData,
       compressed,
       format,
+      // Additional fields
+      // Add levelSize field.
       hasAlpha
     };
   }
@@ -690,16 +744,33 @@
   function transcodeKTX2Image(ktx2File, levelIndex, options) {
     const { alphaFlag, height, width } = ktx2File.getImageLevelInfo(levelIndex, 0, 0);
     const { compressed, format, basisFormat } = getBasisOptions(options, alphaFlag);
-    const decodedSize = ktx2File.getImageTranscodedSizeInBytes(levelIndex, 0, 0, basisFormat);
+    const decodedSize = ktx2File.getImageTranscodedSizeInBytes(
+      levelIndex,
+      0,
+      0,
+      basisFormat
+    );
     const decodedData = new Uint8Array(decodedSize);
-    if (!ktx2File.transcodeImage(decodedData, levelIndex, 0, 0, basisFormat, 0, -1, -1)) {
+    if (!ktx2File.transcodeImage(
+      decodedData,
+      levelIndex,
+      0,
+      0,
+      basisFormat,
+      0,
+      -1,
+      -1
+      /* channel1 */
+    )) {
       throw new Error("Failed to transcode KTX2 image");
     }
     return {
+      // standard loaders.gl image category payload
       width,
       height,
       data: decodedData,
       compressed,
+      // Additional fields
       levelSize: decodedSize,
       hasAlpha: alphaFlag,
       format
@@ -752,9 +823,12 @@
     options: {
       basis: {
         format: "auto",
+        // gl context doesn't exist on a worker thread
         libraryPath: "libs/",
         containerFormat: "auto",
+        // 'basis' || 'ktx2' || 'auto'
         module: "transcoder"
+        // 'transcoder' || 'encoder'
       }
     }
   };

package/dist/{esm/compressed-texture-loader.js → compressed-texture-loader.js}

@@ -1,6 +1,6 @@
-import { VERSION } from './lib/utils/version';
-import { parseCompressedTexture } from './lib/parsers/parse-compressed-texture';
-import parseBasis from './lib/parsers/parse-basis';
+import { VERSION } from "./lib/utils/version.js";
+import { parseCompressedTexture } from "./lib/parsers/parse-compressed-texture.js";
+import parseBasis from "./lib/parsers/parse-basis.js";
 export const CompressedTextureWorkerLoader = {
   name: 'Texture Containers',
   id: 'compressed-texture',

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

@@ -0,0 +1 @@
+{"version":3,"file":"compressed-texture-loader.js","names":["VERSION","parseCompressedTexture","parseBasis","CompressedTextureWorkerLoader","name","id","module","version","worker","extensions","mimeTypes","binary","options","libraryPath","useBasis","CompressedTextureLoader","parse","arrayBuffer","_options$compressedT","basis","format","alpha","noAlpha","containerFormat","result"],"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":"SACQA,OAAO;AAAA,SACPC,sBAAsB;AAAA,OACvBC,UAAU;AAYjB,OAAO,MAAMC,6BAAuE,GAAG;EACrFC,IAAI,EAAE,oBAAoB;EAC1BC,EAAE,EAAE,oBAAoB;EACxBC,MAAM,EAAE,UAAU;EAClBC,OAAO,EAAEP,OAAO;EAChBQ,MAAM,EAAE,IAAI;EACZC,UAAU,EAAE,CACV,KAAK,EACL,MAAM,EACN,KAAK,EACL,KAAK,CACN;EACDC,SAAS,EAAE,CACT,YAAY,EACZ,WAAW,EACX,kBAAkB,EAClB,aAAa,EACb,0BAA0B,CAC3B;EACDC,MAAM,EAAE,IAAI;EACZC,OAAO,EAAE;IACP,oBAAoB,EAAE;MACpBC,WAAW,EAAE,OAAO;MACpBC,QAAQ,EAAE;IACZ;EACF;AACF,CAAC;AAKD,OAAO,MAAMC,uBAA2E,GAAG;EACzF,GAAGZ,6BAA6B;EAChCa,KAAK,EAAE,MAAAA,CAAOC,WAAwB,EAAEL,OAA8B,KAAK;IAAA,IAAAM,oBAAA;IACzE,IAAIN,OAAO,aAAPA,OAAO,gBAAAM,oBAAA,GAAPN,OAAO,CAAG,oBAAoB,CAAC,cAAAM,oBAAA,eAA/BA,oBAAA,CAAiCJ,QAAQ,EAAE;MAE7CF,OAAO,CAACO,KAAK,GAAG;QACdC,MAAM,EAAE;UACNC,KAAK,EAAE,KAAK;UACZC,OAAO,EAAE;QACX,CAAC;QAED,GAAGV,OAAO,CAACO,KAAK;QAChBI,eAAe,EAAE,MAAM;QACvBjB,MAAM,EAAE;MACV,CAAC;MACD,MAAMkB,MAAM,GAAG,MAAMtB,UAAU,CAACe,WAAW,EAAEL,OAAO,CAAC;MACrD,OAAOY,MAAM,CAAC,CAAC,CAAC;IAClB;IACA,OAAOvB,sBAAsB,CAACgB,WAAW,CAAC;EAC5C;AACF,CAAC"}