@loaders.gl/worker-utils 4.0.0-alpha.16 → 4.0.0-alpha.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/es5/lib/env-utils/version.js +2 -2
- package/dist/es5/lib/library-utils/library-utils.js +90 -30
- package/dist/es5/lib/library-utils/library-utils.js.map +1 -1
- package/dist/es5/lib/node/require-utils.node.js +78 -11
- package/dist/es5/lib/node/require-utils.node.js.map +1 -1
- package/dist/es5/lib/worker-api/get-worker-url.js +1 -1
- package/dist/esm/lib/env-utils/version.js +2 -2
- package/dist/esm/lib/library-utils/library-utils.js +17 -5
- package/dist/esm/lib/library-utils/library-utils.js.map +1 -1
- package/dist/esm/lib/node/require-utils.node.js +17 -0
- package/dist/esm/lib/node/require-utils.node.js.map +1 -1
- package/dist/esm/lib/worker-api/get-worker-url.js +1 -1
- package/dist/lib/library-utils/library-utils.d.ts.map +1 -1
- package/dist/lib/library-utils/library-utils.js +21 -4
- package/dist/lib/node/require-utils.node.d.ts +12 -0
- package/dist/lib/node/require-utils.node.d.ts.map +1 -1
- package/dist/lib/node/require-utils.node.js +30 -1
- package/package.json +2 -2
- package/src/lib/library-utils/library-utils.ts +23 -5
- package/src/lib/node/require-utils.node.ts +29 -0
|
@@ -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.
|
|
8
|
+
var VERSION = typeof "4.0.0-alpha.18" !== 'undefined' ? "4.0.0-alpha.18" : DEFAULT_VERSION;
|
|
9
9
|
exports.VERSION = VERSION;
|
|
10
|
-
if (typeof "4.0.0-alpha.
|
|
10
|
+
if (typeof "4.0.0-alpha.18" === '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
|
|
@@ -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.
|
|
19
|
+
var VERSION = typeof "4.0.0-alpha.18" !== 'undefined' ? "4.0.0-alpha.18" : LATEST;
|
|
20
20
|
var loadLibraryPromises = {};
|
|
21
21
|
function loadLibrary(_x) {
|
|
22
22
|
return _loadLibrary.apply(this, arguments);
|
|
@@ -72,64 +72,56 @@ function loadLibraryFromFile(_x2) {
|
|
|
72
72
|
}
|
|
73
73
|
function _loadLibraryFromFile() {
|
|
74
74
|
_loadLibraryFromFile = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(libraryUrl) {
|
|
75
|
-
var
|
|
75
|
+
var scriptSource;
|
|
76
76
|
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
77
77
|
while (1) switch (_context2.prev = _context2.next) {
|
|
78
78
|
case 0:
|
|
79
79
|
if (!libraryUrl.endsWith('wasm')) {
|
|
80
|
-
_context2.next =
|
|
80
|
+
_context2.next = 4;
|
|
81
81
|
break;
|
|
82
82
|
}
|
|
83
83
|
_context2.next = 3;
|
|
84
|
-
return
|
|
84
|
+
return loadAsArrayBuffer(libraryUrl);
|
|
85
85
|
case 3:
|
|
86
|
-
_response = _context2.sent;
|
|
87
|
-
_context2.next = 6;
|
|
88
|
-
return _response.arrayBuffer();
|
|
89
|
-
case 6:
|
|
90
86
|
return _context2.abrupt("return", _context2.sent);
|
|
91
|
-
case
|
|
87
|
+
case 4:
|
|
92
88
|
if (_globals.isBrowser) {
|
|
93
|
-
_context2.next =
|
|
89
|
+
_context2.next = 17;
|
|
94
90
|
break;
|
|
95
91
|
}
|
|
96
|
-
_context2.prev =
|
|
92
|
+
_context2.prev = 5;
|
|
97
93
|
_context2.t0 = node && node.requireFromFile;
|
|
98
94
|
if (!_context2.t0) {
|
|
99
|
-
_context2.next =
|
|
95
|
+
_context2.next = 11;
|
|
100
96
|
break;
|
|
101
97
|
}
|
|
102
|
-
_context2.next =
|
|
98
|
+
_context2.next = 10;
|
|
103
99
|
return node.requireFromFile(libraryUrl);
|
|
104
|
-
case
|
|
100
|
+
case 10:
|
|
105
101
|
_context2.t0 = _context2.sent;
|
|
106
|
-
case
|
|
102
|
+
case 11:
|
|
107
103
|
return _context2.abrupt("return", _context2.t0);
|
|
108
|
-
case
|
|
109
|
-
_context2.prev =
|
|
110
|
-
_context2.t1 = _context2["catch"](
|
|
104
|
+
case 14:
|
|
105
|
+
_context2.prev = 14;
|
|
106
|
+
_context2.t1 = _context2["catch"](5);
|
|
111
107
|
return _context2.abrupt("return", null);
|
|
112
|
-
case
|
|
108
|
+
case 17:
|
|
113
109
|
if (!_globals.isWorker) {
|
|
114
|
-
_context2.next =
|
|
110
|
+
_context2.next = 19;
|
|
115
111
|
break;
|
|
116
112
|
}
|
|
117
113
|
return _context2.abrupt("return", importScripts(libraryUrl));
|
|
118
|
-
case
|
|
119
|
-
_context2.next =
|
|
120
|
-
return
|
|
121
|
-
case
|
|
122
|
-
response = _context2.sent;
|
|
123
|
-
_context2.next = 27;
|
|
124
|
-
return response.text();
|
|
125
|
-
case 27:
|
|
114
|
+
case 19:
|
|
115
|
+
_context2.next = 21;
|
|
116
|
+
return loadAsText(libraryUrl);
|
|
117
|
+
case 21:
|
|
126
118
|
scriptSource = _context2.sent;
|
|
127
119
|
return _context2.abrupt("return", loadLibraryFromString(scriptSource, libraryUrl));
|
|
128
|
-
case
|
|
120
|
+
case 23:
|
|
129
121
|
case "end":
|
|
130
122
|
return _context2.stop();
|
|
131
123
|
}
|
|
132
|
-
}, _callee2, null, [[
|
|
124
|
+
}, _callee2, null, [[5, 14]]);
|
|
133
125
|
}));
|
|
134
126
|
return _loadLibraryFromFile.apply(this, arguments);
|
|
135
127
|
}
|
|
@@ -151,4 +143,72 @@ function loadLibraryFromString(scriptSource, id) {
|
|
|
151
143
|
document.body.appendChild(script);
|
|
152
144
|
return null;
|
|
153
145
|
}
|
|
146
|
+
function loadAsArrayBuffer(_x3) {
|
|
147
|
+
return _loadAsArrayBuffer.apply(this, arguments);
|
|
148
|
+
}
|
|
149
|
+
function _loadAsArrayBuffer() {
|
|
150
|
+
_loadAsArrayBuffer = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(url) {
|
|
151
|
+
var response;
|
|
152
|
+
return _regenerator.default.wrap(function _callee3$(_context3) {
|
|
153
|
+
while (1) switch (_context3.prev = _context3.next) {
|
|
154
|
+
case 0:
|
|
155
|
+
if (!(!node.readFileAsArrayBuffer || url.startsWith('http'))) {
|
|
156
|
+
_context3.next = 7;
|
|
157
|
+
break;
|
|
158
|
+
}
|
|
159
|
+
_context3.next = 3;
|
|
160
|
+
return fetch(url);
|
|
161
|
+
case 3:
|
|
162
|
+
response = _context3.sent;
|
|
163
|
+
_context3.next = 6;
|
|
164
|
+
return response.arrayBuffer();
|
|
165
|
+
case 6:
|
|
166
|
+
return _context3.abrupt("return", _context3.sent);
|
|
167
|
+
case 7:
|
|
168
|
+
_context3.next = 9;
|
|
169
|
+
return node.readFileAsArrayBuffer(url);
|
|
170
|
+
case 9:
|
|
171
|
+
return _context3.abrupt("return", _context3.sent);
|
|
172
|
+
case 10:
|
|
173
|
+
case "end":
|
|
174
|
+
return _context3.stop();
|
|
175
|
+
}
|
|
176
|
+
}, _callee3);
|
|
177
|
+
}));
|
|
178
|
+
return _loadAsArrayBuffer.apply(this, arguments);
|
|
179
|
+
}
|
|
180
|
+
function loadAsText(_x4) {
|
|
181
|
+
return _loadAsText.apply(this, arguments);
|
|
182
|
+
}
|
|
183
|
+
function _loadAsText() {
|
|
184
|
+
_loadAsText = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee4(url) {
|
|
185
|
+
var response;
|
|
186
|
+
return _regenerator.default.wrap(function _callee4$(_context4) {
|
|
187
|
+
while (1) switch (_context4.prev = _context4.next) {
|
|
188
|
+
case 0:
|
|
189
|
+
if (!(!node.readFileAsText || url.startsWith('http'))) {
|
|
190
|
+
_context4.next = 7;
|
|
191
|
+
break;
|
|
192
|
+
}
|
|
193
|
+
_context4.next = 3;
|
|
194
|
+
return fetch(url);
|
|
195
|
+
case 3:
|
|
196
|
+
response = _context4.sent;
|
|
197
|
+
_context4.next = 6;
|
|
198
|
+
return response.text();
|
|
199
|
+
case 6:
|
|
200
|
+
return _context4.abrupt("return", _context4.sent);
|
|
201
|
+
case 7:
|
|
202
|
+
_context4.next = 9;
|
|
203
|
+
return node.readFileAsText(url);
|
|
204
|
+
case 9:
|
|
205
|
+
return _context4.abrupt("return", _context4.sent);
|
|
206
|
+
case 10:
|
|
207
|
+
case "end":
|
|
208
|
+
return _context4.stop();
|
|
209
|
+
}
|
|
210
|
+
}, _callee4);
|
|
211
|
+
}));
|
|
212
|
+
return _loadAsText.apply(this, arguments);
|
|
213
|
+
}
|
|
154
214
|
//# sourceMappingURL=library-utils.js.map
|
|
@@ -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","_response","response","scriptSource","_callee2$","_context2","endsWith","fetch","arrayBuffer","t0","requireFromFile","t1","importScripts","text","loadLibraryFromString","id","requireFromString","eval","global","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":["_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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"}
|
|
@@ -4,6 +4,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
|
+
exports.readFileAsArrayBuffer = readFileAsArrayBuffer;
|
|
8
|
+
exports.readFileAsText = readFileAsText;
|
|
7
9
|
exports.requireFromFile = requireFromFile;
|
|
8
10
|
exports.requireFromString = requireFromString;
|
|
9
11
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
@@ -11,17 +13,18 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
|
|
11
13
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
12
14
|
var _module = _interopRequireDefault(require("module"));
|
|
13
15
|
var _path = _interopRequireDefault(require("path"));
|
|
14
|
-
|
|
15
|
-
|
|
16
|
+
var _fs = _interopRequireDefault(require("fs"));
|
|
17
|
+
function readFileAsArrayBuffer(_x) {
|
|
18
|
+
return _readFileAsArrayBuffer.apply(this, arguments);
|
|
16
19
|
}
|
|
17
|
-
function
|
|
18
|
-
|
|
19
|
-
var response,
|
|
20
|
+
function _readFileAsArrayBuffer() {
|
|
21
|
+
_readFileAsArrayBuffer = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(filename) {
|
|
22
|
+
var response, buffer;
|
|
20
23
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
21
24
|
while (1) switch (_context.prev = _context.next) {
|
|
22
25
|
case 0:
|
|
23
26
|
if (!filename.startsWith('http')) {
|
|
24
|
-
_context.next =
|
|
27
|
+
_context.next = 7;
|
|
25
28
|
break;
|
|
26
29
|
}
|
|
27
30
|
_context.next = 3;
|
|
@@ -29,20 +32,84 @@ function _requireFromFile() {
|
|
|
29
32
|
case 3:
|
|
30
33
|
response = _context.sent;
|
|
31
34
|
_context.next = 6;
|
|
35
|
+
return response.arrayBuffer();
|
|
36
|
+
case 6:
|
|
37
|
+
return _context.abrupt("return", _context.sent);
|
|
38
|
+
case 7:
|
|
39
|
+
buffer = _fs.default.readFileSync(filename);
|
|
40
|
+
return _context.abrupt("return", buffer.buffer);
|
|
41
|
+
case 9:
|
|
42
|
+
case "end":
|
|
43
|
+
return _context.stop();
|
|
44
|
+
}
|
|
45
|
+
}, _callee);
|
|
46
|
+
}));
|
|
47
|
+
return _readFileAsArrayBuffer.apply(this, arguments);
|
|
48
|
+
}
|
|
49
|
+
function readFileAsText(_x2) {
|
|
50
|
+
return _readFileAsText.apply(this, arguments);
|
|
51
|
+
}
|
|
52
|
+
function _readFileAsText() {
|
|
53
|
+
_readFileAsText = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(filename) {
|
|
54
|
+
var response, text;
|
|
55
|
+
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
56
|
+
while (1) switch (_context2.prev = _context2.next) {
|
|
57
|
+
case 0:
|
|
58
|
+
if (!filename.startsWith('http')) {
|
|
59
|
+
_context2.next = 7;
|
|
60
|
+
break;
|
|
61
|
+
}
|
|
62
|
+
_context2.next = 3;
|
|
63
|
+
return fetch(filename);
|
|
64
|
+
case 3:
|
|
65
|
+
response = _context2.sent;
|
|
66
|
+
_context2.next = 6;
|
|
32
67
|
return response.text();
|
|
33
68
|
case 6:
|
|
34
|
-
|
|
35
|
-
|
|
69
|
+
return _context2.abrupt("return", _context2.sent);
|
|
70
|
+
case 7:
|
|
71
|
+
text = _fs.default.readFileSync(filename, 'utf8');
|
|
72
|
+
return _context2.abrupt("return", text);
|
|
73
|
+
case 9:
|
|
74
|
+
case "end":
|
|
75
|
+
return _context2.stop();
|
|
76
|
+
}
|
|
77
|
+
}, _callee2);
|
|
78
|
+
}));
|
|
79
|
+
return _readFileAsText.apply(this, arguments);
|
|
80
|
+
}
|
|
81
|
+
function requireFromFile(_x3) {
|
|
82
|
+
return _requireFromFile.apply(this, arguments);
|
|
83
|
+
}
|
|
84
|
+
function _requireFromFile() {
|
|
85
|
+
_requireFromFile = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(filename) {
|
|
86
|
+
var response, code;
|
|
87
|
+
return _regenerator.default.wrap(function _callee3$(_context3) {
|
|
88
|
+
while (1) switch (_context3.prev = _context3.next) {
|
|
89
|
+
case 0:
|
|
90
|
+
if (!filename.startsWith('http')) {
|
|
91
|
+
_context3.next = 8;
|
|
92
|
+
break;
|
|
93
|
+
}
|
|
94
|
+
_context3.next = 3;
|
|
95
|
+
return fetch(filename);
|
|
96
|
+
case 3:
|
|
97
|
+
response = _context3.sent;
|
|
98
|
+
_context3.next = 6;
|
|
99
|
+
return response.text();
|
|
100
|
+
case 6:
|
|
101
|
+
code = _context3.sent;
|
|
102
|
+
return _context3.abrupt("return", requireFromString(code));
|
|
36
103
|
case 8:
|
|
37
104
|
if (!filename.startsWith('/')) {
|
|
38
105
|
filename = "".concat(process.cwd(), "/").concat(filename);
|
|
39
106
|
}
|
|
40
|
-
return
|
|
107
|
+
return _context3.abrupt("return", require(filename));
|
|
41
108
|
case 10:
|
|
42
109
|
case "end":
|
|
43
|
-
return
|
|
110
|
+
return _context3.stop();
|
|
44
111
|
}
|
|
45
|
-
},
|
|
112
|
+
}, _callee3);
|
|
46
113
|
}));
|
|
47
114
|
return _requireFromFile.apply(this, arguments);
|
|
48
115
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"require-utils.node.js","names":["_module","_interopRequireDefault","require","_path","
|
|
1
|
+
{"version":3,"file":"require-utils.node.js","names":["_module","_interopRequireDefault","require","_path","_fs","readFileAsArrayBuffer","_x","_readFileAsArrayBuffer","apply","arguments","_asyncToGenerator2","default","_regenerator","mark","_callee","filename","response","buffer","wrap","_callee$","_context","prev","next","startsWith","fetch","sent","arrayBuffer","abrupt","fs","readFileSync","stop","readFileAsText","_x2","_readFileAsText","_callee2","text","_callee2$","_context2","requireFromFile","_x3","_requireFromFile","_callee3","code","_callee3$","_context3","requireFromString","concat","process","cwd","_options","_options2","length","undefined","options","_typeof2","Error","paths","Module","_nodeModulePaths","path","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":"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"}
|
|
@@ -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.
|
|
12
|
+
var VERSION = typeof "4.0.0-alpha.18" !== 'undefined' ? "4.0.0-alpha.18" : 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);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const DEFAULT_VERSION = 'beta';
|
|
2
|
-
export const VERSION = typeof "4.0.0-alpha.
|
|
3
|
-
if (typeof "4.0.0-alpha.
|
|
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') {
|
|
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
|
|
@@ -3,7 +3,7 @@ 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.
|
|
6
|
+
const VERSION = typeof "4.0.0-alpha.18" !== 'undefined' ? "4.0.0-alpha.18" : 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;
|
|
@@ -36,8 +36,7 @@ export function getLibraryUrl(library, moduleName, options) {
|
|
|
36
36
|
}
|
|
37
37
|
async function loadLibraryFromFile(libraryUrl) {
|
|
38
38
|
if (libraryUrl.endsWith('wasm')) {
|
|
39
|
-
|
|
40
|
-
return await response.arrayBuffer();
|
|
39
|
+
return await loadAsArrayBuffer(libraryUrl);
|
|
41
40
|
}
|
|
42
41
|
if (!isBrowser) {
|
|
43
42
|
try {
|
|
@@ -49,8 +48,7 @@ async function loadLibraryFromFile(libraryUrl) {
|
|
|
49
48
|
if (isWorker) {
|
|
50
49
|
return importScripts(libraryUrl);
|
|
51
50
|
}
|
|
52
|
-
const
|
|
53
|
-
const scriptSource = await response.text();
|
|
51
|
+
const scriptSource = await loadAsText(libraryUrl);
|
|
54
52
|
return loadLibraryFromString(scriptSource, libraryUrl);
|
|
55
53
|
}
|
|
56
54
|
function loadLibraryFromString(scriptSource, id) {
|
|
@@ -71,4 +69,18 @@ function loadLibraryFromString(scriptSource, id) {
|
|
|
71
69
|
document.body.appendChild(script);
|
|
72
70
|
return null;
|
|
73
71
|
}
|
|
72
|
+
async function loadAsArrayBuffer(url) {
|
|
73
|
+
if (!node.readFileAsArrayBuffer || url.startsWith('http')) {
|
|
74
|
+
const response = await fetch(url);
|
|
75
|
+
return await response.arrayBuffer();
|
|
76
|
+
}
|
|
77
|
+
return await node.readFileAsArrayBuffer(url);
|
|
78
|
+
}
|
|
79
|
+
async function loadAsText(url) {
|
|
80
|
+
if (!node.readFileAsText || url.startsWith('http')) {
|
|
81
|
+
const response = await fetch(url);
|
|
82
|
+
return await response.text();
|
|
83
|
+
}
|
|
84
|
+
return await node.readFileAsText(url);
|
|
85
|
+
}
|
|
74
86
|
//# 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","
|
|
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,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","
|
|
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":"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"}
|
|
@@ -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.
|
|
5
|
+
const VERSION = typeof "4.0.0-alpha.18" !== 'undefined' ? "4.0.0-alpha.18" : 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);
|
|
@@ -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,
|
|
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"}
|
|
@@ -92,8 +92,7 @@ function getLibraryUrl(library, moduleName, options) {
|
|
|
92
92
|
exports.getLibraryUrl = getLibraryUrl;
|
|
93
93
|
async function loadLibraryFromFile(libraryUrl) {
|
|
94
94
|
if (libraryUrl.endsWith('wasm')) {
|
|
95
|
-
|
|
96
|
-
return await response.arrayBuffer();
|
|
95
|
+
return await loadAsArrayBuffer(libraryUrl);
|
|
97
96
|
}
|
|
98
97
|
if (!globals_1.isBrowser) {
|
|
99
98
|
try {
|
|
@@ -110,8 +109,7 @@ async function loadLibraryFromFile(libraryUrl) {
|
|
|
110
109
|
// if (isBrowser) {
|
|
111
110
|
// return await loadScriptFromFile(libraryUrl);
|
|
112
111
|
// }
|
|
113
|
-
const
|
|
114
|
-
const scriptSource = await response.text();
|
|
112
|
+
const scriptSource = await loadAsText(libraryUrl);
|
|
115
113
|
return loadLibraryFromString(scriptSource, libraryUrl);
|
|
116
114
|
}
|
|
117
115
|
/*
|
|
@@ -168,3 +166,22 @@ function combineWorkerWithLibrary(worker, jsContent) {
|
|
|
168
166
|
this.workerSourceURL = URL.createObjectURL(new Blob([body]));
|
|
169
167
|
}
|
|
170
168
|
*/
|
|
169
|
+
async function loadAsArrayBuffer(url) {
|
|
170
|
+
if (!node.readFileAsArrayBuffer || url.startsWith('http')) {
|
|
171
|
+
const response = await fetch(url);
|
|
172
|
+
return await response.arrayBuffer();
|
|
173
|
+
}
|
|
174
|
+
return await node.readFileAsArrayBuffer(url);
|
|
175
|
+
}
|
|
176
|
+
/**
|
|
177
|
+
* Load a file from local file system
|
|
178
|
+
* @param filename
|
|
179
|
+
* @returns
|
|
180
|
+
*/
|
|
181
|
+
async function loadAsText(url) {
|
|
182
|
+
if (!node.readFileAsText || url.startsWith('http')) {
|
|
183
|
+
const response = await fetch(url);
|
|
184
|
+
return await response.text();
|
|
185
|
+
}
|
|
186
|
+
return await node.readFileAsText(url);
|
|
187
|
+
}
|
|
@@ -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":"
|
|
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"}
|
|
@@ -6,10 +6,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
6
6
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.requireFromString = exports.requireFromFile = void 0;
|
|
9
|
+
exports.requireFromString = exports.requireFromFile = exports.readFileAsText = exports.readFileAsArrayBuffer = void 0;
|
|
10
10
|
// this file is not visible to webpack (it is excluded in the package.json "browser" field).
|
|
11
11
|
const module_1 = __importDefault(require("module"));
|
|
12
12
|
const path_1 = __importDefault(require("path"));
|
|
13
|
+
const fs_1 = __importDefault(require("fs"));
|
|
14
|
+
/**
|
|
15
|
+
* Load a file from local file system
|
|
16
|
+
* @param filename
|
|
17
|
+
* @returns
|
|
18
|
+
*/
|
|
19
|
+
async function readFileAsArrayBuffer(filename) {
|
|
20
|
+
if (filename.startsWith('http')) {
|
|
21
|
+
const response = await fetch(filename);
|
|
22
|
+
return await response.arrayBuffer();
|
|
23
|
+
}
|
|
24
|
+
const buffer = fs_1.default.readFileSync(filename);
|
|
25
|
+
return buffer.buffer;
|
|
26
|
+
}
|
|
27
|
+
exports.readFileAsArrayBuffer = readFileAsArrayBuffer;
|
|
28
|
+
/**
|
|
29
|
+
* Load a file from local file system
|
|
30
|
+
* @param filename
|
|
31
|
+
* @returns
|
|
32
|
+
*/
|
|
33
|
+
async function readFileAsText(filename) {
|
|
34
|
+
if (filename.startsWith('http')) {
|
|
35
|
+
const response = await fetch(filename);
|
|
36
|
+
return await response.text();
|
|
37
|
+
}
|
|
38
|
+
const text = fs_1.default.readFileSync(filename, 'utf8');
|
|
39
|
+
return text;
|
|
40
|
+
}
|
|
41
|
+
exports.readFileAsText = readFileAsText;
|
|
13
42
|
// Node.js Dynamically require from file
|
|
14
43
|
// Relative names are resolved relative to cwd
|
|
15
44
|
// This indirect function is provided because webpack will try to bundle `module.require`.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/worker-utils",
|
|
3
|
-
"version": "4.0.0-alpha.
|
|
3
|
+
"version": "4.0.0-alpha.18",
|
|
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": "
|
|
53
|
+
"gitHead": "7bc633f46560f661bdd46cf1015ea27b3694ebce"
|
|
54
54
|
}
|
|
@@ -36,7 +36,6 @@ export async function loadLibrary(
|
|
|
36
36
|
if (moduleName) {
|
|
37
37
|
libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);
|
|
38
38
|
}
|
|
39
|
-
|
|
40
39
|
// Ensure libraries are only loaded once
|
|
41
40
|
|
|
42
41
|
loadLibraryPromises[libraryUrl] =
|
|
@@ -80,8 +79,7 @@ export function getLibraryUrl(library: string, moduleName?: string, options?: an
|
|
|
80
79
|
|
|
81
80
|
async function loadLibraryFromFile(libraryUrl: string): Promise<any> {
|
|
82
81
|
if (libraryUrl.endsWith('wasm')) {
|
|
83
|
-
|
|
84
|
-
return await response.arrayBuffer();
|
|
82
|
+
return await loadAsArrayBuffer(libraryUrl);
|
|
85
83
|
}
|
|
86
84
|
|
|
87
85
|
if (!isBrowser) {
|
|
@@ -99,8 +97,7 @@ async function loadLibraryFromFile(libraryUrl: string): Promise<any> {
|
|
|
99
97
|
// return await loadScriptFromFile(libraryUrl);
|
|
100
98
|
// }
|
|
101
99
|
|
|
102
|
-
const
|
|
103
|
-
const scriptSource = await response.text();
|
|
100
|
+
const scriptSource = await loadAsText(libraryUrl);
|
|
104
101
|
return loadLibraryFromString(scriptSource, libraryUrl);
|
|
105
102
|
}
|
|
106
103
|
|
|
@@ -161,3 +158,24 @@ function combineWorkerWithLibrary(worker, jsContent) {
|
|
|
161
158
|
this.workerSourceURL = URL.createObjectURL(new Blob([body]));
|
|
162
159
|
}
|
|
163
160
|
*/
|
|
161
|
+
|
|
162
|
+
async function loadAsArrayBuffer(url: string): Promise<ArrayBuffer> {
|
|
163
|
+
if (!node.readFileAsArrayBuffer || url.startsWith('http')) {
|
|
164
|
+
const response = await fetch(url);
|
|
165
|
+
return await response.arrayBuffer();
|
|
166
|
+
}
|
|
167
|
+
return await node.readFileAsArrayBuffer(url);
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
/**
|
|
171
|
+
* Load a file from local file system
|
|
172
|
+
* @param filename
|
|
173
|
+
* @returns
|
|
174
|
+
*/
|
|
175
|
+
async function loadAsText(url: string): Promise<string> {
|
|
176
|
+
if (!node.readFileAsText || url.startsWith('http')) {
|
|
177
|
+
const response = await fetch(url);
|
|
178
|
+
return await response.text();
|
|
179
|
+
}
|
|
180
|
+
return await node.readFileAsText(url);
|
|
181
|
+
}
|
|
@@ -6,6 +6,35 @@
|
|
|
6
6
|
|
|
7
7
|
import Module from 'module';
|
|
8
8
|
import path from 'path';
|
|
9
|
+
import fs from 'fs';
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* Load a file from local file system
|
|
13
|
+
* @param filename
|
|
14
|
+
* @returns
|
|
15
|
+
*/
|
|
16
|
+
export async function readFileAsArrayBuffer(filename: string): Promise<ArrayBuffer> {
|
|
17
|
+
if (filename.startsWith('http')) {
|
|
18
|
+
const response = await fetch(filename);
|
|
19
|
+
return await response.arrayBuffer();
|
|
20
|
+
}
|
|
21
|
+
const buffer = fs.readFileSync(filename);
|
|
22
|
+
return buffer.buffer;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
/**
|
|
26
|
+
* Load a file from local file system
|
|
27
|
+
* @param filename
|
|
28
|
+
* @returns
|
|
29
|
+
*/
|
|
30
|
+
export async function readFileAsText(filename: string): Promise<string> {
|
|
31
|
+
if (filename.startsWith('http')) {
|
|
32
|
+
const response = await fetch(filename);
|
|
33
|
+
return await response.text();
|
|
34
|
+
}
|
|
35
|
+
const text = fs.readFileSync(filename, 'utf8');
|
|
36
|
+
return text;
|
|
37
|
+
}
|
|
9
38
|
|
|
10
39
|
// Node.js Dynamically require from file
|
|
11
40
|
// Relative names are resolved relative to cwd
|