@loaders.gl/i3s 4.2.0-alpha.6 → 4.2.0-beta.2

package/dist/arcgis-webscene-loader.d.ts

@@ -1,9 +1,26 @@
-import type { LoaderOptions, LoaderWithParser } from '@loaders.gl/loader-utils';
+import type { LoaderOptions } from '@loaders.gl/loader-utils';
 import type { ArcGISWebSceneData } from "./types.js";
 export type ArcGISWebSceneLoaderOptions = LoaderOptions & {};
 /**
  * Loader for ArcGIS WebScene
  * Spec - https://developers.arcgis.com/web-scene-specification/objects/webscene/
  */
-export declare const ArcGISWebSceneLoader: LoaderWithParser<ArcGISWebSceneData, never, ArcGISWebSceneLoaderOptions>;
+export declare const ArcGISWebSceneLoader: {
+    readonly dataType: ArcGISWebSceneData;
+    readonly batchType: never;
+    readonly name: "ArcGIS Web Scene Loader";
+    readonly id: "arcgis-web-scene";
+    readonly module: "i3s";
+    readonly version: any;
+    readonly mimeTypes: ["application/json"];
+    readonly parse: typeof parse;
+    readonly extensions: ["json"];
+    readonly options: {};
+};
+/**
+ * Parse ArcGIS webscene
+ * @param data
+ */
+declare function parse(data: ArrayBuffer): Promise<ArcGISWebSceneData>;
+export {};
 //# sourceMappingURL=arcgis-webscene-loader.d.ts.map

