@loaders.gl/core 3.4.14 → 3.4.15

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

@@ -6,85 +6,55 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.probeLog = exports.NullLog = exports.ConsoleLog = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _log = require("@probe.gl/log");
-var probeLog = new _log.Log({
+const probeLog = new _log.Log({
   id: 'loaders.gl'
 });
 exports.probeLog = probeLog;
-var NullLog = function () {
-  function NullLog() {
-    (0, _classCallCheck2.default)(this, NullLog);
+class NullLog {
+  log() {
+    return () => {};
   }
-  (0, _createClass2.default)(NullLog, [{
-    key: "log",
-    value: function log() {
-      return function () {};
-    }
-  }, {
-    key: "info",
-    value: function info() {
-      return function () {};
-    }
-  }, {
-    key: "warn",
-    value: function warn() {
-      return function () {};
-    }
-  }, {
-    key: "error",
-    value: function error() {
-      return function () {};
-    }
-  }]);
-  return NullLog;
-}();
+  info() {
+    return () => {};
+  }
+  warn() {
+    return () => {};
+  }
+  error() {
+    return () => {};
+  }
+}
 exports.NullLog = NullLog;
-var ConsoleLog = function () {
-  function ConsoleLog() {
-    (0, _classCallCheck2.default)(this, ConsoleLog);
+class ConsoleLog {
+  constructor() {
     (0, _defineProperty2.default)(this, "console", void 0);
     this.console = console;
   }
-  (0, _createClass2.default)(ConsoleLog, [{
-    key: "log",
-    value: function log() {
-      var _this$console$log;
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-      return (_this$console$log = this.console.log).bind.apply(_this$console$log, [this.console].concat(args));
+  log() {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
     }
-  }, {
-    key: "info",
-    value: function info() {
-      var _this$console$info;
-      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-        args[_key2] = arguments[_key2];
-      }
-      return (_this$console$info = this.console.info).bind.apply(_this$console$info, [this.console].concat(args));
+    return this.console.log.bind(this.console, ...args);
+  }
+  info() {
+    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+      args[_key2] = arguments[_key2];
     }
-  }, {
-    key: "warn",
-    value: function warn() {
-      var _this$console$warn;
-      for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-        args[_key3] = arguments[_key3];
-      }
-      return (_this$console$warn = this.console.warn).bind.apply(_this$console$warn, [this.console].concat(args));
+    return this.console.info.bind(this.console, ...args);
+  }
+  warn() {
+    for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+      args[_key3] = arguments[_key3];
     }
-  }, {
-    key: "error",
-    value: function error() {
-      var _this$console$error;
-      for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-        args[_key4] = arguments[_key4];
-      }
-      return (_this$console$error = this.console.error).bind.apply(_this$console$error, [this.console].concat(args));
+    return this.console.warn.bind(this.console, ...args);
+  }
+  error() {
+    for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+      args[_key4] = arguments[_key4];
     }
-  }]);
-  return ConsoleLog;
-}();
+    return this.console.error.bind(this.console, ...args);
+  }
+}
 exports.ConsoleLog = ConsoleLog;
 //# sourceMappingURL=loggers.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"loggers.js","names":["_log","require","probeLog","Log","id","exports","NullLog","_classCallCheck2","default","_createClass2","key","value","log","info","warn","error","ConsoleLog","_defineProperty2","console","_this$console$log","_len","arguments","length","args","Array","_key","bind","apply","concat","_this$console$info","_len2","_key2","_this$console$warn","_len3","_key3","_this$console$error","_len4","_key4"],"sources":["../../../../src/lib/loader-utils/loggers.ts"],"sourcesContent":["// probe.gl Log compatible loggers\nimport {Log} from '@probe.gl/log';\n\nexport const probeLog = new Log({id: 'loaders.gl'});\n\n// Logs nothing\nexport class NullLog {\n  log() {\n    return () => {};\n  }\n  info() {\n    return () => {};\n  }\n  warn() {\n    return () => {};\n  }\n  error() {\n    return () => {};\n  }\n}\n\n// Logs to console\nexport class ConsoleLog {\n  console;\n\n  constructor() {\n    this.console = console; // eslint-disable-line\n  }\n  log(...args) {\n    return this.console.log.bind(this.console, ...args);\n  }\n  info(...args) {\n    return this.console.info.bind(this.console, ...args);\n  }\n  warn(...args) {\n    return this.console.warn.bind(this.console, ...args);\n  }\n  error(...args) {\n    return this.console.error.bind(this.console, ...args);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"loggers.js","names":["_log","require","probeLog","Log","id","exports","NullLog","log","info","warn","error","ConsoleLog","constructor","_defineProperty2","default","console","_len","arguments","length","args","Array","_key","bind","_len2","_key2","_len3","_key3","_len4","_key4"],"sources":["../../../../src/lib/loader-utils/loggers.ts"],"sourcesContent":["// probe.gl Log compatible loggers\nimport {Log} from '@probe.gl/log';\n\nexport const probeLog = new Log({id: 'loaders.gl'});\n\n// Logs nothing\nexport class NullLog {\n  log() {\n    return () => {};\n  }\n  info() {\n    return () => {};\n  }\n  warn() {\n    return () => {};\n  }\n  error() {\n    return () => {};\n  }\n}\n\n// Logs to console\nexport class ConsoleLog {\n  console;\n\n  constructor() {\n    this.console = console; // eslint-disable-line\n  }\n  log(...args) {\n    return this.console.log.bind(this.console, ...args);\n  }\n  info(...args) {\n    return this.console.info.bind(this.console, ...args);\n  }\n  warn(...args) {\n    return this.console.warn.bind(this.console, ...args);\n  }\n  error(...args) {\n    return this.console.error.bind(this.console, ...args);\n  }\n}\n"],"mappings":";;;;;;;;AACA,IAAAA,IAAA,GAAAC,OAAA;AAEO,MAAMC,QAAQ,GAAG,IAAIC,QAAG,CAAC;EAACC,EAAE,EAAE;AAAY,CAAC,CAAC;AAACC,OAAA,CAAAH,QAAA,GAAAA,QAAA;AAG7C,MAAMI,OAAO,CAAC;EACnBC,GAAGA,CAAA,EAAG;IACJ,OAAO,MAAM,CAAC,CAAC;EACjB;EACAC,IAAIA,CAAA,EAAG;IACL,OAAO,MAAM,CAAC,CAAC;EACjB;EACAC,IAAIA,CAAA,EAAG;IACL,OAAO,MAAM,CAAC,CAAC;EACjB;EACAC,KAAKA,CAAA,EAAG;IACN,OAAO,MAAM,CAAC,CAAC;EACjB;AACF;AAACL,OAAA,CAAAC,OAAA,GAAAA,OAAA;AAGM,MAAMK,UAAU,CAAC;EAGtBC,WAAWA,CAAA,EAAG;IAAA,IAAAC,gBAAA,CAAAC,OAAA;IACZ,IAAI,CAACC,OAAO,GAAGA,OAAO;EACxB;EACAR,GAAGA,CAAA,EAAU;IAAA,SAAAS,IAAA,GAAAC,SAAA,CAAAC,MAAA,EAANC,IAAI,OAAAC,KAAA,CAAAJ,IAAA,GAAAK,IAAA,MAAAA,IAAA,GAAAL,IAAA,EAAAK,IAAA;MAAJF,IAAI,CAAAE,IAAA,IAAAJ,SAAA,CAAAI,IAAA;IAAA;IACT,OAAO,IAAI,CAACN,OAAO,CAACR,GAAG,CAACe,IAAI,CAAC,IAAI,CAACP,OAAO,EAAE,GAAGI,IAAI,CAAC;EACrD;EACAX,IAAIA,CAAA,EAAU;IAAA,SAAAe,KAAA,GAAAN,SAAA,CAAAC,MAAA,EAANC,IAAI,OAAAC,KAAA,CAAAG,KAAA,GAAAC,KAAA,MAAAA,KAAA,GAAAD,KAAA,EAAAC,KAAA;MAAJL,IAAI,CAAAK,KAAA,IAAAP,SAAA,CAAAO,KAAA;IAAA;IACV,OAAO,IAAI,CAACT,OAAO,CAACP,IAAI,CAACc,IAAI,CAAC,IAAI,CAACP,OAAO,EAAE,GAAGI,IAAI,CAAC;EACtD;EACAV,IAAIA,CAAA,EAAU;IAAA,SAAAgB,KAAA,GAAAR,SAAA,CAAAC,MAAA,EAANC,IAAI,OAAAC,KAAA,CAAAK,KAAA,GAAAC,KAAA,MAAAA,KAAA,GAAAD,KAAA,EAAAC,KAAA;MAAJP,IAAI,CAAAO,KAAA,IAAAT,SAAA,CAAAS,KAAA;IAAA;IACV,OAAO,IAAI,CAACX,OAAO,CAACN,IAAI,CAACa,IAAI,CAAC,IAAI,CAACP,OAAO,EAAE,GAAGI,IAAI,CAAC;EACtD;EACAT,KAAKA,CAAA,EAAU;IAAA,SAAAiB,KAAA,GAAAV,SAAA,CAAAC,MAAA,EAANC,IAAI,OAAAC,KAAA,CAAAO,KAAA,GAAAC,KAAA,MAAAA,KAAA,GAAAD,KAAA,EAAAC,KAAA;MAAJT,IAAI,CAAAS,KAAA,IAAAX,SAAA,CAAAW,KAAA;IAAA;IACX,OAAO,IAAI,CAACb,OAAO,CAACL,KAAK,CAACY,IAAI,CAAC,IAAI,CAACP,OAAO,EAAE,GAAGI,IAAI,CAAC;EACvD;AACF;AAACd,OAAA,CAAAM,UAAA,GAAAA,UAAA"}

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

@@ -1,15 +1,11 @@
 "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); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function isLoaderObject(loader) {
   var _loader;
   if (!loader) {
@@ -18,20 +14,24 @@ function isLoaderObject(loader) {
   if (Array.isArray(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;
 }
 function normalizeLoader(loader) {
   var _loader2, _loader3;
   (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) {
     loader.text = true;

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

@@ -1 +1 @@
-{"version":3,"file":"normalize-loader.js","names":["_loaderUtils","require","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","isLoaderObject","loader","_loader","Array","isArray","hasExtensions","extensions","normalizeLoader","_loader2","_loader3","assert","options","parseTextSync","parseText","text","binary"],"sources":["../../../../src/lib/loader-utils/normalize-loader.ts"],"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"],"mappings":";;;;;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AAAgD,SAAAC,QAAAC,MAAA,EAAAC,cAAA,QAAAC,IAAA,GAAAC,MAAA,CAAAD,IAAA,CAAAF,MAAA,OAAAG,MAAA,CAAAC,qBAAA,QAAAC,OAAA,GAAAF,MAAA,CAAAC,qBAAA,CAAAJ,MAAA,GAAAC,cAAA,KAAAI,OAAA,GAAAA,OAAA,CAAAC,MAAA,WAAAC,GAAA,WAAAJ,MAAA,CAAAK,wBAAA,CAAAR,MAAA,EAAAO,GAAA,EAAAE,UAAA,OAAAP,IAAA,CAAAQ,IAAA,CAAAC,KAAA,CAAAT,IAAA,EAAAG,OAAA,YAAAH,IAAA;AAAA,SAAAU,cAAAC,MAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAC,SAAA,CAAAC,MAAA,EAAAF,CAAA,UAAAG,MAAA,WAAAF,SAAA,CAAAD,CAAA,IAAAC,SAAA,CAAAD,CAAA,QAAAA,CAAA,OAAAf,OAAA,CAAAI,MAAA,CAAAc,MAAA,OAAAC,OAAA,WAAAC,GAAA,QAAAC,gBAAA,CAAAC,OAAA,EAAAR,MAAA,EAAAM,GAAA,EAAAF,MAAA,CAAAE,GAAA,SAAAhB,MAAA,CAAAmB,yBAAA,GAAAnB,MAAA,CAAAoB,gBAAA,CAAAV,MAAA,EAAAV,MAAA,CAAAmB,yBAAA,CAAAL,MAAA,KAAAlB,OAAA,CAAAI,MAAA,CAAAc,MAAA,GAAAC,OAAA,WAAAC,GAAA,IAAAhB,MAAA,CAAAqB,cAAA,CAAAX,MAAA,EAAAM,GAAA,EAAAhB,MAAA,CAAAK,wBAAA,CAAAS,MAAA,EAAAE,GAAA,iBAAAN,MAAA;AAEzC,SAASY,cAAcA,CAACC,MAAY,EAAW;EAAA,IAAAC,OAAA;EACpD,IAAI,CAACD,MAAM,EAAE;IACX,OAAO,KAAK;EACd;EAEA,IAAIE,KAAK,CAACC,OAAO,CAACH,MAAM,CAAC,EAAE;IACzBA,MAAM,GAAGA,MAAM,CAAC,CAAC,CAAC;EACpB;EAEA,IAAMI,aAAa,GAAGF,KAAK,CAACC,OAAO,EAAAF,OAAA,GAACD,MAAM,cAAAC,OAAA,uBAANA,OAAA,CAAQI,UAAU,CAAC;EAWvD,OAAOD,aAAa;AACtB;AAEO,SAASE,eAAeA,CAACN,MAAc,EAAU;EAAA,IAAAO,QAAA,EAAAC,QAAA;EAItD,IAAAC,mBAAM,EAACT,MAAM,EAAE,aAAa,CAAC;EAC7B,IAAAS,mBAAM,EAACV,cAAc,CAACC,MAAM,CAAC,EAAE,gBAAgB,CAAC;EAKhD,IAAIU,OAAO;EACX,IAAIR,KAAK,CAACC,OAAO,CAACH,MAAM,CAAC,EAAE;IACzBU,OAAO,GAAGV,MAAM,CAAC,CAAC,CAAC;IACnBA,MAAM,GAAGA,MAAM,CAAC,CAAC,CAAC;IAClBA,MAAM,GAAAd,aAAA,CAAAA,aAAA,KACDc,MAAM;MACTU,OAAO,EAAAxB,aAAA,CAAAA,aAAA,KAAMc,MAAM,CAACU,OAAO,GAAKA,OAAO;IAAC,EACzC;EACH;EAMA,IAAI,CAAAH,QAAA,GAAAP,MAAM,cAAAO,QAAA,eAANA,QAAA,CAAQI,aAAa,KAAAH,QAAA,GAAIR,MAAM,cAAAQ,QAAA,eAANA,QAAA,CAAQI,SAAS,EAAE;IAC9CZ,MAAM,CAACa,IAAI,GAAG,IAAI;EACpB;EAEA,IAAI,CAACb,MAAM,CAACa,IAAI,EAAE;IAChBb,MAAM,CAACc,MAAM,GAAG,IAAI;EACtB;EAEA,OAAOd,MAAM;AACf"}
+{"version":3,"file":"normalize-loader.js","names":["_loaderUtils","require","isLoaderObject","loader","_loader","Array","isArray","hasExtensions","extensions","normalizeLoader","_loader2","_loader3","assert","options","parseTextSync","parseText","text","binary"],"sources":["../../../../src/lib/loader-utils/normalize-loader.ts"],"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"],"mappings":";;;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AAEO,SAASC,cAAcA,CAACC,MAAY,EAAW;EAAA,IAAAC,OAAA;EACpD,IAAI,CAACD,MAAM,EAAE;IACX,OAAO,KAAK;EACd;EAEA,IAAIE,KAAK,CAACC,OAAO,CAACH,MAAM,CAAC,EAAE;IACzBA,MAAM,GAAGA,MAAM,CAAC,CAAC,CAAC;EACpB;EAEA,MAAMI,aAAa,GAAGF,KAAK,CAACC,OAAO,EAAAF,OAAA,GAACD,MAAM,cAAAC,OAAA,uBAANA,OAAA,CAAQI,UAAU,CAAC;EAWvD,OAAOD,aAAa;AACtB;AAEO,SAASE,eAAeA,CAACN,MAAc,EAAU;EAAA,IAAAO,QAAA,EAAAC,QAAA;EAItD,IAAAC,mBAAM,EAACT,MAAM,EAAE,aAAa,CAAC;EAC7B,IAAAS,mBAAM,EAACV,cAAc,CAACC,MAAM,CAAC,EAAE,gBAAgB,CAAC;EAKhD,IAAIU,OAAO;EACX,IAAIR,KAAK,CAACC,OAAO,CAACH,MAAM,CAAC,EAAE;IACzBU,OAAO,GAAGV,MAAM,CAAC,CAAC,CAAC;IACnBA,MAAM,GAAGA,MAAM,CAAC,CAAC,CAAC;IAClBA,MAAM,GAAG;MACP,GAAGA,MAAM;MACTU,OAAO,EAAE;QAAC,GAAGV,MAAM,CAACU,OAAO;QAAE,GAAGA;MAAO;IACzC,CAAC;EACH;EAMA,IAAI,CAAAH,QAAA,GAAAP,MAAM,cAAAO,QAAA,eAANA,QAAA,CAAQI,aAAa,KAAAH,QAAA,GAAIR,MAAM,cAAAQ,QAAA,eAANA,QAAA,CAAQI,SAAS,EAAE;IAC9CZ,MAAM,CAACa,IAAI,GAAG,IAAI;EACpB;EAEA,IAAI,CAACb,MAAM,CAACa,IAAI,EAAE;IAChBb,MAAM,CAACc,MAAM,GAAG,IAAI;EACtB;EAEA,OAAOd,MAAM;AACf"}

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.REMOVED_LOADER_OPTIONS = exports.DEFAULT_LOADER_OPTIONS = void 0;
 var _loaderUtils = require("@loaders.gl/loader-utils");
 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,"file":"option-defaults.js","names":["_loaderUtils","require","_loggers","DEFAULT_LOADER_OPTIONS","fetch","mimeType","undefined","nothrow","log","ConsoleLog","CDN","worker","maxConcurrency","maxMobileConcurrency","reuseWorkers","isBrowser","_nodeWorkers","_workerType","limit","_limitMB","batchSize","batchDebounceMs","metadata","transforms","exports","REMOVED_LOADER_OPTIONS","throws","dataType","uri","method","headers","body","mode","credentials","cache","redirect","referrer","referrerPolicy","integrity","keepalive","signal"],"sources":["../../../../src/lib/loader-utils/option-defaults.ts"],"sourcesContent":["import type {LoaderOptions} from '@loaders.gl/loader-utils';\nimport {isBrowser} 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: isBrowser, // By default reuse workers in browser (Node.js refuses to terminate if browsers are running)\n  _nodeWorkers: false, // By default do not support node 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"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AAEO,IAAME,sBAAqC,GAAG;EAEnDC,KAAK,EAAE,IAAI;EACXC,QAAQ,EAAEC,SAAS;EACnBC,OAAO,EAAE,KAAK;EACdC,GAAG,EAAE,IAAIC,mBAAU,CAAC,CAAC;EAErBC,GAAG,EAAE,+BAA+B;EACpCC,MAAM,EAAE,IAAI;EACZC,cAAc,EAAE,CAAC;EACjBC,oBAAoB,EAAE,CAAC;EACvBC,YAAY,EAAEC,sBAAS;EACvBC,YAAY,EAAE,KAAK;EACnBC,WAAW,EAAE,EAAE;EAEfC,KAAK,EAAE,CAAC;EACRC,QAAQ,EAAE,CAAC;EACXC,SAAS,EAAE,MAAM;EACjBC,eAAe,EAAE,CAAC;EAClBC,QAAQ,EAAE,KAAK;EACfC,UAAU,EAAE;AACd,CAAC;AAACC,OAAA,CAAArB,sBAAA,GAAAA,sBAAA;AAEK,IAAMsB,sBAAsB,GAAG;EACpCC,MAAM,EAAE,SAAS;EACjBC,QAAQ,EAAE,kBAAkB;EAC5BC,GAAG,EAAE,SAAS;EAEdC,MAAM,EAAE,cAAc;EACtBC,OAAO,EAAE,eAAe;EACxBC,IAAI,EAAE,YAAY;EAClBC,IAAI,EAAE,YAAY;EAClBC,WAAW,EAAE,mBAAmB;EAChCC,KAAK,EAAE,aAAa;EACpBC,QAAQ,EAAE,gBAAgB;EAC1BC,QAAQ,EAAE,gBAAgB;EAC1BC,cAAc,EAAE,sBAAsB;EACtCC,SAAS,EAAE,iBAAiB;EAC5BC,SAAS,EAAE,iBAAiB;EAC5BC,MAAM,EAAE;AACV,CAAC;AAAChB,OAAA,CAAAC,sBAAA,GAAAA,sBAAA"}
+{"version":3,"file":"option-defaults.js","names":["_loaderUtils","require","_loggers","DEFAULT_LOADER_OPTIONS","fetch","mimeType","undefined","nothrow","log","ConsoleLog","CDN","worker","maxConcurrency","maxMobileConcurrency","reuseWorkers","isBrowser","_nodeWorkers","_workerType","limit","_limitMB","batchSize","batchDebounceMs","metadata","transforms","exports","REMOVED_LOADER_OPTIONS","throws","dataType","uri","method","headers","body","mode","credentials","cache","redirect","referrer","referrerPolicy","integrity","keepalive","signal"],"sources":["../../../../src/lib/loader-utils/option-defaults.ts"],"sourcesContent":["import type {LoaderOptions} from '@loaders.gl/loader-utils';\nimport {isBrowser} 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: isBrowser, // By default reuse workers in browser (Node.js refuses to terminate if browsers are running)\n  _nodeWorkers: false, // By default do not support node 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"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AAEO,MAAME,sBAAqC,GAAG;EAEnDC,KAAK,EAAE,IAAI;EACXC,QAAQ,EAAEC,SAAS;EACnBC,OAAO,EAAE,KAAK;EACdC,GAAG,EAAE,IAAIC,mBAAU,CAAC,CAAC;EAErBC,GAAG,EAAE,+BAA+B;EACpCC,MAAM,EAAE,IAAI;EACZC,cAAc,EAAE,CAAC;EACjBC,oBAAoB,EAAE,CAAC;EACvBC,YAAY,EAAEC,sBAAS;EACvBC,YAAY,EAAE,KAAK;EACnBC,WAAW,EAAE,EAAE;EAEfC,KAAK,EAAE,CAAC;EACRC,QAAQ,EAAE,CAAC;EACXC,SAAS,EAAE,MAAM;EACjBC,eAAe,EAAE,CAAC;EAClBC,QAAQ,EAAE,KAAK;EACfC,UAAU,EAAE;AACd,CAAC;AAACC,OAAA,CAAArB,sBAAA,GAAAA,sBAAA;AAEK,MAAMsB,sBAAsB,GAAG;EACpCC,MAAM,EAAE,SAAS;EACjBC,QAAQ,EAAE,kBAAkB;EAC5BC,GAAG,EAAE,SAAS;EAEdC,MAAM,EAAE,cAAc;EACtBC,OAAO,EAAE,eAAe;EACxBC,IAAI,EAAE,YAAY;EAClBC,IAAI,EAAE,YAAY;EAClBC,WAAW,EAAE,mBAAmB;EAChCC,KAAK,EAAE,aAAa;EACpBC,QAAQ,EAAE,gBAAgB;EAC1BC,QAAQ,EAAE,gBAAgB;EAC1BC,cAAc,EAAE,sBAAsB;EACtCC,SAAS,EAAE,iBAAiB;EAC5BC,SAAS,EAAE,iBAAiB;EAC5BC,MAAM,EAAE;AACV,CAAC;AAAChB,OAAA,CAAAC,sBAAA,GAAAA,sBAAA"}

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

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -8,30 +7,28 @@ exports.getGlobalLoaderOptions = void 0;
 exports.getGlobalLoaderState = getGlobalLoaderState;
 exports.normalizeOptions = normalizeOptions;
 exports.setGlobalOptions = setGlobalOptions;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _isType = require("../../javascript-utils/is-type");
 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); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function getGlobalLoaderState() {
   globalThis.loaders = globalThis.loaders || {};
-  var loaders = globalThis.loaders;
+  const {
+    loaders
+  } = globalThis;
   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;
 };
 exports.getGlobalLoaderOptions = getGlobalLoaderOptions;
 function setGlobalOptions(options) {
-  var state = getGlobalLoaderState();
-  var globalOptions = getGlobalLoaderOptions();
+  const state = getGlobalLoaderState();
+  const globalOptions = getGlobalLoaderOptions();
   state.globalOptions = normalizeOptionsInternal(globalOptions, options);
 }
 function normalizeOptions(options, loader, loaders, url) {
@@ -42,68 +39,52 @@ function normalizeOptions(options, loader, loaders, url) {
 }
 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, ".") : '';
-  for (var key in options) {
-    var isSubOptions = !id && (0, _isType.isObject)(options[key]);
-    var isBaseUriOption = key === 'baseUri' && !id;
-    var isWorkerUrlOption = key === 'workerUrl' && id;
+  const loaderName = id || 'Top level';
+  const prefix = id ? "".concat(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], "'"))();
       } 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))();
       }
     }
   }
 }
 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 key in loader.options) {
-        if (optionKey === key) {
-          return "Did you mean '".concat(loader.id, ".").concat(key, "'?");
-        }
-        var lowerCaseKey = key.toLowerCase();
-        var 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 '".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, "'?");
       }
     }
