@loaders.gl/tiles 5.0.0-alpha.13 → 5.0.0-alpha.14

package/dist/mvt-worker.js

@@ -15667,7 +15667,7 @@ return true;`);
 
   // ../../node_modules/@math.gl/geospatial/dist/wkb/wkb-builder.js
   function measureGeometry(geometryWriter, options) {
-    const builder = new WKBBuilder({ mode: "measure", ...options });
+    const builder = new WKBBuilder({ ...options, mode: "measure" });
     geometryWriter(builder);
     return builder.finishGeometry();
   }
@@ -15857,6 +15857,11 @@ return true;`);
           if (valueOffsets.length !== geometryWriters.length + 1) {
             throw new Error("WKB valueOffsets length must equal geometry count plus one");
           }
+          for (let i = 0; i < valueOffsets.length; i++) {
+            if (!Number.isInteger(valueOffsets[i]) || valueOffsets[i] < 0 || i > 0 && valueOffsets[i] < valueOffsets[i - 1]) {
+              throw new Error("WKB valueOffsets must be nonnegative and nondecreasing");
+            }
+          }
           if (valueOffsets[valueOffsets.length - 1] > values.byteLength) {
             throw new Error("WKB values buffer is smaller than its final offset");
           }
@@ -15865,10 +15870,10 @@ return true;`);
             if (!geometryWriter)
               continue;
             const builder = new _WKBBuilder({
+              ...options,
               mode: "write",
               target: values,
               byteOffset: valueOffsets[geometryIndex],
-              ...options,
               dimension: options.dimensionResolver?.(geometryIndex) ?? options.dimension
             });
             geometryWriter(builder);
@@ -19056,7 +19061,7 @@ return true;`);
     "../core/src/loader-utils/lib/log-utils/log.ts"() {
       "use strict";
       init_log();
-      VERSION2 = true ? "5.0.0-alpha.13" : "latest";
+      VERSION2 = true ? "5.0.0-alpha.14" : "latest";
       version = VERSION2[0] >= "0" && VERSION2[0] <= "9" ? `v${VERSION2}` : "";
       log2 = createLog();
     }
@@ -19290,6 +19295,8 @@ return true;`);
       process: processOnMainThread
     };
     WorkerBody.onmessage = async (type, payload) => {
+      const reporter = type === "process" || type === "process-in-batches" ? createProgressReporter() : void 0;
+      const jobContext = { ...context, reportProgress: reporter?.report };
       try {
         switch (type) {
           case "preload":
@@ -19302,9 +19309,10 @@ return true;`);
             const result = await process2(
               payload.input,
               payload.options || {},
-              context,
+              jobContext,
               payload.context || {}
             );
+            reporter?.finish();
             WorkerBody.postMessage("done", { result });
             break;
           case "process-in-batches":
@@ -19319,13 +19327,14 @@ return true;`);
               const resultIterator = processInBatches(
                 createDemandDrivenIterator(inputBatches),
                 payload.options || {},
-                context,
+                jobContext,
                 payload.context || {}
               );
               for await (const batch of resultIterator) {
                 await WorkerBody.postMessage("output-batch", { result: batch });
                 await outputAcknowledgements.next();
               }
+              reporter?.finish();
               await WorkerBody.postMessage("done", {});
             } finally {
               activeInputBatches = null;
@@ -19353,6 +19362,7 @@ return true;`);
           default:
         }
       } catch (error) {
+        reporter?.finish();
         const message = error instanceof Error ? error.message : "";
         WorkerBody.postMessage("error", { error: message });
       }
@@ -19392,6 +19402,35 @@ return true;`);
       WorkerBody.postMessage("process", payload);
     });
   }
+  function createProgressReporter() {
+    let pending;
+    let finished = false;
+    let scheduled = false;
+    const flush = () => {
+      scheduled = false;
+      if (pending) {
+        WorkerBody.postMessage("progress", { progress: pending });
+        pending = void 0;
+      }
+    };
+    return {
+      /** Records progress while retaining phase transitions. */
+      report(progress) {
+        if (finished) return;
+        if (pending && pending.phase !== progress.phase) flush();
+        pending = { ...progress };
+        if (!scheduled) {
+          scheduled = true;
+          setTimeout(flush, 0);
+        }
+      },
+      /** Flushes final progress and suppresses reports from stale callbacks. */
+      finish() {
+        flush();
+        finished = true;
+      }
+    };
+  }
   var requestId, activeInputBatches, activeOutputAcknowledgements;
   var init_create_worker = __esm({
     "../core/src/worker-utils/lib/worker-api/create-worker.ts"() {
@@ -19438,6 +19477,7 @@ return true;`);
       options,
       context: {
         ...loaderContext,
+        reportProgress: workerContext?.reportProgress,
         coreApi: createWorkerCoreApi(),
         _parse: createParseOnMainThread(workerContext?.process)
       }
