@loaders.gl/worker-utils 4.0.0-alpha.8 → 4.0.0-beta.1

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.
Files changed (60) hide show
  1. package/dist/es5/lib/env-utils/version.js +17 -6
  2. package/dist/es5/lib/env-utils/version.js.map +1 -1
  3. package/dist/es5/lib/library-utils/library-utils.js +106 -43
  4. package/dist/es5/lib/library-utils/library-utils.js.map +1 -1
  5. package/dist/es5/lib/node/require-utils.node.js +78 -11
  6. package/dist/es5/lib/node/require-utils.node.js.map +1 -1
  7. package/dist/es5/lib/process-utils/child-process-proxy.js +4 -2
  8. package/dist/es5/lib/process-utils/child-process-proxy.js.map +1 -1
  9. package/dist/es5/lib/worker-api/get-worker-url.js +2 -4
  10. package/dist/es5/lib/worker-api/get-worker-url.js.map +1 -1
  11. package/dist/esm/lib/env-utils/version.js +14 -4
  12. package/dist/esm/lib/env-utils/version.js.map +1 -1
  13. package/dist/esm/lib/library-utils/library-utils.js +30 -16
  14. package/dist/esm/lib/library-utils/library-utils.js.map +1 -1
  15. package/dist/esm/lib/node/require-utils.node.js +17 -0
  16. package/dist/esm/lib/node/require-utils.node.js.map +1 -1
  17. package/dist/esm/lib/process-utils/child-process-proxy.js +4 -2
  18. package/dist/esm/lib/process-utils/child-process-proxy.js.map +1 -1
  19. package/dist/esm/lib/worker-api/get-worker-url.js +1 -3
  20. package/dist/esm/lib/worker-api/get-worker-url.js.map +1 -1
  21. package/dist/lib/env-utils/version.d.ts +6 -1
  22. package/dist/lib/env-utils/version.d.ts.map +1 -1
  23. package/dist/lib/library-utils/library-utils.d.ts +2 -2
  24. package/dist/lib/library-utils/library-utils.d.ts.map +1 -1
  25. package/dist/lib/node/require-utils.node.d.ts +12 -0
  26. package/dist/lib/node/require-utils.node.d.ts.map +1 -1
  27. package/dist/lib/process-utils/child-process-proxy.d.ts +2 -0
  28. package/dist/lib/process-utils/child-process-proxy.d.ts.map +1 -1
  29. package/dist/lib/worker-api/get-worker-url.d.ts.map +1 -1
  30. package/package.json +4 -5
  31. package/src/lib/env-utils/version.ts +25 -9
  32. package/src/lib/library-utils/library-utils.ts +42 -23
  33. package/src/lib/node/require-utils.node.ts +29 -0
  34. package/src/lib/process-utils/child-process-proxy.ts +6 -3
  35. package/src/lib/worker-api/get-worker-url.ts +1 -4
  36. package/dist/index.js +0 -59
  37. package/dist/lib/async-queue/async-queue.js +0 -87
  38. package/dist/lib/env-utils/assert.js +0 -13
  39. package/dist/lib/env-utils/globals.js +0 -32
  40. package/dist/lib/env-utils/version.js +0 -12
  41. package/dist/lib/library-utils/library-utils.js +0 -170
  42. package/dist/lib/node/require-utils.node.js +0 -60
  43. package/dist/lib/node/worker_threads-browser.js +0 -15
  44. package/dist/lib/node/worker_threads.js +0 -33
  45. package/dist/lib/process-utils/child-process-proxy.js +0 -135
  46. package/dist/lib/process-utils/process-utils.js +0 -35
  47. package/dist/lib/worker-api/create-worker.js +0 -91
  48. package/dist/lib/worker-api/get-worker-url.js +0 -59
  49. package/dist/lib/worker-api/process-on-worker.js +0 -83
  50. package/dist/lib/worker-api/validate-worker-version.js +0 -35
  51. package/dist/lib/worker-farm/worker-body.js +0 -111
  52. package/dist/lib/worker-farm/worker-farm.js +0 -89
  53. package/dist/lib/worker-farm/worker-job.js +0 -47
  54. package/dist/lib/worker-farm/worker-pool.js +0 -164
  55. package/dist/lib/worker-farm/worker-thread.js +0 -131
  56. package/dist/lib/worker-utils/get-loadable-worker-url.js +0 -72
  57. package/dist/lib/worker-utils/get-transfer-list.js +0 -87
  58. package/dist/lib/worker-utils/remove-nontransferable-options.js +0 -27
  59. package/dist/types.js +0 -2
  60. package/dist/workers/null-worker.js +0 -7