-  } 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) {
     mergedOptions.log = new _loggers.NullLog();
@@ -113,11 +94,14 @@ function normalizeOptionsInternal(loader, options, url) {
   return mergedOptions;
 }
 function mergeNestedFields(mergedOptions, options) {
-  for (var key in options) {
+  for (const key in options) {
     if (key in options) {
-      var value = options[key];
+      const value = options[key];
       if ((0, _isType.isPureObject)(value) && (0, _isType.isPureObject)(mergedOptions[key])) {
-        mergedOptions[key] = _objectSpread(_objectSpread({}, mergedOptions[key]), options[key]);
+        mergedOptions[key] = {
+          ...mergedOptions[key],
+          ...options[key]
+        };
       } else {
         mergedOptions[key] = options[key];
       }

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

@@ -1 +1 @@
-{"version":3,"file":"option-utils.js","names":["_isType","require","_loggers","_optionDefaults","_createForOfIteratorHelper","o","allowArrayLike","it","Symbol","iterator","Array","isArray","_unsupportedIterableToArray","length","i","F","s","n","done","value","e","_e","f","TypeError","normalCompletion","didErr","err","call","step","next","_e2","return","minLen","_arrayLikeToArray","Object","prototype","toString","slice","constructor","name","from","test","arr","len","arr2","ownKeys","object","enumerableOnly","keys","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","arguments","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","getGlobalLoaderState","globalThis","loaders","_state","getGlobalLoaderOptions","state","globalOptions","DEFAULT_LOADER_OPTIONS","exports","setGlobalOptions","options","normalizeOptionsInternal","normalizeOptions","loader","url","validateOptions","validateOptionsObject","REMOVED_LOADER_OPTIONS","_iterator","_step","idOptions","id","loaderOptions","deprecatedOptions","defaultOptions","loaderName","prefix","concat","isSubOptions","isObject","isBaseUriOption","isWorkerUrlOption","probeLog","warn","suggestion","findSimilarOption","optionKey","lowerCaseOptionKey","toLowerCase","bestSuggestion","_iterator2","_step2","lowerCaseKey","isPartialMatch","startsWith","loaderDefaultOptions","mergedOptions","addUrlOptions","log","NullLog","mergeNestedFields","isPureObject","baseUri"],"sources":["../../../../src/lib/loader-utils/option-utils.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport type {Loader, LoaderOptions} from '@loaders.gl/loader-utils';\nimport {isPureObject, isObject} from '../../javascript-utils/is-type';\nimport {probeLog, NullLog} from './loggers';\nimport {DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS} from './option-defaults';\n\n/**\n * Global state for loaders.gl. Stored on `global.loaders._state`\n */\ntype GlobalLoaderState = {\n  loaderRegistry: Loader[];\n  globalOptions: LoaderOptions;\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  globalThis.loaders = globalThis.loaders || {};\n  // @ts-ignore\n  const {loaders} = globalThis;\n\n  // Add _state object to keep separate from modules added to globalThis.loaders\n  loaders._state = loaders._state || {};\n  return loaders._state;\n}\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\n * @returns global loader options merged with default loader options\n */\nexport const getGlobalLoaderOptions = (): LoaderOptions => {\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: LoaderOptions): 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: LoaderOptions,\n  loader: Loader,\n  loaders?: Loader[],\n  url?: string\n): LoaderOptions {\n  loaders = loaders || [];\n  loaders = Array.isArray(loaders) ? loaders : [loaders];\n\n  validateOptions(options, loaders);\n  return normalizeOptionsInternal(loader, options, url);\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/**\n * Harvest information from the url\n * @deprecated This is mainly there to support a hack in the GLTFLoader\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?\n */\nfunction addUrlOptions(options, url?: string) {\n  if (url && !('baseUri' in options)) {\n    options.baseUri = url;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"option-utils.js","names":["_isType","require","_loggers","_optionDefaults","getGlobalLoaderState","globalThis","loaders","_state","getGlobalLoaderOptions","state","globalOptions","DEFAULT_LOADER_OPTIONS","exports","setGlobalOptions","options","normalizeOptionsInternal","normalizeOptions","loader","url","Array","isArray","validateOptions","validateOptionsObject","REMOVED_LOADER_OPTIONS","idOptions","id","loaderOptions","deprecatedOptions","defaultOptions","loaderName","prefix","concat","key","isSubOptions","isObject","isBaseUriOption","isWorkerUrlOption","probeLog","warn","suggestion","findSimilarOption","optionKey","lowerCaseOptionKey","toLowerCase","bestSuggestion","lowerCaseKey","isPartialMatch","startsWith","loaderDefaultOptions","mergedOptions","addUrlOptions","log","NullLog","mergeNestedFields","value","isPureObject","baseUri"],"sources":["../../../../src/lib/loader-utils/option-utils.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport type {Loader, LoaderOptions} from '@loaders.gl/loader-utils';\nimport {isPureObject, isObject} from '../../javascript-utils/is-type';\nimport {probeLog, NullLog} from './loggers';\nimport {DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS} from './option-defaults';\n\n/**\n * Global state for loaders.gl. Stored on `global.loaders._state`\n */\ntype GlobalLoaderState = {\n  loaderRegistry: Loader[];\n  globalOptions: LoaderOptions;\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  globalThis.loaders = globalThis.loaders || {};\n  // @ts-ignore\n  const {loaders} = globalThis;\n\n  // Add _state object to keep separate from modules added to globalThis.loaders\n  loaders._state = loaders._state || {};\n  return loaders._state;\n}\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\n * @returns global loader options merged with default loader options\n */\nexport const getGlobalLoaderOptions = (): LoaderOptions => {\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: LoaderOptions): 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: LoaderOptions,\n  loader: Loader,\n  loaders?: Loader[],\n  url?: string\n): LoaderOptions {\n  loaders = loaders || [];\n  loaders = Array.isArray(loaders) ? loaders : [loaders];\n\n  validateOptions(options, loaders);\n  return normalizeOptionsInternal(loader, options, url);\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/**\n * Harvest information from the url\n * @deprecated This is mainly there to support a hack in the GLTFLoader\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?\n */\nfunction addUrlOptions(options, url?: string) {\n  if (url && !('baseUri' in options)) {\n    options.baseUri = url;\n  }\n}\n"],"mappings":"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"}