@loaders.gl/gltf 4.4.0-alpha.18 → 4.4.0-alpha.19

package/dist/index.cjs

@@ -1695,7 +1695,7 @@ function processPrimitiveTextures(scenegraph, attributeName, featureTexturePrope
 }
 
 // dist/lib/utils/version.js
-var VERSION = true ? "4.4.0-alpha.18" : "latest";
+var VERSION = true ? "4.4.0-alpha.19" : "latest";
 
 // dist/lib/parsers/parse-gltf.js
 var import_loader_utils7 = require("@loaders.gl/loader-utils");
@@ -1814,17 +1814,27 @@ function parseBINChunk(glb, dataView, byteOffset, chunkLength) {
 }
 
 // dist/lib/gltf-utils/resolve-url.js
-function resolveUrl(url, options) {
+function resolveUrl(url, options, context) {
   var _a;
   const absolute = url.startsWith("data:") || url.startsWith("http:") || url.startsWith("https:");
   if (absolute) {
     return url;
   }
-  const baseUrl = ((_a = options == null ? void 0 : options.core) == null ? void 0 : _a.baseUri) || options.baseUri || options.uri;
+  const baseUrl = (context == null ? void 0 : context.baseUrl) || getResolveBaseUrl((_a = options == null ? void 0 : options.core) == null ? void 0 : _a.baseUrl);
   if (!baseUrl) {
-    throw new Error(`'baseUri' must be provided to resolve relative url ${url}`);
+    throw new Error(`'baseUrl' must be provided to resolve relative url ${url}`);
   }
-  return baseUrl.substr(0, baseUrl.lastIndexOf("/") + 1) + url;
+  return baseUrl.endsWith("/") ? `${baseUrl}${url}` : `${baseUrl}/${url}`;
+}
+function getResolveBaseUrl(baseUrl) {
+  if (!baseUrl) {
+    return void 0;
+  }
+  if (baseUrl.endsWith("/")) {
+    return baseUrl;
+  }
+  const slashIndex = baseUrl.lastIndexOf("/");
+  return slashIndex >= 0 ? baseUrl.slice(0, slashIndex + 1) : "";
 }
 
 // dist/lib/extensions/EXT_meshopt_compression.js
@@ -2887,8 +2897,8 @@ async function parseGLTF(gltf, arrayBufferOrString, byteOffset = 0, options, con
 }
 function parseGLTFContainerSync(gltf, data, byteOffset, options) {
   var _a, _b;
-  if ((_a = options.core) == null ? void 0 : _a.baseUri) {
-    gltf.baseUri = (_b = options.core) == null ? void 0 : _b.baseUri;
+  if ((_a = options.core) == null ? void 0 : _a.baseUrl) {
+    gltf.baseUri = (_b = options.core) == null ? void 0 : _b.baseUrl;
   }
   if (data instanceof ArrayBuffer && !isGLB(data, byteOffset, options.glb)) {
     const textDecoder = new TextDecoder();
@@ -2926,7 +2936,7 @@ async function loadBuffers(gltf, options, context) {
     if (buffer.uri) {
       const { fetch } = context;
       assert(fetch);
-      const uri = resolveUrl(buffer.uri, options);
+      const uri = resolveUrl(buffer.uri, options, context);
       const response = await ((_a = context == null ? void 0 : context.fetch) == null ? void 0 : _a.call(context, uri));
       const arrayBuffer = await ((_b = response == null ? void 0 : response.arrayBuffer) == null ? void 0 : _b.call(response));
       gltf.buffers[i] = {
@@ -2966,7 +2976,7 @@ function getReferencesImageIndices(gltf) {
 async function loadImage(gltf, image, index, options, context) {
   let arrayBuffer;
   if (image.uri && !image.hasOwnProperty("bufferView")) {
-    const uri = resolveUrl(image.uri, options);
+    const uri = resolveUrl(image.uri, options, context);
     const { fetch } = context;
     const response = await fetch(uri);
     arrayBuffer = await response.arrayBuffer();