@@ -1 +1 @@
1
- {"version":3,"file":"get-worker-url.js","names":["_assert","require","_globals","_version","NPM_TAG","VERSION","getWorkerName","worker","warning","version","concat","name","getWorkerURL","options","arguments","length","undefined","workerOptions","id","workerFile","isBrowser","url","workerUrl","_workerType","module","versionTag","assert"],"sources":["../../../../src/lib/worker-api/get-worker-url.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport type {WorkerObject, WorkerOptions} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {isBrowser} from '../env-utils/globals';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\nconst NPM_TAG = 'beta'; // 'beta', or 'latest' on release-branch\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : NPM_TAG;\n\n/**\n * Gets worker object's name (for debugging in Chrome thread inspector window)\n */\nexport function getWorkerName(worker: WorkerObject): string {\n const warning = worker.version !== VERSION ? ` (worker-utils@${VERSION})` : '';\n return `${worker.name}@${worker.version}${warning}`;\n}\n\n/**\n * Generate a worker URL based on worker object and options\n * @returns A URL to one of the following:\n * - a published worker on unpkg CDN\n * - a local test worker\n * - a URL provided by the user in options\n */\nexport function getWorkerURL(worker: WorkerObject, options: WorkerOptions = {}): string {\n const workerOptions = options[worker.id] || {};\n\n const workerFile = isBrowser ? `${worker.id}-worker.js` : `${worker.id}-worker-node.js`;\n\n let url = workerOptions.workerUrl;\n\n // HACK: Allow for non-nested workerUrl for the CompressionWorker.\n // For the compression worker, workerOptions is currently not nested correctly. For most loaders,\n // you'd have options within an object, i.e. `{mvt: {coordinates: ...}}` but the CompressionWorker\n // puts options at the top level, not within a `compression` key (its `id`). For this reason, the\n // above `workerOptions` will always be a string (i.e. `'gzip'`) for the CompressionWorker. To not\n // break backwards compatibility, we allow the CompressionWorker to have options at the top level.\n if (!url && worker.id === 'compression') {\n url = options.workerUrl;\n }\n\n // If URL is test, generate local loaders.gl url\n // @ts-ignore _workerType\n if (options._workerType === 'test') {\n url = `modules/${worker.module}/dist/${workerFile}`;\n }\n\n // If url override is not provided, generate a URL to published version on npm CDN unpkg.com\n if (!url) {\n // GENERATE\n let version = worker.version;\n // On master we need to load npm alpha releases published with the `beta` tag\n if (version === 'latest') {\n // throw new Error('latest worker version specified');\n version = NPM_TAG;\n }\n const versionTag = version ? `@${version}` : '';\n url = `https://unpkg.com/@loaders.gl/${worker.module}${versionTag}/dist/${workerFile}`;\n }\n\n assert(url);\n\n // Allow user to override location\n return url;\n}\n"],"mappings":";;;;;;;AAGA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,QAAA,GAAAF,OAAA;AAEA,IAAMG,OAAO,GAAG,MAAM;AACtB,IAAMC,OAAO,GAAG,sBAAkB,KAAK,WAAW,qBAAiBD,OAAO;AAKnE,SAASE,aAAaA,CAACC,MAAoB,EAAU;EAC1D,IAAMC,OAAO,GAAGD,MAAM,CAACE,OAAO,KAAKJ,OAAO,qBAAAK,MAAA,CAAqBL,OAAO,SAAM,EAAE;EAC9E,UAAAK,MAAA,CAAUH,MAAM,CAACI,IAAI,OAAAD,MAAA,CAAIH,MAAM,CAACE,OAAO,EAAAC,MAAA,CAAGF,OAAO;AACnD;AASO,SAASI,YAAYA,CAACL,MAAoB,EAAuC;EAAA,IAArCM,OAAsB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EAC5E,IAAMG,aAAa,GAAGJ,OAAO,CAACN,MAAM,CAACW,EAAE,CAAC,IAAI,CAAC,CAAC;EAE9C,IAAMC,UAAU,GAAGC,kBAAS,MAAAV,MAAA,CAAMH,MAAM,CAACW,EAAE,qBAAAR,MAAA,CAAkBH,MAAM,CAACW,EAAE,oBAAiB;EAEvF,IAAIG,GAAG,GAAGJ,aAAa,CAACK,SAAS;EAQjC,IAAI,CAACD,GAAG,IAAId,MAAM,CAACW,EAAE,KAAK,aAAa,EAAE;IACvCG,GAAG,GAAGR,OAAO,CAACS,SAAS;EACzB;EAIA,IAAIT,OAAO,CAACU,WAAW,KAAK,MAAM,EAAE;IAClCF,GAAG,cAAAX,MAAA,CAAcH,MAAM,CAACiB,MAAM,YAAAd,MAAA,CAASS,UAAU,CAAE;EACrD;EAGA,IAAI,CAACE,GAAG,EAAE;IAER,IAAIZ,OAAO,GAAGF,MAAM,CAACE,OAAO;IAE5B,IAAIA,OAAO,KAAK,QAAQ,EAAE;MAExBA,OAAO,GAAGL,OAAO;IACnB;IACA,IAAMqB,UAAU,GAAGhB,OAAO,OAAAC,MAAA,CAAOD,OAAO,IAAK,EAAE;IAC/CY,GAAG,oCAAAX,MAAA,CAAoCH,MAAM,CAACiB,MAAM,EAAAd,MAAA,CAAGe,UAAU,YAAAf,MAAA,CAASS,UAAU,CAAE;EACxF;EAEA,IAAAO,cAAM,EAACL,GAAG,CAAC;EAGX,OAAOA,GAAG;AACZ"}
1
+ {"version":3,"file":"get-worker-url.js","names":["_assert","require","_globals","_version","getWorkerName","worker","warning","version","VERSION","concat","name","getWorkerURL","options","arguments","length","undefined","workerOptions","id","workerFile","isBrowser","url","workerUrl","_workerType","module","NPM_TAG","versionTag","assert"],"sources":["../../../../src/lib/worker-api/get-worker-url.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport type {WorkerObject, WorkerOptions} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {isBrowser} from '../env-utils/globals';\nimport {VERSION, NPM_TAG} from '../env-utils/version';\n\n/**\n * Gets worker object's name (for debugging in Chrome thread inspector window)\n */\nexport function getWorkerName(worker: WorkerObject): string {\n const warning = worker.version !== VERSION ? ` (worker-utils@${VERSION})` : '';\n return `${worker.name}@${worker.version}${warning}`;\n}\n\n/**\n * Generate a worker URL based on worker object and options\n * @returns A URL to one of the following:\n * - a published worker on unpkg CDN\n * - a local test worker\n * - a URL provided by the user in options\n */\nexport function getWorkerURL(worker: WorkerObject, options: WorkerOptions = {}): string {\n const workerOptions = options[worker.id] || {};\n\n const workerFile = isBrowser ? `${worker.id}-worker.js` : `${worker.id}-worker-node.js`;\n\n let url = workerOptions.workerUrl;\n\n // HACK: Allow for non-nested workerUrl for the CompressionWorker.\n // For the compression worker, workerOptions is currently not nested correctly. For most loaders,\n // you'd have options within an object, i.e. `{mvt: {coordinates: ...}}` but the CompressionWorker\n // puts options at the top level, not within a `compression` key (its `id`). For this reason, the\n // above `workerOptions` will always be a string (i.e. `'gzip'`) for the CompressionWorker. To not\n // break backwards compatibility, we allow the CompressionWorker to have options at the top level.\n if (!url && worker.id === 'compression') {\n url = options.workerUrl;\n }\n\n // If URL is test, generate local loaders.gl url\n // @ts-ignore _workerType\n if (options._workerType === 'test') {\n url = `modules/${worker.module}/dist/${workerFile}`;\n }\n\n // If url override is not provided, generate a URL to published version on npm CDN unpkg.com\n if (!url) {\n // GENERATE\n let version = worker.version;\n // On master we need to load npm alpha releases published with the `beta` tag\n if (version === 'latest') {\n // throw new Error('latest worker version specified');\n version = NPM_TAG;\n }\n const versionTag = version ? `@${version}` : '';\n url = `https://unpkg.com/@loaders.gl/${worker.module}${versionTag}/dist/${workerFile}`;\n }\n\n assert(url);\n\n // Allow user to override location\n return url;\n}\n"],"mappings":";;;;;;;AAGA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,QAAA,GAAAF,OAAA;AAKO,SAASG,aAAaA,CAACC,MAAoB,EAAU;EAC1D,IAAMC,OAAO,GAAGD,MAAM,CAACE,OAAO,KAAKC,gBAAO,qBAAAC,MAAA,CAAqBD,gBAAO,SAAM,EAAE;EAC9E,UAAAC,MAAA,CAAUJ,MAAM,CAACK,IAAI,OAAAD,MAAA,CAAIJ,MAAM,CAACE,OAAO,EAAAE,MAAA,CAAGH,OAAO;AACnD;AASO,SAASK,YAAYA,CAACN,MAAoB,EAAuC;EAAA,IAArCO,OAAsB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EAC5E,IAAMG,aAAa,GAAGJ,OAAO,CAACP,MAAM,CAACY,EAAE,CAAC,IAAI,CAAC,CAAC;EAE9C,IAAMC,UAAU,GAAGC,kBAAS,MAAAV,MAAA,CAAMJ,MAAM,CAACY,EAAE,qBAAAR,MAAA,CAAkBJ,MAAM,CAACY,EAAE,oBAAiB;EAEvF,IAAIG,GAAG,GAAGJ,aAAa,CAACK,SAAS;EAQjC,IAAI,CAACD,GAAG,IAAIf,MAAM,CAACY,EAAE,KAAK,aAAa,EAAE;IACvCG,GAAG,GAAGR,OAAO,CAACS,SAAS;EACzB;EAIA,IAAIT,OAAO,CAACU,WAAW,KAAK,MAAM,EAAE;IAClCF,GAAG,cAAAX,MAAA,CAAcJ,MAAM,CAACkB,MAAM,YAAAd,MAAA,CAASS,UAAU,CAAE;EACrD;EAGA,IAAI,CAACE,GAAG,EAAE;IAER,IAAIb,OAAO,GAAGF,MAAM,CAACE,OAAO;IAE5B,IAAIA,OAAO,KAAK,QAAQ,EAAE;MAExBA,OAAO,GAAGiB,gBAAO;IACnB;IACA,IAAMC,UAAU,GAAGlB,OAAO,OAAAE,MAAA,CAAOF,OAAO,IAAK,EAAE;IAC/Ca,GAAG,oCAAAX,MAAA,CAAoCJ,MAAM,CAACkB,MAAM,EAAAd,MAAA,CAAGgB,UAAU,YAAAhB,MAAA,CAASS,UAAU,CAAE;EACxF;EAEA,IAAAQ,cAAM,EAACN,GAAG,CAAC;EAGX,OAAOA,GAAG;AACZ"}
@@ -1,6 +1,16 @@
1
- const DEFAULT_VERSION = 'beta';
2
- export const VERSION = typeof "4.0.0-alpha.8" !== 'undefined' ? "4.0.0-alpha.8" : DEFAULT_VERSION;
3
- if (typeof "4.0.0-alpha.8" === 'undefined') {
4
- console.error('loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.');
1
+ export const NPM_TAG = 'beta';
2
+ function getVersion() {
3
+ var _globalThis$_loadersg;
4
+ if (!((_globalThis$_loadersg = globalThis._loadersgl_) !== null && _globalThis$_loadersg !== void 0 && _globalThis$_loadersg.version)) {
5
+ globalThis._loadersgl_ = globalThis._loadersgl_ || {};
6
+ if (typeof "4.0.0-beta.1" === 'undefined') {
7
+ console.error('loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.');
8
+ globalThis._loadersgl_.version = NPM_TAG;
9
+ } else {
10
+ globalThis._loadersgl_.version = "4.0.0-beta.1";
11
+ }
12
+ }
13
+ return globalThis._loadersgl_.version;
5
14
  }
15
+ export const VERSION = getVersion();
6
16
  //# sourceMappingURL=version.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"version.js","names":["DEFAULT_VERSION","VERSION","console","error"],"sources":["../../../../src/lib/env-utils/version.ts"],"sourcesContent":["// Version constant cannot be imported, it needs to correspond to the build version of **this** module.\n// __VERSION__ is injected by babel-plugin-version-inline\n\n// Change to `latest` on production branches\nconst DEFAULT_VERSION = 'beta';\ndeclare let __VERSION__: string;\nexport const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : DEFAULT_VERSION;\nif (typeof __VERSION__ === 'undefined') {\n // eslint-disable-next-line\n console.error(\n 'loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.'\n );\n}\n"],"mappings":"AAIA,MAAMA,eAAe,GAAG,MAAM;AAE9B,OAAO,MAAMC,OAAO,GAAG,sBAAkB,KAAK,WAAW,qBAAiBD,eAAe;AACzF,IAAI,sBAAkB,KAAK,WAAW,EAAE;EAEtCE,OAAO,CAACC,KAAK,CACX,iIACF,CAAC;AACH"}
1
+ {"version":3,"file":"version.js","names":["NPM_TAG","getVersion","_globalThis$_loadersg","globalThis","_loadersgl_","version","console","error","VERSION"],"sources":["../../../../src/lib/env-utils/version.ts"],"sourcesContent":["// Version constant cannot be imported, it needs to correspond to the build version of **this** module.\n\n/**\n * TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...\n * 'beta' on beta branch, 'latest' on prod branch\n */\nexport const NPM_TAG = 'beta'; // Change to `latest` on production branches\n\ndeclare let __VERSION__: string;\n\nfunction getVersion() {\n if (!globalThis._loadersgl_?.version) {\n globalThis._loadersgl_ = globalThis._loadersgl_ || {};\n // __VERSION__ is injected by babel-plugin-version-inline\n if (typeof __VERSION__ === 'undefined') {\n // eslint-disable-next-line\n console.error(\n 'loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.'\n );\n globalThis._loadersgl_.version = NPM_TAG;\n } else {\n globalThis._loadersgl_.version = __VERSION__;\n }\n }\n\n return globalThis._loadersgl_.version;\n}\n\nexport const VERSION = getVersion();\n"],"mappings":"AAMA,OAAO,MAAMA,OAAO,GAAG,MAAM;AAI7B,SAASC,UAAUA,CAAA,EAAG;EAAA,IAAAC,qBAAA;EACpB,IAAI,GAAAA,qBAAA,GAACC,UAAU,CAACC,WAAW,cAAAF,qBAAA,eAAtBA,qBAAA,CAAwBG,OAAO,GAAE;IACpCF,UAAU,CAACC,WAAW,GAAGD,UAAU,CAACC,WAAW,IAAI,CAAC,CAAC;IAErD,IAAI,qBAAkB,KAAK,WAAW,EAAE;MAEtCE,OAAO,CAACC,KAAK,CACX,iIACF,CAAC;MACDJ,UAAU,CAACC,WAAW,CAACC,OAAO,GAAGL,OAAO;IAC1C,CAAC,MAAM;MACLG,UAAU,CAACC,WAAW,CAACC,OAAO,iBAAc;IAC9C;EACF;EAEA,OAAOF,UAAU,CAACC,WAAW,CAACC,OAAO;AACvC;AAEA,OAAO,MAAMG,OAAO,GAAGP,UAAU,CAAC,CAAC"}
@@ -1,43 +1,44 @@
1
1
  import { global, isBrowser, isWorker } from '../env-utils/globals';
2
2
  import * as node from '../node/require-utils.node';
3
3
  import { assert } from '../env-utils/assert';
4
- import { VERSION as __VERSION__ } from '../env-utils/version';
5
- const LATEST = 'beta';
6
- const VERSION = typeof "4.0.0-alpha.8" !== 'undefined' ? "4.0.0-alpha.8" : LATEST;
4
+ import { VERSION } from '../env-utils/version';
7
5
  const loadLibraryPromises = {};
8
6
  export async function loadLibrary(libraryUrl) {
9
7
  let moduleName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
10
8
  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
9
+ let libraryName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
11
10
  if (moduleName) {
12
- libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);
11
+ libraryUrl = getLibraryUrl(libraryUrl, moduleName, options, libraryName);
13
12
  }
14
13
  loadLibraryPromises[libraryUrl] = loadLibraryPromises[libraryUrl] || loadLibraryFromFile(libraryUrl);
15
14
  return await loadLibraryPromises[libraryUrl];
16
15
  }
