@loaders.gl/core 3.4.0-alpha.1 → 3.4.0-alpha.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (194) hide show
  1. package/dist/dist.min.js +461 -248
  2. package/dist/es5/core-addons/write-file-browser.js +0 -2
  3. package/dist/es5/index.js.map +1 -1
  4. package/dist/es5/iterators/batch-iterators/timed-batch-iterator.js +65 -67
  5. package/dist/es5/iterators/batch-iterators/timed-batch-iterator.js.map +1 -1
  6. package/dist/es5/iterators/make-iterator/make-array-buffer-iterator.js +13 -24
  7. package/dist/es5/iterators/make-iterator/make-array-buffer-iterator.js.map +1 -1
  8. package/dist/es5/iterators/make-iterator/make-blob-iterator.js +22 -25
  9. package/dist/es5/iterators/make-iterator/make-blob-iterator.js.map +1 -1
  10. package/dist/es5/iterators/make-iterator/make-iterator.js.map +1 -1
  11. package/dist/es5/iterators/make-iterator/make-stream-iterator.js +88 -93
  12. package/dist/es5/iterators/make-iterator/make-stream-iterator.js.map +1 -1
  13. package/dist/es5/iterators/make-iterator/make-string-iterator.js +20 -24
  14. package/dist/es5/iterators/make-iterator/make-string-iterator.js.map +1 -1
  15. package/dist/es5/iterators/make-stream/make-dom-stream.js +30 -34
  16. package/dist/es5/iterators/make-stream/make-dom-stream.js.map +1 -1
  17. package/dist/es5/iterators/make-stream/make-node-stream.js +88 -87
  18. package/dist/es5/iterators/make-stream/make-node-stream.js.map +1 -1
  19. package/dist/es5/javascript-utils/is-type.js +0 -3
  20. package/dist/es5/javascript-utils/is-type.js.map +1 -1
  21. package/dist/es5/lib/api/encode.js +157 -166
  22. package/dist/es5/lib/api/encode.js.map +1 -1
  23. package/dist/es5/lib/api/load-in-batches.js +25 -31
  24. package/dist/es5/lib/api/load-in-batches.js.map +1 -1
  25. package/dist/es5/lib/api/load.js +35 -38
  26. package/dist/es5/lib/api/load.js.map +1 -1
  27. package/dist/es5/lib/api/loader-options.js.map +1 -1
  28. package/dist/es5/lib/api/parse-in-batches.js +192 -207
  29. package/dist/es5/lib/api/parse-in-batches.js.map +1 -1
  30. package/dist/es5/lib/api/parse-sync.js +0 -7
  31. package/dist/es5/lib/api/parse-sync.js.map +1 -1
  32. package/dist/es5/lib/api/parse.js +99 -107
  33. package/dist/es5/lib/api/parse.js.map +1 -1
  34. package/dist/es5/lib/api/register-loaders.js +1 -3
  35. package/dist/es5/lib/api/register-loaders.js.map +1 -1
  36. package/dist/es5/lib/api/save.js +13 -15
  37. package/dist/es5/lib/api/save.js.map +1 -1
  38. package/dist/es5/lib/api/select-loader.js +41 -58
  39. package/dist/es5/lib/api/select-loader.js.map +1 -1
  40. package/dist/es5/lib/fetch/fetch-error-message.js +29 -31
  41. package/dist/es5/lib/fetch/fetch-error-message.js.map +1 -1
  42. package/dist/es5/lib/fetch/fetch-file.js +23 -25
  43. package/dist/es5/lib/fetch/fetch-file.js.map +1 -1
  44. package/dist/es5/lib/fetch/read-array-buffer.js +41 -45
  45. package/dist/es5/lib/fetch/read-array-buffer.js.map +1 -1
  46. package/dist/es5/lib/fetch/read-file.js +0 -3
  47. package/dist/es5/lib/fetch/read-file.js.map +1 -1
  48. package/dist/es5/lib/fetch/write-file.js +15 -17
  49. package/dist/es5/lib/fetch/write-file.js.map +1 -1
  50. package/dist/es5/lib/filesystems/browser-filesystem.js +107 -124
  51. package/dist/es5/lib/filesystems/browser-filesystem.js.map +1 -1
  52. package/dist/es5/lib/filesystems/read-array-buffer.js +19 -21
  53. package/dist/es5/lib/filesystems/read-array-buffer.js.map +1 -1
  54. package/dist/es5/lib/init.js +1 -3
  55. package/dist/es5/lib/init.js.map +1 -1
  56. package/dist/es5/lib/loader-utils/check-errors.js +24 -26
  57. package/dist/es5/lib/loader-utils/check-errors.js.map +1 -1
  58. package/dist/es5/lib/loader-utils/get-data.js +130 -145
  59. package/dist/es5/lib/loader-utils/get-data.js.map +1 -1
  60. package/dist/es5/lib/loader-utils/get-fetch-function.js +26 -0
  61. package/dist/es5/lib/loader-utils/get-fetch-function.js.map +1 -0
  62. package/dist/es5/lib/loader-utils/loader-context.js +2 -5
  63. package/dist/es5/lib/loader-utils/loader-context.js.map +1 -1
  64. package/dist/es5/lib/loader-utils/loggers.js +0 -2
  65. package/dist/es5/lib/loader-utils/loggers.js.map +1 -1
  66. package/dist/es5/lib/loader-utils/normalize-loader.js +0 -3
  67. package/dist/es5/lib/loader-utils/normalize-loader.js.map +1 -1
  68. package/dist/es5/lib/loader-utils/option-defaults.js +0 -2
  69. package/dist/es5/lib/loader-utils/option-defaults.js.map +1 -1
  70. package/dist/es5/lib/loader-utils/option-utils.js +21 -55
  71. package/dist/es5/lib/loader-utils/option-utils.js.map +1 -1
  72. package/dist/es5/lib/progress/fetch-progress.js +92 -98
  73. package/dist/es5/lib/progress/fetch-progress.js.map +1 -1
  74. package/dist/es5/lib/utils/log.js +0 -1
  75. package/dist/es5/lib/utils/log.js.map +1 -1
  76. package/dist/es5/lib/utils/mime-type-utils.js +0 -3
  77. package/dist/es5/lib/utils/mime-type-utils.js.map +1 -1
  78. package/dist/es5/lib/utils/resource-utils.js +0 -4
  79. package/dist/es5/lib/utils/resource-utils.js.map +1 -1
  80. package/dist/es5/lib/utils/response-utils.js +118 -131
  81. package/dist/es5/lib/utils/response-utils.js.map +1 -1
  82. package/dist/es5/null-loader.js +57 -63
  83. package/dist/es5/null-loader.js.map +1 -1
  84. package/dist/es5/workers/null-worker.js.map +1 -1
  85. package/dist/esm/bundle.js +0 -1
  86. package/dist/esm/bundle.js.map +1 -1
  87. package/dist/esm/index.js +0 -12
  88. package/dist/esm/index.js.map +1 -1
  89. package/dist/esm/iterators/batch-iterators/timed-batch-iterator.js +0 -1
  90. package/dist/esm/iterators/batch-iterators/timed-batch-iterator.js.map +1 -1
  91. package/dist/esm/iterators/make-iterator/make-array-buffer-iterator.js +16 -17
  92. package/dist/esm/iterators/make-iterator/make-array-buffer-iterator.js.map +1 -1
  93. package/dist/esm/iterators/make-iterator/make-blob-iterator.js +0 -1
  94. package/dist/esm/iterators/make-iterator/make-blob-iterator.js.map +1 -1
  95. package/dist/esm/iterators/make-iterator/make-iterator.js +0 -1
  96. package/dist/esm/iterators/make-iterator/make-iterator.js.map +1 -1
  97. package/dist/esm/iterators/make-iterator/make-stream-iterator.js +0 -3
  98. package/dist/esm/iterators/make-iterator/make-stream-iterator.js.map +1 -1
  99. package/dist/esm/iterators/make-iterator/make-string-iterator.js +0 -2
  100. package/dist/esm/iterators/make-iterator/make-string-iterator.js.map +1 -1
  101. package/dist/esm/iterators/make-stream/make-dom-stream.js +1 -3
  102. package/dist/esm/iterators/make-stream/make-dom-stream.js.map +1 -1
  103. package/dist/esm/iterators/make-stream/make-node-stream.js +3 -2
  104. package/dist/esm/iterators/make-stream/make-node-stream.js.map +1 -1
  105. package/dist/esm/javascript-utils/is-type.js +0 -4
  106. package/dist/esm/javascript-utils/is-type.js.map +1 -1
  107. package/dist/esm/lib/api/encode.js +0 -9
  108. package/dist/esm/lib/api/encode.js.map +1 -1
  109. package/dist/esm/lib/api/load-in-batches.js +1 -5
  110. package/dist/esm/lib/api/load-in-batches.js.map +1 -1
  111. package/dist/esm/lib/api/load.js +1 -6
  112. package/dist/esm/lib/api/load.js.map +1 -1
  113. package/dist/esm/lib/api/parse-in-batches.js +2 -16
  114. package/dist/esm/lib/api/parse-in-batches.js.map +1 -1
  115. package/dist/esm/lib/api/parse-sync.js +0 -8
  116. package/dist/esm/lib/api/parse-sync.js.map +1 -1
  117. package/dist/esm/lib/api/parse.js +0 -12
  118. package/dist/esm/lib/api/parse.js.map +1 -1
  119. package/dist/esm/lib/api/register-loaders.js +0 -3
  120. package/dist/esm/lib/api/register-loaders.js.map +1 -1
  121. package/dist/esm/lib/api/save.js.map +1 -1
  122. package/dist/esm/lib/api/select-loader.js +0 -20
  123. package/dist/esm/lib/api/select-loader.js.map +1 -1
  124. package/dist/esm/lib/fetch/fetch-error-message.js.map +1 -1
  125. package/dist/esm/lib/fetch/fetch-file.js +0 -1
  126. package/dist/esm/lib/fetch/fetch-file.js.map +1 -1
  127. package/dist/esm/lib/fetch/read-array-buffer.js +0 -3
  128. package/dist/esm/lib/fetch/read-array-buffer.js.map +1 -1
  129. package/dist/esm/lib/fetch/read-file.js +0 -4
  130. package/dist/esm/lib/fetch/read-file.js.map +1 -1
  131. package/dist/esm/lib/fetch/write-file.js +0 -1
  132. package/dist/esm/lib/fetch/write-file.js.map +1 -1
  133. package/dist/esm/lib/filesystems/browser-filesystem.js +1 -11
  134. package/dist/esm/lib/filesystems/browser-filesystem.js.map +1 -1
  135. package/dist/esm/lib/filesystems/read-array-buffer.js +0 -2
  136. package/dist/esm/lib/filesystems/read-array-buffer.js.map +1 -1
  137. package/dist/esm/lib/init.js +1 -4
  138. package/dist/esm/lib/init.js.map +1 -1
  139. package/dist/esm/lib/loader-utils/check-errors.js +1 -2
  140. package/dist/esm/lib/loader-utils/check-errors.js.map +1 -1
  141. package/dist/esm/lib/loader-utils/get-data.js +0 -6
  142. package/dist/esm/lib/loader-utils/get-data.js.map +1 -1
  143. package/dist/esm/lib/loader-utils/get-fetch-function.js +18 -0
  144. package/dist/esm/lib/loader-utils/get-fetch-function.js.map +1 -0
  145. package/dist/esm/lib/loader-utils/loader-context.js +1 -5
  146. package/dist/esm/lib/loader-utils/loader-context.js.map +1 -1
  147. package/dist/esm/lib/loader-utils/loggers.js +0 -3
  148. package/dist/esm/lib/loader-utils/loggers.js.map +1 -1
  149. package/dist/esm/lib/loader-utils/normalize-loader.js +0 -3
  150. package/dist/esm/lib/loader-utils/normalize-loader.js.map +1 -1
  151. package/dist/esm/lib/loader-utils/option-defaults.js +0 -2
  152. package/dist/esm/lib/loader-utils/option-defaults.js.map +1 -1
  153. package/dist/esm/lib/loader-utils/option-utils.js +0 -32
  154. package/dist/esm/lib/loader-utils/option-utils.js.map +1 -1
  155. package/dist/esm/lib/progress/fetch-progress.js +2 -6
  156. package/dist/esm/lib/progress/fetch-progress.js.map +1 -1
  157. package/dist/esm/lib/utils/log.js +0 -1
  158. package/dist/esm/lib/utils/log.js.map +1 -1
  159. package/dist/esm/lib/utils/mime-type-utils.js +0 -4
  160. package/dist/esm/lib/utils/mime-type-utils.js.map +1 -1
  161. package/dist/esm/lib/utils/resource-utils.js +0 -4
  162. package/dist/esm/lib/utils/resource-utils.js.map +1 -1
  163. package/dist/esm/lib/utils/response-utils.js +1 -12
  164. package/dist/esm/lib/utils/response-utils.js.map +1 -1
  165. package/dist/esm/null-loader.js +1 -4
  166. package/dist/esm/null-loader.js.map +1 -1
  167. package/dist/iterators/make-stream/make-node-stream.d.ts +7 -2
  168. package/dist/iterators/make-stream/make-node-stream.d.ts.map +1 -1
  169. package/dist/iterators/make-stream/make-node-stream.js +28 -2
  170. package/dist/lib/api/encode.d.ts +5 -5
  171. package/dist/lib/api/encode.d.ts.map +1 -1
  172. package/dist/lib/api/encode.js +1 -0
  173. package/dist/lib/api/load-in-batches.js +2 -2
  174. package/dist/lib/api/load.d.ts.map +1 -1
  175. package/dist/lib/api/load.js +3 -2
  176. package/dist/lib/fetch/fetch-file.js +1 -1
  177. package/dist/lib/loader-utils/get-fetch-function.d.ts +9 -0
  178. package/dist/lib/loader-utils/get-fetch-function.d.ts.map +1 -0
  179. package/dist/lib/loader-utils/get-fetch-function.js +31 -0
  180. package/dist/lib/loader-utils/loader-context.js +2 -2
  181. package/dist/lib/loader-utils/option-utils.d.ts +5 -15
  182. package/dist/lib/loader-utils/option-utils.d.ts.map +1 -1
  183. package/dist/lib/loader-utils/option-utils.js +10 -31
  184. package/dist/lib/progress/fetch-progress.js +2 -2
  185. package/dist/null-worker.js +1 -1
  186. package/package.json +5 -5
  187. package/src/iterators/make-stream/make-node-stream.ts +8 -2
  188. package/src/lib/api/encode.ts +7 -6
  189. package/src/lib/api/load-in-batches.ts +1 -1
  190. package/src/lib/api/load.ts +3 -2
  191. package/src/lib/loader-utils/get-fetch-function.ts +38 -0
  192. package/src/lib/loader-utils/loader-context.ts +1 -1
  193. package/src/lib/loader-utils/option-utils.ts +17 -44
  194. package/src/lib/progress/fetch-progress.ts +2 -2
