Remove dead code from the class and sink generators, JSBuffer, the bake client, bun-error, and the build scripts

packages/bun-debug-adapter-protocol/scripts/generate-protocol.ts

@@ -20,7 +20,7 @@ async function run() {
   write("index.d.ts", `// GENERATED - DO NOT EDIT\n${types}`);
 }
 
-function formatProtocol(protocol: Protocol, extraTs?: string): string {
+function formatProtocol(protocol: Protocol): string {
   const { definitions } = protocol;
   const requestMap = new Map();
   const responseMap = new Map();
@@ -86,9 +86,6 @@ function formatProtocol(protocol: Protocol, extraTs?: string): string {
   body += formatMapType("RequestMap", requestMap);
   body += formatMapType("ResponseMap", responseMap);
   body += formatMapType("EventMap", eventMap);
-  if (extraTs) {
-    body += extraTs;
-  }
   return body + "};";
 }
 

packages/bun-debug-adapter-protocol/src/debugger/node-socket-framer.ts

@@ -1,15 +1,7 @@
 import type { Socket } from "node:net";
-const enum FramerState {
-  WaitingForLength,
-  WaitingForMessage,
-}
 
 let socketFramerMessageLengthBuffer: Buffer;
 export class SocketFramer {
-  state: FramerState = FramerState.WaitingForLength;
-  pendingLength: number = 0;
-  sizeBuffer: Buffer = Buffer.alloc(4);
-  sizeBufferIndex: number = 0;
   bufferedData: Buffer = Buffer.alloc(0);
   socket: Socket;
   private onMessage: (message: string | string[]) => void;
@@ -26,10 +18,7 @@ export class SocketFramer {
   }
 
   reset(): void {
-    this.state = FramerState.WaitingForLength;
     this.bufferedData = Buffer.alloc(0);
-    this.sizeBufferIndex = 0;
-    this.sizeBuffer = Buffer.alloc(4);
   }
 
   send(data: string): void {

packages/bun-error/bun-error.css

@@ -335,39 +335,12 @@
   content: url("data:image/png;base64,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");
 }
 
-#BunError-SourceLine-text-highlightExpression {
-  font-weight: bold;
-  text-decoration-style: wavy;
-}
-
-.BunError-JSException--TypeError #BunError-SourceLine-text-highlightExpression {
-  border: 1px solid rgba(0, 0, 0, 0.2);
-}
-.BunError-Indented {
-  display: inline-block;
-  user-select: none;
-  -webkit-user-select: none;
-}
-
-.BunError-divet {
-  vertical-align: bottom;
-  user-select: none;
-  -webkit-user-select: none;
-}
-
 .BunError-error-typename {
   font-family: var(--bun-error-monospace);
   color: #e39437;
   font-weight: bold;
 }
 
-.BunError-error-muted {
-  font-weight: normal;
-  user-select: none;
-  -webkit-user-select: none;
-}
-
-.BunError-error-muted,
 .BunError-StackFrame--muted {
   color: rgb(165, 165, 165);
 }

packages/bun-error/index.tsx

@@ -298,15 +298,13 @@ enum LoadState {
 const AsyncSourceLines = ({
   highlight = -1,
   highlightColumnStart = 0,
-  highlightColumnEnd = Infinity,
   children,
   buildURL,
   sourceLines,
   setSourceLines,
 }: {
   highlight: number;
   highlightColumnStart: number;
-  highlightColumnEnd?: number;
   children?: any;
   buildURL: (line?: number, column?: number) => string;
   sourceLines: SourceLine[];
@@ -396,7 +394,6 @@ const AsyncSourceLines = ({
         <SourceLines
           highlight={highlight}
           highlightColumnStart={highlightColumnStart}
-          highlightColumnEnd={highlightColumnEnd}
           buildURL={buildURL}
           sourceLines={sourceLines}
         >
@@ -414,21 +411,18 @@ const SourceLines = ({
   sourceLines,
   highlight = -1,
   highlightColumnStart = 0,
-  highlightColumnEnd = Infinity,
   children,
   buildURL,
 }: {
   sourceLines: SourceLine[];
   highlight: number;
   highlightColumnStart: number;
-  highlightColumnEnd?: number;
   children?: any;
   buildURL: (line?: number, column?: number) => string;
 }) => {
   let start = sourceLines.length;
   let end = 0;
   let dedent = Infinity;
-  let _i = 0;
   var minLineNumber = sourceLines.length + highlight + 1;
   var maxLineNumber = 0;
   for (let i = 0; i < sourceLines.length; i++) {
@@ -504,15 +498,7 @@ const BuildErrorSourceLines = ({ location, filename }: { location: Location; fil
   const { line, line_text, column } = location;
   const sourceLines: SourceLine[] = [{ line, text: line_text }];
   const buildURL = useCallback((line, column) => srcFileURL(filename, line, column), [filename]);
-  return (
-    <SourceLines
-      sourceLines={sourceLines}
-      highlight={line}
-      buildURL={buildURL}
-      highlightColumnStart={column}
-      highlightColumnEnd={column}
-    />
-  );
+  return <SourceLines sourceLines={sourceLines} highlight={line} buildURL={buildURL} highlightColumnStart={column} />;
 };
 
 const BuildErrorStackTrace = ({ location }: { location: Location }) => {
@@ -687,7 +673,6 @@ const NativeStackTrace = ({
           sourceLines={sourceLines}
           highlightColumnStart={position.column}
           buildURL={buildURL}
-          highlightColumnEnd={position.column_stop}
         >
           {children}
         </SourceLines>
@@ -699,7 +684,6 @@ const NativeStackTrace = ({
           setSourceLines={setSourceLines}
           highlightColumnStart={position.column}
           buildURL={buildURL}
-          highlightColumnEnd={position.column_stop}
         >
           {children}
         </AsyncSourceLines>

packages/bun-native-plugin-rs/.gitignore

@@ -1 +1,2 @@
 target/
+headers/

scripts/build/clean.ts

@@ -13,7 +13,7 @@ import { fileURLToPath } from "node:url";
 import { allDeps } from "./deps/index.ts";
 
 const cwd = resolve(dirname(fileURLToPath(import.meta.url)), "..", "..");
-// Machine-shared cache (ccache/cargo/tarballs/webkit). Matches resolveConfig()'s
+// Machine-shared cache (ccache/tarballs/webkit). Matches resolveConfig()'s
 // non-CI default. `clean` is a dev-machine tool so we don't branch on CI here.
 const sharedCacheDir = resolve(process.env.BUN_INSTALL || resolve(homedir(), ".bun"), "build-cache");
 
@@ -31,9 +31,9 @@ presets:
   release          build/release/
   debug-local      build/debug-local/
   release-local    build/release-local/
-  rust             cargo target dirs across all profiles + ~/.bun/build-cache/cargo
+  rust             cargo target dirs across all profiles
   cpp              C++ obj/ + pch/ across all profiles
-  cache            machine-shared build cache (~/.bun/build-cache: ccache, cargo,
+  cache            machine-shared build cache (~/.bun/build-cache: ccache,
                    tarballs, prebuilt webkit) — affects ALL checkouts
   deep             build/, target/, vendor/* (except manually managed deps
                    like WebKit)
@@ -68,7 +68,6 @@ const presets: Record<string, () => string[]> = {
 
   rust: () => [
     ...buildProfiles().map(p => resolve(p, "rust-target")),
-    resolve(sharedCacheDir, "cargo"),
     // `cargo check`/`cargo clippy` run from the repo root with no
     // --target-dir, so they write to the workspace-default `target/`.
     resolve(cwd, "target"),

scripts/build/configure.ts

@@ -120,8 +120,6 @@ export function resolveToolchain(targetOs?: OS, packageManager: PackageManager =
 export interface ConfigureResult {
   cfg: Config;
   output: BunOutput;
-  /** Build.ninja absolute path. */
-  ninjaFile: string;
   /** Env vars the caller should set before spawning ninja. */
   env: Record<string, string>;
   /** Wall-clock ms for the configure pass. */
@@ -391,10 +389,8 @@ export async function configure(input: ConfigureInput, fromNinja = false): Promi
   }
   mark("orderFile");
 
-  const ninjaFile = ninjaPath;
-
   const elapsed = Math.round(performance.now() - start);
   const exe = bunExeName(cfg) + (shouldStrip(cfg) ? " → bun (stripped)" : "");
 
-  return { cfg, output, ninjaFile, env: ccacheEnv(cfg), elapsed, changed, exe };
+  return { cfg, output, env: ccacheEnv(cfg), elapsed, changed, exe };
 }

scripts/build/tty.ts

@@ -31,22 +31,20 @@ export function formatElapsed(ms: number): string {
 /**
  * Hash a name to a stable 256-color. Same name → same color across runs,
  * so `[tinycc]` in stream output and `tinycc` in the done line match.
- * zig overridden to brand orange.
  *
  * `color` defaults to this module's stderr-TTY check. stream.ts passes
  * its own — it writes to FD 3 (a terminal when set up by build.ts) while
  * its FD 2 is a ninja pipe, so the default check would wrongly disable.
  */
 export function nameColor(name: string, text: string = name, color: boolean = useColor): string {
   if (!color) return text;
-  const overrides: Record<string, number> = { zig: 214 };
   const palette = [220, 184, 154, 120, 114, 86, 87, 81, 111, 147, 141, 183];
   let h = 2166136261;
   for (let i = 0; i < name.length; i++) {
     h ^= name.charCodeAt(i);
     h = Math.imul(h, 16777619);
   }
-  const c = overrides[name] ?? palette[(h >>> 0) % palette.length];
+  const c = palette[(h >>> 0) % palette.length];
   return `\x1b[38;5;${c}m${text}\x1b[39m`;
 }
 

src/codegen/bake-codegen.ts

@@ -1,5 +1,5 @@
 import assert from "node:assert";
-import { existsSync, readFileSync, rmSync } from "node:fs";
+import { readFileSync, rmSync } from "node:fs";
 import { basename, join } from "node:path";
 import { argParse, writeIfNotChanged } from "./helpers";
 
@@ -204,9 +204,6 @@ async function run() {
     process.exit(1);
   } else {
     console.log("-> bake.client.js, bake.server.js, bake.error.js");
-
-    const empty_file = join(codegenRoot, "bake_empty_file");
-    if (!existsSync(empty_file)) writeIfNotChanged(empty_file, "this is used to fulfill a build dependency");
   }
 }
 

src/codegen/bundle-functions.ts

@@ -160,7 +160,7 @@ async function processFileSplit(filename: string): Promise<{ functions: BundledB
       const i = contents.indexOf("\n") + 1;
       internal ||= contents.slice(0, i).includes("@internal");
       contents = contents.slice(i);
-    } else if (match[1] === "type" || match[1] === "export type") {
+    } else if (match[1] === "type") {
       const i = contents.search(consumeEndOfType);
       contents = contents.slice(i + 1);
     } else if (match[1] === "interface") {
@@ -281,10 +281,6 @@ async function processFileSplit(filename: string): Promise<{ functions: BundledB
   for (const fn of functions) {
     const tmpFile = path.join(TMP_DIR, `${basename}.${fn.name}.ts`);
 
-    // not sure if this optimization works properly in jsc builtins
-    // const useThis = fn.usesThis;
-    const useThis = true;
-
     // TODO: we should use format=IIFE so we could bundle imports and extra functions.
     writeFileSync(
       tmpFile,
@@ -295,11 +291,7 @@ ${fn.enums.join("\n")}
 // do not allow the bundler to rename a symbol to $
 ($);
 
-$$capture_start$$(${fn.async ? "async " : ""}${
-        useThis
-          ? `function(${fn.params.join(",")})`
-          : `${fn.params.length === 1 ? fn.params[0] : `(${fn.params.join(",")})`}=>`
-      } {${fn.source}}).$$capture_end$$;
+$$capture_start$$(${fn.async ? "async " : ""}function(${fn.params.join(",")}) {${fn.source}}).$$capture_end$$;
 `,
     );
     await Bun.sleep(1);

src/codegen/bundle-modules.ts

@@ -254,8 +254,6 @@ for (const entrypoint of bundledEntryPoints) {
   captured =
     captured
       .replace(/\$\$EXPORT\$\$\((.*)\).\$\$EXPORT_END\$\$;/, "return $1")
-      .replace(/]\s*,\s*__(debug|assert)_end__\)/g, ")")
-      .replace(/]\s*,\s*__debug_end__\)/g, ")")
       .replace(/import.meta.require\((.*?)\)/g, (expr, specifier) => {
         throw new Error(`Builtin Bundler: do not use import.meta.require() (in ${file_path}))`);
       })
@@ -377,7 +375,6 @@ mark("Bundle Functions");
 writeIfNotChanged(
   path.join(CODEGEN_DIR, "InternalModuleRegistry+numberOfModules.h"),
   `#define BUN_INTERNAL_MODULE_COUNT ${moduleList.length}
-#define BUN_NATIVE_MODULE_START_INDEX ${nativeStartIndex}
 `,
 );