@loaders.gl/draco 4.3.4 → 4.4.0-alpha.10

package/dist/draco-worker.js

@@ -9,8 +9,9 @@
           "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;
+        warningIssued = true;
       } else {
-        globalThis._loadersgl_.version = "4.3.3";
+        globalThis._loadersgl_.version = "4.4.0-alpha.10";
       }
     }
     return globalThis._loadersgl_.version;
@@ -173,6 +174,9 @@
     return await loadLibraryPromises[libraryUrl];
   }
   function getLibraryUrl(library, moduleName, options = {}, libraryName = null) {
+    if (options?.core) {
+      throw new Error("loadLibrary: options.core must be pre-normalized");
+    }
     if (!options.useLocalLibraries && library.startsWith("http")) {
       return library;
     }
@@ -198,10 +202,20 @@
       return await loadAsArrayBuffer(libraryUrl);
     }
     if (!isBrowser) {
+      const { requireFromFile } = globalThis.loaders || {};
       try {
-        const { requireFromFile } = globalThis.loaders || {};
-        return await requireFromFile?.(libraryUrl);
+        const result = await requireFromFile?.(libraryUrl);
+        if (result || !libraryUrl.includes("/dist/libs/")) {
+          return result;
+        }
+        return await requireFromFile?.(libraryUrl.replace("/dist/libs/", "/src/libs/"));
       } catch (error) {
+        if (libraryUrl.includes("/dist/libs/")) {
+          try {
+            return await requireFromFile?.(libraryUrl.replace("/dist/libs/", "/src/libs/"));
+          } catch {
+          }
+        }
         console.error(error);
         return null;
       }
@@ -237,7 +251,14 @@
       const response = await fetch(url);
       return await response.arrayBuffer();
     }
-    return await readFileAsArrayBuffer(url);
+    try {
+      return await readFileAsArrayBuffer(url);
+    } catch {
+      if (url.includes("/dist/libs/")) {
+        return await readFileAsArrayBuffer(url.replace("/dist/libs/", "/src/libs/"));
+      }
+      throw new Error(`Failed to load ArrayBuffer from ${url}`);
+    }
   }
   async function loadAsText(url) {
     const { readFileAsText } = globalThis.loaders || {};
@@ -245,7 +266,14 @@
       const response = await fetch(url);
       return await response.text();
     }
-    return await readFileAsText(url);
+    try {
+      return await readFileAsText(url);
+    } catch {
+      if (url.includes("/dist/libs/")) {
+        return await readFileAsText(url.replace("/dist/libs/", "/src/libs/"));
+      }
+      throw new Error(`Failed to load text from ${url}`);
+    }
   }
 
   // ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
@@ -324,40 +352,134 @@
     options = {
       ...options,
       modules: loader && loader.options && loader.options.modules || {},
-      worker: false
+      core: {
+        ...options.core,
+        worker: false
+      }
     };
     return await parser(data, { ...options }, context, loader);
   }
 
