chore(worker-utils): Move Node require utils to polyfills

modules/parquet/src/buffer-polyfill/buffer.ts

@@ -1899,7 +1899,6 @@ function writeDouble(buf: Buffer, value, offset, littleEndian, noAssert): number
 }
 
 // CUSTOM ERRORS
-// =============
 
 // Simplified versions from Node, changed for Buffer-only usage
 const errors: Record<string, any> = {};
@@ -1991,7 +1990,6 @@ function addNumericalSeparator(val) {
 }
 
 // CHECK FUNCTIONS
-// ===============
 
 function checkBounds(buf, offset, byteLength) {
   validateNumber(offset, 'offset');
@@ -2040,7 +2038,6 @@ function boundsError(value, length, type?) {
 }
 
 // HELPER FUNCTIONS
-// ================
 
 const INVALID_BASE64_RE = /[^+/0-9A-Za-z-_]/g;
 

modules/polyfills/test/load-library/require-utils.spec.ts

@@ -18,7 +18,7 @@
     return;
   }
 
-  test.skip('polyfills#requireFromFile#', (t) => {
+  test('polyfills#requireFromFile#', (t) => {
     t.ok(requireFromFile(MODULE_URL), 'Require from file worked');
     t.ok(requireFromFile(SUBMODULE_URL), 'Require from file worked');
     t.end();
@@ -57,7 +57,7 @@
       prependPaths: ['prepend']
     });
 
     console.error(result);
     t.ok(result);
     t.equal(result.paths.indexOf('append'), result.paths.length - 1);
     t.equal(result.paths.indexOf('prepend'), 0);

modules/worker-utils/package.json

@@ -34,15 +34,9 @@
   ],
   "browser": {
     "child_process": false,
-    "module": false,
-    "path": false,
-    "fs": false,
     "./src/lib/node/worker_threads.ts": "./src/lib/node/worker_threads-browser.ts",
     "./dist/es5/lib/node/worker_threads.js": "./dist/es5/lib/node/worker_threads-browser.js",
     "./dist/esm/lib/node/worker_threads.js": "./dist/esm/lib/node/worker_threads-browser.js",
-    "./src/lib/node/require-utils.node.ts": false,
-    "./dist/es5/lib/node/require-utils.node.js": false,
-    "./dist/esm/lib/node/require-utils.node.js": false,
     "./src/lib/process-utils/child-process-proxy.ts": false,
     "./dist/es5/lib/process-utils/child-process-proxy.js": false,
     "./dist/esm/lib/process-utils/child-process-proxy.js": false

modules/worker-utils/src/lib/env-utils/globals.ts

@@ -1,21 +1,6 @@
 // Purpose: include this in your module to avoids adding dependencies on
 // micro modules like 'global' and 'is-browser';
 
-/* eslint-disable no-restricted-globals */
-const globals = {
-  self: typeof self !== 'undefined' && self,
-  window: typeof window !== 'undefined' && window,
-  global: typeof global !== 'undefined' && global,
-  document: typeof document !== 'undefined' && document
-};
-
-const self_: {[key: string]: any} = globals.self || globals.window || globals.global || {};
-const window_: {[key: string]: any} = globals.window || globals.self || globals.global || {};
-const global_: {[key: string]: any} = globals.global || globals.self || globals.window || {};
-const document_: {[key: string]: any} = globals.document || {};
-
-export {self_ as self, window_ as window, global_ as global, document_ as document};
-
 /** true if running in the browser, false if running in Node.js */
 export const isBrowser: boolean =
   // @ts-ignore process.browser

modules/worker-utils/src/lib/library-utils/library-utils.ts

@@ -1,6 +1,5 @@
 /* global importScripts */
 import {isBrowser, isWorker} from '../env-utils/globals';
-import * as node from '../node/require-utils.node';
 import {assert} from '../env-utils/assert';
 import {VERSION} from '../env-utils/version';
 
@@ -84,14 +83,10 @@ async function loadLibraryFromFile(libraryUrl: string): Promise<any> {
   }
 
   if (!isBrowser) {
-    // TODO - Node doesn't yet support dynamic import from https URLs
-    // try {
-    //   return await import(libraryUrl);
-    // } catch (error) {
-    //   console.error(error);
-    // }
     try {
-      return node && node.requireFromFile && (await node.requireFromFile(libraryUrl));
+      // TODO - Node doesn't yet support dynamic import from https URLs
+      // return await import(libraryUrl);
+      return await globalThis.loaders?.requireFromFile?.(libraryUrl);
     } catch (error) {
       console.error(error); // eslint-disable-line no-console
       return null;
@@ -129,7 +124,10 @@ async function loadScriptFromFile(libraryUrl) {
 // we could create a`LibraryLoader` or`ModuleLoader`
 function loadLibraryFromString(scriptSource: string, id: string): null | any {
   if (!isBrowser) {
-    return node.requireFromString && node.requireFromString(scriptSource, id);
+    return (
+      globalThis.loaders?.requireFromString &&
+      globalThis.loaders?.requireFromString(scriptSource, id)
+    );
   }
 
   if (isWorker) {
@@ -168,11 +166,11 @@ function combineWorkerWithLibrary(worker, jsContent) {
 */
 
 async function loadAsArrayBuffer(url: string): Promise<ArrayBuffer> {
-  if (!node.readFileAsArrayBuffer || url.startsWith('http')) {
+  if (!globalThis.loaders?.readFileAsArrayBuffer || url.startsWith('http')) {
     const response = await fetch(url);
     return await response.arrayBuffer();
   }
-  return await node.readFileAsArrayBuffer(url);
+  return await globalThis.loaders?.readFileAsArrayBuffer(url);
 }
 
 /**
@@ -181,9 +179,9 @@ async function loadAsArrayBuffer(url: string): Promise<ArrayBuffer> {
  * @returns
  */
 async function loadAsText(url: string): Promise<string> {
-  if (!node.readFileAsText || url.startsWith('http')) {
+  if (!globalThis.loaders?.readFileAsText || url.startsWith('http')) {
     const response = await fetch(url);
     return await response.text();
   }
-  return await node.readFileAsText(url);
+  return await globalThis.loaders?.readFileAsText(url);
 }

modules/worker-utils/test/index.ts

@@ -1,7 +1,9 @@
+// loaders.gl, MIT license
+
 import './lib/async-queue/async-queue.spec';
 
-// import './lib/library-utils/require-utils.spec';
-import './lib/library-utils/library-utils.spec';
+// TESTED by polyfills?
+// import './lib/library-utils/library-utils.spec';
 
 import './lib/worker-utils/get-transfer-list.spec';
 import './lib/worker-utils/get-loadable-worker-url.spec';