@loaders.gl/core 3.4.0-alpha.2 → 3.4.0-alpha.4
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 +234 -70
- package/dist/es5/core-addons/write-file-browser.js +0 -2
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/iterators/batch-iterators/timed-batch-iterator.js +65 -67
- package/dist/es5/iterators/batch-iterators/timed-batch-iterator.js.map +1 -1
- package/dist/es5/iterators/make-iterator/make-array-buffer-iterator.js +13 -24
- package/dist/es5/iterators/make-iterator/make-array-buffer-iterator.js.map +1 -1
- package/dist/es5/iterators/make-iterator/make-blob-iterator.js +22 -25
- package/dist/es5/iterators/make-iterator/make-blob-iterator.js.map +1 -1
- package/dist/es5/iterators/make-iterator/make-iterator.js.map +1 -1
- package/dist/es5/iterators/make-iterator/make-stream-iterator.js +88 -93
- package/dist/es5/iterators/make-iterator/make-stream-iterator.js.map +1 -1
- package/dist/es5/iterators/make-iterator/make-string-iterator.js +20 -24
- package/dist/es5/iterators/make-iterator/make-string-iterator.js.map +1 -1
- package/dist/es5/iterators/make-stream/make-dom-stream.js +30 -34
- package/dist/es5/iterators/make-stream/make-dom-stream.js.map +1 -1
- package/dist/es5/iterators/make-stream/make-node-stream.js +75 -81
- package/dist/es5/iterators/make-stream/make-node-stream.js.map +1 -1
- package/dist/es5/javascript-utils/is-type.js +0 -3
- package/dist/es5/javascript-utils/is-type.js.map +1 -1
- package/dist/es5/lib/api/encode.js +157 -166
- package/dist/es5/lib/api/encode.js.map +1 -1
- package/dist/es5/lib/api/load-in-batches.js +23 -29
- package/dist/es5/lib/api/load-in-batches.js.map +1 -1
- package/dist/es5/lib/api/load.js +34 -37
- package/dist/es5/lib/api/load.js.map +1 -1
- package/dist/es5/lib/api/loader-options.js.map +1 -1
- package/dist/es5/lib/api/parse-in-batches.js +192 -207
- package/dist/es5/lib/api/parse-in-batches.js.map +1 -1
- package/dist/es5/lib/api/parse-sync.js +0 -7
- package/dist/es5/lib/api/parse-sync.js.map +1 -1
- package/dist/es5/lib/api/parse.js +99 -107
- package/dist/es5/lib/api/parse.js.map +1 -1
- package/dist/es5/lib/api/register-loaders.js +1 -3
- package/dist/es5/lib/api/register-loaders.js.map +1 -1
- package/dist/es5/lib/api/save.js +13 -15
- package/dist/es5/lib/api/save.js.map +1 -1
- package/dist/es5/lib/api/select-loader.js +41 -58
- package/dist/es5/lib/api/select-loader.js.map +1 -1
- package/dist/es5/lib/fetch/fetch-error-message.js +29 -31
- package/dist/es5/lib/fetch/fetch-error-message.js.map +1 -1
- package/dist/es5/lib/fetch/fetch-file.js +23 -25
- package/dist/es5/lib/fetch/fetch-file.js.map +1 -1
- package/dist/es5/lib/fetch/read-array-buffer.js +41 -45
- 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 +15 -17
- package/dist/es5/lib/fetch/write-file.js.map +1 -1
- package/dist/es5/lib/filesystems/browser-filesystem.js +107 -124
- package/dist/es5/lib/filesystems/browser-filesystem.js.map +1 -1
- package/dist/es5/lib/filesystems/read-array-buffer.js +19 -21
- package/dist/es5/lib/filesystems/read-array-buffer.js.map +1 -1
- package/dist/es5/lib/init.js +1 -3
- package/dist/es5/lib/init.js.map +1 -1
- package/dist/es5/lib/loader-utils/check-errors.js +24 -26
- package/dist/es5/lib/loader-utils/check-errors.js.map +1 -1
- package/dist/es5/lib/loader-utils/get-data.js +130 -145
- package/dist/es5/lib/loader-utils/get-data.js.map +1 -1
- package/dist/es5/lib/loader-utils/get-fetch-function.js +0 -5
- package/dist/es5/lib/loader-utils/get-fetch-function.js.map +1 -1
- package/dist/es5/lib/loader-utils/loader-context.js +0 -3
- package/dist/es5/lib/loader-utils/loader-context.js.map +1 -1
- package/dist/es5/lib/loader-utils/loggers.js +0 -2
- package/dist/es5/lib/loader-utils/loggers.js.map +1 -1
- package/dist/es5/lib/loader-utils/normalize-loader.js +0 -3
- package/dist/es5/lib/loader-utils/normalize-loader.js.map +1 -1
- package/dist/es5/lib/loader-utils/option-defaults.js +0 -2
- package/dist/es5/lib/loader-utils/option-defaults.js.map +1 -1
- package/dist/es5/lib/loader-utils/option-utils.js +1 -12
- package/dist/es5/lib/loader-utils/option-utils.js.map +1 -1
- package/dist/es5/lib/progress/fetch-progress.js +92 -98
- 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 +0 -3
- package/dist/es5/lib/utils/mime-type-utils.js.map +1 -1
- package/dist/es5/lib/utils/resource-utils.js +0 -4
- package/dist/es5/lib/utils/resource-utils.js.map +1 -1
- package/dist/es5/lib/utils/response-utils.js +118 -131
- package/dist/es5/lib/utils/response-utils.js.map +1 -1
- package/dist/es5/null-loader.js +57 -63
- package/dist/es5/null-loader.js.map +1 -1
- package/dist/es5/workers/null-worker.js.map +1 -1
- package/dist/esm/bundle.js +0 -1
- package/dist/esm/bundle.js.map +1 -1
- package/dist/esm/index.js +0 -12
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/iterators/batch-iterators/timed-batch-iterator.js +0 -1
- package/dist/esm/iterators/batch-iterators/timed-batch-iterator.js.map +1 -1
- package/dist/esm/iterators/make-iterator/make-array-buffer-iterator.js +16 -17
- package/dist/esm/iterators/make-iterator/make-array-buffer-iterator.js.map +1 -1
- package/dist/esm/iterators/make-iterator/make-blob-iterator.js +0 -1
- package/dist/esm/iterators/make-iterator/make-blob-iterator.js.map +1 -1
- package/dist/esm/iterators/make-iterator/make-iterator.js +0 -1
- package/dist/esm/iterators/make-iterator/make-iterator.js.map +1 -1
- package/dist/esm/iterators/make-iterator/make-stream-iterator.js +0 -3
- package/dist/esm/iterators/make-iterator/make-stream-iterator.js.map +1 -1
- package/dist/esm/iterators/make-iterator/make-string-iterator.js +0 -2
- package/dist/esm/iterators/make-iterator/make-string-iterator.js.map +1 -1
- package/dist/esm/iterators/make-stream/make-dom-stream.js +1 -3
- package/dist/esm/iterators/make-stream/make-dom-stream.js.map +1 -1
- package/dist/esm/iterators/make-stream/make-node-stream.js +0 -1
- package/dist/esm/iterators/make-stream/make-node-stream.js.map +1 -1
- package/dist/esm/javascript-utils/is-type.js +0 -4
- package/dist/esm/javascript-utils/is-type.js.map +1 -1
- package/dist/esm/lib/api/encode.js +0 -9
- package/dist/esm/lib/api/encode.js.map +1 -1
- package/dist/esm/lib/api/load-in-batches.js +0 -4
- package/dist/esm/lib/api/load-in-batches.js.map +1 -1
- package/dist/esm/lib/api/load.js +0 -5
- package/dist/esm/lib/api/load.js.map +1 -1
- package/dist/esm/lib/api/parse-in-batches.js +2 -16
- package/dist/esm/lib/api/parse-in-batches.js.map +1 -1
- package/dist/esm/lib/api/parse-sync.js +0 -8
- package/dist/esm/lib/api/parse-sync.js.map +1 -1
- package/dist/esm/lib/api/parse.js +0 -12
- package/dist/esm/lib/api/parse.js.map +1 -1
- package/dist/esm/lib/api/register-loaders.js +0 -3
- 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 +0 -20
- package/dist/esm/lib/api/select-loader.js.map +1 -1
- package/dist/esm/lib/fetch/fetch-error-message.js.map +1 -1
- package/dist/esm/lib/fetch/fetch-file.js +0 -1
- package/dist/esm/lib/fetch/fetch-file.js.map +1 -1
- package/dist/esm/lib/fetch/read-array-buffer.js +0 -3
- package/dist/esm/lib/fetch/read-array-buffer.js.map +1 -1
- package/dist/esm/lib/fetch/read-file.js +0 -4
- package/dist/esm/lib/fetch/read-file.js.map +1 -1
- package/dist/esm/lib/fetch/write-file.js +0 -1
- package/dist/esm/lib/fetch/write-file.js.map +1 -1
- package/dist/esm/lib/filesystems/browser-filesystem.js +1 -11
- package/dist/esm/lib/filesystems/browser-filesystem.js.map +1 -1
- package/dist/esm/lib/filesystems/read-array-buffer.js +0 -2
- package/dist/esm/lib/filesystems/read-array-buffer.js.map +1 -1
- package/dist/esm/lib/init.js +1 -4
- package/dist/esm/lib/init.js.map +1 -1
- package/dist/esm/lib/loader-utils/check-errors.js +1 -2
- package/dist/esm/lib/loader-utils/check-errors.js.map +1 -1
- package/dist/esm/lib/loader-utils/get-data.js +0 -6
- package/dist/esm/lib/loader-utils/get-data.js.map +1 -1
- package/dist/esm/lib/loader-utils/get-fetch-function.js +0 -7
- package/dist/esm/lib/loader-utils/get-fetch-function.js.map +1 -1
- package/dist/esm/lib/loader-utils/loader-context.js +0 -4
- package/dist/esm/lib/loader-utils/loader-context.js.map +1 -1
- package/dist/esm/lib/loader-utils/loggers.js +0 -3
- package/dist/esm/lib/loader-utils/loggers.js.map +1 -1
- package/dist/esm/lib/loader-utils/normalize-loader.js +0 -3
- package/dist/esm/lib/loader-utils/normalize-loader.js.map +1 -1
- package/dist/esm/lib/loader-utils/option-defaults.js +0 -2
- package/dist/esm/lib/loader-utils/option-defaults.js.map +1 -1
- package/dist/esm/lib/loader-utils/option-utils.js +0 -14
- package/dist/esm/lib/loader-utils/option-utils.js.map +1 -1
- package/dist/esm/lib/progress/fetch-progress.js +2 -6
- package/dist/esm/lib/progress/fetch-progress.js.map +1 -1
- package/dist/esm/lib/utils/log.js +0 -1
- package/dist/esm/lib/utils/log.js.map +1 -1
- package/dist/esm/lib/utils/mime-type-utils.js +0 -4
- package/dist/esm/lib/utils/mime-type-utils.js.map +1 -1
- package/dist/esm/lib/utils/resource-utils.js +0 -4
- package/dist/esm/lib/utils/resource-utils.js.map +1 -1
- package/dist/esm/lib/utils/response-utils.js +1 -12
- package/dist/esm/lib/utils/response-utils.js.map +1 -1
- package/dist/esm/null-loader.js +1 -4
- package/dist/esm/null-loader.js.map +1 -1
- package/dist/lib/fetch/fetch-file.js +1 -1
- package/dist/lib/progress/fetch-progress.js +2 -2
- package/dist/null-worker.js +1 -1
- package/package.json +4 -4
- package/src/lib/progress/fetch-progress.ts +2 -2
|
@@ -14,12 +14,10 @@ export default class BrowserFileSystem {
|
|
|
14
14
|
}
|
|
15
15
|
this.fetch = this.fetch.bind(this);
|
|
16
16
|
}
|
|
17
|
-
|
|
18
17
|
async fetch(path, options) {
|
|
19
18
|
if (path.includes('://')) {
|
|
20
19
|
return this._fetch(path, options);
|
|
21
20
|
}
|
|
22
|
-
|
|
23
21
|
const file = this.files[path];
|
|
24
22
|
if (!file) {
|
|
25
23
|
return new Response(path, {
|
|
@@ -40,14 +38,12 @@ export default class BrowserFileSystem {
|
|
|
40
38
|
});
|
|
41
39
|
return response;
|
|
42
40
|
}
|
|
43
|
-
|
|
44
41
|
const response = new Response(file);
|
|
45
42
|
Object.defineProperty(response, 'url', {
|
|
46
43
|
value: path
|
|
47
44
|
});
|
|
48
45
|
return response;
|
|
49
46
|
}
|
|
50
|
-
|
|
51
47
|
async readdir(dirname) {
|
|
52
48
|
const files = [];
|
|
53
49
|
for (const path in this.files) {
|
|
@@ -55,7 +51,6 @@ export default class BrowserFileSystem {
|
|
|
55
51
|
}
|
|
56
52
|
return files;
|
|
57
53
|
}
|
|
58
|
-
|
|
59
54
|
async stat(path, options) {
|
|
60
55
|
const file = this.files[path];
|
|
61
56
|
if (!file) {
|
|
@@ -65,17 +60,14 @@ export default class BrowserFileSystem {
|
|
|
65
60
|
size: file.size
|
|
66
61
|
};
|
|
67
62
|
}
|
|
68
|
-
|
|
69
63
|
async unlink(path) {
|
|
70
64
|
delete this.files[path];
|
|
71
65
|
delete this.lowerCaseFiles[path];
|
|
72
66
|
this.usedFiles[path] = true;
|
|
73
67
|
}
|
|
74
|
-
|
|
75
68
|
async open(pathname, flags, mode) {
|
|
76
69
|
return this.files[pathname];
|
|
77
70
|
}
|
|
78
|
-
|
|
79
71
|
async read(fd, buffer) {
|
|
80
72
|
let offset = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
81
73
|
let length = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : buffer.byteLength;
|
|
@@ -88,9 +80,7 @@ export default class BrowserFileSystem {
|
|
|
88
80
|
buffer: arrayBuffer
|
|
89
81
|
};
|
|
90
82
|
}
|
|
91
|
-
async close(fd) {
|
|
92
|
-
}
|
|
93
|
-
|
|
83
|
+
async close(fd) {}
|
|
94
84
|
_getFile(path, used) {
|
|
95
85
|
const file = this.files[path] || this.lowerCaseFiles[path];
|
|
96
86
|
if (file && used) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser-filesystem.js","names":["BrowserFileSystem","constructor","files","options","_fetch","fetch","i","length","file","name","lowerCaseFiles","toLowerCase","usedFiles","bind","path","includes","Response","status","statusText","headers","Headers","range","get","bytes","exec","start","parseInt","end","data","slice","arrayBuffer","response","Object","defineProperty","value","readdir","dirname","push","stat","Error","size","unlink","open","pathname","flags","mode","read","fd","buffer","offset","byteLength","position","startPosition","bytesRead","close","_getFile","used"],"sources":["../../../../src/lib/filesystems/browser-filesystem.ts"],"sourcesContent":["import type {FileSystem} from './filesystem';\n\ntype BrowserFileSystemOptions = {\n fetch?: typeof fetch;\n};\n\n/**\n * FileSystem adapter for a browser FileList.\n * Holds a list of browser 'File' objects.\n */\nexport default class BrowserFileSystem implements FileSystem {\n private _fetch: typeof fetch;\n private files: {[filename: string]: File} = {};\n private lowerCaseFiles: {[filename: string]: File} = {};\n private usedFiles: {[filename: string]: boolean} = {};\n\n /**\n * A FileSystem API wrapper around a list of browser 'File' objects\n * @param files\n * @param options\n */\n constructor(files: FileList | File[], options?: BrowserFileSystemOptions) {\n this._fetch = options?.fetch || fetch;\n\n for (let i = 0; i < files.length; ++i) {\n const file = files[i];\n this.files[file.name] = file;\n this.lowerCaseFiles[file.name.toLowerCase()] = file;\n this.usedFiles[file.name] = false;\n }\n\n this.fetch = this.fetch.bind(this);\n }\n\n // implements IFileSystem\n\n /**\n * Implementation of fetch against this file system\n * Delegates to global fetch for http{s}:// or data://\n */\n async fetch(path: string, options?: RequestInit): Promise<Response> {\n // Fallback to handle https:/http:/data: etc fetches\n if (path.includes('://')) {\n return this._fetch(path, options);\n }\n\n // Local fetches are served from the list of files\n const file = this.files[path];\n if (!file) {\n return new Response(path, {status: 400, statusText: 'NOT FOUND'});\n }\n\n const headers = new Headers(options?.headers);\n const range = headers.get('Range');\n const bytes = range && /bytes=($1)-($2)/.exec(range);\n\n if (bytes) {\n const start = parseInt(bytes[1]);\n const end = parseInt(bytes[2]);\n // The trick when reading File objects is to read successive \"slices\" of the File\n // Per spec https://w3c.github.io/FileAPI/, slicing a File should only update the start and end fields\n // Actually reading from file should happen in `readAsArrayBuffer` (and as far we can tell it does)\n const data = await file.slice(start, end).arrayBuffer();\n const response = new Response(data);\n Object.defineProperty(response, 'url', {value: path});\n return response;\n }\n\n // return makeResponse()\n const response = new Response(file);\n Object.defineProperty(response, 'url', {value: path});\n return response;\n }\n\n /**\n * List filenames in this filesystem\n * @param dirname\n * @returns\n */\n async readdir(dirname?: string): Promise<string[]> {\n const files: string[] = [];\n for (const path in this.files) {\n files.push(path);\n }\n // TODO filter by dirname\n return files;\n }\n\n /**\n * Return information (size) about files in this file system\n */\n async stat(path: string, options?: object): Promise<{size: number}> {\n const file = this.files[path];\n if (!file) {\n throw new Error(path);\n }\n return {size: file.size};\n }\n\n /**\n * Just removes the file from the list\n */\n async unlink(path: string): Promise<void> {\n delete this.files[path];\n delete this.lowerCaseFiles[path];\n this.usedFiles[path] = true;\n }\n\n // implements IRandomAccessFileSystem\n\n // RANDOM ACCESS\n async open(pathname: string, flags, mode?): Promise<any> {\n return this.files[pathname];\n }\n\n /**\n * Read a range into a buffer\n * @todo - handle position memory\n * @param buffer is the buffer that the data (read from the fd) will be written to.\n * @param offset is the offset in the buffer to start writing at.\n * @param length is an integer specifying the number of bytes to read.\n * @param position is an argument specifying where to begin reading from in the file. If position is null, data will be read from the current file position, and the file position will be updated. If position is an integer, the file position will remain unchanged.\n */\n async read(\n fd: any,\n buffer: ArrayBuffer,\n offset: number = 0,\n length: number = buffer.byteLength,\n position: number | null = null\n ): Promise<{bytesRead: number; buffer: ArrayBuffer}> {\n const file = fd as File;\n const startPosition = 0; // position\n const arrayBuffer = await file.slice(startPosition, startPosition + length).arrayBuffer();\n // copy into target buffer\n return {bytesRead: length, buffer: arrayBuffer};\n }\n\n async close(fd: number): Promise<void> {\n // NO OP\n }\n\n // fstat(fd: number): Promise<object>; // Stat\n\n // PRIVATE\n\n // Supports case independent paths, and file usage tracking\n _getFile(path, used) {\n // Prefer case match, but fall back to case indepent.\n const file = this.files[path] || this.lowerCaseFiles[path];\n if (file && used) {\n this.usedFiles[path] = true;\n }\n return file;\n }\n}\n"],"mappings":";AAUA,eAAe,MAAMA,iBAAiB,CAAuB;EAW3DC,
|
|
1
|
+
{"version":3,"file":"browser-filesystem.js","names":["BrowserFileSystem","constructor","files","options","_defineProperty","_fetch","fetch","i","length","file","name","lowerCaseFiles","toLowerCase","usedFiles","bind","path","includes","Response","status","statusText","headers","Headers","range","get","bytes","exec","start","parseInt","end","data","slice","arrayBuffer","response","Object","defineProperty","value","readdir","dirname","push","stat","Error","size","unlink","open","pathname","flags","mode","read","fd","buffer","offset","arguments","undefined","byteLength","position","startPosition","bytesRead","close","_getFile","used"],"sources":["../../../../src/lib/filesystems/browser-filesystem.ts"],"sourcesContent":["import type {FileSystem} from './filesystem';\n\ntype BrowserFileSystemOptions = {\n fetch?: typeof fetch;\n};\n\n/**\n * FileSystem adapter for a browser FileList.\n * Holds a list of browser 'File' objects.\n */\nexport default class BrowserFileSystem implements FileSystem {\n private _fetch: typeof fetch;\n private files: {[filename: string]: File} = {};\n private lowerCaseFiles: {[filename: string]: File} = {};\n private usedFiles: {[filename: string]: boolean} = {};\n\n /**\n * A FileSystem API wrapper around a list of browser 'File' objects\n * @param files\n * @param options\n */\n constructor(files: FileList | File[], options?: BrowserFileSystemOptions) {\n this._fetch = options?.fetch || fetch;\n\n for (let i = 0; i < files.length; ++i) {\n const file = files[i];\n this.files[file.name] = file;\n this.lowerCaseFiles[file.name.toLowerCase()] = file;\n this.usedFiles[file.name] = false;\n }\n\n this.fetch = this.fetch.bind(this);\n }\n\n // implements IFileSystem\n\n /**\n * Implementation of fetch against this file system\n * Delegates to global fetch for http{s}:// or data://\n */\n async fetch(path: string, options?: RequestInit): Promise<Response> {\n // Fallback to handle https:/http:/data: etc fetches\n if (path.includes('://')) {\n return this._fetch(path, options);\n }\n\n // Local fetches are served from the list of files\n const file = this.files[path];\n if (!file) {\n return new Response(path, {status: 400, statusText: 'NOT FOUND'});\n }\n\n const headers = new Headers(options?.headers);\n const range = headers.get('Range');\n const bytes = range && /bytes=($1)-($2)/.exec(range);\n\n if (bytes) {\n const start = parseInt(bytes[1]);\n const end = parseInt(bytes[2]);\n // The trick when reading File objects is to read successive \"slices\" of the File\n // Per spec https://w3c.github.io/FileAPI/, slicing a File should only update the start and end fields\n // Actually reading from file should happen in `readAsArrayBuffer` (and as far we can tell it does)\n const data = await file.slice(start, end).arrayBuffer();\n const response = new Response(data);\n Object.defineProperty(response, 'url', {value: path});\n return response;\n }\n\n // return makeResponse()\n const response = new Response(file);\n Object.defineProperty(response, 'url', {value: path});\n return response;\n }\n\n /**\n * List filenames in this filesystem\n * @param dirname\n * @returns\n */\n async readdir(dirname?: string): Promise<string[]> {\n const files: string[] = [];\n for (const path in this.files) {\n files.push(path);\n }\n // TODO filter by dirname\n return files;\n }\n\n /**\n * Return information (size) about files in this file system\n */\n async stat(path: string, options?: object): Promise<{size: number}> {\n const file = this.files[path];\n if (!file) {\n throw new Error(path);\n }\n return {size: file.size};\n }\n\n /**\n * Just removes the file from the list\n */\n async unlink(path: string): Promise<void> {\n delete this.files[path];\n delete this.lowerCaseFiles[path];\n this.usedFiles[path] = true;\n }\n\n // implements IRandomAccessFileSystem\n\n // RANDOM ACCESS\n async open(pathname: string, flags, mode?): Promise<any> {\n return this.files[pathname];\n }\n\n /**\n * Read a range into a buffer\n * @todo - handle position memory\n * @param buffer is the buffer that the data (read from the fd) will be written to.\n * @param offset is the offset in the buffer to start writing at.\n * @param length is an integer specifying the number of bytes to read.\n * @param position is an argument specifying where to begin reading from in the file. If position is null, data will be read from the current file position, and the file position will be updated. If position is an integer, the file position will remain unchanged.\n */\n async read(\n fd: any,\n buffer: ArrayBuffer,\n offset: number = 0,\n length: number = buffer.byteLength,\n position: number | null = null\n ): Promise<{bytesRead: number; buffer: ArrayBuffer}> {\n const file = fd as File;\n const startPosition = 0; // position\n const arrayBuffer = await file.slice(startPosition, startPosition + length).arrayBuffer();\n // copy into target buffer\n return {bytesRead: length, buffer: arrayBuffer};\n }\n\n async close(fd: number): Promise<void> {\n // NO OP\n }\n\n // fstat(fd: number): Promise<object>; // Stat\n\n // PRIVATE\n\n // Supports case independent paths, and file usage tracking\n _getFile(path, used) {\n // Prefer case match, but fall back to case indepent.\n const file = this.files[path] || this.lowerCaseFiles[path];\n if (file && used) {\n this.usedFiles[path] = true;\n }\n return file;\n }\n}\n"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-array-buffer.js","names":["readArrayBuffer","file","start","length","Blob","slice","arrayBuffer","read"],"sources":["../../../../src/lib/filesystems/read-array-buffer.ts"],"sourcesContent":["// Random-Access read\n\nexport async function readArrayBuffer(\n file: Blob | ArrayBuffer | any,\n start: number,\n length: number\n): Promise<ArrayBuffer> {\n if (file instanceof Blob) {\n const slice = file.slice(start, start + length);\n return await slice.arrayBuffer();\n }\n return await file.read(start, start + length);\n}\n\n/**\n * Read a slice of a Blob or File, without loading the entire file into memory\n * The trick when reading File objects is to read successive \"slices\" of the File\n * Per spec https://w3c.github.io/FileAPI/, slicing a File only updates the start and end fields\n * Actually reading from file happens in `readAsArrayBuffer`\n * @param blob to read\n export async function readBlob(blob: Blob): Promise<ArrayBuffer> {\n return await new Promise((resolve, reject) => {\n const fileReader = new FileReader();\n fileReader.onload = (event: ProgressEvent<FileReader>) =>\n resolve(event?.target?.result as ArrayBuffer);\n // TODO - reject with a proper Error\n fileReader.onerror = (error: ProgressEvent<FileReader>) => reject(error);\n fileReader.readAsArrayBuffer(blob);\n });\n}\n*/\n"],"mappings":"
|
|
1
|
+
{"version":3,"file":"read-array-buffer.js","names":["readArrayBuffer","file","start","length","Blob","slice","arrayBuffer","read"],"sources":["../../../../src/lib/filesystems/read-array-buffer.ts"],"sourcesContent":["// Random-Access read\n\nexport async function readArrayBuffer(\n file: Blob | ArrayBuffer | any,\n start: number,\n length: number\n): Promise<ArrayBuffer> {\n if (file instanceof Blob) {\n const slice = file.slice(start, start + length);\n return await slice.arrayBuffer();\n }\n return await file.read(start, start + length);\n}\n\n/**\n * Read a slice of a Blob or File, without loading the entire file into memory\n * The trick when reading File objects is to read successive \"slices\" of the File\n * Per spec https://w3c.github.io/FileAPI/, slicing a File only updates the start and end fields\n * Actually reading from file happens in `readAsArrayBuffer`\n * @param blob to read\n export async function readBlob(blob: Blob): Promise<ArrayBuffer> {\n return await new Promise((resolve, reject) => {\n const fileReader = new FileReader();\n fileReader.onload = (event: ProgressEvent<FileReader>) =>\n resolve(event?.target?.result as ArrayBuffer);\n // TODO - reject with a proper Error\n fileReader.onerror = (error: ProgressEvent<FileReader>) => reject(error);\n fileReader.readAsArrayBuffer(blob);\n });\n}\n*/\n"],"mappings":"AAEA,OAAO,eAAeA,eAAeA,CACnCC,IAA8B,EAC9BC,KAAa,EACbC,MAAc,EACQ;EACtB,IAAIF,IAAI,YAAYG,IAAI,EAAE;IACxB,MAAMC,KAAK,GAAGJ,IAAI,CAACI,KAAK,CAACH,KAAK,EAAEA,KAAK,GAAGC,MAAM,CAAC;IAC/C,OAAO,MAAME,KAAK,CAACC,WAAW,CAAC,CAAC;EAClC;EACA,OAAO,MAAML,IAAI,CAACM,IAAI,CAACL,KAAK,EAAEA,KAAK,GAAGC,MAAM,CAAC;AAC/C"}
|
package/dist/esm/lib/init.js
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
1
|
import { log } from './utils/log';
|
|
3
|
-
|
|
4
|
-
const version = typeof "3.4.0-alpha.2" !== 'undefined' ? "3.4.0-alpha.2" : '';
|
|
5
|
-
|
|
2
|
+
const version = typeof "3.4.0-alpha.4" !== 'undefined' ? "3.4.0-alpha.4" : '';
|
|
6
3
|
if (!globalThis.loaders) {
|
|
7
4
|
log.log(1, "loaders.gl ".concat(version))();
|
|
8
5
|
globalThis.loaders = Object.assign(globalThis.loaders || {}, {
|
package/dist/esm/lib/init.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","names":["log","version","globalThis","loaders","Object","assign","VERSION"],"sources":["../../../src/lib/init.ts"],"sourcesContent":["// loaders.gl, MIT license\nimport {log} from './utils/log';\n\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst version = typeof __VERSION__ !== 'undefined' ? __VERSION__ : '';\n\n// @ts-ignore\nif (!globalThis.loaders) {\n log.log(1, `loaders.gl ${version}`)();\n\n globalThis.loaders = Object.assign(globalThis.loaders || {}, {\n VERSION: version,\n log\n });\n}\n// @ts-ignore\nexport default globalThis.loaders;\n"],"mappings":"
|
|
1
|
+
{"version":3,"file":"init.js","names":["log","version","globalThis","loaders","concat","Object","assign","VERSION"],"sources":["../../../src/lib/init.ts"],"sourcesContent":["// loaders.gl, MIT license\nimport {log} from './utils/log';\n\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst version = typeof __VERSION__ !== 'undefined' ? __VERSION__ : '';\n\n// @ts-ignore\nif (!globalThis.loaders) {\n log.log(1, `loaders.gl ${version}`)();\n\n globalThis.loaders = Object.assign(globalThis.loaders || {}, {\n VERSION: version,\n log\n });\n}\n// @ts-ignore\nexport default globalThis.loaders;\n"],"mappings":"AACA,SAAQA,GAAG,QAAO,aAAa;AAG/B,MAAMC,OAAO,GAAG,sBAAkB,KAAK,WAAW,qBAAiB,EAAE;AAGrE,IAAI,CAACC,UAAU,CAACC,OAAO,EAAE;EACvBH,GAAG,CAACA,GAAG,CAAC,CAAC,gBAAAI,MAAA,CAAgBH,OAAO,CAAE,CAAC,CAAC,CAAC;EAErCC,UAAU,CAACC,OAAO,GAAGE,MAAM,CAACC,MAAM,CAACJ,UAAU,CAACC,OAAO,IAAI,CAAC,CAAC,EAAE;IAC3DI,OAAO,EAAEN,OAAO;IAChBD;EACF,CAAC,CAAC;AACJ;AAEA,eAAeE,UAAU,CAACC,OAAO"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-errors.js","names":["checkFetchResponseStatus","response","ok","errorMessage","status","statusText","text","getErrorText","error","Error","checkFetchResponseStatusSync","matches","match","slice"],"sources":["../../../../src/lib/loader-utils/check-errors.ts"],"sourcesContent":["export async function checkFetchResponseStatus(response) {\n if (!response.ok) {\n let errorMessage = `fetch failed ${response.status} ${response.statusText}`;\n try {\n const text = await response.text();\n if (text) {\n errorMessage += `: ${getErrorText(text)}`;\n }\n } catch (error) {\n // ignore error\n }\n throw new Error(errorMessage);\n }\n}\n\nexport function checkFetchResponseStatusSync(response) {\n if (!response.ok) {\n throw new Error(`fetch failed ${response.status}`);\n }\n}\n\nfunction getErrorText(text) {\n // Look for HTML error texts\n const matches = text.match('<pre>(.*)</pre>');\n return matches ? matches[1] : ` ${text.slice(0, 10)}...`;\n}\n"],"mappings":"AAAA,OAAO,eAAeA,
|
|
1
|
+
{"version":3,"file":"check-errors.js","names":["checkFetchResponseStatus","response","ok","errorMessage","concat","status","statusText","text","getErrorText","error","Error","checkFetchResponseStatusSync","matches","match","slice"],"sources":["../../../../src/lib/loader-utils/check-errors.ts"],"sourcesContent":["export async function checkFetchResponseStatus(response) {\n if (!response.ok) {\n let errorMessage = `fetch failed ${response.status} ${response.statusText}`;\n try {\n const text = await response.text();\n if (text) {\n errorMessage += `: ${getErrorText(text)}`;\n }\n } catch (error) {\n // ignore error\n }\n throw new Error(errorMessage);\n }\n}\n\nexport function checkFetchResponseStatusSync(response) {\n if (!response.ok) {\n throw new Error(`fetch failed ${response.status}`);\n }\n}\n\nfunction getErrorText(text) {\n // Look for HTML error texts\n const matches = text.match('<pre>(.*)</pre>');\n return matches ? matches[1] : ` ${text.slice(0, 10)}...`;\n}\n"],"mappings":"AAAA,OAAO,eAAeA,wBAAwBA,CAACC,QAAQ,EAAE;EACvD,IAAI,CAACA,QAAQ,CAACC,EAAE,EAAE;IAChB,IAAIC,YAAY,mBAAAC,MAAA,CAAmBH,QAAQ,CAACI,MAAM,OAAAD,MAAA,CAAIH,QAAQ,CAACK,UAAU,CAAE;IAC3E,IAAI;MACF,MAAMC,IAAI,GAAG,MAAMN,QAAQ,CAACM,IAAI,CAAC,CAAC;MAClC,IAAIA,IAAI,EAAE;QACRJ,YAAY,SAAAC,MAAA,CAASI,YAAY,CAACD,IAAI,CAAC,CAAE;MAC3C;IACF,CAAC,CAAC,OAAOE,KAAK,EAAE,CAEhB;IACA,MAAM,IAAIC,KAAK,CAACP,YAAY,CAAC;EAC/B;AACF;AAEA,OAAO,SAASQ,4BAA4BA,CAACV,QAAQ,EAAE;EACrD,IAAI,CAACA,QAAQ,CAACC,EAAE,EAAE;IAChB,MAAM,IAAIQ,KAAK,iBAAAN,MAAA,CAAiBH,QAAQ,CAACI,MAAM,CAAE,CAAC;EACpD;AACF;AAEA,SAASG,YAAYA,CAACD,IAAI,EAAE;EAE1B,MAAMK,OAAO,GAAGL,IAAI,CAACM,KAAK,CAAC,iBAAiB,CAAC;EAC7C,OAAOD,OAAO,GAAGA,OAAO,CAAC,CAAC,CAAC,OAAAR,MAAA,CAAOG,IAAI,CAACO,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,QAAK;AAC1D"}
|
|
@@ -3,7 +3,6 @@ import { isResponse, isReadableStream, isAsyncIterable, isIterable, isIterator,
|
|
|
3
3
|
import { makeIterator } from '../../iterators/make-iterator/make-iterator';
|
|
4
4
|
import { checkResponse, makeResponse } from '../utils/response-utils';
|
|
5
5
|
const ERR_DATA = 'Cannot convert supplied data type';
|
|
6
|
-
|
|
7
6
|
export function getArrayBufferOrStringFromDataSync(data, loader, options) {
|
|
8
7
|
if (loader.text && typeof data === 'string') {
|
|
9
8
|
return data;
|
|
@@ -19,14 +18,12 @@ export function getArrayBufferOrStringFromDataSync(data, loader, options) {
|
|
|
19
18
|
}
|
|
20
19
|
return arrayBuffer;
|
|
21
20
|
}
|
|
22
|
-
|
|
23
21
|
if (ArrayBuffer.isView(data)) {
|
|
24
22
|
if (loader.text && !loader.binary) {
|
|
25
23
|
const textDecoder = new TextDecoder('utf8');
|
|
26
24
|
return textDecoder.decode(data);
|
|
27
25
|
}
|
|
28
26
|
let arrayBuffer = data.buffer;
|
|
29
|
-
|
|
30
27
|
const byteLength = data.byteLength || data.length;
|
|
31
28
|
if (data.byteOffset !== 0 || byteLength !== arrayBuffer.byteLength) {
|
|
32
29
|
arrayBuffer = arrayBuffer.slice(data.byteOffset, data.byteOffset + byteLength);
|
|
@@ -35,13 +32,11 @@ export function getArrayBufferOrStringFromDataSync(data, loader, options) {
|
|
|
35
32
|
}
|
|
36
33
|
throw new Error(ERR_DATA);
|
|
37
34
|
}
|
|
38
|
-
|
|
39
35
|
export async function getArrayBufferOrStringFromData(data, loader, options) {
|
|
40
36
|
const isArrayBuffer = data instanceof ArrayBuffer || ArrayBuffer.isView(data);
|
|
41
37
|
if (typeof data === 'string' || isArrayBuffer) {
|
|
42
38
|
return getArrayBufferOrStringFromDataSync(data, loader, options);
|
|
43
39
|
}
|
|
44
|
-
|
|
45
40
|
if (isBlob(data)) {
|
|
46
41
|
data = await makeResponse(data);
|
|
47
42
|
}
|
|
@@ -86,7 +81,6 @@ export async function getReadableStream(data) {
|
|
|
86
81
|
const response = await makeResponse(data);
|
|
87
82
|
return response.body;
|
|
88
83
|
}
|
|
89
|
-
|
|
90
84
|
function getIterableFromData(data) {
|
|
91
85
|
if (ArrayBuffer.isView(data)) {
|
|
92
86
|
return function* oneChunk() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-data.js","names":["concatenateArrayBuffersAsync","isResponse","isReadableStream","isAsyncIterable","isIterable","isIterator","isBlob","isBuffer","makeIterator","checkResponse","makeResponse","ERR_DATA","getArrayBufferOrStringFromDataSync","data","loader","options","text","buffer","ArrayBuffer","arrayBuffer","binary","textDecoder","TextDecoder","decode","isView","byteLength","length","byteOffset","slice","Error","getArrayBufferOrStringFromData","isArrayBuffer","response","getAsyncIterableFromData","body","Symbol","asyncIterator","getIterableFromData","getReadableStream","oneChunk","iterator"],"sources":["../../../../src/lib/loader-utils/get-data.ts"],"sourcesContent":["import type {\n DataType,\n SyncDataType,\n BatchableDataType,\n Loader,\n LoaderOptions\n} from '@loaders.gl/loader-utils';\nimport {concatenateArrayBuffersAsync} from '@loaders.gl/loader-utils';\nimport {\n isResponse,\n isReadableStream,\n isAsyncIterable,\n isIterable,\n isIterator,\n isBlob,\n isBuffer\n} from '../../javascript-utils/is-type';\nimport {makeIterator} from '../../iterators/make-iterator/make-iterator';\nimport {checkResponse, makeResponse} from '../utils/response-utils';\n\nconst ERR_DATA = 'Cannot convert supplied data type';\n\n// eslint-disable-next-line complexity\nexport function getArrayBufferOrStringFromDataSync(\n data: SyncDataType,\n loader: Loader,\n options: LoaderOptions\n): ArrayBuffer | string {\n if (loader.text && typeof data === 'string') {\n return data;\n }\n\n if (isBuffer(data)) {\n // @ts-ignore\n data = data.buffer;\n }\n\n if (data instanceof ArrayBuffer) {\n const arrayBuffer = data;\n if (loader.text && !loader.binary) {\n const textDecoder = new TextDecoder('utf8');\n return textDecoder.decode(arrayBuffer);\n }\n return arrayBuffer;\n }\n\n // We may need to handle offsets\n if (ArrayBuffer.isView(data)) {\n // TextDecoder is invoked on typed arrays and will handle offsets\n if (loader.text && !loader.binary) {\n const textDecoder = new TextDecoder('utf8');\n return textDecoder.decode(data);\n }\n\n let arrayBuffer = data.buffer;\n\n // Since we are returning the underlying arrayBuffer, we must create a new copy\n // if this typed array / Buffer is a partial view into the ArryayBuffer\n // TODO - this is a potentially unnecessary copy\n const byteLength = data.byteLength || data.length;\n if (data.byteOffset !== 0 || byteLength !== arrayBuffer.byteLength) {\n // console.warn(`loaders.gl copying arraybuffer of length ${byteLength}`);\n arrayBuffer = arrayBuffer.slice(data.byteOffset, data.byteOffset + byteLength);\n }\n return arrayBuffer;\n }\n\n throw new Error(ERR_DATA);\n}\n\n// Convert async iterator to a promise\nexport async function getArrayBufferOrStringFromData(\n data: DataType,\n loader: Loader,\n options: LoaderOptions\n): Promise<ArrayBuffer | string> {\n const isArrayBuffer = data instanceof ArrayBuffer || ArrayBuffer.isView(data);\n if (typeof data === 'string' || isArrayBuffer) {\n return getArrayBufferOrStringFromDataSync(data as string | ArrayBuffer, loader, options);\n }\n\n // Blobs and files are FileReader compatible\n if (isBlob(data)) {\n data = await makeResponse(data);\n }\n\n if (isResponse(data)) {\n const response = data as Response;\n await checkResponse(response);\n return loader.binary ? await response.arrayBuffer() : await response.text();\n }\n\n if (isReadableStream(data)) {\n // @ts-expect-error TS2559 options type\n data = makeIterator(data as ReadableStream, options);\n }\n\n if (isIterable(data) || isAsyncIterable(data)) {\n // Assume arrayBuffer iterator - attempt to concatenate\n return concatenateArrayBuffersAsync(data as AsyncIterable<ArrayBuffer>);\n }\n\n throw new Error(ERR_DATA);\n}\n\nexport async function getAsyncIterableFromData(\n data: BatchableDataType,\n options: LoaderOptions\n): Promise<AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>> {\n if (isIterator(data)) {\n return data as AsyncIterable<ArrayBuffer>;\n }\n\n if (isResponse(data)) {\n const response = data as Response;\n // Note Since this function is not async, we currently can't load error message, just status\n await checkResponse(response);\n // TODO - bug in polyfill, body can be a Promise under Node.js\n // eslint-disable-next-line @typescript-eslint/await-thenable\n const body = await response.body;\n // TODO - body can be null?\n return makeIterator(body as ReadableStream<Uint8Array>, options as any);\n }\n\n if (isBlob(data) || isReadableStream(data)) {\n return makeIterator(data as Blob | ReadableStream, options as any);\n }\n\n if (isAsyncIterable(data)) {\n return data[Symbol.asyncIterator]();\n }\n\n return getIterableFromData(data);\n}\n\nexport async function getReadableStream(data: BatchableDataType): Promise<ReadableStream> {\n if (isReadableStream(data)) {\n return data as ReadableStream;\n }\n if (isResponse(data)) {\n // @ts-ignore\n return data.body;\n }\n const response = await makeResponse(data);\n // @ts-ignore\n return response.body;\n}\n\n// HELPERS\n\nfunction getIterableFromData(data) {\n // generate an iterator that emits a single chunk\n if (ArrayBuffer.isView(data)) {\n return (function* oneChunk() {\n yield data.buffer;\n })();\n }\n\n if (data instanceof ArrayBuffer) {\n return (function* oneChunk() {\n yield data;\n })();\n }\n\n if (isIterator(data)) {\n return data;\n }\n\n if (isIterable(data)) {\n return data[Symbol.iterator]();\n }\n\n throw new Error(ERR_DATA);\n}\n"],"mappings":"AAOA,SAAQA,4BAA4B,QAAO,0BAA0B;AACrE,SACEC,UAAU,EACVC,gBAAgB,EAChBC,eAAe,EACfC,UAAU,EACVC,UAAU,EACVC,MAAM,EACNC,QAAQ,QACH,gCAAgC;AACvC,SAAQC,YAAY,QAAO,6CAA6C;AACxE,SAAQC,aAAa,EAAEC,YAAY,QAAO,yBAAyB;AAEnE,MAAMC,QAAQ,GAAG,mCAAmC
|
|
1
|
+
{"version":3,"file":"get-data.js","names":["concatenateArrayBuffersAsync","isResponse","isReadableStream","isAsyncIterable","isIterable","isIterator","isBlob","isBuffer","makeIterator","checkResponse","makeResponse","ERR_DATA","getArrayBufferOrStringFromDataSync","data","loader","options","text","buffer","ArrayBuffer","arrayBuffer","binary","textDecoder","TextDecoder","decode","isView","byteLength","length","byteOffset","slice","Error","getArrayBufferOrStringFromData","isArrayBuffer","response","getAsyncIterableFromData","body","Symbol","asyncIterator","getIterableFromData","getReadableStream","oneChunk","iterator"],"sources":["../../../../src/lib/loader-utils/get-data.ts"],"sourcesContent":["import type {\n DataType,\n SyncDataType,\n BatchableDataType,\n Loader,\n LoaderOptions\n} from '@loaders.gl/loader-utils';\nimport {concatenateArrayBuffersAsync} from '@loaders.gl/loader-utils';\nimport {\n isResponse,\n isReadableStream,\n isAsyncIterable,\n isIterable,\n isIterator,\n isBlob,\n isBuffer\n} from '../../javascript-utils/is-type';\nimport {makeIterator} from '../../iterators/make-iterator/make-iterator';\nimport {checkResponse, makeResponse} from '../utils/response-utils';\n\nconst ERR_DATA = 'Cannot convert supplied data type';\n\n// eslint-disable-next-line complexity\nexport function getArrayBufferOrStringFromDataSync(\n data: SyncDataType,\n loader: Loader,\n options: LoaderOptions\n): ArrayBuffer | string {\n if (loader.text && typeof data === 'string') {\n return data;\n }\n\n if (isBuffer(data)) {\n // @ts-ignore\n data = data.buffer;\n }\n\n if (data instanceof ArrayBuffer) {\n const arrayBuffer = data;\n if (loader.text && !loader.binary) {\n const textDecoder = new TextDecoder('utf8');\n return textDecoder.decode(arrayBuffer);\n }\n return arrayBuffer;\n }\n\n // We may need to handle offsets\n if (ArrayBuffer.isView(data)) {\n // TextDecoder is invoked on typed arrays and will handle offsets\n if (loader.text && !loader.binary) {\n const textDecoder = new TextDecoder('utf8');\n return textDecoder.decode(data);\n }\n\n let arrayBuffer = data.buffer;\n\n // Since we are returning the underlying arrayBuffer, we must create a new copy\n // if this typed array / Buffer is a partial view into the ArryayBuffer\n // TODO - this is a potentially unnecessary copy\n const byteLength = data.byteLength || data.length;\n if (data.byteOffset !== 0 || byteLength !== arrayBuffer.byteLength) {\n // console.warn(`loaders.gl copying arraybuffer of length ${byteLength}`);\n arrayBuffer = arrayBuffer.slice(data.byteOffset, data.byteOffset + byteLength);\n }\n return arrayBuffer;\n }\n\n throw new Error(ERR_DATA);\n}\n\n// Convert async iterator to a promise\nexport async function getArrayBufferOrStringFromData(\n data: DataType,\n loader: Loader,\n options: LoaderOptions\n): Promise<ArrayBuffer | string> {\n const isArrayBuffer = data instanceof ArrayBuffer || ArrayBuffer.isView(data);\n if (typeof data === 'string' || isArrayBuffer) {\n return getArrayBufferOrStringFromDataSync(data as string | ArrayBuffer, loader, options);\n }\n\n // Blobs and files are FileReader compatible\n if (isBlob(data)) {\n data = await makeResponse(data);\n }\n\n if (isResponse(data)) {\n const response = data as Response;\n await checkResponse(response);\n return loader.binary ? await response.arrayBuffer() : await response.text();\n }\n\n if (isReadableStream(data)) {\n // @ts-expect-error TS2559 options type\n data = makeIterator(data as ReadableStream, options);\n }\n\n if (isIterable(data) || isAsyncIterable(data)) {\n // Assume arrayBuffer iterator - attempt to concatenate\n return concatenateArrayBuffersAsync(data as AsyncIterable<ArrayBuffer>);\n }\n\n throw new Error(ERR_DATA);\n}\n\nexport async function getAsyncIterableFromData(\n data: BatchableDataType,\n options: LoaderOptions\n): Promise<AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>> {\n if (isIterator(data)) {\n return data as AsyncIterable<ArrayBuffer>;\n }\n\n if (isResponse(data)) {\n const response = data as Response;\n // Note Since this function is not async, we currently can't load error message, just status\n await checkResponse(response);\n // TODO - bug in polyfill, body can be a Promise under Node.js\n // eslint-disable-next-line @typescript-eslint/await-thenable\n const body = await response.body;\n // TODO - body can be null?\n return makeIterator(body as ReadableStream<Uint8Array>, options as any);\n }\n\n if (isBlob(data) || isReadableStream(data)) {\n return makeIterator(data as Blob | ReadableStream, options as any);\n }\n\n if (isAsyncIterable(data)) {\n return data[Symbol.asyncIterator]();\n }\n\n return getIterableFromData(data);\n}\n\nexport async function getReadableStream(data: BatchableDataType): Promise<ReadableStream> {\n if (isReadableStream(data)) {\n return data as ReadableStream;\n }\n if (isResponse(data)) {\n // @ts-ignore\n return data.body;\n }\n const response = await makeResponse(data);\n // @ts-ignore\n return response.body;\n}\n\n// HELPERS\n\nfunction getIterableFromData(data) {\n // generate an iterator that emits a single chunk\n if (ArrayBuffer.isView(data)) {\n return (function* oneChunk() {\n yield data.buffer;\n })();\n }\n\n if (data instanceof ArrayBuffer) {\n return (function* oneChunk() {\n yield data;\n })();\n }\n\n if (isIterator(data)) {\n return data;\n }\n\n if (isIterable(data)) {\n return data[Symbol.iterator]();\n }\n\n throw new Error(ERR_DATA);\n}\n"],"mappings":"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"}
|
|
@@ -1,25 +1,18 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
1
|
import { isObject } from '../../javascript-utils/is-type';
|
|
4
2
|
import { fetchFile } from '../fetch/fetch-file';
|
|
5
3
|
import { getGlobalLoaderOptions } from './option-utils';
|
|
6
|
-
|
|
7
4
|
export function getFetchFunction(options, context) {
|
|
8
5
|
const globalOptions = getGlobalLoaderOptions();
|
|
9
6
|
const fetchOptions = options || globalOptions;
|
|
10
|
-
|
|
11
7
|
if (typeof fetchOptions.fetch === 'function') {
|
|
12
8
|
return fetchOptions.fetch;
|
|
13
9
|
}
|
|
14
|
-
|
|
15
10
|
if (isObject(fetchOptions.fetch)) {
|
|
16
11
|
return url => fetchFile(url, fetchOptions);
|
|
17
12
|
}
|
|
18
|
-
|
|
19
13
|
if (context !== null && context !== void 0 && context.fetch) {
|
|
20
14
|
return context === null || context === void 0 ? void 0 : context.fetch;
|
|
21
15
|
}
|
|
22
|
-
|
|
23
16
|
return fetchFile;
|
|
24
17
|
}
|
|
25
18
|
//# sourceMappingURL=get-fetch-function.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-fetch-function.js","names":["isObject","fetchFile","getGlobalLoaderOptions","getFetchFunction","options","context","globalOptions","fetchOptions","fetch","url"],"sources":["../../../../src/lib/loader-utils/get-fetch-function.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport type {LoaderContext, LoaderOptions} from '@loaders.gl/loader-utils';\nimport {isObject} from '../../javascript-utils/is-type';\nimport {fetchFile} from '../fetch/fetch-file';\nimport {getGlobalLoaderOptions} from './option-utils';\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 as RequestInit);\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"],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-fetch-function.js","names":["isObject","fetchFile","getGlobalLoaderOptions","getFetchFunction","options","context","globalOptions","fetchOptions","fetch","url"],"sources":["../../../../src/lib/loader-utils/get-fetch-function.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport type {LoaderContext, LoaderOptions} from '@loaders.gl/loader-utils';\nimport {isObject} from '../../javascript-utils/is-type';\nimport {fetchFile} from '../fetch/fetch-file';\nimport {getGlobalLoaderOptions} from './option-utils';\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 as RequestInit);\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"],"mappings":"AAGA,SAAQA,QAAQ,QAAO,gCAAgC;AACvD,SAAQC,SAAS,QAAO,qBAAqB;AAC7C,SAAQC,sBAAsB,QAAO,gBAAgB;AAOrD,OAAO,SAASC,gBAAgBA,CAC9BC,OAAuB,EACvBC,OAA8E,EAC9E;EACA,MAAMC,aAAa,GAAGJ,sBAAsB,CAAC,CAAC;EAE9C,MAAMK,YAAY,GAAGH,OAAO,IAAIE,aAAa;EAG7C,IAAI,OAAOC,YAAY,CAACC,KAAK,KAAK,UAAU,EAAE;IAC5C,OAAOD,YAAY,CAACC,KAAK;EAC3B;EAGA,IAAIR,QAAQ,CAACO,YAAY,CAACC,KAAK,CAAC,EAAE;IAChC,OAAQC,GAAG,IAAKR,SAAS,CAACQ,GAAG,EAAEF,YAA2B,CAAC;EAC7D;EAGA,IAAIF,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEG,KAAK,EAAE;IAClB,OAAOH,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEG,KAAK;EACvB;EAGA,OAAOP,SAAS;AAClB"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { getFetchFunction } from './get-fetch-function';
|
|
2
|
-
|
|
3
2
|
export function getLoaderContext(context, options) {
|
|
4
3
|
let previousContext = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
|
|
5
4
|
if (previousContext) {
|
|
@@ -9,18 +8,15 @@ export function getLoaderContext(context, options) {
|
|
|
9
8
|
fetch: getFetchFunction(options, context),
|
|
10
9
|
...context
|
|
11
10
|
};
|
|
12
|
-
|
|
13
11
|
if (!Array.isArray(resolvedContext.loaders)) {
|
|
14
12
|
resolvedContext.loaders = null;
|
|
15
13
|
}
|
|
16
14
|
return resolvedContext;
|
|
17
15
|
}
|
|
18
|
-
|
|
19
16
|
export function getLoadersFromContext(loaders, context) {
|
|
20
17
|
if (!context && loaders && !Array.isArray(loaders)) {
|
|
21
18
|
return loaders;
|
|
22
19
|
}
|
|
23
|
-
|
|
24
20
|
let candidateLoaders;
|
|
25
21
|
if (loaders) {
|
|
26
22
|
candidateLoaders = Array.isArray(loaders) ? loaders : [loaders];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader-context.js","names":["getFetchFunction","getLoaderContext","context","options","previousContext","resolvedContext","fetch","Array","isArray","loaders","getLoadersFromContext","candidateLoaders","contextLoaders"
|
|
1
|
+
{"version":3,"file":"loader-context.js","names":["getFetchFunction","getLoaderContext","context","options","previousContext","arguments","length","undefined","resolvedContext","fetch","Array","isArray","loaders","getLoadersFromContext","candidateLoaders","contextLoaders"],"sources":["../../../../src/lib/loader-utils/loader-context.ts"],"sourcesContent":["import type {Loader, LoaderOptions, LoaderContext} from '@loaders.gl/loader-utils';\nimport {getFetchFunction} from './get-fetch-function';\n\n/**\n * \"sub\" loaders invoked by other loaders get a \"context\" injected on `this`\n * The context will inject core methods like `parse` and contain information\n * about loaders and options passed in to the top-level `parse` call.\n *\n * @param context\n * @param options\n * @param previousContext\n */\nexport function getLoaderContext(\n context: Omit<LoaderContext, 'fetch'> & Partial<Pick<LoaderContext, 'fetch'>>,\n options?: LoaderOptions,\n previousContext: LoaderContext | null = null\n): LoaderContext {\n // For recursive calls, we already have a context\n // TODO - add any additional loaders to context?\n if (previousContext) {\n return previousContext;\n }\n\n const resolvedContext: LoaderContext = {\n fetch: getFetchFunction(options, context),\n ...context\n };\n\n // Recursive loading does not use single loader\n if (!Array.isArray(resolvedContext.loaders)) {\n resolvedContext.loaders = null;\n }\n\n return resolvedContext;\n}\n\n// eslint-disable-next-line complexity\nexport function getLoadersFromContext(\n loaders: Loader[] | Loader | undefined,\n context?: LoaderContext\n) {\n // A single non-array loader is force selected, but only on top-level (context === null)\n if (!context && loaders && !Array.isArray(loaders)) {\n return loaders;\n }\n\n // Create a merged list\n let candidateLoaders;\n if (loaders) {\n candidateLoaders = Array.isArray(loaders) ? loaders : [loaders];\n }\n if (context && context.loaders) {\n const contextLoaders = Array.isArray(context.loaders) ? context.loaders : [context.loaders];\n candidateLoaders = candidateLoaders ? [...candidateLoaders, ...contextLoaders] : contextLoaders;\n }\n // If no loaders, return null to look in globally registered loaders\n return candidateLoaders && candidateLoaders.length ? candidateLoaders : null;\n}\n"],"mappings":"AACA,SAAQA,gBAAgB,QAAO,sBAAsB;AAWrD,OAAO,SAASC,gBAAgBA,CAC9BC,OAA6E,EAC7EC,OAAuB,EAER;EAAA,IADfC,eAAqC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,IAAI;EAI5C,IAAID,eAAe,EAAE;IACnB,OAAOA,eAAe;EACxB;EAEA,MAAMI,eAA8B,GAAG;IACrCC,KAAK,EAAET,gBAAgB,CAACG,OAAO,EAAED,OAAO,CAAC;IACzC,GAAGA;EACL,CAAC;EAGD,IAAI,CAACQ,KAAK,CAACC,OAAO,CAACH,eAAe,CAACI,OAAO,CAAC,EAAE;IAC3CJ,eAAe,CAACI,OAAO,GAAG,IAAI;EAChC;EAEA,OAAOJ,eAAe;AACxB;AAGA,OAAO,SAASK,qBAAqBA,CACnCD,OAAsC,EACtCV,OAAuB,EACvB;EAEA,IAAI,CAACA,OAAO,IAAIU,OAAO,IAAI,CAACF,KAAK,CAACC,OAAO,CAACC,OAAO,CAAC,EAAE;IAClD,OAAOA,OAAO;EAChB;EAGA,IAAIE,gBAAgB;EACpB,IAAIF,OAAO,EAAE;IACXE,gBAAgB,GAAGJ,KAAK,CAACC,OAAO,CAACC,OAAO,CAAC,GAAGA,OAAO,GAAG,CAACA,OAAO,CAAC;EACjE;EACA,IAAIV,OAAO,IAAIA,OAAO,CAACU,OAAO,EAAE;IAC9B,MAAMG,cAAc,GAAGL,KAAK,CAACC,OAAO,CAACT,OAAO,CAACU,OAAO,CAAC,GAAGV,OAAO,CAACU,OAAO,GAAG,CAACV,OAAO,CAACU,OAAO,CAAC;IAC3FE,gBAAgB,GAAGA,gBAAgB,GAAG,CAAC,GAAGA,gBAAgB,EAAE,GAAGC,cAAc,CAAC,GAAGA,cAAc;EACjG;EAEA,OAAOD,gBAAgB,IAAIA,gBAAgB,CAACR,MAAM,GAAGQ,gBAAgB,GAAG,IAAI;AAC9E"}
|
|
@@ -3,7 +3,6 @@ import { Log } from '@probe.gl/log';
|
|
|
3
3
|
export const probeLog = new Log({
|
|
4
4
|
id: 'loaders.gl'
|
|
5
5
|
});
|
|
6
|
-
|
|
7
6
|
export class NullLog {
|
|
8
7
|
log() {
|
|
9
8
|
return () => {};
|
|
@@ -18,13 +17,11 @@ export class NullLog {
|
|
|
18
17
|
return () => {};
|
|
19
18
|
}
|
|
20
19
|
}
|
|
21
|
-
|
|
22
20
|
export class ConsoleLog {
|
|
23
21
|
constructor() {
|
|
24
22
|
_defineProperty(this, "console", void 0);
|
|
25
23
|
this.console = console;
|
|
26
24
|
}
|
|
27
|
-
|
|
28
25
|
log() {
|
|
29
26
|
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
30
27
|
args[_key] = arguments[_key];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loggers.js","names":["Log","probeLog","id","NullLog","log","info","warn","error","ConsoleLog","constructor","console","args","bind"],"sources":["../../../../src/lib/loader-utils/loggers.ts"],"sourcesContent":["// probe.gl Log compatible loggers\nimport {Log} from '@probe.gl/log';\n\nexport const probeLog = new Log({id: 'loaders.gl'});\n\n// Logs nothing\nexport class NullLog {\n log() {\n return () => {};\n }\n info() {\n return () => {};\n }\n warn() {\n return () => {};\n }\n error() {\n return () => {};\n }\n}\n\n// Logs to console\nexport class ConsoleLog {\n console;\n\n constructor() {\n this.console = console; // eslint-disable-line\n }\n log(...args) {\n return this.console.log.bind(this.console, ...args);\n }\n info(...args) {\n return this.console.info.bind(this.console, ...args);\n }\n warn(...args) {\n return this.console.warn.bind(this.console, ...args);\n }\n error(...args) {\n return this.console.error.bind(this.console, ...args);\n }\n}\n"],"mappings":";AACA,SAAQA,GAAG,QAAO,eAAe;AAEjC,OAAO,MAAMC,QAAQ,GAAG,IAAID,GAAG,CAAC;EAACE,EAAE,EAAE;AAAY,CAAC,CAAC
|
|
1
|
+
{"version":3,"file":"loggers.js","names":["Log","probeLog","id","NullLog","log","info","warn","error","ConsoleLog","constructor","_defineProperty","console","_len","arguments","length","args","Array","_key","bind","_len2","_key2","_len3","_key3","_len4","_key4"],"sources":["../../../../src/lib/loader-utils/loggers.ts"],"sourcesContent":["// probe.gl Log compatible loggers\nimport {Log} from '@probe.gl/log';\n\nexport const probeLog = new Log({id: 'loaders.gl'});\n\n// Logs nothing\nexport class NullLog {\n log() {\n return () => {};\n }\n info() {\n return () => {};\n }\n warn() {\n return () => {};\n }\n error() {\n return () => {};\n }\n}\n\n// Logs to console\nexport class ConsoleLog {\n console;\n\n constructor() {\n this.console = console; // eslint-disable-line\n }\n log(...args) {\n return this.console.log.bind(this.console, ...args);\n }\n info(...args) {\n return this.console.info.bind(this.console, ...args);\n }\n warn(...args) {\n return this.console.warn.bind(this.console, ...args);\n }\n error(...args) {\n return this.console.error.bind(this.console, ...args);\n }\n}\n"],"mappings":";AACA,SAAQA,GAAG,QAAO,eAAe;AAEjC,OAAO,MAAMC,QAAQ,GAAG,IAAID,GAAG,CAAC;EAACE,EAAE,EAAE;AAAY,CAAC,CAAC;AAGnD,OAAO,MAAMC,OAAO,CAAC;EACnBC,GAAGA,CAAA,EAAG;IACJ,OAAO,MAAM,CAAC,CAAC;EACjB;EACAC,IAAIA,CAAA,EAAG;IACL,OAAO,MAAM,CAAC,CAAC;EACjB;EACAC,IAAIA,CAAA,EAAG;IACL,OAAO,MAAM,CAAC,CAAC;EACjB;EACAC,KAAKA,CAAA,EAAG;IACN,OAAO,MAAM,CAAC,CAAC;EACjB;AACF;AAGA,OAAO,MAAMC,UAAU,CAAC;EAGtBC,WAAWA,CAAA,EAAG;IAAAC,eAAA;IACZ,IAAI,CAACC,OAAO,GAAGA,OAAO;EACxB;EACAP,GAAGA,CAAA,EAAU;IAAA,SAAAQ,IAAA,GAAAC,SAAA,CAAAC,MAAA,EAANC,IAAI,OAAAC,KAAA,CAAAJ,IAAA,GAAAK,IAAA,MAAAA,IAAA,GAAAL,IAAA,EAAAK,IAAA;MAAJF,IAAI,CAAAE,IAAA,IAAAJ,SAAA,CAAAI,IAAA;IAAA;IACT,OAAO,IAAI,CAACN,OAAO,CAACP,GAAG,CAACc,IAAI,CAAC,IAAI,CAACP,OAAO,EAAE,GAAGI,IAAI,CAAC;EACrD;EACAV,IAAIA,CAAA,EAAU;IAAA,SAAAc,KAAA,GAAAN,SAAA,CAAAC,MAAA,EAANC,IAAI,OAAAC,KAAA,CAAAG,KAAA,GAAAC,KAAA,MAAAA,KAAA,GAAAD,KAAA,EAAAC,KAAA;MAAJL,IAAI,CAAAK,KAAA,IAAAP,SAAA,CAAAO,KAAA;IAAA;IACV,OAAO,IAAI,CAACT,OAAO,CAACN,IAAI,CAACa,IAAI,CAAC,IAAI,CAACP,OAAO,EAAE,GAAGI,IAAI,CAAC;EACtD;EACAT,IAAIA,CAAA,EAAU;IAAA,SAAAe,KAAA,GAAAR,SAAA,CAAAC,MAAA,EAANC,IAAI,OAAAC,KAAA,CAAAK,KAAA,GAAAC,KAAA,MAAAA,KAAA,GAAAD,KAAA,EAAAC,KAAA;MAAJP,IAAI,CAAAO,KAAA,IAAAT,SAAA,CAAAS,KAAA;IAAA;IACV,OAAO,IAAI,CAACX,OAAO,CAACL,IAAI,CAACY,IAAI,CAAC,IAAI,CAACP,OAAO,EAAE,GAAGI,IAAI,CAAC;EACtD;EACAR,KAAKA,CAAA,EAAU;IAAA,SAAAgB,KAAA,GAAAV,SAAA,CAAAC,MAAA,EAANC,IAAI,OAAAC,KAAA,CAAAO,KAAA,GAAAC,KAAA,MAAAA,KAAA,GAAAD,KAAA,EAAAC,KAAA;MAAJT,IAAI,CAAAS,KAAA,IAAAX,SAAA,CAAAW,KAAA;IAAA;IACX,OAAO,IAAI,CAACb,OAAO,CAACJ,KAAK,CAACW,IAAI,CAAC,IAAI,CAACP,OAAO,EAAE,GAAGI,IAAI,CAAC;EACvD;AACF"}
|
|
@@ -8,14 +8,12 @@ export function isLoaderObject(loader) {
|
|
|
8
8
|
loader = loader[0];
|
|
9
9
|
}
|
|
10
10
|
const hasExtensions = Array.isArray((_loader = loader) === null || _loader === void 0 ? void 0 : _loader.extensions);
|
|
11
|
-
|
|
12
11
|
return hasExtensions;
|
|
13
12
|
}
|
|
14
13
|
export function normalizeLoader(loader) {
|
|
15
14
|
var _loader2, _loader3;
|
|
16
15
|
assert(loader, 'null loader');
|
|
17
16
|
assert(isLoaderObject(loader), 'invalid loader');
|
|
18
|
-
|
|
19
17
|
let options;
|
|
20
18
|
if (Array.isArray(loader)) {
|
|
21
19
|
options = loader[1];
|
|
@@ -28,7 +26,6 @@ export function normalizeLoader(loader) {
|
|
|
28
26
|
}
|
|
29
27
|
};
|
|
30
28
|
}
|
|
31
|
-
|
|
32
29
|
if ((_loader2 = loader) !== null && _loader2 !== void 0 && _loader2.parseTextSync || (_loader3 = loader) !== null && _loader3 !== void 0 && _loader3.parseText) {
|
|
33
30
|
loader.text = true;
|
|
34
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-loader.js","names":["assert","isLoaderObject","loader","Array","isArray","hasExtensions","extensions","normalizeLoader","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,SAAQA,MAAM,QAAO,0BAA0B;AAE/C,OAAO,SAASC,
|
|
1
|
+
{"version":3,"file":"normalize-loader.js","names":["assert","isLoaderObject","loader","_loader","Array","isArray","hasExtensions","extensions","normalizeLoader","_loader2","_loader3","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,SAAQA,MAAM,QAAO,0BAA0B;AAE/C,OAAO,SAASC,cAAcA,CAACC,MAAY,EAAW;EAAA,IAAAC,OAAA;EACpD,IAAI,CAACD,MAAM,EAAE;IACX,OAAO,KAAK;EACd;EAEA,IAAIE,KAAK,CAACC,OAAO,CAACH,MAAM,CAAC,EAAE;IACzBA,MAAM,GAAGA,MAAM,CAAC,CAAC,CAAC;EACpB;EAEA,MAAMI,aAAa,GAAGF,KAAK,CAACC,OAAO,EAAAF,OAAA,GAACD,MAAM,cAAAC,OAAA,uBAANA,OAAA,CAAQI,UAAU,CAAC;EAWvD,OAAOD,aAAa;AACtB;AAEA,OAAO,SAASE,eAAeA,CAACN,MAAc,EAAU;EAAA,IAAAO,QAAA,EAAAC,QAAA;EAItDV,MAAM,CAACE,MAAM,EAAE,aAAa,CAAC;EAC7BF,MAAM,CAACC,cAAc,CAACC,MAAM,CAAC,EAAE,gBAAgB,CAAC;EAKhD,IAAIS,OAAO;EACX,IAAIP,KAAK,CAACC,OAAO,CAACH,MAAM,CAAC,EAAE;IACzBS,OAAO,GAAGT,MAAM,CAAC,CAAC,CAAC;IACnBA,MAAM,GAAGA,MAAM,CAAC,CAAC,CAAC;IAClBA,MAAM,GAAG;MACP,GAAGA,MAAM;MACTS,OAAO,EAAE;QAAC,GAAGT,MAAM,CAACS,OAAO;QAAE,GAAGA;MAAO;IACzC,CAAC;EACH;EAMA,IAAI,CAAAF,QAAA,GAAAP,MAAM,cAAAO,QAAA,eAANA,QAAA,CAAQG,aAAa,KAAAF,QAAA,GAAIR,MAAM,cAAAQ,QAAA,eAANA,QAAA,CAAQG,SAAS,EAAE;IAC9CX,MAAM,CAACY,IAAI,GAAG,IAAI;EACpB;EAEA,IAAI,CAACZ,MAAM,CAACY,IAAI,EAAE;IAChBZ,MAAM,CAACa,MAAM,GAAG,IAAI;EACtB;EAEA,OAAOb,MAAM;AACf"}
|
|
@@ -5,7 +5,6 @@ export const DEFAULT_LOADER_OPTIONS = {
|
|
|
5
5
|
mimeType: undefined,
|
|
6
6
|
nothrow: false,
|
|
7
7
|
log: new ConsoleLog(),
|
|
8
|
-
|
|
9
8
|
CDN: 'https://unpkg.com/@loaders.gl',
|
|
10
9
|
worker: true,
|
|
11
10
|
maxConcurrency: 3,
|
|
@@ -13,7 +12,6 @@ export const DEFAULT_LOADER_OPTIONS = {
|
|
|
13
12
|
reuseWorkers: isBrowser,
|
|
14
13
|
_nodeWorkers: false,
|
|
15
14
|
_workerType: '',
|
|
16
|
-
|
|
17
15
|
limit: 0,
|
|
18
16
|
_limitMB: 0,
|
|
19
17
|
batchSize: 'auto',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"option-defaults.js","names":["isBrowser","ConsoleLog","DEFAULT_LOADER_OPTIONS","fetch","mimeType","undefined","nothrow","log","CDN","worker","maxConcurrency","maxMobileConcurrency","reuseWorkers","_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,SAAQA,SAAS,QAAO,0BAA0B;AAClD,SAAQC,UAAU,QAAO,WAAW;AAEpC,OAAO,MAAMC,sBAAqC,GAAG;EAEnDC,KAAK,EAAE,IAAI;EACXC,QAAQ,EAAEC,SAAS;EACnBC,OAAO,EAAE,KAAK;EACdC,GAAG,EAAE,IAAIN,UAAU,
|
|
1
|
+
{"version":3,"file":"option-defaults.js","names":["isBrowser","ConsoleLog","DEFAULT_LOADER_OPTIONS","fetch","mimeType","undefined","nothrow","log","CDN","worker","maxConcurrency","maxMobileConcurrency","reuseWorkers","_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,SAAQA,SAAS,QAAO,0BAA0B;AAClD,SAAQC,UAAU,QAAO,WAAW;AAEpC,OAAO,MAAMC,sBAAqC,GAAG;EAEnDC,KAAK,EAAE,IAAI;EACXC,QAAQ,EAAEC,SAAS;EACnBC,OAAO,EAAE,KAAK;EACdC,GAAG,EAAE,IAAIN,UAAU,CAAC,CAAC;EAErBO,GAAG,EAAE,+BAA+B;EACpCC,MAAM,EAAE,IAAI;EACZC,cAAc,EAAE,CAAC;EACjBC,oBAAoB,EAAE,CAAC;EACvBC,YAAY,EAAEZ,SAAS;EACvBa,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;AAED,OAAO,MAAMC,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"}
|
|
@@ -1,19 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
1
|
import { isPureObject, isObject } from '../../javascript-utils/is-type';
|
|
4
2
|
import { probeLog, NullLog } from './loggers';
|
|
5
3
|
import { DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS } from './option-defaults';
|
|
6
|
-
|
|
7
4
|
export function getGlobalLoaderState() {
|
|
8
5
|
globalThis.loaders = globalThis.loaders || {};
|
|
9
6
|
const {
|
|
10
7
|
loaders
|
|
11
8
|
} = globalThis;
|
|
12
|
-
|
|
13
9
|
loaders._state = loaders._state || {};
|
|
14
10
|
return loaders._state;
|
|
15
11
|
}
|
|
16
|
-
|
|
17
12
|
export const getGlobalLoaderOptions = () => {
|
|
18
13
|
const state = getGlobalLoaderState();
|
|
19
14
|
state.globalOptions = state.globalOptions || {
|
|
@@ -21,32 +16,26 @@ export const getGlobalLoaderOptions = () => {
|
|
|
21
16
|
};
|
|
22
17
|
return state.globalOptions;
|
|
23
18
|
};
|
|
24
|
-
|
|
25
19
|
export function setGlobalOptions(options) {
|
|
26
20
|
const state = getGlobalLoaderState();
|
|
27
21
|
const globalOptions = getGlobalLoaderOptions();
|
|
28
22
|
state.globalOptions = normalizeOptionsInternal(globalOptions, options);
|
|
29
23
|
}
|
|
30
|
-
|
|
31
24
|
export function normalizeOptions(options, loader, loaders, url) {
|
|
32
25
|
loaders = loaders || [];
|
|
33
26
|
loaders = Array.isArray(loaders) ? loaders : [loaders];
|
|
34
27
|
validateOptions(options, loaders);
|
|
35
28
|
return normalizeOptionsInternal(loader, options, url);
|
|
36
29
|
}
|
|
37
|
-
|
|
38
30
|
function validateOptions(options, loaders) {
|
|
39
31
|
validateOptionsObject(options, null, DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS, loaders);
|
|
40
32
|
for (const loader of loaders) {
|
|
41
33
|
const idOptions = options && options[loader.id] || {};
|
|
42
|
-
|
|
43
34
|
const loaderOptions = loader.options && loader.options[loader.id] || {};
|
|
44
35
|
const deprecatedOptions = loader.deprecatedOptions && loader.deprecatedOptions[loader.id] || {};
|
|
45
|
-
|
|
46
36
|
validateOptionsObject(idOptions, loader.id, loaderOptions, deprecatedOptions, loaders);
|
|
47
37
|
}
|
|
48
38
|
}
|
|
49
|
-
|
|
50
39
|
function validateOptionsObject(options, id, defaultOptions, deprecatedOptions, loaders) {
|
|
51
40
|
const loaderName = id || 'Top level';
|
|
52
41
|
const prefix = id ? "".concat(id, ".") : '';
|
|
@@ -87,7 +76,6 @@ function normalizeOptionsInternal(loader, options, url) {
|
|
|
87
76
|
...loaderDefaultOptions
|
|
88
77
|
};
|
|
89
78
|
addUrlOptions(mergedOptions, url);
|
|
90
|
-
|
|
91
79
|
if (mergedOptions.log === null) {
|
|
92
80
|
mergedOptions.log = new NullLog();
|
|
93
81
|
}
|
|
@@ -95,7 +83,6 @@ function normalizeOptionsInternal(loader, options, url) {
|
|
|
95
83
|
mergeNestedFields(mergedOptions, options);
|
|
96
84
|
return mergedOptions;
|
|
97
85
|
}
|
|
98
|
-
|
|
99
86
|
function mergeNestedFields(mergedOptions, options) {
|
|
100
87
|
for (const key in options) {
|
|
101
88
|
if (key in options) {
|
|
@@ -111,7 +98,6 @@ function mergeNestedFields(mergedOptions, options) {
|
|
|
111
98
|
}
|
|
112
99
|
}
|
|
113
100
|
}
|
|
114
|
-
|
|
115
101
|
function addUrlOptions(options, url) {
|
|
116
102
|
if (url && !('baseUri' in options)) {
|
|
117
103
|
options.baseUri = url;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"option-utils.js","names":["isPureObject","isObject","probeLog","NullLog","DEFAULT_LOADER_OPTIONS","REMOVED_LOADER_OPTIONS","getGlobalLoaderState","globalThis","loaders","_state","getGlobalLoaderOptions","state","globalOptions","setGlobalOptions","options","normalizeOptionsInternal","normalizeOptions","loader","url","Array","isArray","validateOptions","validateOptionsObject","idOptions","id","loaderOptions","deprecatedOptions","defaultOptions","loaderName","prefix","key","isSubOptions","isBaseUriOption","isWorkerUrlOption","warn","suggestion","findSimilarOption","optionKey","lowerCaseOptionKey","toLowerCase","bestSuggestion","lowerCaseKey","isPartialMatch","startsWith","loaderDefaultOptions","mergedOptions","addUrlOptions","log","mergeNestedFields","value","baseUri"],"sources":["../../../../src/lib/loader-utils/option-utils.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport type {Loader, LoaderOptions} from '@loaders.gl/loader-utils';\nimport {isPureObject, isObject} from '../../javascript-utils/is-type';\nimport {probeLog, NullLog} from './loggers';\nimport {DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS} from './option-defaults';\n\n/**\n * Global state for loaders.gl. Stored on `global.loaders._state`\n */\ntype GlobalLoaderState = {\n loaderRegistry: Loader[];\n globalOptions: LoaderOptions;\n};\n\n/**\n * Helper for safely accessing global loaders.gl variables\n * Wraps initialization of global variable in function to defeat overly aggressive tree-shakers\n */\nexport function getGlobalLoaderState(): GlobalLoaderState {\n // @ts-ignore\n globalThis.loaders = globalThis.loaders || {};\n // @ts-ignore\n const {loaders} = globalThis;\n\n // Add _state object to keep separate from modules added to globalThis.loaders\n loaders._state = loaders._state || {};\n return loaders._state;\n}\n\n/**\n * Store global loader options on the global object to increase chances of cross loaders-version interoperability\n * NOTE: This use case is not reliable but can help when testing new versions of loaders.gl with existing frameworks\n * @returns global loader options merged with default loader options\n */\nexport const getGlobalLoaderOptions = (): LoaderOptions => {\n const state = getGlobalLoaderState();\n // Ensure all default loader options from this library are mentioned\n state.globalOptions = state.globalOptions || {...DEFAULT_LOADER_OPTIONS};\n return state.globalOptions;\n};\n\n/**\n * Set global loader options\n * @param options\n */\nexport function setGlobalOptions(options: LoaderOptions): void {\n const state = getGlobalLoaderState();\n const globalOptions = getGlobalLoaderOptions();\n state.globalOptions = normalizeOptionsInternal(globalOptions, options);\n}\n\n/**\n * Merges options with global opts and loader defaults, also injects baseUri\n * @param options\n * @param loader\n * @param loaders\n * @param url\n */\nexport function normalizeOptions(\n options: LoaderOptions,\n loader: Loader,\n loaders?: Loader[],\n url?: string\n): LoaderOptions {\n loaders = loaders || [];\n loaders = Array.isArray(loaders) ? loaders : [loaders];\n\n validateOptions(options, loaders);\n return normalizeOptionsInternal(loader, options, url);\n}\n\n// VALIDATE OPTIONS\n\n/**\n * Warn for unsupported options\n * @param options\n * @param loaders\n */\nfunction validateOptions(options: LoaderOptions, loaders: Loader[]) {\n // Check top level options\n validateOptionsObject(options, null, DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS, loaders);\n for (const loader of loaders) {\n // Get the scoped, loader specific options from the user supplied options\n const idOptions = (options && options[loader.id]) || {};\n\n // Get scoped, loader specific default and deprecated options from the selected loader\n const loaderOptions = (loader.options && loader.options[loader.id]) || {};\n const deprecatedOptions =\n (loader.deprecatedOptions && loader.deprecatedOptions[loader.id]) || {};\n\n // Validate loader specific options\n validateOptionsObject(idOptions, loader.id, loaderOptions, deprecatedOptions, loaders);\n }\n}\n\n// eslint-disable-next-line max-params, complexity\nfunction validateOptionsObject(\n options,\n id: string | null,\n defaultOptions,\n deprecatedOptions,\n loaders: Loader[]\n) {\n const loaderName = id || 'Top level';\n const prefix = id ? `${id}.` : '';\n\n for (const key in options) {\n // If top level option value is an object it could options for a loader, so ignore\n const isSubOptions = !id && isObject(options[key]);\n const isBaseUriOption = key === 'baseUri' && !id;\n const isWorkerUrlOption = key === 'workerUrl' && id;\n // <loader>.workerUrl requires special handling as it is now auto-generated and no longer specified as a default option.\n if (!(key in defaultOptions) && !isBaseUriOption && !isWorkerUrlOption) {\n // Issue deprecation warnings\n if (key in deprecatedOptions) {\n probeLog.warn(\n `${loaderName} loader option \\'${prefix}${key}\\' no longer supported, use \\'${deprecatedOptions[key]}\\'`\n )();\n } else if (!isSubOptions) {\n const suggestion = findSimilarOption(key, loaders);\n probeLog.warn(\n `${loaderName} loader option \\'${prefix}${key}\\' not recognized. ${suggestion}`\n )();\n }\n }\n }\n}\n\nfunction findSimilarOption(optionKey, loaders) {\n const lowerCaseOptionKey = optionKey.toLowerCase();\n let bestSuggestion = '';\n for (const loader of loaders) {\n for (const key in loader.options) {\n if (optionKey === key) {\n return `Did you mean \\'${loader.id}.${key}\\'?`;\n }\n const lowerCaseKey = key.toLowerCase();\n const isPartialMatch =\n lowerCaseOptionKey.startsWith(lowerCaseKey) || lowerCaseKey.startsWith(lowerCaseOptionKey);\n if (isPartialMatch) {\n bestSuggestion = bestSuggestion || `Did you mean \\'${loader.id}.${key}\\'?`;\n }\n }\n }\n return bestSuggestion;\n}\n\nfunction normalizeOptionsInternal(loader, options, url?: string) {\n const loaderDefaultOptions = loader.options || {};\n\n const mergedOptions = {...loaderDefaultOptions};\n\n addUrlOptions(mergedOptions, url);\n\n // LOGGING: options.log can be set to `null` to defeat logging\n if (mergedOptions.log === null) {\n mergedOptions.log = new NullLog();\n }\n\n mergeNestedFields(mergedOptions, getGlobalLoaderOptions());\n mergeNestedFields(mergedOptions, options);\n\n return mergedOptions;\n}\n\n// Merge nested options objects\nfunction mergeNestedFields(mergedOptions, options) {\n for (const key in options) {\n // Check for nested options\n // object in options => either no key in defaultOptions or object in defaultOptions\n if (key in options) {\n const value = options[key];\n if (isPureObject(value) && isPureObject(mergedOptions[key])) {\n mergedOptions[key] = {\n ...mergedOptions[key],\n ...options[key]\n };\n } else {\n mergedOptions[key] = options[key];\n }\n }\n // else: No need to merge nested opts, and the initial merge already copied over the nested options\n }\n}\n\n/**\n * Harvest information from the url\n * @deprecated This is mainly there to support a hack in the GLTFLoader\n * TODO - baseUri should be a directory, i.e. remove file component from baseUri\n * TODO - extract extension?\n * TODO - extract query parameters?\n * TODO - should these be injected on context instead of options?\n */\nfunction addUrlOptions(options, url?: string) {\n if (url && !('baseUri' in options)) {\n options.baseUri = url;\n }\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"option-utils.js","names":["isPureObject","isObject","probeLog","NullLog","DEFAULT_LOADER_OPTIONS","REMOVED_LOADER_OPTIONS","getGlobalLoaderState","globalThis","loaders","_state","getGlobalLoaderOptions","state","globalOptions","setGlobalOptions","options","normalizeOptionsInternal","normalizeOptions","loader","url","Array","isArray","validateOptions","validateOptionsObject","idOptions","id","loaderOptions","deprecatedOptions","defaultOptions","loaderName","prefix","concat","key","isSubOptions","isBaseUriOption","isWorkerUrlOption","warn","suggestion","findSimilarOption","optionKey","lowerCaseOptionKey","toLowerCase","bestSuggestion","lowerCaseKey","isPartialMatch","startsWith","loaderDefaultOptions","mergedOptions","addUrlOptions","log","mergeNestedFields","value","baseUri"],"sources":["../../../../src/lib/loader-utils/option-utils.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport type {Loader, LoaderOptions} from '@loaders.gl/loader-utils';\nimport {isPureObject, isObject} from '../../javascript-utils/is-type';\nimport {probeLog, NullLog} from './loggers';\nimport {DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS} from './option-defaults';\n\n/**\n * Global state for loaders.gl. Stored on `global.loaders._state`\n */\ntype GlobalLoaderState = {\n loaderRegistry: Loader[];\n globalOptions: LoaderOptions;\n};\n\n/**\n * Helper for safely accessing global loaders.gl variables\n * Wraps initialization of global variable in function to defeat overly aggressive tree-shakers\n */\nexport function getGlobalLoaderState(): GlobalLoaderState {\n // @ts-ignore\n globalThis.loaders = globalThis.loaders || {};\n // @ts-ignore\n const {loaders} = globalThis;\n\n // Add _state object to keep separate from modules added to globalThis.loaders\n loaders._state = loaders._state || {};\n return loaders._state;\n}\n\n/**\n * Store global loader options on the global object to increase chances of cross loaders-version interoperability\n * NOTE: This use case is not reliable but can help when testing new versions of loaders.gl with existing frameworks\n * @returns global loader options merged with default loader options\n */\nexport const getGlobalLoaderOptions = (): LoaderOptions => {\n const state = getGlobalLoaderState();\n // Ensure all default loader options from this library are mentioned\n state.globalOptions = state.globalOptions || {...DEFAULT_LOADER_OPTIONS};\n return state.globalOptions;\n};\n\n/**\n * Set global loader options\n * @param options\n */\nexport function setGlobalOptions(options: LoaderOptions): void {\n const state = getGlobalLoaderState();\n const globalOptions = getGlobalLoaderOptions();\n state.globalOptions = normalizeOptionsInternal(globalOptions, options);\n}\n\n/**\n * Merges options with global opts and loader defaults, also injects baseUri\n * @param options\n * @param loader\n * @param loaders\n * @param url\n */\nexport function normalizeOptions(\n options: LoaderOptions,\n loader: Loader,\n loaders?: Loader[],\n url?: string\n): LoaderOptions {\n loaders = loaders || [];\n loaders = Array.isArray(loaders) ? loaders : [loaders];\n\n validateOptions(options, loaders);\n return normalizeOptionsInternal(loader, options, url);\n}\n\n// VALIDATE OPTIONS\n\n/**\n * Warn for unsupported options\n * @param options\n * @param loaders\n */\nfunction validateOptions(options: LoaderOptions, loaders: Loader[]) {\n // Check top level options\n validateOptionsObject(options, null, DEFAULT_LOADER_OPTIONS, REMOVED_LOADER_OPTIONS, loaders);\n for (const loader of loaders) {\n // Get the scoped, loader specific options from the user supplied options\n const idOptions = (options && options[loader.id]) || {};\n\n // Get scoped, loader specific default and deprecated options from the selected loader\n const loaderOptions = (loader.options && loader.options[loader.id]) || {};\n const deprecatedOptions =\n (loader.deprecatedOptions && loader.deprecatedOptions[loader.id]) || {};\n\n // Validate loader specific options\n validateOptionsObject(idOptions, loader.id, loaderOptions, deprecatedOptions, loaders);\n }\n}\n\n// eslint-disable-next-line max-params, complexity\nfunction validateOptionsObject(\n options,\n id: string | null,\n defaultOptions,\n deprecatedOptions,\n loaders: Loader[]\n) {\n const loaderName = id || 'Top level';\n const prefix = id ? `${id}.` : '';\n\n for (const key in options) {\n // If top level option value is an object it could options for a loader, so ignore\n const isSubOptions = !id && isObject(options[key]);\n const isBaseUriOption = key === 'baseUri' && !id;\n const isWorkerUrlOption = key === 'workerUrl' && id;\n // <loader>.workerUrl requires special handling as it is now auto-generated and no longer specified as a default option.\n if (!(key in defaultOptions) && !isBaseUriOption && !isWorkerUrlOption) {\n // Issue deprecation warnings\n if (key in deprecatedOptions) {\n probeLog.warn(\n `${loaderName} loader option \\'${prefix}${key}\\' no longer supported, use \\'${deprecatedOptions[key]}\\'`\n )();\n } else if (!isSubOptions) {\n const suggestion = findSimilarOption(key, loaders);\n probeLog.warn(\n `${loaderName} loader option \\'${prefix}${key}\\' not recognized. ${suggestion}`\n )();\n }\n }\n }\n}\n\nfunction findSimilarOption(optionKey, loaders) {\n const lowerCaseOptionKey = optionKey.toLowerCase();\n let bestSuggestion = '';\n for (const loader of loaders) {\n for (const key in loader.options) {\n if (optionKey === key) {\n return `Did you mean \\'${loader.id}.${key}\\'?`;\n }\n const lowerCaseKey = key.toLowerCase();\n const isPartialMatch =\n lowerCaseOptionKey.startsWith(lowerCaseKey) || lowerCaseKey.startsWith(lowerCaseOptionKey);\n if (isPartialMatch) {\n bestSuggestion = bestSuggestion || `Did you mean \\'${loader.id}.${key}\\'?`;\n }\n }\n }\n return bestSuggestion;\n}\n\nfunction normalizeOptionsInternal(loader, options, url?: string) {\n const loaderDefaultOptions = loader.options || {};\n\n const mergedOptions = {...loaderDefaultOptions};\n\n addUrlOptions(mergedOptions, url);\n\n // LOGGING: options.log can be set to `null` to defeat logging\n if (mergedOptions.log === null) {\n mergedOptions.log = new NullLog();\n }\n\n mergeNestedFields(mergedOptions, getGlobalLoaderOptions());\n mergeNestedFields(mergedOptions, options);\n\n return mergedOptions;\n}\n\n// Merge nested options objects\nfunction mergeNestedFields(mergedOptions, options) {\n for (const key in options) {\n // Check for nested options\n // object in options => either no key in defaultOptions or object in defaultOptions\n if (key in options) {\n const value = options[key];\n if (isPureObject(value) && isPureObject(mergedOptions[key])) {\n mergedOptions[key] = {\n ...mergedOptions[key],\n ...options[key]\n };\n } else {\n mergedOptions[key] = options[key];\n }\n }\n // else: No need to merge nested opts, and the initial merge already copied over the nested options\n }\n}\n\n/**\n * Harvest information from the url\n * @deprecated This is mainly there to support a hack in the GLTFLoader\n * TODO - baseUri should be a directory, i.e. remove file component from baseUri\n * TODO - extract extension?\n * TODO - extract query parameters?\n * TODO - should these be injected on context instead of options?\n */\nfunction addUrlOptions(options, url?: string) {\n if (url && !('baseUri' in options)) {\n options.baseUri = url;\n }\n}\n"],"mappings":"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"}
|