-  // src/lib/utils/version.ts
-  var VERSION2 = true ? "4.3.3" : "latest";
-
-  // src/draco-loader.ts
-  var DracoLoader = {
-    dataType: null,
-    batchType: null,
-    name: "Draco",
-    id: "draco",
-    module: "draco",
-    // shapes: ['mesh'],
-    version: VERSION2,
-    worker: true,
-    extensions: ["drc"],
-    mimeTypes: ["application/octet-stream"],
-    binary: true,
-    tests: ["DRACO"],
-    options: {
-      draco: {
-        decoderType: typeof WebAssembly === "object" ? "wasm" : "js",
-        // 'js' for IE11
-        libraryPath: "libs/",
-        extraAttributes: {},
-        attributeNameEntry: void 0
+  // src/lib/draco-module-loader.ts
+  var DRACO_DECODER_VERSION = "1.5.6";
+  var DRACO_ENCODER_VERSION = "1.4.1";
+  var STATIC_DECODER_URL = `https://www.gstatic.com/draco/versioned/decoders/${DRACO_DECODER_VERSION}`;
+  var DRACO_EXTERNAL_LIBRARIES = {
+    /** The primary Draco3D encoder, javascript wrapper part */
+    DECODER: "draco_wasm_wrapper.js",
+    /** The primary draco decoder, compiled web assembly part */
+    DECODER_WASM: "draco_decoder.wasm",
+    /** Fallback decoder for non-webassebly environments. Very big bundle, lower performance */
+    FALLBACK_DECODER: "draco_decoder.js",
+    /** Draco encoder */
+    ENCODER: "draco_encoder.js"
+  };
+  var DRACO_EXTERNAL_LIBRARY_URLS = {
+    [DRACO_EXTERNAL_LIBRARIES.DECODER]: `${STATIC_DECODER_URL}/${DRACO_EXTERNAL_LIBRARIES.DECODER}`,
+    [DRACO_EXTERNAL_LIBRARIES.DECODER_WASM]: `${STATIC_DECODER_URL}/${DRACO_EXTERNAL_LIBRARIES.DECODER_WASM}`,
+    [DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER]: `${STATIC_DECODER_URL}/${DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER}`,
+    [DRACO_EXTERNAL_LIBRARIES.ENCODER]: `https://raw.githubusercontent.com/google/draco/${DRACO_ENCODER_VERSION}/javascript/${DRACO_EXTERNAL_LIBRARIES.ENCODER}`
+  };
+  var loadDecoderPromise;
+  async function loadDracoDecoderModule(options = {}, type) {
+    const modules = options.modules || {};
+    if (modules.draco3d) {
+      loadDecoderPromise ||= modules.draco3d.createDecoderModule({}).then((draco) => {
+        return { draco };
+      });
+    } else {
+      loadDecoderPromise ||= loadDracoDecoder(options, type);
+    }
+    return await loadDecoderPromise;
+  }
+  function getLibraryExport(library, exportName) {
+    if (library && typeof library === "object") {
+      if (library.default) {
+        return library.default;
+      }
+      if (library[exportName]) {
+        return library[exportName];
       }
     }
-  };
+    return library;
+  }
+  async function loadDracoDecoder(options, type) {
+    let DracoDecoderModule;
+    let wasmBinary;
+    switch (type) {
+      case "js":
+        DracoDecoderModule = await loadLibrary(
+          DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER],
+          "draco",
+          options,
+          DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER
+        );
+        break;
+      case "wasm":
+      default:
+        try {
+          [DracoDecoderModule, wasmBinary] = await Promise.all([
+            await loadLibrary(
+              DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.DECODER],
+              "draco",
+              options,
+              DRACO_EXTERNAL_LIBRARIES.DECODER
+            ),
+            await loadLibrary(
+              DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.DECODER_WASM],
+              "draco",
+              options,
+              DRACO_EXTERNAL_LIBRARIES.DECODER_WASM
+            )
+          ]);
+        } catch {
+          DracoDecoderModule = null;
+          wasmBinary = null;
+        }
+    }
+    DracoDecoderModule = getLibraryExport(DracoDecoderModule, "DracoDecoderModule");
+    DracoDecoderModule = DracoDecoderModule || globalThis.DracoDecoderModule;
+    if (!DracoDecoderModule && !isBrowser) {
+      [DracoDecoderModule, wasmBinary] = await Promise.all([
+        await loadLibrary(
+          DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.DECODER],
+          "draco",
+          { ...options, useLocalLibraries: true },
+          DRACO_EXTERNAL_LIBRARIES.DECODER
+        ),
+        await loadLibrary(
+          DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.DECODER_WASM],
+          "draco",
+          { ...options, useLocalLibraries: true },
+          DRACO_EXTERNAL_LIBRARIES.DECODER_WASM
+        )
+      ]);
+      DracoDecoderModule = getLibraryExport(DracoDecoderModule, "DracoDecoderModule");
+      DracoDecoderModule = DracoDecoderModule || globalThis.DracoDecoderModule;
+    }
+    return await initializeDracoDecoder(DracoDecoderModule, wasmBinary);
+  }
+  function initializeDracoDecoder(DracoDecoderModule, wasmBinary) {
+    if (typeof DracoDecoderModule !== "function") {
+      throw new Error("DracoDecoderModule could not be loaded");
+    }
+    const options = {};
+    if (wasmBinary) {
+      options.wasmBinary = wasmBinary;
+    }
+    return new Promise((resolve) => {
+      DracoDecoderModule({
+        ...options,
+        onModuleLoaded: (draco) => resolve({ draco })
+        // Module is Promise-like. Wrap in object to avoid loop.
+      });
+    });
+  }
+
+  // src/lib/utils/version.ts
+  var VERSION2 = true ? "4.4.0-alpha.10" : "latest";
 
-  // ../schema/src/lib/table/simple-table/data-type.ts
+  // ../schema-utils/src/lib/schema/data-type.ts
   function getDataTypeFromTypedArray(array) {
     switch (array.constructor) {
       case Int8Array:
@@ -382,7 +504,7 @@
     }
   }
 
-  // ../schema/src/lib/mesh/mesh-utils.ts
+  // ../schema-utils/src/lib/mesh/mesh-utils.ts
   function getMeshBoundingBox(attributes) {
     let minX = Infinity;
     let minY = Infinity;
@@ -409,7 +531,7 @@
     ];
   }
 
