@loaders.gl/core 3.3.0-alpha.4 → 3.3.0-alpha.6
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.
- package/dist/dist.min.js +211 -822
- package/dist/es5/bundle.js +0 -1
- package/dist/es5/bundle.js.map +1 -1
- package/dist/es5/core-addons/write-file-browser.js +2 -0
- package/dist/es5/core-addons/write-file-browser.js.map +1 -1
- package/dist/es5/index.js +108 -130
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/iterators/batch-iterators/timed-batch-iterator.js +34 -69
- package/dist/es5/iterators/batch-iterators/timed-batch-iterator.js.map +1 -1
- package/dist/es5/iterators/make-iterator/make-array-buffer-iterator.js +9 -17
- package/dist/es5/iterators/make-iterator/make-array-buffer-iterator.js.map +1 -1
- package/dist/es5/iterators/make-iterator/make-blob-iterator.js +0 -11
- package/dist/es5/iterators/make-iterator/make-blob-iterator.js.map +1 -1
- package/dist/es5/iterators/make-iterator/make-iterator.js +0 -11
- package/dist/es5/iterators/make-iterator/make-iterator.js.map +1 -1
- package/dist/es5/iterators/make-iterator/make-stream-iterator.js +29 -75
- package/dist/es5/iterators/make-iterator/make-stream-iterator.js.map +1 -1
- package/dist/es5/iterators/make-iterator/make-string-iterator.js +1 -8
- package/dist/es5/iterators/make-iterator/make-string-iterator.js.map +1 -1
- package/dist/es5/iterators/make-stream/make-dom-stream.js +2 -17
- package/dist/es5/iterators/make-stream/make-dom-stream.js.map +1 -1
- package/dist/es5/iterators/make-stream/make-node-stream.js +0 -50
- package/dist/es5/iterators/make-stream/make-node-stream.js.map +1 -1
- package/dist/es5/javascript-utils/is-type.js +1 -34
- package/dist/es5/javascript-utils/is-type.js.map +1 -1
- package/dist/es5/lib/api/encode.js +42 -118
- package/dist/es5/lib/api/encode.js.map +1 -1
- package/dist/es5/lib/api/load-in-batches.js +1 -15
- package/dist/es5/lib/api/load-in-batches.js.map +1 -1
- package/dist/es5/lib/api/load.js +0 -18
- package/dist/es5/lib/api/load.js.map +1 -1
- package/dist/es5/lib/api/loader-options.js +4 -5
- package/dist/es5/lib/api/loader-options.js.map +1 -1
- package/dist/es5/lib/api/parse-in-batches.js +122 -196
- package/dist/es5/lib/api/parse-in-batches.js.map +1 -1
- package/dist/es5/lib/api/parse-sync.js +2 -16
- package/dist/es5/lib/api/parse-sync.js.map +1 -1
- package/dist/es5/lib/api/parse.js +3 -42
- package/dist/es5/lib/api/parse.js.map +1 -1
- package/dist/es5/lib/api/register-loaders.js +3 -14
- package/dist/es5/lib/api/register-loaders.js.map +1 -1
- package/dist/es5/lib/api/save.js +0 -11
- package/dist/es5/lib/api/save.js.map +1 -1
- package/dist/es5/lib/api/select-loader.js +18 -91
- package/dist/es5/lib/api/select-loader.js.map +1 -1
- package/dist/es5/lib/common.js.map +1 -1
- package/dist/es5/lib/fetch/fetch-error-message.js +1 -15
- package/dist/es5/lib/fetch/fetch-error-message.js.map +1 -1
- package/dist/es5/lib/fetch/fetch-file.js +0 -14
- package/dist/es5/lib/fetch/fetch-file.js.map +1 -1
- package/dist/es5/lib/fetch/read-array-buffer.js +0 -20
- package/dist/es5/lib/fetch/read-array-buffer.js.map +1 -1
- package/dist/es5/lib/fetch/read-file.js +0 -3
- package/dist/es5/lib/fetch/read-file.js.map +1 -1
- package/dist/es5/lib/fetch/write-file.js +0 -13
- package/dist/es5/lib/fetch/write-file.js.map +1 -1
- package/dist/es5/lib/filesystems/browser-filesystem.js +9 -55
- package/dist/es5/lib/filesystems/browser-filesystem.js.map +1 -1
- package/dist/es5/lib/filesystems/filesystem.js.map +1 -1
- package/dist/es5/lib/filesystems/read-array-buffer.js +0 -10
- package/dist/es5/lib/filesystems/read-array-buffer.js.map +1 -1
- package/dist/es5/lib/init.js +1 -4
- package/dist/es5/lib/init.js.map +1 -1
- package/dist/es5/lib/loader-utils/check-errors.js +0 -14
- package/dist/es5/lib/loader-utils/check-errors.js.map +1 -1
- package/dist/es5/lib/loader-utils/get-data.js +2 -64
- package/dist/es5/lib/loader-utils/get-data.js.map +1 -1
- package/dist/es5/lib/loader-utils/loader-context.js +2 -15
- package/dist/es5/lib/loader-utils/loader-context.js.map +1 -1
- package/dist/es5/lib/loader-utils/loggers.js +2 -20
- package/dist/es5/lib/loader-utils/loggers.js.map +1 -1
- package/dist/es5/lib/loader-utils/normalize-loader.js +4 -16
- package/dist/es5/lib/loader-utils/normalize-loader.js.map +1 -1
- package/dist/es5/lib/loader-utils/option-defaults.js +2 -3
- package/dist/es5/lib/loader-utils/option-defaults.js.map +1 -1
- package/dist/es5/lib/loader-utils/option-utils.js +10 -38
- package/dist/es5/lib/loader-utils/option-utils.js.map +1 -1
- package/dist/es5/lib/progress/fetch-progress.js +6 -35
- package/dist/es5/lib/progress/fetch-progress.js.map +1 -1
- package/dist/es5/lib/utils/log.js +0 -1
- package/dist/es5/lib/utils/log.js.map +1 -1
- package/dist/es5/lib/utils/mime-type-utils.js +1 -4
- package/dist/es5/lib/utils/mime-type-utils.js.map +1 -1
- package/dist/es5/lib/utils/resource-utils.js +1 -11
- package/dist/es5/lib/utils/resource-utils.js.map +1 -1
- package/dist/es5/lib/utils/response-utils.js +1 -47
- package/dist/es5/lib/utils/response-utils.js.map +1 -1
- package/dist/es5/null-loader.js +32 -67
- package/dist/es5/null-loader.js.map +1 -1
- package/dist/es5/workers/null-worker.js +0 -2
- package/dist/es5/workers/null-worker.js.map +1 -1
- package/dist/esm/bundle.js +1 -1
- package/dist/esm/bundle.js.map +1 -1
- package/dist/esm/core-addons/write-file-browser.js.map +1 -1
- package/dist/esm/index.js +11 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/iterators/batch-iterators/timed-batch-iterator.js +1 -3
- package/dist/esm/iterators/batch-iterators/timed-batch-iterator.js.map +1 -1
- package/dist/esm/iterators/make-iterator/make-array-buffer-iterator.js +5 -2
- package/dist/esm/iterators/make-iterator/make-array-buffer-iterator.js.map +1 -1
- package/dist/esm/iterators/make-iterator/make-blob-iterator.js +1 -1
- package/dist/esm/iterators/make-iterator/make-blob-iterator.js.map +1 -1
- package/dist/esm/iterators/make-iterator/make-iterator.js +1 -5
- package/dist/esm/iterators/make-iterator/make-iterator.js.map +1 -1
- package/dist/esm/iterators/make-iterator/make-stream-iterator.js +1 -5
- package/dist/esm/iterators/make-iterator/make-stream-iterator.js.map +1 -1
- package/dist/esm/iterators/make-iterator/make-string-iterator.js +2 -1
- package/dist/esm/iterators/make-iterator/make-string-iterator.js.map +1 -1
- package/dist/esm/iterators/make-stream/make-dom-stream.js +3 -6
- package/dist/esm/iterators/make-stream/make-dom-stream.js.map +1 -1
- package/dist/esm/iterators/make-stream/make-node-stream.js +0 -18
- package/dist/esm/iterators/make-stream/make-node-stream.js.map +1 -1
- package/dist/esm/javascript-utils/is-type.js +4 -2
- package/dist/esm/javascript-utils/is-type.js.map +1 -1
- package/dist/esm/lib/api/encode.js +8 -15
- package/dist/esm/lib/api/encode.js.map +1 -1
- package/dist/esm/lib/api/load-in-batches.js +1 -2
- package/dist/esm/lib/api/load-in-batches.js.map +1 -1
- package/dist/esm/lib/api/load.js +2 -1
- package/dist/esm/lib/api/load.js.map +1 -1
- package/dist/esm/lib/api/loader-options.js.map +1 -1
- package/dist/esm/lib/api/parse-in-batches.js +12 -12
- package/dist/esm/lib/api/parse-in-batches.js.map +1 -1
- package/dist/esm/lib/api/parse-sync.js +3 -5
- package/dist/esm/lib/api/parse-sync.js.map +1 -1
- package/dist/esm/lib/api/parse.js +5 -5
- package/dist/esm/lib/api/parse.js.map +1 -1
- package/dist/esm/lib/api/register-loaders.js +1 -2
- package/dist/esm/lib/api/register-loaders.js.map +1 -1
- package/dist/esm/lib/api/save.js.map +1 -1
- package/dist/esm/lib/api/select-loader.js +17 -35
- package/dist/esm/lib/api/select-loader.js.map +1 -1
- package/dist/esm/lib/common.js.map +1 -1
- package/dist/esm/lib/fetch/fetch-error-message.js +0 -3
- package/dist/esm/lib/fetch/fetch-error-message.js.map +1 -1
- package/dist/esm/lib/fetch/fetch-file.js +1 -3
- package/dist/esm/lib/fetch/fetch-file.js.map +1 -1
- package/dist/esm/lib/fetch/read-array-buffer.js +3 -6
- package/dist/esm/lib/fetch/read-array-buffer.js.map +1 -1
- package/dist/esm/lib/fetch/read-file.js +4 -2
- package/dist/esm/lib/fetch/read-file.js.map +1 -1
- package/dist/esm/lib/fetch/write-file.js +1 -4
- package/dist/esm/lib/fetch/write-file.js.map +1 -1
- package/dist/esm/lib/filesystems/browser-filesystem.js +6 -19
- package/dist/esm/lib/filesystems/browser-filesystem.js.map +1 -1
- package/dist/esm/lib/filesystems/filesystem.js.map +1 -1
- package/dist/esm/lib/filesystems/read-array-buffer.js +2 -1
- package/dist/esm/lib/filesystems/read-array-buffer.js.map +1 -1
- package/dist/esm/lib/init.js +3 -2
- package/dist/esm/lib/init.js.map +1 -1
- package/dist/esm/lib/loader-utils/check-errors.js +2 -5
- package/dist/esm/lib/loader-utils/check-errors.js.map +1 -1
- package/dist/esm/lib/loader-utils/get-data.js +3 -23
- package/dist/esm/lib/loader-utils/get-data.js.map +1 -1
- package/dist/esm/lib/loader-utils/loader-context.js +4 -6
- package/dist/esm/lib/loader-utils/loader-context.js.map +1 -1
- package/dist/esm/lib/loader-utils/loggers.js +18 -13
- package/dist/esm/lib/loader-utils/loggers.js.map +1 -1
- package/dist/esm/lib/loader-utils/normalize-loader.js +6 -9
- package/dist/esm/lib/loader-utils/normalize-loader.js.map +1 -1
- package/dist/esm/lib/loader-utils/option-defaults.js +2 -0
- package/dist/esm/lib/loader-utils/option-defaults.js.map +1 -1
- package/dist/esm/lib/loader-utils/option-utils.js +14 -14
- package/dist/esm/lib/loader-utils/option-utils.js.map +1 -1
- package/dist/esm/lib/progress/fetch-progress.js +5 -10
- package/dist/esm/lib/progress/fetch-progress.js.map +1 -1
- package/dist/esm/lib/utils/log.js +1 -0
- package/dist/esm/lib/utils/log.js.map +1 -1
- package/dist/esm/lib/utils/mime-type-utils.js +4 -4
- package/dist/esm/lib/utils/mime-type-utils.js.map +1 -1
- package/dist/esm/lib/utils/resource-utils.js +2 -7
- package/dist/esm/lib/utils/resource-utils.js.map +1 -1
- package/dist/esm/lib/utils/response-utils.js +5 -18
- package/dist/esm/lib/utils/response-utils.js.map +1 -1
- package/dist/esm/null-loader.js +2 -1
- package/dist/esm/null-loader.js.map +1 -1
- package/dist/esm/workers/null-worker.js.map +1 -1
- package/dist/iterators/make-stream/make-dom-stream.d.ts.map +1 -1
- package/dist/iterators/make-stream/make-dom-stream.js +1 -0
- package/dist/lib/loader-utils/loggers.d.ts +2 -1
- package/dist/lib/loader-utils/loggers.d.ts.map +1 -1
- package/dist/null-worker.js +1 -1
- package/package.json +4 -4
- package/src/iterators/make-stream/make-dom-stream.ts +1 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"normalize-loader.js","names":["isLoaderObject","loader","Array","isArray","hasExtensions","extensions","normalizeLoader","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;AAAgD;AAAA;AAEzC,SAASA,cAAc,CAACC,MAAY,EAAW;EAAA;EACpD,IAAI,CAACA,MAAM,EAAE;IACX,OAAO,KAAK;EACd;EAEA,IAAIC,KAAK,CAACC,OAAO,CAACF,MAAM,CAAC,EAAE;IACzBA,MAAM,GAAGA,MAAM,CAAC,CAAC,CAAC;EACpB;EAEA,IAAMG,aAAa,GAAGF,KAAK,CAACC,OAAO,YAACF,MAAM,4CAAN,QAAQI,UAAU,CAAC;;EAWvD,OAAOD,aAAa;AACtB;AAEO,SAASE,eAAe,CAACL,MAAc,EAAU;EAAA;EAItD,IAAAM,mBAAM,EAACN,MAAM,EAAE,aAAa,CAAC;EAC7B,IAAAM,mBAAM,EAACP,cAAc,CAACC,MAAM,CAAC,EAAE,gBAAgB,CAAC;;EAKhD,IAAIO,OAAO;EACX,IAAIN,KAAK,CAACC,OAAO,CAACF,MAAM,CAAC,EAAE;IACzBO,OAAO,GAAGP,MAAM,CAAC,CAAC,CAAC;IACnBA,MAAM,GAAGA,MAAM,CAAC,CAAC,CAAC;IAClBA,MAAM,mCACDA,MAAM;MACTO,OAAO,kCAAMP,MAAM,CAACO,OAAO,GAAKA,OAAO;IAAC,EACzC;EACH;;EAMA,IAAI,YAAAP,MAAM,qCAAN,SAAQQ,aAAa,gBAAIR,MAAM,qCAAN,SAAQS,SAAS,EAAE;IAC9CT,MAAM,CAACU,IAAI,GAAG,IAAI;EACpB;EAEA,IAAI,CAACV,MAAM,CAACU,IAAI,EAAE;IAChBV,MAAM,CAACW,MAAM,GAAG,IAAI;EACtB;EAEA,OAAOX,MAAM;AACf"}
|
|
@@ -4,16 +4,14 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.REMOVED_LOADER_OPTIONS = exports.DEFAULT_LOADER_OPTIONS = void 0;
|
|
7
|
-
|
|
8
7
|
var _loaderUtils = require("@loaders.gl/loader-utils");
|
|
9
|
-
|
|
10
8
|
var _loggers = require("./loggers");
|
|
11
|
-
|
|
12
9
|
var DEFAULT_LOADER_OPTIONS = {
|
|
13
10
|
fetch: null,
|
|
14
11
|
mimeType: undefined,
|
|
15
12
|
nothrow: false,
|
|
16
13
|
log: new _loggers.ConsoleLog(),
|
|
14
|
+
|
|
17
15
|
CDN: 'https://unpkg.com/@loaders.gl',
|
|
18
16
|
worker: true,
|
|
19
17
|
maxConcurrency: 3,
|
|
@@ -21,6 +19,7 @@ var DEFAULT_LOADER_OPTIONS = {
|
|
|
21
19
|
reuseWorkers: _loaderUtils.isBrowser,
|
|
22
20
|
_nodeWorkers: false,
|
|
23
21
|
_workerType: '',
|
|
22
|
+
|
|
24
23
|
limit: 0,
|
|
25
24
|
_limitMB: 0,
|
|
26
25
|
batchSize: 'auto',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"option-defaults.js","names":["DEFAULT_LOADER_OPTIONS","fetch","mimeType","undefined","nothrow","log","ConsoleLog","CDN","worker","maxConcurrency","maxMobileConcurrency","reuseWorkers","isBrowser","_nodeWorkers","_workerType","limit","_limitMB","batchSize","batchDebounceMs","metadata","transforms","REMOVED_LOADER_OPTIONS","throws","dataType","uri","method","headers","body","mode","credentials","cache","redirect","referrer","referrerPolicy","integrity","keepalive","signal"],"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;AACA;AAEO,IAAMA,sBAAqC,GAAG;EAEnDC,KAAK,EAAE,IAAI;EACXC,QAAQ,EAAEC,SAAS;EACnBC,OAAO,EAAE,KAAK;EACdC,GAAG,EAAE,IAAIC,mBAAU,EAAE;;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;AAAC;AAEK,IAAMC,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;AAAC"}
|
|
@@ -1,39 +1,28 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
|
-
exports.getGlobalLoaderState = getGlobalLoaderState;
|
|
9
|
-
exports.setGlobalOptions = setGlobalOptions;
|
|
10
|
-
exports.normalizeOptions = normalizeOptions;
|
|
11
7
|
exports.getFetchFunction = getFetchFunction;
|
|
12
8
|
exports.getGlobalLoaderOptions = void 0;
|
|
13
|
-
|
|
9
|
+
exports.getGlobalLoaderState = getGlobalLoaderState;
|
|
10
|
+
exports.normalizeOptions = normalizeOptions;
|
|
11
|
+
exports.setGlobalOptions = setGlobalOptions;
|
|
14
12
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
15
|
-
|
|
16
13
|
var _isType = require("../../javascript-utils/is-type");
|
|
17
|
-
|
|
18
14
|
var _fetchFile = require("../fetch/fetch-file");
|
|
19
|
-
|
|
20
15
|
var _loggers = require("./loggers");
|
|
21
|
-
|
|
22
16
|
var _optionDefaults = require("./option-defaults");
|
|
23
|
-
|
|
24
17
|
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; } } }; }
|
|
25
|
-
|
|
26
18
|
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); }
|
|
27
|
-
|
|
28
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; }
|
|
29
|
-
|
|
30
|
-
function
|
|
31
|
-
|
|
32
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
33
|
-
|
|
20
|
+
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
|
+
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; }
|
|
34
22
|
function getGlobalLoaderState() {
|
|
35
23
|
globalThis.loaders = globalThis.loaders || {};
|
|
36
24
|
var loaders = globalThis.loaders;
|
|
25
|
+
|
|
37
26
|
loaders._state = loaders._state || {};
|
|
38
27
|
return loaders._state;
|
|
39
28
|
}
|
|
@@ -45,7 +34,6 @@ var getGlobalLoaderOptions = function getGlobalLoaderOptions() {
|
|
|
45
34
|
};
|
|
46
35
|
|
|
47
36
|
exports.getGlobalLoaderOptions = getGlobalLoaderOptions;
|
|
48
|
-
|
|
49
37
|
function setGlobalOptions(options) {
|
|
50
38
|
var state = getGlobalLoaderState();
|
|
51
39
|
var globalOptions = getGlobalLoaderOptions();
|
|
@@ -82,16 +70,16 @@ function getFetchFunction(options, context) {
|
|
|
82
70
|
|
|
83
71
|
function validateOptions(options, loaders) {
|
|
84
72
|
validateOptionsObject(options, null, _optionDefaults.DEFAULT_LOADER_OPTIONS, _optionDefaults.REMOVED_LOADER_OPTIONS, loaders);
|
|
85
|
-
|
|
86
73
|
var _iterator = _createForOfIteratorHelper(loaders),
|
|
87
|
-
|
|
88
|
-
|
|
74
|
+
_step;
|
|
89
75
|
try {
|
|
90
76
|
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
91
77
|
var loader = _step.value;
|
|
92
78
|
var idOptions = options && options[loader.id] || {};
|
|
79
|
+
|
|
93
80
|
var loaderOptions = loader.options && loader.options[loader.id] || {};
|
|
94
81
|
var deprecatedOptions = loader.deprecatedOptions && loader.deprecatedOptions[loader.id] || {};
|
|
82
|
+
|
|
95
83
|
validateOptionsObject(idOptions, loader.id, loaderOptions, deprecatedOptions, loaders);
|
|
96
84
|
}
|
|
97
85
|
} catch (err) {
|
|
@@ -104,44 +92,34 @@ function validateOptions(options, loaders) {
|
|
|
104
92
|
function validateOptionsObject(options, id, defaultOptions, deprecatedOptions, loaders) {
|
|
105
93
|
var loaderName = id || 'Top level';
|
|
106
94
|
var prefix = id ? "".concat(id, ".") : '';
|
|
107
|
-
|
|
108
95
|
for (var _key in options) {
|
|
109
96
|
var isSubOptions = !id && (0, _isType.isObject)(options[_key]);
|
|
110
97
|
var isBaseUriOption = _key === 'baseUri' && !id;
|
|
111
98
|
var isWorkerUrlOption = _key === 'workerUrl' && id;
|
|
112
|
-
|
|
113
99
|
if (!(_key in defaultOptions) && !isBaseUriOption && !isWorkerUrlOption) {
|
|
114
100
|
if (_key in deprecatedOptions) {
|
|
115
101
|
_loggers.probeLog.warn("".concat(loaderName, " loader option '").concat(prefix).concat(_key, "' no longer supported, use '").concat(deprecatedOptions[_key], "'"))();
|
|
116
102
|
} else if (!isSubOptions) {
|
|
117
103
|
var suggestion = findSimilarOption(_key, loaders);
|
|
118
|
-
|
|
119
104
|
_loggers.probeLog.warn("".concat(loaderName, " loader option '").concat(prefix).concat(_key, "' not recognized. ").concat(suggestion))();
|
|
120
105
|
}
|
|
121
106
|
}
|
|
122
107
|
}
|
|
123
108
|
}
|
|
124
|
-
|
|
125
109
|
function findSimilarOption(optionKey, loaders) {
|
|
126
110
|
var lowerCaseOptionKey = optionKey.toLowerCase();
|
|
127
111
|
var bestSuggestion = '';
|
|
128
|
-
|
|
129
112
|
var _iterator2 = _createForOfIteratorHelper(loaders),
|
|
130
|
-
|
|
131
|
-
|
|
113
|
+
_step2;
|
|
132
114
|
try {
|
|
133
115
|
for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
|
|
134
116
|
var loader = _step2.value;
|
|
135
|
-
|
|
136
117
|
for (var _key2 in loader.options) {
|
|
137
118
|
if (optionKey === _key2) {
|
|
138
119
|
return "Did you mean '".concat(loader.id, ".").concat(_key2, "'?");
|
|
139
120
|
}
|
|
140
|
-
|
|
141
121
|
var lowerCaseKey = _key2.toLowerCase();
|
|
142
|
-
|
|
143
122
|
var isPartialMatch = lowerCaseOptionKey.startsWith(lowerCaseKey) || lowerCaseKey.startsWith(lowerCaseOptionKey);
|
|
144
|
-
|
|
145
123
|
if (isPartialMatch) {
|
|
146
124
|
bestSuggestion = bestSuggestion || "Did you mean '".concat(loader.id, ".").concat(_key2, "'?");
|
|
147
125
|
}
|
|
@@ -152,21 +130,16 @@ function findSimilarOption(optionKey, loaders) {
|
|
|
152
130
|
} finally {
|
|
153
131
|
_iterator2.f();
|
|
154
132
|
}
|
|
155
|
-
|
|
156
133
|
return bestSuggestion;
|
|
157
134
|
}
|
|
158
|
-
|
|
159
135
|
function normalizeOptionsInternal(loader, options, url) {
|
|
160
136
|
var loaderDefaultOptions = loader.options || {};
|
|
161
|
-
|
|
162
137
|
var mergedOptions = _objectSpread({}, loaderDefaultOptions);
|
|
163
|
-
|
|
164
138
|
addUrlOptions(mergedOptions, url);
|
|
165
139
|
|
|
166
140
|
if (mergedOptions.log === null) {
|
|
167
141
|
mergedOptions.log = new _loggers.NullLog();
|
|
168
142
|
}
|
|
169
|
-
|
|
170
143
|
mergeNestedFields(mergedOptions, getGlobalLoaderOptions());
|
|
171
144
|
mergeNestedFields(mergedOptions, options);
|
|
172
145
|
return mergedOptions;
|
|
@@ -176,7 +149,6 @@ function mergeNestedFields(mergedOptions, options) {
|
|
|
176
149
|
for (var _key3 in options) {
|
|
177
150
|
if (_key3 in options) {
|
|
178
151
|
var value = options[_key3];
|
|
179
|
-
|
|
180
152
|
if ((0, _isType.isPureObject)(value) && (0, _isType.isPureObject)(mergedOptions[_key3])) {
|
|
181
153
|
mergedOptions[_key3] = _objectSpread(_objectSpread({}, mergedOptions[_key3]), options[_key3]);
|
|
182
154
|
} else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/loader-utils/option-utils.ts"],"names":["getGlobalLoaderState","globalThis","loaders","_state","getGlobalLoaderOptions","state","globalOptions","DEFAULT_LOADER_OPTIONS","setGlobalOptions","options","normalizeOptionsInternal","normalizeOptions","loader","url","Array","isArray","validateOptions","getFetchFunction","context","fetchOptions","fetch","fetchFile","validateOptionsObject","REMOVED_LOADER_OPTIONS","idOptions","id","loaderOptions","deprecatedOptions","defaultOptions","loaderName","prefix","key","isSubOptions","isBaseUriOption","isWorkerUrlOption","probeLog","warn","suggestion","findSimilarOption","optionKey","lowerCaseOptionKey","toLowerCase","bestSuggestion","lowerCaseKey","isPartialMatch","startsWith","loaderDefaultOptions","mergedOptions","addUrlOptions","log","NullLog","mergeNestedFields","value","baseUri"],"mappings":"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","sourcesContent":["import type {Loader, LoaderContext, LoaderOptions} from '@loaders.gl/loader-utils';\nimport {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"],"file":"option-utils.js"}
|
|
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,29 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports.default = fetchProgress;
|
|
9
|
-
|
|
10
8
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
11
|
-
|
|
12
9
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
13
|
-
|
|
14
10
|
function fetchProgress(_x, _x2) {
|
|
15
11
|
return _fetchProgress.apply(this, arguments);
|
|
16
12
|
}
|
|
17
|
-
|
|
18
13
|
function _fetchProgress() {
|
|
19
14
|
_fetchProgress = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(response, onProgress) {
|
|
20
15
|
var onDone,
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
16
|
+
onError,
|
|
17
|
+
body,
|
|
18
|
+
contentLength,
|
|
19
|
+
totalBytes,
|
|
20
|
+
progressStream,
|
|
21
|
+
_args2 = arguments;
|
|
27
22
|
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
28
23
|
while (1) {
|
|
29
24
|
switch (_context2.prev = _context2.next) {
|
|
@@ -32,46 +27,34 @@ function _fetchProgress() {
|
|
|
32
27
|
onError = _args2.length > 3 && _args2[3] !== undefined ? _args2[3] : function () {};
|
|
33
28
|
_context2.next = 4;
|
|
34
29
|
return response;
|
|
35
|
-
|
|
36
30
|
case 4:
|
|
37
31
|
response = _context2.sent;
|
|
38
|
-
|
|
39
32
|
if (response.ok) {
|
|
40
33
|
_context2.next = 7;
|
|
41
34
|
break;
|
|
42
35
|
}
|
|
43
|
-
|
|
44
36
|
return _context2.abrupt("return", response);
|
|
45
|
-
|
|
46
37
|
case 7:
|
|
47
38
|
body = response.body;
|
|
48
|
-
|
|
49
39
|
if (body) {
|
|
50
40
|
_context2.next = 10;
|
|
51
41
|
break;
|
|
52
42
|
}
|
|
53
|
-
|
|
54
43
|
return _context2.abrupt("return", response);
|
|
55
|
-
|
|
56
44
|
case 10:
|
|
57
45
|
contentLength = response.headers.get('content-length') || 0;
|
|
58
46
|
totalBytes = contentLength && parseInt(contentLength);
|
|
59
|
-
|
|
60
47
|
if (contentLength > 0) {
|
|
61
48
|
_context2.next = 14;
|
|
62
49
|
break;
|
|
63
50
|
}
|
|
64
|
-
|
|
65
51
|
return _context2.abrupt("return", response);
|
|
66
|
-
|
|
67
52
|
case 14:
|
|
68
53
|
if (!(typeof ReadableStream === 'undefined' || !body.getReader)) {
|
|
69
54
|
_context2.next = 16;
|
|
70
55
|
break;
|
|
71
56
|
}
|
|
72
|
-
|
|
73
57
|
return _context2.abrupt("return", response);
|
|
74
|
-
|
|
75
58
|
case 16:
|
|
76
59
|
progressStream = new ReadableStream({
|
|
77
60
|
start: function start(controller) {
|
|
@@ -84,7 +67,6 @@ function _fetchProgress() {
|
|
|
84
67
|
reader = body.getReader();
|
|
85
68
|
_context.next = 3;
|
|
86
69
|
return read(controller, reader, 0, totalBytes, onProgress, onDone, onError);
|
|
87
|
-
|
|
88
70
|
case 3:
|
|
89
71
|
case "end":
|
|
90
72
|
return _context.stop();
|
|
@@ -95,7 +77,6 @@ function _fetchProgress() {
|
|
|
95
77
|
}
|
|
96
78
|
});
|
|
97
79
|
return _context2.abrupt("return", new Response(progressStream));
|
|
98
|
-
|
|
99
80
|
case 18:
|
|
100
81
|
case "end":
|
|
101
82
|
return _context2.stop();
|
|
@@ -105,15 +86,12 @@ function _fetchProgress() {
|
|
|
105
86
|
}));
|
|
106
87
|
return _fetchProgress.apply(this, arguments);
|
|
107
88
|
}
|
|
108
|
-
|
|
109
89
|
function read(_x3, _x4, _x5, _x6, _x7, _x8, _x9) {
|
|
110
90
|
return _read.apply(this, arguments);
|
|
111
91
|
}
|
|
112
|
-
|
|
113
92
|
function _read() {
|
|
114
93
|
_read = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(controller, reader, loadedBytes, totalBytes, onProgress, onDone, onError) {
|
|
115
94
|
var _yield$reader$read, done, value, percent;
|
|
116
|
-
|
|
117
95
|
return _regenerator.default.wrap(function _callee3$(_context3) {
|
|
118
96
|
while (1) {
|
|
119
97
|
switch (_context3.prev = _context3.next) {
|
|
@@ -121,21 +99,17 @@ function _read() {
|
|
|
121
99
|
_context3.prev = 0;
|
|
122
100
|
_context3.next = 3;
|
|
123
101
|
return reader.read();
|
|
124
|
-
|
|
125
102
|
case 3:
|
|
126
103
|
_yield$reader$read = _context3.sent;
|
|
127
104
|
done = _yield$reader$read.done;
|
|
128
105
|
value = _yield$reader$read.value;
|
|
129
|
-
|
|
130
106
|
if (!done) {
|
|
131
107
|
_context3.next = 10;
|
|
132
108
|
break;
|
|
133
109
|
}
|
|
134
|
-
|
|
135
110
|
onDone();
|
|
136
111
|
controller.close();
|
|
137
112
|
return _context3.abrupt("return");
|
|
138
|
-
|
|
139
113
|
case 10:
|
|
140
114
|
loadedBytes += value.byteLength;
|
|
141
115
|
percent = Math.round(loadedBytes / totalBytes * 100);
|
|
@@ -146,17 +120,14 @@ function _read() {
|
|
|
146
120
|
controller.enqueue(value);
|
|
147
121
|
_context3.next = 16;
|
|
148
122
|
return read(controller, reader, loadedBytes, totalBytes, onProgress, onDone, onError);
|
|
149
|
-
|
|
150
123
|
case 16:
|
|
151
124
|
_context3.next = 22;
|
|
152
125
|
break;
|
|
153
|
-
|
|
154
126
|
case 18:
|
|
155
127
|
_context3.prev = 18;
|
|
156
128
|
_context3.t0 = _context3["catch"](0);
|
|
157
129
|
controller.error(_context3.t0);
|
|
158
130
|
onError(_context3.t0);
|
|
159
|
-
|
|
160
131
|
case 22:
|
|
161
132
|
case "end":
|
|
162
133
|
return _context3.stop();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
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 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
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"}
|
|
@@ -5,26 +5,23 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.parseMIMEType = parseMIMEType;
|
|
7
7
|
exports.parseMIMETypeFromURL = parseMIMETypeFromURL;
|
|
8
|
+
|
|
8
9
|
var DATA_URL_PATTERN = /^data:([-\w.]+\/[-\w.+]+)(;|,)/;
|
|
9
10
|
var MIME_TYPE_PATTERN = /^([-\w.]+\/[-\w.+]+)/;
|
|
10
11
|
|
|
11
12
|
function parseMIMEType(mimeString) {
|
|
12
13
|
var matches = MIME_TYPE_PATTERN.exec(mimeString);
|
|
13
|
-
|
|
14
14
|
if (matches) {
|
|
15
15
|
return matches[1];
|
|
16
16
|
}
|
|
17
|
-
|
|
18
17
|
return mimeString;
|
|
19
18
|
}
|
|
20
19
|
|
|
21
20
|
function parseMIMETypeFromURL(url) {
|
|
22
21
|
var matches = DATA_URL_PATTERN.exec(url);
|
|
23
|
-
|
|
24
22
|
if (matches) {
|
|
25
23
|
return matches[1];
|
|
26
24
|
}
|
|
27
|
-
|
|
28
25
|
return '';
|
|
29
26
|
}
|
|
30
27
|
//# sourceMappingURL=mime-type-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
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"}
|
|
@@ -3,13 +3,10 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.getResourceUrlAndType = getResourceUrlAndType;
|
|
7
6
|
exports.getResourceContentLength = getResourceContentLength;
|
|
8
|
-
|
|
7
|
+
exports.getResourceUrlAndType = getResourceUrlAndType;
|
|
9
8
|
var _isType = require("../../javascript-utils/is-type");
|
|
10
|
-
|
|
11
9
|
var _mimeTypeUtils = require("./mime-type-utils");
|
|
12
|
-
|
|
13
10
|
var QUERY_STRING_PATTERN = /\?.*/;
|
|
14
11
|
|
|
15
12
|
function getResourceUrlAndType(resource) {
|
|
@@ -28,7 +25,6 @@ function getResourceUrlAndType(resource) {
|
|
|
28
25
|
type: resource.type || ''
|
|
29
26
|
};
|
|
30
27
|
}
|
|
31
|
-
|
|
32
28
|
if (typeof resource === 'string') {
|
|
33
29
|
return {
|
|
34
30
|
url: stripQueryString(resource),
|
|
@@ -46,26 +42,20 @@ function getResourceContentLength(resource) {
|
|
|
46
42
|
if ((0, _isType.isResponse)(resource)) {
|
|
47
43
|
return resource.headers['content-length'] || -1;
|
|
48
44
|
}
|
|
49
|
-
|
|
50
45
|
if ((0, _isType.isBlob)(resource)) {
|
|
51
46
|
return resource.size;
|
|
52
47
|
}
|
|
53
|
-
|
|
54
48
|
if (typeof resource === 'string') {
|
|
55
49
|
return resource.length;
|
|
56
50
|
}
|
|
57
|
-
|
|
58
51
|
if (resource instanceof ArrayBuffer) {
|
|
59
52
|
return resource.byteLength;
|
|
60
53
|
}
|
|
61
|
-
|
|
62
54
|
if (ArrayBuffer.isView(resource)) {
|
|
63
55
|
return resource.byteLength;
|
|
64
56
|
}
|
|
65
|
-
|
|
66
57
|
return -1;
|
|
67
58
|
}
|
|
68
|
-
|
|
69
59
|
function stripQueryString(url) {
|
|
70
60
|
return url.replace(QUERY_STRING_PATTERN, '');
|
|
71
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
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"}
|