@loaders.gl/worker-utils 4.0.0-alpha.18 → 4.0.0-alpha.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/dist/es5/lib/env-utils/version.js +2 -2
  2. package/dist/es5/lib/library-utils/library-utils.js +18 -13
  3. package/dist/es5/lib/library-utils/library-utils.js.map +1 -1
  4. package/dist/es5/lib/worker-api/get-worker-url.js +1 -1
  5. package/dist/esm/lib/env-utils/version.js +2 -2
  6. package/dist/esm/lib/library-utils/library-utils.js +14 -10
  7. package/dist/esm/lib/library-utils/library-utils.js.map +1 -1
  8. package/dist/esm/lib/worker-api/get-worker-url.js +1 -1
  9. package/dist/lib/library-utils/library-utils.d.ts +2 -2
  10. package/dist/lib/library-utils/library-utils.d.ts.map +1 -1
  11. package/dist/lib/library-utils/library-utils.js +11 -10
  12. package/package.json +2 -2
  13. package/src/lib/library-utils/library-utils.ts +18 -10
package/dist/es5/lib/env-utils/version.js CHANGED
@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.VERSION = void 0;
7
7
  var DEFAULT_VERSION = 'beta';
8
- var VERSION = typeof "4.0.0-alpha.18" !== 'undefined' ? "4.0.0-alpha.18" : DEFAULT_VERSION;
8
+ var VERSION = typeof "4.0.0-alpha.19" !== 'undefined' ? "4.0.0-alpha.19" : DEFAULT_VERSION;
9
9
  exports.VERSION = VERSION;
