@loaders.gl/textures 4.0.0-alpha.5 → 4.0.0-alpha.7

package/dist/basis-worker.js

@@ -28,7 +28,7 @@
   });
 
   // ../worker-utils/src/lib/env-utils/version.ts
-  var VERSION = true ? "4.0.0-alpha.5" : DEFAULT_VERSION;
+  var VERSION = true ? "4.0.0-alpha.7" : 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.");
   }
@@ -93,16 +93,33 @@
   }
 
   // ../worker-utils/src/lib/worker-farm/worker-body.ts
+  function getParentPort() {
+    let parentPort;
+    try {
+      eval("globalThis.parentPort = require('worker_threads').parentPort");
+      parentPort = globalThis.parentPort;
+    } catch {
+    }
+    return parentPort;
+  }
   var onMessageWrapperMap = new Map();
   var WorkerBody = class {
+    static inWorkerThread() {
+      return typeof self !== "undefined" || Boolean(getParentPort());
+    }
     static set onmessage(onMessage) {
-      self.onmessage = (message) => {
-        if (!isKnownMessage(message)) {
-          return;
-        }
-        const { type, payload } = message.data;
+      function handleMessage(message) {
+        const parentPort3 = getParentPort();
+        const { type, payload } = parentPort3 ? message : message.data;
         onMessage(type, payload);
-      };
+      }
+      const parentPort2 = getParentPort();
+      if (parentPort2) {
+        parentPort2.on("message", handleMessage);
+        parentPort2.on("exit", () => console.debug("Node worker closing"));
+      } else {
+        globalThis.onmessage = handleMessage;
+      }
     }
     static addEventListener(onMessage) {
       let onMessageWrapper = onMessageWrapperMap.get(onMessage);
@@ -111,22 +128,36 @@
           if (!isKnownMessage(message)) {
             return;
           }
-          const { type, payload } = message.data;
+          const parentPort3 = getParentPort();
+          const { type, payload } = parentPort3 ? message : message.data;
           onMessage(type, payload);
         };
       }
-      self.addEventListener("message", onMessageWrapper);
+      const parentPort2 = getParentPort();
+      if (parentPort2) {
+        console.error("not implemented");
+      } else {
+        globalThis.addEventListener("message", onMessageWrapper);
+      }
     }
     static removeEventListener(onMessage) {
       const onMessageWrapper = onMessageWrapperMap.get(onMessage);
       onMessageWrapperMap.delete(onMessage);
-      self.removeEventListener("message", onMessageWrapper);
+      const parentPort2 = getParentPort();
+      if (parentPort2) {
+        console.error("not implemented");
+      } else {
+        globalThis.removeEventListener("message", onMessageWrapper);
+      }
     }
     static postMessage(type, payload) {
-      if (self) {
-        const data = { source: "loaders.gl", type, payload };
-        const transferList = getTransferList(payload);
-        self.postMessage(data, transferList);
+      const data = { source: "loaders.gl", type, payload };
+      const transferList = getTransferList(payload);
+      const parentPort2 = getParentPort();
+      if (parentPort2) {
+        parentPort2.postMessage(data, transferList);
+      } else {
+        globalThis.postMessage(data, transferList);
       }
     }
   };