17
- export function getLibraryUrl(library, moduleName, options) {
18
- if (library.startsWith('http')) {
16
+ export function getLibraryUrl(library, moduleName) {
17
+ let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
18
+ let libraryName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
19
+ if (!options.useLocalLibraries && library.startsWith('http')) {
19
20
  return library;
20
21
  }
22
+ libraryName = libraryName || library;
21
23
  const modules = options.modules || {};
22
- if (modules[library]) {
23
- return modules[library];
24
+ if (modules[libraryName]) {
25
+ return modules[libraryName];
24
26
  }
25
27
  if (!isBrowser) {
26
- return "modules/".concat(moduleName, "/dist/libs/").concat(library);
28
+ return "modules/".concat(moduleName, "/dist/libs/").concat(libraryName);
27
29
  }
28
30
  if (options.CDN) {
29
31
  assert(options.CDN.startsWith('http'));
30
- return "".concat(options.CDN, "/").concat(moduleName, "@").concat(VERSION, "/dist/libs/").concat(library);
32
+ return "".concat(options.CDN, "/").concat(moduleName, "@").concat(VERSION, "/dist/libs/").concat(libraryName);
31
33
  }
32
34
  if (isWorker) {
33
- return "../src/libs/".concat(library);
35
+ return "../src/libs/".concat(libraryName);
34
36
  }
35
- return "modules/".concat(moduleName, "/src/libs/").concat(library);
37
+ return "modules/".concat(moduleName, "/src/libs/").concat(libraryName);
36
38
  }
37
39
  async function loadLibraryFromFile(libraryUrl) {
38
40
  if (libraryUrl.endsWith('wasm')) {
39
- const response = await fetch(libraryUrl);
40
- return await response.arrayBuffer();
41
+ return await loadAsArrayBuffer(libraryUrl);
41
42
  }
42
43
  if (!isBrowser) {
43
44
  try {
@@ -49,8 +50,7 @@ async function loadLibraryFromFile(libraryUrl) {
49
50
  if (isWorker) {
50
51
  return importScripts(libraryUrl);
51
52
  }
52
- const response = await fetch(libraryUrl);
53
- const scriptSource = await response.text();
53
+ const scriptSource = await loadAsText(libraryUrl);
54
54
  return loadLibraryFromString(scriptSource, libraryUrl);
55
55
  }
56
56
  function loadLibraryFromString(scriptSource, id) {
@@ -71,4 +71,18 @@ function loadLibraryFromString(scriptSource, id) {
71
71
  document.body.appendChild(script);
72
72
  return null;
73
73
  }
74
+ async function loadAsArrayBuffer(url) {
75
+ if (!node.readFileAsArrayBuffer || url.startsWith('http')) {
76
+ const response = await fetch(url);
77
+ return await response.arrayBuffer();
78
+ }
79
+ return await node.readFileAsArrayBuffer(url);
80
+ }
81
+ async function loadAsText(url) {
82
+ if (!node.readFileAsText || url.startsWith('http')) {
83
+ const response = await fetch(url);
84
+ return await response.text();
85
+ }
86
+ return await node.readFileAsText(url);
87
+ }
74
88
  //# sourceMappingURL=library-utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"library-utils.js","names":["global","isBrowser","isWorker","node","assert","VERSION","__VERSION__","LATEST","loadLibraryPromises","loadLibrary","libraryUrl","moduleName","arguments","length","undefined","options","getLibraryUrl","loadLibraryFromFile","library","startsWith","modules","concat","CDN","endsWith","response","fetch","arrayBuffer","requireFromFile","importScripts","scriptSource","text","loadLibraryFromString","id","requireFromString","eval","call","script","document","createElement","appendChild","createTextNode","e","body"],"sources":["../../../../src/lib/library-utils/library-utils.ts"],"sourcesContent":["/* global importScripts */\nimport {global, isBrowser, isWorker} from '../env-utils/globals';\nimport * as node from '../node/require-utils.node';\nimport {assert} from '../env-utils/assert';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\n/**\n * TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...\n * 'beta' on beta branch, 'latest' on prod branch\n */\nconst LATEST = 'beta';\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : LATEST;\n\nconst loadLibraryPromises: Record<string, Promise<any>> = {}; // promises\n\n/**\n * Dynamically loads a library (\"module\")\n *\n * - wasm library: Array buffer is returned\n * - js library: Parse JS is returned\n *\n * Method depends on environment\n * - browser - script element is created and installed on document\n * - worker - eval is called on global context\n * - node - file is required\n *\n * @param libraryUrl\n * @param moduleName\n * @param options\n */\nexport async function loadLibrary(\n libraryUrl: string,\n moduleName: string | null = null,\n options: object = {}\n): Promise<any> {\n if (moduleName) {\n libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);\n }\n\n // Ensure libraries are only loaded once\n\n loadLibraryPromises[libraryUrl] =\n // eslint-disable-next-line @typescript-eslint/no-misused-promises\n loadLibraryPromises[libraryUrl] || loadLibraryFromFile(libraryUrl);\n return await loadLibraryPromises[libraryUrl];\n}\n\n// TODO - sort out how to resolve paths for main/worker and dev/prod\nexport function getLibraryUrl(library: string, moduleName?: string, options?: any): string {\n // Check if already a URL\n if (library.startsWith('http')) {\n return library;\n }\n\n // Allow application to import and supply libraries through `options.modules`\n const modules = options.modules || {};\n if (modules[library]) {\n return modules[library];\n }\n\n // Load from local files, not from CDN scripts in Node.js\n // TODO - needs to locate the modules directory when installed!\n if (!isBrowser) {\n return `modules/${moduleName}/dist/libs/${library}`;\n }\n\n // In browser, load from external scripts\n if (options.CDN) {\n assert(options.CDN.startsWith('http'));\n return `${options.CDN}/${moduleName}@${VERSION}/dist/libs/${library}`;\n }\n\n // TODO - loading inside workers requires paths relative to worker script location...\n if (isWorker) {\n return `../src/libs/${library}`;\n }\n\n return `modules/${moduleName}/src/libs/${library}`;\n}\n\nasync function loadLibraryFromFile(libraryUrl: string): Promise<any> {\n if (libraryUrl.endsWith('wasm')) {\n const response = await fetch(libraryUrl);\n return await response.arrayBuffer();\n }\n\n if (!isBrowser) {\n try {\n return node && node.requireFromFile && (await node.requireFromFile(libraryUrl));\n } catch {\n return null;\n }\n }\n if (isWorker) {\n return importScripts(libraryUrl);\n }\n // TODO - fix - should be more secure than string parsing since observes CORS\n // if (isBrowser) {\n // return await loadScriptFromFile(libraryUrl);\n // }\n\n const response = await fetch(libraryUrl);\n const scriptSource = await response.text();\n return loadLibraryFromString(scriptSource, libraryUrl);\n}\n\n/*\nasync function loadScriptFromFile(libraryUrl) {\n const script = document.createElement('script');\n script.src = libraryUrl;\n return await new Promise((resolve, reject) => {\n script.onload = data => {\n resolve(data);\n };\n script.onerror = reject;\n });\n}\n*/\n\n// TODO - Needs security audit...\n// - Raw eval call\n// - Potentially bypasses CORS\n// Upside is that this separates fetching and parsing\n// we could create a`LibraryLoader` or`ModuleLoader`\nfunction loadLibraryFromString(scriptSource: string, id: string): null | any {\n if (!isBrowser) {\n return node.requireFromString && node.requireFromString(scriptSource, id);\n }\n\n if (isWorker) {\n // Use lvalue trick to make eval run in global scope\n eval.call(global, scriptSource); // eslint-disable-line no-eval\n // https://stackoverflow.com/questions/9107240/1-evalthis-vs-evalthis-in-javascript\n // http://perfectionkills.com/global-eval-what-are-the-options/\n return null;\n }\n\n const script = document.createElement('script');\n script.id = id;\n // most browsers like a separate text node but some throw an error. The second method covers those.\n try {\n script.appendChild(document.createTextNode(scriptSource));\n } catch (e) {\n script.text = scriptSource;\n }\n document.body.appendChild(script);\n return null;\n}\n\n// TODO - technique for module injection into worker, from THREE.DracoLoader...\n/*\nfunction combineWorkerWithLibrary(worker, jsContent) {\n var fn = wWorker.toString();\n var body = [\n '// injected',\n jsContent,\n '',\n '// worker',\n fn.substring(fn.indexOf('{') + 1, fn.lastIndexOf('}'))\n ].join('\\n');\n this.workerSourceURL = URL.createObjectURL(new Blob([body]));\n}\n*/\n"],"mappings":"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"}
1
+ {"version":3,"file":"library-utils.js","names":["global","isBrowser","isWorker","node","assert","VERSION","loadLibraryPromises","loadLibrary","libraryUrl","moduleName","arguments","length","undefined","options","libraryName","getLibraryUrl","loadLibraryFromFile","library","useLocalLibraries","startsWith","modules","concat","CDN","endsWith","loadAsArrayBuffer","requireFromFile","importScripts","scriptSource","loadAsText","loadLibraryFromString","id","requireFromString","eval","call","script","document","createElement","appendChild","createTextNode","e","text","body","url","readFileAsArrayBuffer","response","fetch","arrayBuffer","readFileAsText"],"sources":["../../../../src/lib/library-utils/library-utils.ts"],"sourcesContent":["/* global importScripts */\nimport {global, isBrowser, isWorker} from '../env-utils/globals';\nimport * as node from '../node/require-utils.node';\nimport {assert} from '../env-utils/assert';\nimport {VERSION} from '../env-utils/version';\n\nconst loadLibraryPromises: Record<string, Promise<any>> = {}; // promises\n\n/**\n * Dynamically loads a library (\"module\")\n *\n * - wasm library: Array buffer is returned\n * - js library: Parse JS is returned\n *\n * Method depends on environment\n * - browser - script element is created and installed on document\n * - worker - eval is called on global context\n * - node - file is required\n *\n * @param libraryUrl\n * @param moduleName\n * @param options\n */\nexport async function loadLibrary(\n libraryUrl: string,\n moduleName: string | null = null,\n options: object = {},\n libraryName: string | null = null\n): Promise<any> {\n if (moduleName) {\n libraryUrl = getLibraryUrl(libraryUrl, moduleName, options, libraryName);\n }\n // Ensure libraries are only loaded once\n\n loadLibraryPromises[libraryUrl] =\n // eslint-disable-next-line @typescript-eslint/no-misused-promises\n loadLibraryPromises[libraryUrl] || loadLibraryFromFile(libraryUrl);\n return await loadLibraryPromises[libraryUrl];\n}\n\n// TODO - sort out how to resolve paths for main/worker and dev/prod\nexport function getLibraryUrl(\n library: string,\n moduleName?: string,\n options: any = {},\n libraryName: string | null = null\n): string {\n // Check if already a URL\n if (!options.useLocalLibraries && library.startsWith('http')) {\n return library;\n }\n\n libraryName = libraryName || library;\n\n // Allow application to import and supply libraries through `options.modules`\n const modules = options.modules || {};\n if (modules[libraryName]) {\n return modules[libraryName];\n }\n\n // Load from local files, not from CDN scripts in Node.js\n // TODO - needs to locate the modules directory when installed!\n if (!isBrowser) {\n return `modules/${moduleName}/dist/libs/${libraryName}`;\n }\n\n // In browser, load from external scripts\n if (options.CDN) {\n assert(options.CDN.startsWith('http'));\n return `${options.CDN}/${moduleName}@${VERSION}/dist/libs/${libraryName}`;\n }\n\n // TODO - loading inside workers requires paths relative to worker script location...\n if (isWorker) {\n return `../src/libs/${libraryName}`;\n }\n\n return `modules/${moduleName}/src/libs/${libraryName}`;\n}\n\nasync function loadLibraryFromFile(libraryUrl: string): Promise<any> {\n if (libraryUrl.endsWith('wasm')) {\n return await loadAsArrayBuffer(libraryUrl);\n }\n\n if (!isBrowser) {\n try {\n return node && node.requireFromFile && (await node.requireFromFile(libraryUrl));\n } catch {\n return null;\n }\n }\n if (isWorker) {\n return importScripts(libraryUrl);\n }\n // TODO - fix - should be more secure than string parsing since observes CORS\n // if (isBrowser) {\n // return await loadScriptFromFile(libraryUrl);\n // }\n\n const scriptSource = await loadAsText(libraryUrl);\n return loadLibraryFromString(scriptSource, libraryUrl);\n}\n\n/*\nasync function loadScriptFromFile(libraryUrl) {\n const script = document.createElement('script');\n script.src = libraryUrl;\n return await new Promise((resolve, reject) => {\n script.onload = data => {\n resolve(data);\n };\n script.onerror = reject;\n });\n}\n*/\n\n// TODO - Needs security audit...\n// - Raw eval call\n// - Potentially bypasses CORS\n// Upside is that this separates fetching and parsing\n// we could create a`LibraryLoader` or`ModuleLoader`\nfunction loadLibraryFromString(scriptSource: string, id: string): null | any {\n if (!isBrowser) {\n return node.requireFromString && node.requireFromString(scriptSource, id);\n }\n\n if (isWorker) {\n // Use lvalue trick to make eval run in global scope\n eval.call(global, scriptSource); // eslint-disable-line no-eval\n // https://stackoverflow.com/questions/9107240/1-evalthis-vs-evalthis-in-javascript\n // http://perfectionkills.com/global-eval-what-are-the-options/\n return null;\n }\n\n const script = document.createElement('script');\n script.id = id;\n // most browsers like a separate text node but some throw an error. The second method covers those.\n try {\n script.appendChild(document.createTextNode(scriptSource));\n } catch (e) {\n script.text = scriptSource;\n }\n document.body.appendChild(script);\n return null;\n}\n\n// TODO - technique for module injection into worker, from THREE.DracoLoader...\n/*\nfunction combineWorkerWithLibrary(worker, jsContent) {\n var fn = wWorker.toString();\n var body = [\n '// injected',\n jsContent,\n '',\n '// worker',\n fn.substring(fn.indexOf('{') + 1, fn.lastIndexOf('}'))\n ].join('\\n');\n this.workerSourceURL = URL.createObjectURL(new Blob([body]));\n}\n*/\n\nasync function loadAsArrayBuffer(url: string): Promise<ArrayBuffer> {\n if (!node.readFileAsArrayBuffer || url.startsWith('http')) {\n const response = await fetch(url);\n return await response.arrayBuffer();\n }\n return await node.readFileAsArrayBuffer(url);\n}\n\n/**\n * Load a file from local file system\n * @param filename\n * @returns\n */\nasync function loadAsText(url: string): Promise<string> {\n if (!node.readFileAsText || url.startsWith('http')) {\n const response = await fetch(url);\n return await response.text();\n }\n return await node.readFileAsText(url);\n}\n"],"mappings":"AACA,SAAQA,MAAM,EAAEC,SAAS,EAAEC,QAAQ,QAAO,sBAAsB;AAChE,OAAO,KAAKC,IAAI,MAAM,4BAA4B;AAClD,SAAQC,MAAM,QAAO,qBAAqB;AAC1C,SAAQC,OAAO,QAAO,sBAAsB;AAE5C,MAAMC,mBAAiD,GAAG,CAAC,CAAC;AAiB5D,OAAO,eAAeC,WAAWA,CAC/BC,UAAkB,EAIJ;EAAA,IAHdC,UAAyB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,IAAI;EAAA,IAChCG,OAAe,GAAAH,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EAAA,IACpBI,WAA0B,GAAAJ,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,IAAI;EAEjC,IAAID,UAAU,EAAE;IACdD,UAAU,GAAGO,aAAa,CAACP,UAAU,EAAEC,UAAU,EAAEI,OAAO,EAAEC,WAAW,CAAC;EAC1E;EAGAR,mBAAmB,CAACE,UAAU,CAAC,GAE7BF,mBAAmB,CAACE,UAAU,CAAC,IAAIQ,mBAAmB,CAACR,UAAU,CAAC;EACpE,OAAO,MAAMF,mBAAmB,CAACE,UAAU,CAAC;AAC9C;AAGA,OAAO,SAASO,aAAaA,CAC3BE,OAAe,EACfR,UAAmB,EAGX;EAAA,IAFRI,OAAY,GAAAH,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EAAA,IACjBI,WAA0B,GAAAJ,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,IAAI;EAGjC,IAAI,CAACG,OAAO,CAACK,iBAAiB,IAAID,OAAO,CAACE,UAAU,CAAC,MAAM,CAAC,EAAE;IAC5D,OAAOF,OAAO;EAChB;EAEAH,WAAW,GAAGA,WAAW,IAAIG,OAAO;EAGpC,MAAMG,OAAO,GAAGP,OAAO,CAACO,OAAO,IAAI,CAAC,CAAC;EACrC,IAAIA,OAAO,CAACN,WAAW,CAAC,EAAE;IACxB,OAAOM,OAAO,CAACN,WAAW,CAAC;EAC7B;EAIA,IAAI,CAACb,SAAS,EAAE;IACd,kBAAAoB,MAAA,CAAkBZ,UAAU,iBAAAY,MAAA,CAAcP,WAAW;EACvD;EAGA,IAAID,OAAO,CAACS,GAAG,EAAE;IACflB,MAAM,CAACS,OAAO,CAACS,GAAG,CAACH,UAAU,CAAC,MAAM,CAAC,CAAC;IACtC,UAAAE,MAAA,CAAUR,OAAO,CAACS,GAAG,OAAAD,MAAA,CAAIZ,UAAU,OAAAY,MAAA,CAAIhB,OAAO,iBAAAgB,MAAA,CAAcP,WAAW;EACzE;EAGA,IAAIZ,QAAQ,EAAE;IACZ,sBAAAmB,MAAA,CAAsBP,WAAW;EACnC;EAEA,kBAAAO,MAAA,CAAkBZ,UAAU,gBAAAY,MAAA,CAAaP,WAAW;AACtD;AAEA,eAAeE,mBAAmBA,CAACR,UAAkB,EAAgB;EACnE,IAAIA,UAAU,CAACe,QAAQ,CAAC,MAAM,CAAC,EAAE;IAC/B,OAAO,MAAMC,iBAAiB,CAAChB,UAAU,CAAC;EAC5C;EAEA,IAAI,CAACP,SAAS,EAAE;IACd,IAAI;MACF,OAAOE,IAAI,IAAIA,IAAI,CAACsB,eAAe,KAAK,MAAMtB,IAAI,CAACsB,eAAe,CAACjB,UAAU,CAAC,CAAC;IACjF,CAAC,CAAC,MAAM;MACN,OAAO,IAAI;IACb;EACF;EACA,IAAIN,QAAQ,EAAE;IACZ,OAAOwB,aAAa,CAAClB,UAAU,CAAC;EAClC;EAMA,MAAMmB,YAAY,GAAG,MAAMC,UAAU,CAACpB,UAAU,CAAC;EACjD,OAAOqB,qBAAqB,CAACF,YAAY,EAAEnB,UAAU,CAAC;AACxD;AAoBA,SAASqB,qBAAqBA,CAACF,YAAoB,EAAEG,EAAU,EAAc;EAC3E,IAAI,CAAC7B,SAAS,EAAE;IACd,OAAOE,IAAI,CAAC4B,iBAAiB,IAAI5B,IAAI,CAAC4B,iBAAiB,CAACJ,YAAY,EAAEG,EAAE,CAAC;EAC3E;EAEA,IAAI5B,QAAQ,EAAE;IAEZ8B,IAAI,CAACC,IAAI,CAACjC,MAAM,EAAE2B,YAAY,CAAC;IAG/B,OAAO,IAAI;EACb;EAEA,MAAMO,MAAM,GAAGC,QAAQ,CAACC,aAAa,CAAC,QAAQ,CAAC;EAC/CF,MAAM,CAACJ,EAAE,GAAGA,EAAE;EAEd,IAAI;IACFI,MAAM,CAACG,WAAW,CAACF,QAAQ,CAACG,cAAc,CAACX,YAAY,CAAC,CAAC;EAC3D,CAAC,CAAC,OAAOY,CAAC,EAAE;IACVL,MAAM,CAACM,IAAI,GAAGb,YAAY;EAC5B;EACAQ,QAAQ,CAACM,IAAI,CAACJ,WAAW,CAACH,MAAM,CAAC;EACjC,OAAO,IAAI;AACb;AAiBA,eAAeV,iBAAiBA,CAACkB,GAAW,EAAwB;EAClE,IAAI,CAACvC,IAAI,CAACwC,qBAAqB,IAAID,GAAG,CAACvB,UAAU,CAAC,MAAM,CAAC,EAAE;IACzD,MAAMyB,QAAQ,GAAG,MAAMC,KAAK,CAACH,GAAG,CAAC;IACjC,OAAO,MAAME,QAAQ,CAACE,WAAW,CAAC,CAAC;EACrC;EACA,OAAO,MAAM3C,IAAI,CAACwC,qBAAqB,CAACD,GAAG,CAAC;AAC9C;AAOA,eAAed,UAAUA,CAACc,GAAW,EAAmB;EACtD,IAAI,CAACvC,IAAI,CAAC4C,cAAc,IAAIL,GAAG,CAACvB,UAAU,CAAC,MAAM,CAAC,EAAE;IAClD,MAAMyB,QAAQ,GAAG,MAAMC,KAAK,CAACH,GAAG,CAAC;IACjC,OAAO,MAAME,QAAQ,CAACJ,IAAI,CAAC,CAAC;EAC9B;EACA,OAAO,MAAMrC,IAAI,CAAC4C,cAAc,CAACL,GAAG,CAAC;AACvC"}
@@ -1,5 +1,22 @@
1
1
  import Module from 'module';
2
2
  import path from 'path';
3
+ import fs from 'fs';
4
+ export async function readFileAsArrayBuffer(filename) {
5
+ if (filename.startsWith('http')) {
6
+ const response = await fetch(filename);
7
+ return await response.arrayBuffer();
8
+ }
9
+ const buffer = fs.readFileSync(filename);
10
+ return buffer.buffer;
11
+ }
12
+ export async function readFileAsText(filename) {
13
+ if (filename.startsWith('http')) {
14
+ const response = await fetch(filename);
15
+ return await response.text();
16
+ }
17
+ const text = fs.readFileSync(filename, 'utf8');
18
+ return text;
19
+ }
3
20
  export async function requireFromFile(filename) {
4
21
  if (filename.startsWith('http')) {
5
22
  const response = await fetch(filename);
@@ -1 +1 @@
1
- {"version":3,"file":"require-utils.node.js","names":["Module","path","requireFromFile","filename","startsWith","response","fetch","code","text","requireFromString","concat","process","cwd","require","_options","_options2","arguments","length","undefined","options","Error","paths","_nodeModulePaths","dirname","parent","module","newModule","prependPaths","appendPaths","_compile","children","splice","indexOf","exports"],"sources":["../../../../src/lib/node/require-utils.node.ts"],"sourcesContent":["// Fork of https://github.com/floatdrop/require-from-string/blob/master/index.js\n// Copyright (c) Vsevolod Strukchinsky <floatdrop@gmail.com> (github.com/floatdrop)\n// MIT license\n\n// this file is not visible to webpack (it is excluded in the package.json \"browser\" field).\n\nimport Module from 'module';\nimport path from 'path';\n\n// Node.js Dynamically require from file\n// Relative names are resolved relative to cwd\n// This indirect function is provided because webpack will try to bundle `module.require`.\n// this file is not visible to webpack (it is excluded in the package.json \"browser\" field).\nexport async function requireFromFile(filename: string): Promise<any> {\n if (filename.startsWith('http')) {\n const response = await fetch(filename);\n const code = await response.text();\n return requireFromString(code);\n }\n\n if (!filename.startsWith('/')) {\n filename = `${process.cwd()}/${filename}`;\n }\n return require(filename);\n}\n\n// Dynamically require from string\n// - `code` - Required - Type: string - Module code.\n// - `filename` - Type: string - Default: '' - Optional filename.\n// - `options.appendPaths` Type: Array List of paths, that will be appended to module paths.\n// Useful, when you want to be able require modules from these paths.\n// - `options.prependPaths` Type: Array Same as appendPaths, but paths will be prepended.\nexport function requireFromString(\n code: string,\n filename = '',\n options?: {\n prependPaths?: string[];\n appendPaths?: string[];\n }\n): any {\n if (typeof filename === 'object') {\n options = filename;\n filename = '';\n }\n\n if (typeof code !== 'string') {\n throw new Error(`code must be a string, not ${typeof code}`);\n }\n\n // @ts-ignore\n const paths = Module._nodeModulePaths(path.dirname(filename));\n\n const parent = module.parent;\n // @ts-ignore\n const newModule = new Module(filename, parent);\n newModule.filename = filename;\n newModule.paths = ([] as string[])\n .concat(options?.prependPaths || [])\n .concat(paths)\n .concat(options?.appendPaths || []);\n // @ts-ignore\n newModule._compile(code, filename);\n\n if (parent && parent.children) {\n parent.children.splice(parent.children.indexOf(newModule), 1);\n }\n\n return newModule.exports;\n}\n"],"mappings":"AAMA,OAAOA,MAAM,MAAM,QAAQ;AAC3B,OAAOC,IAAI,MAAM,MAAM;AAMvB,OAAO,eAAeC,eAAeA,CAACC,QAAgB,EAAgB;EACpE,IAAIA,QAAQ,CAACC,UAAU,CAAC,MAAM,CAAC,EAAE;IAC/B,MAAMC,QAAQ,GAAG,MAAMC,KAAK,CAACH,QAAQ,CAAC;IACtC,MAAMI,IAAI,GAAG,MAAMF,QAAQ,CAACG,IAAI,CAAC,CAAC;IAClC,OAAOC,iBAAiB,CAACF,IAAI,CAAC;EAChC;EAEA,IAAI,CAACJ,QAAQ,CAACC,UAAU,CAAC,GAAG,CAAC,EAAE;IAC7BD,QAAQ,MAAAO,MAAA,CAAMC,OAAO,CAACC,GAAG,CAAC,CAAC,OAAAF,MAAA,CAAIP,QAAQ,CAAE;EAC3C;EACA,OAAOU,OAAO,CAACV,QAAQ,CAAC;AAC1B;AAQA,OAAO,SAASM,iBAAiBA,CAC/BF,IAAY,EAMP;EAAA,IAAAO,QAAA,EAAAC,SAAA;EAAA,IALLZ,QAAQ,GAAAa,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,EAAE;EAAA,IACbG,OAGC,GAAAH,SAAA,CAAAC,MAAA,OAAAD,SAAA,MAAAE,SAAA;EAED,IAAI,OAAOf,QAAQ,KAAK,QAAQ,EAAE;IAChCgB,OAAO,GAAGhB,QAAQ;IAClBA,QAAQ,GAAG,EAAE;EACf;EAEA,IAAI,OAAOI,IAAI,KAAK,QAAQ,EAAE;IAC5B,MAAM,IAAIa,KAAK,+BAAAV,MAAA,CAA+B,OAAOH,IAAI,CAAE,CAAC;EAC9D;EAGA,MAAMc,KAAK,GAAGrB,MAAM,CAACsB,gBAAgB,CAACrB,IAAI,CAACsB,OAAO,CAACpB,QAAQ,CAAC,CAAC;EAE7D,MAAMqB,MAAM,GAAGC,MAAM,CAACD,MAAM;EAE5B,MAAME,SAAS,GAAG,IAAI1B,MAAM,CAACG,QAAQ,EAAEqB,MAAM,CAAC;EAC9CE,SAAS,CAACvB,QAAQ,GAAGA,QAAQ;EAC7BuB,SAAS,CAACL,KAAK,GAAI,EAAE,CAClBX,MAAM,CAAC,EAAAI,QAAA,GAAAK,OAAO,cAAAL,QAAA,uBAAPA,QAAA,CAASa,YAAY,KAAI,EAAE,CAAC,CACnCjB,MAAM,CAACW,KAAK,CAAC,CACbX,MAAM,CAAC,EAAAK,SAAA,GAAAI,OAAO,cAAAJ,SAAA,uBAAPA,SAAA,CAASa,WAAW,KAAI,EAAE,CAAC;EAErCF,SAAS,CAACG,QAAQ,CAACtB,IAAI,EAAEJ,QAAQ,CAAC;EAElC,IAAIqB,MAAM,IAAIA,MAAM,CAACM,QAAQ,EAAE;IAC7BN,MAAM,CAACM,QAAQ,CAACC,MAAM,CAACP,MAAM,CAACM,QAAQ,CAACE,OAAO,CAACN,SAAS,CAAC,EAAE,CAAC,CAAC;EAC/D;EAEA,OAAOA,SAAS,CAACO,OAAO;AAC1B"}
1
+ {"version":3,"file":"require-utils.node.js","names":["Module","path","fs","readFileAsArrayBuffer","filename","startsWith","response","fetch","arrayBuffer","buffer","readFileSync","readFileAsText","text","requireFromFile","code","requireFromString","concat","process","cwd","require","_options","_options2","arguments","length","undefined","options","Error","paths","_nodeModulePaths","dirname","parent","module","newModule","prependPaths","appendPaths","_compile","children","splice","indexOf","exports"],"sources":["../../../../src/lib/node/require-utils.node.ts"],"sourcesContent":["// Fork of https://github.com/floatdrop/require-from-string/blob/master/index.js\n// Copyright (c) Vsevolod Strukchinsky <floatdrop@gmail.com> (github.com/floatdrop)\n// MIT license\n\n// this file is not visible to webpack (it is excluded in the package.json \"browser\" field).\n\nimport Module from 'module';\nimport path from 'path';\nimport fs from 'fs';\n\n/**\n * Load a file from local file system\n * @param filename\n * @returns\n */\nexport async function readFileAsArrayBuffer(filename: string): Promise<ArrayBuffer> {\n if (filename.startsWith('http')) {\n const response = await fetch(filename);\n return await response.arrayBuffer();\n }\n const buffer = fs.readFileSync(filename);\n return buffer.buffer;\n}\n\n/**\n * Load a file from local file system\n * @param filename\n * @returns\n */\nexport async function readFileAsText(filename: string): Promise<string> {\n if (filename.startsWith('http')) {\n const response = await fetch(filename);\n return await response.text();\n }\n const text = fs.readFileSync(filename, 'utf8');\n return text;\n}\n\n// Node.js Dynamically require from file\n// Relative names are resolved relative to cwd\n// This indirect function is provided because webpack will try to bundle `module.require`.\n// this file is not visible to webpack (it is excluded in the package.json \"browser\" field).\nexport async function requireFromFile(filename: string): Promise<any> {\n if (filename.startsWith('http')) {\n const response = await fetch(filename);\n const code = await response.text();\n return requireFromString(code);\n }\n\n if (!filename.startsWith('/')) {\n filename = `${process.cwd()}/${filename}`;\n }\n return require(filename);\n}\n\n// Dynamically require from string\n// - `code` - Required - Type: string - Module code.\n// - `filename` - Type: string - Default: '' - Optional filename.\n// - `options.appendPaths` Type: Array List of paths, that will be appended to module paths.\n// Useful, when you want to be able require modules from these paths.\n// - `options.prependPaths` Type: Array Same as appendPaths, but paths will be prepended.\nexport function requireFromString(\n code: string,\n filename = '',\n options?: {\n prependPaths?: string[];\n appendPaths?: string[];\n }\n): any {\n if (typeof filename === 'object') {\n options = filename;\n filename = '';\n }\n\n if (typeof code !== 'string') {\n throw new Error(`code must be a string, not ${typeof code}`);\n }\n\n // @ts-ignore\n const paths = Module._nodeModulePaths(path.dirname(filename));\n\n const parent = module.parent;\n // @ts-ignore\n const newModule = new Module(filename, parent);\n newModule.filename = filename;\n newModule.paths = ([] as string[])\n .concat(options?.prependPaths || [])\n .concat(paths)\n .concat(options?.appendPaths || []);\n // @ts-ignore\n newModule._compile(code, filename);\n\n if (parent && parent.children) {\n parent.children.splice(parent.children.indexOf(newModule), 1);\n }\n\n return newModule.exports;\n}\n"],"mappings":"AAMA,OAAOA,MAAM,MAAM,QAAQ;AAC3B,OAAOC,IAAI,MAAM,MAAM;AACvB,OAAOC,EAAE,MAAM,IAAI;AAOnB,OAAO,eAAeC,qBAAqBA,CAACC,QAAgB,EAAwB;EAClF,IAAIA,QAAQ,CAACC,UAAU,CAAC,MAAM,CAAC,EAAE;IAC/B,MAAMC,QAAQ,GAAG,MAAMC,KAAK,CAACH,QAAQ,CAAC;IACtC,OAAO,MAAME,QAAQ,CAACE,WAAW,CAAC,CAAC;EACrC;EACA,MAAMC,MAAM,GAAGP,EAAE,CAACQ,YAAY,CAACN,QAAQ,CAAC;EACxC,OAAOK,MAAM,CAACA,MAAM;AACtB;AAOA,OAAO,eAAeE,cAAcA,CAACP,QAAgB,EAAmB;EACtE,IAAIA,QAAQ,CAACC,UAAU,CAAC,MAAM,CAAC,EAAE;IAC/B,MAAMC,QAAQ,GAAG,MAAMC,KAAK,CAACH,QAAQ,CAAC;IACtC,OAAO,MAAME,QAAQ,CAACM,IAAI,CAAC,CAAC;EAC9B;EACA,MAAMA,IAAI,GAAGV,EAAE,CAACQ,YAAY,CAACN,QAAQ,EAAE,MAAM,CAAC;EAC9C,OAAOQ,IAAI;AACb;AAMA,OAAO,eAAeC,eAAeA,CAACT,QAAgB,EAAgB;EACpE,IAAIA,QAAQ,CAACC,UAAU,CAAC,MAAM,CAAC,EAAE;IAC/B,MAAMC,QAAQ,GAAG,MAAMC,KAAK,CAACH,QAAQ,CAAC;IACtC,MAAMU,IAAI,GAAG,MAAMR,QAAQ,CAACM,IAAI,CAAC,CAAC;IAClC,OAAOG,iBAAiB,CAACD,IAAI,CAAC;EAChC;EAEA,IAAI,CAACV,QAAQ,CAACC,UAAU,CAAC,GAAG,CAAC,EAAE;IAC7BD,QAAQ,MAAAY,MAAA,CAAMC,OAAO,CAACC,GAAG,CAAC,CAAC,OAAAF,MAAA,CAAIZ,QAAQ,CAAE;EAC3C;EACA,OAAOe,OAAO,CAACf,QAAQ,CAAC;AAC1B;AAQA,OAAO,SAASW,iBAAiBA,CAC/BD,IAAY,EAMP;EAAA,IAAAM,QAAA,EAAAC,SAAA;EAAA,IALLjB,QAAQ,GAAAkB,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,EAAE;EAAA,IACbG,OAGC,GAAAH,SAAA,CAAAC,MAAA,OAAAD,SAAA,MAAAE,SAAA;EAED,IAAI,OAAOpB,QAAQ,KAAK,QAAQ,EAAE;IAChCqB,OAAO,GAAGrB,QAAQ;IAClBA,QAAQ,GAAG,EAAE;EACf;EAEA,IAAI,OAAOU,IAAI,KAAK,QAAQ,EAAE;IAC5B,MAAM,IAAIY,KAAK,+BAAAV,MAAA,CAA+B,OAAOF,IAAI,CAAE,CAAC;EAC9D;EAGA,MAAMa,KAAK,GAAG3B,MAAM,CAAC4B,gBAAgB,CAAC3B,IAAI,CAAC4B,OAAO,CAACzB,QAAQ,CAAC,CAAC;EAE7D,MAAM0B,MAAM,GAAGC,MAAM,CAACD,MAAM;EAE5B,MAAME,SAAS,GAAG,IAAIhC,MAAM,CAACI,QAAQ,EAAE0B,MAAM,CAAC;EAC9CE,SAAS,CAAC5B,QAAQ,GAAGA,QAAQ;EAC7B4B,SAAS,CAACL,KAAK,GAAI,EAAE,CAClBX,MAAM,CAAC,EAAAI,QAAA,GAAAK,OAAO,cAAAL,QAAA,uBAAPA,QAAA,CAASa,YAAY,KAAI,EAAE,CAAC,CACnCjB,MAAM,CAACW,KAAK,CAAC,CACbX,MAAM,CAAC,EAAAK,SAAA,GAAAI,OAAO,cAAAJ,SAAA,uBAAPA,SAAA,CAASa,WAAW,KAAI,EAAE,CAAC;EAErCF,SAAS,CAACG,QAAQ,CAACrB,IAAI,EAAEV,QAAQ,CAAC;EAElC,IAAI0B,MAAM,IAAIA,MAAM,CAACM,QAAQ,EAAE;IAC7BN,MAAM,CAACM,QAAQ,CAACC,MAAM,CAACP,MAAM,CAACM,QAAQ,CAACE,OAAO,CAACN,SAAS,CAAC,EAAE,CAAC,CAAC;EAC/D;EAEA,OAAOA,SAAS,CAACO,OAAO;AAC1B"}
@@ -55,8 +55,10 @@ export default class ChildProcessProxy {
55
55
  });
56
56
  childProcess.stderr.on('data', data => {
57
57
  console.log("Child process wrote to stderr: \"".concat(data, "\"."));
58
- this._clearTimeout();
59
- reject(new Error(data));
58
+ if (!props.ignoreStderr) {
59
+ this._clearTimeout();
60
+ reject(new Error(data));
61
+ }
60
62
  });
61
63
  childProcess.on('error', error => {
62
64
  console.log("Child process errored with ".concat(error));
@@ -1 +1 @@
1
- {"version":3,"file":"child-process-proxy.js","names":["ChildProcess","getAvailablePort","DEFAULT_PROPS","command","arguments","port","autoPort","wait","onSuccess","processProxy","console","log","concat","props","ChildProcessProxy","constructor","id","length","undefined","_defineProperty","start","args","Number","portArg","push","String","Promise","resolve","reject","_setTimeout","join","childProcess","spawn","stdout","on","data","toString","stderr","_clearTimeout","Error","error","code","stop","kill","exit","statusCode","process","message","callback","successTimer","setTimeout","clearTimeout"],"sources":["../../../../src/lib/process-utils/child-process-proxy.ts"],"sourcesContent":["/* eslint-disable no-console */\n// Avoid using named imports for Node builtins to help with \"empty\" resolution\n// for bundlers targeting browser environments. Access imports & types\n// through the `ChildProcess` object (e.g. `ChildProcess.spawn`, `ChildProcess.ChildProcess`).\nimport * as ChildProcess from 'child_process';\nimport {getAvailablePort} from './process-utils';\n\nexport type ChildProcessProxyProps = {\n command: string;\n arguments: string[];\n /** Whether to add a port specified arg */\n portArg?: string;\n /** Base port number */\n port?: number;\n /** Whether to search for an available port if the base port is occupied */\n autoPort?: boolean;\n /** Number of milliseconds to wait until concluding success */\n /** wait: 0 - infinity */\n wait?: number;\n /** Options passed on to Node'.js `spawn` */\n spawn?: ChildProcess.SpawnOptionsWithoutStdio;\n /** Callback when the */\n onStart?: (proxy: ChildProcessProxy) => void;\n onSuccess?: (proxy: ChildProcessProxy) => void;\n};\n\nconst DEFAULT_PROPS: ChildProcessProxyProps = {\n command: '',\n arguments: [],\n port: 5000,\n autoPort: true,\n wait: 2000,\n onSuccess: (processProxy) => {\n console.log(`Started ${processProxy.props.command}`);\n }\n};\n\n/**\n * Manager for a Node.js child process\n * Prepares arguments, starts, stops and tracks output\n */\nexport default class ChildProcessProxy {\n id: string;\n props: ChildProcessProxyProps = {...DEFAULT_PROPS};\n private childProcess: ChildProcess.ChildProcess | null = null;\n private port: number = 0;\n private successTimer?: any; // NodeJS.Timeout;\n\n // constructor(props?: {id?: string});\n constructor({id = 'browser-driver'} = {}) {\n this.id = id;\n }\n\n /** Starts a child process with the provided props */\n async start(props: ChildProcessProxyProps): Promise<object> {\n props = {...DEFAULT_PROPS, ...props};\n this.props = props;\n\n const args = [...props.arguments];\n\n // If portArg is set, we can look up an available port\n this.port = Number(props.port);\n if (props.portArg) {\n if (props.autoPort) {\n this.port = await getAvailablePort(props.port);\n }\n args.push(props.portArg, String(this.port));\n }\n\n return await new Promise((resolve, reject) => {\n try {\n this._setTimeout(() => {\n if (props.onSuccess) {\n props.onSuccess(this);\n }\n resolve({});\n });\n\n console.log(`Spawning ${props.command} ${props.arguments.join(' ')}`);\n const childProcess = ChildProcess.spawn(props.command, args, props.spawn);\n this.childProcess = childProcess;\n\n childProcess.stdout.on('data', (data) => {\n console.log(data.toString());\n });\n // TODO - add option regarding whether stderr should be treated as data\n childProcess.stderr.on('data', (data) => {\n console.log(`Child process wrote to stderr: \"${data}\".`);\n this._clearTimeout();\n reject(new Error(data));\n });\n childProcess.on('error', (error) => {\n console.log(`Child process errored with ${error}`);\n this._clearTimeout();\n reject(error);\n });\n childProcess.on('close', (code) => {\n console.log(`Child process exited with ${code}`);\n this.childProcess = null;\n this._clearTimeout();\n resolve({});\n });\n } catch (error) {\n reject(error);\n }\n });\n }\n\n /** Stops a running child process */\n async stop(): Promise<void> {\n if (this.childProcess) {\n this.childProcess.kill();\n this.childProcess = null;\n }\n }\n\n /** Exits this process */\n async exit(statusCode: number = 0): Promise<void> {\n try {\n await this.stop();\n // eslint-disable-next-line no-process-exit\n process.exit(statusCode);\n } catch (error) {\n console.error((error as Error).message || error);\n // eslint-disable-next-line no-process-exit\n process.exit(1);\n }\n }\n\n _setTimeout(callback: (...args: any[]) => void) {\n if (Number(this.props.wait) > 0) {\n this.successTimer = setTimeout(callback, this.props.wait);\n }\n }\n\n _clearTimeout() {\n if (this.successTimer) {\n clearTimeout(this.successTimer);\n }\n }\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"child-process-proxy.js","names":["ChildProcess","getAvailablePort","DEFAULT_PROPS","command","arguments","port","autoPort","wait","onSuccess","processProxy","console","log","concat","props","ChildProcessProxy","constructor","id","length","undefined","_defineProperty","start","args","Number","portArg","push","String","Promise","resolve","reject","_setTimeout","join","childProcess","spawn","stdout","on","data","toString","stderr","ignoreStderr","_clearTimeout","Error","error","code","stop","kill","exit","statusCode","process","message","callback","successTimer","setTimeout","clearTimeout"],"sources":["../../../../src/lib/process-utils/child-process-proxy.ts"],"sourcesContent":["/* eslint-disable no-console */\n// Avoid using named imports for Node builtins to help with \"empty\" resolution\n// for bundlers targeting browser environments. Access imports & types\n// through the `ChildProcess` object (e.g. `ChildProcess.spawn`, `ChildProcess.ChildProcess`).\nimport * as ChildProcess from 'child_process';\nimport {getAvailablePort} from './process-utils';\n\nexport type ChildProcessProxyProps = {\n command: string;\n arguments: string[];\n /** Whether to add a port specified arg */\n portArg?: string;\n /** Base port number */\n port?: number;\n /** Whether to search for an available port if the base port is occupied */\n autoPort?: boolean;\n /** Number of milliseconds to wait until concluding success */\n /** wait: 0 - infinity */\n wait?: number;\n /** Options passed on to Node'.js `spawn` */\n spawn?: ChildProcess.SpawnOptionsWithoutStdio;\n /** Should proceed if stderr stream recieved data */\n ignoreStderr?: boolean;\n /** Callback when the */\n onStart?: (proxy: ChildProcessProxy) => void;\n onSuccess?: (proxy: ChildProcessProxy) => void;\n};\n\nconst DEFAULT_PROPS: ChildProcessProxyProps = {\n command: '',\n arguments: [],\n port: 5000,\n autoPort: true,\n wait: 2000,\n onSuccess: (processProxy) => {\n console.log(`Started ${processProxy.props.command}`);\n }\n};\n\n/**\n * Manager for a Node.js child process\n * Prepares arguments, starts, stops and tracks output\n */\nexport default class ChildProcessProxy {\n id: string;\n props: ChildProcessProxyProps = {...DEFAULT_PROPS};\n private childProcess: ChildProcess.ChildProcess | null = null;\n private port: number = 0;\n private successTimer?: any; // NodeJS.Timeout;\n\n // constructor(props?: {id?: string});\n constructor({id = 'browser-driver'} = {}) {\n this.id = id;\n }\n\n /** Starts a child process with the provided props */\n async start(props: ChildProcessProxyProps): Promise<object> {\n props = {...DEFAULT_PROPS, ...props};\n this.props = props;\n\n const args = [...props.arguments];\n\n // If portArg is set, we can look up an available port\n this.port = Number(props.port);\n if (props.portArg) {\n if (props.autoPort) {\n this.port = await getAvailablePort(props.port);\n }\n args.push(props.portArg, String(this.port));\n }\n\n return await new Promise((resolve, reject) => {\n try {\n this._setTimeout(() => {\n if (props.onSuccess) {\n props.onSuccess(this);\n }\n resolve({});\n });\n\n console.log(`Spawning ${props.command} ${props.arguments.join(' ')}`);\n const childProcess = ChildProcess.spawn(props.command, args, props.spawn);\n this.childProcess = childProcess;\n\n childProcess.stdout.on('data', (data) => {\n console.log(data.toString());\n });\n childProcess.stderr.on('data', (data) => {\n console.log(`Child process wrote to stderr: \"${data}\".`);\n if (!props.ignoreStderr) {\n this._clearTimeout();\n reject(new Error(data));\n }\n });\n childProcess.on('error', (error) => {\n console.log(`Child process errored with ${error}`);\n this._clearTimeout();\n reject(error);\n });\n childProcess.on('close', (code) => {\n console.log(`Child process exited with ${code}`);\n this.childProcess = null;\n this._clearTimeout();\n resolve({});\n });\n } catch (error) {\n reject(error);\n }\n });\n }\n\n /** Stops a running child process */\n async stop(): Promise<void> {\n if (this.childProcess) {\n this.childProcess.kill();\n this.childProcess = null;\n }\n }\n\n /** Exits this process */\n async exit(statusCode: number = 0): Promise<void> {\n try {\n await this.stop();\n // eslint-disable-next-line no-process-exit\n process.exit(statusCode);\n } catch (error) {\n console.error((error as Error).message || error);\n // eslint-disable-next-line no-process-exit\n process.exit(1);\n }\n }\n\n _setTimeout(callback: (...args: any[]) => void) {\n if (Number(this.props.wait) > 0) {\n this.successTimer = setTimeout(callback, this.props.wait);\n }\n }\n\n _clearTimeout() {\n if (this.successTimer) {\n clearTimeout(this.successTimer);\n }\n }\n}\n"],"mappings":";AAIA,OAAO,KAAKA,YAAY,MAAM,eAAe;AAC7C,SAAQC,gBAAgB,QAAO,iBAAiB;AAuBhD,MAAMC,aAAqC,GAAG;EAC5CC,OAAO,EAAE,EAAE;EACXC,SAAS,EAAE,EAAE;EACbC,IAAI,EAAE,IAAI;EACVC,QAAQ,EAAE,IAAI;EACdC,IAAI,EAAE,IAAI;EACVC,SAAS,EAAGC,YAAY,IAAK;IAC3BC,OAAO,CAACC,GAAG,YAAAC,MAAA,CAAYH,YAAY,CAACI,KAAK,CAACV,OAAO,CAAE,CAAC;EACtD;AACF,CAAC;AAMD,eAAe,MAAMW,iBAAiB,CAAC;EAQrCC,WAAWA,CAAA,EAA+B;IAAA,IAA9B;MAACC,EAAE,GAAG;IAAgB,CAAC,GAAAZ,SAAA,CAAAa,MAAA,QAAAb,SAAA,QAAAc,SAAA,GAAAd,SAAA,MAAG,CAAC,CAAC;IAAAe,eAAA;IAAAA,eAAA,gBANR;MAAC,GAAGjB;IAAa,CAAC;IAAAiB,eAAA,uBACO,IAAI;IAAAA,eAAA,eACtC,CAAC;IAAAA,eAAA;IAKtB,IAAI,CAACH,EAAE,GAAGA,EAAE;EACd;EAGA,MAAMI,KAAKA,CAACP,KAA6B,EAAmB;IAC1DA,KAAK,GAAG;MAAC,GAAGX,aAAa;MAAE,GAAGW;IAAK,CAAC;IACpC,IAAI,CAACA,KAAK,GAAGA,KAAK;IAElB,MAAMQ,IAAI,GAAG,CAAC,GAAGR,KAAK,CAACT,SAAS,CAAC;IAGjC,IAAI,CAACC,IAAI,GAAGiB,MAAM,CAACT,KAAK,CAACR,IAAI,CAAC;IAC9B,IAAIQ,KAAK,CAACU,OAAO,EAAE;MACjB,IAAIV,KAAK,CAACP,QAAQ,EAAE;QAClB,IAAI,CAACD,IAAI,GAAG,MAAMJ,gBAAgB,CAACY,KAAK,CAACR,IAAI,CAAC;MAChD;MACAgB,IAAI,CAACG,IAAI,CAACX,KAAK,CAACU,OAAO,EAAEE,MAAM,CAAC,IAAI,CAACpB,IAAI,CAAC,CAAC;IAC7C;IAEA,OAAO,MAAM,IAAIqB,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;MAC5C,IAAI;QACF,IAAI,CAACC,WAAW,CAAC,MAAM;UACrB,IAAIhB,KAAK,CAACL,SAAS,EAAE;YACnBK,KAAK,CAACL,SAAS,CAAC,IAAI,CAAC;UACvB;UACAmB,OAAO,CAAC,CAAC,CAAC,CAAC;QACb,CAAC,CAAC;QAEFjB,OAAO,CAACC,GAAG,aAAAC,MAAA,CAAaC,KAAK,CAACV,OAAO,OAAAS,MAAA,CAAIC,KAAK,CAACT,SAAS,CAAC0B,IAAI,CAAC,GAAG,CAAC,CAAE,CAAC;QACrE,MAAMC,YAAY,GAAG/B,YAAY,CAACgC,KAAK,CAACnB,KAAK,CAACV,OAAO,EAAEkB,IAAI,EAAER,KAAK,CAACmB,KAAK,CAAC;QACzE,IAAI,CAACD,YAAY,GAAGA,YAAY;QAEhCA,YAAY,CAACE,MAAM,CAACC,EAAE,CAAC,MAAM,EAAGC,IAAI,IAAK;UACvCzB,OAAO,CAACC,GAAG,CAACwB,IAAI,CAACC,QAAQ,CAAC,CAAC,CAAC;QAC9B,CAAC,CAAC;QACFL,YAAY,CAACM,MAAM,CAACH,EAAE,CAAC,MAAM,EAAGC,IAAI,IAAK;UACvCzB,OAAO,CAACC,GAAG,qCAAAC,MAAA,CAAoCuB,IAAI,QAAI,CAAC;UACxD,IAAI,CAACtB,KAAK,CAACyB,YAAY,EAAE;YACvB,IAAI,CAACC,aAAa,CAAC,CAAC;YACpBX,MAAM,CAAC,IAAIY,KAAK,CAACL,IAAI,CAAC,CAAC;UACzB;QACF,CAAC,CAAC;QACFJ,YAAY,CAACG,EAAE,CAAC,OAAO,EAAGO,KAAK,IAAK;UAClC/B,OAAO,CAACC,GAAG,+BAAAC,MAAA,CAA+B6B,KAAK,CAAE,CAAC;UAClD,IAAI,CAACF,aAAa,CAAC,CAAC;UACpBX,MAAM,CAACa,KAAK,CAAC;QACf,CAAC,CAAC;QACFV,YAAY,CAACG,EAAE,CAAC,OAAO,EAAGQ,IAAI,IAAK;UACjChC,OAAO,CAACC,GAAG,8BAAAC,MAAA,CAA8B8B,IAAI,CAAE,CAAC;UAChD,IAAI,CAACX,YAAY,GAAG,IAAI;UACxB,IAAI,CAACQ,aAAa,CAAC,CAAC;UACpBZ,OAAO,CAAC,CAAC,CAAC,CAAC;QACb,CAAC,CAAC;MACJ,CAAC,CAAC,OAAOc,KAAK,EAAE;QACdb,MAAM,CAACa,KAAK,CAAC;MACf;IACF,CAAC,CAAC;EACJ;EAGA,MAAME,IAAIA,CAAA,EAAkB;IAC1B,IAAI,IAAI,CAACZ,YAAY,EAAE;MACrB,IAAI,CAACA,YAAY,CAACa,IAAI,CAAC,CAAC;MACxB,IAAI,CAACb,YAAY,GAAG,IAAI;IAC1B;EACF;EAGA,MAAMc,IAAIA,CAAA,EAAwC;IAAA,IAAvCC,UAAkB,GAAA1C,SAAA,CAAAa,MAAA,QAAAb,SAAA,QAAAc,SAAA,GAAAd,SAAA,MAAG,CAAC;IAC/B,IAAI;MACF,MAAM,IAAI,CAACuC,IAAI,CAAC,CAAC;MAEjBI,OAAO,CAACF,IAAI,CAACC,UAAU,CAAC;IAC1B,CAAC,CAAC,OAAOL,KAAK,EAAE;MACd/B,OAAO,CAAC+B,KAAK,CAAEA,KAAK,CAAWO,OAAO,IAAIP,KAAK,CAAC;MAEhDM,OAAO,CAACF,IAAI,CAAC,CAAC,CAAC;IACjB;EACF;EAEAhB,WAAWA,CAACoB,QAAkC,EAAE;IAC9C,IAAI3B,MAAM,CAAC,IAAI,CAACT,KAAK,CAACN,IAAI,CAAC,GAAG,CAAC,EAAE;MAC/B,IAAI,CAAC2C,YAAY,GAAGC,UAAU,CAACF,QAAQ,EAAE,IAAI,CAACpC,KAAK,CAACN,IAAI,CAAC;IAC3D;EACF;EAEAgC,aAAaA,CAAA,EAAG;IACd,IAAI,IAAI,CAACW,YAAY,EAAE;MACrBE,YAAY,CAAC,IAAI,CAACF,YAAY,CAAC;IACjC;EACF;AACF"}
@@ -1,8 +1,6 @@
1
1
  import { assert } from '../env-utils/assert';
2
2
  import { isBrowser } from '../env-utils/globals';
3
- import { VERSION as __VERSION__ } from '../env-utils/version';
4
- const NPM_TAG = 'beta';
5
- const VERSION = typeof "4.0.0-alpha.8" !== 'undefined' ? "4.0.0-alpha.8" : NPM_TAG;
3
+ import { VERSION, NPM_TAG } from '../env-utils/version';
6
4
  export function getWorkerName(worker) {
7
5
  const warning = worker.version !== VERSION ? " (worker-utils@".concat(VERSION, ")") : '';
8
6
  return "".concat(worker.name, "@").concat(worker.version).concat(warning);
@@ -1 +1 @@
1
- {"version":3,"file":"get-worker-url.js","names":["assert","isBrowser","VERSION","__VERSION__","NPM_TAG","getWorkerName","worker","warning","version","concat","name","getWorkerURL","options","arguments","length","undefined","workerOptions","id","workerFile","url","workerUrl","_workerType","module","versionTag"],"sources":["../../../../src/lib/worker-api/get-worker-url.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport type {WorkerObject, WorkerOptions} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {isBrowser} from '../env-utils/globals';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\nconst NPM_TAG = 'beta'; // 'beta', or 'latest' on release-branch\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : NPM_TAG;\n\n/**\n * Gets worker object's name (for debugging in Chrome thread inspector window)\n */\nexport function getWorkerName(worker: WorkerObject): string {\n const warning = worker.version !== VERSION ? ` (worker-utils@${VERSION})` : '';\n return `${worker.name}@${worker.version}${warning}`;\n}\n\n/**\n * Generate a worker URL based on worker object and options\n * @returns A URL to one of the following:\n * - a published worker on unpkg CDN\n * - a local test worker\n * - a URL provided by the user in options\n */\nexport function getWorkerURL(worker: WorkerObject, options: WorkerOptions = {}): string {\n const workerOptions = options[worker.id] || {};\n\n const workerFile = isBrowser ? `${worker.id}-worker.js` : `${worker.id}-worker-node.js`;\n\n let url = workerOptions.workerUrl;\n\n // HACK: Allow for non-nested workerUrl for the CompressionWorker.\n // For the compression worker, workerOptions is currently not nested correctly. For most loaders,\n // you'd have options within an object, i.e. `{mvt: {coordinates: ...}}` but the CompressionWorker\n // puts options at the top level, not within a `compression` key (its `id`). For this reason, the\n // above `workerOptions` will always be a string (i.e. `'gzip'`) for the CompressionWorker. To not\n // break backwards compatibility, we allow the CompressionWorker to have options at the top level.\n if (!url && worker.id === 'compression') {\n url = options.workerUrl;\n }\n\n // If URL is test, generate local loaders.gl url\n // @ts-ignore _workerType\n if (options._workerType === 'test') {\n url = `modules/${worker.module}/dist/${workerFile}`;\n }\n\n // If url override is not provided, generate a URL to published version on npm CDN unpkg.com\n if (!url) {\n // GENERATE\n let version = worker.version;\n // On master we need to load npm alpha releases published with the `beta` tag\n if (version === 'latest') {\n // throw new Error('latest worker version specified');\n version = NPM_TAG;\n }\n const versionTag = version ? `@${version}` : '';\n url = `https://unpkg.com/@loaders.gl/${worker.module}${versionTag}/dist/${workerFile}`;\n }\n\n assert(url);\n\n // Allow user to override location\n return url;\n}\n"],"mappings":"AAGA,SAAQA,MAAM,QAAO,qBAAqB;AAC1C,SAAQC,SAAS,QAAO,sBAAsB;AAC9C,SAAQC,OAAO,IAAIC,WAAW,QAAO,sBAAsB;AAE3D,MAAMC,OAAO,GAAG,MAAM;AACtB,MAAMF,OAAO,GAAG,sBAAkB,KAAK,WAAW,qBAAiBE,OAAO;AAK1E,OAAO,SAASC,aAAaA,CAACC,MAAoB,EAAU;EAC1D,MAAMC,OAAO,GAAGD,MAAM,CAACE,OAAO,KAAKN,OAAO,qBAAAO,MAAA,CAAqBP,OAAO,SAAM,EAAE;EAC9E,UAAAO,MAAA,CAAUH,MAAM,CAACI,IAAI,OAAAD,MAAA,CAAIH,MAAM,CAACE,OAAO,EAAAC,MAAA,CAAGF,OAAO;AACnD;AASA,OAAO,SAASI,YAAYA,CAACL,MAAoB,EAAuC;EAAA,IAArCM,OAAsB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EAC5E,MAAMG,aAAa,GAAGJ,OAAO,CAACN,MAAM,CAACW,EAAE,CAAC,IAAI,CAAC,CAAC;EAE9C,MAAMC,UAAU,GAAGjB,SAAS,MAAAQ,MAAA,CAAMH,MAAM,CAACW,EAAE,qBAAAR,MAAA,CAAkBH,MAAM,CAACW,EAAE,oBAAiB;EAEvF,IAAIE,GAAG,GAAGH,aAAa,CAACI,SAAS;EAQjC,IAAI,CAACD,GAAG,IAAIb,MAAM,CAACW,EAAE,KAAK,aAAa,EAAE;IACvCE,GAAG,GAAGP,OAAO,CAACQ,SAAS;EACzB;EAIA,IAAIR,OAAO,CAACS,WAAW,KAAK,MAAM,EAAE;IAClCF,GAAG,cAAAV,MAAA,CAAcH,MAAM,CAACgB,MAAM,YAAAb,MAAA,CAASS,UAAU,CAAE;EACrD;EAGA,IAAI,CAACC,GAAG,EAAE;IAER,IAAIX,OAAO,GAAGF,MAAM,CAACE,OAAO;IAE5B,IAAIA,OAAO,KAAK,QAAQ,EAAE;MAExBA,OAAO,GAAGJ,OAAO;IACnB;IACA,MAAMmB,UAAU,GAAGf,OAAO,OAAAC,MAAA,CAAOD,OAAO,IAAK,EAAE;IAC/CW,GAAG,oCAAAV,MAAA,CAAoCH,MAAM,CAACgB,MAAM,EAAAb,MAAA,CAAGc,UAAU,YAAAd,MAAA,CAASS,UAAU,CAAE;EACxF;EAEAlB,MAAM,CAACmB,GAAG,CAAC;EAGX,OAAOA,GAAG;AACZ"}
1
+ {"version":3,"file":"get-worker-url.js","names":["assert","isBrowser","VERSION","NPM_TAG","getWorkerName","worker","warning","version","concat","name","getWorkerURL","options","arguments","length","undefined","workerOptions","id","workerFile","url","workerUrl","_workerType","module","versionTag"],"sources":["../../../../src/lib/worker-api/get-worker-url.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport type {WorkerObject, WorkerOptions} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {isBrowser} from '../env-utils/globals';\nimport {VERSION, NPM_TAG} from '../env-utils/version';\n\n/**\n * Gets worker object's name (for debugging in Chrome thread inspector window)\n */\nexport function getWorkerName(worker: WorkerObject): string {\n const warning = worker.version !== VERSION ? ` (worker-utils@${VERSION})` : '';\n return `${worker.name}@${worker.version}${warning}`;\n}\n\n/**\n * Generate a worker URL based on worker object and options\n * @returns A URL to one of the following:\n * - a published worker on unpkg CDN\n * - a local test worker\n * - a URL provided by the user in options\n */\nexport function getWorkerURL(worker: WorkerObject, options: WorkerOptions = {}): string {\n const workerOptions = options[worker.id] || {};\n\n const workerFile = isBrowser ? `${worker.id}-worker.js` : `${worker.id}-worker-node.js`;\n\n let url = workerOptions.workerUrl;\n\n // HACK: Allow for non-nested workerUrl for the CompressionWorker.\n // For the compression worker, workerOptions is currently not nested correctly. For most loaders,\n // you'd have options within an object, i.e. `{mvt: {coordinates: ...}}` but the CompressionWorker\n // puts options at the top level, not within a `compression` key (its `id`). For this reason, the\n // above `workerOptions` will always be a string (i.e. `'gzip'`) for the CompressionWorker. To not\n // break backwards compatibility, we allow the CompressionWorker to have options at the top level.\n if (!url && worker.id === 'compression') {\n url = options.workerUrl;\n }\n\n // If URL is test, generate local loaders.gl url\n // @ts-ignore _workerType\n if (options._workerType === 'test') {\n url = `modules/${worker.module}/dist/${workerFile}`;\n }\n\n // If url override is not provided, generate a URL to published version on npm CDN unpkg.com\n if (!url) {\n // GENERATE\n let version = worker.version;\n // On master we need to load npm alpha releases published with the `beta` tag\n if (version === 'latest') {\n // throw new Error('latest worker version specified');\n version = NPM_TAG;\n }\n const versionTag = version ? `@${version}` : '';\n url = `https://unpkg.com/@loaders.gl/${worker.module}${versionTag}/dist/${workerFile}`;\n }\n\n assert(url);\n\n // Allow user to override location\n return url;\n}\n"],"mappings":"AAGA,SAAQA,MAAM,QAAO,qBAAqB;AAC1C,SAAQC,SAAS,QAAO,sBAAsB;AAC9C,SAAQC,OAAO,EAAEC,OAAO,QAAO,sBAAsB;AAKrD,OAAO,SAASC,aAAaA,CAACC,MAAoB,EAAU;EAC1D,MAAMC,OAAO,GAAGD,MAAM,CAACE,OAAO,KAAKL,OAAO,qBAAAM,MAAA,CAAqBN,OAAO,SAAM,EAAE;EAC9E,UAAAM,MAAA,CAAUH,MAAM,CAACI,IAAI,OAAAD,MAAA,CAAIH,MAAM,CAACE,OAAO,EAAAC,MAAA,CAAGF,OAAO;AACnD;AASA,OAAO,SAASI,YAAYA,CAACL,MAAoB,EAAuC;EAAA,IAArCM,OAAsB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EAC5E,MAAMG,aAAa,GAAGJ,OAAO,CAACN,MAAM,CAACW,EAAE,CAAC,IAAI,CAAC,CAAC;EAE9C,MAAMC,UAAU,GAAGhB,SAAS,MAAAO,MAAA,CAAMH,MAAM,CAACW,EAAE,qBAAAR,MAAA,CAAkBH,MAAM,CAACW,EAAE,oBAAiB;EAEvF,IAAIE,GAAG,GAAGH,aAAa,CAACI,SAAS;EAQjC,IAAI,CAACD,GAAG,IAAIb,MAAM,CAACW,EAAE,KAAK,aAAa,EAAE;IACvCE,GAAG,GAAGP,OAAO,CAACQ,SAAS;EACzB;EAIA,IAAIR,OAAO,CAACS,WAAW,KAAK,MAAM,EAAE;IAClCF,GAAG,cAAAV,MAAA,CAAcH,MAAM,CAACgB,MAAM,YAAAb,MAAA,CAASS,UAAU,CAAE;EACrD;EAGA,IAAI,CAACC,GAAG,EAAE;IAER,IAAIX,OAAO,GAAGF,MAAM,CAACE,OAAO;IAE5B,IAAIA,OAAO,KAAK,QAAQ,EAAE;MAExBA,OAAO,GAAGJ,OAAO;IACnB;IACA,MAAMmB,UAAU,GAAGf,OAAO,OAAAC,MAAA,CAAOD,OAAO,IAAK,EAAE;IAC/CW,GAAG,oCAAAV,MAAA,CAAoCH,MAAM,CAACgB,MAAM,EAAAb,MAAA,CAAGc,UAAU,YAAAd,MAAA,CAASS,UAAU,CAAE;EACxF;EAEAjB,MAAM,CAACkB,GAAG,CAAC;EAGX,OAAOA,GAAG;AACZ"}
@@ -1,2 +1,7 @@
1
- export declare const VERSION: string;
1
+ /**
2
+ * TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...
3
+ * 'beta' on beta branch, 'latest' on prod branch
4
+ */
5
+ export declare const NPM_TAG = "beta";
6
+ export declare const VERSION: any;
2
7
  //# sourceMappingURL=version.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/lib/env-utils/version.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,OAAO,QAAqE,CAAC"}
1
+ {"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/lib/env-utils/version.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,eAAO,MAAM,OAAO,SAAS,CAAC;AAsB9B,eAAO,MAAM,OAAO,KAAe,CAAC"}
@@ -13,6 +13,6 @@
13
13
  * @param moduleName
14
14
  * @param options
15
15
  */
16
- export declare function loadLibrary(libraryUrl: string, moduleName?: string | null, options?: object): Promise<any>;
17
- export declare function getLibraryUrl(library: string, moduleName?: string, options?: any): string;
16
+ export declare function loadLibrary(libraryUrl: string, moduleName?: string | null, options?: object, libraryName?: string | null): Promise<any>;
17
+ export declare function getLibraryUrl(library: string, moduleName?: string, options?: any, libraryName?: string | null): string;
18
18
  //# sourceMappingURL=library-utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"library-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/library-utils/library-utils.ts"],"names":[],"mappings":"AAeA;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,UAAU,GAAE,MAAM,GAAG,IAAW,EAChC,OAAO,GAAE,MAAW,GACnB,OAAO,CAAC,GAAG,CAAC,CAWd;AAGD,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,MAAM,CA8BzF"}
1
+ {"version":3,"file":"library-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/library-utils/library-utils.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,UAAU,GAAE,MAAM,GAAG,IAAW,EAChC,OAAO,GAAE,MAAW,EACpB,WAAW,GAAE,MAAM,GAAG,IAAW,GAChC,OAAO,CAAC,GAAG,CAAC,CAUd;AAGD,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,OAAO,GAAE,GAAQ,EACjB,WAAW,GAAE,MAAM,GAAG,IAAW,GAChC,MAAM,CAgCR"}
@@ -1,3 +1,15 @@
1
+ /**
2
+ * Load a file from local file system
3
+ * @param filename
4
+ * @returns
5
+ */
6
+ export declare function readFileAsArrayBuffer(filename: string): Promise<ArrayBuffer>;
7
+ /**
8
+ * Load a file from local file system
9
+ * @param filename
10
+ * @returns
11
+ */
12
+ export declare function readFileAsText(filename: string): Promise<string>;
1
13
  export declare function requireFromFile(filename: string): Promise<any>;
2
14
  export declare function requireFromString(code: string, filename?: string, options?: {
3
15
  prependPaths?: string[];
@@ -1 +1 @@
1
- {"version":3,"file":"require-utils.node.d.ts","sourceRoot":"","sources":["../../../src/lib/node/require-utils.node.ts"],"names":[],"mappings":"AAaA,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAWpE;AAQD,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,QAAQ,SAAK,EACb,OAAO,CAAC,EAAE;IACR,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,GACA,GAAG,CA6BL"}
1
+ {"version":3,"file":"require-utils.node.d.ts","sourceRoot":"","sources":["../../../src/lib/node/require-utils.node.ts"],"names":[],"mappings":"AAUA;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAOlF;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAOtE;AAMD,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAWpE;AAQD,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,QAAQ,SAAK,EACb,OAAO,CAAC,EAAE;IACR,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,GACA,GAAG,CA6BL"}
@@ -14,6 +14,8 @@ export type ChildProcessProxyProps = {
14
14
  wait?: number;
15
15
  /** Options passed on to Node'.js `spawn` */
16
16
  spawn?: ChildProcess.SpawnOptionsWithoutStdio;
17
+ /** Should proceed if stderr stream recieved data */
18
+ ignoreStderr?: boolean;
17
19
  /** Callback when the */
18
20
  onStart?: (proxy: ChildProcessProxy) => void;
19
21
  onSuccess?: (proxy: ChildProcessProxy) => void;
@@ -1 +1 @@
1
- {"version":3,"file":"child-process-proxy.d.ts","sourceRoot":"","sources":["../../../src/lib/process-utils/child-process-proxy.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,YAAY,MAAM,eAAe,CAAC;AAG9C,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,0CAA0C;IAC1C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uBAAuB;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,8DAA8D;IAC9D,yBAAyB;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,4CAA4C;IAC5C,KAAK,CAAC,EAAE,YAAY,CAAC,wBAAwB,CAAC;IAC9C,yBAAyB;IACzB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC7C,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAChD,CAAC;AAaF;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,sBAAsB,CAAsB;IACnD,OAAO,CAAC,YAAY,CAA0C;IAC9D,OAAO,CAAC,IAAI,CAAa;IACzB,OAAO,CAAC,YAAY,CAAC,CAAM;gBAGf,EAAC,EAAqB,EAAC;;KAAK;IAIxC,qDAAqD;IAC/C,KAAK,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC;IAsD3D,oCAAoC;IAC9B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3B,yBAAyB;IACnB,IAAI,CAAC,UAAU,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAYjD,WAAW,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI;IAM9C,aAAa;CAKd"}
1
+ {"version":3,"file":"child-process-proxy.d.ts","sourceRoot":"","sources":["../../../src/lib/process-utils/child-process-proxy.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,YAAY,MAAM,eAAe,CAAC;AAG9C,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,0CAA0C;IAC1C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uBAAuB;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,8DAA8D;IAC9D,yBAAyB;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,4CAA4C;IAC5C,KAAK,CAAC,EAAE,YAAY,CAAC,wBAAwB,CAAC;IAC9C,oDAAoD;IACpD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,yBAAyB;IACzB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC7C,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAChD,CAAC;AAaF;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,sBAAsB,CAAsB;IACnD,OAAO,CAAC,YAAY,CAA0C;IAC9D,OAAO,CAAC,IAAI,CAAa;IACzB,OAAO,CAAC,YAAY,CAAC,CAAM;gBAGf,EAAC,EAAqB,EAAC;;KAAK;IAIxC,qDAAqD;IAC/C,KAAK,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC;IAuD3D,oCAAoC;IAC9B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3B,yBAAyB;IACnB,IAAI,CAAC,UAAU,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAYjD,WAAW,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI;IAM9C,aAAa;CAKd"}
@@ -1 +1 @@
1
- {"version":3,"file":"get-worker-url.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-api/get-worker-url.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAE,aAAa,EAAC,MAAM,aAAa,CAAC;AAQ7D;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAG1D;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,GAAE,aAAkB,GAAG,MAAM,CAwCtF"}
1
+ {"version":3,"file":"get-worker-url.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-api/get-worker-url.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAE,aAAa,EAAC,MAAM,aAAa,CAAC;AAK7D;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAG1D;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,GAAE,aAAkB,GAAG,MAAM,CAwCtF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@loaders.gl/worker-utils",
3
- "version": "4.0.0-alpha.8",
3
+ "version": "4.0.0-beta.1",
4
4
  "description": "Utilities for running tasks on worker threads",
5
5
  "license": "MIT",
6
6
  "publishConfig": {
@@ -26,17 +26,16 @@
26
26
  ],
27
27
  "browser": {
28
28
  "child_process": false,
29
+ "module": false,
30
+ "path": false,
29
31
  "fs": false,
30
32
  "./src/lib/node/worker_threads.ts": "./src/lib/node/worker_threads-browser.ts",
31
- "./dist/lib/node/worker_threads.js": "./dist/lib/node/worker_threads-browser.js",
32
33
  "./dist/es5/lib/node/worker_threads.js": "./dist/es5/lib/node/worker_threads-browser.js",
33
34
  "./dist/esm/lib/node/worker_threads.js": "./dist/esm/lib/node/worker_threads-browser.js",
34
35
  "./src/lib/node/require-utils.node.ts": false,
35
- "./dist/lib/node/require-utils.node.js": false,
36
36
  "./dist/es5/lib/node/require-utils.node.js": false,
37
37
  "./dist/esm/lib/node/require-utils.node.js": false,
38
38
  "./src/lib/process-utils/child-process-proxy.ts": false,
39
- "./dist/lib/process-utils/child-process-proxy.js": false,
40
39
  "./dist/es5/lib/process-utils/child-process-proxy.js": false,
41
40
  "./dist/esm/lib/process-utils/child-process-proxy.js": false
42
41
  },
@@ -50,5 +49,5 @@
50
49
  "dependencies": {
51
50
  "@babel/runtime": "^7.3.1"
52
51
  },
53
- "gitHead": "c35d6640c8d26deab99e277a8e698b5174233789"
52
+ "gitHead": "35c625e67132b0784e597d9ddabae8aefea29ff2"
54
53
  }
@@ -1,13 +1,29 @@
1
1
  // Version constant cannot be imported, it needs to correspond to the build version of **this** module.
2
- // __VERSION__ is injected by babel-plugin-version-inline
3
2
 
4
- // Change to `latest` on production branches
5
- const DEFAULT_VERSION = 'beta';
3
+ /**
4
+ * TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...
5
+ * 'beta' on beta branch, 'latest' on prod branch
6
+ */
7
+ export const NPM_TAG = 'beta'; // Change to `latest` on production branches
8
+
6
9
  declare let __VERSION__: string;
7
- export const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : DEFAULT_VERSION;
8
- if (typeof __VERSION__ === 'undefined') {
9
- // eslint-disable-next-line
10
- console.error(
11
- 'loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.'
12
- );
10
+
11
+ function getVersion() {
12
+ if (!globalThis._loadersgl_?.version) {
13
+ globalThis._loadersgl_ = globalThis._loadersgl_ || {};
14
+ // __VERSION__ is injected by babel-plugin-version-inline
15
+ if (typeof __VERSION__ === 'undefined') {
16
+ // eslint-disable-next-line
17
+ console.error(
18
+ 'loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.'
19
+ );
20
+ globalThis._loadersgl_.version = NPM_TAG;
21
+ } else {
22
+ globalThis._loadersgl_.version = __VERSION__;
23
+ }
24
+ }
25
+
26
+ return globalThis._loadersgl_.version;
13
27
  }
28
+
29
+ export const VERSION = getVersion();