@loaders.gl/i3s 4.0.1 → 4.0.3

package/dist/i3s-content-worker.js

@@ -92,7 +92,7 @@
   }
 
   // ../worker-utils/src/lib/env-utils/version.ts
-  var NPM_TAG = "beta";
+  var NPM_TAG = "latest";
   function getVersion() {
     if (!globalThis._loadersgl_?.version) {
       globalThis._loadersgl_ = globalThis._loadersgl_ || {};
@@ -102,7 +102,7 @@
         );
         globalThis._loadersgl_.version = NPM_TAG;
       } else {
-        globalThis._loadersgl_.version = "4.0.1";
+        globalThis._loadersgl_.version = "4.0.3";
       }
     }
     return globalThis._loadersgl_.version;
@@ -602,61 +602,69 @@
   __publicField(WorkerFarm, "_workerFarm");
 
   // ../worker-utils/src/lib/worker-farm/worker-body.ts
-  function getParentPort() {
+  async function getParentPort() {
     let parentPort;
     try {
       eval("globalThis.parentPort = require('worker_threads').parentPort");
       parentPort = globalThis.parentPort;
     } catch {
+      try {
+        eval("globalThis.workerThreadsPromise = import('worker_threads')");
+        const workerThreads = await globalThis.workerThreadsPromise;
+        parentPort = workerThreads.parentPort;
+      } catch (error) {
+        console.error(error.message);
+      }
     }
     return parentPort;
   }
   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());
