13 files changed, 16 insertions, 28 deletions
diff --git a/src/js/node/assert.js b/src/js/node/assert.js
index ba4df43cc..a00a84509 100644
--- a/src/js/node/assert.js
+++ b/src/js/node/assert.js
@@ -1,5 +1,5 @@
 // Hardcoded module "node:assert"
-var { Bun } = globalThis[Symbol.for("Bun.lazy")]("primordials");
+var { Bun } = $lazy("primordials");
 import util from "node:util";
 
 var isDeepEqual = Bun.deepEquals;
diff --git a/src/js/node/child_process.js b/src/js/node/child_process.js
index 29b203219..c6b10bbec 100644
--- a/src/js/node/child_process.js
+++ b/src/js/node/child_process.js
@@ -5,7 +5,7 @@ import { constants } from "node:os";
 import { promisify } from "node:util";
 const signals = constants.signals;
 
-const { ArrayBuffer, Uint8Array, String, Object, Buffer, Promise } = globalThis[Symbol.for("Bun.lazy")]("primordials");
+const { ArrayBuffer, Uint8Array, String, Object, Buffer, Promise } = $lazy("primordials");
 
 var ObjectPrototypeHasOwnProperty = Object.prototype.hasOwnProperty;
 var ObjectCreate = Object.create;
diff --git a/src/js/node/events.js b/src/js/node/events.js
index 111fdb524..7b78193ca 100644
--- a/src/js/node/events.js
+++ b/src/js/node/events.js
@@ -2,7 +2,7 @@
 // Reference: https://github.com/nodejs/node/blob/main/lib/events.js
 import { throwNotImplemented } from "../shared";
 
-var { isPromise, Array, Object } = globalThis[Symbol.for("Bun.lazy")]("primordials");
+var { isPromise, Array, Object } = $lazy("primordials");
 const SymbolFor = Symbol.for;
 const ObjectDefineProperty = Object.defineProperty;
 const kCapture = Symbol("kCapture");
diff --git a/src/js/node/fs.js b/src/js/node/fs.js
index 072102c35..5e72d6e27 100644
--- a/src/js/node/fs.js
+++ b/src/js/node/fs.js
@@ -4,7 +4,7 @@ export var WriteStream;
 import { EventEmitter } from "node:events";
 
 // Hardcoded module "node:fs"
-var { direct, isPromise, isCallable } = globalThis[Symbol.for("Bun.lazy")]("primordials");
+var { direct, isPromise, isCallable } = $lazy("primordials");
 import promises from "node:fs/promises";
 export { default as promises } from "node:fs/promises";
 import * as Stream from "node:stream";