@@ -19448,8 +19488,10 @@ return true;`);
     if (!loader.parseInBatches) {
       throw new Error(`${loader.id} loader does not support batched parsing`);
     }
-    const resultIterator = loader.parseInBatches(inputIterator, options, {
+    const parserOptions = getWorkerLoaderOptions(loader, options);
+    const resultIterator = loader.parseInBatches(inputIterator, parserOptions, {
       ...loaderContext,
+      reportProgress: workerContext?.reportProgress,
       coreApi: createWorkerCoreApi(),
       _parse: createParseOnMainThread(workerContext?.process)
     });
@@ -19505,7 +19547,17 @@ return true;`);
     if (!context) {
       return void 0;
     }
-    const { fetch: fetch2, loaders, coreApi, _parse, _parseSync, _parseInBatches, ...serializableContext } = context;
+    const {
+      fetch: fetch2,
+      loaders,
+      coreApi,
+      signal,
+      reportProgress,
+      _parse,
+      _parseSync,
+      _parseInBatches,
+      ...serializableContext
+    } = context;
     return JSON.parse(JSON.stringify(serializableContext));
   }
   async function parseData({
@@ -19526,18 +19578,15 @@ return true;`);
     } else {
       throw new Error(`Could not load data with ${loader.name} loader`);
     }
-    options = {
+    options = getWorkerLoaderOptions(loader, options);
+    return await parser(data, { ...options }, context, loader);
+  }
+  function getWorkerLoaderOptions(loader, options) {
+    return {
       ...options,
-      modules: {
-        ...loader && loader.options && loader.options.modules || {},
-        ...options.modules || {}
-      },
-      core: {
-        ...options.core,
-        worker: false
-      }
+      modules: { ...loader.options?.modules, ...options.modules },
+      core: { ...options.core, worker: false }
     };
-    return await parser(data, { ...options }, context, loader);
   }
   var init_create_loader_worker = __esm({
     "../core/src/loader-utils/lib/worker-loader-utils/create-loader-worker.ts"() {
@@ -21091,14 +21140,6 @@ return true;`);
     }
   });
 
