@loaders.gl/core 4.4.0-alpha.1 → 4.4.0-alpha.9
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/README.md +4 -0
- package/dist/core-addons/write-file-browser.js +1 -0
- package/dist/core-addons/write-file-browser.js.map +1 -0
- package/dist/dist.dev.js +368 -146
- package/dist/dist.min.js +3 -3
- package/dist/index.cjs +339 -227
- package/dist/index.cjs.map +4 -4
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -0
- package/dist/iterators/batch-iterators/timed-batch-iterator.js +1 -0
- package/dist/iterators/batch-iterators/timed-batch-iterator.js.map +1 -0
- package/dist/iterators/make-iterator/make-array-buffer-iterator.js +1 -0
- package/dist/iterators/make-iterator/make-array-buffer-iterator.js.map +1 -0
- package/dist/iterators/make-iterator/make-blob-iterator.js +1 -0
- package/dist/iterators/make-iterator/make-blob-iterator.js.map +1 -0
- package/dist/iterators/make-iterator/make-iterator.d.ts.map +1 -1
- package/dist/iterators/make-iterator/make-iterator.js +7 -3
- package/dist/iterators/make-iterator/make-iterator.js.map +1 -0
- package/dist/iterators/make-iterator/make-stream-iterator.js +1 -0
- package/dist/iterators/make-iterator/make-stream-iterator.js.map +1 -0
- package/dist/iterators/make-iterator/make-string-iterator.d.ts.map +1 -1
- package/dist/iterators/make-iterator/make-string-iterator.js +3 -1
- package/dist/iterators/make-iterator/make-string-iterator.js.map +1 -0
- package/dist/iterators/make-stream/make-stream.js +1 -0
- package/dist/iterators/make-stream/make-stream.js.map +1 -0
- package/dist/lib/api/create-data-source.js +1 -0
- package/dist/lib/api/create-data-source.js.map +1 -0
- package/dist/lib/api/encode-table.d.ts.map +1 -1
- package/dist/lib/api/encode-table.js +3 -2
- package/dist/lib/api/encode-table.js.map +1 -0
- package/dist/lib/api/encode.d.ts.map +1 -1
- package/dist/lib/api/encode.js +3 -2
- package/dist/lib/api/encode.js.map +1 -0
- package/dist/lib/api/load-in-batches.js +1 -0
- package/dist/lib/api/load-in-batches.js.map +1 -0
- package/dist/lib/api/load.js +2 -1
- package/dist/lib/api/load.js.map +1 -0
- package/dist/lib/api/loader-options.js +1 -0
- package/dist/lib/api/loader-options.js.map +1 -0
- package/dist/lib/api/parse-in-batches.d.ts.map +1 -1
- package/dist/lib/api/parse-in-batches.js +7 -6
- package/dist/lib/api/parse-in-batches.js.map +1 -0
- package/dist/lib/api/parse-sync.d.ts.map +1 -1
- package/dist/lib/api/parse-sync.js +4 -3
- package/dist/lib/api/parse-sync.js.map +1 -0
- package/dist/lib/api/parse.d.ts.map +1 -1
- package/dist/lib/api/parse.js +8 -9
- package/dist/lib/api/parse.js.map +1 -0
- package/dist/lib/api/register-loaders.js +1 -0
- package/dist/lib/api/register-loaders.js.map +1 -0
- package/dist/lib/api/select-loader.d.ts +3 -3
- package/dist/lib/api/select-loader.d.ts.map +1 -1
- package/dist/lib/api/select-loader.js +20 -15
- package/dist/lib/api/select-loader.js.map +1 -0
- package/dist/lib/api/select-source.js +1 -0
- package/dist/lib/api/select-source.js.map +1 -0
- package/dist/lib/common.js +1 -0
- package/dist/lib/common.js.map +1 -0
- package/dist/lib/fetch/fetch-error-message.js +1 -0
- package/dist/lib/fetch/fetch-error-message.js.map +1 -0
- package/dist/lib/fetch/fetch-error.js +1 -0
- package/dist/lib/fetch/fetch-error.js.map +1 -0
- package/dist/lib/fetch/fetch-file.js +1 -0
- package/dist/lib/fetch/fetch-file.js.map +1 -0
- package/dist/lib/fetch/read-array-buffer.js +1 -0
- package/dist/lib/fetch/read-array-buffer.js.map +1 -0
- package/dist/lib/filesystems/browser-filesystem.js +1 -0
- package/dist/lib/filesystems/browser-filesystem.js.map +1 -0
- package/dist/lib/filesystems/read-array-buffer.js +1 -0
- package/dist/lib/filesystems/read-array-buffer.js.map +1 -0
- package/dist/lib/init.js +2 -1
- package/dist/lib/init.js.map +1 -0
- package/dist/lib/loader-utils/check-errors.js +1 -0
- package/dist/lib/loader-utils/check-errors.js.map +1 -0
- package/dist/lib/loader-utils/get-data.d.ts +18 -1
- package/dist/lib/loader-utils/get-data.d.ts.map +1 -1
- package/dist/lib/loader-utils/get-data.js +47 -38
- package/dist/lib/loader-utils/get-data.js.map +1 -0
- package/dist/lib/loader-utils/get-fetch-function.d.ts.map +1 -1
- package/dist/lib/loader-utils/get-fetch-function.js +7 -5
- package/dist/lib/loader-utils/get-fetch-function.js.map +1 -0
- package/dist/lib/loader-utils/loader-context.d.ts +2 -2
- package/dist/lib/loader-utils/loader-context.d.ts.map +1 -1
- package/dist/lib/loader-utils/loader-context.js +1 -0
- package/dist/lib/loader-utils/loader-context.js.map +1 -0
- package/dist/lib/loader-utils/loggers.js +1 -0
- package/dist/lib/loader-utils/loggers.js.map +1 -0
- package/dist/lib/loader-utils/normalize-loader.js +1 -0
- package/dist/lib/loader-utils/normalize-loader.js.map +1 -0
- package/dist/lib/loader-utils/option-defaults.d.ts +22 -0
- package/dist/lib/loader-utils/option-defaults.d.ts.map +1 -1
- package/dist/lib/loader-utils/option-defaults.js +50 -20
- package/dist/lib/loader-utils/option-defaults.js.map +1 -0
- package/dist/lib/loader-utils/option-utils.d.ts +9 -3
- package/dist/lib/loader-utils/option-utils.d.ts.map +1 -1
- package/dist/lib/loader-utils/option-utils.js +108 -13
- package/dist/lib/loader-utils/option-utils.js.map +1 -0
- package/dist/lib/progress/fetch-progress.js +1 -0
- package/dist/lib/progress/fetch-progress.js.map +1 -0
- package/dist/lib/utils/mime-type-utils.js +1 -0
- package/dist/lib/utils/mime-type-utils.js.map +1 -0
- package/dist/lib/utils/resource-utils.d.ts.map +1 -1
- package/dist/lib/utils/resource-utils.js +8 -10
- package/dist/lib/utils/resource-utils.js.map +1 -0
- package/dist/lib/utils/response-utils.js +2 -1
- package/dist/lib/utils/response-utils.js.map +1 -0
- package/dist/lib/utils/url-utils.js +1 -0
- package/dist/lib/utils/url-utils.js.map +1 -0
- package/dist/null-loader.d.ts +3 -3
- package/dist/null-loader.d.ts.map +1 -1
- package/dist/null-loader.js +2 -1
- package/dist/null-loader.js.map +1 -0
- package/dist/null-worker-node.js +5 -2
- package/dist/null-worker.js +5 -2
- package/dist/workers/null-worker-node.js +1 -0
- package/dist/workers/null-worker-node.js.map +1 -0
- package/dist/workers/null-worker.js +1 -0
- package/dist/workers/null-worker.js.map +1 -0
- package/package.json +12 -6
- package/src/index.ts +1 -1
- package/src/iterators/make-iterator/make-iterator.ts +8 -5
- package/src/iterators/make-iterator/make-string-iterator.ts +2 -1
- package/src/lib/api/encode-table.ts +2 -1
- package/src/lib/api/encode.ts +8 -2
- package/src/lib/api/load.ts +1 -1
- package/src/lib/api/parse-in-batches.ts +26 -19
- package/src/lib/api/parse-sync.ts +6 -5
- package/src/lib/api/parse.ts +15 -11
- package/src/lib/api/select-loader.ts +42 -24
- package/src/lib/loader-utils/get-data.ts +62 -48
- package/src/lib/loader-utils/get-fetch-function.ts +6 -5
- package/src/lib/loader-utils/loader-context.ts +2 -2
- package/src/lib/loader-utils/option-defaults.ts +54 -22
- package/src/lib/loader-utils/option-utils.ts +125 -19
- package/src/lib/utils/resource-utils.ts +9 -12
- package/src/lib/utils/response-utils.ts +2 -2
- package/src/null-loader.ts +6 -3
- package/dist/javascript-utils/is-type.d.ts +0 -21
- package/dist/javascript-utils/is-type.d.ts.map +0 -1
- package/dist/javascript-utils/is-type.js +0 -25
- package/src/javascript-utils/is-type.ts +0 -51
|
@@ -4,31 +4,60 @@
|
|
|
4
4
|
import { isBrowser } from '@loaders.gl/loader-utils';
|
|
5
5
|
import { ConsoleLog } from "./loggers.js";
|
|
6
6
|
export const DEFAULT_LOADER_OPTIONS = {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
7
|
+
core: {
|
|
8
|
+
baseUri: undefined,
|
|
9
|
+
// baseUri
|
|
10
|
+
fetch: null,
|
|
11
|
+
mimeType: undefined,
|
|
12
|
+
fallbackMimeType: undefined,
|
|
13
|
+
ignoreRegisteredLoaders: undefined,
|
|
14
|
+
nothrow: false,
|
|
15
|
+
log: new ConsoleLog(), // A probe.gl compatible (`log.log()()` syntax) that just logs to console
|
|
16
|
+
useLocalLibraries: false,
|
|
17
|
+
CDN: 'https://unpkg.com/@loaders.gl',
|
|
18
|
+
worker: true, // By default, use worker if provided by loader.
|
|
19
|
+
maxConcurrency: 3, // How many worker instances should be created for each loader.
|
|
20
|
+
maxMobileConcurrency: 1, // How many worker instances should be created for each loader on mobile devices.
|
|
21
|
+
reuseWorkers: isBrowser, // By default reuse workers in browser (Node.js refuses to terminate if browsers are running)
|
|
22
|
+
_nodeWorkers: false, // By default do not support node workers
|
|
23
|
+
_workerType: '', // 'test' to use locally generated workers
|
|
24
|
+
limit: 0,
|
|
25
|
+
_limitMB: 0,
|
|
26
|
+
batchSize: 'auto',
|
|
27
|
+
batchDebounceMs: 0,
|
|
28
|
+
metadata: false, // TODO - currently only implemented for parseInBatches, adds initial metadata batch,
|
|
29
|
+
transforms: []
|
|
30
|
+
}
|
|
26
31
|
};
|
|
27
32
|
export const REMOVED_LOADER_OPTIONS = {
|
|
33
|
+
// baseUri
|
|
34
|
+
baseUri: 'core.baseUri',
|
|
35
|
+
fetch: 'core.fetch',
|
|
36
|
+
mimeType: 'core.mimeType',
|
|
37
|
+
fallbackMimeType: 'core.fallbackMimeType',
|
|
38
|
+
ignoreRegisteredLoaders: 'core.ignoreRegisteredLoaders',
|
|
39
|
+
nothrow: 'core.nothrow',
|
|
40
|
+
log: 'core.log',
|
|
41
|
+
useLocalLibraries: 'core.useLocalLibraries',
|
|
42
|
+
CDN: 'core.CDN',
|
|
43
|
+
worker: 'core.worker',
|
|
44
|
+
maxConcurrency: 'core.maxConcurrency',
|
|
45
|
+
maxMobileConcurrency: 'core.maxMobileConcurrency',
|
|
46
|
+
reuseWorkers: 'core.reuseWorkers',
|
|
47
|
+
_nodeWorkers: 'core.nodeWorkers',
|
|
48
|
+
_workerType: 'core._workerType',
|
|
49
|
+
_worker: 'core._workerType',
|
|
50
|
+
limit: 'core.limit',
|
|
51
|
+
_limitMB: 'core._limitMB',
|
|
52
|
+
batchSize: 'core.batchSize',
|
|
53
|
+
batchDebounceMs: 'core.batchDebounceMs',
|
|
54
|
+
metadata: 'core.metadata',
|
|
55
|
+
transforms: 'core.transforms',
|
|
56
|
+
// Older deprecations
|
|
28
57
|
throws: 'nothrow',
|
|
29
58
|
dataType: '(no longer used)',
|
|
30
59
|
uri: 'baseUri',
|
|
31
|
-
// Warn if fetch options are used on
|
|
60
|
+
// Warn if fetch options are used on toplevel
|
|
32
61
|
method: 'fetch.method',
|
|
33
62
|
headers: 'fetch.headers',
|
|
34
63
|
body: 'fetch.body',
|
|
@@ -42,3 +71,4 @@ export const REMOVED_LOADER_OPTIONS = {
|
|
|
42
71
|
keepalive: 'fetch.keepalive',
|
|
43
72
|
signal: 'fetch.signal'
|
|
44
73
|
};
|
|
74
|
+
//# sourceMappingURL=option-defaults.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"option-defaults.js","sourceRoot":"","sources":["../../../src/lib/loader-utils/option-defaults.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,SAAS,EAAC,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAC,UAAU,EAAC,qBAAkB;AAErC,MAAM,CAAC,MAAM,sBAAsB,GAAkB;IACnD,IAAI,EAAE;QACJ,OAAO,EAAE,SAAS;QAClB,UAAU;QACV,KAAK,EAAE,IAAI;QACX,QAAQ,EAAE,SAAS;QACnB,gBAAgB,EAAE,SAAS;QAC3B,uBAAuB,EAAE,SAAS;QAClC,OAAO,EAAE,KAAK;QACd,GAAG,EAAE,IAAI,UAAU,EAAE,EAAE,yEAAyE;QAChG,iBAAiB,EAAE,KAAK;QAExB,GAAG,EAAE,+BAA+B;QACpC,MAAM,EAAE,IAAI,EAAE,gDAAgD;QAC9D,cAAc,EAAE,CAAC,EAAE,+DAA+D;QAClF,oBAAoB,EAAE,CAAC,EAAE,iFAAiF;QAC1G,YAAY,EAAE,SAAS,EAAE,6FAA6F;QACtH,YAAY,EAAE,KAAK,EAAE,yCAAyC;QAC9D,WAAW,EAAE,EAAE,EAAE,0CAA0C;QAE3D,KAAK,EAAE,CAAC;QACR,QAAQ,EAAE,CAAC;QACX,SAAS,EAAE,MAAM;QACjB,eAAe,EAAE,CAAC;QAClB,QAAQ,EAAE,KAAK,EAAE,qFAAqF;QACtG,UAAU,EAAE,EAAE;KACf;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,UAAU;IACV,OAAO,EAAE,cAAc;IACvB,KAAK,EAAE,YAAY;IACnB,QAAQ,EAAE,eAAe;IACzB,gBAAgB,EAAE,uBAAuB;IACzC,uBAAuB,EAAE,8BAA8B;IACvD,OAAO,EAAE,cAAc;IACvB,GAAG,EAAE,UAAU;IACf,iBAAiB,EAAE,wBAAwB;IAE3C,GAAG,EAAE,UAAU;IACf,MAAM,EAAE,aAAa;IACrB,cAAc,EAAE,qBAAqB;IACrC,oBAAoB,EAAE,2BAA2B;IACjD,YAAY,EAAE,mBAAmB;IACjC,YAAY,EAAE,kBAAkB;IAChC,WAAW,EAAE,kBAAkB;IAC/B,OAAO,EAAE,kBAAkB;IAE3B,KAAK,EAAE,YAAY;IACnB,QAAQ,EAAE,eAAe;IACzB,SAAS,EAAE,gBAAgB;IAC3B,eAAe,EAAE,sBAAsB;IACvC,QAAQ,EAAE,eAAe;IACzB,UAAU,EAAE,iBAAiB;IAE7B,qBAAqB;IACrB,MAAM,EAAE,SAAS;IACjB,QAAQ,EAAE,kBAAkB;IAC5B,GAAG,EAAE,SAAS;IACd,6CAA6C;IAC7C,MAAM,EAAE,cAAc;IACtB,OAAO,EAAE,eAAe;IACxB,IAAI,EAAE,YAAY;IAClB,IAAI,EAAE,YAAY;IAClB,WAAW,EAAE,mBAAmB;IAChC,KAAK,EAAE,aAAa;IACpB,QAAQ,EAAE,gBAAgB;IAC1B,QAAQ,EAAE,gBAAgB;IAC1B,cAAc,EAAE,sBAAsB;IACtC,SAAS,EAAE,iBAAiB;IAC5B,SAAS,EAAE,iBAAiB;IAC5B,MAAM,EAAE,cAAc;CACvB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Loader, LoaderOptions } from '@loaders.gl/loader-utils';
|
|
1
|
+
import { Loader, LoaderOptions, StrictLoaderOptions } from '@loaders.gl/loader-utils';
|
|
2
2
|
/**
|
|
3
3
|
* Global state for loaders.gl. Stored on `globalThis.loaders._state`
|
|
4
4
|
*/
|
|
@@ -16,7 +16,7 @@ export declare function getGlobalLoaderState(): GlobalLoaderState;
|
|
|
16
16
|
* NOTE: This use case is not reliable but can help when testing new versions of loaders.gl with existing frameworks
|
|
17
17
|
* @returns global loader options merged with default loader options
|
|
18
18
|
*/
|
|
19
|
-
export declare function getGlobalLoaderOptions():
|
|
19
|
+
export declare function getGlobalLoaderOptions(): StrictLoaderOptions;
|
|
20
20
|
/**
|
|
21
21
|
* Set global loader options
|
|
22
22
|
* @param options
|
|
@@ -29,6 +29,12 @@ export declare function setGlobalOptions(options: LoaderOptions): void;
|
|
|
29
29
|
* @param loaders
|
|
30
30
|
* @param url
|
|
31
31
|
*/
|
|
32
|
-
export declare function normalizeOptions(options: LoaderOptions, loader: Loader, loaders?: Loader[], url?: string):
|
|
32
|
+
export declare function normalizeOptions(options: LoaderOptions, loader: Loader, loaders?: Loader[], url?: string): StrictLoaderOptions;
|
|
33
|
+
/**
|
|
34
|
+
* Returns a copy of the provided options with deprecated top-level core fields moved into `core`
|
|
35
|
+
* and removed from the top level. This keeps global options from leaking deprecated aliases into
|
|
36
|
+
* loader-specific option maps during normalization.
|
|
37
|
+
*/
|
|
38
|
+
export declare function normalizeLoaderOptions(options: LoaderOptions): StrictLoaderOptions;
|
|
33
39
|
export {};
|
|
34
40
|
//# sourceMappingURL=option-utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"option-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/option-utils.ts"],"names":[],"mappings":"AAIA,OAAO,
|
|
1
|
+
{"version":3,"file":"option-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/option-utils.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,aAAa,EAIb,mBAAmB,EACpB,MAAM,0BAA0B,CAAC;AA4BlC;;GAEG;AACH,KAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,iBAAiB,CAWxD;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,IAAI,mBAAmB,CAQ5D;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAO7D;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,GAAG,CAAC,EAAE,MAAM,GACX,mBAAmB,CAMrB;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,aAAa,GAAG,mBAAmB,CAYlF"}
|
|
@@ -1,10 +1,32 @@
|
|
|
1
1
|
// loaders.gl
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
|
-
import { registerJSModules } from '@loaders.gl/loader-utils';
|
|
5
|
-
import { isPureObject, isObject } from "../../javascript-utils/is-type.js";
|
|
4
|
+
import { registerJSModules, isPureObject, isObject } from '@loaders.gl/loader-utils';
|
|
6
5
|
import { probeLog, NullLog } from "./loggers.js";
|
|
7
6
|
import { DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS } from "./option-defaults.js";
|
|
7
|
+
const CORE_LOADER_OPTION_KEYS = [
|
|
8
|
+
'baseUri',
|
|
9
|
+
'fetch',
|
|
10
|
+
'mimeType',
|
|
11
|
+
'fallbackMimeType',
|
|
12
|
+
'ignoreRegisteredLoaders',
|
|
13
|
+
'nothrow',
|
|
14
|
+
'log',
|
|
15
|
+
'useLocalLibraries',
|
|
16
|
+
'CDN',
|
|
17
|
+
'worker',
|
|
18
|
+
'maxConcurrency',
|
|
19
|
+
'maxMobileConcurrency',
|
|
20
|
+
'reuseWorkers',
|
|
21
|
+
'_nodeWorkers',
|
|
22
|
+
'_workerType',
|
|
23
|
+
'limit',
|
|
24
|
+
'_limitMB',
|
|
25
|
+
'batchSize',
|
|
26
|
+
'batchDebounceMs',
|
|
27
|
+
'metadata',
|
|
28
|
+
'transforms'
|
|
29
|
+
];
|
|
8
30
|
/**
|
|
9
31
|
* Helper for safely accessing global loaders.gl variables
|
|
10
32
|
* Wraps initialization of global variable in function to defeat overly aggressive tree-shakers
|
|
@@ -28,8 +50,11 @@ export function getGlobalLoaderState() {
|
|
|
28
50
|
export function getGlobalLoaderOptions() {
|
|
29
51
|
const state = getGlobalLoaderState();
|
|
30
52
|
// Ensure all default loader options from this library are mentioned
|
|
31
|
-
state.globalOptions = state.globalOptions || {
|
|
32
|
-
|
|
53
|
+
state.globalOptions = state.globalOptions || {
|
|
54
|
+
...DEFAULT_LOADER_OPTIONS,
|
|
55
|
+
core: { ...DEFAULT_LOADER_OPTIONS.core }
|
|
56
|
+
};
|
|
57
|
+
return normalizeLoaderOptions(state.globalOptions);
|
|
33
58
|
}
|
|
34
59
|
/**
|
|
35
60
|
* Set global loader options
|
|
@@ -54,7 +79,25 @@ export function normalizeOptions(options, loader, loaders, url) {
|
|
|
54
79
|
loaders = loaders || [];
|
|
55
80
|
loaders = Array.isArray(loaders) ? loaders : [loaders];
|
|
56
81
|
validateOptions(options, loaders);
|
|
57
|
-
return normalizeOptionsInternal(loader, options, url);
|
|
82
|
+
return normalizeLoaderOptions(normalizeOptionsInternal(loader, options, url));
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* Returns a copy of the provided options with deprecated top-level core fields moved into `core`
|
|
86
|
+
* and removed from the top level. This keeps global options from leaking deprecated aliases into
|
|
87
|
+
* loader-specific option maps during normalization.
|
|
88
|
+
*/
|
|
89
|
+
export function normalizeLoaderOptions(options) {
|
|
90
|
+
const normalized = cloneLoaderOptions(options);
|
|
91
|
+
moveDeprecatedTopLevelOptionsToCore(normalized);
|
|
92
|
+
for (const key of CORE_LOADER_OPTION_KEYS) {
|
|
93
|
+
if (normalized.core && normalized.core[key] !== undefined) {
|
|
94
|
+
delete normalized[key];
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
if (normalized.core && normalized.core._workerType !== undefined) {
|
|
98
|
+
delete normalized._worker;
|
|
99
|
+
}
|
|
100
|
+
return normalized;
|
|
58
101
|
}
|
|
59
102
|
// VALIDATE OPTIONS
|
|
60
103
|
/**
|
|
@@ -67,7 +110,7 @@ function validateOptions(options, loaders) {
|
|
|
67
110
|
validateOptionsObject(options, null, DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS, loaders);
|
|
68
111
|
for (const loader of loaders) {
|
|
69
112
|
// Get the scoped, loader specific options from the user supplied options
|
|
70
|
-
const idOptions = (
|
|
113
|
+
const idOptions = (options && options[loader.id]) || {};
|
|
71
114
|
// Get scoped, loader specific default and deprecated options from the selected loader
|
|
72
115
|
const loaderOptions = (loader.options && loader.options[loader.id]) || {};
|
|
73
116
|
const deprecatedOptions = (loader.deprecatedOptions && loader.deprecatedOptions[loader.id]) || {};
|
|
@@ -118,13 +161,19 @@ function findSimilarOption(optionKey, loaders) {
|
|
|
118
161
|
function normalizeOptionsInternal(loader, options, url) {
|
|
119
162
|
const loaderDefaultOptions = loader.options || {};
|
|
120
163
|
const mergedOptions = { ...loaderDefaultOptions };
|
|
121
|
-
|
|
164
|
+
if (loaderDefaultOptions.core) {
|
|
165
|
+
mergedOptions.core = { ...loaderDefaultOptions.core };
|
|
166
|
+
}
|
|
167
|
+
moveDeprecatedTopLevelOptionsToCore(mergedOptions);
|
|
122
168
|
// LOGGING: options.log can be set to `null` to defeat logging
|
|
123
|
-
if (mergedOptions.log === null) {
|
|
124
|
-
mergedOptions.
|
|
169
|
+
if (mergedOptions.core?.log === null) {
|
|
170
|
+
mergedOptions.core = { ...mergedOptions.core, log: new NullLog() };
|
|
125
171
|
}
|
|
126
|
-
mergeNestedFields(mergedOptions, getGlobalLoaderOptions());
|
|
127
|
-
|
|
172
|
+
mergeNestedFields(mergedOptions, normalizeLoaderOptions(getGlobalLoaderOptions()));
|
|
173
|
+
const userOptions = normalizeLoaderOptions(options);
|
|
174
|
+
mergeNestedFields(mergedOptions, userOptions);
|
|
175
|
+
addUrlOptions(mergedOptions, url);
|
|
176
|
+
addDeprecatedTopLevelOptions(mergedOptions);
|
|
128
177
|
return mergedOptions;
|
|
129
178
|
}
|
|
130
179
|
// Merge nested options objects
|
|
@@ -156,7 +205,53 @@ function mergeNestedFields(mergedOptions, options) {
|
|
|
156
205
|
* TODO - should these be injected on context instead of options?
|
|
157
206
|
*/
|
|
158
207
|
function addUrlOptions(options, url) {
|
|
159
|
-
if (url
|
|
160
|
-
|
|
208
|
+
if (!url) {
|
|
209
|
+
return;
|
|
210
|
+
}
|
|
211
|
+
const hasTopLevelBaseUri = options.baseUri !== undefined;
|
|
212
|
+
const hasCoreBaseUri = options.core?.baseUri !== undefined;
|
|
213
|
+
if (!hasTopLevelBaseUri && !hasCoreBaseUri) {
|
|
214
|
+
options.core ||= {};
|
|
215
|
+
options.core.baseUri = url;
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
function cloneLoaderOptions(options) {
|
|
219
|
+
const clonedOptions = { ...options };
|
|
220
|
+
if (options.core) {
|
|
221
|
+
clonedOptions.core = { ...options.core };
|
|
222
|
+
}
|
|
223
|
+
return clonedOptions;
|
|
224
|
+
}
|
|
225
|
+
function moveDeprecatedTopLevelOptionsToCore(options) {
|
|
226
|
+
for (const key of CORE_LOADER_OPTION_KEYS) {
|
|
227
|
+
if (options[key] !== undefined) {
|
|
228
|
+
const coreOptions = (options.core = options.core || {});
|
|
229
|
+
const coreRecord = coreOptions;
|
|
230
|
+
// Treat deprecated top-level core options as aliases to `options.core`, but never override an explicitly
|
|
231
|
+
// provided `options.core` value.
|
|
232
|
+
if (coreRecord[key] === undefined) {
|
|
233
|
+
coreRecord[key] = options[key];
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
}
|
|
237
|
+
// Support the older internal `_worker` alias (used by some tests and integrations) for `_workerType`.
|
|
238
|
+
const workerTypeAlias = options._worker;
|
|
239
|
+
if (workerTypeAlias !== undefined) {
|
|
240
|
+
options.core ||= {};
|
|
241
|
+
if (options.core._workerType === undefined) {
|
|
242
|
+
options.core._workerType = workerTypeAlias;
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
function addDeprecatedTopLevelOptions(options) {
|
|
247
|
+
const coreOptions = options.core;
|
|
248
|
+
if (!coreOptions) {
|
|
249
|
+
return;
|
|
250
|
+
}
|
|
251
|
+
for (const key of CORE_LOADER_OPTION_KEYS) {
|
|
252
|
+
if (coreOptions[key] !== undefined) {
|
|
253
|
+
options[key] = coreOptions[key];
|
|
254
|
+
}
|
|
161
255
|
}
|
|
162
256
|
}
|
|
257
|
+
//# sourceMappingURL=option-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"option-utils.js","sourceRoot":"","sources":["../../../src/lib/loader-utils/option-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fetch-progress.js","sourceRoot":"","sources":["../../../src/lib/progress/fetch-progress.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAEpC,6EAA6E;AAE7E;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,QAAsC,EACtC,UAAe,EAAE,6BAA6B;AAC9C,MAAM,GAAG,GAAG,EAAE,GAAE,CAAC,EACjB,OAAO,GAAG,GAAG,EAAE,GAAE,CAAC;IAElB,QAAQ,GAAG,MAAM,QAAQ,CAAC;IAC1B,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,6CAA6C;QAC7C,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC3B,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,qDAAqD;QACrD,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAClE,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/D,IAAI,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,EAAE,CAAC;QACtB,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,iDAAiD;IACjD,IAAI,OAAO,cAAc,KAAK,WAAW,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QAC7D,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,0DAA0D;IAC1D,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC;QACxC,KAAK,CAAC,KAAK,CAAC,UAAU;YACpB,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAChC,MAAM,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAC7E,CAAC;KACF,CAAC,CAAC;IAEH,OAAO,IAAI,QAAQ,CAAC,cAAc,CAAC,CAAC;AACtC,CAAC;AAED,yCAAyC;AACzC,8EAA8E;AAC9E,sCAAsC;AACtC,KAAK,UAAU,IAAI,CACjB,UAAe,EACf,MAAW,EACX,WAAmB,EACnB,UAAkB,EAClB,UAAoB,EACpB,MAAgB,EAChB,OAAiB;IAEjB,IAAI,CAAC;QACH,MAAM,EAAC,IAAI,EAAE,KAAK,EAAC,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QAC1C,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,EAAE,CAAC;YACT,UAAU,CAAC,KAAK,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QACD,WAAW,IAAI,KAAK,CAAC,UAAU,CAAC;QAChC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,GAAG,UAAU,CAAC,GAAG,GAAG,CAAC,CAAC;QAC7D,UAAU,CAAC,OAAO,EAAE,EAAC,WAAW,EAAE,UAAU,EAAC,CAAC,CAAC;QAC/C,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC1B,MAAM,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACvF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACxB,OAAO,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mime-type-utils.js","sourceRoot":"","sources":["../../../src/lib/utils/mime-type-utils.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAEpC,kDAAkD;AAClD,qCAAqC;AAErC,MAAM,gBAAgB,GAAG,gCAAgC,CAAC;AAC1D,MAAM,iBAAiB,GAAG,sBAAsB,CAAC;AAEjD;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAAC,SAAiB,EAAE,SAAiB;IACnE,IAAI,SAAS,CAAC,WAAW,EAAE,KAAK,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,aAAa,CAAC,UAAkB;IAC9C,4DAA4D;IAC5D,MAAM,OAAO,GAAG,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACnD,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC9C,4DAA4D;IAC5D,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3C,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/resource-utils.ts"],"names":[],"mappings":"AAQA;;;GAGG;AACH,MAAM,MAAM,QAAQ,GAAG,QAAQ,GAAG,IAAI,GAAG,MAAM,CAAC;AAEhD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"resource-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/resource-utils.ts"],"names":[],"mappings":"AAQA;;;GAGG;AACH,MAAM,MAAM,QAAQ,GAAG,QAAQ,GAAG,IAAI,GAAG,MAAM,CAAC;AAEhD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,CAoBxD;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,CAmB7D;AAED;;;;;;IAMI;AACJ,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,CAoBlE"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// loaders.gl
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
|
-
import { isResponse, isBlob } from
|
|
4
|
+
import { isResponse, isBlob } from '@loaders.gl/loader-utils';
|
|
5
5
|
import { parseMIMEType, parseMIMETypeFromURL } from "./mime-type-utils.js";
|
|
6
6
|
import { stripQueryString } from "./url-utils.js";
|
|
7
7
|
/**
|
|
@@ -14,15 +14,14 @@ import { stripQueryString } from "./url-utils.js";
|
|
|
14
14
|
export function getResourceUrl(resource) {
|
|
15
15
|
// If resource is a `Response`, it contains the information directly as a field
|
|
16
16
|
if (isResponse(resource)) {
|
|
17
|
-
|
|
18
|
-
return response.url;
|
|
17
|
+
return resource.url;
|
|
19
18
|
}
|
|
20
19
|
// If the resource is a Blob or a File (subclass of Blob)
|
|
21
20
|
if (isBlob(resource)) {
|
|
22
|
-
const blob = resource;
|
|
23
21
|
// File objects have a "name" property. Blob objects don't have any
|
|
24
22
|
// url (name) information
|
|
25
|
-
|
|
23
|
+
const fileName = 'name' in resource ? resource.name : '';
|
|
24
|
+
return fileName || '';
|
|
26
25
|
}
|
|
27
26
|
if (typeof resource === 'string') {
|
|
28
27
|
return resource;
|
|
@@ -40,15 +39,13 @@ export function getResourceUrl(resource) {
|
|
|
40
39
|
export function getResourceMIMEType(resource) {
|
|
41
40
|
// If resource is a response, it contains the information directly
|
|
42
41
|
if (isResponse(resource)) {
|
|
43
|
-
const
|
|
44
|
-
const
|
|
45
|
-
const noQueryUrl = stripQueryString(response.url);
|
|
42
|
+
const contentTypeHeader = resource.headers.get('content-type') || '';
|
|
43
|
+
const noQueryUrl = stripQueryString(resource.url);
|
|
46
44
|
return parseMIMEType(contentTypeHeader) || parseMIMETypeFromURL(noQueryUrl);
|
|
47
45
|
}
|
|
48
46
|
// If the resource is a Blob or a File (subclass of Blob)
|
|
49
47
|
if (isBlob(resource)) {
|
|
50
|
-
|
|
51
|
-
return blob.type || '';
|
|
48
|
+
return resource.type || '';
|
|
52
49
|
}
|
|
53
50
|
if (typeof resource === 'string') {
|
|
54
51
|
return parseMIMETypeFromURL(resource);
|
|
@@ -84,3 +81,4 @@ export function getResourceContentLength(resource) {
|
|
|
84
81
|
}
|
|
85
82
|
return -1;
|
|
86
83
|
}
|
|
84
|
+
//# sourceMappingURL=resource-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resource-utils.js","sourceRoot":"","sources":["../../../src/lib/utils/resource-utils.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,UAAU,EAAE,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAC,aAAa,EAAE,oBAAoB,EAAC,6BAA0B;AACtE,OAAO,EAAC,gBAAgB,EAAC,uBAAoB;AAQ7C;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAAC,QAAiB;IAC9C,+EAA+E;IAC/E,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzB,OAAO,QAAQ,CAAC,GAAG,CAAC;IACtB,CAAC;IAED,yDAAyD;IACzD,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACrB,mEAAmE;QACnE,yBAAyB;QACzB,MAAM,QAAQ,GAAG,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAE,QAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QACnE,OAAO,QAAQ,IAAI,EAAE,CAAC;IACxB,CAAC;IAED,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,UAAU;IACV,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAAC,QAAiB;IACnD,kEAAkE;IAClE,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzB,MAAM,iBAAiB,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QACrE,MAAM,UAAU,GAAG,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAClD,OAAO,aAAa,CAAC,iBAAiB,CAAC,IAAI,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAC9E,CAAC;IAED,yDAAyD;IACzD,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACrB,OAAO,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC;IAC7B,CAAC;IAED,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IAED,UAAU;IACV,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;;;;IAMI;AACJ,MAAM,UAAU,wBAAwB,CAAC,QAAiB;IACxD,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzB,MAAM,QAAQ,GAAG,QAAQ,CAAC;QAC1B,OAAO,QAAQ,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;IAClD,CAAC;IACD,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,GAAG,QAAQ,CAAC;QACtB,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IACD,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACjC,0BAA0B;QAC1B,OAAO,QAAQ,CAAC,MAAM,CAAC;IACzB,CAAC;IACD,IAAI,QAAQ,YAAY,WAAW,EAAE,CAAC;QACpC,OAAO,QAAQ,CAAC,UAAU,CAAC;IAC7B,CAAC;IACD,IAAI,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACjC,OAAO,QAAQ,CAAC,UAAU,CAAC;IAC7B,CAAC;IACD,OAAO,CAAC,CAAC,CAAC;AACZ,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// loaders.gl
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
|
-
import { isResponse } from
|
|
4
|
+
import { isResponse } from '@loaders.gl/loader-utils';
|
|
5
5
|
import { FetchError } from "../fetch/fetch-error.js";
|
|
6
6
|
import { getResourceContentLength, getResourceUrl, getResourceMIMEType } from "./resource-utils.js";
|
|
7
7
|
import { shortenUrlForDisplay } from "./url-utils.js";
|
|
@@ -118,3 +118,4 @@ function arrayBufferToBase64(buffer) {
|
|
|
118
118
|
}
|
|
119
119
|
return btoa(binary);
|
|
120
120
|
}
|
|
121
|
+
//# sourceMappingURL=response-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"response-utils.js","sourceRoot":"","sources":["../../../src/lib/utils/response-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"url-utils.js","sourceRoot":"","sources":["../../../src/lib/utils/url-utils.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAEpC,MAAM,oBAAoB,GAAG,MAAM,CAAC;AAEpC,MAAM,UAAU,kBAAkB,CAAC,GAAG;IACpC,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAChD,OAAO,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAG;IAClC,OAAO,GAAG,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC9C,IAAI,GAAG,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;QACpB,OAAO,GAAG,CAAC;IACb,CAAC;IACD,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IAC1C,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACnC,OAAO,GAAG,QAAQ,MAAM,MAAM,EAAE,CAAC;AACnC,CAAC"}
|
package/dist/null-loader.d.ts
CHANGED
|
@@ -33,9 +33,9 @@ export declare const NullLoader: {
|
|
|
33
33
|
readonly version: any;
|
|
34
34
|
readonly mimeTypes: ["application/x.empty"];
|
|
35
35
|
readonly extensions: ["null"];
|
|
36
|
-
readonly parse: (arrayBuffer:
|
|
36
|
+
readonly parse: (arrayBuffer: ArrayBufferLike | ArrayBufferView, options?: NullLoaderOptions, context?: LoaderContext) => Promise<null>;
|
|
37
37
|
readonly parseSync: typeof parseSync;
|
|
38
|
-
readonly parseInBatches: (asyncIterator: Iterable<
|
|
38
|
+
readonly parseInBatches: (asyncIterator: Iterable<ArrayBufferView | ArrayBufferLike> | AsyncIterable<ArrayBufferView | ArrayBufferLike>, options: NullLoaderOptions | undefined, context: LoaderContext | undefined) => AsyncGenerator<null, void, any>;
|
|
39
39
|
readonly tests: [() => false];
|
|
40
40
|
readonly options: {
|
|
41
41
|
readonly null: {};
|
|
@@ -45,6 +45,6 @@ export declare const NullLoader: {
|
|
|
45
45
|
* Returns arguments passed to the parse API in a format that can be transferred to a
|
|
46
46
|
* web worker. The `context` parameter is stripped using JSON.stringify & parse.
|
|
47
47
|
*/
|
|
48
|
-
declare function parseSync(arrayBuffer:
|
|
48
|
+
declare function parseSync(arrayBuffer: ArrayBufferLike | ArrayBufferView, options?: NullLoaderOptions, context?: LoaderContext): null;
|
|
49
49
|
export {};
|
|
50
50
|
//# sourceMappingURL=null-loader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"null-loader.d.ts","sourceRoot":"","sources":["../src/null-loader.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAA2B,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACtF,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAEvD,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAC9C,IAAI,CAAC,EAAE,EAAE,CAAC;CACX,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB;;wBAER,KAAK;;;;;;;;;;;;CAYiC,CAAC;AAE5D;;GAEG;AACH,eAAO,MAAM,UAAU;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"null-loader.d.ts","sourceRoot":"","sources":["../src/null-loader.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAA2B,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACtF,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAEvD,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAC9C,IAAI,CAAC,EAAE,EAAE,CAAC;CACX,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB;;wBAER,KAAK;;;;;;;;;;;;CAYiC,CAAC;AAE5D;;GAEG;AACH,eAAO,MAAM,UAAU;;;;;;;;;kCAWN,eAAe,GAAG,eAAe,YACpC,iBAAiB,YACjB,aAAa;;;;;;;CAYyC,CAAC;AAErE;;;GAGG;AACH,iBAAS,SAAS,CAChB,WAAW,EAAE,eAAe,GAAG,eAAe,EAC9C,OAAO,CAAC,EAAE,iBAAiB,EAC3B,OAAO,CAAC,EAAE,aAAa,GACtB,IAAI,CAEN"}
|
package/dist/null-loader.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
// __VERSION__ is injected by babel-plugin-version-inline
|
|
5
5
|
// @ts-ignore TS2304: Cannot find name '__VERSION__'.
|
|
6
|
-
const VERSION = typeof "4.4.0-alpha.
|
|
6
|
+
const VERSION = typeof "4.4.0-alpha.9" !== 'undefined' ? "4.4.0-alpha.9" : 'latest';
|
|
7
7
|
/**
|
|
8
8
|
* Loads any data and returns null (or optionally passes through data unparsed)
|
|
9
9
|
*/
|
|
@@ -53,3 +53,4 @@ export const NullLoader = {
|
|
|
53
53
|
function parseSync(arrayBuffer, options, context) {
|
|
54
54
|
return null;
|
|
55
55
|
}
|
|
56
|
+
//# sourceMappingURL=null-loader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"null-loader.js","sourceRoot":"","sources":["../src/null-loader.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAEpC,yDAAyD;AACzD,qDAAqD;AACrD,MAAM,OAAO,GAAG,sBAAkB,KAAK,WAAW,CAAC,CAAC,iBAAa,CAAC,CAAC,QAAQ,CAAC;AAS5E;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,QAAQ,EAAE,IAAI;IACd,SAAS,EAAE,IAAa;IACxB,IAAI,EAAE,aAAa;IACnB,EAAE,EAAE,MAAM;IACV,MAAM,EAAE,MAAM;IACd,OAAO,EAAE,OAAO;IAChB,MAAM,EAAE,IAAI;IACZ,SAAS,EAAE,CAAC,qBAAqB,CAAC;IAClC,UAAU,EAAE,CAAC,MAAM,CAAC;IACpB,KAAK,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC;IACpB,OAAO,EAAE;QACP,IAAI,EAAE,EAAE;KACT;CACwD,CAAC;AAE5D;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,QAAQ,EAAE,IAAI;IACd,SAAS,EAAE,IAAI;IAEf,IAAI,EAAE,aAAa;IACnB,EAAE,EAAE,MAAM;IACV,MAAM,EAAE,MAAM;IACd,OAAO,EAAE,OAAO;IAChB,SAAS,EAAE,CAAC,qBAAqB,CAAC;IAClC,UAAU,EAAE,CAAC,MAAM,CAAC;IACpB,KAAK,EAAE,KAAK,EACV,WAA8C,EAC9C,OAA2B,EAC3B,OAAuB,EACvB,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,OAAO,IAAI,EAAE,EAAE,OAAO,CAAC;IACnD,SAAS;IACT,cAAc,EAAE,KAAK,SAAS,CAAC,CAAC,SAAS,CAAC,aAAa,EAAE,OAAO,EAAE,OAAO;QACvE,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,aAAa,EAAE,CAAC;YACxC,MAAM,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IACD,KAAK,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC;IACpB,OAAO,EAAE;QACP,IAAI,EAAE,EAAE;KACT;CACiE,CAAC;AAErE;;;GAGG;AACH,SAAS,SAAS,CAChB,WAA8C,EAC9C,OAA2B,EAC3B,OAAuB;IAEvB,OAAO,IAAI,CAAC;AACd,CAAC"}
|
package/dist/null-worker-node.js
CHANGED
|
@@ -229,13 +229,16 @@ async function parseData({
|
|
|
229
229
|
options = {
|
|
230
230
|
...options,
|
|
231
231
|
modules: loader && loader.options && loader.options.modules || {},
|
|
232
|
-
|
|
232
|
+
core: {
|
|
233
|
+
...options.core,
|
|
234
|
+
worker: false
|
|
235
|
+
}
|
|
233
236
|
};
|
|
234
237
|
return await parser(data, { ...options }, context, loader);
|
|
235
238
|
}
|
|
236
239
|
|
|
237
240
|
// src/null-loader.ts
|
|
238
|
-
var VERSION = true ? "4.4.0-alpha.
|
|
241
|
+
var VERSION = true ? "4.4.0-alpha.9" : "latest";
|
|
239
242
|
var NullLoader = {
|
|
240
243
|
dataType: null,
|
|
241
244
|
batchType: null,
|
package/dist/null-worker.js
CHANGED
|
@@ -194,13 +194,16 @@
|
|
|
194
194
|
options = {
|
|
195
195
|
...options,
|
|
196
196
|
modules: loader && loader.options && loader.options.modules || {},
|
|
197
|
-
|
|
197
|
+
core: {
|
|
198
|
+
...options.core,
|
|
199
|
+
worker: false
|
|
200
|
+
}
|
|
198
201
|
};
|
|
199
202
|
return await parser(data, { ...options }, context, loader);
|
|
200
203
|
}
|
|
201
204
|
|
|
202
205
|
// src/null-loader.ts
|
|
203
|
-
var VERSION = true ? "4.4.0-alpha.
|
|
206
|
+
var VERSION = true ? "4.4.0-alpha.9" : "latest";
|
|
204
207
|
var NullLoader = {
|
|
205
208
|
dataType: null,
|
|
206
209
|
batchType: null,
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"null-worker-node.js","sourceRoot":"","sources":["../../src/workers/null-worker-node.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,kBAAkB,EAAC,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAC,UAAU,EAAC,0BAAuB;AAE1C,kBAAkB,CAAC,UAAU,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"null-worker.js","sourceRoot":"","sources":["../../src/workers/null-worker.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,kBAAkB,EAAC,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAC,UAAU,EAAC,0BAAuB;AAE1C,kBAAkB,CAAC,UAAU,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/core",
|
|
3
|
-
"version": "4.4.0-alpha.
|
|
3
|
+
"version": "4.4.0-alpha.9",
|
|
4
4
|
"description": "The core API for working with loaders.gl loaders and writers",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -32,6 +32,12 @@
|
|
|
32
32
|
"types": "./dist/index.d.ts",
|
|
33
33
|
"import": "./dist/index.js",
|
|
34
34
|
"require": "./dist/index.cjs"
|
|
35
|
+
},
|
|
36
|
+
"./null-worker.js": {
|
|
37
|
+
"import": "./dist/null-worker.js"
|
|
38
|
+
},
|
|
39
|
+
"./null-worker-node.js": {
|
|
40
|
+
"import": "./dist/null-worker-node.js"
|
|
35
41
|
}
|
|
36
42
|
},
|
|
37
43
|
"sideEffects": false,
|
|
@@ -55,11 +61,11 @@
|
|
|
55
61
|
"build-worker-node": "esbuild src/workers/null-worker.ts --outfile=dist/null-worker-node.js --bundle --platform=node --target=node16 --define:__VERSION__=\\\"$npm_package_version\\\""
|
|
56
62
|
},
|
|
57
63
|
"dependencies": {
|
|
58
|
-
"@loaders.gl/loader-utils": "4.4.0-alpha.
|
|
59
|
-
"@loaders.gl/schema": "4.4.0-alpha.
|
|
60
|
-
"@loaders.gl/schema-utils": "4.4.0-alpha.
|
|
61
|
-
"@loaders.gl/worker-utils": "4.4.0-alpha.
|
|
64
|
+
"@loaders.gl/loader-utils": "4.4.0-alpha.9",
|
|
65
|
+
"@loaders.gl/schema": "4.4.0-alpha.9",
|
|
66
|
+
"@loaders.gl/schema-utils": "4.4.0-alpha.9",
|
|
67
|
+
"@loaders.gl/worker-utils": "4.4.0-alpha.9",
|
|
62
68
|
"@probe.gl/log": "^4.0.2"
|
|
63
69
|
},
|
|
64
|
-
"gitHead": "
|
|
70
|
+
"gitHead": "e9e6710379718c7663e97eba868c76e15de4cb84"
|
|
65
71
|
}
|
package/src/index.ts
CHANGED
|
@@ -9,7 +9,7 @@ import {makeArrayBufferIterator} from './make-array-buffer-iterator';
|
|
|
9
9
|
import {makeBlobIterator} from './make-blob-iterator';
|
|
10
10
|
import type {StreamIteratorOptions} from './make-stream-iterator';
|
|
11
11
|
import {makeStreamIterator} from './make-stream-iterator';
|
|
12
|
-
import {isBlob, isReadableStream, isResponse} from '
|
|
12
|
+
import {isBlob, isReadableStream, isResponse} from '@loaders.gl/loader-utils';
|
|
13
13
|
|
|
14
14
|
/**
|
|
15
15
|
* @param [options.chunkSize]
|
|
@@ -38,14 +38,17 @@ export function makeIterator(
|
|
|
38
38
|
return makeArrayBufferIterator(data, options);
|
|
39
39
|
}
|
|
40
40
|
if (isBlob(data)) {
|
|
41
|
-
return makeBlobIterator(data
|
|
41
|
+
return makeBlobIterator(data, options);
|
|
42
42
|
}
|
|
43
43
|
if (isReadableStream(data)) {
|
|
44
|
-
return makeStreamIterator(data
|
|
44
|
+
return makeStreamIterator(data, options);
|
|
45
45
|
}
|
|
46
46
|
if (isResponse(data)) {
|
|
47
|
-
const
|
|
48
|
-
|
|
47
|
+
const responseBody = data.body;
|
|
48
|
+
if (!responseBody) {
|
|
49
|
+
throw new Error('Readable stream not available on Response');
|
|
50
|
+
}
|
|
51
|
+
return makeStreamIterator(responseBody as ReadableStream, options);
|
|
49
52
|
}
|
|
50
53
|
throw new Error('makeIterator');
|
|
51
54
|
}
|