@loaders.gl/loader-utils 3.4.0-alpha.2 → 3.4.0-alpha.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/json-loader.js +7 -11
- package/dist/es5/json-loader.js.map +1 -1
- package/dist/es5/lib/binary-utils/array-buffer-utils.js +1 -8
- package/dist/es5/lib/binary-utils/array-buffer-utils.js.map +1 -1
- package/dist/es5/lib/binary-utils/dataview-copy-utils.js +0 -5
- package/dist/es5/lib/binary-utils/dataview-copy-utils.js.map +1 -1
- package/dist/es5/lib/binary-utils/get-first-characters.js +0 -2
- package/dist/es5/lib/binary-utils/get-first-characters.js.map +1 -1
- package/dist/es5/lib/binary-utils/memory-conversion-utils.js +0 -5
- package/dist/es5/lib/binary-utils/memory-conversion-utils.js.map +1 -1
- package/dist/es5/lib/binary-utils/memory-copy-utils.js +0 -3
- package/dist/es5/lib/binary-utils/memory-copy-utils.js.map +1 -1
- package/dist/es5/lib/env-utils/assert.js.map +1 -1
- package/dist/es5/lib/env-utils/globals.js +1 -5
- package/dist/es5/lib/env-utils/globals.js.map +1 -1
- package/dist/es5/lib/filesystems/node-filesystem.js +86 -100
- package/dist/es5/lib/filesystems/node-filesystem.js.map +1 -1
- package/dist/es5/lib/filesystems/readable-file.js +24 -33
- package/dist/es5/lib/filesystems/readable-file.js.map +1 -1
- package/dist/es5/lib/filesystems/writable-file.js +18 -25
- package/dist/es5/lib/filesystems/writable-file.js.map +1 -1
- package/dist/es5/lib/iterators/async-iteration.js +134 -140
- package/dist/es5/lib/iterators/async-iteration.js.map +1 -1
- package/dist/es5/lib/iterators/text-iterators.js +207 -221
- package/dist/es5/lib/iterators/text-iterators.js.map +1 -1
- package/dist/es5/lib/node/buffer.browser.js +0 -2
- package/dist/es5/lib/node/buffer.browser.js.map +1 -1
- package/dist/es5/lib/node/buffer.js +0 -2
- package/dist/es5/lib/node/buffer.js.map +1 -1
- package/dist/es5/lib/node/fs.js +19 -30
- package/dist/es5/lib/node/fs.js.map +1 -1
- package/dist/es5/lib/node/promisify.js +0 -1
- package/dist/es5/lib/node/promisify.js.map +1 -1
- package/dist/es5/lib/node/stream.js +1 -5
- package/dist/es5/lib/node/stream.js.map +1 -1
- package/dist/es5/lib/option-utils/merge-loader-options.js +0 -1
- package/dist/es5/lib/option-utils/merge-loader-options.js.map +1 -1
- package/dist/es5/lib/parser-utils/parse-json.js.map +1 -1
- package/dist/es5/lib/path-utils/file-aliases.js +0 -5
- package/dist/es5/lib/path-utils/file-aliases.js.map +1 -1
- package/dist/es5/lib/path-utils/get-cwd.js +15 -0
- package/dist/es5/lib/path-utils/get-cwd.js.map +1 -0
- package/dist/es5/lib/path-utils/path.js +105 -5
- package/dist/es5/lib/path-utils/path.js.map +1 -1
- package/dist/es5/lib/request-utils/request-scheduler.js +6 -29
- package/dist/es5/lib/request-utils/request-scheduler.js.map +1 -1
- package/dist/es5/lib/worker-loader-utils/create-loader-worker.js +69 -79
- package/dist/es5/lib/worker-loader-utils/create-loader-worker.js.map +1 -1
- package/dist/es5/lib/worker-loader-utils/encode-with-worker.js +0 -1
- package/dist/es5/lib/worker-loader-utils/encode-with-worker.js.map +1 -1
- package/dist/es5/lib/worker-loader-utils/parse-with-worker.js +70 -77
- package/dist/es5/lib/worker-loader-utils/parse-with-worker.js.map +1 -1
- package/dist/es5/types.js.map +1 -1
- package/dist/es5/workers/json-worker.js.map +1 -1
- package/dist/esm/index.js +0 -15
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/json-loader.js +1 -4
- package/dist/esm/json-loader.js.map +1 -1
- package/dist/esm/lib/binary-utils/array-buffer-utils.js +0 -8
- package/dist/esm/lib/binary-utils/array-buffer-utils.js.map +1 -1
- package/dist/esm/lib/binary-utils/dataview-copy-utils.js +0 -7
- package/dist/esm/lib/binary-utils/dataview-copy-utils.js.map +1 -1
- package/dist/esm/lib/binary-utils/get-first-characters.js +0 -3
- package/dist/esm/lib/binary-utils/get-first-characters.js.map +1 -1
- package/dist/esm/lib/binary-utils/memory-conversion-utils.js +0 -7
- package/dist/esm/lib/binary-utils/memory-conversion-utils.js.map +1 -1
- package/dist/esm/lib/binary-utils/memory-copy-utils.js +0 -4
- package/dist/esm/lib/binary-utils/memory-copy-utils.js.map +1 -1
- package/dist/esm/lib/env-utils/assert.js +0 -1
- package/dist/esm/lib/env-utils/assert.js.map +1 -1
- package/dist/esm/lib/env-utils/globals.js +1 -7
- package/dist/esm/lib/env-utils/globals.js.map +1 -1
- package/dist/esm/lib/filesystems/node-filesystem.js +0 -1
- package/dist/esm/lib/filesystems/node-filesystem.js.map +1 -1
- package/dist/esm/lib/filesystems/readable-file.js +0 -2
- package/dist/esm/lib/filesystems/readable-file.js.map +1 -1
- package/dist/esm/lib/filesystems/writable-file.js +0 -1
- package/dist/esm/lib/filesystems/writable-file.js.map +1 -1
- package/dist/esm/lib/iterators/async-iteration.js +0 -2
- package/dist/esm/lib/iterators/async-iteration.js.map +1 -1
- package/dist/esm/lib/iterators/text-iterators.js +13 -12
- package/dist/esm/lib/iterators/text-iterators.js.map +1 -1
- package/dist/esm/lib/node/buffer.browser.js +0 -3
- package/dist/esm/lib/node/buffer.browser.js.map +1 -1
- package/dist/esm/lib/node/buffer.js +0 -3
- package/dist/esm/lib/node/buffer.js.map +1 -1
- package/dist/esm/lib/node/fs.js +1 -8
- package/dist/esm/lib/node/fs.js.map +1 -1
- package/dist/esm/lib/node/promisify.js +0 -2
- package/dist/esm/lib/node/promisify.js.map +1 -1
- package/dist/esm/lib/node/stream.js +1 -5
- package/dist/esm/lib/node/stream.js.map +1 -1
- package/dist/esm/lib/option-utils/merge-loader-options.js +0 -2
- package/dist/esm/lib/option-utils/merge-loader-options.js.map +1 -1
- package/dist/esm/lib/parser-utils/parse-json.js +0 -1
- package/dist/esm/lib/parser-utils/parse-json.js.map +1 -1
- package/dist/esm/lib/path-utils/file-aliases.js +0 -6
- package/dist/esm/lib/path-utils/file-aliases.js.map +1 -1
- package/dist/esm/lib/path-utils/get-cwd.js +9 -0
- package/dist/esm/lib/path-utils/get-cwd.js.map +1 -0
- package/dist/esm/lib/path-utils/path.js +104 -6
- package/dist/esm/lib/path-utils/path.js.map +1 -1
- package/dist/esm/lib/request-utils/request-scheduler.js +0 -16
- package/dist/esm/lib/request-utils/request-scheduler.js.map +1 -1
- package/dist/esm/lib/worker-loader-utils/create-loader-worker.js +0 -10
- package/dist/esm/lib/worker-loader-utils/create-loader-worker.js.map +1 -1
- package/dist/esm/lib/worker-loader-utils/encode-with-worker.js +0 -2
- package/dist/esm/lib/worker-loader-utils/encode-with-worker.js.map +1 -1
- package/dist/esm/lib/worker-loader-utils/parse-with-worker.js +1 -8
- package/dist/esm/lib/worker-loader-utils/parse-with-worker.js.map +1 -1
- package/dist/esm/types.js.map +1 -1
- package/dist/lib/path-utils/get-cwd.d.ts +2 -0
- package/dist/lib/path-utils/get-cwd.d.ts.map +1 -0
- package/dist/lib/path-utils/get-cwd.js +12 -0
- package/dist/lib/path-utils/path.d.ts +8 -0
- package/dist/lib/path-utils/path.d.ts.map +1 -1
- package/dist/lib/path-utils/path.js +141 -3
- package/dist/lib/worker-loader-utils/create-loader-worker.js +1 -1
- package/dist/types.d.ts +7 -7
- package/dist/types.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/lib/path-utils/get-cwd.ts +9 -0
- package/src/lib/path-utils/path.ts +138 -4
- package/src/types.ts +7 -7
package/dist/esm/lib/node/fs.js
CHANGED
|
@@ -1,39 +1,32 @@
|
|
|
1
|
-
|
|
2
1
|
import fs from 'fs';
|
|
3
2
|
import { toArrayBuffer } from './buffer';
|
|
4
3
|
import { promisify2, promisify3 } from './promisify';
|
|
5
4
|
export let readdir;
|
|
6
5
|
export let stat;
|
|
7
|
-
|
|
8
6
|
export let readFile;
|
|
9
7
|
export let readFileSync;
|
|
10
8
|
export let writeFile;
|
|
11
9
|
export let writeFileSync;
|
|
12
|
-
|
|
13
10
|
export let open;
|
|
14
11
|
export let close;
|
|
15
12
|
export let read;
|
|
16
13
|
export let fstat;
|
|
17
14
|
export let createWriteStream;
|
|
18
15
|
export let isSupported = Boolean(fs);
|
|
19
|
-
|
|
20
16
|
try {
|
|
21
17
|
readdir = promisify2(fs.readdir);
|
|
22
18
|
stat = promisify2(fs.stat);
|
|
23
|
-
|
|
24
19
|
readFile = fs.readFile;
|
|
25
20
|
readFileSync = fs.readFileSync;
|
|
26
21
|
writeFile = promisify3(fs.writeFile);
|
|
27
22
|
writeFileSync = fs.writeFileSync;
|
|
28
|
-
|
|
29
23
|
open = fs.open;
|
|
30
24
|
close = fd => new Promise((resolve, reject) => fs.close(fd, err => err ? reject(err) : resolve()));
|
|
31
25
|
read = fs.read;
|
|
32
26
|
fstat = fs.fstat;
|
|
33
27
|
createWriteStream = fs.createWriteStream;
|
|
34
28
|
isSupported = Boolean(fs);
|
|
35
|
-
} catch {
|
|
36
|
-
}
|
|
29
|
+
} catch {}
|
|
37
30
|
export async function _readToArrayBuffer(fd, start, length) {
|
|
38
31
|
const buffer = Buffer.alloc(length);
|
|
39
32
|
const {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs.js","names":["fs","toArrayBuffer","promisify2","promisify3","readdir","stat","readFile","readFileSync","writeFile","writeFileSync","open","close","read","fstat","createWriteStream","isSupported","Boolean","fd","Promise","resolve","reject","err","_readToArrayBuffer","start","length","buffer","Buffer","alloc","bytesRead","Error"],"sources":["../../../../src/lib/node/fs.ts"],"sourcesContent":["// fs wrapper (promisified fs + avoids bundling fs in browsers)\nimport fs from 'fs';\nimport {toArrayBuffer} from './buffer';\nimport {promisify2, promisify3} from './promisify';\n\nexport type {Stats, WriteStream} from 'fs';\n\nexport let readdir;\n/** Wrapper for Node.js fs method */\nexport let stat;\n\n/** Wrapper for Node.js fs method */\nexport let readFile;\n/** Wrapper for Node.js fs method */\nexport let readFileSync;\n/** Wrapper for Node.js fs method */\nexport let writeFile;\n/** Wrapper for Node.js fs method */\nexport let writeFileSync;\n\n// file descriptors\n\n/** Wrapper for Node.js fs method */\nexport let open;\n/** Wrapper for Node.js fs method */\nexport let close: (fd: number) => Promise<void>;\n/** Wrapper for Node.js fs method */\nexport let read;\n/** Wrapper for Node.js fs method */\nexport let fstat;\n\nexport let createWriteStream: typeof fs.createWriteStream;\n\nexport let isSupported = Boolean(fs);\n\n// paths\n\ntry {\n /** Wrapper for Node.js fs method */\n readdir = promisify2(fs.readdir);\n /** Wrapper for Node.js fs method */\n stat = promisify2(fs.stat);\n\n /** Wrapper for Node.js fs method */\n readFile = fs.readFile;\n /** Wrapper for Node.js fs method */\n readFileSync = fs.readFileSync;\n /** Wrapper for Node.js fs method */\n writeFile = promisify3(fs.writeFile);\n /** Wrapper for Node.js fs method */\n writeFileSync = fs.writeFileSync;\n\n // file descriptors\n\n /** Wrapper for Node.js fs method */\n open = fs.open;\n /** Wrapper for Node.js fs method */\n close = (fd: number) =>\n new Promise((resolve, reject) => fs.close(fd, (err) => (err ? reject(err) : resolve())));\n /** Wrapper for Node.js fs method */\n read = fs.read;\n /** Wrapper for Node.js fs method */\n fstat = fs.fstat;\n\n createWriteStream = fs.createWriteStream;\n\n isSupported = Boolean(fs);\n} catch {\n // ignore\n}\n\nexport async function _readToArrayBuffer(fd: number, start: number, length: number) {\n const buffer = Buffer.alloc(length);\n const {bytesRead} = await read(fd, buffer, 0, length, start);\n if (bytesRead !== length) {\n throw new Error('fs.read failed');\n }\n return toArrayBuffer(buffer);\n}\n"],"mappings":"
|
|
1
|
+
{"version":3,"file":"fs.js","names":["fs","toArrayBuffer","promisify2","promisify3","readdir","stat","readFile","readFileSync","writeFile","writeFileSync","open","close","read","fstat","createWriteStream","isSupported","Boolean","fd","Promise","resolve","reject","err","_readToArrayBuffer","start","length","buffer","Buffer","alloc","bytesRead","Error"],"sources":["../../../../src/lib/node/fs.ts"],"sourcesContent":["// fs wrapper (promisified fs + avoids bundling fs in browsers)\nimport fs from 'fs';\nimport {toArrayBuffer} from './buffer';\nimport {promisify2, promisify3} from './promisify';\n\nexport type {Stats, WriteStream} from 'fs';\n\nexport let readdir;\n/** Wrapper for Node.js fs method */\nexport let stat;\n\n/** Wrapper for Node.js fs method */\nexport let readFile;\n/** Wrapper for Node.js fs method */\nexport let readFileSync;\n/** Wrapper for Node.js fs method */\nexport let writeFile;\n/** Wrapper for Node.js fs method */\nexport let writeFileSync;\n\n// file descriptors\n\n/** Wrapper for Node.js fs method */\nexport let open;\n/** Wrapper for Node.js fs method */\nexport let close: (fd: number) => Promise<void>;\n/** Wrapper for Node.js fs method */\nexport let read;\n/** Wrapper for Node.js fs method */\nexport let fstat;\n\nexport let createWriteStream: typeof fs.createWriteStream;\n\nexport let isSupported = Boolean(fs);\n\n// paths\n\ntry {\n /** Wrapper for Node.js fs method */\n readdir = promisify2(fs.readdir);\n /** Wrapper for Node.js fs method */\n stat = promisify2(fs.stat);\n\n /** Wrapper for Node.js fs method */\n readFile = fs.readFile;\n /** Wrapper for Node.js fs method */\n readFileSync = fs.readFileSync;\n /** Wrapper for Node.js fs method */\n writeFile = promisify3(fs.writeFile);\n /** Wrapper for Node.js fs method */\n writeFileSync = fs.writeFileSync;\n\n // file descriptors\n\n /** Wrapper for Node.js fs method */\n open = fs.open;\n /** Wrapper for Node.js fs method */\n close = (fd: number) =>\n new Promise((resolve, reject) => fs.close(fd, (err) => (err ? reject(err) : resolve())));\n /** Wrapper for Node.js fs method */\n read = fs.read;\n /** Wrapper for Node.js fs method */\n fstat = fs.fstat;\n\n createWriteStream = fs.createWriteStream;\n\n isSupported = Boolean(fs);\n} catch {\n // ignore\n}\n\nexport async function _readToArrayBuffer(fd: number, start: number, length: number) {\n const buffer = Buffer.alloc(length);\n const {bytesRead} = await read(fd, buffer, 0, length, start);\n if (bytesRead !== length) {\n throw new Error('fs.read failed');\n }\n return toArrayBuffer(buffer);\n}\n"],"mappings":"AACA,OAAOA,EAAE,MAAM,IAAI;AACnB,SAAQC,aAAa,QAAO,UAAU;AACtC,SAAQC,UAAU,EAAEC,UAAU,QAAO,aAAa;AAIlD,OAAO,IAAIC,OAAO;AAElB,OAAO,IAAIC,IAAI;AAGf,OAAO,IAAIC,QAAQ;AAEnB,OAAO,IAAIC,YAAY;AAEvB,OAAO,IAAIC,SAAS;AAEpB,OAAO,IAAIC,aAAa;AAKxB,OAAO,IAAIC,IAAI;AAEf,OAAO,IAAIC,KAAoC;AAE/C,OAAO,IAAIC,IAAI;AAEf,OAAO,IAAIC,KAAK;AAEhB,OAAO,IAAIC,iBAA8C;AAEzD,OAAO,IAAIC,WAAW,GAAGC,OAAO,CAAChB,EAAE,CAAC;AAIpC,IAAI;EAEFI,OAAO,GAAGF,UAAU,CAACF,EAAE,CAACI,OAAO,CAAC;EAEhCC,IAAI,GAAGH,UAAU,CAACF,EAAE,CAACK,IAAI,CAAC;EAG1BC,QAAQ,GAAGN,EAAE,CAACM,QAAQ;EAEtBC,YAAY,GAAGP,EAAE,CAACO,YAAY;EAE9BC,SAAS,GAAGL,UAAU,CAACH,EAAE,CAACQ,SAAS,CAAC;EAEpCC,aAAa,GAAGT,EAAE,CAACS,aAAa;EAKhCC,IAAI,GAAGV,EAAE,CAACU,IAAI;EAEdC,KAAK,GAAIM,EAAU,IACjB,IAAIC,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAKpB,EAAE,CAACW,KAAK,CAACM,EAAE,EAAGI,GAAG,IAAMA,GAAG,GAAGD,MAAM,CAACC,GAAG,CAAC,GAAGF,OAAO,EAAG,CAAC,CAAC;EAE1FP,IAAI,GAAGZ,EAAE,CAACY,IAAI;EAEdC,KAAK,GAAGb,EAAE,CAACa,KAAK;EAEhBC,iBAAiB,GAAGd,EAAE,CAACc,iBAAiB;EAExCC,WAAW,GAAGC,OAAO,CAAChB,EAAE,CAAC;AAC3B,CAAC,CAAC,MAAM,CAER;AAEA,OAAO,eAAesB,kBAAkBA,CAACL,EAAU,EAAEM,KAAa,EAAEC,MAAc,EAAE;EAClF,MAAMC,MAAM,GAAGC,MAAM,CAACC,KAAK,CAACH,MAAM,CAAC;EACnC,MAAM;IAACI;EAAS,CAAC,GAAG,MAAMhB,IAAI,CAACK,EAAE,EAAEQ,MAAM,EAAE,CAAC,EAAED,MAAM,EAAED,KAAK,CAAC;EAC5D,IAAIK,SAAS,KAAKJ,MAAM,EAAE;IACxB,MAAM,IAAIK,KAAK,CAAC,gBAAgB,CAAC;EACnC;EACA,OAAO5B,aAAa,CAACwB,MAAM,CAAC;AAC9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promisify.js","names":["promisify1","fn","args","Promise","resolve","reject","error","callbackArgs","promisify2","arg1","arg2","promisify3","arg3"],"sources":["../../../../src/lib/node/promisify.ts"],"sourcesContent":["// @loaders.gl, MIT license\n\n// type Parameter1<T extends (arg1: any, ...args: unknown[]) => unknown> = T extends (\n// arg1: infer P,\n// ...args: unknown[]\n// ) => unknown\n// ? P\n// : never;\n\n// type Parameter2<T extends (arg1: unknown, arg2: any, ...args: unknown[]) => unknown> = T extends (\n// arg1: unknown,\n// arg2: infer P,\n// ...args: unknown[]\n// ) => unknown\n// ? P\n// : never;\n\n// type CallbackParameter2<\n// T extends (arg: unknown, cb: (error: any, value: any) => void) => unknown\n// > = T extends (arg: unknown, cb: (error: any, value: infer P) => void) => unknown ? P : never;\n\n// type CallbackParameter3<\n// T extends (arg: unknown, arg2: unknown, cb: (error: any, value: any) => void) => unknown\n// > = T extends (arg: unknown, arg2: unknown, cb: (error: any, value: infer P) => void) => unknown\n// ? P\n// : never;\n\n// /** Extract the parameters of a function type in a tuple */\n// export type Promisified<F extends (arg1, cb: (error: unknown, value: any) => void) => any> = (\n// arg1: Parameter1<F>\n// ) => Promise<CallbackParameter2<F>>;\n// /** Extract the parameters of a function type in a tuple */\n// export type Promisified2<F extends (arg1, arg2, cb: (error: unknown, value: any) => void) => any> = (\n// arg1: Parameter1<F>,\n// arg2: Parameter2<F>\n// ) => Promise<CallbackParameter3<F>>;\n\n/** Wrapper for Node.js promisify */\ntype Callback<A> = (error: unknown, args: A) => void;\n\n/**\n * Typesafe promisify implementation\n * @link https://dev.to/_gdelgado/implement-a-type-safe-version-of-node-s-promisify-in-7-lines-of-code-in-typescript-2j34\n * @param fn\n * @returns\n */\nexport function promisify1<T, A>(fn: (args: T, cb: Callback<A>) => void): (args: T) => Promise<A> {\n return (args: T) =>\n new Promise((resolve, reject) =>\n fn(args, (error, callbackArgs) => (error ? reject(error) : resolve(callbackArgs)))\n );\n}\n\nexport function promisify2<T1, T2, A>(\n fn: (arg1: T1, arg2: T2, cb: Callback<A>) => void\n): (arg1: T1, arg2: T2) => Promise<A> {\n return (arg1: T1, arg2: T2) =>\n new Promise((resolve, reject) =>\n fn(arg1, arg2, (error, callbackArgs) => (error ? reject(error) : resolve(callbackArgs)))\n );\n}\n\nexport function promisify3<T1, T2, T3, A>(\n fn: (arg1: T1, arg2: T2, arg3: T3, cb: Callback<A>) => void\n): (arg1: T1, arg2: T2, arg3: T3) => Promise<A> {\n return (arg1: T1, arg2: T2, arg3: T3) =>\n new Promise((resolve, reject) =>\n fn(arg1, arg2, arg3, (error, callbackArgs) => (error ? reject(error) : resolve(callbackArgs)))\n );\n}\n"],"mappings":"
|
|
1
|
+
{"version":3,"file":"promisify.js","names":["promisify1","fn","args","Promise","resolve","reject","error","callbackArgs","promisify2","arg1","arg2","promisify3","arg3"],"sources":["../../../../src/lib/node/promisify.ts"],"sourcesContent":["// @loaders.gl, MIT license\n\n// type Parameter1<T extends (arg1: any, ...args: unknown[]) => unknown> = T extends (\n// arg1: infer P,\n// ...args: unknown[]\n// ) => unknown\n// ? P\n// : never;\n\n// type Parameter2<T extends (arg1: unknown, arg2: any, ...args: unknown[]) => unknown> = T extends (\n// arg1: unknown,\n// arg2: infer P,\n// ...args: unknown[]\n// ) => unknown\n// ? P\n// : never;\n\n// type CallbackParameter2<\n// T extends (arg: unknown, cb: (error: any, value: any) => void) => unknown\n// > = T extends (arg: unknown, cb: (error: any, value: infer P) => void) => unknown ? P : never;\n\n// type CallbackParameter3<\n// T extends (arg: unknown, arg2: unknown, cb: (error: any, value: any) => void) => unknown\n// > = T extends (arg: unknown, arg2: unknown, cb: (error: any, value: infer P) => void) => unknown\n// ? P\n// : never;\n\n// /** Extract the parameters of a function type in a tuple */\n// export type Promisified<F extends (arg1, cb: (error: unknown, value: any) => void) => any> = (\n// arg1: Parameter1<F>\n// ) => Promise<CallbackParameter2<F>>;\n// /** Extract the parameters of a function type in a tuple */\n// export type Promisified2<F extends (arg1, arg2, cb: (error: unknown, value: any) => void) => any> = (\n// arg1: Parameter1<F>,\n// arg2: Parameter2<F>\n// ) => Promise<CallbackParameter3<F>>;\n\n/** Wrapper for Node.js promisify */\ntype Callback<A> = (error: unknown, args: A) => void;\n\n/**\n * Typesafe promisify implementation\n * @link https://dev.to/_gdelgado/implement-a-type-safe-version-of-node-s-promisify-in-7-lines-of-code-in-typescript-2j34\n * @param fn\n * @returns\n */\nexport function promisify1<T, A>(fn: (args: T, cb: Callback<A>) => void): (args: T) => Promise<A> {\n return (args: T) =>\n new Promise((resolve, reject) =>\n fn(args, (error, callbackArgs) => (error ? reject(error) : resolve(callbackArgs)))\n );\n}\n\nexport function promisify2<T1, T2, A>(\n fn: (arg1: T1, arg2: T2, cb: Callback<A>) => void\n): (arg1: T1, arg2: T2) => Promise<A> {\n return (arg1: T1, arg2: T2) =>\n new Promise((resolve, reject) =>\n fn(arg1, arg2, (error, callbackArgs) => (error ? reject(error) : resolve(callbackArgs)))\n );\n}\n\nexport function promisify3<T1, T2, T3, A>(\n fn: (arg1: T1, arg2: T2, arg3: T3, cb: Callback<A>) => void\n): (arg1: T1, arg2: T2, arg3: T3) => Promise<A> {\n return (arg1: T1, arg2: T2, arg3: T3) =>\n new Promise((resolve, reject) =>\n fn(arg1, arg2, arg3, (error, callbackArgs) => (error ? reject(error) : resolve(callbackArgs)))\n );\n}\n"],"mappings":"AA8CA,OAAO,SAASA,UAAUA,CAAOC,EAAsC,EAA2B;EAChG,OAAQC,IAAO,IACb,IAAIC,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAC1BJ,EAAE,CAACC,IAAI,EAAE,CAACI,KAAK,EAAEC,YAAY,KAAMD,KAAK,GAAGD,MAAM,CAACC,KAAK,CAAC,GAAGF,OAAO,CAACG,YAAY,CAAE,CAAC,CACnF;AACL;AAEA,OAAO,SAASC,UAAUA,CACxBP,EAAiD,EACb;EACpC,OAAO,CAACQ,IAAQ,EAAEC,IAAQ,KACxB,IAAIP,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAC1BJ,EAAE,CAACQ,IAAI,EAAEC,IAAI,EAAE,CAACJ,KAAK,EAAEC,YAAY,KAAMD,KAAK,GAAGD,MAAM,CAACC,KAAK,CAAC,GAAGF,OAAO,CAACG,YAAY,CAAE,CAAC,CACzF;AACL;AAEA,OAAO,SAASI,UAAUA,CACxBV,EAA2D,EACb;EAC9C,OAAO,CAACQ,IAAQ,EAAEC,IAAQ,EAAEE,IAAQ,KAClC,IAAIT,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAC1BJ,EAAE,CAACQ,IAAI,EAAEC,IAAI,EAAEE,IAAI,EAAE,CAACN,KAAK,EAAEC,YAAY,KAAMD,KAAK,GAAGD,MAAM,CAACC,KAAK,CAAC,GAAGF,OAAO,CAACG,YAAY,CAAE,CAAC,CAC/F;AACL"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream.js","names":["stream","Transform","isSupported","Boolean"],"sources":["../../../../src/lib/node/stream.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport stream from 'stream';\n\nexport type {Writable} from 'stream';\n\nexport let Transform;\n\nexport const isSupported = Boolean(stream);\n\n// paths\n\ntry {\n /** Wrapper for Node.js fs method */\n Transform = stream.Transform;\n} catch {\n // ignore\n}\n"],"mappings":"
|
|
1
|
+
{"version":3,"file":"stream.js","names":["stream","Transform","isSupported","Boolean"],"sources":["../../../../src/lib/node/stream.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport stream from 'stream';\n\nexport type {Writable} from 'stream';\n\nexport let Transform;\n\nexport const isSupported = Boolean(stream);\n\n// paths\n\ntry {\n /** Wrapper for Node.js fs method */\n Transform = stream.Transform;\n} catch {\n // ignore\n}\n"],"mappings":"AAEA,OAAOA,MAAM,MAAM,QAAQ;AAI3B,OAAO,IAAIC,SAAS;AAEpB,OAAO,MAAMC,WAAW,GAAGC,OAAO,CAACH,MAAM,CAAC;AAI1C,IAAI;EAEFC,SAAS,GAAGD,MAAM,CAACC,SAAS;AAC9B,CAAC,CAAC,MAAM,CAER"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-loader-options.js","names":["mergeLoaderOptions","baseOptions","newOptions","options","key","newValue","Object","entries","assign"],"sources":["../../../../src/lib/option-utils/merge-loader-options.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport {LoaderOptions} from '../../types';\n\n/**\n *\n * @param baseOptions Can be undefined, in which case a fresh options object will be minted\n * @param newOptions\n * @returns\n */\nexport function mergeLoaderOptions<Options extends LoaderOptions>(\n baseOptions: Options | undefined,\n newOptions: Options\n): Options {\n const options = {...baseOptions};\n for (const [key, newValue] of Object.entries(newOptions)) {\n if (newValue && typeof newValue === 'object') {\n options[key] = options[key] || {};\n Object.assign(options[key] as object, newOptions[key]);\n } else {\n options[key] = newOptions[key];\n }\n }\n return options as Options;\n}\n"],"mappings":"
|
|
1
|
+
{"version":3,"file":"merge-loader-options.js","names":["mergeLoaderOptions","baseOptions","newOptions","options","key","newValue","Object","entries","assign"],"sources":["../../../../src/lib/option-utils/merge-loader-options.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport {LoaderOptions} from '../../types';\n\n/**\n *\n * @param baseOptions Can be undefined, in which case a fresh options object will be minted\n * @param newOptions\n * @returns\n */\nexport function mergeLoaderOptions<Options extends LoaderOptions>(\n baseOptions: Options | undefined,\n newOptions: Options\n): Options {\n const options = {...baseOptions};\n for (const [key, newValue] of Object.entries(newOptions)) {\n if (newValue && typeof newValue === 'object') {\n options[key] = options[key] || {};\n Object.assign(options[key] as object, newOptions[key]);\n } else {\n options[key] = newOptions[key];\n }\n }\n return options as Options;\n}\n"],"mappings":"AAUA,OAAO,SAASA,kBAAkBA,CAChCC,WAAgC,EAChCC,UAAmB,EACV;EACT,MAAMC,OAAO,GAAG;IAAC,GAAGF;EAAW,CAAC;EAChC,KAAK,MAAM,CAACG,GAAG,EAAEC,QAAQ,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACL,UAAU,CAAC,EAAE;IACxD,IAAIG,QAAQ,IAAI,OAAOA,QAAQ,KAAK,QAAQ,EAAE;MAC5CF,OAAO,CAACC,GAAG,CAAC,GAAGD,OAAO,CAACC,GAAG,CAAC,IAAI,CAAC,CAAC;MACjCE,MAAM,CAACE,MAAM,CAACL,OAAO,CAACC,GAAG,CAAC,EAAYF,UAAU,CAACE,GAAG,CAAC,CAAC;IACxD,CAAC,MAAM;MACLD,OAAO,CAACC,GAAG,CAAC,GAAGF,UAAU,CAACE,GAAG,CAAC;IAChC;EACF;EACA,OAAOD,OAAO;AAChB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-json.js","names":["getFirstCharacters","parseJSON","string","JSON","parse","_","Error"],"sources":["../../../../src/lib/parser-utils/parse-json.ts"],"sourcesContent":["import {getFirstCharacters} from '../binary-utils/get-first-characters';\n\n/**\n * Minimal JSON parser that throws more meaningful error messages\n */\nexport function parseJSON(string: string): any {\n try {\n return JSON.parse(string);\n } catch (_) {\n throw new Error(`Failed to parse JSON from data starting with \"${getFirstCharacters(string)}\"`);\n }\n}\n"],"mappings":"AAAA,SAAQA,kBAAkB,QAAO,sCAAsC
|
|
1
|
+
{"version":3,"file":"parse-json.js","names":["getFirstCharacters","parseJSON","string","JSON","parse","_","Error","concat"],"sources":["../../../../src/lib/parser-utils/parse-json.ts"],"sourcesContent":["import {getFirstCharacters} from '../binary-utils/get-first-characters';\n\n/**\n * Minimal JSON parser that throws more meaningful error messages\n */\nexport function parseJSON(string: string): any {\n try {\n return JSON.parse(string);\n } catch (_) {\n throw new Error(`Failed to parse JSON from data starting with \"${getFirstCharacters(string)}\"`);\n }\n}\n"],"mappings":"AAAA,SAAQA,kBAAkB,QAAO,sCAAsC;AAKvE,OAAO,SAASC,SAASA,CAACC,MAAc,EAAO;EAC7C,IAAI;IACF,OAAOC,IAAI,CAACC,KAAK,CAACF,MAAM,CAAC;EAC3B,CAAC,CAAC,OAAOG,CAAC,EAAE;IACV,MAAM,IAAIC,KAAK,mDAAAC,MAAA,CAAkDP,kBAAkB,CAACE,MAAM,CAAC,QAAI;EACjG;AACF"}
|
|
@@ -1,20 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
1
|
let pathPrefix = '';
|
|
4
2
|
const fileAliases = {};
|
|
5
|
-
|
|
6
3
|
export function setPathPrefix(prefix) {
|
|
7
4
|
pathPrefix = prefix;
|
|
8
5
|
}
|
|
9
|
-
|
|
10
6
|
export function getPathPrefix() {
|
|
11
7
|
return pathPrefix;
|
|
12
8
|
}
|
|
13
|
-
|
|
14
9
|
export function addAliases(aliases) {
|
|
15
10
|
Object.assign(fileAliases, aliases);
|
|
16
11
|
}
|
|
17
|
-
|
|
18
12
|
export function resolvePath(filename) {
|
|
19
13
|
for (const alias in fileAliases) {
|
|
20
14
|
if (filename.startsWith(alias)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-aliases.js","names":["pathPrefix","fileAliases","setPathPrefix","prefix","getPathPrefix","addAliases","aliases","Object","assign","resolvePath","filename","alias","startsWith","replacement","replace"],"sources":["../../../../src/lib/path-utils/file-aliases.ts"],"sourcesContent":["// Simple file alias mechanisms for tests.\n\nlet pathPrefix = '';\nconst fileAliases: {[aliasPath: string]: string} = {};\n\n/*\n * Set a relative path prefix\n */\nexport function setPathPrefix(prefix: string): void {\n pathPrefix = prefix;\n}\n\n/*\n * Get the relative path prefix\n */\nexport function getPathPrefix(): string {\n return pathPrefix;\n}\n\n/**\n *\n * @param aliases\n *\n * Note: addAliases are an experimental export, they are only for testing of loaders.gl loaders\n * not intended as a generic aliasing mechanism\n */\nexport function addAliases(aliases: {[aliasPath: string]: string}): void {\n Object.assign(fileAliases, aliases);\n}\n\n/**\n * Resolves aliases and adds path-prefix to paths\n */\nexport function resolvePath(filename: string): string {\n for (const alias in fileAliases) {\n if (filename.startsWith(alias)) {\n const replacement = fileAliases[alias];\n filename = filename.replace(alias, replacement);\n }\n }\n if (!filename.startsWith('http://') && !filename.startsWith('https://')) {\n filename = `${pathPrefix}${filename}`;\n }\n return filename;\n}\n"],"mappings":"
|
|
1
|
+
{"version":3,"file":"file-aliases.js","names":["pathPrefix","fileAliases","setPathPrefix","prefix","getPathPrefix","addAliases","aliases","Object","assign","resolvePath","filename","alias","startsWith","replacement","replace","concat"],"sources":["../../../../src/lib/path-utils/file-aliases.ts"],"sourcesContent":["// Simple file alias mechanisms for tests.\n\nlet pathPrefix = '';\nconst fileAliases: {[aliasPath: string]: string} = {};\n\n/*\n * Set a relative path prefix\n */\nexport function setPathPrefix(prefix: string): void {\n pathPrefix = prefix;\n}\n\n/*\n * Get the relative path prefix\n */\nexport function getPathPrefix(): string {\n return pathPrefix;\n}\n\n/**\n *\n * @param aliases\n *\n * Note: addAliases are an experimental export, they are only for testing of loaders.gl loaders\n * not intended as a generic aliasing mechanism\n */\nexport function addAliases(aliases: {[aliasPath: string]: string}): void {\n Object.assign(fileAliases, aliases);\n}\n\n/**\n * Resolves aliases and adds path-prefix to paths\n */\nexport function resolvePath(filename: string): string {\n for (const alias in fileAliases) {\n if (filename.startsWith(alias)) {\n const replacement = fileAliases[alias];\n filename = filename.replace(alias, replacement);\n }\n }\n if (!filename.startsWith('http://') && !filename.startsWith('https://')) {\n filename = `${pathPrefix}${filename}`;\n }\n return filename;\n}\n"],"mappings":"AAEA,IAAIA,UAAU,GAAG,EAAE;AACnB,MAAMC,WAA0C,GAAG,CAAC,CAAC;AAKrD,OAAO,SAASC,aAAaA,CAACC,MAAc,EAAQ;EAClDH,UAAU,GAAGG,MAAM;AACrB;AAKA,OAAO,SAASC,aAAaA,CAAA,EAAW;EACtC,OAAOJ,UAAU;AACnB;AASA,OAAO,SAASK,UAAUA,CAACC,OAAsC,EAAQ;EACvEC,MAAM,CAACC,MAAM,CAACP,WAAW,EAAEK,OAAO,CAAC;AACrC;AAKA,OAAO,SAASG,WAAWA,CAACC,QAAgB,EAAU;EACpD,KAAK,MAAMC,KAAK,IAAIV,WAAW,EAAE;IAC/B,IAAIS,QAAQ,CAACE,UAAU,CAACD,KAAK,CAAC,EAAE;MAC9B,MAAME,WAAW,GAAGZ,WAAW,CAACU,KAAK,CAAC;MACtCD,QAAQ,GAAGA,QAAQ,CAACI,OAAO,CAACH,KAAK,EAAEE,WAAW,CAAC;IACjD;EACF;EACA,IAAI,CAACH,QAAQ,CAACE,UAAU,CAAC,SAAS,CAAC,IAAI,CAACF,QAAQ,CAACE,UAAU,CAAC,UAAU,CAAC,EAAE;IACvEF,QAAQ,MAAAK,MAAA,CAAMf,UAAU,EAAAe,MAAA,CAAGL,QAAQ,CAAE;EACvC;EACA,OAAOA,QAAQ;AACjB"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export function getCWD() {
|
|
2
|
+
var _window$location;
|
|
3
|
+
if (typeof process !== 'undefined' && typeof process.cwd !== 'undefined') {
|
|
4
|
+
return process.cwd();
|
|
5
|
+
}
|
|
6
|
+
const pathname = (_window$location = window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname;
|
|
7
|
+
return (pathname === null || pathname === void 0 ? void 0 : pathname.slice(0, pathname.lastIndexOf('/') + 1)) || '';
|
|
8
|
+
}
|
|
9
|
+
//# sourceMappingURL=get-cwd.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-cwd.js","names":["getCWD","_window$location","process","cwd","pathname","window","location","slice","lastIndexOf"],"sources":["../../../../src/lib/path-utils/get-cwd.ts"],"sourcesContent":["// loaders.gl MIT license\n\nexport function getCWD() {\n if (typeof process !== 'undefined' && typeof process.cwd !== 'undefined') {\n return process.cwd();\n }\n const pathname = window.location?.pathname;\n return pathname?.slice(0, pathname.lastIndexOf('/') + 1) || '';\n}\n"],"mappings":"AAEA,OAAO,SAASA,MAAMA,CAAA,EAAG;EAAA,IAAAC,gBAAA;EACvB,IAAI,OAAOC,OAAO,KAAK,WAAW,IAAI,OAAOA,OAAO,CAACC,GAAG,KAAK,WAAW,EAAE;IACxE,OAAOD,OAAO,CAACC,GAAG,EAAE;EACtB;EACA,MAAMC,QAAQ,IAAAH,gBAAA,GAAGI,MAAM,CAACC,QAAQ,cAAAL,gBAAA,uBAAfA,gBAAA,CAAiBG,QAAQ;EAC1C,OAAO,CAAAA,QAAQ,aAARA,QAAQ,uBAARA,QAAQ,CAAEG,KAAK,CAAC,CAAC,EAAEH,QAAQ,CAACI,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAI,EAAE;AAChE"}
|
|
@@ -1,15 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
import { getCWD } from './get-cwd';
|
|
3
2
|
export function filename(url) {
|
|
4
|
-
const slashIndex = url
|
|
3
|
+
const slashIndex = url ? url.lastIndexOf('/') : -1;
|
|
5
4
|
return slashIndex >= 0 ? url.substr(slashIndex + 1) : '';
|
|
6
5
|
}
|
|
7
|
-
|
|
8
6
|
export function dirname(url) {
|
|
9
|
-
const slashIndex = url
|
|
7
|
+
const slashIndex = url ? url.lastIndexOf('/') : -1;
|
|
10
8
|
return slashIndex >= 0 ? url.substr(0, slashIndex) : '';
|
|
11
9
|
}
|
|
12
|
-
|
|
13
10
|
export function join() {
|
|
14
11
|
for (var _len = arguments.length, parts = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
15
12
|
parts[_key] = arguments[_key];
|
|
@@ -26,4 +23,105 @@ export function join() {
|
|
|
26
23
|
});
|
|
27
24
|
return parts.join(separator);
|
|
28
25
|
}
|
|
26
|
+
export function resolve() {
|
|
27
|
+
const paths = [];
|
|
28
|
+
for (let _i = 0; _i < arguments.length; _i++) {
|
|
29
|
+
paths[_i] = _i < 0 || arguments.length <= _i ? undefined : arguments[_i];
|
|
30
|
+
}
|
|
31
|
+
let resolvedPath = '';
|
|
32
|
+
let resolvedAbsolute = false;
|
|
33
|
+
let cwd;
|
|
34
|
+
for (let i = paths.length - 1; i >= -1 && !resolvedAbsolute; i--) {
|
|
35
|
+
let path;
|
|
36
|
+
if (i >= 0) {
|
|
37
|
+
path = paths[i];
|
|
38
|
+
} else {
|
|
39
|
+
if (cwd === undefined) {
|
|
40
|
+
cwd = getCWD();
|
|
41
|
+
}
|
|
42
|
+
path = cwd;
|
|
43
|
+
}
|
|
44
|
+
if (path.length === 0) {
|
|
45
|
+
continue;
|
|
46
|
+
}
|
|
47
|
+
resolvedPath = "".concat(path, "/").concat(resolvedPath);
|
|
48
|
+
resolvedAbsolute = path.charCodeAt(0) === SLASH;
|
|
49
|
+
}
|
|
50
|
+
resolvedPath = normalizeStringPosix(resolvedPath, !resolvedAbsolute);
|
|
51
|
+
if (resolvedAbsolute) {
|
|
52
|
+
return "/".concat(resolvedPath);
|
|
53
|
+
} else if (resolvedPath.length > 0) {
|
|
54
|
+
return resolvedPath;
|
|
55
|
+
}
|
|
56
|
+
return '.';
|
|
57
|
+
}
|
|
58
|
+
const SLASH = 47;
|
|
59
|
+
const DOT = 46;
|
|
60
|
+
function normalizeStringPosix(path, allowAboveRoot) {
|
|
61
|
+
let res = '';
|
|
62
|
+
let lastSlash = -1;
|
|
63
|
+
let dots = 0;
|
|
64
|
+
let code;
|
|
65
|
+
let isAboveRoot = false;
|
|
66
|
+
for (let i = 0; i <= path.length; ++i) {
|
|
67
|
+
if (i < path.length) {
|
|
68
|
+
code = path.charCodeAt(i);
|
|
69
|
+
} else if (code === SLASH) {
|
|
70
|
+
break;
|
|
71
|
+
} else {
|
|
72
|
+
code = SLASH;
|
|
73
|
+
}
|
|
74
|
+
if (code === SLASH) {
|
|
75
|
+
if (lastSlash === i - 1 || dots === 1) {} else if (lastSlash !== i - 1 && dots === 2) {
|
|
76
|
+
if (res.length < 2 || !isAboveRoot || res.charCodeAt(res.length - 1) !== DOT || res.charCodeAt(res.length - 2) !== DOT) {
|
|
77
|
+
if (res.length > 2) {
|
|
78
|
+
const start = res.length - 1;
|
|
79
|
+
let j = start;
|
|
80
|
+
for (; j >= 0; --j) {
|
|
81
|
+
if (res.charCodeAt(j) === SLASH) {
|
|
82
|
+
break;
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
if (j !== start) {
|
|
86
|
+
res = j === -1 ? '' : res.slice(0, j);
|
|
87
|
+
lastSlash = i;
|
|
88
|
+
dots = 0;
|
|
89
|
+
isAboveRoot = false;
|
|
90
|
+
continue;
|
|
91
|
+
}
|
|
92
|
+
} else if (res.length === 2 || res.length === 1) {
|
|
93
|
+
res = '';
|
|
94
|
+
lastSlash = i;
|
|
95
|
+
dots = 0;
|
|
96
|
+
isAboveRoot = false;
|
|
97
|
+
continue;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
if (allowAboveRoot) {
|
|
101
|
+
if (res.length > 0) {
|
|
102
|
+
res += '/..';
|
|
103
|
+
} else {
|
|
104
|
+
res = '..';
|
|
105
|
+
}
|
|
106
|
+
isAboveRoot = true;
|
|
107
|
+
}
|
|
108
|
+
} else {
|
|
109
|
+
const slice = path.slice(lastSlash + 1, i);
|
|
110
|
+
if (res.length > 0) {
|
|
111
|
+
res += "/".concat(slice);
|
|
112
|
+
} else {
|
|
113
|
+
res = slice;
|
|
114
|
+
}
|
|
115
|
+
isAboveRoot = false;
|
|
116
|
+
}
|
|
117
|
+
lastSlash = i;
|
|
118
|
+
dots = 0;
|
|
119
|
+
} else if (code === DOT && dots !== -1) {
|
|
120
|
+
++dots;
|
|
121
|
+
} else {
|
|
122
|
+
dots = -1;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
return res;
|
|
126
|
+
}
|
|
29
127
|
//# sourceMappingURL=path.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.js","names":["filename","url","slashIndex","lastIndexOf","substr","dirname","join","parts","separator","map","part","index","replace","RegExp","
|
|
1
|
+
{"version":3,"file":"path.js","names":["getCWD","filename","url","slashIndex","lastIndexOf","substr","dirname","join","_len","arguments","length","parts","Array","_key","separator","map","part","index","replace","RegExp","concat","resolve","paths","_i","undefined","resolvedPath","resolvedAbsolute","cwd","i","path","charCodeAt","SLASH","normalizeStringPosix","DOT","allowAboveRoot","res","lastSlash","dots","code","isAboveRoot","start","j","slice"],"sources":["../../../../src/lib/path-utils/path.ts"],"sourcesContent":["// Beginning of a minimal implementation of the Node.js path API, that doesn't pull in big polyfills.\n\nimport {getCWD} from './get-cwd';\n\n/**\n * Replacement for Node.js path.filename\n * @param url\n */\nexport function filename(url: string): string {\n const slashIndex = url ? url.lastIndexOf('/') : -1;\n return slashIndex >= 0 ? url.substr(slashIndex + 1) : '';\n}\n\n/**\n * Replacement for Node.js path.dirname\n * @param url\n */\nexport function dirname(url: string): string {\n const slashIndex = url ? url.lastIndexOf('/') : -1;\n return slashIndex >= 0 ? url.substr(0, slashIndex) : '';\n}\n\n/**\n * Replacement for Node.js path.join\n * @param parts\n */\nexport function join(...parts: string[]): string {\n const separator = '/';\n parts = parts.map((part, index) => {\n if (index) {\n part = part.replace(new RegExp(`^${separator}`), '');\n }\n if (index !== parts.length - 1) {\n part = part.replace(new RegExp(`${separator}$`), '');\n }\n return part;\n });\n return parts.join(separator);\n}\n\n/* eslint-disable no-continue */\n\n/**\n * https://nodejs.org/api/path.html#path_path_resolve_paths\n * @param paths A sequence of paths or path segments.\n * @return resolved path\n * Forked from BTOdell/path-resolve under MIT license\n * @see https://github.com/BTOdell/path-resolve/blob/master/LICENSE\n */\nexport function resolve(...components: string[]): string {\n const paths: string[] = [];\n for (let _i = 0; _i < components.length; _i++) {\n paths[_i] = components[_i];\n }\n let resolvedPath = '';\n let resolvedAbsolute = false;\n let cwd: string | undefined;\n for (let i = paths.length - 1; i >= -1 && !resolvedAbsolute; i--) {\n let path: string | undefined;\n if (i >= 0) {\n path = paths[i];\n } else {\n if (cwd === undefined) {\n cwd = getCWD();\n }\n path = cwd;\n }\n // Skip empty entries\n if (path.length === 0) {\n continue;\n }\n resolvedPath = `${path}/${resolvedPath}`;\n resolvedAbsolute = path.charCodeAt(0) === SLASH;\n }\n // At this point the path should be resolved to a full absolute path, but\n // handle relative paths to be safe (might happen when process.cwd() fails)\n // Normalize the path (removes leading slash)\n resolvedPath = normalizeStringPosix(resolvedPath, !resolvedAbsolute);\n if (resolvedAbsolute) {\n return `/${resolvedPath}`;\n } else if (resolvedPath.length > 0) {\n return resolvedPath;\n }\n return '.';\n}\n\nconst SLASH = 47;\nconst DOT = 46;\n\n/**\n * Resolves . and .. elements in a path with directory names\n * Forked from BTOdell/path-resolve under MIT license\n * @see https://github.com/BTOdell/path-resolve/blob/master/LICENSE\n */\n/* eslint-disable max-depth */\n// eslint-disable-next-line complexity, max-statements\nfunction normalizeStringPosix(path: string, allowAboveRoot: boolean): string {\n let res = '';\n let lastSlash = -1;\n let dots = 0;\n let code: number | undefined;\n let isAboveRoot = false;\n\n for (let i = 0; i <= path.length; ++i) {\n if (i < path.length) {\n code = path.charCodeAt(i);\n } else if (code === SLASH) {\n break;\n } else {\n code = SLASH;\n }\n if (code === SLASH) {\n if (lastSlash === i - 1 || dots === 1) {\n // NOOP\n } else if (lastSlash !== i - 1 && dots === 2) {\n if (\n res.length < 2 ||\n !isAboveRoot ||\n res.charCodeAt(res.length - 1) !== DOT ||\n res.charCodeAt(res.length - 2) !== DOT\n ) {\n if (res.length > 2) {\n const start = res.length - 1;\n let j = start;\n for (; j >= 0; --j) {\n if (res.charCodeAt(j) === SLASH) {\n break;\n }\n }\n if (j !== start) {\n res = j === -1 ? '' : res.slice(0, j);\n lastSlash = i;\n dots = 0;\n isAboveRoot = false;\n continue;\n }\n } else if (res.length === 2 || res.length === 1) {\n res = '';\n lastSlash = i;\n dots = 0;\n isAboveRoot = false;\n continue;\n }\n }\n if (allowAboveRoot) {\n if (res.length > 0) {\n res += '/..';\n } else {\n res = '..';\n }\n isAboveRoot = true;\n }\n } else {\n const slice = path.slice(lastSlash + 1, i);\n if (res.length > 0) {\n res += `/${slice}`;\n } else {\n res = slice;\n }\n isAboveRoot = false;\n }\n lastSlash = i;\n dots = 0;\n } else if (code === DOT && dots !== -1) {\n ++dots;\n } else {\n dots = -1;\n }\n }\n return res;\n}\n"],"mappings":"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"}
|
|
@@ -10,9 +10,7 @@ const DEFAULT_PROPS = {
|
|
|
10
10
|
throttleRequests: true,
|
|
11
11
|
maxRequests: 6
|
|
12
12
|
};
|
|
13
|
-
|
|
14
13
|
export default class RequestScheduler {
|
|
15
|
-
|
|
16
14
|
constructor() {
|
|
17
15
|
let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
18
16
|
_defineProperty(this, "props", void 0);
|
|
@@ -25,7 +23,6 @@ export default class RequestScheduler {
|
|
|
25
23
|
...DEFAULT_PROPS,
|
|
26
24
|
...props
|
|
27
25
|
};
|
|
28
|
-
|
|
29
26
|
this.stats = new Stats({
|
|
30
27
|
id: this.props.id
|
|
31
28
|
});
|
|
@@ -35,7 +32,6 @@ export default class RequestScheduler {
|
|
|
35
32
|
this.stats.get(STAT_QUEUED_REQUESTS_EVER);
|
|
36
33
|
this.stats.get(STAT_ACTIVE_REQUESTS_EVER);
|
|
37
34
|
}
|
|
38
|
-
|
|
39
35
|
scheduleRequest(handle) {
|
|
40
36
|
let getPriority = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : () => 0;
|
|
41
37
|
if (!this.props.throttleRequests) {
|
|
@@ -43,7 +39,6 @@ export default class RequestScheduler {
|
|
|
43
39
|
done: () => {}
|
|
44
40
|
});
|
|
45
41
|
}
|
|
46
|
-
|
|
47
42
|
if (this.requestMap.has(handle)) {
|
|
48
43
|
return this.requestMap.get(handle);
|
|
49
44
|
}
|
|
@@ -61,7 +56,6 @@ export default class RequestScheduler {
|
|
|
61
56
|
this._issueNewRequests();
|
|
62
57
|
return promise;
|
|
63
58
|
}
|
|
64
|
-
|
|
65
59
|
_issueRequest(request) {
|
|
66
60
|
const {
|
|
67
61
|
handle,
|
|
@@ -71,13 +65,11 @@ export default class RequestScheduler {
|
|
|
71
65
|
const done = () => {
|
|
72
66
|
if (!isDone) {
|
|
73
67
|
isDone = true;
|
|
74
|
-
|
|
75
68
|
this.requestMap.delete(handle);
|
|
76
69
|
this.activeRequestCount--;
|
|
77
70
|
this._issueNewRequests();
|
|
78
71
|
}
|
|
79
72
|
};
|
|
80
|
-
|
|
81
73
|
this.activeRequestCount++;
|
|
82
74
|
return resolve ? resolve({
|
|
83
75
|
done
|
|
@@ -85,13 +77,11 @@ export default class RequestScheduler {
|
|
|
85
77
|
done
|
|
86
78
|
});
|
|
87
79
|
}
|
|
88
|
-
|
|
89
80
|
_issueNewRequests() {
|
|
90
81
|
if (!this.deferredUpdate) {
|
|
91
82
|
this.deferredUpdate = setTimeout(() => this._issueNewRequestsAsync(), 0);
|
|
92
83
|
}
|
|
93
84
|
}
|
|
94
|
-
|
|
95
85
|
_issueNewRequestsAsync() {
|
|
96
86
|
this.deferredUpdate = null;
|
|
97
87
|
const freeSlots = Math.max(this.props.maxRequests - this.activeRequestCount, 0);
|
|
@@ -99,16 +89,13 @@ export default class RequestScheduler {
|
|
|
99
89
|
return;
|
|
100
90
|
}
|
|
101
91
|
this._updateAllRequests();
|
|
102
|
-
|
|
103
92
|
for (let i = 0; i < freeSlots; ++i) {
|
|
104
93
|
const request = this.requestQueue.shift();
|
|
105
94
|
if (request) {
|
|
106
95
|
this._issueRequest(request);
|
|
107
96
|
}
|
|
108
97
|
}
|
|
109
|
-
|
|
110
98
|
}
|
|
111
|
-
|
|
112
99
|
_updateAllRequests() {
|
|
113
100
|
const requestQueue = this.requestQueue;
|
|
114
101
|
for (let i = 0; i < requestQueue.length; ++i) {
|
|
@@ -119,13 +106,10 @@ export default class RequestScheduler {
|
|
|
119
106
|
i--;
|
|
120
107
|
}
|
|
121
108
|
}
|
|
122
|
-
|
|
123
109
|
requestQueue.sort((a, b) => a.priority - b.priority);
|
|
124
110
|
}
|
|
125
|
-
|
|
126
111
|
_updateRequest(request) {
|
|
127
112
|
request.priority = request.getPriority(request.handle);
|
|
128
|
-
|
|
129
113
|
if (request.priority < 0) {
|
|
130
114
|
request.resolve(null);
|
|
131
115
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-scheduler.js","names":["Stats","STAT_QUEUED_REQUESTS","STAT_ACTIVE_REQUESTS","STAT_CANCELLED_REQUESTS","STAT_QUEUED_REQUESTS_EVER","STAT_ACTIVE_REQUESTS_EVER","DEFAULT_PROPS","id","throttleRequests","maxRequests","RequestScheduler","constructor","props","Map","stats","get","scheduleRequest","handle","getPriority","Promise","resolve","done","requestMap","has","request","priority","promise","requestQueue","push","set","_issueNewRequests","_issueRequest","isDone","delete","activeRequestCount","deferredUpdate","setTimeout","_issueNewRequestsAsync","freeSlots","Math","max","_updateAllRequests","i","shift","length","_updateRequest","splice","sort","a","b"],"sources":["../../../../src/lib/request-utils/request-scheduler.ts"],"sourcesContent":["import {Stats} from '@probe.gl/stats';\n\ntype Handle = any;\ntype DoneFunction = () => any;\ntype GetPriorityFunction = () => number;\ntype RequestResult = {\n done: DoneFunction;\n} | null;\n\n/** RequestScheduler Options */\nexport type RequestSchedulerProps = {\n id?: string;\n throttleRequests?: boolean;\n maxRequests?: number;\n};\n\nconst STAT_QUEUED_REQUESTS = 'Queued Requests';\nconst STAT_ACTIVE_REQUESTS = 'Active Requests';\nconst STAT_CANCELLED_REQUESTS = 'Cancelled Requests';\nconst STAT_QUEUED_REQUESTS_EVER = 'Queued Requests Ever';\nconst STAT_ACTIVE_REQUESTS_EVER = 'Active Requests Ever';\n\nconst DEFAULT_PROPS: Required<RequestSchedulerProps> = {\n id: 'request-scheduler',\n // Specifies if the request scheduler should throttle incoming requests, mainly for comparative testing\n throttleRequests: true,\n // The maximum number of simultaneous active requests. Un-throttled requests do not observe this limit.\n maxRequests: 6\n};\n\n/** Tracks one request */\ntype Request = {\n handle: Handle;\n priority: number;\n getPriority: GetPriorityFunction;\n resolve?: (value: any) => any;\n};\n\n/**\n * Used to issue a request, without having them \"deeply queued\" by the browser.\n * @todo - Track requests globally, across multiple servers\n */\nexport default class RequestScheduler {\n readonly props: Required<RequestSchedulerProps>;\n readonly stats: Stats;\n activeRequestCount: number = 0;\n\n /** Tracks the number of active requests and prioritizes/cancels queued requests. */\n private requestQueue: Request[] = [];\n private requestMap: Map<Handle, Promise<RequestResult>> = new Map();\n private deferredUpdate: any = null;\n\n constructor(props: RequestSchedulerProps = {}) {\n this.props = {...DEFAULT_PROPS, ...props};\n\n // Returns the statistics used by the request scheduler.\n this.stats = new Stats({id: this.props.id});\n this.stats.get(STAT_QUEUED_REQUESTS);\n this.stats.get(STAT_ACTIVE_REQUESTS);\n this.stats.get(STAT_CANCELLED_REQUESTS);\n this.stats.get(STAT_QUEUED_REQUESTS_EVER);\n this.stats.get(STAT_ACTIVE_REQUESTS_EVER);\n }\n\n /**\n * Called by an application that wants to issue a request, without having it deeply queued by the browser\n *\n * When the returned promise resolved, it is OK for the application to issue a request.\n * The promise resolves to an object that contains a `done` method.\n * When the application's request has completed (or failed), the application must call the `done` function\n *\n * @param handle\n * @param getPriority will be called when request \"slots\" open up,\n * allowing the caller to update priority or cancel the request\n * Highest priority executes first, priority < 0 cancels the request\n * @returns a promise\n * - resolves to a object (with a `done` field) when the request can be issued without queueing,\n * - resolves to `null` if the request has been cancelled (by the callback return < 0).\n * In this case the application should not issue the request\n */\n scheduleRequest(\n handle: Handle,\n getPriority: GetPriorityFunction = () => 0\n ): Promise<RequestResult> {\n // Allows throttling to be disabled\n if (!this.props.throttleRequests) {\n return Promise.resolve({done: () => {}});\n }\n\n // dedupe\n if (this.requestMap.has(handle)) {\n return this.requestMap.get(handle) as Promise<any>;\n }\n\n const request: Request = {handle, priority: 0, getPriority};\n const promise = new Promise<RequestResult>((resolve) => {\n // @ts-ignore\n request.resolve = resolve;\n return request;\n });\n\n this.requestQueue.push(request);\n this.requestMap.set(handle, promise);\n this._issueNewRequests();\n return promise;\n }\n\n // PRIVATE\n\n _issueRequest(request: Request): Promise<any> {\n const {handle, resolve} = request;\n let isDone = false;\n\n const done = () => {\n // can only be called once\n if (!isDone) {\n isDone = true;\n\n // Stop tracking a request - it has completed, failed, cancelled etc\n this.requestMap.delete(handle);\n this.activeRequestCount--;\n // A slot just freed up, see if any queued requests are waiting\n this._issueNewRequests();\n }\n };\n\n // Track this request\n this.activeRequestCount++;\n\n return resolve ? resolve({done}) : Promise.resolve({done});\n }\n\n /** We check requests asynchronously, to prevent multiple updates */\n _issueNewRequests(): void {\n if (!this.deferredUpdate) {\n this.deferredUpdate = setTimeout(() => this._issueNewRequestsAsync(), 0);\n }\n }\n\n /** Refresh all requests */\n _issueNewRequestsAsync() {\n // TODO - shouldn't we clear the timeout?\n this.deferredUpdate = null;\n\n const freeSlots = Math.max(this.props.maxRequests - this.activeRequestCount, 0);\n\n if (freeSlots === 0) {\n return;\n }\n\n this._updateAllRequests();\n\n // Resolve pending promises for the top-priority requests\n for (let i = 0; i < freeSlots; ++i) {\n const request = this.requestQueue.shift();\n if (request) {\n this._issueRequest(request); // eslint-disable-line @typescript-eslint/no-floating-promises\n }\n }\n\n // Uncomment to debug\n // console.log(`${freeSlots} free slots, ${this.requestQueue.length} queued requests`);\n }\n\n /** Ensure all requests have updated priorities, and that no longer valid requests are cancelled */\n _updateAllRequests() {\n const requestQueue = this.requestQueue;\n for (let i = 0; i < requestQueue.length; ++i) {\n const request = requestQueue[i];\n if (!this._updateRequest(request)) {\n // Remove the element and make sure to adjust the counter to account for shortened array\n requestQueue.splice(i, 1);\n this.requestMap.delete(request.handle);\n i--;\n }\n }\n\n // Sort the remaining requests based on priority\n requestQueue.sort((a, b) => a.priority - b.priority);\n }\n\n /** Update a single request by calling the callback */\n _updateRequest(request) {\n request.priority = request.getPriority(request.handle); // eslint-disable-line callback-return\n\n // by returning a negative priority, the callback cancels the request\n if (request.priority < 0) {\n request.resolve(null);\n return false;\n }\n return true;\n }\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"request-scheduler.js","names":["Stats","STAT_QUEUED_REQUESTS","STAT_ACTIVE_REQUESTS","STAT_CANCELLED_REQUESTS","STAT_QUEUED_REQUESTS_EVER","STAT_ACTIVE_REQUESTS_EVER","DEFAULT_PROPS","id","throttleRequests","maxRequests","RequestScheduler","constructor","props","arguments","length","undefined","_defineProperty","Map","stats","get","scheduleRequest","handle","getPriority","Promise","resolve","done","requestMap","has","request","priority","promise","requestQueue","push","set","_issueNewRequests","_issueRequest","isDone","delete","activeRequestCount","deferredUpdate","setTimeout","_issueNewRequestsAsync","freeSlots","Math","max","_updateAllRequests","i","shift","_updateRequest","splice","sort","a","b"],"sources":["../../../../src/lib/request-utils/request-scheduler.ts"],"sourcesContent":["import {Stats} from '@probe.gl/stats';\n\ntype Handle = any;\ntype DoneFunction = () => any;\ntype GetPriorityFunction = () => number;\ntype RequestResult = {\n done: DoneFunction;\n} | null;\n\n/** RequestScheduler Options */\nexport type RequestSchedulerProps = {\n id?: string;\n throttleRequests?: boolean;\n maxRequests?: number;\n};\n\nconst STAT_QUEUED_REQUESTS = 'Queued Requests';\nconst STAT_ACTIVE_REQUESTS = 'Active Requests';\nconst STAT_CANCELLED_REQUESTS = 'Cancelled Requests';\nconst STAT_QUEUED_REQUESTS_EVER = 'Queued Requests Ever';\nconst STAT_ACTIVE_REQUESTS_EVER = 'Active Requests Ever';\n\nconst DEFAULT_PROPS: Required<RequestSchedulerProps> = {\n id: 'request-scheduler',\n // Specifies if the request scheduler should throttle incoming requests, mainly for comparative testing\n throttleRequests: true,\n // The maximum number of simultaneous active requests. Un-throttled requests do not observe this limit.\n maxRequests: 6\n};\n\n/** Tracks one request */\ntype Request = {\n handle: Handle;\n priority: number;\n getPriority: GetPriorityFunction;\n resolve?: (value: any) => any;\n};\n\n/**\n * Used to issue a request, without having them \"deeply queued\" by the browser.\n * @todo - Track requests globally, across multiple servers\n */\nexport default class RequestScheduler {\n readonly props: Required<RequestSchedulerProps>;\n readonly stats: Stats;\n activeRequestCount: number = 0;\n\n /** Tracks the number of active requests and prioritizes/cancels queued requests. */\n private requestQueue: Request[] = [];\n private requestMap: Map<Handle, Promise<RequestResult>> = new Map();\n private deferredUpdate: any = null;\n\n constructor(props: RequestSchedulerProps = {}) {\n this.props = {...DEFAULT_PROPS, ...props};\n\n // Returns the statistics used by the request scheduler.\n this.stats = new Stats({id: this.props.id});\n this.stats.get(STAT_QUEUED_REQUESTS);\n this.stats.get(STAT_ACTIVE_REQUESTS);\n this.stats.get(STAT_CANCELLED_REQUESTS);\n this.stats.get(STAT_QUEUED_REQUESTS_EVER);\n this.stats.get(STAT_ACTIVE_REQUESTS_EVER);\n }\n\n /**\n * Called by an application that wants to issue a request, without having it deeply queued by the browser\n *\n * When the returned promise resolved, it is OK for the application to issue a request.\n * The promise resolves to an object that contains a `done` method.\n * When the application's request has completed (or failed), the application must call the `done` function\n *\n * @param handle\n * @param getPriority will be called when request \"slots\" open up,\n * allowing the caller to update priority or cancel the request\n * Highest priority executes first, priority < 0 cancels the request\n * @returns a promise\n * - resolves to a object (with a `done` field) when the request can be issued without queueing,\n * - resolves to `null` if the request has been cancelled (by the callback return < 0).\n * In this case the application should not issue the request\n */\n scheduleRequest(\n handle: Handle,\n getPriority: GetPriorityFunction = () => 0\n ): Promise<RequestResult> {\n // Allows throttling to be disabled\n if (!this.props.throttleRequests) {\n return Promise.resolve({done: () => {}});\n }\n\n // dedupe\n if (this.requestMap.has(handle)) {\n return this.requestMap.get(handle) as Promise<any>;\n }\n\n const request: Request = {handle, priority: 0, getPriority};\n const promise = new Promise<RequestResult>((resolve) => {\n // @ts-ignore\n request.resolve = resolve;\n return request;\n });\n\n this.requestQueue.push(request);\n this.requestMap.set(handle, promise);\n this._issueNewRequests();\n return promise;\n }\n\n // PRIVATE\n\n _issueRequest(request: Request): Promise<any> {\n const {handle, resolve} = request;\n let isDone = false;\n\n const done = () => {\n // can only be called once\n if (!isDone) {\n isDone = true;\n\n // Stop tracking a request - it has completed, failed, cancelled etc\n this.requestMap.delete(handle);\n this.activeRequestCount--;\n // A slot just freed up, see if any queued requests are waiting\n this._issueNewRequests();\n }\n };\n\n // Track this request\n this.activeRequestCount++;\n\n return resolve ? resolve({done}) : Promise.resolve({done});\n }\n\n /** We check requests asynchronously, to prevent multiple updates */\n _issueNewRequests(): void {\n if (!this.deferredUpdate) {\n this.deferredUpdate = setTimeout(() => this._issueNewRequestsAsync(), 0);\n }\n }\n\n /** Refresh all requests */\n _issueNewRequestsAsync() {\n // TODO - shouldn't we clear the timeout?\n this.deferredUpdate = null;\n\n const freeSlots = Math.max(this.props.maxRequests - this.activeRequestCount, 0);\n\n if (freeSlots === 0) {\n return;\n }\n\n this._updateAllRequests();\n\n // Resolve pending promises for the top-priority requests\n for (let i = 0; i < freeSlots; ++i) {\n const request = this.requestQueue.shift();\n if (request) {\n this._issueRequest(request); // eslint-disable-line @typescript-eslint/no-floating-promises\n }\n }\n\n // Uncomment to debug\n // console.log(`${freeSlots} free slots, ${this.requestQueue.length} queued requests`);\n }\n\n /** Ensure all requests have updated priorities, and that no longer valid requests are cancelled */\n _updateAllRequests() {\n const requestQueue = this.requestQueue;\n for (let i = 0; i < requestQueue.length; ++i) {\n const request = requestQueue[i];\n if (!this._updateRequest(request)) {\n // Remove the element and make sure to adjust the counter to account for shortened array\n requestQueue.splice(i, 1);\n this.requestMap.delete(request.handle);\n i--;\n }\n }\n\n // Sort the remaining requests based on priority\n requestQueue.sort((a, b) => a.priority - b.priority);\n }\n\n /** Update a single request by calling the callback */\n _updateRequest(request) {\n request.priority = request.getPriority(request.handle); // eslint-disable-line callback-return\n\n // by returning a negative priority, the callback cancels the request\n if (request.priority < 0) {\n request.resolve(null);\n return false;\n }\n return true;\n }\n}\n"],"mappings":"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"}
|
|
@@ -1,9 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
1
|
import { WorkerBody } from '@loaders.gl/worker-utils';
|
|
4
|
-
|
|
5
2
|
let requestId = 0;
|
|
6
|
-
|
|
7
3
|
export function createLoaderWorker(loader) {
|
|
8
4
|
if (!WorkerBody.inWorkerThread()) {
|
|
9
5
|
return;
|
|
@@ -12,7 +8,6 @@ export function createLoaderWorker(loader) {
|
|
|
12
8
|
switch (type) {
|
|
13
9
|
case 'process':
|
|
14
10
|
try {
|
|
15
|
-
|
|
16
11
|
const {
|
|
17
12
|
input,
|
|
18
13
|
options = {},
|
|
@@ -44,7 +39,6 @@ export function createLoaderWorker(loader) {
|
|
|
44
39
|
function parseOnMainThread(arrayBuffer, options) {
|
|
45
40
|
return new Promise((resolve, reject) => {
|
|
46
41
|
const id = requestId++;
|
|
47
|
-
|
|
48
42
|
const onMessage = (type, payload) => {
|
|
49
43
|
if (payload.id !== id) {
|
|
50
44
|
return;
|
|
@@ -61,9 +55,7 @@ function parseOnMainThread(arrayBuffer, options) {
|
|
|
61
55
|
default:
|
|
62
56
|
}
|
|
63
57
|
};
|
|
64
|
-
|
|
65
58
|
WorkerBody.addEventListener(onMessage);
|
|
66
|
-
|
|
67
59
|
const payload = {
|
|
68
60
|
id,
|
|
69
61
|
input: arrayBuffer,
|
|
@@ -72,7 +64,6 @@ function parseOnMainThread(arrayBuffer, options) {
|
|
|
72
64
|
WorkerBody.postMessage('process', payload);
|
|
73
65
|
});
|
|
74
66
|
}
|
|
75
|
-
|
|
76
67
|
async function parseData(_ref) {
|
|
77
68
|
let {
|
|
78
69
|
loader,
|
|
@@ -92,7 +83,6 @@ async function parseData(_ref) {
|
|
|
92
83
|
} else {
|
|
93
84
|
throw new Error("Could not load data with ".concat(loader.name, " loader"));
|
|
94
85
|
}
|
|
95
|
-
|
|
96
86
|
options = {
|
|
97
87
|
...options,
|
|
98
88
|
modules: loader && loader.options && loader.options.modules || {},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-loader-worker.js","names":["WorkerBody","requestId","createLoaderWorker","loader","inWorkerThread","onmessage","type","payload","input","options","context","result","parseData","arrayBuffer","parse","parseOnMainThread","postMessage","error","message","Error","Promise","resolve","reject","id","onMessage","removeEventListener","addEventListener","data","parser","parseSync","parseTextSync","textDecoder","TextDecoder","decode","name","modules","worker"],"sources":["../../../../src/lib/worker-loader-utils/create-loader-worker.ts"],"sourcesContent":["/* eslint-disable no-restricted-globals */\nimport type {LoaderWithParser} from '../../types';\nimport {WorkerBody} from '@loaders.gl/worker-utils';\n// import {validateLoaderVersion} from './validate-loader-version';\n\nlet requestId = 0;\n\n/**\n * Set up a WebWorkerGlobalScope to talk with the main thread\n * @param loader\n */\nexport function createLoaderWorker(loader: LoaderWithParser) {\n // Check that we are actually in a worker thread\n if (!WorkerBody.inWorkerThread()) {\n return;\n }\n\n WorkerBody.onmessage = async (type, payload) => {\n switch (type) {\n case 'process':\n try {\n // validateLoaderVersion(loader, data.source.split('@')[1]);\n\n const {input, options = {}, context = {}} = payload;\n\n const result = await parseData({\n loader,\n arrayBuffer: input,\n options,\n context: {\n ...context,\n parse: parseOnMainThread\n }\n });\n WorkerBody.postMessage('done', {result});\n } catch (error) {\n const message = error instanceof Error ? error.message : '';\n WorkerBody.postMessage('error', {error: message});\n }\n break;\n default:\n }\n };\n}\n\nfunction parseOnMainThread(arrayBuffer: ArrayBuffer, options: {[key: string]: any}): Promise<void> {\n return new Promise((resolve, reject) => {\n const id = requestId++;\n\n /**\n */\n const onMessage = (type, payload) => {\n if (payload.id !== id) {\n // not ours\n return;\n }\n\n switch (type) {\n case 'done':\n WorkerBody.removeEventListener(onMessage);\n resolve(payload.result);\n break;\n\n case 'error':\n WorkerBody.removeEventListener(onMessage);\n reject(payload.error);\n break;\n\n default:\n // ignore\n }\n };\n\n WorkerBody.addEventListener(onMessage);\n\n // Ask the main thread to decode data\n const payload = {id, input: arrayBuffer, options};\n WorkerBody.postMessage('process', payload);\n });\n}\n\n// TODO - Support byteOffset and byteLength (enabling parsing of embedded binaries without copies)\n// TODO - Why not support async loader.parse* funcs here?\n// TODO - Why not reuse a common function instead of reimplementing loader.parse* selection logic? Keeping loader small?\n// TODO - Lack of appropriate parser functions can be detected when we create worker, no need to wait until parse\nasync function parseData({loader, arrayBuffer, options, context}) {\n let data;\n let parser;\n if (loader.parseSync || loader.parse) {\n data = arrayBuffer;\n parser = loader.parseSync || loader.parse;\n } else if (loader.parseTextSync) {\n const textDecoder = new TextDecoder();\n data = textDecoder.decode(arrayBuffer);\n parser = loader.parseTextSync;\n } else {\n throw new Error(`Could not load data with ${loader.name} loader`);\n }\n\n // TODO - proper merge in of loader options...\n options = {\n ...options,\n modules: (loader && loader.options && loader.options.modules) || {},\n worker: false\n };\n\n return await parser(data, {...options}, context, loader);\n}\n"],"mappings":"
|
|
1
|
+
{"version":3,"file":"create-loader-worker.js","names":["WorkerBody","requestId","createLoaderWorker","loader","inWorkerThread","onmessage","type","payload","input","options","context","result","parseData","arrayBuffer","parse","parseOnMainThread","postMessage","error","message","Error","Promise","resolve","reject","id","onMessage","removeEventListener","addEventListener","_ref","data","parser","parseSync","parseTextSync","textDecoder","TextDecoder","decode","concat","name","modules","worker"],"sources":["../../../../src/lib/worker-loader-utils/create-loader-worker.ts"],"sourcesContent":["/* eslint-disable no-restricted-globals */\nimport type {LoaderWithParser} from '../../types';\nimport {WorkerBody} from '@loaders.gl/worker-utils';\n// import {validateLoaderVersion} from './validate-loader-version';\n\nlet requestId = 0;\n\n/**\n * Set up a WebWorkerGlobalScope to talk with the main thread\n * @param loader\n */\nexport function createLoaderWorker(loader: LoaderWithParser) {\n // Check that we are actually in a worker thread\n if (!WorkerBody.inWorkerThread()) {\n return;\n }\n\n WorkerBody.onmessage = async (type, payload) => {\n switch (type) {\n case 'process':\n try {\n // validateLoaderVersion(loader, data.source.split('@')[1]);\n\n const {input, options = {}, context = {}} = payload;\n\n const result = await parseData({\n loader,\n arrayBuffer: input,\n options,\n context: {\n ...context,\n parse: parseOnMainThread\n }\n });\n WorkerBody.postMessage('done', {result});\n } catch (error) {\n const message = error instanceof Error ? error.message : '';\n WorkerBody.postMessage('error', {error: message});\n }\n break;\n default:\n }\n };\n}\n\nfunction parseOnMainThread(arrayBuffer: ArrayBuffer, options: {[key: string]: any}): Promise<void> {\n return new Promise((resolve, reject) => {\n const id = requestId++;\n\n /**\n */\n const onMessage = (type, payload) => {\n if (payload.id !== id) {\n // not ours\n return;\n }\n\n switch (type) {\n case 'done':\n WorkerBody.removeEventListener(onMessage);\n resolve(payload.result);\n break;\n\n case 'error':\n WorkerBody.removeEventListener(onMessage);\n reject(payload.error);\n break;\n\n default:\n // ignore\n }\n };\n\n WorkerBody.addEventListener(onMessage);\n\n // Ask the main thread to decode data\n const payload = {id, input: arrayBuffer, options};\n WorkerBody.postMessage('process', payload);\n });\n}\n\n// TODO - Support byteOffset and byteLength (enabling parsing of embedded binaries without copies)\n// TODO - Why not support async loader.parse* funcs here?\n// TODO - Why not reuse a common function instead of reimplementing loader.parse* selection logic? Keeping loader small?\n// TODO - Lack of appropriate parser functions can be detected when we create worker, no need to wait until parse\nasync function parseData({loader, arrayBuffer, options, context}) {\n let data;\n let parser;\n if (loader.parseSync || loader.parse) {\n data = arrayBuffer;\n parser = loader.parseSync || loader.parse;\n } else if (loader.parseTextSync) {\n const textDecoder = new TextDecoder();\n data = textDecoder.decode(arrayBuffer);\n parser = loader.parseTextSync;\n } else {\n throw new Error(`Could not load data with ${loader.name} loader`);\n }\n\n // TODO - proper merge in of loader options...\n options = {\n ...options,\n modules: (loader && loader.options && loader.options.modules) || {},\n worker: false\n };\n\n return await parser(data, {...options}, context, loader);\n}\n"],"mappings":"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"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import { WorkerFarm } from '@loaders.gl/worker-utils';
|
|
2
2
|
import { isBrowser } from '../env-utils/globals';
|
|
3
|
-
|
|
4
3
|
export function canEncodeWithWorker(writer, options) {
|
|
5
4
|
if (!WorkerFarm.isSupported()) {
|
|
6
5
|
return false;
|
|
7
6
|
}
|
|
8
|
-
|
|
9
7
|
if (!isBrowser && !(options !== null && options !== void 0 && options._nodeWorkers)) {
|
|
10
8
|
return false;
|
|
11
9
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"encode-with-worker.js","names":["WorkerFarm","isBrowser","canEncodeWithWorker","writer","options","isSupported","_nodeWorkers","worker"],"sources":["../../../../src/lib/worker-loader-utils/encode-with-worker.ts"],"sourcesContent":["import {WorkerFarm} from '@loaders.gl/worker-utils';\nimport {Writer, WriterOptions} from '../../types';\nimport {isBrowser} from '../env-utils/globals';\n\n/**\n * Determines if a loader can parse with worker\n * @param loader\n * @param options\n */\nexport function canEncodeWithWorker(writer: Writer, options?: WriterOptions) {\n if (!WorkerFarm.isSupported()) {\n return false;\n }\n\n // Node workers are still experimental\n if (!isBrowser && !options?._nodeWorkers) {\n return false;\n }\n\n return writer.worker && options?.worker;\n}\n"],"mappings":"AAAA,SAAQA,UAAU,QAAO,0BAA0B;AAEnD,SAAQC,SAAS,QAAO,sBAAsB
|
|
1
|
+
{"version":3,"file":"encode-with-worker.js","names":["WorkerFarm","isBrowser","canEncodeWithWorker","writer","options","isSupported","_nodeWorkers","worker"],"sources":["../../../../src/lib/worker-loader-utils/encode-with-worker.ts"],"sourcesContent":["import {WorkerFarm} from '@loaders.gl/worker-utils';\nimport {Writer, WriterOptions} from '../../types';\nimport {isBrowser} from '../env-utils/globals';\n\n/**\n * Determines if a loader can parse with worker\n * @param loader\n * @param options\n */\nexport function canEncodeWithWorker(writer: Writer, options?: WriterOptions) {\n if (!WorkerFarm.isSupported()) {\n return false;\n }\n\n // Node workers are still experimental\n if (!isBrowser && !options?._nodeWorkers) {\n return false;\n }\n\n return writer.worker && options?.worker;\n}\n"],"mappings":"AAAA,SAAQA,UAAU,QAAO,0BAA0B;AAEnD,SAAQC,SAAS,QAAO,sBAAsB;AAO9C,OAAO,SAASC,mBAAmBA,CAACC,MAAc,EAAEC,OAAuB,EAAE;EAC3E,IAAI,CAACJ,UAAU,CAACK,WAAW,EAAE,EAAE;IAC7B,OAAO,KAAK;EACd;EAGA,IAAI,CAACJ,SAAS,IAAI,EAACG,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEE,YAAY,GAAE;IACxC,OAAO,KAAK;EACd;EAEA,OAAOH,MAAM,CAACI,MAAM,KAAIH,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEG,MAAM;AACzC"}
|