-  // ../arrow/src/transport.ts
-  var init_transport2 = __esm({
-    "../arrow/src/transport.ts"() {
-      "use strict";
-      init_transport();
-    }
-  });
-
   // src/mvt/lib/mvt-worker-transport.ts
   function serializeMVTWorkerResult(result, options) {
     if (isArrowTable3(result)) {
@@ -21137,7 +21178,7 @@ return true;`);
   var init_mvt_worker_transport = __esm({
     "src/mvt/lib/mvt-worker-transport.ts"() {
       "use strict";
-      init_transport2();
+      init_transport();
     }
   });
 
@@ -21176,7 +21217,7 @@ return true;`);
       "use strict";
       init_mvt_format();
       init_mvt_worker_transport();
-      VERSION3 = true ? "5.0.0-alpha.13" : "latest";
+      VERSION3 = true ? "5.0.0-alpha.14" : "latest";
       MVTLoader = {
         ...MVTFormat,
         dataType: null,

package/dist/pmtiles/dist.dev.js

@@ -1122,7 +1122,7 @@ var __exports__ = (() => {
     for (const credential of requestCredentials) normalizeRequestOrigins(credential.origins);
     const authenticatedFetch = async (url2, requestOptions = {}) => {
       requestOptions = mergeFetchOptions(fetchOptions, requestOptions);
-      if (requestOptions.signal?.aborted) throw createAbortError();
+      requestOptions.signal?.throwIfAborted();
       if (!credentials.length) return baseFetch(url2, requestOptions);
       const resolvedURL = parseHTTPURL(url2);
       const authorization = resolvedURL ? await authorizeRequest(resolvedURL, requestOptions, tokenCredentials) : { url: url2, options: requestOptions, credentials: [] };
@@ -1138,7 +1138,7 @@ var __exports__ = (() => {
         (credential) => credential.refreshStatusCodes?.includes(response.status)
       );
       if (!refreshableCredentials.length && !shouldRetrySignature) return response;
-      if (requestOptions.signal?.aborted) throw createAbortError();
+      requestOptions.signal?.throwIfAborted();
       const refreshedTokens = /* @__PURE__ */ new Map();
       await Promise.all(
         refreshableCredentials.map(async ({ credential }) => {
@@ -1149,7 +1149,7 @@ var __exports__ = (() => {
       if (!refreshedTokens.size && !shouldRetrySignature) return response;
       await response.body?.cancel().catch(() => {
       });
-      if (requestOptions.signal?.aborted) throw createAbortError();
+      requestOptions.signal?.throwIfAborted();
       const replayAuthorization = resolvedURL ? await authorizeRequest(
         resolvedURL,
         requestOptions,
@@ -1183,9 +1183,10 @@ var __exports__ = (() => {
     } else {
       fetchFunction = (url2, requestOptions) => fetch(url2, requestOptions);
     }
+    const fetchOptions = typeof fetchOption === "object" && fetchOption ? fetchOption : void 0;
     return createAuthenticatedFetch({
       fetch: fetchFunction,
-      fetchOptions: typeof fetchOption === "object" && fetchOption ? fetchOption : void 0,
+      fetchOptions: options.signal ? { ...fetchOptions, signal: options.signal } : fetchOptions,
       credentials: options.core?.credentials || [],
       authentications: options.core?.authentications
     });
@@ -1205,7 +1206,7 @@ var __exports__ = (() => {
     for (const credential of credentials) {
       const origin = getRequestOrigin(request.url);
       if (!origin || !normalizeRequestOrigins(credential.origins).includes(origin)) continue;
-      if (signal?.aborted) throw createAbortError();
+      signal?.throwIfAborted();
       const authenticatedRequest = await credential.authenticate({
         url: request.url,
         options: { ...request.options, headers: new Headers(request.options.headers) },
@@ -1221,7 +1222,7 @@ var __exports__ = (() => {
       };
       appliedCredentials.push(credential);
     }
-    if (signal?.aborted) throw createAbortError();
+    signal?.throwIfAborted();
     return { ...request, credentials: appliedCredentials };
   }
   function getRequestOrigin(url2) {
@@ -1311,9 +1312,6 @@ var __exports__ = (() => {
     if (!["GET", "HEAD", "OPTIONS", "PUT", "DELETE"].includes(method)) return false;
     return !(options.body && typeof ReadableStream !== "undefined" && options.body instanceof ReadableStream);
   }
-  function createAbortError() {
-    return new DOMException("The operation was aborted.", "AbortError");
-  }
   var AUTHENTICATED_FETCH, refreshPromises;
   var init_request_credentials = __esm({
     "../core/src/loader-utils/lib/request-utils/request-credentials.ts"() {
@@ -1517,7 +1515,7 @@ var __exports__ = (() => {
   function getTimestamp() {
     return globalThis.performance?.now() ?? Date.now();
   }
-  function createAbortError2() {
+  function createAbortError() {
     if (typeof DOMException !== "undefined") {
       return new DOMException("Request aborted", "AbortError");
     }
@@ -1621,7 +1619,7 @@ var __exports__ = (() => {
             return Promise.reject(new Error("Byte range length cannot be negative"));
           }
           if (request.signal?.aborted) {
-            return Promise.reject(request.signal.reason ?? createAbortError2());
+            return Promise.reject(request.signal.reason ?? createAbortError());
           }
           if (request.length === 0) {
             return Promise.resolve(new ArrayBuffer(0));
@@ -1881,7 +1879,7 @@ var __exports__ = (() => {
             }
           }
           this.transportQueue = this.transportQueue.filter((group) => group.requests.length > 0);
-          request.reject(request.signal?.reason ?? createAbortError2());
+          request.reject(request.signal?.reason ?? createAbortError());
           this.trackEvent({
             type: "abort",
             sourceId: request.sourceId,
@@ -18871,7 +18869,7 @@ return true;`);
 
   // ../../node_modules/@math.gl/geospatial/dist/wkb/wkb-builder.js
   function measureGeometry(geometryWriter, options) {
-    const builder = new WKBBuilder({ mode: "measure", ...options });
+    const builder = new WKBBuilder({ ...options, mode: "measure" });
     geometryWriter(builder);
     return builder.finishGeometry();
   }
@@ -19061,6 +19059,11 @@ return true;`);
           if (valueOffsets.length !== geometryWriters.length + 1) {
             throw new Error("WKB valueOffsets length must equal geometry count plus one");
           }
+          for (let i2 = 0; i2 < valueOffsets.length; i2++) {
+            if (!Number.isInteger(valueOffsets[i2]) || valueOffsets[i2] < 0 || i2 > 0 && valueOffsets[i2] < valueOffsets[i2 - 1]) {
+              throw new Error("WKB valueOffsets must be nonnegative and nondecreasing");
+            }
+          }
           if (valueOffsets[valueOffsets.length - 1] > values.byteLength) {
             throw new Error("WKB values buffer is smaller than its final offset");
           }
@@ -19069,10 +19072,10 @@ return true;`);
             if (!geometryWriter)
               continue;
             const builder = new _WKBBuilder({
+              ...options,
               mode: "write",
               target: values,
               byteOffset: valueOffsets[geometryIndex],
-              ...options,
               dimension: options.dimensionResolver?.(geometryIndex) ?? options.dimension
             });
             geometryWriter(builder);
@@ -46871,14 +46874,6 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     }
   });
 
-  // ../arrow/src/transport.ts
-  var init_transport2 = __esm({
-    "../arrow/src/transport.ts"() {
-      "use strict";
-      init_transport();
-    }
-  });
-
   // src/mvt/lib/mvt-worker-transport.ts
   function serializeMVTWorkerResult(result, options) {
     if (isArrowTable3(result)) {
@@ -46917,7 +46912,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
   var init_mvt_worker_transport = __esm({
     "src/mvt/lib/mvt-worker-transport.ts"() {
       "use strict";
-      init_transport2();
+      init_transport();
     }
   });