4 files changed, 23 insertions, 12 deletions
diff --git a/src/js/builtins/BunBuiltinNames.h b/src/js/builtins/BunBuiltinNames.h
index 651cac59b..f3266d5c2 100644
--- a/src/js/builtins/BunBuiltinNames.h
+++ b/src/js/builtins/BunBuiltinNames.h
@@ -140,7 +140,6 @@ using namespace JSC;
     macro(makeDOMException) \
     macro(makeGetterTypeError) \
     macro(makeThisTypeError) \
-    macro(map) \
     macro(method) \
     macro(nextTick) \
     macro(normalize) \
@@ -193,8 +192,6 @@ using namespace JSC;
     macro(resolve) \
     macro(resolveSync) \
     macro(resume) \
-    macro(search) \
-    macro(searchParams) \
     macro(self) \
     macro(sep) \
     macro(setBody) \
diff --git a/src/js/builtins/ConsoleObject.ts b/src/js/builtins/ConsoleObject.ts
index da316efdc..b48593154 100644
--- a/src/js/builtins/ConsoleObject.ts
+++ b/src/js/builtins/ConsoleObject.ts
@@ -116,7 +116,7 @@ export function write(this: Console, input) {
 
   const count = $argumentCount();
   for (var i = 1; i < count; i++) {
-    wrote += writer.write($argument(i));
+    wrote += writer.write(arguments[i]);
   }
 
   writer.flush(true);
@@ -278,7 +278,7 @@ export function createConsoleConstructor(console: typeof globalThis.console) {
   };
 
   const table = (head, columns) => {
-    const columnWidths = ArrayPrototypeMap.call(head, h => getStringWidth(h)) as number[];
+    const columnWidths = ArrayPrototypeMap.$call(head, h => getStringWidth(h)) as number[];
     const longestColumn = Math.max(...(ArrayPrototypeMap as any).$call(columns, a => a.length));
     const rows: any = $newArrayWithSize(longestColumn);
 
@@ -508,7 +508,7 @@ export function createConsoleConstructor(console: typeof globalThis.console) {
         const errorHandler = useStdout ? this._stdoutErrorHandler : this._stderrErrorHandler;
 
         if (groupIndent.length !== 0) {
-          if (StringPrototypeIncludes.call(string, "\n")) {
+          if (StringPrototypeIncludes.$call(string, "\n")) {
             // ?!
             string = (RegExpPrototypeSymbolReplace.$call as any)(/\n/g, string, `\n${groupIndent}`);
           }
@@ -657,7 +657,7 @@ export function createConsoleConstructor(console: typeof globalThis.console) {
       if (!expression) {
         args[0] = `Assertion failed${args.length === 0 ? "" : `: ${args[0]}`}`;
         // The arguments will be formatted in warn() again
-        Reflect.apply(this.warn, this, args);
+        this.warn.$apply(this, args);
       }
     },
 
@@ -698,7 +698,7 @@ export function createConsoleConstructor(console: typeof globalThis.console) {
 
     group(...data) {
       if (data.length > 0) {
-        Reflect.apply(this.log, this, data);
+        this.log.$apply(this, data);
       }
       this[kGroupIndent] += StringPrototypeRepeat.$call(" ", this[kGroupIndentationWidth]);
     },
diff --git a/src/js/builtins/ProcessObjectInternals.ts b/src/js/builtins/ProcessObjectInternals.ts
index aa7c9b783..a72a96c2a 100644
--- a/src/js/builtins/ProcessObjectInternals.ts
+++ b/src/js/builtins/ProcessObjectInternals.ts
@@ -106,7 +106,7 @@ export function getStdinStream(fd) {
     if (event === "readable") {
       ref();
     }
-    return originalOn.call(this, event, listener);
+    return originalOn.$call(this, event, listener);
   };
 
   stream.fd = fd;
@@ -114,13 +114,13 @@ export function getStdinStream(fd) {
   const originalPause = stream.pause;
   stream.pause = function () {
     unref();
-    return originalPause.call(this);
+    return originalPause.$call(this);
   };
 
   const originalResume = stream.resume;
   stream.resume = function () {
     ref();
-    return originalResume.call(this);
+    return originalResume.$call(this);
   };
 
   async function internalRead(stream) {
@@ -252,6 +252,11 @@ export function initializeNextTickQueue(process, nextTickQueue, drainMicrotasksF
       // but allows much quicker checks.
 
       class FixedCircularBuffer {
+        top: number;
+        bottom: number;
+        list: Array<FixedCircularBuffer | undefined>;
+        next: FixedCircularBuffer | null;
+
         constructor() {
           this.bottom = 0;
           this.top = 0;
@@ -283,6 +288,9 @@ export function initializeNextTickQueue(process, nextTickQueue, drainMicrotasksF
       }
 
       class FixedQueue {
+        head: FixedCircularBuffer;
+        tail: FixedCircularBuffer;
+
         constructor() {
           this.head = this.tail = new FixedCircularBuffer();
         }
@@ -381,3 +389,8 @@ export function initializeNextTickQueue(process, nextTickQueue, drainMicrotasksF
 
   return nextTick;
 }
+
+$getter;
+export function mainModule() {
+  return $requireMap.$get(Bun.main);
+}
diff --git a/src/js/builtins/ReadableStreamInternals.ts b/src/js/builtins/ReadableStreamInternals.ts
index ca263363c..36f049f3e 100644
--- a/src/js/builtins/ReadableStreamInternals.ts
+++ b/src/js/builtins/ReadableStreamInternals.ts
@@ -1034,7 +1034,8 @@ export function createTextStream(highWaterMark) {
       if (byteLength > 0) {
         hasBuffer = true;
         if (rope.length > 0) {
-          $arrayPush(array, rope, chunk);
+          $arrayPush(array, rope);
+          $arrayPush(array, chunk);
           rope = "";
         } else {
           $arrayPush(array, chunk);