-  // ../schema/src/lib/mesh/deduce-mesh-schema.ts
+  // ../schema-utils/src/lib/mesh/deduce-mesh-schema.ts
   function deduceMeshField(name, attribute, optionalMetadata) {
     const type = getDataTypeFromTypedArray(attribute.value);
     const metadata = optionalMetadata ? optionalMetadata : makeMeshAttributeMetadata(attribute);
@@ -633,6 +755,7 @@
           case "triangle-strip":
             return {
               topology: "triangle-strip",
+              // TODO - mode is wrong?
               mode: 4,
               // GL.TRIANGLES
               attributes,
@@ -645,6 +768,7 @@
           default:
             return {
               topology: "triangle-list",
+              // TODO - mode is wrong?
               mode: 5,
               // GL.TRIANGLE_STRIP
               attributes,
@@ -929,91 +1053,39 @@
     return intArray;
   }
 
-  // src/lib/draco-module-loader.ts
-  var DRACO_DECODER_VERSION = "1.5.6";
-  var DRACO_ENCODER_VERSION = "1.4.1";
-  var STATIC_DECODER_URL = `https://www.gstatic.com/draco/versioned/decoders/${DRACO_DECODER_VERSION}`;
-  var DRACO_EXTERNAL_LIBRARIES = {
-    /** The primary Draco3D encoder, javascript wrapper part */
-    DECODER: "draco_wasm_wrapper.js",
-    /** The primary draco decoder, compiled web assembly part */
-    DECODER_WASM: "draco_decoder.wasm",
-    /** Fallback decoder for non-webassebly environments. Very big bundle, lower performance */
-    FALLBACK_DECODER: "draco_decoder.js",
-    /** Draco encoder */
-    ENCODER: "draco_encoder.js"
-  };
-  var DRACO_EXTERNAL_LIBRARY_URLS = {
-    [DRACO_EXTERNAL_LIBRARIES.DECODER]: `${STATIC_DECODER_URL}/${DRACO_EXTERNAL_LIBRARIES.DECODER}`,
-    [DRACO_EXTERNAL_LIBRARIES.DECODER_WASM]: `${STATIC_DECODER_URL}/${DRACO_EXTERNAL_LIBRARIES.DECODER_WASM}`,
-    [DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER]: `${STATIC_DECODER_URL}/${DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER}`,
-    [DRACO_EXTERNAL_LIBRARIES.ENCODER]: `https://raw.githubusercontent.com/google/draco/${DRACO_ENCODER_VERSION}/javascript/${DRACO_EXTERNAL_LIBRARIES.ENCODER}`
-  };
-  var loadDecoderPromise;
-  async function loadDracoDecoderModule(options) {
-    const modules = options.modules || {};
-    if (modules.draco3d) {
-      loadDecoderPromise ||= modules.draco3d.createDecoderModule({}).then((draco) => {
-        return { draco };
-      });
-    } else {
-      loadDecoderPromise ||= loadDracoDecoder(options);
-    }
-    return await loadDecoderPromise;
-  }
-  async function loadDracoDecoder(options) {
-    let DracoDecoderModule;
-    let wasmBinary;
-    switch (options.draco && options.draco.decoderType) {
-      case "js":
-        DracoDecoderModule = await loadLibrary(
-          DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER],
-          "draco",
-          options,
-          DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER
-        );
-        break;
-      case "wasm":
-      default:
-        [DracoDecoderModule, wasmBinary] = await Promise.all([
-          await loadLibrary(
-            DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.DECODER],
-            "draco",
-            options,
-            DRACO_EXTERNAL_LIBRARIES.DECODER
-          ),
-          await loadLibrary(
-            DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.DECODER_WASM],
-            "draco",
-            options,
-            DRACO_EXTERNAL_LIBRARIES.DECODER_WASM
-          )
-        ]);
-    }
-    DracoDecoderModule = DracoDecoderModule || globalThis.DracoDecoderModule;
-    return await initializeDracoDecoder(DracoDecoderModule, wasmBinary);
-  }
-  function initializeDracoDecoder(DracoDecoderModule, wasmBinary) {
-    const options = {};
-    if (wasmBinary) {
-      options.wasmBinary = wasmBinary;
+  // src/draco-loader.ts
+  var DracoWorkerLoader = {
+    dataType: null,
+    batchType: null,
+    name: "Draco",
+    id: "draco",
+    module: "draco",
+    // shapes: ['mesh'],
+    version: VERSION2,
+    worker: true,
+    extensions: ["drc"],
+    mimeTypes: ["application/octet-stream"],
+    binary: true,
+    tests: ["DRACO"],
+    options: {
+      draco: {
+        decoderType: typeof WebAssembly === "object" ? "wasm" : "js",
+        // 'js' for IE11
+        libraryPath: "libs/",
+        extraAttributes: {},
+        attributeNameEntry: void 0
+      }
     }
-    return new Promise((resolve) => {
-      DracoDecoderModule({
-        ...options,
-        onModuleLoaded: (draco) => resolve({ draco })
-        // Module is Promise-like. Wrap in object to avoid loop.
-      });
-    });
-  }
-
-  // src/index.ts
-  var DracoLoader2 = {
-    ...DracoLoader,
+  };
+  var DracoLoader = {
+    ...DracoWorkerLoader,
     parse
   };
   async function parse(arrayBuffer, options) {
-    const { draco } = await loadDracoDecoderModule(options);
+    const { draco } = await loadDracoDecoderModule(
+      options?.core,
+      options?.draco?.decoderType || "wasm"
+    );
     const dracoParser = new DracoParser(draco);
     try {
       return dracoParser.parseSync(arrayBuffer, options?.draco);
@@ -1023,6 +1095,6 @@
   }
 
   // src/workers/draco-worker.ts
-  createLoaderWorker(DracoLoader2);
+  createLoaderWorker(DracoLoader);
 })();
 //# sourceMappingURL=draco-worker.js.map