diff --git a/src/js/node/http.ts b/src/js/node/http.ts
index fe075c832..2eb5231d5 100644
--- a/src/js/node/http.ts
+++ b/src/js/node/http.ts
@@ -57,7 +57,7 @@ function isIPv6(input) {
 // Importing from node:url is unnecessary
 const { URL } = globalThis;
 
-const { newArrayWithSize, String, Object, Array } = globalThis[Symbol.for("Bun.lazy")]("primordials");
+const { newArrayWithSize, String, Object, Array } = $lazy("primordials");
 
 const globalReportError = globalThis.reportError;
 const setTimeout = globalThis.setTimeout;
diff --git a/src/js/node/net.js b/src/js/node/net.js
index 6c690b349..d45bb23a1 100644
--- a/src/js/node/net.js
+++ b/src/js/node/net.js
@@ -56,7 +56,7 @@ function isIP(s) {
   return 0;
 }
 
-const { Bun, createFIFO, Object } = globalThis[Symbol.for("Bun.lazy")]("primordials");
+const { Bun, createFIFO, Object } = $lazy("primordials");
 const { connect: bunConnect } = Bun;
 var { setTimeout } = globalThis;
 
diff --git a/src/js/node/os.js b/src/js/node/os.js
index 3cd0288bd..2ff98beea 100644
--- a/src/js/node/os.js
+++ b/src/js/node/os.js
@@ -1,10 +1,7 @@
 // Hardcoded module "node:os"
 
 export var tmpdir = function () {
-  var lazy = Symbol.for("Bun.lazy");
-  var primordials = globalThis[lazy]("primordials");
-
-  var { Bun } = primordials;
+  var { Bun } = $lazy("primordials");
   var env = Bun.env;
 
   tmpdir = function () {
diff --git a/src/js/node/readline.js b/src/js/node/readline.js
index 64e73172a..b1613e34d 100644
--- a/src/js/node/readline.js
+++ b/src/js/node/readline.js
@@ -25,7 +25,7 @@
 // ----------------------------------------------------------------------------
 // Section: Imports
 // ----------------------------------------------------------------------------
-var { Array, RegExp, String, Bun } = globalThis[Symbol.for("Bun.lazy")]("primordials");
+var { Array, RegExp, String, Bun } = $lazy("primordials");
 import { EventEmitter } from "node:events";
 import { clearTimeout, setTimeout } from "timers";
 import { StringDecoder } from "string_decoder";
diff --git a/src/js/node/stream.consumers.js b/src/js/node/stream.consumers.js
index a1f85ab94..8dbe2920a 100644
--- a/src/js/node/stream.consumers.js
+++ b/src/js/node/stream.consumers.js
@@ -1,5 +1,5 @@
 // Hardcoded module "node:stream/consumers" / "readable-stream/consumer"
-const { Bun } = globalThis[Symbol.for("Bun.lazy")]("primordials");
+const { Bun } = $lazy("primordials");
 
 export const arrayBuffer = Bun.readableStreamToArrayBuffer;
 export const text = Bun.readableStreamToText;
diff --git a/src/js/node/stream.js b/src/js/node/stream.js
index 30c76d797..474ada8d8 100644
--- a/src/js/node/stream.js
+++ b/src/js/node/stream.js
@@ -34,7 +34,7 @@ var debug = __DEBUG__
     : (...args) => console.log(...args.slice(0, -1))
   : () => {};
 
-var { isPromise, isCallable, direct, Object } = globalThis[Symbol.for("Bun.lazy")]("primordials");
+var { isPromise, isCallable, direct, Object } = $lazy("primordials");
 import { EventEmitter as EE } from "bun:events_native";
 import { StringDecoder } from "node:string_decoder";
 
@@ -2309,7 +2309,7 @@ var require_readable = __commonJS({
       Symbol: Symbol2,
     } = require_primordials();
 
-    var ReadableState = globalThis[Symbol.for("Bun.lazy")]("bun:stream").ReadableState;
+    var ReadableState = $lazy("bun:stream").ReadableState;
     var { Stream, prependListener } = require_legacy();
 
     function Readable(options) {
@@ -2559,12 +2559,7 @@ var require_readable = __commonJS({
 
     var { addAbortSignal } = require_add_abort_signal();
     var eos = require_end_of_stream();
-    const {
-      maybeReadMore: _maybeReadMore,
-      resume,
-      emitReadable: _emitReadable,
-      onEofChunk,
-    } = globalThis[Symbol.for("Bun.lazy")]("bun:stream");
+    const { maybeReadMore: _maybeReadMore, resume, emitReadable: _emitReadable, onEofChunk } = $lazy("bun:stream");
     function maybeReadMore(stream, state) {
       process.nextTick(_maybeReadMore, stream, state);
     }
@@ -5215,7 +5210,7 @@ var require_ours = __commonJS({
  *
  */
 function createNativeStreamReadable(nativeType, Readable) {
-  var [pull, start, cancel, setClose, deinit, updateRef, drainFn] = globalThis[Symbol.for("Bun.lazy")](nativeType);
+  var [pull, start, cancel, setClose, deinit, updateRef, drainFn] = $lazy(nativeType);
 
   var closer = [false];
   var handleNumberResult = function (nativeReadable, result, view, isClosed) {
diff --git a/src/js/node/tls.js b/src/js/node/tls.js
index 310a36620..60903239b 100644
--- a/src/js/node/tls.js
+++ b/src/js/node/tls.js
@@ -4,7 +4,7 @@ import net, { Server as NetServer } from "node:net";
 const InternalTCPSocket = net[Symbol.for("::bunternal::")];
 const bunSocketInternal = Symbol.for("::bunnetsocketinternal::");
 
-const { RegExp, Array, String } = globalThis[Symbol.for("Bun.lazy")]("primordials");
+const { RegExp, Array, String } = $lazy("primordials");
 const SymbolReplace = Symbol.replace;
 const RegExpPrototypeSymbolReplace = RegExp.prototype[SymbolReplace];
 const RegExpPrototypeExec = RegExp.prototype.exec;
diff --git a/src/js/node/url.js b/src/js/node/url.js
index bb7093bcc..927543405 100644
--- a/src/js/node/url.js
+++ b/src/js/node/url.js
@@ -820,7 +820,7 @@ function urlToHttpOptions(url) {
   return options;
 }
 
-const lazy = globalThis[Symbol.for("Bun.lazy")];
+const lazy = $lazy;
 const pathToFileURL = lazy("pathToFileURL");
 const fileURLToPath = lazy("fileURLToPath");
 const defaultObject = {
diff --git a/src/js/node/vm.ts b/src/js/node/vm.ts
index 678ab20b9..331f4fbc6 100644
--- a/src/js/node/vm.ts
+++ b/src/js/node/vm.ts
@@ -1,11 +1,7 @@
 // Hardcoded module "node:vm"
 import { throwNotImplemented } from "../shared";
 
-const lazy = globalThis[Symbol.for("Bun.lazy")];
-if (!lazy || typeof lazy !== "function") {
-  throw new Error("Something went wrong while loading Bun. Expected 'Bun.lazy' to be defined.");
-}
-const vm = lazy("vm");
+const vm = $lazy("vm");
 
 const { createContext, isContext, Script, runInNewContext, runInThisContext } = vm;