@@ -4,70 +4,42 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.getFetchFunction = getFetchFunction;
8
7
  exports.getGlobalLoaderOptions = void 0;
9
8
  exports.getGlobalLoaderState = getGlobalLoaderState;
10
9
  exports.normalizeOptions = normalizeOptions;
11
10
  exports.setGlobalOptions = setGlobalOptions;
12
11
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
13
12
  var _isType = require("../../javascript-utils/is-type");
14
- var _fetchFile = require("../fetch/fetch-file");
15
13
  var _loggers = require("./loggers");
16
14
  var _optionDefaults = require("./option-defaults");
17
15
  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; } } }; }
18
16
  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); }
19
- 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; }
17
+ 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; }
20
18
  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; }
21
19
  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; }
22
20
  function getGlobalLoaderState() {
23
21
  globalThis.loaders = globalThis.loaders || {};
24
22
  var loaders = globalThis.loaders;
25
-
26
23
  loaders._state = loaders._state || {};
27
24
  return loaders._state;
28
25
  }
29
-
30
26
  var getGlobalLoaderOptions = function getGlobalLoaderOptions() {
31
27
  var state = getGlobalLoaderState();
32
28
  state.globalOptions = state.globalOptions || _objectSpread({}, _optionDefaults.DEFAULT_LOADER_OPTIONS);
33
29
  return state.globalOptions;
34
30
  };
