@loaders.gl/core 4.0.0-alpha.4 → 4.0.0-alpha.6

package/dist/lib/loader-utils/normalize-loader.js

@@ -1,43 +1,52 @@
-import { assert } from '@loaders.gl/loader-utils';
-export function isLoaderObject(loader) {
-  var _loader;
-
-  if (!loader) {
-    return false;
-  }
-
-  if (Array.isArray(loader)) {
-    loader = loader[0];
-  }
-
-  const hasExtensions = Array.isArray((_loader = loader) === null || _loader === void 0 ? void 0 : _loader.extensions);
-  return hasExtensions;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeLoader = exports.isLoaderObject = void 0;
+const loader_utils_1 = require("@loaders.gl/loader-utils");
+function isLoaderObject(loader) {
+    if (!loader) {
+        return false;
+    }
+    if (Array.isArray(loader)) {
+        loader = loader[0];
+    }
+    const hasExtensions = Array.isArray(loader?.extensions);
+    /* Now handled by types and worker loaders do not have these
+    let hasParser =
+      loader.parseTextSync ||
+      loader.parseSync ||
+      loader.parse ||
+      loader.parseStream || // TODO Remove, Replace with parseInBatches
+      loader.parseInBatches;
+    */
+    return hasExtensions;
 }
-export function normalizeLoader(loader) {
-  var _loader2, _loader3;
-
-  assert(loader, 'null loader');
-  assert(isLoaderObject(loader), 'invalid loader');
-  let options;
-
-  if (Array.isArray(loader)) {
-    options = loader[1];
-    loader = loader[0];
-    loader = { ...loader,
-      options: { ...loader.options,
-        ...options
-      }
-    };
-  }
-
-  if ((_loader2 = loader) !== null && _loader2 !== void 0 && _loader2.parseTextSync || (_loader3 = loader) !== null && _loader3 !== void 0 && _loader3.parseText) {
-    loader.text = true;
-  }
-
-  if (!loader.text) {
-    loader.binary = true;
-  }
-
-  return loader;
+exports.isLoaderObject = isLoaderObject;
+function normalizeLoader(loader) {
+    // This error is fairly easy to trigger by mixing up import statements etc
+    // So we make an exception and add a developer error message for this case
+    // To help new users from getting stuck here
+    (0, loader_utils_1.assert)(loader, 'null loader');
+    (0, loader_utils_1.assert)(isLoaderObject(loader), 'invalid loader');
+    // NORMALIZE [LOADER, OPTIONS] => LOADER
+    // If [loader, options], create a new loaders object with options merged in
+    let options;
+    if (Array.isArray(loader)) {
+        options = loader[1];
+        loader = loader[0];
+        loader = {
+            ...loader,
+            options: { ...loader.options, ...options }
+        };
+    }
+    // NORMALIZE text and binary flags
+    // Ensure at least one of text/binary flags are properly set
+    // @ts-expect-error
+    if (loader?.parseTextSync || loader?.parseText) {
+        loader.text = true;
+    }
+    if (!loader.text) {
+        loader.binary = true;
+    }
+    return loader;
 }
-//# sourceMappingURL=normalize-loader.js.map
+exports.normalizeLoader = normalizeLoader;

package/dist/lib/loader-utils/option-defaults.d.ts

@@ -0,0 +1,20 @@
+import type { LoaderOptions } from '@loaders.gl/loader-utils';
+export declare const DEFAULT_LOADER_OPTIONS: LoaderOptions;
+export declare const REMOVED_LOADER_OPTIONS: {
+    throws: string;
+    dataType: string;
+    uri: string;
+    method: string;
+    headers: string;
+    body: string;
+    mode: string;
+    credentials: string;
+    cache: string;
+    redirect: string;
+    referrer: string;
+    referrerPolicy: string;
+    integrity: string;
+    keepalive: string;
+    signal: string;
+};
+//# sourceMappingURL=option-defaults.d.ts.map

package/dist/lib/loader-utils/option-defaults.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"option-defaults.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/option-defaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAI5D,eAAO,MAAM,sBAAsB,EAAE,aAqBpC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;CAiBlC,CAAC"}

package/dist/lib/loader-utils/option-defaults.js

@@ -1,37 +1,43 @@
-import { ConsoleLog } from './loggers';
-export const DEFAULT_LOADER_OPTIONS = {
-  fetch: null,
-  mimeType: undefined,
-  nothrow: false,
-  log: new ConsoleLog(),
-  CDN: 'https://unpkg.com/@loaders.gl',
-  worker: true,
-  maxConcurrency: 3,
-  maxMobileConcurrency: 1,
-  reuseWorkers: true,
-  _workerType: '',
-  limit: 0,
-  _limitMB: 0,
-  batchSize: 'auto',
-  batchDebounceMs: 0,
-  metadata: false,
-  transforms: []
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.REMOVED_LOADER_OPTIONS = exports.DEFAULT_LOADER_OPTIONS = void 0;
+const loader_utils_1 = require("@loaders.gl/loader-utils");
+const loggers_1 = require("./loggers");
+exports.DEFAULT_LOADER_OPTIONS = {
+    // baseUri
+    fetch: null,
+    mimeType: undefined,
+    nothrow: false,
+    log: new loggers_1.ConsoleLog(),
+    CDN: 'https://unpkg.com/@loaders.gl',
+    worker: true,
+    maxConcurrency: 3,
+    maxMobileConcurrency: 1,
+    reuseWorkers: loader_utils_1.isBrowser,
+    _nodeWorkers: false,
+    _workerType: '',
+    limit: 0,
+    _limitMB: 0,
+    batchSize: 'auto',
+    batchDebounceMs: 0,
+    metadata: false,
+    transforms: []
 };
-export const REMOVED_LOADER_OPTIONS = {
-  throws: 'nothrow',
-  dataType: '(no longer used)',
-  uri: 'baseUri',
-  method: 'fetch.method',
-  headers: 'fetch.headers',
-  body: 'fetch.body',
-  mode: 'fetch.mode',
-  credentials: 'fetch.credentials',
-  cache: 'fetch.cache',
-  redirect: 'fetch.redirect',
-  referrer: 'fetch.referrer',
-  referrerPolicy: 'fetch.referrerPolicy',
-  integrity: 'fetch.integrity',
-  keepalive: 'fetch.keepalive',
-  signal: 'fetch.signal'
+exports.REMOVED_LOADER_OPTIONS = {
+    throws: 'nothrow',
+    dataType: '(no longer used)',
+    uri: 'baseUri',
+    // Warn if fetch options are used on top-level
+    method: 'fetch.method',
+    headers: 'fetch.headers',
+    body: 'fetch.body',
+    mode: 'fetch.mode',
+    credentials: 'fetch.credentials',
+    cache: 'fetch.cache',
+    redirect: 'fetch.redirect',
+    referrer: 'fetch.referrer',
+    referrerPolicy: 'fetch.referrerPolicy',
+    integrity: 'fetch.integrity',
+    keepalive: 'fetch.keepalive',
+    signal: 'fetch.signal'
 };
-//# sourceMappingURL=option-defaults.js.map

package/dist/lib/loader-utils/option-utils.d.ts

@@ -0,0 +1,34 @@
+import type { Loader, LoaderOptions } from '@loaders.gl/loader-utils';
+/**
+ * Global state for loaders.gl. Stored on `global.loaders._state`
+ */
+type GlobalLoaderState = {
+    loaderRegistry: Loader[];
+    globalOptions: LoaderOptions;
+};
+/**
+ * Helper for safely accessing global loaders.gl variables
+ * Wraps initialization of global variable in function to defeat overly aggressive tree-shakers
+ */
+export declare function getGlobalLoaderState(): GlobalLoaderState;
+/**
+ * Store global loader options on the global object to increase chances of cross loaders-version interoperability
+ * NOTE: This use case is not reliable but can help when testing new versions of loaders.gl with existing frameworks
+ * @returns global loader options merged with default loader options
+ */
+export declare const getGlobalLoaderOptions: () => LoaderOptions;
+/**
+ * Set global loader options
+ * @param options
+ */
+export declare function setGlobalOptions(options: LoaderOptions): void;
+/**
+ * Merges options with global opts and loader defaults, also injects baseUri
+ * @param options
+ * @param loader
+ * @param loaders
+ * @param url
+ */
+export declare function normalizeOptions(options: LoaderOptions, loader: Loader, loaders?: Loader[], url?: string): LoaderOptions;
+export {};
+//# sourceMappingURL=option-utils.d.ts.map

package/dist/lib/loader-utils/option-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"option-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/option-utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAKpE;;GAEG;AACH,KAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,iBAAiB,CASxD;AAED;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,QAAO,aAKzC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAI7D;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,GAAG,CAAC,EAAE,MAAM,GACX,aAAa,CAMf"}

package/dist/lib/loader-utils/option-utils.js

@@ -1,140 +1,160 @@
-import { isPureObject, isObject } from '../../javascript-utils/is-type';
-import { fetchFile } from '../fetch/fetch-file';
-import { probeLog, NullLog } from './loggers';
-import { DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS } from './option-defaults';
-export function getGlobalLoaderState() {
-  globalThis.loaders = globalThis.loaders || {};
-  const {
-    loaders
-  } = globalThis;
-  loaders._state = loaders._state || {};
-  return loaders._state;
+"use strict";
+// loaders.gl, MIT license
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeOptions = exports.setGlobalOptions = exports.getGlobalLoaderOptions = exports.getGlobalLoaderState = void 0;
+const is_type_1 = require("../../javascript-utils/is-type");
+const loggers_1 = require("./loggers");
+const option_defaults_1 = require("./option-defaults");
+/**
+ * Helper for safely accessing global loaders.gl variables
+ * Wraps initialization of global variable in function to defeat overly aggressive tree-shakers
+ */
+function getGlobalLoaderState() {
+    // @ts-ignore
+    globalThis.loaders = globalThis.loaders || {};
+    // @ts-ignore
+    const { loaders } = globalThis;
+    // Add _state object to keep separate from modules added to globalThis.loaders
+    loaders._state = loaders._state || {};
+    return loaders._state;
 }
-
+exports.getGlobalLoaderState = getGlobalLoaderState;
+/**
+ * Store global loader options on the global object to increase chances of cross loaders-version interoperability
+ * NOTE: This use case is not reliable but can help when testing new versions of loaders.gl with existing frameworks
+ * @returns global loader options merged with default loader options
+ */
 const getGlobalLoaderOptions = () => {
-  const state = getGlobalLoaderState();
-  state.globalOptions = state.globalOptions || { ...DEFAULT_LOADER_OPTIONS
-  };
-  return state.globalOptions;
+    const state = getGlobalLoaderState();
+    // Ensure all default loader options from this library are mentioned
+    state.globalOptions = state.globalOptions || { ...option_defaults_1.DEFAULT_LOADER_OPTIONS };
+    return state.globalOptions;
 };
-
-export function setGlobalOptions(options) {
-  const state = getGlobalLoaderState();
-  const globalOptions = getGlobalLoaderOptions();
-  state.globalOptions = normalizeOptionsInternal(globalOptions, options);
+exports.getGlobalLoaderOptions = getGlobalLoaderOptions;
+/**
+ * Set global loader options
+ * @param options
+ */
+function setGlobalOptions(options) {
+    const state = getGlobalLoaderState();
+    const globalOptions = (0, exports.getGlobalLoaderOptions)();
+    state.globalOptions = normalizeOptionsInternal(globalOptions, options);
 }
-export function normalizeOptions(options, loader, loaders, url) {
-  loaders = loaders || [];
-  loaders = Array.isArray(loaders) ? loaders : [loaders];
-  validateOptions(options, loaders);
-  return normalizeOptionsInternal(loader, options, url);
+exports.setGlobalOptions = setGlobalOptions;
+/**
+ * Merges options with global opts and loader defaults, also injects baseUri
+ * @param options
+ * @param loader
+ * @param loaders
+ * @param url
+ */
+function normalizeOptions(options, loader, loaders, url) {
+    loaders = loaders || [];
+    loaders = Array.isArray(loaders) ? loaders : [loaders];
+    validateOptions(options, loaders);
+    return normalizeOptionsInternal(loader, options, url);
 }
-export function getFetchFunction(options, context) {
-  const globalOptions = getGlobalLoaderOptions();
-  const fetchOptions = options || globalOptions;
-
-  if (typeof fetchOptions.fetch === 'function') {
-    return fetchOptions.fetch;
-  }
-
-  if (isObject(fetchOptions.fetch)) {
-    return url => fetchFile(url, fetchOptions);
-  }
-
-  if (context !== null && context !== void 0 && context.fetch) {
-    return context === null || context === void 0 ? void 0 : context.fetch;
-  }
-
-  return fetchFile;
-}
-
+exports.normalizeOptions = normalizeOptions;
+// VALIDATE OPTIONS
+/**
+ * Warn for unsupported options
+ * @param options
+ * @param loaders
+ */
 function validateOptions(options, loaders) {
-  validateOptionsObject(options, null, DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS, loaders);
-
-  for (const loader of loaders) {
-    const idOptions = options && options[loader.id] || {};
-    const loaderOptions = loader.options && loader.options[loader.id] || {};
-    const deprecatedOptions = loader.deprecatedOptions && loader.deprecatedOptions[loader.id] || {};
-    validateOptionsObject(idOptions, loader.id, loaderOptions, deprecatedOptions, loaders);
-  }
+    // Check top level options
+    validateOptionsObject(options, null, option_defaults_1.DEFAULT_LOADER_OPTIONS, option_defaults_1.REMOVED_LOADER_OPTIONS, loaders);
+    for (const loader of loaders) {
+        // Get the scoped, loader specific options from the user supplied options
+        const idOptions = (options && options[loader.id]) || {};
+        // Get scoped, loader specific default and deprecated options from the selected loader
+        const loaderOptions = (loader.options && loader.options[loader.id]) || {};
+        const deprecatedOptions = (loader.deprecatedOptions && loader.deprecatedOptions[loader.id]) || {};
+        // Validate loader specific options
+        validateOptionsObject(idOptions, loader.id, loaderOptions, deprecatedOptions, loaders);
+    }
 }
-
+// eslint-disable-next-line max-params, complexity
 function validateOptionsObject(options, id, defaultOptions, deprecatedOptions, loaders) {
-  const loaderName = id || 'Top level';
-  const prefix = id ? "".concat(id, ".") : '';
-
-  for (const key in options) {
-    const isSubOptions = !id && isObject(options[key]);
-    const isBaseUriOption = key === 'baseUri' && !id;
-    const isWorkerUrlOption = key === 'workerUrl' && id;
-
-    if (!(key in defaultOptions) && !isBaseUriOption && !isWorkerUrlOption) {
-      if (key in deprecatedOptions) {
-        probeLog.warn("".concat(loaderName, " loader option '").concat(prefix).concat(key, "' no longer supported, use '").concat(deprecatedOptions[key], "'"))();
-      } else if (!isSubOptions) {
-        const suggestion = findSimilarOption(key, loaders);
-        probeLog.warn("".concat(loaderName, " loader option '").concat(prefix).concat(key, "' not recognized. ").concat(suggestion))();
-      }
+    const loaderName = id || 'Top level';
+    const prefix = id ? `${id}.` : '';
+    for (const key in options) {
+        // If top level option value is an object it could options for a loader, so ignore
+        const isSubOptions = !id && (0, is_type_1.isObject)(options[key]);
+        const isBaseUriOption = key === 'baseUri' && !id;
+        const isWorkerUrlOption = key === 'workerUrl' && id;
+        // <loader>.workerUrl requires special handling as it is now auto-generated and no longer specified as a default option.
+        if (!(key in defaultOptions) && !isBaseUriOption && !isWorkerUrlOption) {
+            // Issue deprecation warnings
+            if (key in deprecatedOptions) {
+                loggers_1.probeLog.warn(`${loaderName} loader option \'${prefix}${key}\' no longer supported, use \'${deprecatedOptions[key]}\'`)();
+            }
+            else if (!isSubOptions) {
+                const suggestion = findSimilarOption(key, loaders);
+                loggers_1.probeLog.warn(`${loaderName} loader option \'${prefix}${key}\' not recognized. ${suggestion}`)();
+            }
+        }
     }
-  }
 }
-
 function findSimilarOption(optionKey, loaders) {
-  const lowerCaseOptionKey = optionKey.toLowerCase();
-  let bestSuggestion = '';
-
-  for (const loader of loaders) {
-    for (const key in loader.options) {
-      if (optionKey === key) {
-        return "Did you mean '".concat(loader.id, ".").concat(key, "'?");
-      }
-
-      const lowerCaseKey = key.toLowerCase();
-      const isPartialMatch = lowerCaseOptionKey.startsWith(lowerCaseKey) || lowerCaseKey.startsWith(lowerCaseOptionKey);
-
-      if (isPartialMatch) {
-        bestSuggestion = bestSuggestion || "Did you mean '".concat(loader.id, ".").concat(key, "'?");
-      }
+    const lowerCaseOptionKey = optionKey.toLowerCase();
+    let bestSuggestion = '';
+    for (const loader of loaders) {
+        for (const key in loader.options) {
+            if (optionKey === key) {
+                return `Did you mean \'${loader.id}.${key}\'?`;
+            }
+            const lowerCaseKey = key.toLowerCase();
+            const isPartialMatch = lowerCaseOptionKey.startsWith(lowerCaseKey) || lowerCaseKey.startsWith(lowerCaseOptionKey);
+            if (isPartialMatch) {
+                bestSuggestion = bestSuggestion || `Did you mean \'${loader.id}.${key}\'?`;
+            }
+        }
     }
-  }
-
-  return bestSuggestion;
+    return bestSuggestion;
 }
-
 function normalizeOptionsInternal(loader, options, url) {
-  const loaderDefaultOptions = loader.options || {};
-  const mergedOptions = { ...loaderDefaultOptions
-  };
-  addUrlOptions(mergedOptions, url);
-
-  if (mergedOptions.log === null) {
-    mergedOptions.log = new NullLog();
-  }
-
-  mergeNestedFields(mergedOptions, getGlobalLoaderOptions());
-  mergeNestedFields(mergedOptions, options);
-  return mergedOptions;
+    const loaderDefaultOptions = loader.options || {};
+    const mergedOptions = { ...loaderDefaultOptions };
+    addUrlOptions(mergedOptions, url);
+    // LOGGING: options.log can be set to `null` to defeat logging
+    if (mergedOptions.log === null) {
+        mergedOptions.log = new loggers_1.NullLog();
+    }
+    mergeNestedFields(mergedOptions, (0, exports.getGlobalLoaderOptions)());
+    mergeNestedFields(mergedOptions, options);
+    return mergedOptions;
 }
-
+// Merge nested options objects
 function mergeNestedFields(mergedOptions, options) {
-  for (const key in options) {
-    if (key in options) {
-      const value = options[key];
-
-      if (isPureObject(value) && isPureObject(mergedOptions[key])) {
-        mergedOptions[key] = { ...mergedOptions[key],
-          ...options[key]
-        };
-      } else {
-        mergedOptions[key] = options[key];
-      }
+    for (const key in options) {
+        // Check for nested options
+        // object in options => either no key in defaultOptions or object in defaultOptions
+        if (key in options) {
+            const value = options[key];
+            if ((0, is_type_1.isPureObject)(value) && (0, is_type_1.isPureObject)(mergedOptions[key])) {
+                mergedOptions[key] = {
+                    ...mergedOptions[key],
+                    ...options[key]
+                };
+            }
+            else {
+                mergedOptions[key] = options[key];
+            }
+        }
+        // else: No need to merge nested opts, and the initial merge already copied over the nested options
     }
-  }
 }
-
+/**
+ * Harvest information from the url
+ * @deprecated This is mainly there to support a hack in the GLTFLoader
+ * TODO - baseUri should be a directory, i.e. remove file component from baseUri
+ * TODO - extract extension?
+ * TODO - extract query parameters?
+ * TODO - should these be injected on context instead of options?
+ */
 function addUrlOptions(options, url) {
-  if (url && !('baseUri' in options)) {
-    options.baseUri = url;
-  }
+    if (url && !('baseUri' in options)) {
+        options.baseUri = url;
+    }
 }
-//# sourceMappingURL=option-utils.js.map

package/dist/lib/progress/fetch-progress.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Intercepts the Response stream and creates a new Response
+ */
+export default function fetchProgress(response: Response | Promise<Response>, onProgress: any, // TODO better callback types
+onDone?: () => void, onError?: () => void): Promise<Response>;
+//# sourceMappingURL=fetch-progress.d.ts.map

package/dist/lib/progress/fetch-progress.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetch-progress.d.ts","sourceRoot":"","sources":["../../../src/lib/progress/fetch-progress.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,wBAA8B,aAAa,CACzC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,EACtC,UAAU,EAAE,GAAG,EAAE,6BAA6B;AAC9C,MAAM,aAAW,EACjB,OAAO,aAAW,qBA+BnB"}

package/dist/lib/progress/fetch-progress.js

@@ -1,61 +1,59 @@
-export default async function fetchProgress(response, onProgress, onDone = () => {}, onError = () => {}) {
-  response = await response;
-
-  if (!response.ok) {
-    return response;
-  }
-
-  const body = response.body;
-
-  if (!body) {
-    return response;
-  }
-
-  const contentLength = response.headers.get('content-length') || 0;
-  const totalBytes = contentLength && parseInt(contentLength);
-
-  if (!(contentLength > 0)) {
-    return response;
-  }
-
-  if (typeof ReadableStream === 'undefined' || !body.getReader) {
-    return response;
-  }
-
-  const progressStream = new ReadableStream({
-    async start(controller) {
-      const reader = body.getReader();
-      await read(controller, reader, 0, totalBytes, onProgress, onDone, onError);
+"use strict";
+// Forked from github AnthumChris/fetch-progress-indicators under MIT license
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * Intercepts the Response stream and creates a new Response
+ */
+async function fetchProgress(response, onProgress, // TODO better callback types
+onDone = () => { }, onError = () => { }) {
+    response = await response;
+    if (!response.ok) {
+        // ERROR checking needs to be done separately
+        return response;
     }
-
-  });
-  return new Response(progressStream);
+    const body = response.body;
+    if (!body) {
+        // 'ReadableStream not yet supported in this browser.
+        return response;
+    }
+    const contentLength = response.headers.get('content-length') || 0;
+    const totalBytes = contentLength ? parseInt(contentLength) : 0;
+    if (!(totalBytes > 0)) {
+        return response;
+    }
+    // Currently override only implemented in browser
+    if (typeof ReadableStream === 'undefined' || !body.getReader) {
+        return response;
+    }
+    // Create a new stream that invisbly wraps original stream
+    const progressStream = new ReadableStream({
+        async start(controller) {
+            const reader = body.getReader();
+            await read(controller, reader, 0, totalBytes, onProgress, onDone, onError);
+        }
+    });
+    return new Response(progressStream);
 }
-
+exports.default = fetchProgress;
+// Forward to original streams controller
+// TODO - this causes a crazy deep "async stack"... rewrite as async iterator?
+// eslint-disable-next-line max-params
 async function read(controller, reader, loadedBytes, totalBytes, onProgress, onDone, onError) {
-  try {
-    const {
-      done,
-      value
-    } = await reader.read();
-
-    if (done) {
-      onDone();
-      controller.close();
-      return;
+    try {
+        const { done, value } = await reader.read();
+        if (done) {
+            onDone();
+            controller.close();
+            return;
+        }
+        loadedBytes += value.byteLength;
+        const percent = Math.round((loadedBytes / totalBytes) * 100);
+        onProgress(percent, { loadedBytes, totalBytes });
+        controller.enqueue(value);
+        await read(controller, reader, loadedBytes, totalBytes, onProgress, onDone, onError);
+    }
+    catch (error) {
+        controller.error(error);
+        onError(error);
     }
-
-    loadedBytes += value.byteLength;
-    const percent = Math.round(loadedBytes / totalBytes * 100);
-    onProgress(percent, {
-      loadedBytes,
-      totalBytes
-    });
-    controller.enqueue(value);
-    await read(controller, reader, loadedBytes, totalBytes, onProgress, onDone, onError);
-  } catch (error) {
-    controller.error(error);
-    onError(error);
-  }
 }
-//# sourceMappingURL=fetch-progress.js.map