+    static async inWorkerThread() {
+      return typeof self !== "undefined" || Boolean(await getParentPort());
     }
     /*
      * (type: WorkerMessageType, payload: WorkerMessagePayload) => any
      */
     static set onmessage(onMessage2) {
-      function handleMessage(message) {
-        const parentPort3 = getParentPort();
-        const { type, payload } = parentPort3 ? message : message.data;
+      async function handleMessage(message) {
+        const parentPort2 = await getParentPort();
+        const { type, payload } = parentPort2 ? message : message.data;
         onMessage2(type, payload);
       }
-      const parentPort2 = getParentPort();
-      if (parentPort2) {
-        parentPort2.on("message", handleMessage);
-        parentPort2.on("exit", () => console.debug("Node worker closing"));
-      } else {
-        globalThis.onmessage = handleMessage;
-      }
+      getParentPort().then((parentPort2) => {
+        if (parentPort2) {
+          parentPort2.on("message", handleMessage);
+          parentPort2.on("exit", () => console.debug("Node worker closing"));
+        } else {
+          globalThis.onmessage = handleMessage;
+        }
+      });
     }
-    static addEventListener(onMessage2) {
+    static async addEventListener(onMessage2) {
       let onMessageWrapper = onMessageWrapperMap.get(onMessage2);
       if (!onMessageWrapper) {
-        onMessageWrapper = (message) => {
+        onMessageWrapper = async (message) => {
           if (!isKnownMessage(message)) {
             return;
           }
-          const parentPort3 = getParentPort();
+          const parentPort3 = await getParentPort();
           const { type, payload } = parentPort3 ? message : message.data;
           onMessage2(type, payload);
         };
       }
-      const parentPort2 = getParentPort();
+      const parentPort2 = await getParentPort();
       if (parentPort2) {
         console.error("not implemented");
       } else {
         globalThis.addEventListener("message", onMessageWrapper);
       }
     }
-    static removeEventListener(onMessage2) {
+    static async removeEventListener(onMessage2) {
       const onMessageWrapper = onMessageWrapperMap.get(onMessage2);
       onMessageWrapperMap.delete(onMessage2);
-      const parentPort2 = getParentPort();
+      const parentPort2 = await getParentPort();
       if (parentPort2) {
         console.error("not implemented");
       } else {
@@ -668,10 +676,10 @@
      * @param type
      * @param payload
      */
-    static postMessage(type, payload) {
+    static async postMessage(type, payload) {
       const data = { source: "loaders.gl", type, payload };
       const transferList = getTransferList(payload);
-      const parentPort2 = getParentPort();
+      const parentPort2 = await getParentPort();
       if (parentPort2) {
         parentPort2.postMessage(data, transferList);
       } else {
@@ -693,7 +701,11 @@
       url = options.workerUrl;
     }
     if (options._workerType === "test") {
-      url = `modules/${worker.module}/dist/${workerFile}`;
+      if (isBrowser2) {
+        url = `modules/${worker.module}/dist/${workerFile}`;
+      } else {
+        url = `modules/${worker.module}/src/workers/${worker.id}-worker-node.ts`;
+      }
     }
     if (!url) {
       let version = worker.version;
@@ -802,8 +814,8 @@
 
   // ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
   var requestId = 0;
-  function createLoaderWorker(loader) {
-    if (!WorkerBody.inWorkerThread()) {
+  async function createLoaderWorker(loader) {
+    if (!await WorkerBody.inWorkerThread()) {
       return;
     }
     WorkerBody.onmessage = async (type, payload) => {
@@ -1435,7 +1447,7 @@
   var navigator_ = globalThis.navigator || {};
 
   // ../../node_modules/@probe.gl/log/node_modules/@probe.gl/env/dist/utils/globals.js
-  var VERSION2 = true ? "4.0.1" : "untranspiled source";
+  var VERSION2 = true ? "4.0.3" : "untranspiled source";
   var isBrowser4 = isBrowser3();
 
   // ../../node_modules/@probe.gl/log/dist/utils/local-storage.js
@@ -2598,6 +2610,83 @@
     throw new Error(`${loader.id} loader - no parser found and worker is disabled`);
   }
 
+  // ../schema/src/lib/table/simple-table/data-type.ts
+  function getDataTypeFromTypedArray(array) {
+    switch (array.constructor) {
+      case Int8Array:
+        return "int8";
+      case Uint8Array:
+      case Uint8ClampedArray:
+        return "uint8";
+      case Int16Array:
+        return "int16";
+      case Uint16Array:
+        return "uint16";
+      case Int32Array:
+        return "int32";
+      case Uint32Array:
+        return "uint32";
+      case Float32Array:
+        return "float32";
+      case Float64Array:
+        return "float64";
+      default:
+        return "null";
+    }
+  }
+
+  // ../schema/src/lib/mesh/mesh-utils.ts
+  function getMeshBoundingBox(attributes) {
+    let minX = Infinity;
+    let minY = Infinity;
+    let minZ = Infinity;
+    let maxX = -Infinity;
+    let maxY = -Infinity;
+    let maxZ = -Infinity;
+    const positions = attributes.POSITION ? attributes.POSITION.value : [];
+    const len2 = positions && positions.length;
+    for (let i2 = 0; i2 < len2; i2 += 3) {
+      const x = positions[i2];
+      const y = positions[i2 + 1];
+      const z = positions[i2 + 2];
+      minX = x < minX ? x : minX;
+      minY = y < minY ? y : minY;
+      minZ = z < minZ ? z : minZ;
+      maxX = x > maxX ? x : maxX;
+      maxY = y > maxY ? y : maxY;
+      maxZ = z > maxZ ? z : maxZ;
+    }
+    return [
+      [minX, minY, minZ],
+      [maxX, maxY, maxZ]
+    ];
+  }
+
+  // ../schema/src/lib/mesh/deduce-mesh-schema.ts
+  function deduceMeshField(name, attribute, optionalMetadata) {
+    const type = getDataTypeFromTypedArray(attribute.value);
+    const metadata = optionalMetadata ? optionalMetadata : makeMeshAttributeMetadata(attribute);
+    return {
+      name,
+      type: { type: "fixed-size-list", listSize: attribute.size, children: [{ name: "value", type }] },
+      nullable: false,
+      metadata
+    };
+  }
+  function makeMeshAttributeMetadata(attribute) {
+    const result = {};
+    if ("byteOffset" in attribute) {
+      result.byteOffset = attribute.byteOffset.toString(10);
+    }
+    if ("byteStride" in attribute) {
+      result.byteStride = attribute.byteStride.toString(10);
+    }
+    if ("normalized" in attribute) {
+      result.normalized = attribute.normalized.toString();
+    }
+    return result;
+  }
+
   // ../core/src/lib/api/load.ts
   async function load(url, loaders, options, context) {
     let resolvedLoaders;
@@ -5226,7 +5315,7 @@
   _defineProperty(Ellipsoid, "WGS84", new Ellipsoid(WGS84_RADIUS_X, WGS84_RADIUS_Y, WGS84_RADIUS_Z));
 
   // ../images/src/lib/utils/version.ts
-  var VERSION3 = true ? "4.0.1" : "latest";
+  var VERSION3 = true ? "4.0.3" : "latest";
 
   // ../images/src/lib/category-api/image-type.ts
   var parseImageNode = globalThis.loaders?.parseImageNode;
@@ -5353,7 +5442,10 @@
     return await new Promise((resolve2, reject) => {
       try {
         image.onload = () => resolve2(image);
-        image.onerror = (err) => reject(new Error(`Could not load image ${url}: ${err}`));
+        image.onerror = (error) => {
+          const message = error instanceof Error ? error.message : "error";
+          reject(new Error(message));
+        };
       } catch (error) {
         reject(error);
       }
@@ -5629,7 +5721,7 @@
   };
 
   // ../draco/src/lib/utils/version.ts
-  var VERSION4 = true ? "4.0.1" : "latest";
+  var VERSION4 = true ? "4.0.3" : "latest";
 
   // ../draco/src/draco-loader.ts
   var DEFAULT_DRACO_OPTIONS = {
@@ -5655,83 +5747,6 @@
     options: DEFAULT_DRACO_OPTIONS
   };
 
-  // ../schema/src/lib/table/simple-table/data-type.ts
-  function getDataTypeFromTypedArray(array) {
-    switch (array.constructor) {
-      case Int8Array:
-        return "int8";
-      case Uint8Array:
-      case Uint8ClampedArray:
-        return "uint8";
-      case Int16Array:
-        return "int16";
-      case Uint16Array:
-        return "uint16";
-      case Int32Array:
-        return "int32";
-      case Uint32Array:
-        return "uint32";
-      case Float32Array:
-        return "float32";
-      case Float64Array:
-        return "float64";
-      default:
-        return "null";
-    }
-  }
-
-  // ../schema/src/lib/mesh/mesh-utils.ts
-  function getMeshBoundingBox(attributes) {
-    let minX = Infinity;
-    let minY = Infinity;
-    let minZ = Infinity;
-    let maxX = -Infinity;
-    let maxY = -Infinity;
-    let maxZ = -Infinity;
-    const positions = attributes.POSITION ? attributes.POSITION.value : [];
-    const len2 = positions && positions.length;
-    for (let i2 = 0; i2 < len2; i2 += 3) {
-      const x = positions[i2];
-      const y = positions[i2 + 1];
-      const z = positions[i2 + 2];
-      minX = x < minX ? x : minX;
-      minY = y < minY ? y : minY;
-      minZ = z < minZ ? z : minZ;
-      maxX = x > maxX ? x : maxX;
-      maxY = y > maxY ? y : maxY;
-      maxZ = z > maxZ ? z : maxZ;
-    }
-    return [
-      [minX, minY, minZ],
-      [maxX, maxY, maxZ]
-    ];
-  }
-
-  // ../schema/src/lib/mesh/deduce-mesh-schema.ts
-  function deduceMeshField(name, attribute, optionalMetadata) {
-    const type = getDataTypeFromTypedArray(attribute.value);
-    const metadata = optionalMetadata ? optionalMetadata : makeMeshAttributeMetadata(attribute);
-    return {
-      name,
-      type: { type: "fixed-size-list", listSize: attribute.size, children: [{ name: "value", type }] },
-      nullable: false,
-      metadata
-    };
-  }
-  function makeMeshAttributeMetadata(attribute) {
-    const result = {};
-    if ("byteOffset" in attribute) {
-      result.byteOffset = attribute.byteOffset.toString(10);
-    }
-    if ("byteStride" in attribute) {
-      result.byteStride = attribute.byteStride.toString(10);
-    }
-    if ("normalized" in attribute) {
-      result.normalized = attribute.normalized.toString();
-    }
-    return result;
-  }
-
   // ../draco/src/lib/utils/get-draco-schema.ts
   function getDracoSchema(attributes, loaderData, indices) {
     const metadata = makeMetadata(loaderData.metadata);
@@ -6310,7 +6325,7 @@
   }
 
   // ../textures/src/lib/utils/version.ts
-  var VERSION5 = true ? "4.0.1" : "beta";
+  var VERSION5 = true ? "4.0.3" : "latest";
 
   // ../textures/src/lib/parsers/basis-module-loader.ts
   var BASIS_EXTERNAL_LIBRARIES = {
@@ -7838,7 +7853,7 @@
   }
 
   // src/i3s-content-loader.ts
-  var VERSION6 = true ? "4.0.1" : "beta";
+  var VERSION6 = true ? "4.0.3" : "latest";
   var I3SContentLoader = {
     name: "I3S Content (Indexed Scene Layers)",
     id: "i3s-content",

package/dist/index.cjs

@@ -533,7 +533,7 @@ function getFeatureIdsFromFeatureIndexMetadata(featureIndex) {
 }
 
 // src/i3s-content-loader.ts
-var VERSION = typeof __VERSION__ !== "undefined" ? __VERSION__ : "beta";
+var VERSION = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
 var I3SContentLoader = {
   name: "I3S Content (Indexed Scene Layers)",
   id: "i3s-content",
@@ -1387,7 +1387,7 @@ function parseSublayersTree(sublayers, url) {
 }
 
 // src/i3s-building-scene-layer-loader.ts
-var VERSION6 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "beta";
+var VERSION6 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
 var I3SBuildingSceneLayerLoader = {
   name: "I3S Building Scene Layer",
   id: "i3s-building-scene-layer",
@@ -1471,7 +1471,7 @@ async function checkSupportedIndexCRS(layer) {
 }
 
 // src/arcgis-webscene-loader.ts
-var VERSION7 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "beta";
+var VERSION7 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
 var ArcGISWebSceneLoader = {
   name: "ArcGIS Web Scene Loader",
   id: "arcgis-web-scene",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/i3s",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "description": "i3s .",
   "license": "MIT",
   "type": "module",
@@ -41,20 +41,20 @@
     "build-worker-node": "esbuild src/workers/i3s-content-worker-node.ts --outfile=dist/i3s-content-worker-node.js --platform=node --target=node16 --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/compression": "4.0.1",
-    "@loaders.gl/crypto": "4.0.1",
-    "@loaders.gl/draco": "4.0.1",
-    "@loaders.gl/images": "4.0.1",
-    "@loaders.gl/loader-utils": "4.0.1",
-    "@loaders.gl/schema": "4.0.1",
-    "@loaders.gl/textures": "4.0.1",
-    "@loaders.gl/tiles": "4.0.1",
+    "@loaders.gl/compression": "4.0.3",
+    "@loaders.gl/crypto": "4.0.3",
+    "@loaders.gl/draco": "4.0.3",
+    "@loaders.gl/images": "4.0.3",
+    "@loaders.gl/loader-utils": "4.0.3",
+    "@loaders.gl/schema": "4.0.3",
+    "@loaders.gl/textures": "4.0.3",
+    "@loaders.gl/tiles": "4.0.3",
     "@math.gl/core": "^4.0.0",
     "@math.gl/culling": "^4.0.0",
     "@math.gl/geospatial": "^4.0.0"
   },
   "peerDependencies": {
-    "@loaders.gl/core": "4.0.0-beta.8"
+    "@loaders.gl/core": "^4.0.0"
   },
-  "gitHead": "765e5a26a6bf3f2cc02cabffc4a1e3665ec92a53"
+  "gitHead": "03c871839b36c997249dabae1844df53a35d3760"
 }

package/src/arcgis-webscene-loader.ts

@@ -5,7 +5,7 @@ import {parseWebscene} from './lib/parsers/parse-arcgis-webscene';
 
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'beta';
+const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
 export type ArcGISWebSceneLoaderOptions = LoaderOptions & {};
 

package/src/i3s-building-scene-layer-loader.ts

@@ -7,7 +7,7 @@ import {parseBuildingSceneLayer} from './lib/parsers/parse-i3s-building-scene-la
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 
-const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'beta';
+const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 /**
  * Loader for I3S - Building Scene Layer
  */

package/src/i3s-content-loader.ts

@@ -6,7 +6,7 @@ import {I3STileContent, I3STileOptions, I3STilesetOptions} from './types';
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 
-const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'beta';
+const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
 /**
  * Loader for I3S - Indexed 3D Scene Layer