@@ -208,19 +239,20 @@
   // ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
   var requestId = 0;
   function createLoaderWorker(loader) {
-    if (typeof self === "undefined") {
+    if (!WorkerBody.inWorkerThread()) {
       return;
     }
     WorkerBody.onmessage = async (type, payload) => {
       switch (type) {
         case "process":
           try {
-            const { input, options = {} } = payload;
+            const { input, options = {}, context = {} } = payload;
             const result = await parseData({
               loader,
               arrayBuffer: input,
               options,
               context: {
+                ...context,
                 parse: parseOnMainThread
               }
             });
@@ -280,10 +312,10 @@
   }
 
   // src/lib/utils/version.ts
-  var VERSION3 = true ? "4.0.0-alpha.5" : "beta";
+  var VERSION3 = true ? "4.0.0-alpha.7" : "beta";
 
   // src/lib/parsers/basis-module-loader.ts
-  var VERSION4 = true ? "4.0.0-alpha.5" : "beta";
+  var VERSION4 = true ? "4.0.0-alpha.7" : "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 loadBasisTranscoderPromise;
@@ -640,6 +672,7 @@
       height,
       data: decodedData,
       compressed,
+      levelSize: decodedSize,
       hasAlpha: alphaFlag,
       format
     };

package/dist/bundle.js

@@ -1,5 +1,5 @@
+"use strict";
+// @ts-nocheck
 const moduleExports = require('./index');
-
 globalThis.loaders = globalThis.loaders || {};
 module.exports = Object.assign(globalThis.loaders, moduleExports);
-//# sourceMappingURL=bundle.js.map

package/dist/compressed-texture-loader.d.ts

@@ -1,5 +1,5 @@
 import type { Loader, LoaderWithParser } from '@loaders.gl/loader-utils';
-export declare type TextureLoaderOptions = {
+export type TextureLoaderOptions = {
     'compressed-texture'?: {
         libraryPath?: string;
         useBasis?: boolean;

package/dist/compressed-texture-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compressed-texture-loader.d.ts","sourceRoot":"","sources":["../src/compressed-texture-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAKvE,oBAAY,oBAAoB,GAAG;IACjC,oBAAoB,CAAC,EAAE;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CAAC;CACH,CAAC;AASF;;GAEG;AACH,eAAO,MAAM,6BAA6B;;;;;;;;;;;;;;;CAqBzC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;CAiBnC,CAAC;AAGF,eAAO,MAAM,uCAAuC,EAAE,MAAsC,CAAC;AAC7F,eAAO,MAAM,iCAAiC,EAAE,gBAA0C,CAAC"}
+{"version":3,"file":"compressed-texture-loader.d.ts","sourceRoot":"","sources":["../src/compressed-texture-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAKvE,MAAM,MAAM,oBAAoB,GAAG;IACjC,oBAAoB,CAAC,EAAE;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CAAC;CACH,CAAC;AASF;;GAEG;AACH,eAAO,MAAM,6BAA6B;;;;;;;;;;;;;;;CAqBzC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;CAiBnC,CAAC;AAGF,eAAO,MAAM,uCAAuC,EAAE,MAAsC,CAAC;AAC7F,eAAO,MAAM,iCAAiC,EAAE,gBAA0C,CAAC"}

package/dist/compressed-texture-loader.js

@@ -1,41 +1,64 @@
-import { VERSION } from './lib/utils/version';
-import { parseCompressedTexture } from './lib/parsers/parse-compressed-texture';
-import parseBasis from './lib/parsers/parse-basis';
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._TypecheckCompressedTextureLoader = exports._TypecheckCompressedTextureWorkerLoader = exports.CompressedTextureLoader = exports.CompressedTextureWorkerLoader = void 0;
+const version_1 = require("./lib/utils/version");
+const parse_compressed_texture_1 = require("./lib/parsers/parse-compressed-texture");
+const parse_basis_1 = __importDefault(require("./lib/parsers/parse-basis"));
 const DEFAULT_TEXTURE_LOADER_OPTIONS = {
-  'compressed-texture': {
-    libraryPath: 'libs/',
-    useBasis: false
-  }
+    'compressed-texture': {
+        libraryPath: 'libs/',
+        useBasis: false
+    }
 };
-export const CompressedTextureWorkerLoader = {
-  name: 'Texture Containers',
-  id: 'compressed-texture',
-  module: 'textures',
-  version: VERSION,
-  worker: true,
-  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
+/**
+ * Worker Loader for KTX, DDS, and PVR texture container formats
+ */
+exports.CompressedTextureWorkerLoader = {
+    name: 'Texture Containers',
+    id: 'compressed-texture',
+    module: 'textures',
+    version: version_1.VERSION,
+    worker: true,
+    extensions: [
+        'ktx',
+        'ktx2',
+        'dds',
+        'pvr' // WEBGL_compressed_texture_pvrtc
+    ],
+    mimeTypes: [
+        'image/ktx2',
+        'image/ktx',
+        'image/vnd-ms.dds',
+        'image/x-dds',
+        'application/octet-stream'
+    ],
+    binary: true,
+    options: DEFAULT_TEXTURE_LOADER_OPTIONS
 };
-export const CompressedTextureLoader = { ...CompressedTextureWorkerLoader,
-  parse: async (arrayBuffer, options) => {
-    if (options['compressed-texture'].useBasis) {
-      options.basis = {
-        format: {
-          alpha: 'BC3',
-          noAlpha: 'BC1'
-        },
-        ...options.basis,
-        containerFormat: 'ktx2',
-        module: 'encoder'
-      };
-      return (await parseBasis(arrayBuffer, options))[0];
+/**
+ * Loader for KTX, DDS, and PVR texture container formats
+ */
+exports.CompressedTextureLoader = {
+    ...exports.CompressedTextureWorkerLoader,
+    parse: async (arrayBuffer, options) => {
+        if (options['compressed-texture'].useBasis) {
+            options.basis = {
+                format: {
+                    alpha: 'BC3',
+                    noAlpha: 'BC1'
+                },
+                ...options.basis,
+                containerFormat: 'ktx2',
+                module: 'encoder'
+            };
+            return (await (0, parse_basis_1.default)(arrayBuffer, options))[0];
+        }
+        return (0, parse_compressed_texture_1.parseCompressedTexture)(arrayBuffer);
     }
-
-    return parseCompressedTexture(arrayBuffer);
-  }
 };
-export const _TypecheckCompressedTextureWorkerLoader = CompressedTextureWorkerLoader;
-export const _TypecheckCompressedTextureLoader = CompressedTextureLoader;
-//# sourceMappingURL=compressed-texture-loader.js.map
+// TYPE TESTS - TODO find a better way than exporting junk
+exports._TypecheckCompressedTextureWorkerLoader = exports.CompressedTextureWorkerLoader;
+exports._TypecheckCompressedTextureLoader = exports.CompressedTextureLoader;

package/dist/compressed-texture-worker.js

@@ -35,7 +35,7 @@
   }
 
   // ../worker-utils/src/lib/env-utils/version.ts
-  var VERSION = true ? "4.0.0-alpha.5" : DEFAULT_VERSION;
+  var VERSION = true ? "4.0.0-alpha.7" : 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.");
   }
@@ -100,16 +100,33 @@
   }
 
   // ../worker-utils/src/lib/worker-farm/worker-body.ts
+  function getParentPort() {
+    let parentPort;
+    try {
+      eval("globalThis.parentPort = require('worker_threads').parentPort");
+      parentPort = globalThis.parentPort;
+    } catch {
+    }
+    return parentPort;
+  }
   var onMessageWrapperMap = new Map();
   var WorkerBody = class {
+    static inWorkerThread() {
+      return typeof self !== "undefined" || Boolean(getParentPort());
+    }
     static set onmessage(onMessage) {
-      self.onmessage = (message) => {
-        if (!isKnownMessage(message)) {
-          return;
-        }
-        const { type, payload } = message.data;
+      function handleMessage(message) {
+        const parentPort3 = getParentPort();
+        const { type, payload } = parentPort3 ? message : message.data;
         onMessage(type, payload);
-      };
+      }
+      const parentPort2 = getParentPort();
+      if (parentPort2) {
+        parentPort2.on("message", handleMessage);
+        parentPort2.on("exit", () => console.debug("Node worker closing"));
+      } else {
+        globalThis.onmessage = handleMessage;
+      }
     }
     static addEventListener(onMessage) {
       let onMessageWrapper = onMessageWrapperMap.get(onMessage);
@@ -118,22 +135,36 @@
           if (!isKnownMessage(message)) {
             return;
           }
-          const { type, payload } = message.data;
+          const parentPort3 = getParentPort();
+          const { type, payload } = parentPort3 ? message : message.data;
           onMessage(type, payload);
         };
       }
-      self.addEventListener("message", onMessageWrapper);
+      const parentPort2 = getParentPort();
+      if (parentPort2) {
+        console.error("not implemented");
+      } else {
+        globalThis.addEventListener("message", onMessageWrapper);
+      }
     }
     static removeEventListener(onMessage) {
       const onMessageWrapper = onMessageWrapperMap.get(onMessage);
       onMessageWrapperMap.delete(onMessage);
-      self.removeEventListener("message", onMessageWrapper);
+      const parentPort2 = getParentPort();
+      if (parentPort2) {
+        console.error("not implemented");
+      } else {
+        globalThis.removeEventListener("message", onMessageWrapper);
+      }
     }
     static postMessage(type, payload) {
-      if (self) {
-        const data = { source: "loaders.gl", type, payload };
-        const transferList = getTransferList(payload);
-        self.postMessage(data, transferList);
+      const data = { source: "loaders.gl", type, payload };
+      const transferList = getTransferList(payload);
+      const parentPort2 = getParentPort();
+      if (parentPort2) {
+        parentPort2.postMessage(data, transferList);
+      } else {
+        globalThis.postMessage(data, transferList);
       }
     }
   };
@@ -215,19 +246,20 @@
   // ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
   var requestId = 0;
   function createLoaderWorker(loader) {
-    if (typeof self === "undefined") {
+    if (!WorkerBody.inWorkerThread()) {
       return;
     }
     WorkerBody.onmessage = async (type, payload) => {
       switch (type) {
         case "process":
           try {
-            const { input, options = {} } = payload;
+            const { input, options = {}, context = {} } = payload;
             const result = await parseData({
               loader,
               arrayBuffer: input,
               options,
               context: {
+                ...context,
                 parse: parseOnMainThread
               }
             });
@@ -287,7 +319,7 @@
   }
 
   // src/lib/utils/version.ts
-  var VERSION3 = true ? "4.0.0-alpha.5" : "beta";
+  var VERSION3 = true ? "4.0.0-alpha.7" : "beta";
 
   // ../../node_modules/ktx-parse/dist/ktx-parse.modern.js
   var t = new Uint8Array([0]);
@@ -875,7 +907,7 @@
   }
 
   // src/lib/parsers/basis-module-loader.ts
-  var VERSION4 = true ? "4.0.0-alpha.5" : "beta";
+  var VERSION4 = true ? "4.0.0-alpha.7" : "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 loadBasisTranscoderPromise;
@@ -1121,6 +1153,7 @@
       height,
       data: decodedData,
       compressed,
+      levelSize: decodedSize,
       hasAlpha: alphaFlag,
       format
     };

package/dist/compressed-texture-writer.d.ts

@@ -1,25 +1,17 @@
-import type { Writer } from '@loaders.gl/loader-utils';
-import { encodeImageURLToCompressedTextureURL } from './lib/encoders/encode-texture';
+import type { Writer, WriterOptions } from '@loaders.gl/loader-utils';
+export type CompressedTextureWriterOptions = WriterOptions & {
+    cwd?: string;
+    texture?: {
+        format: string;
+        compression: string;
+        quality: string;
+        mipmap: boolean;
+        flipY: boolean;
+        toolFlags: string;
+    };
+};
 /**
  * DDS Texture Container Exporter
  */
-export declare const CompressedTextureWriter: {
-    name: string;
-    id: string;
-    module: string;
-    version: any;
-    extensions: string[];
-    options: {
-        texture: {
-            format: string;
-            compression: string;
-            quality: string;
-            mipmap: boolean;
-            flipY: boolean;
-            toolFlags: string;
-        };
-    };
-    encodeURLtoURL: typeof encodeImageURLToCompressedTextureURL;
-};
-export declare const _TypecheckCompressedTextureWriter: Writer;
+export declare const CompressedTextureWriter: Writer<unknown, unknown, CompressedTextureWriterOptions>;
 //# sourceMappingURL=compressed-texture-writer.d.ts.map

package/dist/compressed-texture-writer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compressed-texture-writer.d.ts","sourceRoot":"","sources":["../src/compressed-texture-writer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAErD,OAAO,EAAC,oCAAoC,EAAC,MAAM,+BAA+B,CAAC;AAEnF;;GAEG;AACH,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;CAoBnC,CAAC;AAGF,eAAO,MAAM,iCAAiC,EAAE,MAAgC,CAAC"}
+{"version":3,"file":"compressed-texture-writer.d.ts","sourceRoot":"","sources":["../src/compressed-texture-writer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAIpE,MAAM,MAAM,8BAA8B,GAAG,aAAa,GAAG;IAC3D,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE;QACR,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,OAAO,CAAC;QAChB,KAAK,EAAE,OAAO,CAAC;QACf,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,uBAAuB,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,8BAA8B,CAoB5F,CAAC"}

package/dist/compressed-texture-writer.js

@@ -1,22 +1,34 @@
-import { VERSION } from './lib/utils/version';
-import { encodeImageURLToCompressedTextureURL } from './lib/encoders/encode-texture';
-export const CompressedTextureWriter = {
-  name: 'DDS Texture Container',
-  id: 'dds',
-  module: 'textures',
-  version: VERSION,
-  extensions: ['dds'],
-  options: {
-    texture: {
-      format: 'auto',
-      compression: 'auto',
-      quality: 'auto',
-      mipmap: false,
-      flipY: false,
-      toolFlags: ''
-    }
-  },
-  encodeURLtoURL: encodeImageURLToCompressedTextureURL
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CompressedTextureWriter = void 0;
+const version_1 = require("./lib/utils/version");
+const encode_texture_1 = require("./lib/encoders/encode-texture");
+/**
+ * DDS Texture Container Exporter
+ */
+exports.CompressedTextureWriter = {
+    name: 'DDS Texture Container',
+    id: 'dds',
+    module: 'textures',
+    version: version_1.VERSION,
+    extensions: ['dds'],
+    options: {
+        texture: {
+            format: 'auto',
+            compression: 'auto',
+            quality: 'auto',
+            mipmap: false,
+            flipY: false,
+            toolFlags: ''
+        }
+    },
+    encodeURLtoURL: encode_texture_1.encodeImageURLToCompressedTextureURL
 };
-export const _TypecheckCompressedTextureWriter = CompressedTextureWriter;
-//# sourceMappingURL=compressed-texture-writer.js.map
+// TYPE TESTS - TODO find a better way than exporting junk
+// export const _TypecheckCompressedTextureWriter: typeof CompressedTextureWriter & {
+//   encodeURLtoURL: (
+//     inputUrl: string,
+//     outputUrl: string,
+//     options?: CompressedTextureWriterOptions
+//   ) => Promise<string>;
+// } = CompressedTextureWriter;

package/dist/crunch-loader.js

@@ -1,18 +1,25 @@
-import { VERSION } from './lib/utils/version';
-export const CrunchLoader = {
-  id: 'crunch',
-  name: 'Crunch',
-  module: 'textures',
-  version: VERSION,
-  worker: true,
-  extensions: ['crn'],
-  mimeTypes: ['image/crn', 'image/x-crn', 'application/octet-stream'],
-  binary: true,
-  options: {
-    crunch: {
-      libraryPath: 'libs/'
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._TypecheckCrunchLoader = exports.CrunchLoader = void 0;
+const version_1 = require("./lib/utils/version");
+/**
+ * Worker loader for the Crunch compressed texture container format
+ */
+exports.CrunchLoader = {
+    id: 'crunch',
+    name: 'Crunch',
+    module: 'textures',
+    version: version_1.VERSION,
+    worker: true,
+    extensions: ['crn'],
+    mimeTypes: ['image/crn', 'image/x-crn', 'application/octet-stream'],
+    binary: true,
+    options: {
+        crunch: {
+            libraryPath: 'libs/'
+        }
     }
-  }
 };
-export const _TypecheckCrunchLoader = CrunchLoader;
-//# sourceMappingURL=crunch-loader.js.map
+// We avoid bundling crunch - rare format, only offer worker loader
+// TYPE TESTS - TODO find a better way than exporting junk
+exports._TypecheckCrunchLoader = exports.CrunchLoader;