@loaders.gl/core 3.0.12 → 3.0.13

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

@@ -1,21 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isLoaderObject = isLoaderObject;
 exports.normalizeLoader = normalizeLoader;
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _loaderUtils = require("@loaders.gl/loader-utils");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
 function isLoaderObject(loader) {
   var _loader;
 
@@ -27,7 +19,7 @@ function isLoaderObject(loader) {
     loader = loader[0];
   }
 
-  var hasExtensions = Array.isArray((_loader = loader) === null || _loader === void 0 ? void 0 : _loader.extensions);
+  const hasExtensions = Array.isArray((_loader = loader) === null || _loader === void 0 ? void 0 : _loader.extensions);
   return hasExtensions;
 }
 
@@ -36,14 +28,16 @@ function normalizeLoader(loader) {
 
   (0, _loaderUtils.assert)(loader, 'null loader');
   (0, _loaderUtils.assert)(isLoaderObject(loader), 'invalid loader');
-  var options;
+  let options;
 
   if (Array.isArray(loader)) {
     options = loader[1];
     loader = loader[0];
-    loader = _objectSpread(_objectSpread({}, loader), {}, {
-      options: _objectSpread(_objectSpread({}, loader.options), options)
-    });
+    loader = { ...loader,
+      options: { ...loader.options,
+        ...options
+      }
+    };
   }
 
   if ((_loader2 = loader) !== null && _loader2 !== void 0 && _loader2.parseTextSync || (_loader3 = loader) !== null && _loader3 !== void 0 && _loader3.parseText) {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/lib/loader-utils/normalize-loader.ts"],"names":["isLoaderObject","loader","Array","isArray","hasExtensions","extensions","normalizeLoader","options","parseTextSync","parseText","text","binary"],"mappings":";;;;;;;;;;;;AACA;;;;;;AAEO,SAASA,cAAT,CAAwBC,MAAxB,EAA+C;AAAA;;AACpD,MAAI,CAACA,MAAL,EAAa;AACX,WAAO,KAAP;AACD;;AAED,MAAIC,KAAK,CAACC,OAAN,CAAcF,MAAd,CAAJ,EAA2B;AACzBA,IAAAA,MAAM,GAAGA,MAAM,CAAC,CAAD,CAAf;AACD;;AAED,MAAMG,aAAa,GAAGF,KAAK,CAACC,OAAN,YAAcF,MAAd,4CAAc,QAAQI,UAAtB,CAAtB;AAWA,SAAOD,aAAP;AACD;;AAEM,SAASE,eAAT,CAAyBL,MAAzB,EAAiD;AAAA;;AAItD,2BAAOA,MAAP,EAAe,aAAf;AACA,2BAAOD,cAAc,CAACC,MAAD,CAArB,EAA+B,gBAA/B;AAKA,MAAIM,OAAJ;;AACA,MAAIL,KAAK,CAACC,OAAN,CAAcF,MAAd,CAAJ,EAA2B;AACzBM,IAAAA,OAAO,GAAGN,MAAM,CAAC,CAAD,CAAhB;AACAA,IAAAA,MAAM,GAAGA,MAAM,CAAC,CAAD,CAAf;AACAA,IAAAA,MAAM,mCACDA,MADC;AAEJM,MAAAA,OAAO,kCAAMN,MAAM,CAACM,OAAb,GAAyBA,OAAzB;AAFH,MAAN;AAID;;AAMD,MAAI,YAAAN,MAAM,UAAN,oCAAQO,aAAR,gBAAyBP,MAAzB,qCAAyB,SAAQQ,SAArC,EAAgD;AAC9CR,IAAAA,MAAM,CAACS,IAAP,GAAc,IAAd;AACD;;AAED,MAAI,CAACT,MAAM,CAACS,IAAZ,EAAkB;AAChBT,IAAAA,MAAM,CAACU,MAAP,GAAgB,IAAhB;AACD;;AAED,SAAOV,MAAP;AACD","sourcesContent":["import type {Loader} from '@loaders.gl/loader-utils';\nimport {assert} from '@loaders.gl/loader-utils';\n\nexport function isLoaderObject(loader?: any): boolean {\n  if (!loader) {\n    return false;\n  }\n\n  if (Array.isArray(loader)) {\n    loader = loader[0];\n  }\n\n  const hasExtensions = Array.isArray(loader?.extensions);\n\n  /* Now handled by types and worker loaders do not have these\n  let hasParser =\n    loader.parseTextSync ||\n    loader.parseSync ||\n    loader.parse ||\n    loader.parseStream || // TODO Remove, Replace with parseInBatches\n    loader.parseInBatches;\n  */\n\n  return hasExtensions;\n}\n\nexport function normalizeLoader(loader: Loader): Loader {\n  // This error is fairly easy to trigger by mixing up import statements etc\n  // So we make an exception and add a developer error message for this case\n  // To help new users from getting stuck here\n  assert(loader, 'null loader');\n  assert(isLoaderObject(loader), 'invalid loader');\n\n  // NORMALIZE [LOADER, OPTIONS] => LOADER\n\n  // If [loader, options], create a new loaders object with options merged in\n  let options;\n  if (Array.isArray(loader)) {\n    options = loader[1];\n    loader = loader[0];\n    loader = {\n      ...loader,\n      options: {...loader.options, ...options}\n    };\n  }\n\n  // NORMALIZE text and binary flags\n  // Ensure at least one of text/binary flags are properly set\n\n  // @ts-expect-error\n  if (loader?.parseTextSync || loader?.parseText) {\n    loader.text = true;\n  }\n\n  if (!loader.text) {\n    loader.binary = true;\n  }\n\n  return loader;\n}\n"],"file":"normalize-loader.js"}
+{"version":3,"sources":["../../../../src/lib/loader-utils/normalize-loader.ts"],"names":["isLoaderObject","loader","Array","isArray","hasExtensions","extensions","normalizeLoader","options","parseTextSync","parseText","text","binary"],"mappings":";;;;;;;;AACA;;AAEO,SAASA,cAAT,CAAwBC,MAAxB,EAA+C;AAAA;;AACpD,MAAI,CAACA,MAAL,EAAa;AACX,WAAO,KAAP;AACD;;AAED,MAAIC,KAAK,CAACC,OAAN,CAAcF,MAAd,CAAJ,EAA2B;AACzBA,IAAAA,MAAM,GAAGA,MAAM,CAAC,CAAD,CAAf;AACD;;AAED,QAAMG,aAAa,GAAGF,KAAK,CAACC,OAAN,YAAcF,MAAd,4CAAc,QAAQI,UAAtB,CAAtB;AAWA,SAAOD,aAAP;AACD;;AAEM,SAASE,eAAT,CAAyBL,MAAzB,EAAiD;AAAA;;AAItD,2BAAOA,MAAP,EAAe,aAAf;AACA,2BAAOD,cAAc,CAACC,MAAD,CAArB,EAA+B,gBAA/B;AAKA,MAAIM,OAAJ;;AACA,MAAIL,KAAK,CAACC,OAAN,CAAcF,MAAd,CAAJ,EAA2B;AACzBM,IAAAA,OAAO,GAAGN,MAAM,CAAC,CAAD,CAAhB;AACAA,IAAAA,MAAM,GAAGA,MAAM,CAAC,CAAD,CAAf;AACAA,IAAAA,MAAM,GAAG,EACP,GAAGA,MADI;AAEPM,MAAAA,OAAO,EAAE,EAAC,GAAGN,MAAM,CAACM,OAAX;AAAoB,WAAGA;AAAvB;AAFF,KAAT;AAID;;AAMD,MAAI,YAAAN,MAAM,UAAN,oCAAQO,aAAR,gBAAyBP,MAAzB,qCAAyB,SAAQQ,SAArC,EAAgD;AAC9CR,IAAAA,MAAM,CAACS,IAAP,GAAc,IAAd;AACD;;AAED,MAAI,CAACT,MAAM,CAACS,IAAZ,EAAkB;AAChBT,IAAAA,MAAM,CAACU,MAAP,GAAgB,IAAhB;AACD;;AAED,SAAOV,MAAP;AACD","sourcesContent":["import type {Loader} from '@loaders.gl/loader-utils';\nimport {assert} from '@loaders.gl/loader-utils';\n\nexport function isLoaderObject(loader?: any): boolean {\n  if (!loader) {\n    return false;\n  }\n\n  if (Array.isArray(loader)) {\n    loader = loader[0];\n  }\n\n  const hasExtensions = Array.isArray(loader?.extensions);\n\n  /* Now handled by types and worker loaders do not have these\n  let hasParser =\n    loader.parseTextSync ||\n    loader.parseSync ||\n    loader.parse ||\n    loader.parseStream || // TODO Remove, Replace with parseInBatches\n    loader.parseInBatches;\n  */\n\n  return hasExtensions;\n}\n\nexport function normalizeLoader(loader: Loader): Loader {\n  // This error is fairly easy to trigger by mixing up import statements etc\n  // So we make an exception and add a developer error message for this case\n  // To help new users from getting stuck here\n  assert(loader, 'null loader');\n  assert(isLoaderObject(loader), 'invalid loader');\n\n  // NORMALIZE [LOADER, OPTIONS] => LOADER\n\n  // If [loader, options], create a new loaders object with options merged in\n  let options;\n  if (Array.isArray(loader)) {\n    options = loader[1];\n    loader = loader[0];\n    loader = {\n      ...loader,\n      options: {...loader.options, ...options}\n    };\n  }\n\n  // NORMALIZE text and binary flags\n  // Ensure at least one of text/binary flags are properly set\n\n  // @ts-expect-error\n  if (loader?.parseTextSync || loader?.parseText) {\n    loader.text = true;\n  }\n\n  if (!loader.text) {\n    loader.binary = true;\n  }\n\n  return loader;\n}\n"],"file":"normalize-loader.js"}

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

@@ -7,7 +7,7 @@ exports.REMOVED_LOADER_OPTIONS = exports.DEFAULT_LOADER_OPTIONS = void 0;
 
 var _loggers = require("./loggers");
 
-var DEFAULT_LOADER_OPTIONS = {
+const DEFAULT_LOADER_OPTIONS = {
   fetch: null,
   mimeType: undefined,
   nothrow: false,
@@ -26,7 +26,7 @@ var DEFAULT_LOADER_OPTIONS = {
   transforms: []
 };
 exports.DEFAULT_LOADER_OPTIONS = DEFAULT_LOADER_OPTIONS;
-var REMOVED_LOADER_OPTIONS = {
+const REMOVED_LOADER_OPTIONS = {
   throws: 'nothrow',
   dataType: '(no longer used)',
   uri: 'baseUri',

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/lib/loader-utils/option-defaults.ts"],"names":["DEFAULT_LOADER_OPTIONS","fetch","mimeType","undefined","nothrow","log","ConsoleLog","CDN","worker","maxConcurrency","maxMobileConcurrency","reuseWorkers","_workerType","limit","_limitMB","batchSize","batchDebounceMs","metadata","transforms","REMOVED_LOADER_OPTIONS","throws","dataType","uri","method","headers","body","mode","credentials","cache","redirect","referrer","referrerPolicy","integrity","keepalive","signal"],"mappings":";;;;;;;AACA;;AAEO,IAAMA,sBAAqC,GAAG;AAEnDC,EAAAA,KAAK,EAAE,IAF4C;AAGnDC,EAAAA,QAAQ,EAAEC,SAHyC;AAInDC,EAAAA,OAAO,EAAE,KAJ0C;AAKnDC,EAAAA,GAAG,EAAE,IAAIC,mBAAJ,EAL8C;AAOnDC,EAAAA,GAAG,EAAE,+BAP8C;AAQnDC,EAAAA,MAAM,EAAE,IAR2C;AASnDC,EAAAA,cAAc,EAAE,CATmC;AAUnDC,EAAAA,oBAAoB,EAAE,CAV6B;AAWnDC,EAAAA,YAAY,EAAE,IAXqC;AAYnDC,EAAAA,WAAW,EAAE,EAZsC;AAcnDC,EAAAA,KAAK,EAAE,CAd4C;AAenDC,EAAAA,QAAQ,EAAE,CAfyC;AAgBnDC,EAAAA,SAAS,EAAE,MAhBwC;AAiBnDC,EAAAA,eAAe,EAAE,CAjBkC;AAkBnDC,EAAAA,QAAQ,EAAE,KAlByC;AAmBnDC,EAAAA,UAAU,EAAE;AAnBuC,CAA9C;;AAsBA,IAAMC,sBAAsB,GAAG;AACpCC,EAAAA,MAAM,EAAE,SAD4B;AAEpCC,EAAAA,QAAQ,EAAE,kBAF0B;AAGpCC,EAAAA,GAAG,EAAE,SAH+B;AAKpCC,EAAAA,MAAM,EAAE,cAL4B;AAMpCC,EAAAA,OAAO,EAAE,eAN2B;AAOpCC,EAAAA,IAAI,EAAE,YAP8B;AAQpCC,EAAAA,IAAI,EAAE,YAR8B;AASpCC,EAAAA,WAAW,EAAE,mBATuB;AAUpCC,EAAAA,KAAK,EAAE,aAV6B;AAWpCC,EAAAA,QAAQ,EAAE,gBAX0B;AAYpCC,EAAAA,QAAQ,EAAE,gBAZ0B;AAapCC,EAAAA,cAAc,EAAE,sBAboB;AAcpCC,EAAAA,SAAS,EAAE,iBAdyB;AAepCC,EAAAA,SAAS,EAAE,iBAfyB;AAgBpCC,EAAAA,MAAM,EAAE;AAhB4B,CAA/B","sourcesContent":["import type {LoaderOptions} from '@loaders.gl/loader-utils';\nimport {ConsoleLog} from './loggers';\n\nexport const DEFAULT_LOADER_OPTIONS: LoaderOptions = {\n  // baseUri\n  fetch: null,\n  mimeType: undefined,\n  nothrow: false,\n  log: new ConsoleLog(), // A probe.gl compatible (`log.log()()` syntax) that just logs to console\n\n  CDN: 'https://unpkg.com/@loaders.gl',\n  worker: true, // By default, use worker if provided by loader.\n  maxConcurrency: 3, // How many worker instances should be created for each loader.\n  maxMobileConcurrency: 1, // How many worker instances should be created for each loader on mobile devices.\n  reuseWorkers: true, // By default reuse workers,\n  _workerType: '', // 'test' to use locally generated workers\n\n  limit: 0,\n  _limitMB: 0,\n  batchSize: 'auto',\n  batchDebounceMs: 0,\n  metadata: false, // TODO - currently only implemented for parseInBatches, adds initial metadata batch,\n  transforms: []\n};\n\nexport const REMOVED_LOADER_OPTIONS = {\n  throws: 'nothrow',\n  dataType: '(no longer used)',\n  uri: 'baseUri',\n  // Warn if fetch options are used on top-level\n  method: 'fetch.method',\n  headers: 'fetch.headers',\n  body: 'fetch.body',\n  mode: 'fetch.mode',\n  credentials: 'fetch.credentials',\n  cache: 'fetch.cache',\n  redirect: 'fetch.redirect',\n  referrer: 'fetch.referrer',\n  referrerPolicy: 'fetch.referrerPolicy',\n  integrity: 'fetch.integrity',\n  keepalive: 'fetch.keepalive',\n  signal: 'fetch.signal'\n};\n"],"file":"option-defaults.js"}
+{"version":3,"sources":["../../../../src/lib/loader-utils/option-defaults.ts"],"names":["DEFAULT_LOADER_OPTIONS","fetch","mimeType","undefined","nothrow","log","ConsoleLog","CDN","worker","maxConcurrency","maxMobileConcurrency","reuseWorkers","_workerType","limit","_limitMB","batchSize","batchDebounceMs","metadata","transforms","REMOVED_LOADER_OPTIONS","throws","dataType","uri","method","headers","body","mode","credentials","cache","redirect","referrer","referrerPolicy","integrity","keepalive","signal"],"mappings":";;;;;;;AACA;;AAEO,MAAMA,sBAAqC,GAAG;AAEnDC,EAAAA,KAAK,EAAE,IAF4C;AAGnDC,EAAAA,QAAQ,EAAEC,SAHyC;AAInDC,EAAAA,OAAO,EAAE,KAJ0C;AAKnDC,EAAAA,GAAG,EAAE,IAAIC,mBAAJ,EAL8C;AAOnDC,EAAAA,GAAG,EAAE,+BAP8C;AAQnDC,EAAAA,MAAM,EAAE,IAR2C;AASnDC,EAAAA,cAAc,EAAE,CATmC;AAUnDC,EAAAA,oBAAoB,EAAE,CAV6B;AAWnDC,EAAAA,YAAY,EAAE,IAXqC;AAYnDC,EAAAA,WAAW,EAAE,EAZsC;AAcnDC,EAAAA,KAAK,EAAE,CAd4C;AAenDC,EAAAA,QAAQ,EAAE,CAfyC;AAgBnDC,EAAAA,SAAS,EAAE,MAhBwC;AAiBnDC,EAAAA,eAAe,EAAE,CAjBkC;AAkBnDC,EAAAA,QAAQ,EAAE,KAlByC;AAmBnDC,EAAAA,UAAU,EAAE;AAnBuC,CAA9C;;AAsBA,MAAMC,sBAAsB,GAAG;AACpCC,EAAAA,MAAM,EAAE,SAD4B;AAEpCC,EAAAA,QAAQ,EAAE,kBAF0B;AAGpCC,EAAAA,GAAG,EAAE,SAH+B;AAKpCC,EAAAA,MAAM,EAAE,cAL4B;AAMpCC,EAAAA,OAAO,EAAE,eAN2B;AAOpCC,EAAAA,IAAI,EAAE,YAP8B;AAQpCC,EAAAA,IAAI,EAAE,YAR8B;AASpCC,EAAAA,WAAW,EAAE,mBATuB;AAUpCC,EAAAA,KAAK,EAAE,aAV6B;AAWpCC,EAAAA,QAAQ,EAAE,gBAX0B;AAYpCC,EAAAA,QAAQ,EAAE,gBAZ0B;AAapCC,EAAAA,cAAc,EAAE,sBAboB;AAcpCC,EAAAA,SAAS,EAAE,iBAdyB;AAepCC,EAAAA,SAAS,EAAE,iBAfyB;AAgBpCC,EAAAA,MAAM,EAAE;AAhB4B,CAA/B","sourcesContent":["import type {LoaderOptions} from '@loaders.gl/loader-utils';\nimport {ConsoleLog} from './loggers';\n\nexport const DEFAULT_LOADER_OPTIONS: LoaderOptions = {\n  // baseUri\n  fetch: null,\n  mimeType: undefined,\n  nothrow: false,\n  log: new ConsoleLog(), // A probe.gl compatible (`log.log()()` syntax) that just logs to console\n\n  CDN: 'https://unpkg.com/@loaders.gl',\n  worker: true, // By default, use worker if provided by loader.\n  maxConcurrency: 3, // How many worker instances should be created for each loader.\n  maxMobileConcurrency: 1, // How many worker instances should be created for each loader on mobile devices.\n  reuseWorkers: true, // By default reuse workers,\n  _workerType: '', // 'test' to use locally generated workers\n\n  limit: 0,\n  _limitMB: 0,\n  batchSize: 'auto',\n  batchDebounceMs: 0,\n  metadata: false, // TODO - currently only implemented for parseInBatches, adds initial metadata batch,\n  transforms: []\n};\n\nexport const REMOVED_LOADER_OPTIONS = {\n  throws: 'nothrow',\n  dataType: '(no longer used)',\n  uri: 'baseUri',\n  // Warn if fetch options are used on top-level\n  method: 'fetch.method',\n  headers: 'fetch.headers',\n  body: 'fetch.body',\n  mode: 'fetch.mode',\n  credentials: 'fetch.credentials',\n  cache: 'fetch.cache',\n  redirect: 'fetch.redirect',\n  referrer: 'fetch.referrer',\n  referrerPolicy: 'fetch.referrerPolicy',\n  integrity: 'fetch.integrity',\n  keepalive: 'fetch.keepalive',\n  signal: 'fetch.signal'\n};\n"],"file":"option-defaults.js"}

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

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -10,8 +8,6 @@ exports.setGlobalOptions = setGlobalOptions;
 exports.normalizeOptions = normalizeOptions;
 exports.getFetchFunction = getFetchFunction;
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _loaderUtils = require("@loaders.gl/loader-utils");
 
 var _isType = require("../../javascript-utils/is-type");
@@ -22,32 +18,25 @@ var _loggers = require("./loggers");
 
 var _optionDefaults = require("./option-defaults");
 
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
 function getGlobalLoaderState() {
   _loaderUtils.global.loaders = _loaderUtils.global.loaders || {};
-  var loaders = _loaderUtils.global.loaders;
+  const {
+    loaders
+  } = _loaderUtils.global;
   loaders._state = loaders._state || {};
   return loaders._state;
 }
 
-var getGlobalLoaderOptions = function getGlobalLoaderOptions() {
-  var state = getGlobalLoaderState();
-  state.globalOptions = state.globalOptions || _objectSpread({}, _optionDefaults.DEFAULT_LOADER_OPTIONS);
+const getGlobalLoaderOptions = () => {
+  const state = getGlobalLoaderState();
+  state.globalOptions = state.globalOptions || { ..._optionDefaults.DEFAULT_LOADER_OPTIONS
+  };
   return state.globalOptions;
 };
 
 function setGlobalOptions(options) {
-  var state = getGlobalLoaderState();
-  var globalOptions = getGlobalLoaderOptions();
+  const state = getGlobalLoaderState();
+  const globalOptions = getGlobalLoaderOptions();
   state.globalOptions = normalizeOptionsInternal(globalOptions, options);
 }
 
@@ -59,17 +48,15 @@ function normalizeOptions(options, loader, loaders, url) {
 }
 
 function getFetchFunction(options, context) {
-  var globalOptions = getGlobalLoaderOptions();
-  var fetchOptions = options || globalOptions;
+  const globalOptions = getGlobalLoaderOptions();
+  const fetchOptions = options || globalOptions;
 
   if (typeof fetchOptions.fetch === 'function') {
     return fetchOptions.fetch;
   }
 
   if ((0, _isType.isObject)(fetchOptions.fetch)) {
-    return function (url) {
-      return (0, _fetchFile.fetchFile)(url, fetchOptions);
-    };
+    return url => (0, _fetchFile.fetchFile)(url, fetchOptions);
   }
 
   if (context !== null && context !== void 0 && context.fetch) {
@@ -82,84 +69,61 @@ function getFetchFunction(options, context) {
 function validateOptions(options, loaders) {
   validateOptionsObject(options, null, _optionDefaults.DEFAULT_LOADER_OPTIONS, _optionDefaults.REMOVED_LOADER_OPTIONS, loaders);
 
-  var _iterator = _createForOfIteratorHelper(loaders),
-      _step;
-
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var loader = _step.value;
-      var idOptions = options && options[loader.id] || {};
-      var loaderOptions = loader.options && loader.options[loader.id] || {};
-      var deprecatedOptions = loader.deprecatedOptions && loader.deprecatedOptions[loader.id] || {};
-      validateOptionsObject(idOptions, loader.id, loaderOptions, deprecatedOptions, loaders);
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
+  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);
   }
 }
 
 function validateOptionsObject(options, id, defaultOptions, deprecatedOptions, loaders) {
-  var loaderName = id || 'Top level';
-  var prefix = id ? "".concat(id, ".") : '';
+  const loaderName = id || 'Top level';
+  const prefix = id ? "".concat(id, ".") : '';
 
-  for (var _key in options) {
-    var isSubOptions = !id && (0, _isType.isObject)(options[_key]);
-    var isBaseUriOption = _key === 'baseUri' && !id;
-    var isWorkerUrlOption = _key === 'workerUrl' && id;
+  for (const key in options) {
+    const isSubOptions = !id && (0, _isType.isObject)(options[key]);
+    const isBaseUriOption = key === 'baseUri' && !id;
+    const isWorkerUrlOption = key === 'workerUrl' && id;
 
-    if (!(_key in defaultOptions) && !isBaseUriOption && !isWorkerUrlOption) {
-      if (_key in deprecatedOptions) {
-        _loggers.probeLog.warn("".concat(loaderName, " loader option '").concat(prefix).concat(_key, "' no longer supported, use '").concat(deprecatedOptions[_key], "'"))();
+    if (!(key in defaultOptions) && !isBaseUriOption && !isWorkerUrlOption) {
+      if (key in deprecatedOptions) {
+        _loggers.probeLog.warn("".concat(loaderName, " loader option '").concat(prefix).concat(key, "' no longer supported, use '").concat(deprecatedOptions[key], "'"))();
       } else if (!isSubOptions) {
-        var suggestion = findSimilarOption(_key, loaders);
+        const suggestion = findSimilarOption(key, loaders);
 
-        _loggers.probeLog.warn("".concat(loaderName, " loader option '").concat(prefix).concat(_key, "' not recognized. ").concat(suggestion))();
+        _loggers.probeLog.warn("".concat(loaderName, " loader option '").concat(prefix).concat(key, "' not recognized. ").concat(suggestion))();
       }
     }
   }
 }
 
 function findSimilarOption(optionKey, loaders) {
-  var lowerCaseOptionKey = optionKey.toLowerCase();
-  var bestSuggestion = '';
-
-  var _iterator2 = _createForOfIteratorHelper(loaders),
-      _step2;
-
-  try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var loader = _step2.value;
-
-      for (var _key2 in loader.options) {
-        if (optionKey === _key2) {
-          return "Did you mean '".concat(loader.id, ".").concat(_key2, "'?");
-        }
+  const lowerCaseOptionKey = optionKey.toLowerCase();
+  let bestSuggestion = '';
 
-        var lowerCaseKey = _key2.toLowerCase();
+  for (const loader of loaders) {
+    for (const key in loader.options) {
+      if (optionKey === key) {
+        return "Did you mean '".concat(loader.id, ".").concat(key, "'?");
+      }
 
-        var isPartialMatch = lowerCaseOptionKey.startsWith(lowerCaseKey) || lowerCaseKey.startsWith(lowerCaseOptionKey);
+      const lowerCaseKey = key.toLowerCase();
+      const isPartialMatch = lowerCaseOptionKey.startsWith(lowerCaseKey) || lowerCaseKey.startsWith(lowerCaseOptionKey);
 
-        if (isPartialMatch) {
-          bestSuggestion = bestSuggestion || "Did you mean '".concat(loader.id, ".").concat(_key2, "'?");
-        }
+      if (isPartialMatch) {
+        bestSuggestion = bestSuggestion || "Did you mean '".concat(loader.id, ".").concat(key, "'?");
       }
     }
-  } catch (err) {
-    _iterator2.e(err);
-  } finally {
-    _iterator2.f();
   }
 
   return bestSuggestion;
 }
 
 function normalizeOptionsInternal(loader, options, url) {
-  var loaderDefaultOptions = loader.options || {};
-
-  var mergedOptions = _objectSpread({}, loaderDefaultOptions);
-
+  const loaderDefaultOptions = loader.options || {};
+  const mergedOptions = { ...loaderDefaultOptions
+  };
   addUrlOptions(mergedOptions, url);
 
   if (mergedOptions.log === null) {
@@ -172,14 +136,16 @@ function normalizeOptionsInternal(loader, options, url) {
 }
 
 function mergeNestedFields(mergedOptions, options) {
-  for (var _key3 in options) {
-    if (_key3 in options) {
-      var value = options[_key3];
-
-      if ((0, _isType.isPureObject)(value) && (0, _isType.isPureObject)(mergedOptions[_key3])) {
-        mergedOptions[_key3] = _objectSpread(_objectSpread({}, mergedOptions[_key3]), options[_key3]);
+  for (const key in options) {
+    if (key in options) {
+      const value = options[key];
+
+      if ((0, _isType.isPureObject)(value) && (0, _isType.isPureObject)(mergedOptions[key])) {
+        mergedOptions[key] = { ...mergedOptions[key],
+          ...options[key]
+        };
       } else {
-        mergedOptions[_key3] = options[_key3];
+        mergedOptions[key] = options[key];
       }
     }
   }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/lib/loader-utils/option-utils.ts"],"names":["getGlobalLoaderState","global","loaders","_state","getGlobalLoaderOptions","state","globalOptions","DEFAULT_LOADER_OPTIONS","setGlobalOptions","options","normalizeOptionsInternal","normalizeOptions","loader","url","Array","isArray","validateOptions","getFetchFunction","context","fetchOptions","fetch","fetchFile","validateOptionsObject","REMOVED_LOADER_OPTIONS","idOptions","id","loaderOptions","deprecatedOptions","defaultOptions","loaderName","prefix","key","isSubOptions","isBaseUriOption","isWorkerUrlOption","probeLog","warn","suggestion","findSimilarOption","optionKey","lowerCaseOptionKey","toLowerCase","bestSuggestion","lowerCaseKey","isPartialMatch","startsWith","loaderDefaultOptions","mergedOptions","addUrlOptions","log","NullLog","mergeNestedFields","value","baseUri"],"mappings":";;;;;;;;;;;;;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;;;;;;;AAaO,SAASA,oBAAT,GAAmD;AAExDC,sBAAOC,OAAP,GAAiBD,oBAAOC,OAAP,IAAkB,EAAnC;AAEA,MAAOA,OAAP,GAAkBD,mBAAlB,CAAOC,OAAP;AAGAA,EAAAA,OAAO,CAACC,MAAR,GAAiBD,OAAO,CAACC,MAAR,IAAkB,EAAnC;AACA,SAAOD,OAAO,CAACC,MAAf;AACD;;AAID,IAAMC,sBAAsB,GAAG,SAAzBA,sBAAyB,GAAM;AACnC,MAAMC,KAAK,GAAGL,oBAAoB,EAAlC;AAEAK,EAAAA,KAAK,CAACC,aAAN,GAAsBD,KAAK,CAACC,aAAN,sBAA2BC,sCAA3B,CAAtB;AACA,SAAOF,KAAK,CAACC,aAAb;AACD,CALD;;AAWO,SAASE,gBAAT,CAA0BC,OAA1B,EAAiD;AACtD,MAAMJ,KAAK,GAAGL,oBAAoB,EAAlC;AACA,MAAMM,aAAa,GAAGF,sBAAsB,EAA5C;AACAC,EAAAA,KAAK,CAACC,aAAN,GAAsBI,wBAAwB,CAACJ,aAAD,EAAgBG,OAAhB,CAA9C;AACD;;AASM,SAASE,gBAAT,CACLF,OADK,EAELG,MAFK,EAGLV,OAHK,EAILW,GAJK,EAKG;AACRX,EAAAA,OAAO,GAAGA,OAAO,IAAI,EAArB;AACAA,EAAAA,OAAO,GAAGY,KAAK,CAACC,OAAN,CAAcb,OAAd,IAAyBA,OAAzB,GAAmC,CAACA,OAAD,CAA7C;AAEAc,EAAAA,eAAe,CAACP,OAAD,EAAUP,OAAV,CAAf;AACA,SAAOQ,wBAAwB,CAACE,MAAD,EAASH,OAAT,EAAkBI,GAAlB,CAA/B;AACD;;AAOM,SAASI,gBAAT,CACLR,OADK,EAELS,OAFK,EAGL;AACA,MAAMZ,aAAa,GAAGF,sBAAsB,EAA5C;AAEA,MAAMe,YAAY,GAAGV,OAAO,IAAIH,aAAhC;;AAGA,MAAI,OAAOa,YAAY,CAACC,KAApB,KAA8B,UAAlC,EAA8C;AAC5C,WAAOD,YAAY,CAACC,KAApB;AACD;;AAGD,MAAI,sBAASD,YAAY,CAACC,KAAtB,CAAJ,EAAkC;AAChC,WAAO,UAACP,GAAD;AAAA,aAAS,0BAAUA,GAAV,EAAeM,YAAf,CAAT;AAAA,KAAP;AACD;;AAGD,MAAID,OAAJ,aAAIA,OAAJ,eAAIA,OAAO,CAAEE,KAAb,EAAoB;AAClB,WAAOF,OAAP,aAAOA,OAAP,uBAAOA,OAAO,CAAEE,KAAhB;AACD;;AAGD,SAAOC,oBAAP;AACD;;AASD,SAASL,eAAT,CAAyBP,OAAzB,EAAiDP,OAAjD,EAAoE;AAElEoB,EAAAA,qBAAqB,CAACb,OAAD,EAAU,IAAV,EAAgBF,sCAAhB,EAAwCgB,sCAAxC,EAAgErB,OAAhE,CAArB;;AAFkE,6CAG7CA,OAH6C;AAAA;;AAAA;AAGlE,wDAA8B;AAAA,UAAnBU,MAAmB;AAE5B,UAAMY,SAAS,GAAIf,OAAO,IAAIA,OAAO,CAACG,MAAM,CAACa,EAAR,CAAnB,IAAmC,EAArD;AAGA,UAAMC,aAAa,GAAId,MAAM,CAACH,OAAP,IAAkBG,MAAM,CAACH,OAAP,CAAeG,MAAM,CAACa,EAAtB,CAAnB,IAAiD,EAAvE;AACA,UAAME,iBAAiB,GACpBf,MAAM,CAACe,iBAAP,IAA4Bf,MAAM,CAACe,iBAAP,CAAyBf,MAAM,CAACa,EAAhC,CAA7B,IAAqE,EADvE;AAIAH,MAAAA,qBAAqB,CAACE,SAAD,EAAYZ,MAAM,CAACa,EAAnB,EAAuBC,aAAvB,EAAsCC,iBAAtC,EAAyDzB,OAAzD,CAArB;AACD;AAdiE;AAAA;AAAA;AAAA;AAAA;AAenE;;AAGD,SAASoB,qBAAT,CACEb,OADF,EAEEgB,EAFF,EAGEG,cAHF,EAIED,iBAJF,EAKEzB,OALF,EAME;AACA,MAAM2B,UAAU,GAAGJ,EAAE,IAAI,WAAzB;AACA,MAAMK,MAAM,GAAGL,EAAE,aAAMA,EAAN,SAAc,EAA/B;;AAEA,OAAK,IAAMM,IAAX,IAAkBtB,OAAlB,EAA2B;AAEzB,QAAMuB,YAAY,GAAG,CAACP,EAAD,IAAO,sBAAShB,OAAO,CAACsB,IAAD,CAAhB,CAA5B;AACA,QAAME,eAAe,GAAGF,IAAG,KAAK,SAAR,IAAqB,CAACN,EAA9C;AACA,QAAMS,iBAAiB,GAAGH,IAAG,KAAK,WAAR,IAAuBN,EAAjD;;AAEA,QAAI,EAAEM,IAAG,IAAIH,cAAT,KAA4B,CAACK,eAA7B,IAAgD,CAACC,iBAArD,EAAwE;AAEtE,UAAIH,IAAG,IAAIJ,iBAAX,EAA8B;AAC5BQ,0BAASC,IAAT,WACKP,UADL,6BACmCC,MADnC,SAC4CC,IAD5C,yCACgFJ,iBAAiB,CAACI,IAAD,CADjG;AAGD,OAJD,MAIO,IAAI,CAACC,YAAL,EAAmB;AACxB,YAAMK,UAAU,GAAGC,iBAAiB,CAACP,IAAD,EAAM7B,OAAN,CAApC;;AACAiC,0BAASC,IAAT,WACKP,UADL,6BACmCC,MADnC,SAC4CC,IAD5C,+BACqEM,UADrE;AAGD;AACF;AACF;AACF;;AAED,SAASC,iBAAT,CAA2BC,SAA3B,EAAsCrC,OAAtC,EAA+C;AAC7C,MAAMsC,kBAAkB,GAAGD,SAAS,CAACE,WAAV,EAA3B;AACA,MAAIC,cAAc,GAAG,EAArB;;AAF6C,8CAGxBxC,OAHwB;AAAA;;AAAA;AAG7C,2DAA8B;AAAA,UAAnBU,MAAmB;;AAC5B,WAAK,IAAMmB,KAAX,IAAkBnB,MAAM,CAACH,OAAzB,EAAkC;AAChC,YAAI8B,SAAS,KAAKR,KAAlB,EAAuB;AACrB,yCAAyBnB,MAAM,CAACa,EAAhC,cAAsCM,KAAtC;AACD;;AACD,YAAMY,YAAY,GAAGZ,KAAG,CAACU,WAAJ,EAArB;;AACA,YAAMG,cAAc,GAClBJ,kBAAkB,CAACK,UAAnB,CAA8BF,YAA9B,KAA+CA,YAAY,CAACE,UAAb,CAAwBL,kBAAxB,CADjD;;AAEA,YAAII,cAAJ,EAAoB;AAClBF,UAAAA,cAAc,GAAGA,cAAc,4BAAsB9B,MAAM,CAACa,EAA7B,cAAmCM,KAAnC,OAA/B;AACD;AACF;AACF;AAf4C;AAAA;AAAA;AAAA;AAAA;;AAgB7C,SAAOW,cAAP;AACD;;AAED,SAAShC,wBAAT,CAAkCE,MAAlC,EAA0CH,OAA1C,EAAmDI,GAAnD,EAAiE;AAC/D,MAAMiC,oBAAoB,GAAGlC,MAAM,CAACH,OAAP,IAAkB,EAA/C;;AAEA,MAAMsC,aAAa,qBAAOD,oBAAP,CAAnB;;AAEAE,EAAAA,aAAa,CAACD,aAAD,EAAgBlC,GAAhB,CAAb;;AAGA,MAAIkC,aAAa,CAACE,GAAd,KAAsB,IAA1B,EAAgC;AAC9BF,IAAAA,aAAa,CAACE,GAAd,GAAoB,IAAIC,gBAAJ,EAApB;AACD;;AAEDC,EAAAA,iBAAiB,CAACJ,aAAD,EAAgB3C,sBAAsB,EAAtC,CAAjB;AACA+C,EAAAA,iBAAiB,CAACJ,aAAD,EAAgBtC,OAAhB,CAAjB;AAEA,SAAOsC,aAAP;AACD;;AAGD,SAASI,iBAAT,CAA2BJ,aAA3B,EAA0CtC,OAA1C,EAAmD;AACjD,OAAK,IAAMsB,KAAX,IAAkBtB,OAAlB,EAA2B;AAGzB,QAAIsB,KAAG,IAAItB,OAAX,EAAoB;AAClB,UAAM2C,KAAK,GAAG3C,OAAO,CAACsB,KAAD,CAArB;;AACA,UAAI,0BAAaqB,KAAb,KAAuB,0BAAaL,aAAa,CAAChB,KAAD,CAA1B,CAA3B,EAA6D;AAC3DgB,QAAAA,aAAa,CAAChB,KAAD,CAAb,mCACKgB,aAAa,CAAChB,KAAD,CADlB,GAEKtB,OAAO,CAACsB,KAAD,CAFZ;AAID,OALD,MAKO;AACLgB,QAAAA,aAAa,CAAChB,KAAD,CAAb,GAAqBtB,OAAO,CAACsB,KAAD,CAA5B;AACD;AACF;AAEF;AACF;;AAOD,SAASiB,aAAT,CAAuBvC,OAAvB,EAAgCI,GAAhC,EAA8C;AAC5C,MAAIA,GAAG,IAAI,EAAE,aAAaJ,OAAf,CAAX,EAAoC;AAClCA,IAAAA,OAAO,CAAC4C,OAAR,GAAkBxC,GAAlB;AACD;AACF","sourcesContent":["import type {Loader, LoaderContext, LoaderOptions} from '@loaders.gl/loader-utils';\nimport {global} from '@loaders.gl/loader-utils';\nimport {isPureObject, isObject} from '../../javascript-utils/is-type';\nimport {fetchFile} from '../fetch/fetch-file';\nimport {probeLog, NullLog} from './loggers';\nimport {DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS} from './option-defaults';\n/**\n * Global state for loaders.gl. Stored on `global.loaders._state`\n */\ntype GlobalLoaderState = {\n  loaderRegistry: Loader[];\n  globalOptions: {[key: string]: any};\n};\n\n/**\n * Helper for safely accessing global loaders.gl variables\n * Wraps initialization of global variable in function to defeat overly aggressive tree-shakers\n */\nexport function getGlobalLoaderState(): GlobalLoaderState {\n  // @ts-ignore\n  global.loaders = global.loaders || {};\n  // @ts-ignore\n  const {loaders} = global;\n\n  // Add _state object to keep separate from modules added to global.loaders\n  loaders._state = loaders._state || {};\n  return loaders._state;\n}\n\n// Store global loader options on the global object to increase chances of cross loaders-version interoperability\n// NOTE: This use case is not reliable but can help when testing new versions of loaders.gl with existing frameworks\nconst getGlobalLoaderOptions = () => {\n  const state = getGlobalLoaderState();\n  // Ensure all default loader options from this library are mentioned\n  state.globalOptions = state.globalOptions || {...DEFAULT_LOADER_OPTIONS};\n  return state.globalOptions;\n};\n\n/**\n * Set global loader options\n * @param options\n */\nexport function setGlobalOptions(options: object): void {\n  const state = getGlobalLoaderState();\n  const globalOptions = getGlobalLoaderOptions();\n  state.globalOptions = normalizeOptionsInternal(globalOptions, options);\n}\n\n/**\n * Merges options with global opts and loader defaults, also injects baseUri\n * @param options\n * @param loader\n * @param loaders\n * @param url\n */\nexport function normalizeOptions(\n  options: object,\n  loader: Loader,\n  loaders?: Loader[],\n  url?: string\n): object {\n  loaders = loaders || [];\n  loaders = Array.isArray(loaders) ? loaders : [loaders];\n\n  validateOptions(options, loaders);\n  return normalizeOptionsInternal(loader, options, url);\n}\n\n/**\n * Gets the current fetch function from options and context\n * @param options\n * @param context\n */\nexport function getFetchFunction(\n  options?: LoaderOptions,\n  context?: Omit<LoaderContext, 'fetch'> & Partial<Pick<LoaderContext, 'fetch'>>\n) {\n  const globalOptions = getGlobalLoaderOptions();\n\n  const fetchOptions = options || globalOptions;\n\n  // options.fetch can be a function\n  if (typeof fetchOptions.fetch === 'function') {\n    return fetchOptions.fetch;\n  }\n\n  // options.fetch can be an options object\n  if (isObject(fetchOptions.fetch)) {\n    return (url) => fetchFile(url, fetchOptions);\n  }\n\n  // else refer to context (from parent loader) if available\n  if (context?.fetch) {\n    return context?.fetch;\n  }\n\n  // else return the default fetch function\n  return fetchFile;\n}\n\n// VALIDATE OPTIONS\n\n/**\n * Warn for unsupported options\n * @param options\n * @param loaders\n */\nfunction validateOptions(options: LoaderOptions, loaders: Loader[]) {\n  // Check top level options\n  validateOptionsObject(options, null, DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS, loaders);\n  for (const loader of loaders) {\n    // Get the scoped, loader specific options from the user supplied options\n    const idOptions = (options && options[loader.id]) || {};\n\n    // Get scoped, loader specific default and deprecated options from the selected loader\n    const loaderOptions = (loader.options && loader.options[loader.id]) || {};\n    const deprecatedOptions =\n      (loader.deprecatedOptions && loader.deprecatedOptions[loader.id]) || {};\n\n    // Validate loader specific options\n    validateOptionsObject(idOptions, loader.id, loaderOptions, deprecatedOptions, loaders);\n  }\n}\n\n// eslint-disable-next-line max-params, complexity\nfunction validateOptionsObject(\n  options,\n  id: string | null,\n  defaultOptions,\n  deprecatedOptions,\n  loaders: Loader[]\n) {\n  const loaderName = id || 'Top level';\n  const prefix = id ? `${id}.` : '';\n\n  for (const key in options) {\n    // If top level option value is an object it could options for a loader, so ignore\n    const isSubOptions = !id && isObject(options[key]);\n    const isBaseUriOption = key === 'baseUri' && !id;\n    const isWorkerUrlOption = key === 'workerUrl' && id;\n    // <loader>.workerUrl requires special handling as it is now auto-generated and no longer specified as a default option.\n    if (!(key in defaultOptions) && !isBaseUriOption && !isWorkerUrlOption) {\n      // Issue deprecation warnings\n      if (key in deprecatedOptions) {\n        probeLog.warn(\n          `${loaderName} loader option \\'${prefix}${key}\\' no longer supported, use \\'${deprecatedOptions[key]}\\'`\n        )();\n      } else if (!isSubOptions) {\n        const suggestion = findSimilarOption(key, loaders);\n        probeLog.warn(\n          `${loaderName} loader option \\'${prefix}${key}\\' not recognized. ${suggestion}`\n        )();\n      }\n    }\n  }\n}\n\nfunction findSimilarOption(optionKey, loaders) {\n  const lowerCaseOptionKey = optionKey.toLowerCase();\n  let bestSuggestion = '';\n  for (const loader of loaders) {\n    for (const key in loader.options) {\n      if (optionKey === key) {\n        return `Did you mean \\'${loader.id}.${key}\\'?`;\n      }\n      const lowerCaseKey = key.toLowerCase();\n      const isPartialMatch =\n        lowerCaseOptionKey.startsWith(lowerCaseKey) || lowerCaseKey.startsWith(lowerCaseOptionKey);\n      if (isPartialMatch) {\n        bestSuggestion = bestSuggestion || `Did you mean \\'${loader.id}.${key}\\'?`;\n      }\n    }\n  }\n  return bestSuggestion;\n}\n\nfunction normalizeOptionsInternal(loader, options, url?: string) {\n  const loaderDefaultOptions = loader.options || {};\n\n  const mergedOptions = {...loaderDefaultOptions};\n\n  addUrlOptions(mergedOptions, url);\n\n  // LOGGING: options.log can be set to `null` to defeat logging\n  if (mergedOptions.log === null) {\n    mergedOptions.log = new NullLog();\n  }\n\n  mergeNestedFields(mergedOptions, getGlobalLoaderOptions());\n  mergeNestedFields(mergedOptions, options);\n\n  return mergedOptions;\n}\n\n// Merge nested options objects\nfunction mergeNestedFields(mergedOptions, options) {\n  for (const key in options) {\n    // Check for nested options\n    // object in options => either no key in defaultOptions or object in defaultOptions\n    if (key in options) {\n      const value = options[key];\n      if (isPureObject(value) && isPureObject(mergedOptions[key])) {\n        mergedOptions[key] = {\n          ...mergedOptions[key],\n          ...options[key]\n        };\n      } else {\n        mergedOptions[key] = options[key];\n      }\n    }\n    // else: No need to merge nested opts, and the initial merge already copied over the nested options\n  }\n}\n\n// Harvest information from the url\n// TODO - baseUri should be a directory, i.e. remove file component from baseUri\n// TODO - extract extension?\n// TODO - extract query parameters?\n// TODO - should these be injected on context instead of options?\nfunction addUrlOptions(options, url?: string) {\n  if (url && !('baseUri' in options)) {\n    options.baseUri = url;\n  }\n}\n"],"file":"option-utils.js"}
+{"version":3,"sources":["../../../../src/lib/loader-utils/option-utils.ts"],"names":["getGlobalLoaderState","global","loaders","_state","getGlobalLoaderOptions","state","globalOptions","DEFAULT_LOADER_OPTIONS","setGlobalOptions","options","normalizeOptionsInternal","normalizeOptions","loader","url","Array","isArray","validateOptions","getFetchFunction","context","fetchOptions","fetch","fetchFile","validateOptionsObject","REMOVED_LOADER_OPTIONS","idOptions","id","loaderOptions","deprecatedOptions","defaultOptions","loaderName","prefix","key","isSubOptions","isBaseUriOption","isWorkerUrlOption","probeLog","warn","suggestion","findSimilarOption","optionKey","lowerCaseOptionKey","toLowerCase","bestSuggestion","lowerCaseKey","isPartialMatch","startsWith","loaderDefaultOptions","mergedOptions","addUrlOptions","log","NullLog","mergeNestedFields","value","baseUri"],"mappings":"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","sourcesContent":["import type {Loader, LoaderContext, LoaderOptions} from '@loaders.gl/loader-utils';\nimport {global} from '@loaders.gl/loader-utils';\nimport {isPureObject, isObject} from '../../javascript-utils/is-type';\nimport {fetchFile} from '../fetch/fetch-file';\nimport {probeLog, NullLog} from './loggers';\nimport {DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS} from './option-defaults';\n/**\n * Global state for loaders.gl. Stored on `global.loaders._state`\n */\ntype GlobalLoaderState = {\n  loaderRegistry: Loader[];\n  globalOptions: {[key: string]: any};\n};\n\n/**\n * Helper for safely accessing global loaders.gl variables\n * Wraps initialization of global variable in function to defeat overly aggressive tree-shakers\n */\nexport function getGlobalLoaderState(): GlobalLoaderState {\n  // @ts-ignore\n  global.loaders = global.loaders || {};\n  // @ts-ignore\n  const {loaders} = global;\n\n  // Add _state object to keep separate from modules added to global.loaders\n  loaders._state = loaders._state || {};\n  return loaders._state;\n}\n\n// Store global loader options on the global object to increase chances of cross loaders-version interoperability\n// NOTE: This use case is not reliable but can help when testing new versions of loaders.gl with existing frameworks\nconst getGlobalLoaderOptions = () => {\n  const state = getGlobalLoaderState();\n  // Ensure all default loader options from this library are mentioned\n  state.globalOptions = state.globalOptions || {...DEFAULT_LOADER_OPTIONS};\n  return state.globalOptions;\n};\n\n/**\n * Set global loader options\n * @param options\n */\nexport function setGlobalOptions(options: object): void {\n  const state = getGlobalLoaderState();\n  const globalOptions = getGlobalLoaderOptions();\n  state.globalOptions = normalizeOptionsInternal(globalOptions, options);\n}\n\n/**\n * Merges options with global opts and loader defaults, also injects baseUri\n * @param options\n * @param loader\n * @param loaders\n * @param url\n */\nexport function normalizeOptions(\n  options: object,\n  loader: Loader,\n  loaders?: Loader[],\n  url?: string\n): object {\n  loaders = loaders || [];\n  loaders = Array.isArray(loaders) ? loaders : [loaders];\n\n  validateOptions(options, loaders);\n  return normalizeOptionsInternal(loader, options, url);\n}\n\n/**\n * Gets the current fetch function from options and context\n * @param options\n * @param context\n */\nexport function getFetchFunction(\n  options?: LoaderOptions,\n  context?: Omit<LoaderContext, 'fetch'> & Partial<Pick<LoaderContext, 'fetch'>>\n) {\n  const globalOptions = getGlobalLoaderOptions();\n\n  const fetchOptions = options || globalOptions;\n\n  // options.fetch can be a function\n  if (typeof fetchOptions.fetch === 'function') {\n    return fetchOptions.fetch;\n  }\n\n  // options.fetch can be an options object\n  if (isObject(fetchOptions.fetch)) {\n    return (url) => fetchFile(url, fetchOptions);\n  }\n\n  // else refer to context (from parent loader) if available\n  if (context?.fetch) {\n    return context?.fetch;\n  }\n\n  // else return the default fetch function\n  return fetchFile;\n}\n\n// VALIDATE OPTIONS\n\n/**\n * Warn for unsupported options\n * @param options\n * @param loaders\n */\nfunction validateOptions(options: LoaderOptions, loaders: Loader[]) {\n  // Check top level options\n  validateOptionsObject(options, null, DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS, loaders);\n  for (const loader of loaders) {\n    // Get the scoped, loader specific options from the user supplied options\n    const idOptions = (options && options[loader.id]) || {};\n\n    // Get scoped, loader specific default and deprecated options from the selected loader\n    const loaderOptions = (loader.options && loader.options[loader.id]) || {};\n    const deprecatedOptions =\n      (loader.deprecatedOptions && loader.deprecatedOptions[loader.id]) || {};\n\n    // Validate loader specific options\n    validateOptionsObject(idOptions, loader.id, loaderOptions, deprecatedOptions, loaders);\n  }\n}\n\n// eslint-disable-next-line max-params, complexity\nfunction validateOptionsObject(\n  options,\n  id: string | null,\n  defaultOptions,\n  deprecatedOptions,\n  loaders: Loader[]\n) {\n  const loaderName = id || 'Top level';\n  const prefix = id ? `${id}.` : '';\n\n  for (const key in options) {\n    // If top level option value is an object it could options for a loader, so ignore\n    const isSubOptions = !id && isObject(options[key]);\n    const isBaseUriOption = key === 'baseUri' && !id;\n    const isWorkerUrlOption = key === 'workerUrl' && id;\n    // <loader>.workerUrl requires special handling as it is now auto-generated and no longer specified as a default option.\n    if (!(key in defaultOptions) && !isBaseUriOption && !isWorkerUrlOption) {\n      // Issue deprecation warnings\n      if (key in deprecatedOptions) {\n        probeLog.warn(\n          `${loaderName} loader option \\'${prefix}${key}\\' no longer supported, use \\'${deprecatedOptions[key]}\\'`\n        )();\n      } else if (!isSubOptions) {\n        const suggestion = findSimilarOption(key, loaders);\n        probeLog.warn(\n          `${loaderName} loader option \\'${prefix}${key}\\' not recognized. ${suggestion}`\n        )();\n      }\n    }\n  }\n}\n\nfunction findSimilarOption(optionKey, loaders) {\n  const lowerCaseOptionKey = optionKey.toLowerCase();\n  let bestSuggestion = '';\n  for (const loader of loaders) {\n    for (const key in loader.options) {\n      if (optionKey === key) {\n        return `Did you mean \\'${loader.id}.${key}\\'?`;\n      }\n      const lowerCaseKey = key.toLowerCase();\n      const isPartialMatch =\n        lowerCaseOptionKey.startsWith(lowerCaseKey) || lowerCaseKey.startsWith(lowerCaseOptionKey);\n      if (isPartialMatch) {\n        bestSuggestion = bestSuggestion || `Did you mean \\'${loader.id}.${key}\\'?`;\n      }\n    }\n  }\n  return bestSuggestion;\n}\n\nfunction normalizeOptionsInternal(loader, options, url?: string) {\n  const loaderDefaultOptions = loader.options || {};\n\n  const mergedOptions = {...loaderDefaultOptions};\n\n  addUrlOptions(mergedOptions, url);\n\n  // LOGGING: options.log can be set to `null` to defeat logging\n  if (mergedOptions.log === null) {\n    mergedOptions.log = new NullLog();\n  }\n\n  mergeNestedFields(mergedOptions, getGlobalLoaderOptions());\n  mergeNestedFields(mergedOptions, options);\n\n  return mergedOptions;\n}\n\n// Merge nested options objects\nfunction mergeNestedFields(mergedOptions, options) {\n  for (const key in options) {\n    // Check for nested options\n    // object in options => either no key in defaultOptions or object in defaultOptions\n    if (key in options) {\n      const value = options[key];\n      if (isPureObject(value) && isPureObject(mergedOptions[key])) {\n        mergedOptions[key] = {\n          ...mergedOptions[key],\n          ...options[key]\n        };\n      } else {\n        mergedOptions[key] = options[key];\n      }\n    }\n    // else: No need to merge nested opts, and the initial merge already copied over the nested options\n  }\n}\n\n// Harvest information from the url\n// TODO - baseUri should be a directory, i.e. remove file component from baseUri\n// TODO - extract extension?\n// TODO - extract query parameters?\n// TODO - should these be injected on context instead of options?\nfunction addUrlOptions(options, url?: string) {\n  if (url && !('baseUri' in options)) {\n    options.baseUri = url;\n  }\n}\n"],"file":"option-utils.js"}

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

@@ -1,169 +1,68 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = fetchProgress;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-function fetchProgress(_x, _x2) {
-  return _fetchProgress.apply(this, arguments);
-}
-
-function _fetchProgress() {
-  _fetchProgress = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(response, onProgress) {
-    var onDone,
-        onError,
-        body,
-        contentLength,
-        totalBytes,
-        progressStream,
-        _args2 = arguments;
-    return _regenerator.default.wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            onDone = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : function () {};
-            onError = _args2.length > 3 && _args2[3] !== undefined ? _args2[3] : function () {};
-            _context2.next = 4;
-            return response;
-
-          case 4:
-            response = _context2.sent;
-
-            if (response.ok) {
-              _context2.next = 7;
-              break;
-            }
-
-            return _context2.abrupt("return", response);
-
-          case 7:
-            body = response.body;
-
-            if (body) {
-              _context2.next = 10;
-              break;
-            }
-
-            return _context2.abrupt("return", response);
+async function fetchProgress(response, onProgress, onDone = () => {}, onError = () => {}) {
+  response = await response;
 
-          case 10:
-            contentLength = response.headers.get('content-length') || 0;
-            totalBytes = contentLength && parseInt(contentLength);
+  if (!response.ok) {
+    return response;
+  }
 
-            if (contentLength > 0) {
-              _context2.next = 14;
-              break;
-            }
+  const body = response.body;
 
-            return _context2.abrupt("return", response);
+  if (!body) {
+    return response;
+  }
 
-          case 14:
-            if (!(typeof ReadableStream === 'undefined' || !body.getReader)) {
-              _context2.next = 16;
-              break;
-            }
+  const contentLength = response.headers.get('content-length') || 0;
+  const totalBytes = contentLength && parseInt(contentLength);
 
-            return _context2.abrupt("return", response);
+  if (!(contentLength > 0)) {
+    return response;
+  }
 
-          case 16:
-            progressStream = new ReadableStream({
-              start: function start(controller) {
-                return (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee() {
-                  var reader;
-                  return _regenerator.default.wrap(function _callee$(_context) {
-                    while (1) {
-                      switch (_context.prev = _context.next) {
-                        case 0:
-                          reader = body.getReader();
-                          _context.next = 3;
-                          return read(controller, reader, 0, totalBytes, onProgress, onDone, onError);
+  if (typeof ReadableStream === 'undefined' || !body.getReader) {
+    return response;
+  }
 
-                        case 3:
-                        case "end":
-                          return _context.stop();
-                      }
-                    }
-                  }, _callee);
-                }))();
-              }
-            });
-            return _context2.abrupt("return", new Response(progressStream));
+  const progressStream = new ReadableStream({
+    async start(controller) {
+      const reader = body.getReader();
+      await read(controller, reader, 0, totalBytes, onProgress, onDone, onError);
+    }
 
-          case 18:
-          case "end":
-            return _context2.stop();
-        }
-      }
-    }, _callee2);
-  }));
-  return _fetchProgress.apply(this, arguments);
+  });
+  return new Response(progressStream);
 }
 
-function read(_x3, _x4, _x5, _x6, _x7, _x8, _x9) {
-  return _read.apply(this, arguments);
-}
-
-function _read() {
-  _read = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(controller, reader, loadedBytes, totalBytes, onProgress, onDone, onError) {
-    var _yield$reader$read, done, value, percent;
-
-    return _regenerator.default.wrap(function _callee3$(_context3) {
-      while (1) {
-        switch (_context3.prev = _context3.next) {
-          case 0:
-            _context3.prev = 0;
-            _context3.next = 3;
-            return reader.read();
-
-          case 3:
-            _yield$reader$read = _context3.sent;
-            done = _yield$reader$read.done;
-            value = _yield$reader$read.value;
-
-            if (!done) {
-              _context3.next = 10;
-              break;
-            }
-
-            onDone();
-            controller.close();
-            return _context3.abrupt("return");
-
-          case 10:
-            loadedBytes += value.byteLength;
-            percent = Math.round(loadedBytes / totalBytes * 100);
-            onProgress(percent, {
-              loadedBytes: loadedBytes,
-              totalBytes: totalBytes
-            });
-            controller.enqueue(value);
-            _context3.next = 16;
-            return read(controller, reader, loadedBytes, totalBytes, onProgress, onDone, onError);
-
-          case 16:
-            _context3.next = 22;
-            break;
-
-          case 18:
-            _context3.prev = 18;
-            _context3.t0 = _context3["catch"](0);
-            controller.error(_context3.t0);
-            onError(_context3.t0);
-
-          case 22:
-          case "end":
-            return _context3.stop();
-        }
-      }
-    }, _callee3, null, [[0, 18]]);
-  }));
-  return _read.apply(this, arguments);
+async function read(controller, reader, loadedBytes, totalBytes, onProgress, onDone, onError) {
+  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);
+  }
 }
 //# sourceMappingURL=fetch-progress.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/lib/progress/fetch-progress.ts"],"names":["fetchProgress","response","onProgress","onDone","onError","ok","body","contentLength","headers","get","totalBytes","parseInt","ReadableStream","getReader","progressStream","start","controller","reader","read","Response","loadedBytes","done","value","close","byteLength","percent","Math","round","enqueue","error"],"mappings":";;;;;;;;;;;;;SAK8BA,a;;;;;6EAAf,kBACbC,QADa,EAEbC,UAFa;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGbC,YAAAA,MAHa,8DAGJ,YAAM,CAAE,CAHJ;AAIbC,YAAAA,OAJa,8DAIH,YAAM,CAAE,CAJL;AAAA;AAAA,mBAMIH,QANJ;;AAAA;AAMbA,YAAAA,QANa;;AAAA,gBAORA,QAAQ,CAACI,EAPD;AAAA;AAAA;AAAA;;AAAA,8CASJJ,QATI;;AAAA;AAWPK,YAAAA,IAXO,GAWAL,QAAQ,CAACK,IAXT;;AAAA,gBAYRA,IAZQ;AAAA;AAAA;AAAA;;AAAA,8CAcJL,QAdI;;AAAA;AAgBPM,YAAAA,aAhBO,GAgBSN,QAAQ,CAACO,OAAT,CAAiBC,GAAjB,CAAqB,gBAArB,KAA0C,CAhBnD;AAiBPC,YAAAA,UAjBO,GAiBMH,aAAa,IAAII,QAAQ,CAACJ,aAAD,CAjB/B;;AAAA,gBAkBPA,aAAa,GAAG,CAlBT;AAAA;AAAA;AAAA;;AAAA,8CAmBJN,QAnBI;;AAAA;AAAA,kBAsBT,OAAOW,cAAP,KAA0B,WAA1B,IAAyC,CAACN,IAAI,CAACO,SAtBtC;AAAA;AAAA;AAAA;;AAAA,8CAuBJZ,QAvBI;;AAAA;AA2BPa,YAAAA,cA3BO,GA2BU,IAAIF,cAAJ,CAAmB;AAClCG,cAAAA,KADkC,iBAC5BC,UAD4B,EAChB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAChBC,0BAAAA,MADgB,GACPX,IAAI,CAACO,SAAL,EADO;AAAA;AAAA,iCAEhBK,IAAI,CAACF,UAAD,EAAaC,MAAb,EAAqB,CAArB,EAAwBP,UAAxB,EAAoCR,UAApC,EAAgDC,MAAhD,EAAwDC,OAAxD,CAFY;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGvB;AAJuC,aAAnB,CA3BV;AAAA,8CAkCN,IAAIe,QAAJ,CAAaL,cAAb,CAlCM;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G;;;;SAwCAI,I;;;;;oEAAf,kBAAoBF,UAApB,EAAgCC,MAAhC,EAAwCG,WAAxC,EAAqDV,UAArD,EAAiER,UAAjE,EAA6EC,MAA7E,EAAqFC,OAArF;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAEgCa,MAAM,CAACC,IAAP,EAFhC;;AAAA;AAAA;AAEWG,YAAAA,IAFX,sBAEWA,IAFX;AAEiBC,YAAAA,KAFjB,sBAEiBA,KAFjB;;AAAA,iBAGQD,IAHR;AAAA;AAAA;AAAA;;AAIMlB,YAAAA,MAAM;AACNa,YAAAA,UAAU,CAACO,KAAX;AALN;;AAAA;AAQIH,YAAAA,WAAW,IAAIE,KAAK,CAACE,UAArB;AACMC,YAAAA,OATV,GASoBC,IAAI,CAACC,KAAL,CAAYP,WAAW,GAAGV,UAAf,GAA6B,GAAxC,CATpB;AAUIR,YAAAA,UAAU,CAACuB,OAAD,EAAU;AAACL,cAAAA,WAAW,EAAXA,WAAD;AAAcV,cAAAA,UAAU,EAAVA;AAAd,aAAV,CAAV;AACAM,YAAAA,UAAU,CAACY,OAAX,CAAmBN,KAAnB;AAXJ;AAAA,mBAYUJ,IAAI,CAACF,UAAD,EAAaC,MAAb,EAAqBG,WAArB,EAAkCV,UAAlC,EAA8CR,UAA9C,EAA0DC,MAA1D,EAAkEC,OAAlE,CAZd;;AAAA;AAAA;AAAA;;AAAA;AAAA;AAAA;AAcIY,YAAAA,UAAU,CAACa,KAAX;AACAzB,YAAAA,OAAO,cAAP;;AAfJ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G","sourcesContent":["// Forked from github AnthumChris/fetch-progress-indicators under MIT license\n\n/**\n * Intercepts the Response stream and creates a new Response\n */\nexport default async function fetchProgress(\n  response: Response | Promise<Response>,\n  onProgress: any, // TODO better callback types\n  onDone = () => {},\n  onError = () => {}\n) {\n  response = await response;\n  if (!response.ok) {\n    // ERROR checking needs to be done separately\n    return response;\n  }\n  const body = response.body;\n  if (!body) {\n    // 'ReadableStream not yet supported in this browser.\n    return response;\n  }\n  const contentLength = response.headers.get('content-length') || 0;\n  const totalBytes = contentLength && parseInt(contentLength);\n  if (!(contentLength > 0)) {\n    return response;\n  }\n  // Currently override only implemented in browser\n  if (typeof ReadableStream === 'undefined' || !body.getReader) {\n    return response;\n  }\n\n  // Create a new stream that invisbly wraps original stream\n  const progressStream = new ReadableStream({\n    async start(controller) {\n      const reader = body.getReader();\n      await read(controller, reader, 0, totalBytes, onProgress, onDone, onError);\n    }\n  });\n\n  return new Response(progressStream);\n}\n\n// Forward to original streams controller\n// TODO - this causes a crazy deep \"async stack\"... rewrite as async iterator?\n// eslint-disable-next-line max-params\nasync function read(controller, reader, loadedBytes, totalBytes, onProgress, onDone, onError) {\n  try {\n    const {done, value} = await reader.read();\n    if (done) {\n      onDone();\n      controller.close();\n      return;\n    }\n    loadedBytes += value.byteLength;\n    const percent = Math.round((loadedBytes / totalBytes) * 100);\n    onProgress(percent, {loadedBytes, totalBytes});\n    controller.enqueue(value);\n    await read(controller, reader, loadedBytes, totalBytes, onProgress, onDone, onError);\n  } catch (error) {\n    controller.error(error);\n    onError(error);\n  }\n}\n"],"file":"fetch-progress.js"}
+{"version":3,"sources":["../../../../src/lib/progress/fetch-progress.ts"],"names":["fetchProgress","response","onProgress","onDone","onError","ok","body","contentLength","headers","get","totalBytes","parseInt","ReadableStream","getReader","progressStream","start","controller","reader","read","Response","loadedBytes","done","value","close","byteLength","percent","Math","round","enqueue","error"],"mappings":";;;;;;;AAKe,eAAeA,aAAf,CACbC,QADa,EAEbC,UAFa,EAGbC,MAAM,GAAG,MAAM,CAAE,CAHJ,EAIbC,OAAO,GAAG,MAAM,CAAE,CAJL,EAKb;AACAH,EAAAA,QAAQ,GAAG,MAAMA,QAAjB;;AACA,MAAI,CAACA,QAAQ,CAACI,EAAd,EAAkB;AAEhB,WAAOJ,QAAP;AACD;;AACD,QAAMK,IAAI,GAAGL,QAAQ,CAACK,IAAtB;;AACA,MAAI,CAACA,IAAL,EAAW;AAET,WAAOL,QAAP;AACD;;AACD,QAAMM,aAAa,GAAGN,QAAQ,CAACO,OAAT,CAAiBC,GAAjB,CAAqB,gBAArB,KAA0C,CAAhE;AACA,QAAMC,UAAU,GAAGH,aAAa,IAAII,QAAQ,CAACJ,aAAD,CAA5C;;AACA,MAAI,EAAEA,aAAa,GAAG,CAAlB,CAAJ,EAA0B;AACxB,WAAON,QAAP;AACD;;AAED,MAAI,OAAOW,cAAP,KAA0B,WAA1B,IAAyC,CAACN,IAAI,CAACO,SAAnD,EAA8D;AAC5D,WAAOZ,QAAP;AACD;;AAGD,QAAMa,cAAc,GAAG,IAAIF,cAAJ,CAAmB;AACxC,UAAMG,KAAN,CAAYC,UAAZ,EAAwB;AACtB,YAAMC,MAAM,GAAGX,IAAI,CAACO,SAAL,EAAf;AACA,YAAMK,IAAI,CAACF,UAAD,EAAaC,MAAb,EAAqB,CAArB,EAAwBP,UAAxB,EAAoCR,UAApC,EAAgDC,MAAhD,EAAwDC,OAAxD,CAAV;AACD;;AAJuC,GAAnB,CAAvB;AAOA,SAAO,IAAIe,QAAJ,CAAaL,cAAb,CAAP;AACD;;AAKD,eAAeI,IAAf,CAAoBF,UAApB,EAAgCC,MAAhC,EAAwCG,WAAxC,EAAqDV,UAArD,EAAiER,UAAjE,EAA6EC,MAA7E,EAAqFC,OAArF,EAA8F;AAC5F,MAAI;AACF,UAAM;AAACiB,MAAAA,IAAD;AAAOC,MAAAA;AAAP,QAAgB,MAAML,MAAM,CAACC,IAAP,EAA5B;;AACA,QAAIG,IAAJ,EAAU;AACRlB,MAAAA,MAAM;AACNa,MAAAA,UAAU,CAACO,KAAX;AACA;AACD;;AACDH,IAAAA,WAAW,IAAIE,KAAK,CAACE,UAArB;AACA,UAAMC,OAAO,GAAGC,IAAI,CAACC,KAAL,CAAYP,WAAW,GAAGV,UAAf,GAA6B,GAAxC,CAAhB;AACAR,IAAAA,UAAU,CAACuB,OAAD,EAAU;AAACL,MAAAA,WAAD;AAAcV,MAAAA;AAAd,KAAV,CAAV;AACAM,IAAAA,UAAU,CAACY,OAAX,CAAmBN,KAAnB;AACA,UAAMJ,IAAI,CAACF,UAAD,EAAaC,MAAb,EAAqBG,WAArB,EAAkCV,UAAlC,EAA8CR,UAA9C,EAA0DC,MAA1D,EAAkEC,OAAlE,CAAV;AACD,GAZD,CAYE,OAAOyB,KAAP,EAAc;AACdb,IAAAA,UAAU,CAACa,KAAX,CAAiBA,KAAjB;AACAzB,IAAAA,OAAO,CAACyB,KAAD,CAAP;AACD;AACF","sourcesContent":["// Forked from github AnthumChris/fetch-progress-indicators under MIT license\n\n/**\n * Intercepts the Response stream and creates a new Response\n */\nexport default async function fetchProgress(\n  response: Response | Promise<Response>,\n  onProgress: any, // TODO better callback types\n  onDone = () => {},\n  onError = () => {}\n) {\n  response = await response;\n  if (!response.ok) {\n    // ERROR checking needs to be done separately\n    return response;\n  }\n  const body = response.body;\n  if (!body) {\n    // 'ReadableStream not yet supported in this browser.\n    return response;\n  }\n  const contentLength = response.headers.get('content-length') || 0;\n  const totalBytes = contentLength && parseInt(contentLength);\n  if (!(contentLength > 0)) {\n    return response;\n  }\n  // Currently override only implemented in browser\n  if (typeof ReadableStream === 'undefined' || !body.getReader) {\n    return response;\n  }\n\n  // Create a new stream that invisbly wraps original stream\n  const progressStream = new ReadableStream({\n    async start(controller) {\n      const reader = body.getReader();\n      await read(controller, reader, 0, totalBytes, onProgress, onDone, onError);\n    }\n  });\n\n  return new Response(progressStream);\n}\n\n// Forward to original streams controller\n// TODO - this causes a crazy deep \"async stack\"... rewrite as async iterator?\n// eslint-disable-next-line max-params\nasync function read(controller, reader, loadedBytes, totalBytes, onProgress, onDone, onError) {\n  try {\n    const {done, value} = await reader.read();\n    if (done) {\n      onDone();\n      controller.close();\n      return;\n    }\n    loadedBytes += value.byteLength;\n    const percent = Math.round((loadedBytes / totalBytes) * 100);\n    onProgress(percent, {loadedBytes, totalBytes});\n    controller.enqueue(value);\n    await read(controller, reader, loadedBytes, totalBytes, onProgress, onDone, onError);\n  } catch (error) {\n    controller.error(error);\n    onError(error);\n  }\n}\n"],"file":"fetch-progress.js"}