package/dist/arcgis-webscene-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arcgis-webscene-loader.d.ts","sourceRoot":"","sources":["../src/arcgis-webscene-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC9E,OAAO,KAAK,EAAC,kBAAkB,EAAC,mBAAgB;AAQhD,MAAM,MAAM,2BAA2B,GAAG,aAAa,GAAG,EAAE,CAAC;AAE7D;;;GAGG;AACH,eAAO,MAAM,oBAAoB,EAAE,gBAAgB,CACjD,kBAAkB,EAClB,KAAK,EACL,2BAA2B,CAU5B,CAAC"}
+{"version":3,"file":"arcgis-webscene-loader.d.ts","sourceRoot":"","sources":["../src/arcgis-webscene-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAmB,MAAM,0BAA0B,CAAC;AAC9E,OAAO,KAAK,EAAC,kBAAkB,EAAC,mBAAgB;AAQhD,MAAM,MAAM,2BAA2B,GAAG,aAAa,GAAG,EAAE,CAAC;AAE7D;;;GAGG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;;;;CAW4D,CAAC;AAE9F;;;GAGG;AACH,iBAAe,KAAK,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAEnE"}

package/dist/arcgis-webscene-loader.js

@@ -1,12 +1,14 @@
 import { parseWebscene } from "./lib/parsers/parse-arcgis-webscene.js";
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.2.0-alpha.5" !== 'undefined' ? "4.2.0-alpha.5" : 'latest';
+const VERSION = typeof "4.2.0-beta.1" !== 'undefined' ? "4.2.0-beta.1" : 'latest';
 /**
  * Loader for ArcGIS WebScene
  * Spec - https://developers.arcgis.com/web-scene-specification/objects/webscene/
  */
 export const ArcGISWebSceneLoader = {
+    dataType: null,
+    batchType: null,
     name: 'ArcGIS Web Scene Loader',
     id: 'arcgis-web-scene',
     module: 'i3s',

package/dist/dist.dev.js

@@ -45,13 +45,6 @@ var __exports__ = (() => {
     }
   });
 
-  // (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";
-    }
-  });
-
   // ../../node_modules/pako/lib/utils/common.js
   var require_common = __commonJS({
     "../../node_modules/pako/lib/utils/common.js"(exports) {
@@ -505,7 +498,7 @@ var __exports__ = (() => {
         var elems = desc.stat_desc.elems;
         var n2, m;
         var max_code = -1;
-        var node2;
+        var node;
         s2.heap_len = 0;
         s2.heap_max = HEAP_SIZE;
         for (n2 = 0; n2 < elems; n2++) {
@@ -517,19 +510,19 @@ var __exports__ = (() => {
           }
         }
         while (s2.heap_len < 2) {
-          node2 = s2.heap[++s2.heap_len] = max_code < 2 ? ++max_code : 0;
-          tree[node2 * 2] = 1;
-          s2.depth[node2] = 0;
+          node = s2.heap[++s2.heap_len] = max_code < 2 ? ++max_code : 0;
+          tree[node * 2] = 1;
+          s2.depth[node] = 0;
           s2.opt_len--;
           if (has_stree) {
-            s2.static_len -= stree[node2 * 2 + 1];
+            s2.static_len -= stree[node * 2 + 1];
           }
         }
         desc.max_code = max_code;
         for (n2 = s2.heap_len >> 1; n2 >= 1; n2--) {
           pqdownheap(s2, tree, n2);
         }
-        node2 = elems;
+        node = elems;
         do {
           n2 = s2.heap[
             1
@@ -551,13 +544,13 @@ var __exports__ = (() => {
           ];
           s2.heap[--s2.heap_max] = n2;
           s2.heap[--s2.heap_max] = m;
-          tree[node2 * 2] = tree[n2 * 2] + tree[m * 2];
-          s2.depth[node2] = (s2.depth[n2] >= s2.depth[m] ? s2.depth[n2] : s2.depth[m]) + 1;
-          tree[n2 * 2 + 1] = tree[m * 2 + 1] = node2;
+          tree[node * 2] = tree[n2 * 2] + tree[m * 2];
+          s2.depth[node] = (s2.depth[n2] >= s2.depth[m] ? s2.depth[n2] : s2.depth[m]) + 1;
+          tree[n2 * 2 + 1] = tree[m * 2 + 1] = node;
           s2.heap[
             1
             /*SMALLEST*/
-          ] = node2++;
+          ] = node++;
           pqdownheap(
             s2,
             tree,
@@ -4342,6 +4335,63 @@ var __exports__ = (() => {
   var matches = typeof process !== "undefined" && process.version && /v([0-9]*)/.exec(process.version);
   var nodeVersion = matches && parseFloat(matches[1]) || 0;
 
+  // ../../node_modules/@babel/runtime/helpers/esm/typeof.js
+  function _typeof(obj) {
+    "@babel/helpers - typeof";
+    return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(obj2) {
+      return typeof obj2;
+    } : function(obj2) {
+      return obj2 && "function" == typeof Symbol && obj2.constructor === Symbol && obj2 !== Symbol.prototype ? "symbol" : typeof obj2;
+    }, _typeof(obj);
+  }
+
+  // ../../node_modules/@babel/runtime/helpers/esm/toPrimitive.js
+  function _toPrimitive(input, hint) {
+    if (_typeof(input) !== "object" || input === null)
+      return input;
+    var prim = input[Symbol.toPrimitive];
+    if (prim !== void 0) {
+      var res = prim.call(input, hint || "default");
+      if (_typeof(res) !== "object")
+        return res;
+      throw new TypeError("@@toPrimitive must return a primitive value.");
+    }
+    return (hint === "string" ? String : Number)(input);
+  }
+
+  // ../../node_modules/@babel/runtime/helpers/esm/toPropertyKey.js
+  function _toPropertyKey(arg) {
+    var key = _toPrimitive(arg, "string");
+    return _typeof(key) === "symbol" ? key : String(key);
+  }
+
+  // ../../node_modules/@babel/runtime/helpers/esm/defineProperty.js
+  function _defineProperty(obj, key, value) {
+    key = _toPropertyKey(key);
+    if (key in obj) {
+      Object.defineProperty(obj, key, {
+        value,
+        enumerable: true,
+        configurable: true,
+        writable: true
+      });
+    } else {
+      obj[key] = value;
+    }
+    return obj;
+  }
+
+  // ../loader-utils/src/lib/module-utils/js-module-utils.ts
+  function registerJSModules(modules) {
+    globalThis.loaders ||= {};
+    globalThis.loaders.modules ||= {};
+    Object.assign(globalThis.loaders.modules, modules);
+  }
+  function getJSModuleOrNull(name) {
+    const module = globalThis.loaders?.modules?.[name];
+    return module || null;
+  }
+
   // ../worker-utils/src/lib/env-utils/version.ts
   var NPM_TAG = "latest";
   function getVersion() {
@@ -4388,7 +4438,6 @@ var __exports__ = (() => {
   var nodeVersion2 = matches2 && parseFloat(matches2[1]) || 0;
 
   // ../worker-utils/src/lib/library-utils/library-utils.ts
-  var node = __toESM(require_require_utils(), 1);
   var loadLibraryPromises = {};
   async function loadLibrary(libraryUrl, moduleName = null, options = {}, libraryName = null) {
     if (moduleName) {
@@ -4425,7 +4474,8 @@ var __exports__ = (() => {
     }
     if (!isBrowser2) {
       try {
-        return node && void 0 && await (void 0)(libraryUrl);
+        const { requireFromFile } = globalThis.loaders || {};
+        return await requireFromFile?.(libraryUrl);
       } catch (error) {
         console.error(error);
         return null;
@@ -4439,7 +4489,8 @@ var __exports__ = (() => {
   }
   function loadLibraryFromString(scriptSource, id) {
     if (!isBrowser2) {
-      return void 0 && (void 0)(scriptSource, id);
+      const { requireFromString } = globalThis.loaders || {};
+      return requireFromString?.(scriptSource, id);
     }
     if (isWorker) {
       eval.call(globalThis, scriptSource);
@@ -4456,18 +4507,20 @@ var __exports__ = (() => {
     return null;
   }
   async function loadAsArrayBuffer(url) {
-    if (isBrowser2 || !void 0 || url.startsWith("http")) {
+    const { readFileAsArrayBuffer } = globalThis.loaders || {};
+    if (isBrowser2 || !readFileAsArrayBuffer || url.startsWith("http")) {
       const response = await fetch(url);
       return await response.arrayBuffer();
     }
-    return await (void 0)(url);
+    return await readFileAsArrayBuffer(url);
   }
   async function loadAsText(url) {
-    if (isBrowser2 || !void 0 || url.startsWith("http")) {
+    const { readFileAsText } = globalThis.loaders || {};
+    if (isBrowser2 || !readFileAsText || url.startsWith("http")) {
       const response = await fetch(url);
       return await response.text();
     }
-    return await (void 0)(url);
+    return await readFileAsText(url);
   }
 
   // ../loader-utils/src/lib/binary-utils/array-buffer-utils.ts
@@ -4511,52 +4564,6 @@ var __exports__ = (() => {
     return concatenateArrayBuffers(...arrayBuffers);
   }
 
-  // ../../node_modules/@babel/runtime/helpers/esm/typeof.js
-  function _typeof(obj) {
-    "@babel/helpers - typeof";
-    return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(obj2) {
-      return typeof obj2;
-    } : function(obj2) {
-      return obj2 && "function" == typeof Symbol && obj2.constructor === Symbol && obj2 !== Symbol.prototype ? "symbol" : typeof obj2;
-    }, _typeof(obj);
-  }
-
-  // ../../node_modules/@babel/runtime/helpers/esm/toPrimitive.js
-  function _toPrimitive(input, hint) {
-    if (_typeof(input) !== "object" || input === null)
-      return input;
-    var prim = input[Symbol.toPrimitive];
-    if (prim !== void 0) {
-      var res = prim.call(input, hint || "default");
-      if (_typeof(res) !== "object")
-        return res;
-      throw new TypeError("@@toPrimitive must return a primitive value.");
-    }
-    return (hint === "string" ? String : Number)(input);
-  }
-
-  // ../../node_modules/@babel/runtime/helpers/esm/toPropertyKey.js
-  function _toPropertyKey(arg) {
-    var key = _toPrimitive(arg, "string");
-    return _typeof(key) === "symbol" ? key : String(key);
-  }
-
-  // ../../node_modules/@babel/runtime/helpers/esm/defineProperty.js
-  function _defineProperty(obj, key, value) {
-    key = _toPropertyKey(key);
-    if (key in obj) {
-      Object.defineProperty(obj, key, {
-        value,
-        enumerable: true,
-        configurable: true,
-        writable: true
-      });
-    } else {
-      obj[key] = value;
-    }
-    return obj;
-  }
-
   // ../loader-utils/src/lib/node/buffer.browser.ts
   function toArrayBuffer(buffer) {
     return buffer;
@@ -9695,6 +9702,8 @@ var __exports__ = (() => {
     // imagebitmap: {} - passes (platform dependent) parameters to ImageBitmap constructor
   };
   var ImageLoader = {
+    dataType: null,
+    batchType: null,
     id: "image",
     module: "images",
     name: "Images",
@@ -9712,6 +9721,8 @@ var __exports__ = (() => {
 
   // ../draco/src/draco-loader.ts
   var DracoLoader = {
+    dataType: null,
+    batchType: null,
     name: "Draco",
     id: "draco",
     module: "draco",
@@ -9866,7 +9877,11 @@ var __exports__ = (() => {
     4: Uint16Array,
     5: Int32Array,
     6: Uint32Array,
+    // 7: BigInt64Array,
+    // 8: BigUint64Array,
     9: Float32Array
+    // 10: Float64Array
+    // 11: BOOL - What array type do we use for this?
   };
   var INDEX_ITEM_SIZE = 4;
   var DracoParser = class {
@@ -10039,14 +10054,17 @@ var __exports__ = (() => {
       for (const loaderAttribute of Object.values(loaderData.attributes)) {
         const attributeName = this._deduceAttributeName(loaderAttribute, options);
         loaderAttribute.name = attributeName;
-        const { value, size } = this._getAttributeValues(dracoGeometry, loaderAttribute);
-        attributes[attributeName] = {
-          value,
-          size,
-          byteOffset: loaderAttribute.byte_offset,
-          byteStride: loaderAttribute.byte_stride,
-          normalized: loaderAttribute.normalized
-        };
+        const values = this._getAttributeValues(dracoGeometry, loaderAttribute);
+        if (values) {
+          const { value, size } = values;
+          attributes[attributeName] = {
+            value,
+            size,
+            byteOffset: loaderAttribute.byte_offset,
+            byteStride: loaderAttribute.byte_stride,
+            normalized: loaderAttribute.normalized
+          };
+        }
       }
       return attributes;
     }
@@ -10088,6 +10106,10 @@ var __exports__ = (() => {
      */
     _getAttributeValues(dracoGeometry, attribute) {
       const TypedArrayCtor = DRACO_DATA_TYPE_TO_TYPED_ARRAY_MAP[attribute.data_type];
+      if (!TypedArrayCtor) {
+        console.warn(`DRACO: Unsupported attribute type ${attribute.data_type}`);
+        return null;
+      }
       const numComponents = attribute.num_components;
       const numPoints = dracoGeometry.num_points();
       const numValues = numPoints * numComponents;
@@ -10318,11 +10340,11 @@ var __exports__ = (() => {
   async function loadDracoDecoderModule(options) {
     const modules = options.modules || {};
     if (modules.draco3d) {
-      loadDecoderPromise = loadDecoderPromise || modules.draco3d.createDecoderModule({}).then((draco) => {
+      loadDecoderPromise ||= modules.draco3d.createDecoderModule({}).then((draco) => {
         return { draco };
       });
     } else {
-      loadDecoderPromise = loadDecoderPromise || loadDracoDecoder(options);
+      loadDecoderPromise ||= loadDracoDecoder(options);
     }
     return await loadDecoderPromise;
   }
@@ -10403,11 +10425,12 @@ var __exports__ = (() => {
   };
   var loadBasisTranscoderPromise;
   async function loadBasisTranscoderModule(options) {
-    const modules = options.modules || {};
-    if (modules.basis) {
-      return modules.basis;
+    registerJSModules(options.modules);
+    const basis = getJSModuleOrNull("basis");
+    if (basis) {
+      return basis;
     }
-    loadBasisTranscoderPromise = loadBasisTranscoderPromise || loadBasisTranscoder(options);
+    loadBasisTranscoderPromise ||= loadBasisTranscoder(options);
     return await loadBasisTranscoderPromise;
   }
   async function loadBasisTranscoder(options) {
@@ -11073,6 +11096,8 @@ var __exports__ = (() => {
 
   // ../textures/src/basis-loader.ts
   var BasisWorkerLoader = {
+    dataType: null,
+    batchType: null,
     name: "Basis",
     id: "basis",
     module: "textures",
@@ -11085,12 +11110,9 @@ var __exports__ = (() => {
     options: {
       basis: {
         format: "auto",
-        // gl context doesn't exist on a worker thread
         libraryPath: "libs/",
         containerFormat: "auto",
-        // 'basis' || 'ktx2' || 'auto'
         module: "transcoder"
-        // 'transcoder' || 'encoder'
       }
     }
   };
@@ -11391,6 +11413,8 @@ var __exports__ = (() => {
 
   // ../textures/src/compressed-texture-loader.ts
   var CompressedTextureWorkerLoader = {
+    dataType: null,
+    batchType: null,
     name: "Texture Containers",
     id: "compressed-texture",
     module: "textures",
@@ -11869,6 +11893,8 @@ var __exports__ = (() => {
   // src/i3s-content-loader.ts
   var VERSION5 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
   var I3SContentLoader = {
+    dataType: null,
+    batchType: null,
     name: "I3S Content (Indexed Scene Layers)",
     id: "i3s-content",
     module: "i3s",
@@ -12356,6 +12382,8 @@ var __exports__ = (() => {
   // src/i3s-node-page-loader.ts
   var VERSION6 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
   var I3SNodePageLoader = {
+    dataType: null,
+    batchType: null,
     name: "I3S Node Page",
     id: "i3s-node-page",
     module: "i3s",
@@ -12431,10 +12459,10 @@ var __exports__ = (() => {
      */
     // eslint-disable-next-line complexity, max-statements
     async formTileFromNodePages(id) {
-      const node2 = await this.getNodeById(id);
+      const node = await this.getNodeById(id);
       const children = [];
       const childNodesPromises = [];
-      for (const child of node2.children || []) {
+      for (const child of node.children || []) {
         childNodesPromises.push(this.getNodeById(child));
       }
       const childNodes = await Promise.all(childNodesPromises);
@@ -12450,29 +12478,29 @@ var __exports__ = (() => {
       let textureFormat = "jpg";
       let attributeUrls = [];
       let isDracoGeometry = false;
-      if (node2 && node2.mesh) {
-        const { url, isDracoGeometry: isDracoGeometryResult } = node2.mesh.geometry && this.getContentUrl(node2.mesh.geometry) || { isDracoGeometry: false };
+      if (node && node.mesh) {
+        const { url, isDracoGeometry: isDracoGeometryResult } = node.mesh.geometry && this.getContentUrl(node.mesh.geometry) || { isDracoGeometry: false };
         contentUrl = url;
         isDracoGeometry = isDracoGeometryResult;
-        const { textureData, materialDefinition: nodeMaterialDefinition } = this.getInformationFromMaterial(node2.mesh.material);
+        const { textureData, materialDefinition: nodeMaterialDefinition } = this.getInformationFromMaterial(node.mesh.material);
         materialDefinition = nodeMaterialDefinition;
         textureFormat = textureData.format || textureFormat;
         if (textureData.name) {
-          textureUrl = `${this.url}/nodes/${node2.mesh.material.resource}/textures/${textureData.name}`;
+          textureUrl = `${this.url}/nodes/${node.mesh.material.resource}/textures/${textureData.name}`;
         }
         if (this.tileset.attributeStorageInfo) {
           attributeUrls = generateTilesetAttributeUrls(
             this.tileset,
             this.url,
-            node2.mesh.attribute.resource
+            node.mesh.attribute.resource
           );
         }
       }
-      const lodSelection = this.getLodSelection(node2);
+      const lodSelection = this.getLodSelection(node);
       return normalizeTileNonUrlData({
         id: id.toString(),
         lodSelection,
-        obb: node2.obb,
+        obb: node.obb,
         contentUrl,
         textureUrl,
         attributeUrls,
@@ -12520,19 +12548,19 @@ var __exports__ = (() => {
      * @param node - a node from nodepage
      * @returns- Array of LodSelection
      */
-    getLodSelection(node2) {
+    getLodSelection(node) {
       const lodSelection = [];
       if (this.lodSelectionMetricType === "maxScreenThresholdSQ") {
         lodSelection.push({
           metricType: "maxScreenThreshold",
           // @ts-ignore
-          maxError: Math.sqrt(node2.lodThreshold / (Math.PI * 0.25))
+          maxError: Math.sqrt(node.lodThreshold / (Math.PI * 0.25))
         });
       }
       lodSelection.push({
         metricType: this.lodSelectionMetricType,
         // @ts-ignore
-        maxError: node2.lodThreshold
+        maxError: node.lodThreshold
       });
       return lodSelection;
     }
@@ -12715,6 +12743,8 @@ var __exports__ = (() => {
   var SLPK_HEX = "504b0304";
   var POINT_CLOUD = "PointCloud";
   var I3SLoader = {
+    dataType: null,
+    batchType: null,
     name: "I3S (Indexed Scene Layers)",
     id: "i3s",
     module: "i3s",
@@ -13838,7 +13868,8 @@ var __exports__ = (() => {
       this.decompressBatches = this.decompressBatches.bind(this);
     }
     /** Preloads any dynamic libraries. May enable sync functions */
-    async preload() {
+    async preload(modules = {}) {
+      registerJSModules(modules);
       return;
     }
     /** Asynchronously compress data */
@@ -14364,6 +14395,8 @@ var __exports__ = (() => {
   // src/i3s-slpk-loader.ts
   var VERSION8 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
   var SLPKLoader = {
+    dataType: null,
+    batchType: null,
     name: "I3S SLPK (Scene Layer Package)",
     id: "slpk",
     module: "i3s",
@@ -14446,6 +14479,8 @@ var __exports__ = (() => {
   var EMPTY_VALUE = "";
   var REJECTED_STATUS = "rejected";
   var I3SAttributeLoader = {
+    dataType: null,
+    batchType: null,
     name: "I3S Attribute",
     id: "i3s-attribute",
     module: "i3s",
@@ -14578,6 +14613,8 @@ var __exports__ = (() => {
   // src/i3s-building-scene-layer-loader.ts
   var VERSION10 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
   var I3SBuildingSceneLayerLoader = {
+    dataType: null,
+    batchType: null,
     name: "I3S Building Scene Layer",
     id: "i3s-building-scene-layer",
     module: "i3s",
@@ -14667,6 +14704,8 @@ var __exports__ = (() => {
   // src/arcgis-webscene-loader.ts
   var VERSION11 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
   var ArcGISWebSceneLoader = {
+    dataType: null,
+    batchType: null,
     name: "ArcGIS Web Scene Loader",
     id: "arcgis-web-scene",
     module: "i3s",