@loaders.gl/core 4.4.0-alpha.17 → 4.4.0-alpha.19
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.dev.js +49 -10
- package/dist/dist.min.js +3 -3
- package/dist/index.cjs +63 -30
- package/dist/index.cjs.map +2 -2
- package/dist/lib/api/load.d.ts.map +1 -1
- package/dist/lib/api/load.js +13 -0
- package/dist/lib/api/load.js.map +1 -1
- package/dist/lib/api/select-loader.d.ts.map +1 -1
- package/dist/lib/api/select-loader.js +16 -0
- package/dist/lib/api/select-loader.js.map +1 -1
- package/dist/lib/init.js +1 -1
- package/dist/lib/loader-utils/option-defaults.js +5 -5
- package/dist/lib/loader-utils/option-defaults.js.map +1 -1
- package/dist/lib/loader-utils/option-utils.d.ts +1 -1
- package/dist/lib/loader-utils/option-utils.d.ts.map +1 -1
- package/dist/lib/loader-utils/option-utils.js +14 -9
- package/dist/lib/loader-utils/option-utils.js.map +1 -1
- package/dist/null-loader.js +1 -1
- package/dist/null-worker-node.js +1 -1
- package/dist/null-worker.js +1 -1
- package/package.json +6 -6
- package/src/lib/api/load.ts +14 -0
- package/src/lib/api/select-loader.ts +26 -0
- package/src/lib/loader-utils/option-defaults.ts +5 -5
- package/src/lib/loader-utils/option-utils.ts +16 -9
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../../src/lib/api/load.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,QAAQ,EACR,MAAM,EACN,aAAa,EACb,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,sBAAsB,EACtB,qBAAqB,EACtB,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../../src/lib/api/load.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,QAAQ,EACR,MAAM,EACN,aAAa,EACb,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,sBAAsB,EACtB,qBAAqB,EACtB,MAAM,0BAA0B,CAAC;AAQlC;;;;;;;;GAQG;AAEH,wBAAsB,IAAI,CACxB,OAAO,SAAS,MAAM,EACtB,QAAQ,SAAS,aAAa,GAAG,iBAAiB,CAAC,OAAO,CAAC,EAE3D,GAAG,EAAE,MAAM,GAAG,QAAQ,EACtB,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;AAEtC,wBAAsB,IAAI,CACxB,YAAY,SAAS,MAAM,EAAE,EAC7B,QAAQ,SAAS,aAAa,GAAG,sBAAsB,CAAC,YAAY,CAAC,EAErE,GAAG,EAAE,MAAM,GAAG,QAAQ,EACtB,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAC,CAAC;AAEhD;;;GAGG;AACH,wBAAsB,IAAI,CACxB,GAAG,EAAE,MAAM,GAAG,QAAQ,EACtB,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,OAAO,CAAC,CAAC"}
|
package/dist/lib/api/load.js
CHANGED
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
import { isBlob } from '@loaders.gl/loader-utils';
|
|
5
5
|
import { isLoaderObject } from "../loader-utils/normalize-loader.js";
|
|
6
6
|
import { getFetchFunction } from "../loader-utils/get-fetch-function.js";
|
|
7
|
+
import { normalizeLoaderOptions } from "../loader-utils/option-utils.js";
|
|
7
8
|
import { parse } from "./parse.js";
|
|
8
9
|
// export async function load(url: string | DataType, loaders: LoaderOptions): Promise<any>;
|
|
9
10
|
// implementation signature
|
|
@@ -34,6 +35,18 @@ export async function load(url, loaders, options, context) {
|
|
|
34
35
|
// @ts-expect-error TODO - This may not work for overridden fetch functions
|
|
35
36
|
data = await fetch(url);
|
|
36
37
|
}
|
|
38
|
+
if (typeof url === 'string') {
|
|
39
|
+
const normalizedOptions = normalizeLoaderOptions(resolvedOptions || {});
|
|
40
|
+
if (!normalizedOptions.core?.baseUrl) {
|
|
41
|
+
resolvedOptions = {
|
|
42
|
+
...resolvedOptions,
|
|
43
|
+
core: {
|
|
44
|
+
...resolvedOptions?.core,
|
|
45
|
+
baseUrl: url
|
|
46
|
+
}
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
}
|
|
37
50
|
// Data is loaded (at least we have a `Response` object) so time to hand over to `parse`
|
|
38
51
|
// return await parse(data, loaders as Loader[], options);
|
|
39
52
|
return Array.isArray(resolvedLoaders)
|
package/dist/lib/api/load.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load.js","sourceRoot":"","sources":["../../../src/lib/api/load.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAYpC,OAAO,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAC,cAAc,EAAC,4CAAyC;AAChE,OAAO,EAAC,gBAAgB,EAAC,8CAA2C;AAEpE,OAAO,EAAC,KAAK,EAAC,mBAAgB;AA0C9B,4FAA4F;AAE5F,2BAA2B;AAC3B,MAAM,CAAC,KAAK,UAAU,IAAI,CACxB,GAAsB,EACtB,OAAkC,EAClC,OAAuC,EACvC,OAAuB;IAEvB,IAAI,eAAkC,CAAC;IACvC,IAAI,eAA0C,CAAC;IAE/C,gCAAgC;IAChC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;QACxD,eAAe,GAAG,EAAE,CAAC;QACrB,eAAe,GAAG,OAAwB,CAAC;QAC3C,OAAO,GAAG,SAAS,CAAC,CAAC,2CAA2C;IAClE,CAAC;SAAM,CAAC;QACN,eAAe,GAAG,OAA4B,CAAC;QAC/C,eAAe,GAAG,OAAwB,CAAC;IAC7C,CAAC;IAED,wBAAwB;IACxB,MAAM,KAAK,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAC;IAEhD,2DAA2D;IAC3D,IAAI,IAAI,GAAG,GAAG,CAAC;IACf,iCAAiC;IACjC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;QACxB,oFAAoF;IACtF,CAAC;IAED,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;QAChB,mDAAmD;QACnD,2EAA2E;QAC3E,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,wFAAwF;IACxF,0DAA0D;IAC1D,OAAO,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC;QACnC,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC,wBAAwB;QAC9E,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC,yBAAyB;AACpF,CAAC"}
|
|
1
|
+
{"version":3,"file":"load.js","sourceRoot":"","sources":["../../../src/lib/api/load.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAYpC,OAAO,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAC,cAAc,EAAC,4CAAyC;AAChE,OAAO,EAAC,gBAAgB,EAAC,8CAA2C;AACpE,OAAO,EAAC,sBAAsB,EAAC,wCAAqC;AAEpE,OAAO,EAAC,KAAK,EAAC,mBAAgB;AA0C9B,4FAA4F;AAE5F,2BAA2B;AAC3B,MAAM,CAAC,KAAK,UAAU,IAAI,CACxB,GAAsB,EACtB,OAAkC,EAClC,OAAuC,EACvC,OAAuB;IAEvB,IAAI,eAAkC,CAAC;IACvC,IAAI,eAA0C,CAAC;IAE/C,gCAAgC;IAChC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;QACxD,eAAe,GAAG,EAAE,CAAC;QACrB,eAAe,GAAG,OAAwB,CAAC;QAC3C,OAAO,GAAG,SAAS,CAAC,CAAC,2CAA2C;IAClE,CAAC;SAAM,CAAC;QACN,eAAe,GAAG,OAA4B,CAAC;QAC/C,eAAe,GAAG,OAAwB,CAAC;IAC7C,CAAC;IAED,wBAAwB;IACxB,MAAM,KAAK,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAC;IAEhD,2DAA2D;IAC3D,IAAI,IAAI,GAAG,GAAG,CAAC;IACf,iCAAiC;IACjC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;QACxB,oFAAoF;IACtF,CAAC;IAED,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;QAChB,mDAAmD;QACnD,2EAA2E;QAC3E,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,MAAM,iBAAiB,GAAG,sBAAsB,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;QACxE,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC;YACrC,eAAe,GAAG;gBAChB,GAAG,eAAe;gBAClB,IAAI,EAAE;oBACJ,GAAG,eAAe,EAAE,IAAI;oBACxB,OAAO,EAAE,GAAG;iBACb;aACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,wFAAwF;IACxF,0DAA0D;IAC1D,OAAO,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC;QACnC,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC,wBAAwB;QAC9E,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC,yBAAyB;AACpF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select-loader.d.ts","sourceRoot":"","sources":["../../../src/lib/api/select-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,0BAA0B,CAAC;AAuB7F;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,QAAQ,EACd,OAAO,GAAE,MAAM,EAAE,GAAG,MAAW,EAC/B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"select-loader.d.ts","sourceRoot":"","sources":["../../../src/lib/api/select-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,0BAA0B,CAAC;AAuB7F;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,QAAQ,EACd,OAAO,GAAE,MAAM,EAAE,GAAG,MAAW,EAC/B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAkDxB;AAUD;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,QAAQ,EACd,OAAO,GAAE,MAAM,EAAE,GAAG,MAAW,EAC/B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,MAAM,GAAG,IAAI,CAsCf"}
|
|
@@ -27,6 +27,13 @@ export async function selectLoader(data, loaders = [], options, context) {
|
|
|
27
27
|
}
|
|
28
28
|
const normalizedOptions = normalizeLoaderOptions(options || {});
|
|
29
29
|
normalizedOptions.core ||= {};
|
|
30
|
+
if (data instanceof Response && mayContainText(data)) {
|
|
31
|
+
const text = await data.clone().text();
|
|
32
|
+
const textLoader = selectLoaderSync(text, loaders, { ...normalizedOptions, core: { ...normalizedOptions.core, nothrow: true } }, context);
|
|
33
|
+
if (textLoader) {
|
|
34
|
+
return textLoader;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
30
37
|
// First make a sync attempt, disabling exceptions
|
|
31
38
|
let loader = selectLoaderSync(data, loaders, { ...normalizedOptions, core: { ...normalizedOptions.core, nothrow: true } }, context);
|
|
32
39
|
if (loader) {
|
|
@@ -38,12 +45,21 @@ export async function selectLoader(data, loaders = [], options, context) {
|
|
|
38
45
|
data = await data.slice(0, 10).arrayBuffer();
|
|
39
46
|
loader = selectLoaderSync(data, loaders, normalizedOptions, context);
|
|
40
47
|
}
|
|
48
|
+
if (!loader && data instanceof Response && mayContainText(data)) {
|
|
49
|
+
const text = await data.clone().text();
|
|
50
|
+
loader = selectLoaderSync(text, loaders, normalizedOptions, context);
|
|
51
|
+
}
|
|
41
52
|
// no loader available
|
|
42
53
|
if (!loader && !normalizedOptions.core.nothrow) {
|
|
43
54
|
throw new Error(getNoValidLoaderMessage(data));
|
|
44
55
|
}
|
|
45
56
|
return loader;
|
|
46
57
|
}
|
|
58
|
+
function mayContainText(response) {
|
|
59
|
+
const mimeType = getResourceMIMEType(response);
|
|
60
|
+
return Boolean(mimeType &&
|
|
61
|
+
(mimeType.startsWith('text/') || mimeType === 'application/json' || mimeType.endsWith('+json')));
|
|
62
|
+
}
|
|
47
63
|
/**
|
|
48
64
|
* Find a loader that matches file extension and/or initial file content
|
|
49
65
|
* Search the loaders array argument for a loader that matches url extension or initial data
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select-loader.js","sourceRoot":"","sources":["../../../src/lib/api/select-loader.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"select-loader.js","sourceRoot":"","sources":["../../../src/lib/api/select-loader.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/init.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
import { log } from '@loaders.gl/loader-utils';
|
|
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.19" !== 'undefined' ? "4.4.0-alpha.19" : '';
|
|
7
7
|
// @ts-ignore
|
|
8
8
|
if (!globalThis.loaders) {
|
|
9
9
|
log.log(1, `loaders.gl ${version}`)();
|
|
@@ -5,8 +5,8 @@ import { isBrowser } from '@loaders.gl/loader-utils';
|
|
|
5
5
|
import { ConsoleLog } from "./loggers.js";
|
|
6
6
|
export const DEFAULT_LOADER_OPTIONS = {
|
|
7
7
|
core: {
|
|
8
|
-
|
|
9
|
-
//
|
|
8
|
+
baseUrl: undefined,
|
|
9
|
+
// baseUrl
|
|
10
10
|
fetch: null,
|
|
11
11
|
mimeType: undefined,
|
|
12
12
|
fallbackMimeType: undefined,
|
|
@@ -30,8 +30,8 @@ export const DEFAULT_LOADER_OPTIONS = {
|
|
|
30
30
|
}
|
|
31
31
|
};
|
|
32
32
|
export const REMOVED_LOADER_OPTIONS = {
|
|
33
|
-
//
|
|
34
|
-
baseUri: 'core.
|
|
33
|
+
// deprecated top-level alias
|
|
34
|
+
baseUri: 'core.baseUrl',
|
|
35
35
|
fetch: 'core.fetch',
|
|
36
36
|
mimeType: 'core.mimeType',
|
|
37
37
|
fallbackMimeType: 'core.fallbackMimeType',
|
|
@@ -56,7 +56,7 @@ export const REMOVED_LOADER_OPTIONS = {
|
|
|
56
56
|
// Older deprecations
|
|
57
57
|
throws: 'nothrow',
|
|
58
58
|
dataType: '(no longer used)',
|
|
59
|
-
uri: '
|
|
59
|
+
uri: 'core.baseUrl',
|
|
60
60
|
// Warn if fetch options are used on toplevel
|
|
61
61
|
method: 'core.fetch.method',
|
|
62
62
|
headers: 'core.fetch.headers',
|
|
@@ -1 +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,
|
|
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,6BAA6B;IAC7B,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,cAAc;IAEnB,6CAA6C;IAC7C,MAAM,EAAE,mBAAmB;IAC3B,OAAO,EAAE,oBAAoB;IAC7B,IAAI,EAAE,iBAAiB;IACvB,IAAI,EAAE,iBAAiB;IACvB,WAAW,EAAE,wBAAwB;IACrC,KAAK,EAAE,kBAAkB;IACzB,QAAQ,EAAE,qBAAqB;IAC/B,QAAQ,EAAE,qBAAqB;IAC/B,cAAc,EAAE,2BAA2B;IAC3C,SAAS,EAAE,sBAAsB;IACjC,SAAS,EAAE,sBAAsB;IACjC,MAAM,EAAE,mBAAmB;CAC5B,CAAC"}
|
|
@@ -23,7 +23,7 @@ export declare function getGlobalLoaderOptions(): StrictLoaderOptions;
|
|
|
23
23
|
*/
|
|
24
24
|
export declare function setGlobalOptions(options: LoaderOptions): void;
|
|
25
25
|
/**
|
|
26
|
-
* Merges options with global opts and loader defaults, also injects
|
|
26
|
+
* Merges options with global opts and loader defaults, also injects baseUrl
|
|
27
27
|
* @param options
|
|
28
28
|
* @param loader
|
|
29
29
|
* @param loaders
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,EAEpB,MAAM,0BAA0B,CAAC;AA6BlC;;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,11 +1,12 @@
|
|
|
1
1
|
// loaders.gl
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
|
-
import { registerJSModules, isPureObject, isObject } from '@loaders.gl/loader-utils';
|
|
4
|
+
import { registerJSModules, isPureObject, isObject, path } from '@loaders.gl/loader-utils';
|
|
5
5
|
import { probeLog, NullLog } from "./loggers.js";
|
|
6
6
|
import { DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS } from "./option-defaults.js";
|
|
7
|
+
import { stripQueryString } from "../utils/url-utils.js";
|
|
7
8
|
const CORE_LOADER_OPTION_KEYS = [
|
|
8
|
-
'
|
|
9
|
+
'baseUrl',
|
|
9
10
|
'fetch',
|
|
10
11
|
'mimeType',
|
|
11
12
|
'fallbackMimeType',
|
|
@@ -69,7 +70,7 @@ export function setGlobalOptions(options) {
|
|
|
69
70
|
registerJSModules(options.modules);
|
|
70
71
|
}
|
|
71
72
|
/**
|
|
72
|
-
* Merges options with global opts and loader defaults, also injects
|
|
73
|
+
* Merges options with global opts and loader defaults, also injects baseUrl
|
|
73
74
|
* @param options
|
|
74
75
|
* @param loader
|
|
75
76
|
* @param loaders
|
|
@@ -202,8 +203,7 @@ function mergeNestedFields(mergedOptions, options) {
|
|
|
202
203
|
}
|
|
203
204
|
/**
|
|
204
205
|
* Harvest information from the url
|
|
205
|
-
* @deprecated This is mainly there to support
|
|
206
|
-
* TODO - baseUri should be a directory, i.e. remove file component from baseUri
|
|
206
|
+
* @deprecated This is mainly there to support loaders that still resolve from options
|
|
207
207
|
* TODO - extract extension?
|
|
208
208
|
* TODO - extract query parameters?
|
|
209
209
|
* TODO - should these be injected on context instead of options?
|
|
@@ -212,11 +212,10 @@ function addUrlOptions(options, url) {
|
|
|
212
212
|
if (!url) {
|
|
213
213
|
return;
|
|
214
214
|
}
|
|
215
|
-
const
|
|
216
|
-
|
|
217
|
-
if (!hasTopLevelBaseUri && !hasCoreBaseUri) {
|
|
215
|
+
const hasCoreBaseUrl = options.core?.baseUrl !== undefined;
|
|
216
|
+
if (!hasCoreBaseUrl) {
|
|
218
217
|
options.core ||= {};
|
|
219
|
-
options.core.
|
|
218
|
+
options.core.baseUrl = path.dirname(stripQueryString(url));
|
|
220
219
|
}
|
|
221
220
|
}
|
|
222
221
|
function cloneLoaderOptions(options) {
|
|
@@ -227,6 +226,12 @@ function cloneLoaderOptions(options) {
|
|
|
227
226
|
return clonedOptions;
|
|
228
227
|
}
|
|
229
228
|
function moveDeprecatedTopLevelOptionsToCore(options) {
|
|
229
|
+
if (options.baseUri !== undefined) {
|
|
230
|
+
options.core ||= {};
|
|
231
|
+
if (options.core.baseUrl === undefined) {
|
|
232
|
+
options.core.baseUrl = options.baseUri;
|
|
233
|
+
}
|
|
234
|
+
}
|
|
230
235
|
for (const key of CORE_LOADER_OPTION_KEYS) {
|
|
231
236
|
if (options[key] !== undefined) {
|
|
232
237
|
const coreOptions = (options.core = options.core || {});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"option-utils.js","sourceRoot":"","sources":["../../../src/lib/loader-utils/option-utils.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAGL,iBAAiB,EACjB,YAAY,EACZ,QAAQ,
|
|
1
|
+
{"version":3,"file":"option-utils.js","sourceRoot":"","sources":["../../../src/lib/loader-utils/option-utils.ts"],"names":[],"mappings":"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"}
|
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.19" !== 'undefined' ? "4.4.0-alpha.19" : 'latest';
|
|
7
7
|
/**
|
|
8
8
|
* Loads any data and returns null (or optionally passes through data unparsed)
|
|
9
9
|
*/
|
package/dist/null-worker-node.js
CHANGED
package/dist/null-worker.js
CHANGED
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.19",
|
|
4
4
|
"description": "The core API for working with loaders.gl loaders and writers",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -58,11 +58,11 @@
|
|
|
58
58
|
"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\\\""
|
|
59
59
|
},
|
|
60
60
|
"dependencies": {
|
|
61
|
-
"@loaders.gl/loader-utils": "4.4.0-alpha.
|
|
62
|
-
"@loaders.gl/schema": "4.4.0-alpha.
|
|
63
|
-
"@loaders.gl/schema-utils": "4.4.0-alpha.
|
|
64
|
-
"@loaders.gl/worker-utils": "4.4.0-alpha.
|
|
61
|
+
"@loaders.gl/loader-utils": "4.4.0-alpha.19",
|
|
62
|
+
"@loaders.gl/schema": "4.4.0-alpha.19",
|
|
63
|
+
"@loaders.gl/schema-utils": "4.4.0-alpha.19",
|
|
64
|
+
"@loaders.gl/worker-utils": "4.4.0-alpha.19",
|
|
65
65
|
"@probe.gl/log": "^4.1.1"
|
|
66
66
|
},
|
|
67
|
-
"gitHead": "
|
|
67
|
+
"gitHead": "e29d8964be2d7304d212560b44e6669ce01e9b8a"
|
|
68
68
|
}
|
package/src/lib/api/load.ts
CHANGED
|
@@ -15,6 +15,7 @@ import type {
|
|
|
15
15
|
import {isBlob} from '@loaders.gl/loader-utils';
|
|
16
16
|
import {isLoaderObject} from '../loader-utils/normalize-loader';
|
|
17
17
|
import {getFetchFunction} from '../loader-utils/get-fetch-function';
|
|
18
|
+
import {normalizeLoaderOptions} from '../loader-utils/option-utils';
|
|
18
19
|
|
|
19
20
|
import {parse} from './parse';
|
|
20
21
|
|
|
@@ -97,6 +98,19 @@ export async function load(
|
|
|
97
98
|
data = await fetch(url);
|
|
98
99
|
}
|
|
99
100
|
|
|
101
|
+
if (typeof url === 'string') {
|
|
102
|
+
const normalizedOptions = normalizeLoaderOptions(resolvedOptions || {});
|
|
103
|
+
if (!normalizedOptions.core?.baseUrl) {
|
|
104
|
+
resolvedOptions = {
|
|
105
|
+
...resolvedOptions,
|
|
106
|
+
core: {
|
|
107
|
+
...resolvedOptions?.core,
|
|
108
|
+
baseUrl: url
|
|
109
|
+
}
|
|
110
|
+
};
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
|
|
100
114
|
// Data is loaded (at least we have a `Response` object) so time to hand over to `parse`
|
|
101
115
|
// return await parse(data, loaders as Loader[], options);
|
|
102
116
|
return Array.isArray(resolvedLoaders)
|
|
@@ -47,6 +47,19 @@ export async function selectLoader(
|
|
|
47
47
|
const normalizedOptions = normalizeLoaderOptions(options || {});
|
|
48
48
|
normalizedOptions.core ||= {};
|
|
49
49
|
|
|
50
|
+
if (data instanceof Response && mayContainText(data)) {
|
|
51
|
+
const text = await data.clone().text();
|
|
52
|
+
const textLoader = selectLoaderSync(
|
|
53
|
+
text,
|
|
54
|
+
loaders,
|
|
55
|
+
{...normalizedOptions, core: {...normalizedOptions.core, nothrow: true}},
|
|
56
|
+
context
|
|
57
|
+
);
|
|
58
|
+
if (textLoader) {
|
|
59
|
+
return textLoader;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
|
|
50
63
|
// First make a sync attempt, disabling exceptions
|
|
51
64
|
let loader = selectLoaderSync(
|
|
52
65
|
data,
|
|
@@ -65,6 +78,11 @@ export async function selectLoader(
|
|
|
65
78
|
loader = selectLoaderSync(data, loaders, normalizedOptions, context);
|
|
66
79
|
}
|
|
67
80
|
|
|
81
|
+
if (!loader && data instanceof Response && mayContainText(data)) {
|
|
82
|
+
const text = await data.clone().text();
|
|
83
|
+
loader = selectLoaderSync(text, loaders, normalizedOptions, context);
|
|
84
|
+
}
|
|
85
|
+
|
|
68
86
|
// no loader available
|
|
69
87
|
if (!loader && !normalizedOptions.core.nothrow) {
|
|
70
88
|
throw new Error(getNoValidLoaderMessage(data));
|
|
@@ -73,6 +91,14 @@ export async function selectLoader(
|
|
|
73
91
|
return loader;
|
|
74
92
|
}
|
|
75
93
|
|
|
94
|
+
function mayContainText(response: Response): boolean {
|
|
95
|
+
const mimeType = getResourceMIMEType(response);
|
|
96
|
+
return Boolean(
|
|
97
|
+
mimeType &&
|
|
98
|
+
(mimeType.startsWith('text/') || mimeType === 'application/json' || mimeType.endsWith('+json'))
|
|
99
|
+
);
|
|
100
|
+
}
|
|
101
|
+
|
|
76
102
|
/**
|
|
77
103
|
* Find a loader that matches file extension and/or initial file content
|
|
78
104
|
* Search the loaders array argument for a loader that matches url extension or initial data
|
|
@@ -8,8 +8,8 @@ import {ConsoleLog} from './loggers';
|
|
|
8
8
|
|
|
9
9
|
export const DEFAULT_LOADER_OPTIONS: LoaderOptions = {
|
|
10
10
|
core: {
|
|
11
|
-
|
|
12
|
-
//
|
|
11
|
+
baseUrl: undefined,
|
|
12
|
+
// baseUrl
|
|
13
13
|
fetch: null,
|
|
14
14
|
mimeType: undefined,
|
|
15
15
|
fallbackMimeType: undefined,
|
|
@@ -36,8 +36,8 @@ export const DEFAULT_LOADER_OPTIONS: LoaderOptions = {
|
|
|
36
36
|
};
|
|
37
37
|
|
|
38
38
|
export const REMOVED_LOADER_OPTIONS = {
|
|
39
|
-
//
|
|
40
|
-
baseUri: 'core.
|
|
39
|
+
// deprecated top-level alias
|
|
40
|
+
baseUri: 'core.baseUrl',
|
|
41
41
|
fetch: 'core.fetch',
|
|
42
42
|
mimeType: 'core.mimeType',
|
|
43
43
|
fallbackMimeType: 'core.fallbackMimeType',
|
|
@@ -65,7 +65,7 @@ export const REMOVED_LOADER_OPTIONS = {
|
|
|
65
65
|
// Older deprecations
|
|
66
66
|
throws: 'nothrow',
|
|
67
67
|
dataType: '(no longer used)',
|
|
68
|
-
uri: '
|
|
68
|
+
uri: 'core.baseUrl',
|
|
69
69
|
|
|
70
70
|
// Warn if fetch options are used on toplevel
|
|
71
71
|
method: 'core.fetch.method',
|
|
@@ -8,13 +8,15 @@ import {
|
|
|
8
8
|
registerJSModules,
|
|
9
9
|
isPureObject,
|
|
10
10
|
isObject,
|
|
11
|
-
StrictLoaderOptions
|
|
11
|
+
StrictLoaderOptions,
|
|
12
|
+
path
|
|
12
13
|
} from '@loaders.gl/loader-utils';
|
|
13
14
|
import {probeLog, NullLog} from './loggers';
|
|
14
15
|
import {DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS} from './option-defaults';
|
|
16
|
+
import {stripQueryString} from '../utils/url-utils';
|
|
15
17
|
|
|
16
18
|
const CORE_LOADER_OPTION_KEYS = [
|
|
17
|
-
'
|
|
19
|
+
'baseUrl',
|
|
18
20
|
'fetch',
|
|
19
21
|
'mimeType',
|
|
20
22
|
'fallbackMimeType',
|
|
@@ -91,7 +93,7 @@ export function setGlobalOptions(options: LoaderOptions): void {
|
|
|
91
93
|
}
|
|
92
94
|
|
|
93
95
|
/**
|
|
94
|
-
* Merges options with global opts and loader defaults, also injects
|
|
96
|
+
* Merges options with global opts and loader defaults, also injects baseUrl
|
|
95
97
|
* @param options
|
|
96
98
|
* @param loader
|
|
97
99
|
* @param loaders
|
|
@@ -262,8 +264,7 @@ function mergeNestedFields(mergedOptions: LoaderOptions, options: LoaderOptions)
|
|
|
262
264
|
|
|
263
265
|
/**
|
|
264
266
|
* Harvest information from the url
|
|
265
|
-
* @deprecated This is mainly there to support
|
|
266
|
-
* TODO - baseUri should be a directory, i.e. remove file component from baseUri
|
|
267
|
+
* @deprecated This is mainly there to support loaders that still resolve from options
|
|
267
268
|
* TODO - extract extension?
|
|
268
269
|
* TODO - extract query parameters?
|
|
269
270
|
* TODO - should these be injected on context instead of options?
|
|
@@ -272,11 +273,10 @@ function addUrlOptions(options: LoaderOptions, url?: string): void {
|
|
|
272
273
|
if (!url) {
|
|
273
274
|
return;
|
|
274
275
|
}
|
|
275
|
-
const
|
|
276
|
-
|
|
277
|
-
if (!hasTopLevelBaseUri && !hasCoreBaseUri) {
|
|
276
|
+
const hasCoreBaseUrl = options.core?.baseUrl !== undefined;
|
|
277
|
+
if (!hasCoreBaseUrl) {
|
|
278
278
|
options.core ||= {};
|
|
279
|
-
options.core.
|
|
279
|
+
options.core.baseUrl = path.dirname(stripQueryString(url));
|
|
280
280
|
}
|
|
281
281
|
}
|
|
282
282
|
|
|
@@ -289,6 +289,13 @@ function cloneLoaderOptions(options: LoaderOptions): LoaderOptions {
|
|
|
289
289
|
}
|
|
290
290
|
|
|
291
291
|
function moveDeprecatedTopLevelOptionsToCore(options: LoaderOptions): void {
|
|
292
|
+
if (options.baseUri !== undefined) {
|
|
293
|
+
options.core ||= {};
|
|
294
|
+
if (options.core.baseUrl === undefined) {
|
|
295
|
+
options.core.baseUrl = options.baseUri;
|
|
296
|
+
}
|
|
297
|
+
}
|
|
298
|
+
|
|
292
299
|
for (const key of CORE_LOADER_OPTION_KEYS) {
|
|
293
300
|
if ((options as Record<string, unknown>)[key] !== undefined) {
|
|
294
301
|
const coreOptions = (options.core = options.core || {});
|