10
- if (typeof "4.0.0-alpha.18" === 'undefined') {
10
+ if (typeof "4.0.0-alpha.19" === 'undefined') {
11
11
  console.error('loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.');
12
12
  }
13
13
  //# sourceMappingURL=version.js.map
package/dist/es5/lib/library-utils/library-utils.js CHANGED
@@ -16,7 +16,7 @@ var _version = require("../env-utils/version");
16
16
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
17
17
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
18
18
  var LATEST = 'beta';
19
- var VERSION = typeof "4.0.0-alpha.18" !== 'undefined' ? "4.0.0-alpha.18" : LATEST;
19
+ var VERSION = typeof "4.0.0-alpha.19" !== 'undefined' ? "4.0.0-alpha.19" : LATEST;
20
20
  var loadLibraryPromises = {};
21
21
  function loadLibrary(_x) {
22
22
  return _loadLibrary.apply(this, arguments);
@@ -25,21 +25,23 @@ function _loadLibrary() {
25
25
  _loadLibrary = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(libraryUrl) {
26
26
  var moduleName,
27
27
  options,
28
+ libraryName,
28
29
  _args = arguments;
29
30
  return _regenerator.default.wrap(function _callee$(_context) {
30
31
  while (1) switch (_context.prev = _context.next) {
31
32
  case 0:
32
33
  moduleName = _args.length > 1 && _args[1] !== undefined ? _args[1] : null;
33
34
  options = _args.length > 2 && _args[2] !== undefined ? _args[2] : {};
35
+ libraryName = _args.length > 3 && _args[3] !== undefined ? _args[3] : null;
34
36
  if (moduleName) {
35
- libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);
37
+ libraryUrl = getLibraryUrl(libraryUrl, moduleName, options, libraryName);
36
38
  }
37
39
  loadLibraryPromises[libraryUrl] = loadLibraryPromises[libraryUrl] || loadLibraryFromFile(libraryUrl);
38
- _context.next = 6;
40
+ _context.next = 7;
39
41
  return loadLibraryPromises[libraryUrl];
40
- case 6:
41
- return _context.abrupt("return", _context.sent);
42
42
  case 7:
43
+ return _context.abrupt("return", _context.sent);
44
+ case 8:
43
45
  case "end":
44
46
  return _context.stop();
45
47
  }
@@ -47,25 +49,28 @@ function _loadLibrary() {
47
49
  }));
48
50
  return _loadLibrary.apply(this, arguments);
49
51
  }
50
- function getLibraryUrl(library, moduleName, options) {
51
- if (library.startsWith('http')) {
52
+ function getLibraryUrl(library, moduleName) {
53
+ var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
54
+ var libraryName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
55
+ if (!options.useLocalLibraries && library.startsWith('http')) {
52
56
  return library;
53
57
  }
58
+ libraryName = libraryName || library;
54
59
  var modules = options.modules || {};
55
- if (modules[library]) {
56
- return modules[library];
60
+ if (modules[libraryName]) {
61
+ return modules[libraryName];
57
62
  }
58
63
  if (!_globals.isBrowser) {
59
- return "modules/".concat(moduleName, "/dist/libs/").concat(library);
64
+ return "modules/".concat(moduleName, "/dist/libs/").concat(libraryName);
60
65
  }
61
66
  if (options.CDN) {
62
67
  (0, _assert.assert)(options.CDN.startsWith('http'));
63
- return "".concat(options.CDN, "/").concat(moduleName, "@").concat(VERSION, "/dist/libs/").concat(library);
68
+ return "".concat(options.CDN, "/").concat(moduleName, "@").concat(VERSION, "/dist/libs/").concat(libraryName);
64
69
  }
65
70
  if (_globals.isWorker) {
66
- return "../src/libs/".concat(library);
71
+ return "../src/libs/".concat(libraryName);
67
72
  }
68
- return "modules/".concat(moduleName, "/src/libs/").concat(library);
73
+ return "modules/".concat(moduleName, "/src/libs/").concat(libraryName);
69
74
  }
70
75
  function loadLibraryFromFile(_x2) {
71
76
  return _loadLibraryFromFile.apply(this, arguments);
package/dist/es5/lib/library-utils/library-utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"library-utils.js","names":["_globals","require","node","_interopRequireWildcard","_assert","_version","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","_typeof","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","LATEST","VERSION","loadLibraryPromises","loadLibrary","_x","_loadLibrary","apply","arguments","_asyncToGenerator2","_regenerator","mark","_callee","libraryUrl","moduleName","options","_args","wrap","_callee$","_context","prev","next","length","undefined","getLibraryUrl","loadLibraryFromFile","abrupt","sent","stop","library","startsWith","modules","isBrowser","concat","CDN","assert","isWorker","_x2","_loadLibraryFromFile","_callee2","scriptSource","_callee2$","_context2","endsWith","loadAsArrayBuffer","t0","requireFromFile","t1","importScripts","loadAsText","loadLibraryFromString","id","requireFromString","eval","global","script","document","createElement","appendChild","createTextNode","e","text","body","_x3","_loadAsArrayBuffer","_callee3","url","response","_callee3$","_context3","readFileAsArrayBuffer","fetch","arrayBuffer","_x4","_loadAsText","_callee4","_callee4$","_context4","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 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 // 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 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":"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"}
1
+ {"version":3,"file":"library-utils.js","names":["_globals","require","node","_interopRequireWildcard","_assert","_version","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","_typeof","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","LATEST","VERSION","loadLibraryPromises","loadLibrary","_x","_loadLibrary","apply","arguments","_asyncToGenerator2","_regenerator","mark","_callee","libraryUrl","moduleName","options","libraryName","_args","wrap","_callee$","_context","prev","next","length","undefined","getLibraryUrl","loadLibraryFromFile","abrupt","sent","stop","library","useLocalLibraries","startsWith","modules","isBrowser","concat","CDN","assert","isWorker","_x2","_loadLibraryFromFile","_callee2","scriptSource","_callee2$","_context2","endsWith","loadAsArrayBuffer","t0","requireFromFile","t1","importScripts","loadAsText","loadLibraryFromString","id","requireFromString","eval","global","script","document","createElement","appendChild","createTextNode","e","text","body","_x3","_loadAsArrayBuffer","_callee3","url","response","_callee3$","_context3","readFileAsArrayBuffer","fetch","arrayBuffer","_x4","_loadAsText","_callee4","_callee4$","_context4","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 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 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":"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"}
package/dist/es5/lib/worker-api/get-worker-url.js CHANGED
@@ -9,7 +9,7 @@ var _assert = require("../env-utils/assert");
9
9
  var _globals = require("../env-utils/globals");
10
10
  var _version = require("../env-utils/version");
11
11
  var NPM_TAG = 'beta';
12
- var VERSION = typeof "4.0.0-alpha.18" !== 'undefined' ? "4.0.0-alpha.18" : NPM_TAG;
12
+ var VERSION = typeof "4.0.0-alpha.19" !== 'undefined' ? "4.0.0-alpha.19" : NPM_TAG;
13
13
  function getWorkerName(worker) {
14
14
  var warning = worker.version !== VERSION ? " (worker-utils@".concat(VERSION, ")") : '';
15
15
  return "".concat(worker.name, "@").concat(worker.version).concat(warning);
package/dist/esm/lib/env-utils/version.js CHANGED
@@ -1,6 +1,6 @@
1
1
  const DEFAULT_VERSION = 'beta';
2
- export const VERSION = typeof "4.0.0-alpha.18" !== 'undefined' ? "4.0.0-alpha.18" : DEFAULT_VERSION;
3
- if (typeof "4.0.0-alpha.18" === 'undefined') {
2
+ export const VERSION = typeof "4.0.0-alpha.19" !== 'undefined' ? "4.0.0-alpha.19" : DEFAULT_VERSION;
3
+ if (typeof "4.0.0-alpha.19" === 'undefined') {
4
4
  console.error('loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.');
5
5
  }
6
6
  //# sourceMappingURL=version.js.map
package/dist/esm/lib/library-utils/library-utils.js CHANGED
@@ -3,36 +3,40 @@ import * as node from '../node/require-utils.node';
3
3
  import { assert } from '../env-utils/assert';
4
4
  import { VERSION as __VERSION__ } from '../env-utils/version';
5
5
  const LATEST = 'beta';
6
- const VERSION = typeof "4.0.0-alpha.18" !== 'undefined' ? "4.0.0-alpha.18" : LATEST;
6
+ const VERSION = typeof "4.0.0-alpha.19" !== 'undefined' ? "4.0.0-alpha.19" : LATEST;
7
7
  const loadLibraryPromises = {};
8
8
  export async function loadLibrary(libraryUrl) {
9
9
  let moduleName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
10
10
  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
11
+ let libraryName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
11
12
  if (moduleName) {
12
- libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);
13
+ libraryUrl = getLibraryUrl(libraryUrl, moduleName, options, libraryName);
13
14
  }
14
15
  loadLibraryPromises[libraryUrl] = loadLibraryPromises[libraryUrl] || loadLibraryFromFile(libraryUrl);
15
16
  return await loadLibraryPromises[libraryUrl];
16
17
  }
17
- export function getLibraryUrl(library, moduleName, options) {
18
- if (library.startsWith('http')) {
18
+ export function getLibraryUrl(library, moduleName) {
19
+ let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
20
+ let libraryName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
21
+ if (!options.useLocalLibraries && library.startsWith('http')) {
19
22
  return library;
20
23
  }
24
+ libraryName = libraryName || library;
21
25
  const modules = options.modules || {};
22
- if (modules[library]) {
23
- return modules[library];
26
+ if (modules[libraryName]) {
27
+ return modules[libraryName];
24
28
  }
25
29
  if (!isBrowser) {
26
- return "modules/".concat(moduleName, "/dist/libs/").concat(library);
30
+ return "modules/".concat(moduleName, "/dist/libs/").concat(libraryName);
27
31
  }
28
32
  if (options.CDN) {
29
33
  assert(options.CDN.startsWith('http'));
30
- return "".concat(options.CDN, "/").concat(moduleName, "@").concat(VERSION, "/dist/libs/").concat(library);
34
+ return "".concat(options.CDN, "/").concat(moduleName, "@").concat(VERSION, "/dist/libs/").concat(libraryName);
31
35
  }
32
36
  if (isWorker) {
33
- return "../src/libs/".concat(library);
37
+ return "../src/libs/".concat(libraryName);
34
38
  }
35
- return "modules/".concat(moduleName, "/src/libs/").concat(library);
39
+ return "modules/".concat(moduleName, "/src/libs/").concat(libraryName);
36
40
  }
37
41
  async function loadLibraryFromFile(libraryUrl) {
38
42
  if (libraryUrl.endsWith('wasm')) {
package/dist/esm/lib/library-utils/library-utils.js.map CHANGED
@@ -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","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 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 // 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 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":"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"}
1
+ {"version":3,"file":"library-utils.js","names":["global","isBrowser","isWorker","node","assert","VERSION","__VERSION__","LATEST","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 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 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":"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"}
package/dist/esm/lib/worker-api/get-worker-url.js CHANGED
@@ -2,7 +2,7 @@ import { assert } from '../env-utils/assert';
2
2
  import { isBrowser } from '../env-utils/globals';
3
3
  import { VERSION as __VERSION__ } from '../env-utils/version';
4
4
  const NPM_TAG = 'beta';
5
- const VERSION = typeof "4.0.0-alpha.18" !== 'undefined' ? "4.0.0-alpha.18" : NPM_TAG;
5
+ const VERSION = typeof "4.0.0-alpha.19" !== 'undefined' ? "4.0.0-alpha.19" : NPM_TAG;
6
6
  export function getWorkerName(worker) {
7
7
  const warning = worker.version !== VERSION ? " (worker-utils@".concat(VERSION, ")") : '';
8
8
  return "".concat(worker.name, "@").concat(worker.version).concat(warning);
package/dist/lib/library-utils/library-utils.d.ts CHANGED
@@ -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
package/dist/lib/library-utils/library-utils.d.ts.map CHANGED
@@ -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,CAUd;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":"AAeA;;;;;;;;;;;;;;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"}
package/dist/lib/library-utils/library-utils.js CHANGED
@@ -51,9 +51,9 @@ const loadLibraryPromises = {}; // promises
51
51
  * @param moduleName
52
52
  * @param options
53
53
  */
54
- async function loadLibrary(libraryUrl, moduleName = null, options = {}) {
54
+ async function loadLibrary(libraryUrl, moduleName = null, options = {}, libraryName = null) {
55
55
  if (moduleName) {
56
- libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);
56
+ libraryUrl = getLibraryUrl(libraryUrl, moduleName, options, libraryName);
57
57
  }
58
58
  // Ensure libraries are only loaded once
59
59
  loadLibraryPromises[libraryUrl] =
@@ -63,31 +63,32 @@ async function loadLibrary(libraryUrl, moduleName = null, options = {}) {
63
63
  }
64
64
  exports.loadLibrary = loadLibrary;
65
65
  // TODO - sort out how to resolve paths for main/worker and dev/prod
66
- function getLibraryUrl(library, moduleName, options) {
66
+ function getLibraryUrl(library, moduleName, options = {}, libraryName = null) {
67
67
  // Check if already a URL
68
- if (library.startsWith('http')) {
68
+ if (!options.useLocalLibraries && library.startsWith('http')) {
69
69
  return library;
70
70
  }
71
+ libraryName = libraryName || library;
71
72
  // Allow application to import and supply libraries through `options.modules`
72
73
  const modules = options.modules || {};
73
- if (modules[library]) {
74
- return modules[library];
74
+ if (modules[libraryName]) {
75
+ return modules[libraryName];
75
76
  }
76
77
  // Load from local files, not from CDN scripts in Node.js
77
78
  // TODO - needs to locate the modules directory when installed!
78
79
  if (!globals_1.isBrowser) {
79
- return `modules/${moduleName}/dist/libs/${library}`;
80
+ return `modules/${moduleName}/dist/libs/${libraryName}`;
80
81
  }
81
82
  // In browser, load from external scripts
82
83
  if (options.CDN) {
83
84
  (0, assert_1.assert)(options.CDN.startsWith('http'));
84
- return `${options.CDN}/${moduleName}@${VERSION}/dist/libs/${library}`;
85
+ return `${options.CDN}/${moduleName}@${VERSION}/dist/libs/${libraryName}`;
85
86
  }
86
87
  // TODO - loading inside workers requires paths relative to worker script location...
87
88
  if (globals_1.isWorker) {
88
- return `../src/libs/${library}`;
89
+ return `../src/libs/${libraryName}`;
89
90
  }
90
- return `modules/${moduleName}/src/libs/${library}`;
91
+ return `modules/${moduleName}/src/libs/${libraryName}`;
91
92
  }
92
93
  exports.getLibraryUrl = getLibraryUrl;
93
94
  async function loadLibraryFromFile(libraryUrl) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@loaders.gl/worker-utils",
3
- "version": "4.0.0-alpha.18",
3
+ "version": "4.0.0-alpha.19",
4
4
  "description": "Utilities for running tasks on worker threads",
5
5
  "license": "MIT",
6
6
  "publishConfig": {
@@ -50,5 +50,5 @@
50
50
  "dependencies": {
51
51
  "@babel/runtime": "^7.3.1"
52
52
  },
53
- "gitHead": "7bc633f46560f661bdd46cf1015ea27b3694ebce"
53
+ "gitHead": "2ca50ec4e1d312c124eb7c93c60ab6fd17ee833e"
54
54
  }
package/src/lib/library-utils/library-utils.ts CHANGED
@@ -31,10 +31,11 @@ const loadLibraryPromises: Record<string, Promise<any>> = {}; // promises
31
31
  export async function loadLibrary(
32
32
  libraryUrl: string,
33
33
  moduleName: string | null = null,
34
- options: object = {}
34
+ options: object = {},
35
+ libraryName: string | null = null
35
36
  ): Promise<any> {
36
37
  if (moduleName) {
37
- libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);
38
+ libraryUrl = getLibraryUrl(libraryUrl, moduleName, options, libraryName);
38
39
  }
39
40
  // Ensure libraries are only loaded once
40
41
 
@@ -45,36 +46,43 @@ export async function loadLibrary(
45
46
  }
46
47
 
47
48
  // TODO - sort out how to resolve paths for main/worker and dev/prod
48
- export function getLibraryUrl(library: string, moduleName?: string, options?: any): string {
49
+ export function getLibraryUrl(
50
+ library: string,
51
+ moduleName?: string,
52
+ options: any = {},
53
+ libraryName: string | null = null
54
+ ): string {
49
55
  // Check if already a URL
50
- if (library.startsWith('http')) {
56
+ if (!options.useLocalLibraries && library.startsWith('http')) {
51
57
  return library;
52
58
  }
53
59
 
60
+ libraryName = libraryName || library;
61
+
54
62
  // Allow application to import and supply libraries through `options.modules`
55
63
  const modules = options.modules || {};
56
- if (modules[library]) {
57
- return modules[library];
64
+ if (modules[libraryName]) {
65
+ return modules[libraryName];
58
66
  }
59
67
 
60
68
  // Load from local files, not from CDN scripts in Node.js
61
69
  // TODO - needs to locate the modules directory when installed!
62
70
  if (!isBrowser) {
63
- return `modules/${moduleName}/dist/libs/${library}`;
71
+ return `modules/${moduleName}/dist/libs/${libraryName}`;
64
72
  }
65
73
 
66
74
  // In browser, load from external scripts
67
75
  if (options.CDN) {
68
76
  assert(options.CDN.startsWith('http'));
69
- return `${options.CDN}/${moduleName}@${VERSION}/dist/libs/${library}`;
77
+ return `${options.CDN}/${moduleName}@${VERSION}/dist/libs/${libraryName}`;
70
78
  }
71
79
 
72
80
  // TODO - loading inside workers requires paths relative to worker script location...
73
81
  if (isWorker) {
74
- return `../src/libs/${library}`;
82
+ return `../src/libs/${libraryName}`;
75
83
  }
76
84
 
77
- return `modules/${moduleName}/src/libs/${library}`;
85
+ return `modules/${moduleName}/src/libs/${libraryName}`;
78
86
  }
79
87
 
80
88
  async function loadLibraryFromFile(libraryUrl: string): Promise<any> {