35
-
36
31
  exports.getGlobalLoaderOptions = getGlobalLoaderOptions;
37
32
  function setGlobalOptions(options) {
38
33
  var state = getGlobalLoaderState();
39
34
  var globalOptions = getGlobalLoaderOptions();
40
35
  state.globalOptions = normalizeOptionsInternal(globalOptions, options);
41
36
  }
42
-
43
37
  function normalizeOptions(options, loader, loaders, url) {
44
38
  loaders = loaders || [];
45
39
  loaders = Array.isArray(loaders) ? loaders : [loaders];
46
40
  validateOptions(options, loaders);
47
41
  return normalizeOptionsInternal(loader, options, url);
48
42
  }
49
-
50
- function getFetchFunction(options, context) {
51
- var globalOptions = getGlobalLoaderOptions();
52
- var fetchOptions = options || globalOptions;
53
-
54
- if (typeof fetchOptions.fetch === 'function') {
55
- return fetchOptions.fetch;
56
- }
57
-
58
- if ((0, _isType.isObject)(fetchOptions.fetch)) {
59
- return function (url) {
60
- return (0, _fetchFile.fetchFile)(url, fetchOptions);
61
- };
62
- }
63
-
64
- if (context !== null && context !== void 0 && context.fetch) {
65
- return context === null || context === void 0 ? void 0 : context.fetch;
66
- }
67
-
68
- return _fetchFile.fetchFile;
69
- }
70
-
71
43
  function validateOptions(options, loaders) {
72
44
  validateOptionsObject(options, null, _optionDefaults.DEFAULT_LOADER_OPTIONS, _optionDefaults.REMOVED_LOADER_OPTIONS, loaders);
73
45
  var _iterator = _createForOfIteratorHelper(loaders),
@@ -76,10 +48,8 @@ function validateOptions(options, loaders) {
76
48
  for (_iterator.s(); !(_step = _iterator.n()).done;) {
77
49
  var loader = _step.value;
78
50
  var idOptions = options && options[loader.id] || {};
79
-
80
51
  var loaderOptions = loader.options && loader.options[loader.id] || {};
81
52
  var deprecatedOptions = loader.deprecatedOptions && loader.deprecatedOptions[loader.id] || {};
82
-
83
53
  validateOptionsObject(idOptions, loader.id, loaderOptions, deprecatedOptions, loaders);
84
54
  }
85
55
  } catch (err) {
@@ -88,20 +58,19 @@ function validateOptions(options, loaders) {
88
58
  _iterator.f();
89
59
  }
90
60
  }
91
-
92
61
  function validateOptionsObject(options, id, defaultOptions, deprecatedOptions, loaders) {
93
62
  var loaderName = id || 'Top level';
94
63
  var prefix = id ? "".concat(id, ".") : '';
95
- for (var _key in options) {
96
- var isSubOptions = !id && (0, _isType.isObject)(options[_key]);
97
- var isBaseUriOption = _key === 'baseUri' && !id;
98
- var isWorkerUrlOption = _key === 'workerUrl' && id;
99
- if (!(_key in defaultOptions) && !isBaseUriOption && !isWorkerUrlOption) {
100
- if (_key in deprecatedOptions) {
101
- _loggers.probeLog.warn("".concat(loaderName, " loader option '").concat(prefix).concat(_key, "' no longer supported, use '").concat(deprecatedOptions[_key], "'"))();
64
+ for (var key in options) {
65
+ var isSubOptions = !id && (0, _isType.isObject)(options[key]);
66
+ var isBaseUriOption = key === 'baseUri' && !id;
67
+ var isWorkerUrlOption = key === 'workerUrl' && id;
68
+ if (!(key in defaultOptions) && !isBaseUriOption && !isWorkerUrlOption) {
69
+ if (key in deprecatedOptions) {
70
+ _loggers.probeLog.warn("".concat(loaderName, " loader option '").concat(prefix).concat(key, "' no longer supported, use '").concat(deprecatedOptions[key], "'"))();
102
71
  } else if (!isSubOptions) {
103
- var suggestion = findSimilarOption(_key, loaders);
104
- _loggers.probeLog.warn("".concat(loaderName, " loader option '").concat(prefix).concat(_key, "' not recognized. ").concat(suggestion))();
72
+ var suggestion = findSimilarOption(key, loaders);
73
+ _loggers.probeLog.warn("".concat(loaderName, " loader option '").concat(prefix).concat(key, "' not recognized. ").concat(suggestion))();
105
74
  }
106
75
  }
107
76
  }
@@ -114,14 +83,14 @@ function findSimilarOption(optionKey, loaders) {
114
83
  try {
115
84
  for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
116
85
  var loader = _step2.value;
117
- for (var _key2 in loader.options) {
118
- if (optionKey === _key2) {
119
- return "Did you mean '".concat(loader.id, ".").concat(_key2, "'?");
86
+ for (var key in loader.options) {
87
+ if (optionKey === key) {
88
+ return "Did you mean '".concat(loader.id, ".").concat(key, "'?");
120
89
  }
121
- var lowerCaseKey = _key2.toLowerCase();
90
+ var lowerCaseKey = key.toLowerCase();
122
91
  var isPartialMatch = lowerCaseOptionKey.startsWith(lowerCaseKey) || lowerCaseKey.startsWith(lowerCaseOptionKey);
123
92
  if (isPartialMatch) {
124
- bestSuggestion = bestSuggestion || "Did you mean '".concat(loader.id, ".").concat(_key2, "'?");
93
+ bestSuggestion = bestSuggestion || "Did you mean '".concat(loader.id, ".").concat(key, "'?");
125
94
  }
126
95
  }
127
96
  }
@@ -136,7 +105,6 @@ function normalizeOptionsInternal(loader, options, url) {
136
105
  var loaderDefaultOptions = loader.options || {};
137
106
  var mergedOptions = _objectSpread({}, loaderDefaultOptions);
138
107
  addUrlOptions(mergedOptions, url);
139
-
140
108
  if (mergedOptions.log === null) {
141
109
  mergedOptions.log = new _loggers.NullLog();
142
110
  }
@@ -144,20 +112,18 @@ function normalizeOptionsInternal(loader, options, url) {
144
112
  mergeNestedFields(mergedOptions, options);
145
113
  return mergedOptions;
146
114
  }
147
-
148
115
  function mergeNestedFields(mergedOptions, options) {
149
- for (var _key3 in options) {
150
- if (_key3 in options) {
151
- var value = options[_key3];
152
- if ((0, _isType.isPureObject)(value) && (0, _isType.isPureObject)(mergedOptions[_key3])) {
153
- mergedOptions[_key3] = _objectSpread(_objectSpread({}, mergedOptions[_key3]), options[_key3]);
116
+ for (var key in options) {
117
+ if (key in options) {
118
+ var value = options[key];
119
+ if ((0, _isType.isPureObject)(value) && (0, _isType.isPureObject)(mergedOptions[key])) {
120
+ mergedOptions[key] = _objectSpread(_objectSpread({}, mergedOptions[key]), options[key]);
154
121
  } else {
155
- mergedOptions[_key3] = options[_key3];
122
+ mergedOptions[key] = options[key];
156
123
  }
157
124
  }
158
125
  }
159
126
  }
160
-
161
127
  function addUrlOptions(options, url) {
162
128
  if (url && !('baseUri' in options)) {
163
129
  options.baseUri = url;
@@ -1 +1 @@
1
- {"version":3,"file":"option-utils.js","names":["getGlobalLoaderState","globalThis","loaders","_state","getGlobalLoaderOptions","state","globalOptions","DEFAULT_LOADER_OPTIONS","setGlobalOptions","options","normalizeOptionsInternal","normalizeOptions","loader","url","Array","isArray","validateOptions","getFetchFunction","context","fetchOptions","fetch","isObject","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","isPureObject","baseUri"],"sources":["../../../../src/lib/loader-utils/option-utils.ts"],"sourcesContent":["import type {Loader, LoaderContext, LoaderOptions} 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 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 = () => {\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"],"mappings":"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"}
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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"}
@@ -20,67 +20,63 @@ function _fetchProgress() {
20
20
  progressStream,
21
21
  _args2 = arguments;
22
22
  return _regenerator.default.wrap(function _callee2$(_context2) {
23
- while (1) {
24
- switch (_context2.prev = _context2.next) {
25
- case 0:
26
- onDone = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : function () {};
27
- onError = _args2.length > 3 && _args2[3] !== undefined ? _args2[3] : function () {};
28
- _context2.next = 4;
29
- return response;
30
- case 4:
31
- response = _context2.sent;
32
- if (response.ok) {
33
- _context2.next = 7;
34
- break;
35
- }
36
- return _context2.abrupt("return", response);
37
- case 7:
38
- body = response.body;
39
- if (body) {
40
- _context2.next = 10;
41
- break;
42
- }
43
- return _context2.abrupt("return", response);
44
- case 10:
45
- contentLength = response.headers.get('content-length') || 0;
46
- totalBytes = contentLength && parseInt(contentLength);
47
- if (contentLength > 0) {
48
- _context2.next = 14;
49
- break;
50
- }
51
- return _context2.abrupt("return", response);
52
- case 14:
53
- if (!(typeof ReadableStream === 'undefined' || !body.getReader)) {
54
- _context2.next = 16;
55
- break;
23
+ while (1) switch (_context2.prev = _context2.next) {
24
+ case 0:
25
+ onDone = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : function () {};
26
+ onError = _args2.length > 3 && _args2[3] !== undefined ? _args2[3] : function () {};
27
+ _context2.next = 4;
28
+ return response;
29
+ case 4:
30
+ response = _context2.sent;
31
+ if (response.ok) {
32
+ _context2.next = 7;
33
+ break;
34
+ }
35
+ return _context2.abrupt("return", response);
36
+ case 7:
37
+ body = response.body;
38
+ if (body) {
39
+ _context2.next = 10;
40
+ break;
41
+ }
42
+ return _context2.abrupt("return", response);
43
+ case 10:
44
+ contentLength = response.headers.get('content-length') || 0;
45
+ totalBytes = contentLength ? parseInt(contentLength) : 0;
46
+ if (totalBytes > 0) {
47
+ _context2.next = 14;
48
+ break;
49
+ }
50
+ return _context2.abrupt("return", response);
51
+ case 14:
52
+ if (!(typeof ReadableStream === 'undefined' || !body.getReader)) {
53
+ _context2.next = 16;
54
+ break;
55
+ }
56
+ return _context2.abrupt("return", response);
57
+ case 16:
58
+ progressStream = new ReadableStream({
59
+ start: function start(controller) {
60
+ return (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee() {
61
+ var reader;
62
+ return _regenerator.default.wrap(function _callee$(_context) {
63
+ while (1) switch (_context.prev = _context.next) {
64
+ case 0:
65
+ reader = body.getReader();
66
+ _context.next = 3;
67
+ return read(controller, reader, 0, totalBytes, onProgress, onDone, onError);
68
+ case 3:
69
+ case "end":
70
+ return _context.stop();
71
+ }
72
+ }, _callee);
73
+ }))();
56
74
  }
57
- return _context2.abrupt("return", response);
58
- case 16:
59
- progressStream = new ReadableStream({
60
- start: function start(controller) {
61
- return (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee() {
62
- var reader;
63
- return _regenerator.default.wrap(function _callee$(_context) {
64
- while (1) {
65
- switch (_context.prev = _context.next) {
66
- case 0:
67
- reader = body.getReader();
68
- _context.next = 3;
69
- return read(controller, reader, 0, totalBytes, onProgress, onDone, onError);
70
- case 3:
71
- case "end":
72
- return _context.stop();
73
- }
74
- }
75
- }, _callee);
76
- }))();
77
- }
78
- });
79
- return _context2.abrupt("return", new Response(progressStream));
80
- case 18:
81
- case "end":
82
- return _context2.stop();
83
- }
75
+ });
76
+ return _context2.abrupt("return", new Response(progressStream));
77
+ case 18:
78
+ case "end":
79
+ return _context2.stop();
84
80
  }
85
81
  }, _callee2);
86
82
  }));
@@ -93,45 +89,43 @@ function _read() {
93
89
  _read = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(controller, reader, loadedBytes, totalBytes, onProgress, onDone, onError) {
94
90
  var _yield$reader$read, done, value, percent;
95
91
  return _regenerator.default.wrap(function _callee3$(_context3) {
96
- while (1) {
97
- switch (_context3.prev = _context3.next) {
98
- case 0:
99
- _context3.prev = 0;
100
- _context3.next = 3;
101
- return reader.read();
102
- case 3:
103
- _yield$reader$read = _context3.sent;
104
- done = _yield$reader$read.done;
105
- value = _yield$reader$read.value;
106
- if (!done) {
107
- _context3.next = 10;
108
- break;
109
- }
110
- onDone();
111
- controller.close();
112
- return _context3.abrupt("return");
113
- case 10:
114
- loadedBytes += value.byteLength;
115
- percent = Math.round(loadedBytes / totalBytes * 100);
116
- onProgress(percent, {
117
- loadedBytes: loadedBytes,
118
- totalBytes: totalBytes
119
- });
120
- controller.enqueue(value);
121
- _context3.next = 16;
122
- return read(controller, reader, loadedBytes, totalBytes, onProgress, onDone, onError);
123
- case 16:
124
- _context3.next = 22;
92
+ while (1) switch (_context3.prev = _context3.next) {
93
+ case 0:
94
+ _context3.prev = 0;
95
+ _context3.next = 3;
96
+ return reader.read();
97
+ case 3:
98
+ _yield$reader$read = _context3.sent;
99
+ done = _yield$reader$read.done;
100
+ value = _yield$reader$read.value;
101
+ if (!done) {
102
+ _context3.next = 10;
125
103
  break;
126
- case 18:
127
- _context3.prev = 18;
128
- _context3.t0 = _context3["catch"](0);
129
- controller.error(_context3.t0);
130
- onError(_context3.t0);
131
- case 22:
132
- case "end":
133
- return _context3.stop();
134
- }
104
+ }
105
+ onDone();
106
+ controller.close();
107
+ return _context3.abrupt("return");
108
+ case 10:
109
+ loadedBytes += value.byteLength;
110
+ percent = Math.round(loadedBytes / totalBytes * 100);
111
+ onProgress(percent, {
112
+ loadedBytes: loadedBytes,
113
+ totalBytes: totalBytes
114
+ });
115
+ controller.enqueue(value);
116
+ _context3.next = 16;
117
+ return read(controller, reader, loadedBytes, totalBytes, onProgress, onDone, onError);
118
+ case 16:
119
+ _context3.next = 22;
120
+ break;
121
+ case 18:
122
+ _context3.prev = 18;
123
+ _context3.t0 = _context3["catch"](0);
124
+ controller.error(_context3.t0);
125
+ onError(_context3.t0);
126
+ case 22:
127
+ case "end":
128
+ return _context3.stop();
135
129
  }
136
130
  }, _callee3, null, [[0, 18]]);
137
131
  }));
@@ -1 +1 @@
1
- {"version":3,"file":"fetch-progress.js","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"],"sources":["../../../../src/lib/progress/fetch-progress.ts"],"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"],"mappings":";;;;;;;;;SAK8BA,aAAa;EAAA;AAAA;AAAA;EAAA,2EAA5B,kBACbC,QAAsC,EACtCC,UAAe;IAAA;MAAA;MAAA;MAAA;MAAA;MAAA;MAAA;IAAA;MAAA;QAAA;UAAA;YACfC,MAAM,8DAAG,YAAM,CAAC,CAAC;YACjBC,OAAO,8DAAG,YAAM,CAAC,CAAC;YAAA;YAAA,OAEDH,QAAQ;UAAA;YAAzBA,QAAQ;YAAA,IACHA,QAAQ,CAACI,EAAE;cAAA;cAAA;YAAA;YAAA,kCAEPJ,QAAQ;UAAA;YAEXK,IAAI,GAAGL,QAAQ,CAACK,IAAI;YAAA,IACrBA,IAAI;cAAA;cAAA;YAAA;YAAA,kCAEAL,QAAQ;UAAA;YAEXM,aAAa,GAAGN,QAAQ,CAACO,OAAO,CAACC,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC;YAC3DC,UAAU,GAAGH,aAAa,IAAII,QAAQ,CAACJ,aAAa,CAAC;YAAA,IACrDA,aAAa,GAAG,CAAC;cAAA;cAAA;YAAA;YAAA,kCACdN,QAAQ;UAAA;YAAA,MAGb,OAAOW,cAAc,KAAK,WAAW,IAAI,CAACN,IAAI,CAACO,SAAS;cAAA;cAAA;YAAA;YAAA,kCACnDZ,QAAQ;UAAA;YAIXa,cAAc,GAAG,IAAIF,cAAc,CAAC;cAClCG,KAAK,iBAACC,UAAU,EAAE;gBAAA;kBAAA;kBAAA;oBAAA;sBAAA;wBAAA;0BAChBC,MAAM,GAAGX,IAAI,CAACO,SAAS,EAAE;0BAAA;0BAAA,OACzBK,IAAI,CAACF,UAAU,EAAEC,MAAM,EAAE,CAAC,EAAEP,UAAU,EAAER,UAAU,EAAEC,MAAM,EAAEC,OAAO,CAAC;wBAAA;wBAAA;0BAAA;sBAAA;oBAAA;kBAAA;gBAAA;cAC5E;YACF,CAAC,CAAC;YAAA,kCAEK,IAAIe,QAAQ,CAACL,cAAc,CAAC;UAAA;UAAA;YAAA;QAAA;MAAA;IAAA;EAAA,CACpC;EAAA;AAAA;AAAA,SAKcI,IAAI;EAAA;AAAA;AAAA;EAAA,kEAAnB,kBAAoBF,UAAU,EAAEC,MAAM,EAAEG,WAAW,EAAEV,UAAU,EAAER,UAAU,EAAEC,MAAM,EAAEC,OAAO;IAAA;IAAA;MAAA;QAAA;UAAA;YAAA;YAAA;YAAA,OAE5Da,MAAM,CAACC,IAAI,EAAE;UAAA;YAAA;YAAlCG,IAAI,sBAAJA,IAAI;YAAEC,KAAK,sBAALA,KAAK;YAAA,KACdD,IAAI;cAAA;cAAA;YAAA;YACNlB,MAAM,EAAE;YACRa,UAAU,CAACO,KAAK,EAAE;YAAC;UAAA;YAGrBH,WAAW,IAAIE,KAAK,CAACE,UAAU;YACzBC,OAAO,GAAGC,IAAI,CAACC,KAAK,CAAEP,WAAW,GAAGV,UAAU,GAAI,GAAG,CAAC;YAC5DR,UAAU,CAACuB,OAAO,EAAE;cAACL,WAAW,EAAXA,WAAW;cAAEV,UAAU,EAAVA;YAAU,CAAC,CAAC;YAC9CM,UAAU,CAACY,OAAO,CAACN,KAAK,CAAC;YAAC;YAAA,OACpBJ,IAAI,CAACF,UAAU,EAAEC,MAAM,EAAEG,WAAW,EAAEV,UAAU,EAAER,UAAU,EAAEC,MAAM,EAAEC,OAAO,CAAC;UAAA;YAAA;YAAA;UAAA;YAAA;YAAA;YAEpFY,UAAU,CAACa,KAAK,cAAO;YACvBzB,OAAO,cAAO;UAAC;UAAA;YAAA;QAAA;MAAA;IAAA;EAAA,CAElB;EAAA;AAAA"}
1
+ {"version":3,"file":"fetch-progress.js","names":["fetchProgress","_x","_x2","_fetchProgress","apply","arguments","_asyncToGenerator2","default","_regenerator","mark","_callee2","response","onProgress","onDone","onError","body","contentLength","totalBytes","progressStream","_args2","wrap","_callee2$","_context2","prev","next","length","undefined","sent","ok","abrupt","headers","get","parseInt","ReadableStream","getReader","start","controller","_callee","reader","_callee$","_context","read","stop","Response","_x3","_x4","_x5","_x6","_x7","_x8","_x9","_read","_callee3","loadedBytes","_yield$reader$read","done","value","percent","_callee3$","_context3","close","byteLength","Math","round","enqueue","t0","error"],"sources":["../../../../src/lib/progress/fetch-progress.ts"],"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) : 0;\n if (!(totalBytes > 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"],"mappings":"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"}
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.log = void 0;
7
7
  var _log = require("@probe.gl/log");
8
-
9
8
  var log = new _log.Log({
10
9
  id: 'loaders.gl'
11
10
  });
@@ -1 +1 @@
1
- {"version":3,"file":"log.js","names":["log","Log","id"],"sources":["../../../../src/lib/utils/log.ts"],"sourcesContent":["// loaders.gl, MIT license\nimport {Log} from '@probe.gl/log';\n\nexport const log = new Log({id: 'loaders.gl'});\n"],"mappings":";;;;;;AACA;;AAEO,IAAMA,GAAG,GAAG,IAAIC,QAAG,CAAC;EAACC,EAAE,EAAE;AAAY,CAAC,CAAC;AAAC"}
1
+ {"version":3,"file":"log.js","names":["_log","require","log","Log","id","exports"],"sources":["../../../../src/lib/utils/log.ts"],"sourcesContent":["// loaders.gl, MIT license\nimport {Log} from '@probe.gl/log';\n\nexport const log = new Log({id: 'loaders.gl'});\n"],"mappings":";;;;;;AACA,IAAAA,IAAA,GAAAC,OAAA;AAEO,IAAMC,GAAG,GAAG,IAAIC,QAAG,CAAC;EAACC,EAAE,EAAE;AAAY,CAAC,CAAC;AAACC,OAAA,CAAAH,GAAA,GAAAA,GAAA"}
@@ -5,10 +5,8 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.parseMIMEType = parseMIMEType;
7
7
  exports.parseMIMETypeFromURL = parseMIMETypeFromURL;
8
-
9
8
  var DATA_URL_PATTERN = /^data:([-\w.]+\/[-\w.+]+)(;|,)/;
10
9
  var MIME_TYPE_PATTERN = /^([-\w.]+\/[-\w.+]+)/;
11
-
12
10
  function parseMIMEType(mimeString) {
13
11
  var matches = MIME_TYPE_PATTERN.exec(mimeString);
14
12
  if (matches) {
@@ -16,7 +14,6 @@ function parseMIMEType(mimeString) {
16
14
  }
17
15
  return mimeString;
18
16
  }
19
-
20
17
  function parseMIMETypeFromURL(url) {
21
18
  var matches = DATA_URL_PATTERN.exec(url);
22
19
  if (matches) {
@@ -1 +1 @@
1
- {"version":3,"file":"mime-type-utils.js","names":["DATA_URL_PATTERN","MIME_TYPE_PATTERN","parseMIMEType","mimeString","matches","exec","parseMIMETypeFromURL","url"],"sources":["../../../../src/lib/utils/mime-type-utils.ts"],"sourcesContent":["// TODO - build/integrate proper MIME type parsing\n// https://mimesniff.spec.whatwg.org/\n\nconst DATA_URL_PATTERN = /^data:([-\\w.]+\\/[-\\w.+]+)(;|,)/;\nconst MIME_TYPE_PATTERN = /^([-\\w.]+\\/[-\\w.+]+)/;\n\n/**\n * Remove extra data like `charset` from MIME types\n * @param mimeString\n * @returns A clean MIME type, or an empty string\n *\n * @todo - handle more advanced MIMETYpes, multiple types\n * @todo - extract charset etc\n */\nexport function parseMIMEType(mimeString: string): string {\n // If resource is a data url, extract any embedded mime type\n const matches = MIME_TYPE_PATTERN.exec(mimeString);\n if (matches) {\n return matches[1];\n }\n return mimeString;\n}\n\n/**\n * Extract MIME type from data URL\n *\n * @param mimeString\n * @returns A clean MIME type, or an empty string\n *\n * @todo - handle more advanced MIMETYpes, multiple types\n * @todo - extract charset etc\n */\nexport function parseMIMETypeFromURL(url: string): string {\n // If resource is a data URL, extract any embedded mime type\n const matches = DATA_URL_PATTERN.exec(url);\n if (matches) {\n return matches[1];\n }\n return '';\n}\n"],"mappings":";;;;;;;;AAGA,IAAMA,gBAAgB,GAAG,gCAAgC;AACzD,IAAMC,iBAAiB,GAAG,sBAAsB;;AAUzC,SAASC,aAAa,CAACC,UAAkB,EAAU;EAExD,IAAMC,OAAO,GAAGH,iBAAiB,CAACI,IAAI,CAACF,UAAU,CAAC;EAClD,IAAIC,OAAO,EAAE;IACX,OAAOA,OAAO,CAAC,CAAC,CAAC;EACnB;EACA,OAAOD,UAAU;AACnB;;AAWO,SAASG,oBAAoB,CAACC,GAAW,EAAU;EAExD,IAAMH,OAAO,GAAGJ,gBAAgB,CAACK,IAAI,CAACE,GAAG,CAAC;EAC1C,IAAIH,OAAO,EAAE;IACX,OAAOA,OAAO,CAAC,CAAC,CAAC;EACnB;EACA,OAAO,EAAE;AACX"}
1
+ {"version":3,"file":"mime-type-utils.js","names":["DATA_URL_PATTERN","MIME_TYPE_PATTERN","parseMIMEType","mimeString","matches","exec","parseMIMETypeFromURL","url"],"sources":["../../../../src/lib/utils/mime-type-utils.ts"],"sourcesContent":["// TODO - build/integrate proper MIME type parsing\n// https://mimesniff.spec.whatwg.org/\n\nconst DATA_URL_PATTERN = /^data:([-\\w.]+\\/[-\\w.+]+)(;|,)/;\nconst MIME_TYPE_PATTERN = /^([-\\w.]+\\/[-\\w.+]+)/;\n\n/**\n * Remove extra data like `charset` from MIME types\n * @param mimeString\n * @returns A clean MIME type, or an empty string\n *\n * @todo - handle more advanced MIMETYpes, multiple types\n * @todo - extract charset etc\n */\nexport function parseMIMEType(mimeString: string): string {\n // If resource is a data url, extract any embedded mime type\n const matches = MIME_TYPE_PATTERN.exec(mimeString);\n if (matches) {\n return matches[1];\n }\n return mimeString;\n}\n\n/**\n * Extract MIME type from data URL\n *\n * @param mimeString\n * @returns A clean MIME type, or an empty string\n *\n * @todo - handle more advanced MIMETYpes, multiple types\n * @todo - extract charset etc\n */\nexport function parseMIMETypeFromURL(url: string): string {\n // If resource is a data URL, extract any embedded mime type\n const matches = DATA_URL_PATTERN.exec(url);\n if (matches) {\n return matches[1];\n }\n return '';\n}\n"],"mappings":";;;;;;;AAGA,IAAMA,gBAAgB,GAAG,gCAAgC;AACzD,IAAMC,iBAAiB,GAAG,sBAAsB;AAUzC,SAASC,aAAaA,CAACC,UAAkB,EAAU;EAExD,IAAMC,OAAO,GAAGH,iBAAiB,CAACI,IAAI,CAACF,UAAU,CAAC;EAClD,IAAIC,OAAO,EAAE;IACX,OAAOA,OAAO,CAAC,CAAC,CAAC;EACnB;EACA,OAAOD,UAAU;AACnB;AAWO,SAASG,oBAAoBA,CAACC,GAAW,EAAU;EAExD,IAAMH,OAAO,GAAGJ,gBAAgB,CAACK,IAAI,CAACE,GAAG,CAAC;EAC1C,IAAIH,OAAO,EAAE;IACX,OAAOA,OAAO,CAAC,CAAC,CAAC;EACnB;EACA,OAAO,EAAE;AACX"}
@@ -8,7 +8,6 @@ exports.getResourceUrlAndType = getResourceUrlAndType;
8
8
  var _isType = require("../../javascript-utils/is-type");
9
9
  var _mimeTypeUtils = require("./mime-type-utils");
10
10
  var QUERY_STRING_PATTERN = /\?.*/;
11
-
12
11
  function getResourceUrlAndType(resource) {
13
12
  if ((0, _isType.isResponse)(resource)) {
14
13
  var url = stripQueryString(resource.url || '');
@@ -18,7 +17,6 @@ function getResourceUrlAndType(resource) {
18
17
  type: (0, _mimeTypeUtils.parseMIMEType)(contentTypeHeader) || (0, _mimeTypeUtils.parseMIMETypeFromURL)(url)
19
18
  };
20
19
  }
21
-
22
20
  if ((0, _isType.isBlob)(resource)) {
23
21
  return {
24
22
  url: stripQueryString(resource.name || ''),
@@ -31,13 +29,11 @@ function getResourceUrlAndType(resource) {
31
29
  type: (0, _mimeTypeUtils.parseMIMETypeFromURL)(resource)
32
30
  };
33
31
  }
34
-
35
32
  return {
36
33
  url: '',
37
34
  type: ''
38
35
  };
39
36
  }
40
-
41
37
  function getResourceContentLength(resource) {
42
38
  if ((0, _isType.isResponse)(resource)) {
43
39
  return resource.headers['content-length'] || -1;
@@ -1 +1 @@
1
- {"version":3,"file":"resource-utils.js","names":["QUERY_STRING_PATTERN","getResourceUrlAndType","resource","isResponse","url","stripQueryString","contentTypeHeader","headers","get","type","parseMIMEType","parseMIMETypeFromURL","isBlob","name","getResourceContentLength","size","length","ArrayBuffer","byteLength","isView","replace"],"sources":["../../../../src/lib/utils/resource-utils.ts"],"sourcesContent":["import {isResponse, isBlob} from '../../javascript-utils/is-type';\nimport {parseMIMEType, parseMIMETypeFromURL} from './mime-type-utils';\n\nconst QUERY_STRING_PATTERN = /\\?.*/;\n\n/**\n * Returns an object with `url` and (MIME) `type` fields\n * If it cannot determine url or type, the corresponding value will be an empty string\n *\n * @param resource Any type, but only Responses, string URLs and data URLs are processed\n *\n * @todo string parameters are assumed to be URLs\n */\nexport function getResourceUrlAndType(resource: any): {url: string; type: string} {\n // If resource is a response, it contains the information directly\n if (isResponse(resource)) {\n const url = stripQueryString(resource.url || '');\n const contentTypeHeader = resource.headers.get('content-type') || '';\n return {\n url,\n type: parseMIMEType(contentTypeHeader) || parseMIMETypeFromURL(url)\n };\n }\n\n // If the resource is a Blob or a File (subclass of Blob)\n if (isBlob(resource)) {\n return {\n // File objects have a \"name\" property. Blob objects don't have any\n // url (name) information\n url: stripQueryString(resource.name || ''),\n type: resource.type || ''\n };\n }\n\n if (typeof resource === 'string') {\n return {\n // TODO this could mess up data URL but it doesn't matter as it is just used for inference\n url: stripQueryString(resource),\n // If a data url\n type: parseMIMETypeFromURL(resource)\n };\n }\n\n // Unknown\n return {\n url: '',\n type: ''\n };\n}\n\n/**\n * Returns (approximate) content length for a resource if it can be determined.\n * Returns -1 if content length cannot be determined.\n * @param resource\n\n * @note string parameters are NOT assumed to be URLs\n */\nexport function getResourceContentLength(resource: any): number {\n if (isResponse(resource)) {\n return resource.headers['content-length'] || -1;\n }\n if (isBlob(resource)) {\n return resource.size;\n }\n if (typeof resource === 'string') {\n // TODO - handle data URL?\n return resource.length;\n }\n if (resource instanceof ArrayBuffer) {\n return resource.byteLength;\n }\n if (ArrayBuffer.isView(resource)) {\n return resource.byteLength;\n }\n return -1;\n}\n\nfunction stripQueryString(url) {\n return url.replace(QUERY_STRING_PATTERN, '');\n}\n"],"mappings":";;;;;;;AAAA;AACA;AAEA,IAAMA,oBAAoB,GAAG,MAAM;;AAU5B,SAASC,qBAAqB,CAACC,QAAa,EAA+B;EAEhF,IAAI,IAAAC,kBAAU,EAACD,QAAQ,CAAC,EAAE;IACxB,IAAME,GAAG,GAAGC,gBAAgB,CAACH,QAAQ,CAACE,GAAG,IAAI,EAAE,CAAC;IAChD,IAAME,iBAAiB,GAAGJ,QAAQ,CAACK,OAAO,CAACC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE;IACpE,OAAO;MACLJ,GAAG,EAAHA,GAAG;MACHK,IAAI,EAAE,IAAAC,4BAAa,EAACJ,iBAAiB,CAAC,IAAI,IAAAK,mCAAoB,EAACP,GAAG;IACpE,CAAC;EACH;;EAGA,IAAI,IAAAQ,cAAM,EAACV,QAAQ,CAAC,EAAE;IACpB,OAAO;MAGLE,GAAG,EAAEC,gBAAgB,CAACH,QAAQ,CAACW,IAAI,IAAI,EAAE,CAAC;MAC1CJ,IAAI,EAAEP,QAAQ,CAACO,IAAI,IAAI;IACzB,CAAC;EACH;EAEA,IAAI,OAAOP,QAAQ,KAAK,QAAQ,EAAE;IAChC,OAAO;MAELE,GAAG,EAAEC,gBAAgB,CAACH,QAAQ,CAAC;MAE/BO,IAAI,EAAE,IAAAE,mCAAoB,EAACT,QAAQ;IACrC,CAAC;EACH;;EAGA,OAAO;IACLE,GAAG,EAAE,EAAE;IACPK,IAAI,EAAE;EACR,CAAC;AACH;;AASO,SAASK,wBAAwB,CAACZ,QAAa,EAAU;EAC9D,IAAI,IAAAC,kBAAU,EAACD,QAAQ,CAAC,EAAE;IACxB,OAAOA,QAAQ,CAACK,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;EACjD;EACA,IAAI,IAAAK,cAAM,EAACV,QAAQ,CAAC,EAAE;IACpB,OAAOA,QAAQ,CAACa,IAAI;EACtB;EACA,IAAI,OAAOb,QAAQ,KAAK,QAAQ,EAAE;IAEhC,OAAOA,QAAQ,CAACc,MAAM;EACxB;EACA,IAAId,QAAQ,YAAYe,WAAW,EAAE;IACnC,OAAOf,QAAQ,CAACgB,UAAU;EAC5B;EACA,IAAID,WAAW,CAACE,MAAM,CAACjB,QAAQ,CAAC,EAAE;IAChC,OAAOA,QAAQ,CAACgB,UAAU;EAC5B;EACA,OAAO,CAAC,CAAC;AACX;AAEA,SAASb,gBAAgB,CAACD,GAAG,EAAE;EAC7B,OAAOA,GAAG,CAACgB,OAAO,CAACpB,oBAAoB,EAAE,EAAE,CAAC;AAC9C"}
1
+ {"version":3,"file":"resource-utils.js","names":["_isType","require","_mimeTypeUtils","QUERY_STRING_PATTERN","getResourceUrlAndType","resource","isResponse","url","stripQueryString","contentTypeHeader","headers","get","type","parseMIMEType","parseMIMETypeFromURL","isBlob","name","getResourceContentLength","size","length","ArrayBuffer","byteLength","isView","replace"],"sources":["../../../../src/lib/utils/resource-utils.ts"],"sourcesContent":["import {isResponse, isBlob} from '../../javascript-utils/is-type';\nimport {parseMIMEType, parseMIMETypeFromURL} from './mime-type-utils';\n\nconst QUERY_STRING_PATTERN = /\\?.*/;\n\n/**\n * Returns an object with `url` and (MIME) `type` fields\n * If it cannot determine url or type, the corresponding value will be an empty string\n *\n * @param resource Any type, but only Responses, string URLs and data URLs are processed\n *\n * @todo string parameters are assumed to be URLs\n */\nexport function getResourceUrlAndType(resource: any): {url: string; type: string} {\n // If resource is a response, it contains the information directly\n if (isResponse(resource)) {\n const url = stripQueryString(resource.url || '');\n const contentTypeHeader = resource.headers.get('content-type') || '';\n return {\n url,\n type: parseMIMEType(contentTypeHeader) || parseMIMETypeFromURL(url)\n };\n }\n\n // If the resource is a Blob or a File (subclass of Blob)\n if (isBlob(resource)) {\n return {\n // File objects have a \"name\" property. Blob objects don't have any\n // url (name) information\n url: stripQueryString(resource.name || ''),\n type: resource.type || ''\n };\n }\n\n if (typeof resource === 'string') {\n return {\n // TODO this could mess up data URL but it doesn't matter as it is just used for inference\n url: stripQueryString(resource),\n // If a data url\n type: parseMIMETypeFromURL(resource)\n };\n }\n\n // Unknown\n return {\n url: '',\n type: ''\n };\n}\n\n/**\n * Returns (approximate) content length for a resource if it can be determined.\n * Returns -1 if content length cannot be determined.\n * @param resource\n\n * @note string parameters are NOT assumed to be URLs\n */\nexport function getResourceContentLength(resource: any): number {\n if (isResponse(resource)) {\n return resource.headers['content-length'] || -1;\n }\n if (isBlob(resource)) {\n return resource.size;\n }\n if (typeof resource === 'string') {\n // TODO - handle data URL?\n return resource.length;\n }\n if (resource instanceof ArrayBuffer) {\n return resource.byteLength;\n }\n if (ArrayBuffer.isView(resource)) {\n return resource.byteLength;\n }\n return -1;\n}\n\nfunction stripQueryString(url) {\n return url.replace(QUERY_STRING_PATTERN, '');\n}\n"],"mappings":";;;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,cAAA,GAAAD,OAAA;AAEA,IAAME,oBAAoB,GAAG,MAAM;AAU5B,SAASC,qBAAqBA,CAACC,QAAa,EAA+B;EAEhF,IAAI,IAAAC,kBAAU,EAACD,QAAQ,CAAC,EAAE;IACxB,IAAME,GAAG,GAAGC,gBAAgB,CAACH,QAAQ,CAACE,GAAG,IAAI,EAAE,CAAC;IAChD,IAAME,iBAAiB,GAAGJ,QAAQ,CAACK,OAAO,CAACC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE;IACpE,OAAO;MACLJ,GAAG,EAAHA,GAAG;MACHK,IAAI,EAAE,IAAAC,4BAAa,EAACJ,iBAAiB,CAAC,IAAI,IAAAK,mCAAoB,EAACP,GAAG;IACpE,CAAC;EACH;EAGA,IAAI,IAAAQ,cAAM,EAACV,QAAQ,CAAC,EAAE;IACpB,OAAO;MAGLE,GAAG,EAAEC,gBAAgB,CAACH,QAAQ,CAACW,IAAI,IAAI,EAAE,CAAC;MAC1CJ,IAAI,EAAEP,QAAQ,CAACO,IAAI,IAAI;IACzB,CAAC;EACH;EAEA,IAAI,OAAOP,QAAQ,KAAK,QAAQ,EAAE;IAChC,OAAO;MAELE,GAAG,EAAEC,gBAAgB,CAACH,QAAQ,CAAC;MAE/BO,IAAI,EAAE,IAAAE,mCAAoB,EAACT,QAAQ;IACrC,CAAC;EACH;EAGA,OAAO;IACLE,GAAG,EAAE,EAAE;IACPK,IAAI,EAAE;EACR,CAAC;AACH;AASO,SAASK,wBAAwBA,CAACZ,QAAa,EAAU;EAC9D,IAAI,IAAAC,kBAAU,EAACD,QAAQ,CAAC,EAAE;IACxB,OAAOA,QAAQ,CAACK,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;EACjD;EACA,IAAI,IAAAK,cAAM,EAACV,QAAQ,CAAC,EAAE;IACpB,OAAOA,QAAQ,CAACa,IAAI;EACtB;EACA,IAAI,OAAOb,QAAQ,KAAK,QAAQ,EAAE;IAEhC,OAAOA,QAAQ,CAACc,MAAM;EACxB;EACA,IAAId,QAAQ,YAAYe,WAAW,EAAE;IACnC,OAAOf,QAAQ,CAACgB,UAAU;EAC5B;EACA,IAAID,WAAW,CAACE,MAAM,CAACjB,QAAQ,CAAC,EAAE;IAChC,OAAOA,QAAQ,CAACgB,UAAU;EAC5B;EACA,OAAO,CAAC,CAAC;AACX;AAEA,SAASb,gBAAgBA,CAACD,GAAG,EAAE;EAC7B,OAAOA,GAAG,CAACgB,OAAO,CAACpB,oBAAoB,EAAE,EAAE,CAAC;AAC9C"}