[autofix.ci] apply automated fixes

The FFI `JSVALUE_TO_PTR` function was missing support for ArrayBuffer objects,
causing segfaults when ArrayBuffers were passed as pointer arguments to FFI
functions. TypedArrays and DataViews worked correctly, but ArrayBuffers fell
through to number-as-pointer conversion logic, resulting in invalid pointers.

Changes:
- Add `JSC__JSValue__toArrayBufferPtr` C++ helper function to extract ArrayBuffer data pointer
- Add `JSCELL_IS_ARRAY_BUFFER` helper function for type detection
- Update `JSVALUE_TO_PTR` in FFI.h to handle ArrayBuffer case
- Add JSTypeArrayBuffer constant (value 38) for type detection
- Integrate ArrayBuffer support into FFI symbol table
- Add regression test to prevent future issues
- Add test/js/bun/ffi/*.so to .gitignore to prevent committing compiled FFI test binaries

Fixes: ArrayBuffer, TypedArray, and DataView now all work identically when
passed as pointer arguments to FFI functions.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

.buildkite/ci.mjs

@@ -434,11 +434,17 @@ function getBuildEnv(target, options) {
  * @param {PipelineOptions} options
  * @returns {string}
  */
-function getBuildCommand(target, options) {
+function getBuildCommand(target, options, label) {
   const { profile } = target;
+  const buildProfile = profile || "release";
 
-  const label = profile || "release";
-  return `bun run build:${label}`;
+  if (target.os === "windows" && label === "build-bun") {
+    // Only sign release builds, not canary builds (DigiCert charges per signature)
+    const enableSigning = !options.canary ? " -DENABLE_WINDOWS_CODESIGNING=ON" : "";
+    return `bun run build:${buildProfile}${enableSigning}`;
+  }
+
+  return `bun run build:${buildProfile}`;
 }
 
 /**
@@ -534,7 +540,7 @@ function getLinkBunStep(platform, options) {
       BUN_LINK_ONLY: "ON",
       ...getBuildEnv(platform, options),
     },
-    command: `${getBuildCommand(platform, options)} --target bun`,
+    command: `${getBuildCommand(platform, options, "build-bun")} --target bun`,
   };
 }
 

.buildkite/scripts/sign-windows.ps1

@@ -0,0 +1,464 @@
+# Windows Code Signing Script for Bun
+# Uses DigiCert KeyLocker for Authenticode signing
+# Native PowerShell implementation - no path translation issues
+
+param(
+    [Parameter(Mandatory=$true)]
+    [string]$BunProfileExe,
+    
+    [Parameter(Mandatory=$true)]
+    [string]$BunExe
+)
+
+$ErrorActionPreference = "Stop"
+$ProgressPreference = "SilentlyContinue"
+
+# Logging functions
+function Log-Info {
+    param([string]$Message)
+    Write-Host "[INFO] $Message" -ForegroundColor Cyan
+}
+
+function Log-Success {
+    param([string]$Message)
+    Write-Host "[SUCCESS] $Message" -ForegroundColor Green
+}
+
+function Log-Error {
+    param([string]$Message)
+    Write-Host "[ERROR] $Message" -ForegroundColor Red
+}
+
+function Log-Debug {
+    param([string]$Message)
+    if ($env:DEBUG -eq "true" -or $env:DEBUG -eq "1") {
+        Write-Host "[DEBUG] $Message" -ForegroundColor Gray
+    }
+}
+
+# Load Visual Studio environment if not already loaded
+function Ensure-VSEnvironment {
+    if ($null -eq $env:VSINSTALLDIR) {
+        Log-Info "Loading Visual Studio environment..."
+        
+        $vswhere = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"
+        if (!(Test-Path $vswhere)) {
+            throw "Command not found: vswhere (did you install Visual Studio?)"
+        }
+        
+        $vsDir = & $vswhere -prerelease -latest -property installationPath
+        if ($null -eq $vsDir) {
+            $vsDir = Get-ChildItem -Path "C:\Program Files\Microsoft Visual Studio\2022" -Directory -ErrorAction SilentlyContinue
+            if ($null -eq $vsDir) {
+                throw "Visual Studio directory not found."
+            }
+            $vsDir = $vsDir.FullName
+        }
+        
+        Push-Location $vsDir
+        try {
+            $vsShell = Join-Path -Path $vsDir -ChildPath "Common7\Tools\Launch-VsDevShell.ps1"
+            . $vsShell -Arch amd64 -HostArch amd64
+        } finally {
+            Pop-Location
+        }
+        
+        Log-Success "Visual Studio environment loaded"
+    }
+    
+    if ($env:VSCMD_ARG_TGT_ARCH -eq "x86") {
+        throw "Visual Studio environment is targeting 32 bit, but only 64 bit is supported."
+    }
+}
+
+# Check for required environment variables
+function Check-Environment {
+    Log-Info "Checking environment variables..."
+    
+    $required = @{
+        "SM_API_KEY" = $env:SM_API_KEY
+        "SM_CLIENT_CERT_PASSWORD" = $env:SM_CLIENT_CERT_PASSWORD
+        "SM_KEYPAIR_ALIAS" = $env:SM_KEYPAIR_ALIAS
+        "SM_HOST" = $env:SM_HOST
+        "SM_CLIENT_CERT_FILE" = $env:SM_CLIENT_CERT_FILE
+    }
+    
+    $missing = @()
+    foreach ($key in $required.Keys) {
+        if ([string]::IsNullOrEmpty($required[$key])) {
+            $missing += $key
+        } else {
+            Log-Debug "$key is set (length: $($required[$key].Length))"
+        }
+    }
+    
+    if ($missing.Count -gt 0) {
+        throw "Missing required environment variables: $($missing -join ', ')"
+    }
+    
+    Log-Success "All required environment variables are present"
+}
+
+# Setup certificate file
+function Setup-Certificate {
+    Log-Info "Setting up certificate..."
+    
+    # Always try to decode as base64 first
+    # If it fails, then treat as file path
+    try {
+        Log-Info "Attempting to decode certificate as base64..."
+        Log-Debug "Input string length: $($env:SM_CLIENT_CERT_FILE.Length) characters"
+        
+        $tempCertPath = Join-Path $env:TEMP "digicert_cert_$(Get-Random).p12"
+        
+        # Try to decode as base64
+        $certBytes = [System.Convert]::FromBase64String($env:SM_CLIENT_CERT_FILE)
+        [System.IO.File]::WriteAllBytes($tempCertPath, $certBytes)
+        
+        # Validate the decoded certificate size
+        $fileSize = (Get-Item $tempCertPath).Length
+        if ($fileSize -lt 100) {
+            throw "Decoded certificate too small: $fileSize bytes (expected >100 bytes)"
+        }
+        
+        # Update environment to point to file
+        $env:SM_CLIENT_CERT_FILE = $tempCertPath
+        
+        Log-Success "Certificate decoded and written to: $tempCertPath"
+        Log-Debug "Decoded certificate file size: $fileSize bytes"
+        
+        # Register cleanup
+        $global:TEMP_CERT_PATH = $tempCertPath
+        
+    } catch {
+        # If base64 decode fails, check if it's a file path
+        Log-Info "Base64 decode failed, checking if it's a file path..."
+        Log-Debug "Decode error: $_"
+        
+        if (Test-Path $env:SM_CLIENT_CERT_FILE) {
+            $fileSize = (Get-Item $env:SM_CLIENT_CERT_FILE).Length
+            
+            # Validate file size
+            if ($fileSize -lt 100) {
+                throw "Certificate file too small: $fileSize bytes at $env:SM_CLIENT_CERT_FILE (possibly corrupted)"
+            }
+            
+            Log-Info "Using certificate file: $env:SM_CLIENT_CERT_FILE"
+            Log-Debug "Certificate file size: $fileSize bytes"
+        } else {
+            throw "SM_CLIENT_CERT_FILE is neither valid base64 nor an existing file: $env:SM_CLIENT_CERT_FILE"
+        }
+    }
+}
+
+# Install DigiCert KeyLocker tools
+function Install-KeyLocker {
+    Log-Info "Setting up DigiCert KeyLocker tools..."
+    
+    # Define our controlled installation directory
+    $installDir = "C:\BuildTools\DigiCert"
+    $smctlPath = Join-Path $installDir "smctl.exe"
+    
+    # Check if already installed in our controlled location
+    if (Test-Path $smctlPath) {
+        Log-Success "KeyLocker tools already installed at: $smctlPath"
+        
+        # Add to PATH if not already there
+        if ($env:PATH -notlike "*$installDir*") {
+            $env:PATH = "$installDir;$env:PATH"
+            Log-Info "Added to PATH: $installDir"
+        }
+        
+        return $smctlPath
+    }
+    
+    Log-Info "Installing KeyLocker tools to: $installDir"
+    
+    # Create the installation directory if it doesn't exist
+    if (!(Test-Path $installDir)) {
+        Log-Info "Creating installation directory: $installDir"
+        try {
+            New-Item -ItemType Directory -Path $installDir -Force | Out-Null
+            Log-Success "Created directory: $installDir"
+        } catch {
+            throw "Failed to create directory $installDir : $_"
+        }
+    }
+    
+    # Download MSI installer
+    $msiUrl = "https://bun-ci-assets.bun.sh/Keylockertools-windows-x64.msi"
+    $msiPath = Join-Path $env:TEMP "Keylockertools-windows-x64.msi"
+    
+    Log-Info "Downloading MSI from: $msiUrl"
+    Log-Info "Downloading to: $msiPath"
+    
+    try {
+        # Remove existing MSI if present
+        if (Test-Path $msiPath) {
+            Remove-Item $msiPath -Force
+            Log-Debug "Removed existing MSI file"
+        }
+        
+        # Download with progress tracking
+        $webClient = New-Object System.Net.WebClient
+        $webClient.DownloadFile($msiUrl, $msiPath)
+        
+        if (!(Test-Path $msiPath)) {
+            throw "MSI download failed - file not found"
+        }
+        
+        $fileSize = (Get-Item $msiPath).Length
+        Log-Success "MSI downloaded successfully (size: $fileSize bytes)"
+        
+    } catch {
+        throw "Failed to download MSI: $_"
+    }
+    
+    # Install MSI
+    Log-Info "Installing MSI..."
+    Log-Debug "MSI path: $msiPath"
+    Log-Debug "File exists: $(Test-Path $msiPath)"
+    Log-Debug "File size: $((Get-Item $msiPath).Length) bytes"
+    
+    # Check if running as administrator
+    $isAdmin = ([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
+    Log-Info "Running as administrator: $isAdmin"
+    
+    # Install MSI silently to our controlled directory
+    $arguments = @(
+        "/i", "`"$msiPath`"",
+        "/quiet",
+        "/norestart",
+        "TARGETDIR=`"$installDir`"",
+        "INSTALLDIR=`"$installDir`"",
+        "ACCEPT_EULA=1",
+        "ADDLOCAL=ALL"
+    )
+    
+    Log-Debug "Running: msiexec.exe $($arguments -join ' ')"
+    Log-Info "Installing to: $installDir"
+    
+    $process = Start-Process -FilePath "msiexec.exe" -ArgumentList $arguments -Wait -PassThru -NoNewWindow
+    
+    if ($process.ExitCode -ne 0) {
+        Log-Error "MSI installation failed with exit code: $($process.ExitCode)"
+        
+        # Try to get error details from event log
+        try {
+            $events = Get-WinEvent -LogName "Application" -MaxEvents 10 | 
+                Where-Object { $_.ProviderName -eq "MsiInstaller" -and $_.TimeCreated -gt (Get-Date).AddMinutes(-1) }
+            
+            foreach ($event in $events) {
+                Log-Debug "MSI Event: $($event.Message)"
+            }
+        } catch {
+            Log-Debug "Could not retrieve MSI installation events"
+        }
+        
+        throw "MSI installation failed with exit code: $($process.ExitCode)"
+    }
+    
+    Log-Success "MSI installation completed"
+    
+    # Wait for installation to complete
+    Start-Sleep -Seconds 2
+    
+    # Verify smctl.exe exists in our controlled location
+    if (Test-Path $smctlPath) {
+        Log-Success "KeyLocker tools installed successfully at: $smctlPath"
+        
+        # Add to PATH
+        $env:PATH = "$installDir;$env:PATH"
+        Log-Info "Added to PATH: $installDir"
+        
+        return $smctlPath
+    }
+    
+    # If not in our expected location, check if it installed somewhere in the directory
+    $found = Get-ChildItem -Path $installDir -Filter "smctl.exe" -Recurse -ErrorAction SilentlyContinue | 
+        Select-Object -First 1
+    
+    if ($found) {
+        Log-Success "Found smctl.exe at: $($found.FullName)"
+        $smctlDir = $found.DirectoryName
+        $env:PATH = "$smctlDir;$env:PATH"
+        return $found.FullName
+    }
+    
+    throw "KeyLocker tools installation succeeded but smctl.exe not found in $installDir"
+}
+
+# Configure KeyLocker
+function Configure-KeyLocker {
+    param([string]$SmctlPath)
+    
+    Log-Info "Configuring KeyLocker..."
+    
+    # Verify smctl is accessible
+    try {
+        $version = & $SmctlPath --version 2>&1
+        Log-Debug "smctl version: $version"
+    } catch {
+        throw "Failed to run smctl: $_"
+    }
+    
+    # Configure KeyLocker credentials and environment
+    Log-Info "Configuring KeyLocker credentials..."
+    
+    try {
+        # Save credentials (API key and password)
+        Log-Info "Saving credentials to OS store..."
+        $saveOutput = & $SmctlPath credentials save $env:SM_API_KEY $env:SM_CLIENT_CERT_PASSWORD 2>&1 | Out-String
+        Log-Debug "Credentials save output: $saveOutput"
+        
+        if ($saveOutput -like "*Credentials saved*") {
+            Log-Success "Credentials saved successfully"
+        }
+        
+        # Set environment variables for smctl
+        Log-Info "Setting KeyLocker environment variables..."
+        $env:SM_HOST = $env:SM_HOST  # Already set, but ensure it's available
+        $env:SM_API_KEY = $env:SM_API_KEY  # Already set
+        $env:SM_CLIENT_CERT_FILE = $env:SM_CLIENT_CERT_FILE  # Path to decoded cert file
+        Log-Debug "SM_HOST: $env:SM_HOST"
+        Log-Debug "SM_CLIENT_CERT_FILE: $env:SM_CLIENT_CERT_FILE"
+        
+        # Run health check
+        Log-Info "Running KeyLocker health check..."
+        $healthOutput = & $SmctlPath healthcheck 2>&1 | Out-String
+        Log-Debug "Health check output: $healthOutput"
+        
+        if ($healthOutput -like "*Healthy*" -or $healthOutput -like "*SUCCESS*" -or $LASTEXITCODE -eq 0) {
+            Log-Success "KeyLocker health check passed"
+        } else {
+            Log-Error "Health check failed: $healthOutput"
+            # Don't throw here, sometimes healthcheck is flaky but signing still works
+        }
+        
+        # Sync certificates to Windows certificate store
+        Log-Info "Syncing certificates to Windows store..."
+        $syncOutput = & $SmctlPath windows certsync 2>&1 | Out-String
+        Log-Debug "Certificate sync output: $syncOutput"
+        
+        if ($syncOutput -like "*success*" -or $syncOutput -like "*synced*" -or $LASTEXITCODE -eq 0) {
+            Log-Success "Certificates synced to Windows store"
+        } else {
+            Log-Info "Certificate sync output: $syncOutput"
+        }
+        
+    } catch {
+        throw "Failed to configure KeyLocker: $_"
+    }
+}
+
+# Sign an executable
+function Sign-Executable {
+    param(
+        [string]$ExePath,
+        [string]$SmctlPath
+    )
+    
+    if (!(Test-Path $ExePath)) {
+        throw "Executable not found: $ExePath"
+    }
+    
+    $fileName = Split-Path $ExePath -Leaf
+    Log-Info "Signing $fileName..."
+    Log-Debug "Full path: $ExePath"
+    Log-Debug "File size: $((Get-Item $ExePath).Length) bytes"
+    
+    # Check if already signed
+    $existingSig = Get-AuthenticodeSignature $ExePath
+    if ($existingSig.Status -eq "Valid") {
+        Log-Info "$fileName is already signed by: $($existingSig.SignerCertificate.Subject)"
+        Log-Info "Skipping re-signing"
+        return
+    }
+    
+    # Sign the executable using smctl
+    try {
+        # smctl sign command with keypair-alias
+        $signArgs = @(
+            "sign",
+            "--keypair-alias", $env:SM_KEYPAIR_ALIAS,
+            "--input", $ExePath,
+            "--verbose"
+        )
+        
+        Log-Debug "Running: $SmctlPath $($signArgs -join ' ')"
+        
+        $signOutput = & $SmctlPath $signArgs 2>&1 | Out-String
+        
+        if ($LASTEXITCODE -ne 0) {
+            Log-Error "Signing output: $signOutput"
+            throw "Signing failed with exit code: $LASTEXITCODE"
+        }
+        
+        Log-Debug "Signing output: $signOutput"
+        Log-Success "Signing command completed"
+        
+    } catch {
+        throw "Failed to sign $fileName : $_"
+    }
+    
+    # Verify signature
+    $newSig = Get-AuthenticodeSignature $ExePath
+    
+    if ($newSig.Status -eq "Valid") {
+        Log-Success "$fileName signed successfully"
+        Log-Info "Signed by: $($newSig.SignerCertificate.Subject)"
+        Log-Info "Thumbprint: $($newSig.SignerCertificate.Thumbprint)"
+        Log-Info "Valid from: $($newSig.SignerCertificate.NotBefore) to $($newSig.SignerCertificate.NotAfter)"
+    } else {
+        throw "$fileName signature verification failed: $($newSig.Status) - $($newSig.StatusMessage)"
+    }
+}
+
+# Cleanup function
+function Cleanup {
+    if ($global:TEMP_CERT_PATH -and (Test-Path $global:TEMP_CERT_PATH)) {
+        try {
+            Remove-Item $global:TEMP_CERT_PATH -Force
+            Log-Info "Cleaned up temporary certificate"
+        } catch {
+            Log-Error "Failed to cleanup temporary certificate: $_"
+        }
+    }
+}
+
+# Main execution
+try {
+    Write-Host "========================================" -ForegroundColor Cyan
+    Write-Host "  Windows Code Signing for Bun" -ForegroundColor Cyan
+    Write-Host "========================================" -ForegroundColor Cyan
+    
+    # Ensure we're in a VS environment
+    Ensure-VSEnvironment
+    
+    # Check environment variables
+    Check-Environment
+    
+    # Setup certificate
+    Setup-Certificate
+    
+    # Install and configure KeyLocker
+    $smctlPath = Install-KeyLocker
+    Configure-KeyLocker -SmctlPath $smctlPath
+    
+    # Sign both executables
+    Sign-Executable -ExePath $BunProfileExe -SmctlPath $smctlPath
+    Sign-Executable -ExePath $BunExe -SmctlPath $smctlPath
+    
+    Write-Host "========================================" -ForegroundColor Green
+    Write-Host "  Code signing completed successfully!" -ForegroundColor Green
+    Write-Host "========================================" -ForegroundColor Green
+    
+    exit 0
+    
+} catch {
+    Log-Error "Code signing failed: $_"
+    exit 1
+    
+} finally {
+    Cleanup
+}

.github/workflows/auto-label-claude-prs.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   auto-label:
-    if: github.event.pull_request.user.login == 'robobun'
+    if: github.event.pull_request.user.login == 'robobun' || contains(github.event.pull_request.body, '🤖 Generated with')
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -21,4 +21,4 @@ jobs:
               repo: context.repo.repo,
               issue_number: context.issue.number,
               labels: ['claude']
-            });
+            });

.github/workflows/claude.yml

@@ -37,6 +37,21 @@ jobs:
       - name: Checkout repository
         working-directory: /workspace/bun
         run: |
+          git config --global user.email "claude-bot@bun.sh" && \
+          git config --global user.name "Claude Bot" && \
+          git config --global url."git@github.com:".insteadOf "https://github.com/" && \
+          git config --global url."git@github.com:".insteadOf "http://github.com/" && \
+          git config --global --add safe.directory /workspace/bun && \
+          git config --global push.default current && \
+          git config --global pull.rebase true && \
+          git config --global init.defaultBranch main && \
+          git config --global core.editor "vim" && \
+          git config --global color.ui auto && \
+          git config --global fetch.prune true && \
+          git config --global diff.colorMoved zebra && \
+          git config --global merge.conflictStyle diff3 && \
+          git config --global rerere.enabled true && \
+          git config --global core.autocrlf input
           git fetch origin ${{ github.event.pull_request.head.sha }}
           git checkout ${{ github.event.pull_request.head.ref }}
           git reset --hard origin/${{ github.event.pull_request.head.ref }}

.gitignore

@@ -186,4 +186,4 @@ scratch*.{js,ts,tsx,cjs,mjs}
 
 *.bun-build
 
-scripts/lldb-inline
+scripts/lldb-inline*.so

.vscode/launch.json

@@ -22,6 +22,9 @@
         "BUN_DEBUG_QUIET_LOGS": "1",
         "BUN_DEBUG_jest": "1",
         "BUN_GARBAGE_COLLECTOR_LEVEL": "1",
+        // "BUN_JSC_validateExceptionChecks": "1",
+        // "BUN_JSC_dumpSimulatedThrows": "1",
+        // "BUN_JSC_unexpectedExceptionStackTraceLimit": "20",
       },
       "console": "internalConsole",
       "sourceMap": {

.vscode/settings.json

@@ -168,5 +168,5 @@
     "WebKit/WebInspectorUI": true,
   },
   "git.detectSubmodules": false,
-  "bun.test.customScript": "./build/debug/bun-debug test"
+  "bun.test.customScript": "./build/debug/bun-debug test",
 }

CONTRIBUTING.md

@@ -223,8 +223,8 @@ $ git clone https://github.com/oven-sh/WebKit vendor/WebKit
 $ git -C vendor/WebKit checkout <commit_hash>
 
 # Make a debug build of JSC. This will output build artifacts in ./vendor/WebKit/WebKitBuild/Debug
-# Optionally, you can use `make jsc` for a release build
-$ make jsc-debug && rm vendor/WebKit/WebKitBuild/Debug/JavaScriptCore/DerivedSources/inspector/InspectorProtocolObjects.h
+# Optionally, you can use `bun run jsc:build` for a release build
+$ bun run jsc:build:debug && rm vendor/WebKit/WebKitBuild/Debug/JavaScriptCore/DerivedSources/inspector/InspectorProtocolObjects.h
 
 # After an initial run of `make jsc-debug`, you can rebuild JSC with:
 $ cmake --build vendor/WebKit/WebKitBuild/Debug --target jsc && rm vendor/WebKit/WebKitBuild/Debug/JavaScriptCore/DerivedSources/inspector/InspectorProtocolObjects.h

LATEST

@@ -1 +1 @@
-1.2.20
+1.2.21

bench/postMessage/postMessage-string.mjs

@@ -0,0 +1,77 @@
+// Benchmark for string fast path optimization in postMessage with Workers
+
+import { bench, run } from "mitata";
+import { Worker, isMainThread, parentPort } from "node:worker_threads";
+
+// Test strings of different sizes
+const strings = {
+  small: "Hello world",
+  medium: Buffer.alloc("Hello World!!!".length * 1024, "Hello World!!!").toString(),
+  large: Buffer.alloc("Hello World!!!".length * 1024 * 256, "Hello World!!!").toString(),
+};
+
+let worker;
+let receivedCount = new Int32Array(new SharedArrayBuffer(4));
+let sentCount = 0;
+
+function createWorker() {
+  const workerCode = `
+    import { parentPort, workerData } from "node:worker_threads";
+
+    let int = workerData;
+
+    parentPort?.on("message", data => {
+      Atomics.add(int, 0, 1);
+    });
+  `;
+
+  worker = new Worker(workerCode, { eval: true, workerData: receivedCount });
+
+  worker.on("message", confirmationId => {});
+
+  worker.on("error", error => {
+    console.error("Worker error:", error);
+  });
+}
+
+// Initialize worker before running benchmarks
+createWorker();
+
+function fmt(int) {
+  if (int < 1000) {
+    return `${int} chars`;
+  }
+
+  if (int < 100000) {
+    return `${(int / 1024) | 0} KB`;
+  }
+
+  return `${(int / 1024 / 1024) | 0} MB`;
+}
+
+// Benchmark postMessage with pure strings (uses fast path)
+bench("postMessage(" + fmt(strings.small.length) + " string)", async () => {
+  sentCount++;
+  worker.postMessage(strings.small);
+});
+
+bench("postMessage(" + fmt(strings.medium.length) + " string)", async () => {
+  sentCount++;
+  worker.postMessage(strings.medium);
+});
+
+bench("postMessage(" + fmt(strings.large.length) + " string)", async () => {
+  sentCount++;
+  worker.postMessage(strings.large);
+});
+
+await run();
+
+await new Promise(resolve => setTimeout(resolve, 5000));
+
+if (receivedCount[0] !== sentCount) {
+  throw new Error("Expected " + receivedCount[0] + " to equal " + sentCount);
+}
+
+// Cleanup worker
+worker?.terminate();

bench/postMessage/structureClone-string.mjs

@@ -0,0 +1,56 @@
+// Benchmark for string fast path optimization in postMessage and structuredClone
+
+import { bench, run } from "mitata";
+
+// Test strings of different sizes
+const strings = {
+  small: "Hello world",
+  medium: "Hello World!!!".repeat(1024).split("").join(""),
+  large: "Hello World!!!".repeat(1024).repeat(1024).split("").join(""),
+};
+
+console.log("String fast path benchmark");
+console.log("Comparing pure strings (fast path) vs objects containing strings (traditional)");
+console.log("For structuredClone, pure strings should have constant time regardless of size.");
+console.log("");
+
+// Benchmark structuredClone with pure strings (uses fast path)
+bench("structuredClone small string (fast path)", () => {
+  structuredClone(strings.small);
+});
+
+bench("structuredClone medium string (fast path)", () => {
+  structuredClone(strings.medium);
+});
+
+bench("structuredClone large string (fast path)", () => {
+  structuredClone(strings.large);
+});
+
+// Benchmark structuredClone with objects containing strings (traditional path)
+bench("structuredClone object with small string", () => {
+  structuredClone({ str: strings.small });
+});
+
+bench("structuredClone object with medium string", () => {
+  structuredClone({ str: strings.medium });
+});
+
+bench("structuredClone object with large string", () => {
+  structuredClone({ str: strings.large });
+});
+
+// Multiple string cloning benchmark
+bench("structuredClone 100 small strings", () => {
+  for (let i = 0; i < 100; i++) {
+    structuredClone(strings.small);
+  }
+});
+
+bench("structuredClone 100 small objects", () => {
+  for (let i = 0; i < 100; i++) {
+    structuredClone({ str: strings.small });
+  }
+});
+
+await run();

bench/yaml/bun.lock

@@ -0,0 +1,19 @@
+{
+  "lockfileVersion": 1,
+  "workspaces": {
+    "": {
+      "name": "yaml-benchmark",
+      "dependencies": {
+        "js-yaml": "^4.1.0",
+        "yaml": "^2.8.1",
+      },
+    },
+  },
+  "packages": {
+    "argparse": ["argparse@2.0.1", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="],
+
+    "js-yaml": ["js-yaml@4.1.0", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="],
+
+    "yaml": ["yaml@2.8.1", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw=="],
+  }
+}

bench/yaml/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "yaml-benchmark",
+  "version": "1.0.0",
+  "dependencies": {
+    "js-yaml": "^4.1.0",
+    "yaml": "^2.8.1"
+  }
+}

bench/yaml/yaml-parse.mjs

@@ -0,0 +1,368 @@
+import { bench, group, run } from "../runner.mjs";
+import jsYaml from "js-yaml";
+import yaml from "yaml";
+
+// Small YAML document
+const smallYaml = `
+name: John Doe
+age: 30
+email: john@example.com
+active: true
+`;
+
+// Medium YAML document with nested structures
+const mediumYaml = `
+company: Acme Corp
+employees:
+  - name: John Doe
+    age: 30
+    position: Developer
+    skills:
+      - JavaScript
+      - TypeScript
+      - Node.js
+  - name: Jane Smith
+    age: 28
+    position: Designer
+    skills:
+      - Figma
+      - Photoshop
+      - Illustrator
+  - name: Bob Johnson
+    age: 35
+    position: Manager
+    skills:
+      - Leadership
+      - Communication
+      - Planning
+settings:
+  database:
+    host: localhost
+    port: 5432
+    name: mydb
+  cache:
+    enabled: true
+    ttl: 3600
+`;
+
+// Large YAML document with complex structures
+const largeYaml = `
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nginx-deployment
+  labels:
+    app: nginx
+spec:
+  replicas: 3
+  selector:
+    matchLabels:
+      app: nginx
+  template:
+    metadata:
+      labels:
+        app: nginx
+    spec:
+      containers:
+      - name: nginx
+        image: nginx:1.14.2
+        ports:
+        - containerPort: 80
+        env:
+        - name: ENV_VAR_1
+          value: "value1"
+        - name: ENV_VAR_2
+          value: "value2"
+        volumeMounts:
+        - name: config
+          mountPath: /etc/nginx
+        resources:
+          limits:
+            cpu: "1"
+            memory: "1Gi"
+          requests:
+            cpu: "0.5"
+            memory: "512Mi"
+      volumes:
+      - name: config
+        configMap:
+          name: nginx-config
+          items:
+          - key: nginx.conf
+            path: nginx.conf
+          - key: mime.types
+            path: mime.types
+      nodeSelector:
+        disktype: ssd
+      tolerations:
+      - key: "key1"
+        operator: "Equal"
+        value: "value1"
+        effect: "NoSchedule"
+      - key: "key2"
+        operator: "Exists"
+        effect: "NoExecute"
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: kubernetes.io/e2e-az-name
+                operator: In
+                values:
+                - e2e-az1
+                - e2e-az2
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - web-store
+              topologyKey: kubernetes.io/hostname
+`;
+
+// YAML with anchors and references
+const yamlWithAnchors = `
+defaults: &defaults
+  adapter: postgresql
+  host: localhost
+  port: 5432
+
+development:
+  <<: *defaults
+  database: dev_db
+
+test:
+  <<: *defaults
+  database: test_db
+
+production:
+  <<: *defaults
+  database: prod_db
+  host: prod.example.com
+`;
+
+// Array of items
+const arrayYaml = `
+- id: 1
+  name: Item 1
+  price: 10.99
+  tags: [electronics, gadgets]
+- id: 2
+  name: Item 2
+  price: 25.50
+  tags: [books, education]
+- id: 3
+  name: Item 3
+  price: 5.00
+  tags: [food, snacks]
+- id: 4
+  name: Item 4
+  price: 100.00
+  tags: [electronics, computers]
+- id: 5
+  name: Item 5
+  price: 15.75
+  tags: [clothing, accessories]
+`;
+
+// Multiline strings
+const multilineYaml = `
+description: |
+  This is a multiline string
+  that preserves line breaks
+  and indentation.
+  
+  It can contain multiple paragraphs
+  and special characters: !@#$%^&*()
+  
+folded: >
+  This is a folded string
+  where line breaks are converted
+  to spaces unless there are
+  
+  empty lines like above.
+plain: This is a plain string
+quoted: "This is a quoted string with \\"escapes\\""
+literal: 'This is a literal string with ''quotes'''
+`;
+
+// Numbers and special values
+const numbersYaml = `
+integer: 42
+negative: -17
+float: 3.14159
+scientific: 1.23e-4
+infinity: .inf
+negativeInfinity: -.inf
+notANumber: .nan
+octal: 0o755
+hex: 0xFF
+binary: 0b1010
+`;
+
+// Dates and timestamps
+const datesYaml = `
+date: 2024-01-15
+datetime: 2024-01-15T10:30:00Z
+timestamp: 2024-01-15 10:30:00.123456789 -05:00
+canonical: 2024-01-15T10:30:00.123456789Z
+`;
+
+// Parse benchmarks
+group("parse small YAML", () => {
+  if (typeof Bun !== "undefined" && Bun.YAML) {
+    bench("Bun.YAML.parse", () => {
+      globalThis.result = Bun.YAML.parse(smallYaml);
+    });
+  }
+
+  bench("js-yaml.load", () => {
+    globalThis.result = jsYaml.load(smallYaml);
+  });
+
+  bench("yaml.parse", () => {
+    globalThis.result = yaml.parse(smallYaml);
+  });
+});
+
+group("parse medium YAML", () => {
+  if (typeof Bun !== "undefined" && Bun.YAML) {
+    bench("Bun.YAML.parse", () => {
+      globalThis.result = Bun.YAML.parse(mediumYaml);
+    });
+  }
+
+  bench("js-yaml.load", () => {
+    globalThis.result = jsYaml.load(mediumYaml);
+  });
+
+  bench("yaml.parse", () => {
+    globalThis.result = yaml.parse(mediumYaml);
+  });
+});
+
+group("parse large YAML", () => {
+  if (typeof Bun !== "undefined" && Bun.YAML) {
+    bench("Bun.YAML.parse", () => {
+      globalThis.result = Bun.YAML.parse(largeYaml);
+    });
+  }
+
+  bench("js-yaml.load", () => {
+    globalThis.result = jsYaml.load(largeYaml);
+  });
+
+  bench("yaml.parse", () => {
+    globalThis.result = yaml.parse(largeYaml);
+  });
+});
+
+group("parse YAML with anchors", () => {
+  if (typeof Bun !== "undefined" && Bun.YAML) {
+    bench("Bun.YAML.parse", () => {
+      globalThis.result = Bun.YAML.parse(yamlWithAnchors);
+    });
+  }
+
+  bench("js-yaml.load", () => {
+    globalThis.result = jsYaml.load(yamlWithAnchors);
+  });
+
+  bench("yaml.parse", () => {
+    globalThis.result = yaml.parse(yamlWithAnchors);
+  });
+});
+
+group("parse YAML array", () => {
+  if (typeof Bun !== "undefined" && Bun.YAML) {
+    bench("Bun.YAML.parse", () => {
+      globalThis.result = Bun.YAML.parse(arrayYaml);
+    });
+  }
+
+  bench("js-yaml.load", () => {
+    globalThis.result = jsYaml.load(arrayYaml);
+  });
+
+  bench("yaml.parse", () => {
+    globalThis.result = yaml.parse(arrayYaml);
+  });
+});
+
+group("parse YAML with multiline strings", () => {
+  if (typeof Bun !== "undefined" && Bun.YAML) {
+    bench("Bun.YAML.parse", () => {
+      globalThis.result = Bun.YAML.parse(multilineYaml);
+    });
+  }
+
+  bench("js-yaml.load", () => {
+    globalThis.result = jsYaml.load(multilineYaml);
+  });
+
+  bench("yaml.parse", () => {
+    globalThis.result = yaml.parse(multilineYaml);
+  });
+});
+
+group("parse YAML with numbers", () => {
+  if (typeof Bun !== "undefined" && Bun.YAML) {
+    bench("Bun.YAML.parse", () => {
+      globalThis.result = Bun.YAML.parse(numbersYaml);
+    });
+  }
+
+  bench("js-yaml.load", () => {
+    globalThis.result = jsYaml.load(numbersYaml);
+  });
+
+  bench("yaml.parse", () => {
+    globalThis.result = yaml.parse(numbersYaml);
+  });
+});
+
+group("parse YAML with dates", () => {
+  if (typeof Bun !== "undefined" && Bun.YAML) {
+    bench("Bun.YAML.parse", () => {
+      globalThis.result = Bun.YAML.parse(datesYaml);
+    });
+  }
+
+  bench("js-yaml.load", () => {
+    globalThis.result = jsYaml.load(datesYaml);
+  });
+
+  bench("yaml.parse", () => {
+    globalThis.result = yaml.parse(datesYaml);
+  });
+});
+
+// // Stringify benchmarks
+// const smallObjJs = jsYaml.load(smallYaml);
+// const mediumObjJs = jsYaml.load(mediumYaml);
+// const largeObjJs = jsYaml.load(largeYaml);
+
+// group("stringify small object", () => {
+//   bench("js-yaml.dump", () => {
+//     globalThis.result = jsYaml.dump(smallObjJs);
+//   });
+// });
+
+// group("stringify medium object", () => {
+//   bench("js-yaml.dump", () => {
+//     globalThis.result = jsYaml.dump(mediumObjJs);
+//   });
+// });
+
+// group("stringify large object", () => {
+//   bench("js-yaml.dump", () => {
+//     globalThis.result = jsYaml.dump(largeObjJs);
+//   });
+// });
+
+await run();

bun.lock

@@ -6,6 +6,7 @@
       "devDependencies": {
         "@lezer/common": "^1.2.3",
         "@lezer/cpp": "^1.1.3",
+        "@types/bun": "workspace:*",
         "bun-tracestrings": "github:oven-sh/bun.report#912ca63e26c51429d3e6799aa2a6ab079b188fd8",
         "esbuild": "^0.21.4",
         "mitata": "^0.1.11",

cmake/Options.cmake

@@ -57,6 +57,23 @@ else()
   message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}")
 endif()
 
+# Windows Code Signing Option
+if(WIN32)
+  optionx(ENABLE_WINDOWS_CODESIGNING BOOL "Enable Windows code signing with DigiCert KeyLocker" DEFAULT OFF)
+  
+  if(ENABLE_WINDOWS_CODESIGNING)
+    message(STATUS "Windows code signing: ENABLED")
+    
+    # Check for required environment variables
+    if(NOT DEFINED ENV{SM_API_KEY})
+      message(WARNING "SM_API_KEY not set - code signing may fail")
+    endif()
+    if(NOT DEFINED ENV{SM_CLIENT_CERT_FILE})
+      message(WARNING "SM_CLIENT_CERT_FILE not set - code signing may fail")
+    endif()
+  endif()
+endif()
+
 if(LINUX)
   if(EXISTS "/etc/alpine-release")
     set(DEFAULT_ABI "musl")

cmake/sources/CxxSources.txt

@@ -87,6 +87,7 @@ src/bun.js/bindings/JSNodePerformanceHooksHistogramConstructor.cpp
 src/bun.js/bindings/JSNodePerformanceHooksHistogramPrototype.cpp
 src/bun.js/bindings/JSPropertyIterator.cpp
 src/bun.js/bindings/JSS3File.cpp
+src/bun.js/bindings/JSSecrets.cpp
 src/bun.js/bindings/JSSocketAddressDTO.cpp
 src/bun.js/bindings/JSStringDecoder.cpp
 src/bun.js/bindings/JSWrappingFunction.cpp
@@ -94,6 +95,7 @@ src/bun.js/bindings/JSX509Certificate.cpp
 src/bun.js/bindings/JSX509CertificateConstructor.cpp
 src/bun.js/bindings/JSX509CertificatePrototype.cpp
 src/bun.js/bindings/linux_perf_tracing.cpp
+src/bun.js/bindings/MarkedArgumentBufferBinding.cpp
 src/bun.js/bindings/MarkingConstraint.cpp
 src/bun.js/bindings/ModuleLoader.cpp
 src/bun.js/bindings/napi_external.cpp
@@ -188,6 +190,9 @@ src/bun.js/bindings/ProcessIdentifier.cpp
 src/bun.js/bindings/RegularExpression.cpp
 src/bun.js/bindings/S3Error.cpp
 src/bun.js/bindings/ScriptExecutionContext.cpp
+src/bun.js/bindings/SecretsDarwin.cpp
+src/bun.js/bindings/SecretsLinux.cpp
+src/bun.js/bindings/SecretsWindows.cpp
 src/bun.js/bindings/Serialization.cpp
 src/bun.js/bindings/ServerRouteList.cpp
 src/bun.js/bindings/spawn.cpp

cmake/sources/JavaScriptSources.txt

@@ -65,6 +65,12 @@ src/js/internal/linkedlist.ts
 src/js/internal/primordials.js
 src/js/internal/promisify.ts
 src/js/internal/shared.ts
+src/js/internal/sql/errors.ts
+src/js/internal/sql/mysql.ts
+src/js/internal/sql/postgres.ts
+src/js/internal/sql/query.ts
+src/js/internal/sql/shared.ts
+src/js/internal/sql/sqlite.ts
 src/js/internal/stream.promises.ts
 src/js/internal/stream.ts
 src/js/internal/streams/add-abort-signal.ts

cmake/sources/ZigGeneratedClassesSources.txt

@@ -6,7 +6,6 @@ src/bun.js/api/Glob.classes.ts
 src/bun.js/api/h2.classes.ts
 src/bun.js/api/html_rewriter.classes.ts
 src/bun.js/api/JSBundler.classes.ts
-src/bun.js/api/postgres.classes.ts
 src/bun.js/api/ResumableSink.classes.ts
 src/bun.js/api/S3Client.classes.ts
 src/bun.js/api/S3Stat.classes.ts
@@ -15,6 +14,7 @@ src/bun.js/api/Shell.classes.ts
 src/bun.js/api/ShellArgs.classes.ts
 src/bun.js/api/sockets.classes.ts
 src/bun.js/api/sourcemap.classes.ts
+src/bun.js/api/sql.classes.ts
 src/bun.js/api/streams.classes.ts
 src/bun.js/api/valkey.classes.ts
 src/bun.js/api/zlib.classes.ts

cmake/sources/ZigSources.txt

@@ -64,6 +64,7 @@ src/async/windows_event_loop.zig
 src/bake.zig
 src/bake/DevServer.zig
 src/bake/DevServer/Assets.zig
+src/bake/DevServer/DevAllocator.zig
 src/bake/DevServer/DirectoryWatchStore.zig
 src/bake/DevServer/ErrorReportRequest.zig
 src/bake/DevServer/HmrSocket.zig
@@ -143,6 +144,7 @@ src/bun.js/api/Timer/TimerObjectInternals.zig
 src/bun.js/api/Timer/WTFTimer.zig
 src/bun.js/api/TOMLObject.zig
 src/bun.js/api/UnsafeObject.zig
+src/bun.js/api/YAMLObject.zig
 src/bun.js/bindgen_test.zig
 src/bun.js/bindings/AbortSignal.zig
 src/bun.js/bindings/AnyPromise.zig
@@ -184,10 +186,12 @@ src/bun.js/bindings/JSPromiseRejectionOperation.zig
 src/bun.js/bindings/JSPropertyIterator.zig
 src/bun.js/bindings/JSRef.zig
 src/bun.js/bindings/JSRuntimeType.zig
+src/bun.js/bindings/JSSecrets.zig
 src/bun.js/bindings/JSString.zig
 src/bun.js/bindings/JSType.zig
 src/bun.js/bindings/JSUint8Array.zig
 src/bun.js/bindings/JSValue.zig
+src/bun.js/bindings/MarkedArgumentBuffer.zig
 src/bun.js/bindings/NodeModuleModule.zig
 src/bun.js/bindings/RegularExpression.zig
 src/bun.js/bindings/ResolvedSource.zig
@@ -412,6 +416,7 @@ src/bundler/DeferredBatchTask.zig
 src/bundler/entry_points.zig
 src/bundler/Graph.zig
 src/bundler/HTMLImportManifest.zig
+src/bundler/IndexStringMap.zig
 src/bundler/linker_context/computeChunks.zig
 src/bundler/linker_context/computeCrossChunkDependencies.zig
 src/bundler/linker_context/convertStmtsForChunk.zig
@@ -494,7 +499,6 @@ src/copy_file.zig
 src/crash_handler.zig
 src/create/SourceFileProjectGenerator.zig
 src/csrf.zig
-src/css_scanner.zig
 src/css/compat.zig
 src/css/context.zig
 src/css/css_internals.zig
@@ -646,6 +650,7 @@ src/glob.zig
 src/glob/GlobWalker.zig
 src/glob/match.zig
 src/Global.zig
+src/handle_oom.zig
 src/heap_breakdown.zig
 src/highway.zig
 src/hmac.zig
@@ -730,6 +735,7 @@ src/install/PackageManager/patchPackage.zig
 src/install/PackageManager/processDependencyList.zig
 src/install/PackageManager/ProgressStrings.zig
 src/install/PackageManager/runTasks.zig
+src/install/PackageManager/security_scanner.zig
 src/install/PackageManager/updatePackageJSONAndInstall.zig
 src/install/PackageManager/UpdateRequest.zig
 src/install/PackageManager/WorkspacePackageJSONCache.zig
@@ -748,6 +754,7 @@ src/interchange.zig
 src/interchange/json.zig
 src/interchange/toml.zig
 src/interchange/toml/lexer.zig
+src/interchange/yaml.zig
 src/io/heap.zig
 src/io/io.zig
 src/io/MaxBuf.zig
@@ -794,7 +801,9 @@ src/ptr/CowSlice.zig
 src/ptr/meta.zig
 src/ptr/owned.zig
 src/ptr/owned/maybe.zig
+src/ptr/owned/scoped.zig
 src/ptr/ref_count.zig
+src/ptr/shared.zig
 src/ptr/tagged_pointer.zig
 src/ptr/weak_ptr.zig
 src/renamer.zig
@@ -882,30 +891,63 @@ src/sourcemap/JSSourceMap.zig
 src/sourcemap/LineOffsetTable.zig
 src/sourcemap/sourcemap.zig
 src/sourcemap/VLQ.zig
+src/sql/mysql.zig
+src/sql/mysql/AuthMethod.zig
+src/sql/mysql/Capabilities.zig
+src/sql/mysql/ConnectionState.zig
+src/sql/mysql/MySQLConnection.zig
+src/sql/mysql/MySQLContext.zig
+src/sql/mysql/MySQLQuery.zig
+src/sql/mysql/MySQLRequest.zig
+src/sql/mysql/MySQLStatement.zig
+src/sql/mysql/MySQLTypes.zig
+src/sql/mysql/protocol/AnyMySQLError.zig
+src/sql/mysql/protocol/Auth.zig
+src/sql/mysql/protocol/AuthSwitchRequest.zig
+src/sql/mysql/protocol/AuthSwitchResponse.zig
+src/sql/mysql/protocol/CharacterSet.zig
+src/sql/mysql/protocol/ColumnDefinition41.zig
+src/sql/mysql/protocol/CommandType.zig
+src/sql/mysql/protocol/DecodeBinaryValue.zig
+src/sql/mysql/protocol/EncodeInt.zig
+src/sql/mysql/protocol/EOFPacket.zig
+src/sql/mysql/protocol/ErrorPacket.zig
+src/sql/mysql/protocol/HandshakeResponse41.zig
+src/sql/mysql/protocol/HandshakeV10.zig
+src/sql/mysql/protocol/LocalInfileRequest.zig
+src/sql/mysql/protocol/NewReader.zig
+src/sql/mysql/protocol/NewWriter.zig
+src/sql/mysql/protocol/OKPacket.zig
+src/sql/mysql/protocol/PacketHeader.zig
+src/sql/mysql/protocol/PacketType.zig
+src/sql/mysql/protocol/PreparedStatement.zig
+src/sql/mysql/protocol/Query.zig
+src/sql/mysql/protocol/ResultSet.zig
+src/sql/mysql/protocol/ResultSetHeader.zig
+src/sql/mysql/protocol/Signature.zig
+src/sql/mysql/protocol/StackReader.zig
+src/sql/mysql/protocol/StmtPrepareOKPacket.zig
+src/sql/mysql/SSLMode.zig
+src/sql/mysql/StatusFlags.zig
+src/sql/mysql/TLSStatus.zig
 src/sql/postgres.zig
 src/sql/postgres/AnyPostgresError.zig
 src/sql/postgres/AuthenticationState.zig
 src/sql/postgres/CommandTag.zig
-src/sql/postgres/ConnectionFlags.zig
-src/sql/postgres/Data.zig
 src/sql/postgres/DataCell.zig
 src/sql/postgres/DebugSocketMonitorReader.zig
 src/sql/postgres/DebugSocketMonitorWriter.zig
-src/sql/postgres/ObjectIterator.zig
-src/sql/postgres/PostgresCachedStructure.zig
 src/sql/postgres/PostgresProtocol.zig
 src/sql/postgres/PostgresRequest.zig
 src/sql/postgres/PostgresSQLConnection.zig
 src/sql/postgres/PostgresSQLContext.zig
 src/sql/postgres/PostgresSQLQuery.zig
-src/sql/postgres/PostgresSQLQueryResultMode.zig
 src/sql/postgres/PostgresSQLStatement.zig
 src/sql/postgres/PostgresTypes.zig
 src/sql/postgres/protocol/ArrayList.zig
 src/sql/postgres/protocol/Authentication.zig
 src/sql/postgres/protocol/BackendKeyData.zig
 src/sql/postgres/protocol/Close.zig
-src/sql/postgres/protocol/ColumnIdentifier.zig
 src/sql/postgres/protocol/CommandComplete.zig
 src/sql/postgres/protocol/CopyData.zig
 src/sql/postgres/protocol/CopyFail.zig
@@ -938,7 +980,6 @@ src/sql/postgres/protocol/StartupMessage.zig
 src/sql/postgres/protocol/TransactionStatusIndicator.zig
 src/sql/postgres/protocol/WriteWrap.zig
 src/sql/postgres/protocol/zHelpers.zig
-src/sql/postgres/QueryBindingIterator.zig
 src/sql/postgres/SASL.zig
 src/sql/postgres/Signature.zig
 src/sql/postgres/SocketMonitor.zig
@@ -953,6 +994,14 @@ src/sql/postgres/types/json.zig
 src/sql/postgres/types/numeric.zig
 src/sql/postgres/types/PostgresString.zig
 src/sql/postgres/types/Tag.zig
+src/sql/shared/CachedStructure.zig
+src/sql/shared/ColumnIdentifier.zig
+src/sql/shared/ConnectionFlags.zig
+src/sql/shared/Data.zig
+src/sql/shared/ObjectIterator.zig
+src/sql/shared/QueryBindingIterator.zig
+src/sql/shared/SQLDataCell.zig
+src/sql/shared/SQLQueryResultMode.zig
 src/StandaloneModuleGraph.zig
 src/StaticHashMap.zig
 src/string.zig

cmake/targets/BuildBun.cmake

@@ -1205,6 +1205,7 @@ if(NOT BUN_CPP_ONLY)
   endif()
 
   if(bunStrip)
+    # First, strip bun-profile.exe to create bun.exe
     register_command(
       TARGET
         ${bun}
@@ -1225,6 +1226,48 @@ if(NOT BUN_CPP_ONLY)
       OUTPUTS
         ${BUILD_PATH}/${bunStripExe}
     )
+    
+    # Then sign both executables on Windows
+    if(WIN32 AND ENABLE_WINDOWS_CODESIGNING)
+      set(SIGN_SCRIPT "${CMAKE_SOURCE_DIR}/.buildkite/scripts/sign-windows.ps1")
+      
+      # Verify signing script exists
+      if(NOT EXISTS "${SIGN_SCRIPT}")
+        message(FATAL_ERROR "Windows signing script not found: ${SIGN_SCRIPT}")
+      endif()
+      
+      # Use PowerShell for Windows code signing (native Windows, no path issues)
+      find_program(POWERSHELL_EXECUTABLE 
+        NAMES pwsh.exe powershell.exe
+        PATHS 
+          "C:/Program Files/PowerShell/7"
+          "C:/Program Files (x86)/PowerShell/7"
+          "C:/Windows/System32/WindowsPowerShell/v1.0"
+        DOC "Path to PowerShell executable"
+      )
+      
+      if(NOT POWERSHELL_EXECUTABLE)
+        set(POWERSHELL_EXECUTABLE "powershell.exe")
+      endif()
+      
+      message(STATUS "Using PowerShell executable: ${POWERSHELL_EXECUTABLE}")
+      
+      # Sign both bun-profile.exe and bun.exe after stripping
+      register_command(
+        TARGET
+          ${bun}
+        TARGET_PHASE
+          POST_BUILD
+        COMMENT
+          "Code signing bun-profile.exe and bun.exe with DigiCert KeyLocker"
+        COMMAND
+          "${POWERSHELL_EXECUTABLE}" "-NoProfile" "-ExecutionPolicy" "Bypass" "-File" "${SIGN_SCRIPT}" "-BunProfileExe" "${BUILD_PATH}/${bunExe}" "-BunExe" "${BUILD_PATH}/${bunStripExe}"
+        CWD
+          ${CMAKE_SOURCE_DIR}
+        SOURCES
+          ${BUILD_PATH}/${bunStripExe}
+      )
+    endif()
   endif()
 
   # somehow on some Linux systems we need to disable ASLR for ASAN-instrumented binaries to run

cmake/tools/SetupWebKit.cmake

@@ -2,7 +2,7 @@ option(WEBKIT_VERSION "The version of WebKit to use")
 option(WEBKIT_LOCAL "If a local version of WebKit should be used instead of downloading")
 
 if(NOT WEBKIT_VERSION)
-  set(WEBKIT_VERSION aa4997abc9126f5a7557c9ecb7e8104779d87ec4)
+  set(WEBKIT_VERSION f9e86fe8dc0aa2fc1f137cc94777cb10637c23a4)
 endif()
 
 string(SUBSTRING ${WEBKIT_VERSION} 0 16 WEBKIT_VERSION_PREFIX)

docs/api/secrets.md

@@ -0,0 +1,319 @@
+Store and retrieve sensitive credentials securely using the operating system's native credential storage APIs.
+
+**Experimental:** This API is new and experimental. It may change in the future.
+
+```typescript
+import { secrets } from "bun";
+
+const githubToken = await secrets.get({
+  service: "my-cli-tool",
+  name: "github-token",
+});
+
+if (!githubToken) {
+  const response = await fetch("https://api.github.com/name", {
+    headers: { "Authorization": `token ${githubToken}` },
+  });
+  console.log("Please enter your GitHub token");
+} else {
+  await secrets.set({
+    service: "my-cli-tool",
+    name: "github-token",
+    value: prompt("Please enter your GitHub token"),
+  });
+  console.log("GitHub token stored");
+}
+```
+
+## Overview
+
+`Bun.secrets` provides a cross-platform API for managing sensitive credentials that CLI tools and development applications typically store in plaintext files like `~/.npmrc`, `~/.aws/credentials`, or `.env` files. It uses:
+
+- **macOS**: Keychain Services
+- **Linux**: libsecret (GNOME Keyring, KWallet, etc.)
+- **Windows**: Windows Credential Manager
+
+All operations are asynchronous and non-blocking, running on Bun's threadpool.
+
+Note: in the future, we may add an additional `provider` option to make this better for production deployment secrets, but today this API is mostly useful for local development tools.
+
+## API
+
+### `Bun.secrets.get(options)`
+
+Retrieve a stored credential.
+
+```typescript
+import { secrets } from "bun";
+
+const password = await Bun.secrets.get({
+  service: "my-app",
+  name: "alice@example.com",
+});
+// Returns: string | null
+
+// Or if you prefer without an object
+const password = await Bun.secrets.get("my-app", "alice@example.com");
+```
+
+**Parameters:**
+
+- `options.service` (string, required) - The service or application name
+- `options.name` (string, required) - The username or account identifier
+
+**Returns:**
+
+- `Promise<string | null>` - The stored password, or `null` if not found
+
+### `Bun.secrets.set(options, value)`
+
+Store or update a credential.
+
+```typescript
+import { secrets } from "bun";
+
+await secrets.set({
+  service: "my-app",
+  name: "alice@example.com",
+  value: "super-secret-password",
+});
+```
+
+**Parameters:**
+
+- `options.service` (string, required) - The service or application name
+- `options.name` (string, required) - The username or account identifier
+- `value` (string, required) - The password or secret to store
+
+**Notes:**
+
+- If a credential already exists for the given service/name combination, it will be replaced
+- The stored value is encrypted by the operating system
+
+### `Bun.secrets.delete(options)`
+
+Delete a stored credential.
+
+```typescript
+const deleted = await Bun.secrets.delete({
+  service: "my-app",
+  name: "alice@example.com",
+  value: "super-secret-password",
+});
+// Returns: boolean
+```
+
+**Parameters:**
+
+- `options.service` (string, required) - The service or application name
+- `options.name` (string, required) - The username or account identifier
+
+**Returns:**
+
+- `Promise<boolean>` - `true` if a credential was deleted, `false` if not found
+
+## Examples
+
+### Storing CLI Tool Credentials
+
+```javascript
+// Store GitHub CLI token (instead of ~/.config/gh/hosts.yml)
+await Bun.secrets.set({
+  service: "my-app.com",
+  name: "github-token",
+  value: "ghp_xxxxxxxxxxxxxxxxxxxx",
+});
+
+// Or if you prefer without an object
+await Bun.secrets.set("my-app.com", "github-token", "ghp_xxxxxxxxxxxxxxxxxxxx");
+
+// Store npm registry token (instead of ~/.npmrc)
+await Bun.secrets.set({
+  service: "npm-registry",
+  name: "https://registry.npmjs.org",
+  value: "npm_xxxxxxxxxxxxxxxxxxxx",
+});
+
+// Retrieve for API calls
+const token = await Bun.secrets.get({
+  service: "gh-cli",
+  name: "github.com",
+});
+
+if (token) {
+  const response = await fetch("https://api.github.com/name", {
+    headers: {
+      "Authorization": `token ${token}`,
+    },
+  });
+}
+```
+
+### Migrating from Plaintext Config Files
+
+```javascript
+// Instead of storing in ~/.aws/credentials
+await Bun.secrets.set({
+  service: "aws-cli",
+  name: "AWS_SECRET_ACCESS_KEY",
+  value: process.env.AWS_SECRET_ACCESS_KEY,
+});
+
+// Instead of .env files with sensitive data
+await Bun.secrets.set({
+  service: "my-app",
+  name: "api-key",
+  value: "sk_live_xxxxxxxxxxxxxxxxxxxx",
+});
+
+// Load at runtime
+const apiKey =
+  (await Bun.secrets.get({
+    service: "my-app",
+    name: "api-key",
+  })) || process.env.API_KEY; // Fallback for CI/production
+```
+
+### Error Handling
+
+```javascript
+try {
+  await Bun.secrets.set({
+    service: "my-app",
+    name: "alice",
+    value: "password123",
+  });
+} catch (error) {
+  console.error("Failed to store credential:", error.message);
+}
+
+// Check if a credential exists
+const password = await Bun.secrets.get({
+  service: "my-app",
+  name: "alice",
+});
+
+if (password === null) {
+  console.log("No credential found");
+}
+```
+
+### Updating Credentials
+
+```javascript
+// Initial password
+await Bun.secrets.set({
+  service: "email-server",
+  name: "admin@example.com",
+  value: "old-password",
+});
+
+// Update to new password
+await Bun.secrets.set({
+  service: "email-server",
+  name: "admin@example.com",
+  value: "new-password",
+});
+
+// The old password is replaced
+```
+
+## Platform Behavior
+
+### macOS (Keychain)
+
+- Credentials are stored in the name's login keychain
+- The keychain may prompt for access permission on first use
+- Credentials persist across system restarts
+- Accessible by the name who stored them
+
+### Linux (libsecret)
+
+- Requires a secret service daemon (GNOME Keyring, KWallet, etc.)
+- Credentials are stored in the default collection
+- May prompt for unlock if the keyring is locked
+- The secret service must be running
+
+### Windows (Credential Manager)
+
+- Credentials are stored in Windows Credential Manager
+- Visible in Control Panel → Credential Manager → Windows Credentials
+- Persist with `CRED_PERSIST_ENTERPRISE` flag so it's scoped per user
+- Encrypted using Windows Data Protection API
+
+## Security Considerations
+
+1. **Encryption**: Credentials are encrypted by the operating system's credential manager
+2. **Access Control**: Only the name who stored the credential can retrieve it
+3. **No Plain Text**: Passwords are never stored in plain text
+4. **Memory Safety**: Bun zeros out password memory after use
+5. **Process Isolation**: Credentials are isolated per name account
+
+## Limitations
+
+- Maximum password length varies by platform (typically 2048-4096 bytes)
+- Service and name names should be reasonable lengths (< 256 characters)
+- Some special characters may need escaping depending on the platform
+- Requires appropriate system services:
+  - Linux: Secret service daemon must be running
+  - macOS: Keychain Access must be available
+  - Windows: Credential Manager service must be enabled
+
+## Comparison with Environment Variables
+
+Unlike environment variables, `Bun.secrets`:
+
+- ✅ Encrypts credentials at rest (thanks to the operating system)
+- ✅ Avoids exposing secrets in process memory dumps (memory is zeroed after its no longer needed)
+- ✅ Survives application restarts
+- ✅ Can be updated without restarting the application
+- ✅ Provides name-level access control
+- ❌ Requires OS credential service
+- ❌ Not very useful for deployment secrets (use environment variables in production)
+
+## Best Practices
+
+1. **Use descriptive service names**: Match the tool or application name
+   If you're building a CLI for external use, you probably should use a UTI (Uniform Type Identifier) for the service name.
+
+   ```javascript
+   // Good - matches the actual tool
+   { service: "com.docker.hub", name: "username" }
+   { service: "com.vercel.cli", name: "team-name" }
+
+   // Avoid - too generic
+   { service: "api", name: "key" }
+   ```
+
+2. **Credentials-only**: Don't store application configuration in this API
+   This API is slow, you probably still need to use a config file for some things.
+
+3. **Use for local development tools**:
+   - ✅ CLI tools (gh, npm, docker, kubectl)
+   - ✅ Local development servers
+   - ✅ Personal API keys for testing
+   - ❌ Production servers (use proper secret management)
+
+## TypeScript
+
+```typescript
+namespace Bun {
+  interface SecretsOptions {
+    service: string;
+    name: string;
+  }
+
+  interface Secrets {
+    get(options: SecretsOptions): Promise<string | null>;
+    set(options: SecretsOptions, value: string): Promise<void>;
+    delete(options: SecretsOptions): Promise<boolean>;
+  }
+
+  const secrets: Secrets;
+}
+```
+
+## See Also
+
+- [Environment Variables](./env.md) - For deployment configuration
+- [Bun.password](./password.md) - For password hashing and verification

docs/api/sql.md

@@ -1,20 +1,20 @@
-Bun provides native bindings for working with PostgreSQL databases with a modern, Promise-based API. The interface is designed to be simple and performant, using tagged template literals for queries and offering features like connection pooling, transactions, and prepared statements.
+Bun provides native bindings for working with SQL databases through a unified Promise-based API that supports both PostgreSQL and SQLite. The interface is designed to be simple and performant, using tagged template literals for queries and offering features like connection pooling, transactions, and prepared statements.
 
 ```ts
-import { sql } from "bun";
+import { sql, SQL } from "bun";
 
+// PostgreSQL (default)
 const users = await sql`
   SELECT * FROM users
   WHERE active = ${true}
   LIMIT ${10}
 `;
 
-// Select with multiple conditions
-const activeUsers = await sql`
-  SELECT * 
-  FROM users 
-  WHERE active = ${true} 
-  AND age >= ${18}
+// With a a SQLite db
+const sqlite = new SQL("sqlite://myapp.db");
+const results = await sqlite`
+  SELECT * FROM users 
+  WHERE active = ${1}
 `;
 ```
 
@@ -44,6 +44,113 @@ const activeUsers = await sql`
 
 {% /features %}
 
+## Database Support
+
+Bun.SQL provides a unified API for multiple database systems:
+
+### PostgreSQL
+
+PostgreSQL is used when:
+
+- The connection string doesn't match SQLite patterns (it's the fallback adapter)
+- The connection string explicitly uses `postgres://` or `postgresql://` protocols
+- No connection string is provided and environment variables point to PostgreSQL
+
+```ts
+import { sql } from "bun";
+// Uses PostgreSQL if DATABASE_URL is not set or is a PostgreSQL URL
+await sql`SELECT ...`;
+
+import { SQL } from "bun";
+const pg = new SQL("postgres://user:pass@localhost:5432/mydb");
+await pg`SELECT ...`;
+```
+
+### SQLite
+
+SQLite support is now built into Bun.SQL, providing the same tagged template literal interface as PostgreSQL:
+
+```ts
+import { SQL } from "bun";
+
+// In-memory database
+const memory = new SQL(":memory:");
+const memory2 = new SQL("sqlite://:memory:");
+
+// File-based database
+const db = new SQL("sqlite://myapp.db");
+
+// Using options object
+const db2 = new SQL({
+  adapter: "sqlite",
+  filename: "./data/app.db",
+});
+
+// For simple filenames, specify adapter explicitly
+const db3 = new SQL("myapp.db", { adapter: "sqlite" });
+```
+
+{% details summary="SQLite Connection String Formats" %}
+
+SQLite accepts various URL formats for connection strings:
+
+```ts
+// Standard sqlite:// protocol
+new SQL("sqlite://path/to/database.db");
+new SQL("sqlite:path/to/database.db"); // Without slashes
+
+// file:// protocol (also recognized as SQLite)
+new SQL("file://path/to/database.db");
+new SQL("file:path/to/database.db");
+
+// Special :memory: database
+new SQL(":memory:");
+new SQL("sqlite://:memory:");
+new SQL("file://:memory:");
+
+// Relative and absolute paths
+new SQL("sqlite://./local.db"); // Relative to current directory
+new SQL("sqlite://../parent/db.db"); // Parent directory
+new SQL("sqlite:///absolute/path.db"); // Absolute path
+
+// With query parameters
+new SQL("sqlite://data.db?mode=ro"); // Read-only mode
+new SQL("sqlite://data.db?mode=rw"); // Read-write mode (no create)
+new SQL("sqlite://data.db?mode=rwc"); // Read-write-create mode (default)
+```
+
+**Note:** Simple filenames without a protocol (like `"myapp.db"`) require explicitly specifying `{ adapter: "sqlite" }` to avoid ambiguity with PostgreSQL.
+
+{% /details %}
+
+{% details summary="SQLite-Specific Options" %}
+
+SQLite databases support additional configuration options:
+
+```ts
+const db = new SQL({
+  adapter: "sqlite",
+  filename: "app.db",
+
+  // SQLite-specific options
+  readonly: false, // Open in read-only mode
+  create: true, // Create database if it doesn't exist
+  readwrite: true, // Open for reading and writing
+
+  // Additional Bun:sqlite options
+  strict: true, // Enable strict mode
+  safeIntegers: false, // Use JavaScript numbers for integers
+});
+```
+
+Query parameters in the URL are parsed to set these options:
+
+- `?mode=ro` → `readonly: true`
+- `?mode=rw` → `readonly: false, create: false`
+- `?mode=rwc` → `readonly: false, create: true` (default)
+
+{% /details %}
+
 ### Inserting data
 
 You can pass JavaScript values directly to the SQL template literal and escaping will be handled for you.
@@ -251,14 +358,55 @@ await query;
 
 ## Database Environment Variables
 
-`sql` connection parameters can be configured using environment variables. The client checks these variables in a specific order of precedence.
+`sql` connection parameters can be configured using environment variables. The client checks these variables in a specific order of precedence and automatically detects the database type based on the connection string format.
 
-The following environment variables can be used to define the connection URL:
+### Automatic Database Detection
+
+When using `Bun.sql()` without arguments or `new SQL()` with a connection string, the adapter is automatically detected based on the URL format. SQLite becomes the default adapter in these cases:
+
+#### SQLite Auto-Detection
+
+SQLite is automatically selected when the connection string matches these patterns:
+
+- `:memory:` - In-memory database
+- `sqlite://...` - SQLite protocol URLs
+- `sqlite:...` - SQLite protocol without slashes
+- `file://...` - File protocol URLs
+- `file:...` - File protocol without slashes
+
+```ts
+// These all use SQLite automatically (no adapter needed)
+const sql1 = new SQL(":memory:");
+const sql2 = new SQL("sqlite://app.db");
+const sql3 = new SQL("file://./database.db");
+
+// Works with DATABASE_URL environment variable
+DATABASE_URL=":memory:" bun run app.js
+DATABASE_URL="sqlite://myapp.db" bun run app.js
+DATABASE_URL="file://./data/app.db" bun run app.js
+```
+
+#### PostgreSQL Auto-Detection
+
+PostgreSQL is the default for all other connection strings:
+
+```bash
+# PostgreSQL is detected for these patterns
+DATABASE_URL="postgres://user:pass@localhost:5432/mydb" bun run app.js
+DATABASE_URL="postgresql://user:pass@localhost:5432/mydb" bun run app.js
+
+# Or any URL that doesn't match SQLite patterns
+DATABASE_URL="localhost:5432/mydb" bun run app.js
+```
+
+### PostgreSQL Environment Variables
+
+The following environment variables can be used to define the PostgreSQL connection:
 
 | Environment Variable        | Description                                |
 | --------------------------- | ------------------------------------------ |
 | `POSTGRES_URL`              | Primary connection URL for PostgreSQL      |
-| `DATABASE_URL`              | Alternative connection URL                 |
+| `DATABASE_URL`              | Alternative connection URL (auto-detected) |
 | `PGURL`                     | Alternative connection URL                 |
 | `PG_URL`                    | Alternative connection URL                 |
 | `TLS_POSTGRES_DATABASE_URL` | SSL/TLS-enabled connection URL             |
@@ -274,6 +422,19 @@ If no connection URL is provided, the system checks for the following individual
 | `PGPASSWORD`         | -                            | (empty)       | Database password |
 | `PGDATABASE`         | -                            | username      | Database name     |
 
+### SQLite Environment Variables
+
+SQLite connections can be configured via `DATABASE_URL` when it contains a SQLite-compatible URL:
+
+```bash
+# These are all recognized as SQLite
+DATABASE_URL=":memory:"
+DATABASE_URL="sqlite://./app.db"
+DATABASE_URL="file:///absolute/path/to/db.sqlite"
+```
+
+**Note:** PostgreSQL-specific environment variables (`POSTGRES_URL`, `PGHOST`, etc.) are ignored when using SQLite.
+
 ## Runtime Preconnection
 
 Bun can preconnect to PostgreSQL at startup to improve performance by establishing database connections before your application code runs. This is useful for reducing connection latency on the first database query.
@@ -293,16 +454,18 @@ The `--sql-preconnect` flag will automatically establish a PostgreSQL connection
 
 ## Connection Options
 
-You can configure your database connection manually by passing options to the SQL constructor:
+You can configure your database connection manually by passing options to the SQL constructor. Options vary depending on the database adapter:
+
+### PostgreSQL Options
 
 ```ts
 import { SQL } from "bun";
 
 const db = new SQL({
-  // Required
+  // Connection details (adapter is auto-detected as PostgreSQL)
   url: "postgres://user:pass@localhost:5432/dbname",
 
-  // Optional configuration
+  // Alternative connection parameters
   hostname: "localhost",
   port: 5432,
   database: "myapp",
@@ -330,14 +493,52 @@ const db = new SQL({
 
   // Callbacks
   onconnect: client => {
-    console.log("Connected to database");
+    console.log("Connected to PostgreSQL");
   },
   onclose: client => {
-    console.log("Connection closed");
+    console.log("PostgreSQL connection closed");
   },
 });
 ```
 
+### SQLite Options
+
+```ts
+import { SQL } from "bun";
+
+const db = new SQL({
+  // Required for SQLite
+  adapter: "sqlite",
+  filename: "./data/app.db", // or ":memory:" for in-memory database
+
+  // SQLite-specific access modes
+  readonly: false, // Open in read-only mode
+  create: true, // Create database if it doesn't exist
+  readwrite: true, // Allow read and write operations
+
+  // SQLite data handling
+  strict: true, // Enable strict mode for better type safety
+  safeIntegers: false, // Use BigInt for integers exceeding JS number range
+
+  // Callbacks
+  onconnect: client => {
+    console.log("SQLite database opened");
+  },
+  onclose: client => {
+    console.log("SQLite database closed");
+  },
+});
+```
+
+{% details summary="SQLite Connection Notes" %}
+
+- **Connection Pooling**: SQLite doesn't use connection pooling as it's a file-based database. Each `SQL` instance represents a single connection.
+- **Transactions**: SQLite supports nested transactions through savepoints, similar to PostgreSQL.
+- **Concurrent Access**: SQLite handles concurrent access through file locking. Use WAL mode for better concurrency.
+- **Memory Databases**: Using `:memory:` creates a temporary database that exists only for the connection lifetime.
+
+{% /details %}
+
 ## Dynamic passwords
 
 When clients need to use alternative authentication schemes such as access tokens or connections to databases with rotating passwords, provide either a synchronous or asynchronous function that will resolve the dynamic password value at connection time.
@@ -353,11 +554,66 @@ const sql = new SQL(url, {
 });
 ```
 
+## SQLite-Specific Features
+
+### Query Execution
+
+SQLite executes queries synchronously, unlike PostgreSQL which uses asynchronous I/O. However, the API remains consistent using Promises:
+
+```ts
+const sqlite = new SQL("sqlite://app.db");
+
+// Works the same as PostgreSQL, but executes synchronously under the hood
+const users = await sqlite`SELECT * FROM users`;
+
+// Parameters work identically
+const user = await sqlite`SELECT * FROM users WHERE id = ${userId}`;
+```
+
+### SQLite Pragmas
+
+You can use PRAGMA statements to configure SQLite behavior:
+
+```ts
+const sqlite = new SQL("sqlite://app.db");
+
+// Enable foreign keys
+await sqlite`PRAGMA foreign_keys = ON`;
+
+// Set journal mode to WAL for better concurrency
+await sqlite`PRAGMA journal_mode = WAL`;
+
+// Check integrity
+const integrity = await sqlite`PRAGMA integrity_check`;
+```
+
+### Data Type Differences
+
+SQLite has a more flexible type system than PostgreSQL:
+
+```ts
+// SQLite stores data in 5 storage classes: NULL, INTEGER, REAL, TEXT, BLOB
+const sqlite = new SQL("sqlite://app.db");
+
+// SQLite is more lenient with types
+await sqlite`
+  CREATE TABLE flexible (
+    id INTEGER PRIMARY KEY,
+    data TEXT,        -- Can store numbers as strings
+    value NUMERIC,    -- Can store integers, reals, or text
+    blob BLOB         -- Binary data
+  )
+`;
+
+// JavaScript values are automatically converted
+await sqlite`INSERT INTO flexible VALUES (${1}, ${"text"}, ${123.45}, ${Buffer.from("binary")})`;
+```
+
 ## Transactions
 
-To start a new transaction, use `sql.begin`. This method reserves a dedicated connection for the duration of the transaction and provides a scoped `sql` instance to use within the callback function. Once the callback completes, `sql.begin` resolves with the return value of the callback.
+To start a new transaction, use `sql.begin`. This method works for both PostgreSQL and SQLite. For PostgreSQL, it reserves a dedicated connection from the pool. For SQLite, it begins a transaction on the single connection.
 
-The `BEGIN` command is sent automatically, including any optional configurations you specify. If an error occurs during the transaction, a `ROLLBACK` is triggered to release the reserved connection and ensure the process continues smoothly.
+The `BEGIN` command is sent automatically, including any optional configurations you specify. If an error occurs during the transaction, a `ROLLBACK` is triggered to ensure the process continues smoothly.
 
 ### Basic Transactions
 
@@ -552,9 +808,36 @@ Note that disabling prepared statements may impact performance for queries that
 
 ## Error Handling
 
-The client provides typed errors for different failure scenarios:
+The client provides typed errors for different failure scenarios. Errors are database-specific and extend from base error classes:
 
-### Connection Errors
+### Error Classes
+
+```ts
+import { SQL } from "bun";
+
+try {
+  await sql`SELECT * FROM users`;
+} catch (error) {
+  if (error instanceof SQL.PostgresError) {
+    // PostgreSQL-specific error
+    console.log(error.code); // PostgreSQL error code
+    console.log(error.detail); // Detailed error message
+    console.log(error.hint); // Helpful hint from PostgreSQL
+  } else if (error instanceof SQL.SQLiteError) {
+    // SQLite-specific error
+    console.log(error.code); // SQLite error code (e.g., "SQLITE_CONSTRAINT")
+    console.log(error.errno); // SQLite error number
+    console.log(error.byteOffset); // Byte offset in SQL statement (if available)
+  } else if (error instanceof SQL.SQLError) {
+    // Generic SQL error (base class)
+    console.log(error.message);
+  }
+}
+```
+
+{% details summary="PostgreSQL-Specific Error Codes" %}
+
+### PostgreSQL Connection Errors
 
 | Connection Errors                 | Description                                          |
 | --------------------------------- | ---------------------------------------------------- |
@@ -619,6 +902,51 @@ The client provides typed errors for different failure scenarios:
 | `ERR_POSTGRES_UNSAFE_TRANSACTION`        | Unsafe transaction operation detected |
 | `ERR_POSTGRES_INVALID_TRANSACTION_STATE` | Invalid transaction state             |
 
+{% /details %}
+
+### SQLite-Specific Errors
+
+SQLite errors provide error codes and numbers that correspond to SQLite's standard error codes:
+
+{% details summary="Common SQLite Error Codes" %}
+
+| Error Code          | errno | Description                                          |
+| ------------------- | ----- | ---------------------------------------------------- |
+| `SQLITE_CONSTRAINT` | 19    | Constraint violation (UNIQUE, CHECK, NOT NULL, etc.) |
+| `SQLITE_BUSY`       | 5     | Database is locked                                   |
+| `SQLITE_LOCKED`     | 6     | Table in the database is locked                      |
+| `SQLITE_READONLY`   | 8     | Attempt to write to a readonly database              |
+| `SQLITE_IOERR`      | 10    | Disk I/O error                                       |
+| `SQLITE_CORRUPT`    | 11    | Database disk image is malformed                     |
+| `SQLITE_FULL`       | 13    | Database or disk is full                             |
+| `SQLITE_CANTOPEN`   | 14    | Unable to open database file                         |
+| `SQLITE_PROTOCOL`   | 15    | Database lock protocol error                         |
+| `SQLITE_SCHEMA`     | 17    | Database schema has changed                          |
+| `SQLITE_TOOBIG`     | 18    | String or BLOB exceeds size limit                    |
+| `SQLITE_MISMATCH`   | 20    | Data type mismatch                                   |
+| `SQLITE_MISUSE`     | 21    | Library used incorrectly                             |
+| `SQLITE_AUTH`       | 23    | Authorization denied                                 |
+
+Example error handling:
+
+```ts
+const sqlite = new SQL("sqlite://app.db");
+
+try {
+  await sqlite`INSERT INTO users (id, name) VALUES (1, 'Alice')`;
+  await sqlite`INSERT INTO users (id, name) VALUES (1, 'Bob')`; // Duplicate ID
+} catch (error) {
+  if (error instanceof SQL.SQLiteError) {
+    if (error.code === "SQLITE_CONSTRAINT") {
+      console.log("Constraint violation:", error.message);
+      // Handle unique constraint violation
+    }
+  }
+}
+```
+
+{% /details %}
+
 ## Numbers and BigInt
 
 Bun's SQL client includes special handling for large numbers that exceed the range of a 53-bit integer. Here's how it works:
@@ -652,7 +980,6 @@ There's still some things we haven't finished yet.
 
 - Connection preloading via `--db-preconnect` Bun CLI flag
 - MySQL support: [we're working on it](https://github.com/oven-sh/bun/pull/15274)
-- SQLite support: planned, but not started. Ideally, we implement it natively instead of wrapping `bun:sqlite`.
 - Column name transforms (e.g. `snake_case` to `camelCase`). This is mostly blocked on a unicode-aware implementation of changing the case in C++ using WebKit's `WTF::String`.
 - Column type transforms
 
@@ -671,13 +998,7 @@ We also haven't implemented some of the more uncommon features like:
 - Point & PostGIS types
 - All the multi-dimensional integer array types (only a couple of the types are supported)
 
-## Frequently Asked Questions
-
-> Why is this `Bun.sql` and not `Bun.postgres`?
-
-The plan is to add more database drivers in the future.
-
-> Why not just use an existing library?
+## Why not just use an existing library?
 
 npm packages like postgres.js, pg, and node-postgres can be used in Bun too. They're great options.
 

docs/api/yaml.md

@@ -0,0 +1,459 @@
+In Bun, YAML is a first-class citizen alongside JSON and TOML.
+
+Bun provides built-in support for YAML files through both runtime APIs and bundler integration. You can
+
+- Parse YAML strings with `Bun.YAML.parse`
+- import & require YAML files as modules at runtime (including hot reloading & watch mode support)
+- import & require YAML files in frontend apps via bun's bundler
+
+## Conformance
+
+Bun's YAML parser currently passes over 90% of the official YAML test suite. While we're actively working on reaching 100% conformance, the current implementation covers the vast majority of real-world use cases. The parser is written in Zig for optimal performance and is continuously being improved.
+
+## Runtime API
+
+### `Bun.YAML.parse()`
+
+Parse a YAML string into a JavaScript object.
+
+```ts
+import { YAML } from "bun";
+const text = `
+name: John Doe
+age: 30
+email: john@example.com
+hobbies:
+  - reading
+  - coding
+  - hiking
+`;
+
+const data = YAML.parse(text);
+console.log(data);
+// {
+//   name: "John Doe",
+//   age: 30,
+//   email: "john@example.com",
+//   hobbies: ["reading", "coding", "hiking"]
+// }
+```
+
+#### Multi-document YAML
+
+When parsing YAML with multiple documents (separated by `---`), `Bun.YAML.parse()` returns an array:
+
+```ts
+const multiDoc = `
+---
+name: Document 1
+---
+name: Document 2
+---
+name: Document 3
+`;
+
+const docs = Bun.YAML.parse(multiDoc);
+console.log(docs);
+// [
+//   { name: "Document 1" },
+//   { name: "Document 2" },
+//   { name: "Document 3" }
+// ]
+```
+
+#### Supported YAML Features
+
+Bun's YAML parser supports the full YAML 1.2 specification, including:
+
+- **Scalars**: strings, numbers, booleans, null values
+- **Collections**: sequences (arrays) and mappings (objects)
+- **Anchors and Aliases**: reusable nodes with `&` and `*`
+- **Tags**: type hints like `!!str`, `!!int`, `!!float`, `!!bool`, `!!null`
+- **Multi-line strings**: literal (`|`) and folded (`>`) scalars
+- **Comments**: using `#`
+- **Directives**: `%YAML` and `%TAG`
+
+```ts
+const yaml = `
+# Employee record
+employee: &emp
+  name: Jane Smith
+  department: Engineering
+  skills:
+    - JavaScript
+    - TypeScript
+    - React
+
+manager: *emp  # Reference to employee
+
+config: !!str 123  # Explicit string type
+
+description: |
+  This is a multi-line
+  literal string that preserves
+  line breaks and spacing.
+
+summary: >
+  This is a folded string
+  that joins lines with spaces
+  unless there are blank lines.
+`;
+
+const data = Bun.YAML.parse(yaml);
+```
+
+#### Error Handling
+
+`Bun.YAML.parse()` throws a `SyntaxError` if the YAML is invalid:
+
+```ts
+try {
+  Bun.YAML.parse("invalid: yaml: content:");
+} catch (error) {
+  console.error("Failed to parse YAML:", error.message);
+}
+```
+
+## Module Import
+
+### ES Modules
+
+You can import YAML files directly as ES modules. The YAML content is parsed and made available as both default and named exports:
+
+```yaml#config.yaml
+database:
+  host: localhost
+  port: 5432
+  name: myapp
+
+redis:
+  host: localhost
+  port: 6379
+
+features:
+  auth: true
+  rateLimit: true
+  analytics: false
+```
+
+#### Default Import
+
+```ts#app.ts
+import config from "./config.yaml";
+
+console.log(config.database.host); // "localhost"
+console.log(config.redis.port); // 6379
+```
+
+#### Named Imports
+
+You can destructure top-level YAML properties as named imports:
+
+```ts
+import { database, redis, features } from "./config.yaml";
+
+console.log(database.host); // "localhost"
+console.log(redis.port); // 6379
+console.log(features.auth); // true
+```
+
+Or combine both:
+
+```ts
+import config, { database, features } from "./config.yaml";
+
+// Use the full config object
+console.log(config);
+
+// Or use specific parts
+if (features.rateLimit) {
+  setupRateLimiting(database);
+}
+```
+
+### CommonJS
+
+YAML files can also be required in CommonJS:
+
+```js
+const config = require("./config.yaml");
+console.log(config.database.name); // "myapp"
+
+// Destructuring also works
+const { database, redis } = require("./config.yaml");
+console.log(database.port); // 5432
+```
+
+## Hot Reloading with YAML
+
+One of the most powerful features of Bun's YAML support is hot reloading. When you run your application with `bun --hot`, changes to YAML files are automatically detected and reloaded without closing connections
+
+### Configuration Hot Reloading
+
+```yaml#config.yaml
+server:
+  port: 3000
+  host: localhost
+
+features:
+  debug: true
+  verbose: false
+```
+
+```ts#server.ts
+import { server, features } from "./config.yaml";
+
+console.log(`Starting server on ${server.host}:${server.port}`);
+
+if (features.debug) {
+  console.log("Debug mode enabled");
+}
+
+// Your server code here
+Bun.serve({
+  port: server.port,
+  hostname: server.host,
+  fetch(req) {
+    if (features.verbose) {
+      console.log(`${req.method} ${req.url}`);
+    }
+    return new Response("Hello World");
+  },
+});
+```
+
+Run with hot reloading:
+
+```bash
+bun --hot server.ts
+```
+
+Now when you modify `config.yaml`, the changes are immediately reflected in your running application. This is perfect for:
+
+- Adjusting configuration during development
+- Testing different settings without restarts
+- Live debugging with configuration changes
+- Feature flag toggling
+
+## Configuration Management
+
+### Environment-Based Configuration
+
+YAML excels at managing configuration across different environments:
+
+```yaml#config.yaml
+defaults: &defaults
+  timeout: 5000
+  retries: 3
+  cache:
+    enabled: true
+    ttl: 3600
+
+development:
+  <<: *defaults
+  api:
+    url: http://localhost:4000
+    key: dev_key_12345
+  logging:
+    level: debug
+    pretty: true
+
+staging:
+  <<: *defaults
+  api:
+    url: https://staging-api.example.com
+    key: ${STAGING_API_KEY}
+  logging:
+    level: info
+    pretty: false
+
+production:
+  <<: *defaults
+  api:
+    url: https://api.example.com
+    key: ${PROD_API_KEY}
+  cache:
+    enabled: true
+    ttl: 86400
+  logging:
+    level: error
+    pretty: false
+```
+
+```ts#app.ts
+import configs from "./config.yaml";
+
+const env = process.env.NODE_ENV || "development";
+const config = configs[env];
+
+// Environment variables in YAML values can be interpolated
+function interpolateEnvVars(obj: any): any {
+  if (typeof obj === "string") {
+    return obj.replace(/\${(\w+)}/g, (_, key) => process.env[key] || "");
+  }
+  if (typeof obj === "object") {
+    for (const key in obj) {
+      obj[key] = interpolateEnvVars(obj[key]);
+    }
+  }
+  return obj;
+}
+
+export default interpolateEnvVars(config);
+```
+
+### Feature Flags Configuration
+
+```yaml#features.yaml
+features:
+  newDashboard:
+    enabled: true
+    rolloutPercentage: 50
+    allowedUsers:
+      - admin@example.com
+      - beta@example.com
+
+  experimentalAPI:
+    enabled: false
+    endpoints:
+      - /api/v2/experimental
+      - /api/v2/beta
+
+  darkMode:
+    enabled: true
+    default: auto # auto, light, dark
+```
+
+```ts#feature-flags.ts
+import { features } from "./features.yaml";
+
+export function isFeatureEnabled(
+  featureName: string,
+  userEmail?: string,
+): boolean {
+  const feature = features[featureName];
+
+  if (!feature?.enabled) {
+    return false;
+  }
+
+  // Check rollout percentage
+  if (feature.rolloutPercentage < 100) {
+    const hash = hashCode(userEmail || "anonymous");
+    if (hash % 100 >= feature.rolloutPercentage) {
+      return false;
+    }
+  }
+
+  // Check allowed users
+  if (feature.allowedUsers && userEmail) {
+    return feature.allowedUsers.includes(userEmail);
+  }
+
+  return true;
+}
+
+// Use with hot reloading to toggle features in real-time
+if (isFeatureEnabled("newDashboard", user.email)) {
+  renderNewDashboard();
+} else {
+  renderLegacyDashboard();
+}
+```
+
+### Database Configuration
+
+```yaml#database.yaml
+connections:
+  primary:
+    type: postgres
+    host: ${DB_HOST:-localhost}
+    port: ${DB_PORT:-5432}
+    database: ${DB_NAME:-myapp}
+    username: ${DB_USER:-postgres}
+    password: ${DB_PASS}
+    pool:
+      min: 2
+      max: 10
+      idleTimeout: 30000
+
+  cache:
+    type: redis
+    host: ${REDIS_HOST:-localhost}
+    port: ${REDIS_PORT:-6379}
+    password: ${REDIS_PASS}
+    db: 0
+
+  analytics:
+    type: clickhouse
+    host: ${ANALYTICS_HOST:-localhost}
+    port: 8123
+    database: analytics
+
+migrations:
+  autoRun: ${AUTO_MIGRATE:-false}
+  directory: ./migrations
+
+seeds:
+  enabled: ${SEED_DB:-false}
+  directory: ./seeds
+```
+
+```ts#db.ts
+import { connections, migrations } from "./database.yaml";
+import { createConnection } from "./database-driver";
+
+// Parse environment variables with defaults
+function parseConfig(config: any) {
+  return JSON.parse(
+    JSON.stringify(config).replace(
+      /\${([^:-]+)(?::([^}]+))?}/g,
+      (_, key, defaultValue) => process.env[key] || defaultValue || "",
+    ),
+  );
+}
+
+const dbConfig = parseConfig(connections);
+
+export const db = await createConnection(dbConfig.primary);
+export const cache = await createConnection(dbConfig.cache);
+export const analytics = await createConnection(dbConfig.analytics);
+
+// Auto-run migrations if configured
+if (parseConfig(migrations).autoRun === "true") {
+  await runMigrations(db, migrations.directory);
+}
+```
+
+### Bundler Integration
+
+When you import YAML files in your application and bundle it with Bun, the YAML is parsed at build time and included as a JavaScript module:
+
+```bash
+bun build app.ts --outdir=dist
+```
+
+This means:
+
+- Zero runtime YAML parsing overhead in production
+- Smaller bundle sizes
+- Tree-shaking support for unused configuration (named imports)
+
+### Dynamic Imports
+
+YAML files can be dynamically imported, useful for loading configuration on demand:
+
+```ts#Load configuration based on environment
+const env = process.env.NODE_ENV || "development";
+const config = await import(`./configs/${env}.yaml`);
+
+// Load user-specific settings
+async function loadUserSettings(userId: string) {
+  try {
+    const settings = await import(`./users/${userId}/settings.yaml`);
+    return settings.default;
+  } catch {
+    return await import("./users/default-settings.yaml");
+  }
+}
+```

docs/bundler/executables.md

@@ -408,16 +408,119 @@ $ bun build --compile --asset-naming="[name].[ext]" ./index.ts
 
 To trim down the size of the executable a little, pass `--minify` to `bun build --compile`. This uses Bun's minifier to reduce the code size. Overall though, Bun's binary is still way too big and we need to make it smaller.
 
+## Using Bun.build() API
+
+You can also generate standalone executables using the `Bun.build()` JavaScript API. This is useful when you need programmatic control over the build process.
+
+### Basic usage
+
+```js
+await Bun.build({
+  entrypoints: ["./app.ts"],
+  outdir: "./dist",
+  compile: {
+    target: "bun-windows-x64",
+    outfile: "myapp.exe",
+  },
+});
+```
+
+### Windows metadata with Bun.build()
+
+When targeting Windows, you can specify metadata through the `windows` object:
+
+```js
+await Bun.build({
+  entrypoints: ["./app.ts"],
+  outdir: "./dist",
+  compile: {
+    target: "bun-windows-x64",
+    outfile: "myapp.exe",
+    windows: {
+      title: "My Application",
+      publisher: "My Company Inc",
+      version: "1.2.3.4",
+      description: "A powerful application built with Bun",
+      copyright: "© 2024 My Company Inc",
+      hideConsole: false, // Set to true for GUI applications
+      icon: "./icon.ico", // Path to icon file
+    },
+  },
+});
+```
+
+### Cross-compilation with Bun.build()
+
+You can cross-compile for different platforms:
+
+```js
+// Build for multiple platforms
+const platforms = [
+  { target: "bun-windows-x64", outfile: "app-windows.exe" },
+  { target: "bun-linux-x64", outfile: "app-linux" },
+  { target: "bun-darwin-arm64", outfile: "app-macos" },
+];
+
+for (const platform of platforms) {
+  await Bun.build({
+    entrypoints: ["./app.ts"],
+    outdir: "./dist",
+    compile: platform,
+  });
+}
+```
+
 ## Windows-specific flags
 
-When compiling a standalone executable on Windows, there are two platform-specific options that can be used to customize metadata on the generated `.exe` file:
+When compiling a standalone executable for Windows, there are several platform-specific options that can be used to customize the generated `.exe` file:
 
-- `--windows-icon=path/to/icon.ico` to customize the executable file icon.
-- `--windows-hide-console` to disable the background terminal, which can be used for applications that do not need a TTY.
+### Visual customization
+
+- `--windows-icon=path/to/icon.ico` - Set the executable file icon
+- `--windows-hide-console` - Disable the background terminal window (useful for GUI applications)
+
+### Metadata customization
+
+You can embed version information and other metadata into your Windows executable:
+
+- `--windows-title <STR>` - Set the product name (appears in file properties)
+- `--windows-publisher <STR>` - Set the company name
+- `--windows-version <STR>` - Set the version number (e.g. "1.2.3.4")
+- `--windows-description <STR>` - Set the file description
+- `--windows-copyright <STR>` - Set the copyright information
+
+#### Example with all metadata flags:
+
+```sh
+bun build --compile ./app.ts \
+  --outfile myapp.exe \
+  --windows-title "My Application" \
+  --windows-publisher "My Company Inc" \
+  --windows-version "1.2.3.4" \
+  --windows-description "A powerful application built with Bun" \
+  --windows-copyright "© 2024 My Company Inc"
+```
+
+This metadata will be visible in Windows Explorer when viewing the file properties:
+
+1. Right-click the executable in Windows Explorer
+2. Select "Properties"
+3. Go to the "Details" tab
+
+#### Version string format
+
+The `--windows-version` flag accepts version strings in the following formats:
+
+- `"1"` - Will be normalized to "1.0.0.0"
+- `"1.2"` - Will be normalized to "1.2.0.0"
+- `"1.2.3"` - Will be normalized to "1.2.3.0"
+- `"1.2.3.4"` - Full version format
+
+Each version component must be a number between 0 and 65535.
 
 {% callout %}
 
-These flags currently cannot be used when cross-compiling because they depend on Windows APIs.
+These flags currently cannot be used when cross-compiling because they depend on Windows APIs. They are only available when building on Windows itself.
 
 {% /callout %}
 

docs/bundler/index.md

@@ -1,4 +1,4 @@
-Bun's fast native bundler is now in beta. It can be used via the `bun build` CLI command or the `Bun.build()` JavaScript API.
+Bun's fast native bundler can be used via the `bun build` CLI command or the `Bun.build()` JavaScript API.
 
 {% codetabs group="a" %}
 
@@ -1259,6 +1259,33 @@ $ bun build ./index.tsx --outdir ./out --drop=console --drop=debugger --drop=any
 
 {% /codetabs %}
 
+### `throw`
+
+Controls error handling behavior when the build fails. When set to `true` (default), the returned promise rejects with an `AggregateError`. When set to `false`, the promise resolves with a `BuildOutput` object where `success` is `false`.
+
+```ts#JavaScript
+// Default behavior: throws on error
+try {
+  await Bun.build({
+    entrypoints: ['./index.tsx'],
+    throw: true, // default
+  });
+} catch (error) {
+  // Handle AggregateError
+  console.error("Build failed:", error);
+}
+
+// Alternative: handle errors via success property
+const result = await Bun.build({
+  entrypoints: ['./index.tsx'],
+  throw: false,
+});
+
+if (!result.success) {
+  console.error("Build failed with errors:", result.logs);
+}
+```
+
 ## Outputs
 
 The `Bun.build` function returns a `Promise<BuildOutput>`, defined as:
@@ -1569,8 +1596,7 @@ interface BuildConfig {
    * When set to `true`, the returned promise rejects with an AggregateError when a build failure happens.
    * When set to `false`, the `success` property of the returned object will be `false` when a build failure happens.
    *
-   * This defaults to `false` in Bun 1.1 and will change to `true` in Bun 1.2
-   * as most usage of `Bun.build` forgets to check for errors.
+   * This defaults to `true`.
    */
   throw?: boolean;
 }

docs/bundler/loaders.md

@@ -1,6 +1,6 @@
 The Bun bundler implements a set of default loaders out of the box. As a rule of thumb, the bundler and the runtime both support the same set of file types out of the box.
 
-`.js` `.cjs` `.mjs` `.mts` `.cts` `.ts` `.tsx` `.jsx` `.toml` `.json` `.txt` `.wasm` `.node` `.html`
+`.js` `.cjs` `.mjs` `.mts` `.cts` `.ts` `.tsx` `.jsx` `.toml` `.json` `.yaml` `.yml` `.txt` `.wasm` `.node` `.html`
 
 Bun uses the file extension to determine which built-in _loader_ should be used to parse the file. Every loader has a name, such as `js`, `tsx`, or `json`. These names are used when building [plugins](https://bun.com/docs/bundler/plugins) that extend Bun with custom loaders.
 
@@ -121,6 +121,55 @@ export default {
 
 {% /codetabs %}
 
+### `yaml`
+
+**YAML loader**. Default for `.yaml` and `.yml`.
+
+YAML files can be directly imported. Bun will parse them with its fast native YAML parser.
+
+```ts
+import config from "./config.yaml";
+config.database.host; // => "localhost"
+
+// via import attribute:
+// import myCustomYAML from './my.config' with {type: "yaml"};
+```
+
+During bundling, the parsed YAML is inlined into the bundle as a JavaScript object.
+
+```ts
+var config = {
+  database: {
+    host: "localhost",
+    port: 5432,
+  },
+  // ...other fields
+};
+config.database.host;
+```
+
+If a `.yaml` or `.yml` file is passed as an entrypoint, it will be converted to a `.js` module that `export default`s the parsed object.
+
+{% codetabs %}
+
+```yaml#Input
+name: John Doe
+age: 35
+email: johndoe@example.com
+```
+
+```js#Output
+export default {
+  name: "John Doe",
+  age: 35,
+  email: "johndoe@example.com"
+}
+```
+
+{% /codetabs %}
+
+For more details on YAML support including the runtime API `Bun.YAML.parse()`, see the [YAML API documentation](/docs/api/yaml).
+
 ### `text`
 
 **Text loader**. Default for `.txt`.

docs/bundler/plugins.md

@@ -9,6 +9,7 @@ Plugins can register callbacks to be run at various points in the lifecycle of a
 - [`onStart()`](#onstart): Run once the bundler has started a bundle
 - [`onResolve()`](#onresolve): Run before a module is resolved
 - [`onLoad()`](#onload): Run before a module is loaded.
+- [`onEnd()`](#onend): Run after the bundle has completed
 - [`onBeforeParse()`](#onbeforeparse): Run zero-copy native addons in the parser thread before a file is parsed.
 
 ### Reference
@@ -18,6 +19,7 @@ A rough overview of the types (please refer to Bun's `bun.d.ts` for the full typ
 ```ts
 type PluginBuilder = {
   onStart(callback: () => void): void;
+  onEnd(callback: (result: BuildOutput) => void | Promise<void>): void;
   onResolve: (
     args: { filter: RegExp; namespace?: string },
     callback: (args: { path: string; importer: string }) => {
@@ -285,6 +287,53 @@ plugin({
 
 Note that the `.defer()` function currently has the limitation that it can only be called once per `onLoad` callback.
 
+### `onEnd`
+
+```ts
+onEnd(callback: (result: BuildOutput) => void | Promise<void>): void;
+```
+
+Registers a callback to be run when the bundler completes a bundle (whether successful or not).
+
+The callback receives the `BuildOutput` object containing:
+
+- `success`: boolean indicating if the build succeeded
+- `outputs`: array of generated build artifacts
+- `logs`: array of build messages (warnings, errors, etc.)
+
+This is useful for post-processing, cleanup, notifications, or custom error handling.
+
+```ts
+await Bun.build({
+  entrypoints: ["./index.ts"],
+  outdir: "./out",
+  plugins: [
+    {
+      name: "onEnd example",
+      setup(build) {
+        build.onEnd(result => {
+          if (result.success) {
+            console.log(
+              `✅ Build succeeded with ${result.outputs.length} outputs`,
+            );
+          } else {
+            console.error(`❌ Build failed with ${result.logs.length} errors`);
+          }
+        });
+      },
+    },
+  ],
+});
+```
+
+The `onEnd` callbacks are called:
+
+- **Before** the build promise resolves or rejects
+- **After** all bundling is complete
+- **In the order** they were registered
+
+Multiple plugins can register `onEnd` callbacks, and they will all be called sequentially. If an `onEnd` callback returns a promise, the build will wait for it to resolve before continuing.
+
 ## Native plugins
 
 One of the reasons why Bun's bundler is so fast is that it is written in native code and leverages multi-threading to load and parse modules in parallel.

docs/guides/deployment/index.json

@@ -0,0 +1,4 @@
+{
+  "name": "Deployment",
+  "description": "A collection of guides for deploying Bun to providers"
+}

docs/guides/deployment/railway.md

@@ -0,0 +1,157 @@
+---
+name: Deploy a Bun application on Railway
+description: Deploy Bun applications to Railway with this step-by-step guide covering CLI and dashboard methods, optional PostgreSQL setup, and automatic SSL configuration.
+---
+
+Railway is an infrastructure platform where you can provision infrastructure, develop with that infrastructure locally, and then deploy to the cloud. It enables instant deployments from GitHub with zero configuration, automatic SSL, and built-in database provisioning.
+
+This guide walks through deploying a Bun application with a PostgreSQL database (optional), which is exactly what the template below provides.
+
+You can either follow this guide step-by-step or simply deploy the pre-configured template with one click:
+
+{% raw %}
+
+<a href="https://railway.com/deploy/bun-react-postgres?referralCode=Bun&utm_medium=integration&utm_source=template&utm_campaign=bun" target="_blank">
+  <img src="https://railway.com/button.svg" alt="Deploy on Railway" />
+</a>
+
+{% /raw %}
+
+---
+
+**Prerequisites**:
+
+- A Bun application ready for deployment
+- A [Railway account](https://railway.app/)
+- Railway CLI (for CLI deployment method)
+- A GitHub account (for Dashboard deployment method)
+
+---
+
+## Method 1: Deploy via CLI
+
+---
+
+#### Step 1
+
+Ensure sure you have the Railway CLI installed.
+
+```bash
+bun install -g @railway/cli
+```
+
+---
+
+#### Step 2
+
+Log into your Railway account.
+
+```bash
+railway login
+```
+
+---
+
+#### Step 3
+
+After successfully authenticating, initialize a new project.
+
+```bash
+# Initialize project
+bun-react-postgres$ railway init
+```
+
+---
+
+#### Step 4
+
+After initializing the project, add a new database and service.
+
+> **Note:** Step 4 is only necessary if your application uses a database. If you don't need PostgreSQL, skip to Step 5.
+
+```bash
+# Add PostgreSQL database. Make sure to add this first!
+bun-react-postgres$ railway add --database postgres
+
+# Add your application service.
+bun-react-postgres$ railway add --service bun-react-db --variables DATABASE_URL=\${{Postgres.DATABASE_URL}}
+```
+
+---
+
+#### Step 5
+
+After the services have been created and connected, deploy the application to Railway. By default, services are only accessible within Railway's private network. To make your app publicly accessible, you need to generate a public domain.
+
+```bash
+# Deploy your application
+bun-nextjs-starter$ railway up
+
+# Generate public domain
+bun-nextjs-starter$ railway domain
+```
+
+---
+
+## Method 2: Deploy via Dashboard
+
+---
+
+#### Step 1
+
+Create a new project
+
+1. Go to [Railway Dashboard](http://railway.com/dashboard?utm_medium=integration&utm_source=docs&utm_campaign=bun)
+2. Click **"+ New"** → **"GitHub repo"**
+3. Choose your repository
+
+---
+
+#### Step 2
+
+Add a PostgreSQL database, and connect this database to the service
+
+> **Note:** Step 2 is only necessary if your application uses a database. If you don't need PostgreSQL, skip to Step 3.
+
+1. Click **"+ New"** → **"Database"** → **"Add PostgreSQL"**
+2. After the database has been created, select your service (not the database)
+3. Go to **"Variables"** tab
+4. Click **"+ New Variable"** → **"Add Reference"**
+5. Select `DATABASE_URL` from postgres
+
+---
+
+#### Step 3
+
+Generate a public domain
+
+1. Select your service
+2. Go to **"Settings"** tab
+3. Under **"Networking"**, click **"Generate Domain"**
+
+---
+
+Your app is now live! Railway auto-deploys on every GitHub push.
+
+---
+
+## Configuration (Optional)
+
+---
+
+By default, Railway uses [Nixpacks](https://docs.railway.com/guides/build-configuration#nixpacks-options) to automatically detect and build your Bun application with zero configuration.
+
+However, using the [Railpack](https://docs.railway.com/guides/build-configuration#railpack) application builder provides better Bun support, and will always support the latest version of Bun. The pre-configured templates use Railpack by default.
+
+To enable Railpack in a custom project, add the following to your `railway.json`:
+
+```json
+{
+  "$schema": "https://railway.com/railway.schema.json",
+  "build": {
+    "builder": "RAILPACK"
+  }
+}
+```
+
+For more build configuration settings, check out the [Railway documentation](https://docs.railway.com/guides/build-configuration).

docs/guides/runtime/import-yaml.md

@@ -0,0 +1,76 @@
+---
+name: Import a YAML file
+---
+
+Bun natively supports `.yaml` and `.yml` imports.
+
+```yaml#config.yaml
+database:
+  host: localhost
+  port: 5432
+  name: myapp
+
+server:
+  port: 3000
+  timeout: 30
+
+features:
+  auth: true
+  rateLimit: true
+```
+
+---
+
+Import the file like any other source file.
+
+```ts
+import config from "./config.yaml";
+
+config.database.host; // => "localhost"
+config.server.port; // => 3000
+config.features.auth; // => true
+```
+
+---
+
+You can also use named imports to destructure top-level properties:
+
+```ts
+import { database, server, features } from "./config.yaml";
+
+console.log(database.name); // => "myapp"
+console.log(server.timeout); // => 30
+console.log(features.rateLimit); // => true
+```
+
+---
+
+Bun also supports [Import Attributes](https://github.com/tc39/proposal-import-attributes) syntax:
+
+```ts
+import config from "./config.yaml" with { type: "yaml" };
+
+config.database.port; // => 5432
+```
+
+---
+
+For parsing YAML strings at runtime, use `Bun.YAML.parse()`:
+
+```ts
+const yamlString = `
+name: John Doe
+age: 30
+hobbies:
+  - reading
+  - coding
+`;
+
+const data = Bun.YAML.parse(yamlString);
+console.log(data.name); // => "John Doe"
+console.log(data.hobbies); // => ["reading", "coding"]
+```
+
+---
+
+See [Docs > API > YAML](https://bun.com/docs/api/yaml) for complete documentation on YAML support in Bun.

docs/guides/runtime/set-env.md

@@ -17,7 +17,7 @@ Bun reads the following files automatically (listed in order of increasing prece
 
 - `.env`
 - `.env.production`, `.env.development`, `.env.test` (depending on value of `NODE_ENV`)
-- `.env.local`
+- `.env.local` (not loaded when `NODE_ENV=test`)
 
 ```txt#.env
 FOO=hello

docs/guides/test/migrate-from-jest.md

@@ -35,7 +35,7 @@ Add this directive to _just one file_ in your project, such as:
 - Any single `.ts` file that TypeScript includes in your compilation
 
 ```ts
-/// <reference types="bun/test-globals" />
+/// <reference types="bun-types/test-globals" />
 ```
 
 ---

docs/install/security-scanner-api.md

@@ -0,0 +1,81 @@
+Bun's package manager can scan packages for security vulnerabilities before installation, helping protect your applications from supply chain attacks and known vulnerabilities.
+
+## Quick Start
+
+Configure a security scanner in your `bunfig.toml`:
+
+```toml
+[install.security]
+scanner = "@acme/bun-security-scanner"
+```
+
+When configured, Bun will:
+
+- Scan all packages before installation
+- Display security warnings and advisories
+- Cancel installation if critical vulnerabilities are found
+- Automatically disable auto-install for security
+
+## How It Works
+
+Security scanners analyze packages during `bun install`, `bun add`, and other package operations. They can detect:
+
+- Known security vulnerabilities (CVEs)
+- Malicious packages
+- License compliance issues
+- ...and more!
+
+### Security Levels
+
+Scanners report issues at two severity levels:
+
+- **`fatal`** - Installation stops immediately, exits with non-zero code
+- **`warn`** - In interactive terminals, prompts to continue; in CI, exits immediately
+
+## Using Pre-built Scanners
+
+Many security companies publish Bun security scanners as npm packages that you can install and use immediately.
+
+### Installing a Scanner
+
+Install a security scanner from npm:
+
+```bash
+$ bun add -d @acme/bun-security-scanner
+```
+
+> **Note:** Consult your security scanner's documentation for their specific package name and installation instructions. Most scanners will be installed with `bun add`.
+
+### Configuring the Scanner
+
+After installation, configure it in your `bunfig.toml`:
+
+```toml
+[install.security]
+scanner = "@acme/bun-security-scanner"
+```
+
+### Enterprise Configuration
+
+Some enterprise scanners might support authentication and/or configuration through environment variables:
+
+```bash
+# This might go in ~/.bashrc, for example
+export SECURITY_API_KEY="your-api-key"
+
+# The scanner will now use these credentials automatically
+bun install
+```
+
+Consult your security scanner's documentation to learn which environment variables to set and if any additional configuration is required.
+
+### Authoring your own scanner
+
+For a complete example with tests and CI setup, see the official template:
+[github.com/oven-sh/security-scanner-template](https://github.com/oven-sh/security-scanner-template)
+
+## Related
+
+- [Configuration (bunfig.toml)](/docs/runtime/bunfig#install-security-scanner)
+- [Package Manager](/docs/install)
+- [Security Scanner Template](https://github.com/oven-sh/security-scanner-template)

docs/nav.ts

@@ -219,6 +219,9 @@ export default {
     page("install/npmrc", ".npmrc support", {
       description: "Bun supports loading some configuration options from .npmrc",
     }),
+    page("install/security-scanner-api", "Security Scanner API", {
+      description: "Scan your project for vulnerabilities with Bun's security scanner API.",
+    }),
     // page("install/utilities", "Utilities", {
     //   description: "Use `bun pm` to introspect your global module cache or project dependency tree.",
     // }),
@@ -383,6 +386,9 @@ export default {
     page("api/spawn", "Child processes", {
       description: `Spawn sync and async child processes with easily configurable input and output streams.`,
     }), // "`Bun.spawn`"),
+    page("api/yaml", "YAML", {
+      description: `Bun.YAML.parse(string) lets you parse YAML files in JavaScript`,
+    }), // "`Bun.spawn`"),
     page("api/html-rewriter", "HTMLRewriter", {
       description: `Parse and transform HTML with Bun's native HTMLRewriter API, inspired by Cloudflare Workers.`,
     }), // "`HTMLRewriter`"),

docs/runtime/bun-apis.md

@@ -195,12 +195,12 @@ Click the link in the right column to jump to the associated documentation.
 ---
 
 - Parsing & Formatting
-- [`Bun.semver`](https://bun.com/docs/api/semver), `Bun.TOML.parse`, [`Bun.color`](https://bun.com/docs/api/color)
+- [`Bun.semver`](https://bun.com/docs/api/semver), `Bun.TOML.parse`, [`Bun.YAML.parse`](https://bun.com/docs/api/yaml), [`Bun.color`](https://bun.com/docs/api/color)
 
 ---
 
 - Low-level / Internals
-- `Bun.mmap`, `Bun.gc`, `Bun.generateHeapSnapshot`, [`bun:jsc`](https://bun.com/docs/api/bun-jsc)
+- `Bun.mmap`, `Bun.gc`, `Bun.generateHeapSnapshot`, [`bun:jsc`](https://bun.com/reference/bun/jsc)
 
 ---
 

docs/runtime/bunfig.md

@@ -94,6 +94,7 @@ Bun supports the following loaders:
 - `file`
 - `json`
 - `toml`
+- `yaml`
 - `wasm`
 - `napi`
 - `base64`
@@ -496,6 +497,32 @@ Whether to generate a non-Bun lockfile alongside `bun.lock`. (A `bun.lock` will
 print = "yarn"
 ```
 
+### `install.security.scanner`
+
+Configure a security scanner to scan packages for vulnerabilities before installation.
+
+First, install a security scanner from npm:
+
+```bash
+$ bun add -d @acme/bun-security-scanner
+```
+
+Then configure it in your `bunfig.toml`:
+
+```toml
+[install.security]
+scanner = "@acme/bun-security-scanner"
+```
+
+When a security scanner is configured:
+
+- Auto-install is automatically disabled for security
+- Packages are scanned before installation
+- Installation is cancelled if fatal issues are found
+- Security warnings are displayed during installation
+
+Learn more about [using and writing security scanners](/docs/install/security).
+
 ### `install.linker`
 
 Configure the default linker strategy. Default `"hoisted"`.

docs/runtime/env.md

@@ -8,6 +8,10 @@ Bun reads the following files automatically (listed in order of increasing prece
 - `.env.production`, `.env.development`, `.env.test` (depending on value of `NODE_ENV`)
 - `.env.local`
 
+{% callout %}
+**Note:** When `NODE_ENV=test`, `.env.local` is **not** loaded. This ensures consistent test environments across different executions by preventing local overrides during testing. This behavior matches popular frameworks like [Next.js](https://nextjs.org/docs/pages/guides/environment-variables#test-environment-variables) and [Create React App](https://create-react-app.dev/docs/adding-custom-environment-variables/#what-other-env-files-can-be-used).
+{% /callout %}
+
 ```txt#.env
 FOO=hello
 BAR=world

docs/runtime/index.md

@@ -92,15 +92,18 @@ every file before execution. Its transpiler  can directly run TypeScript and JSX
 
 ## JSX
 
-## JSON and TOML
+## JSON, TOML, and YAML
 
-Source files can import a `*.json` or `*.toml` file to load its contents as a plain old JavaScript object.
+Source files can import `*.json`, `*.toml`, or `*.yaml` files to load their contents as plain JavaScript objects.
 
 ```ts
 import pkg from "./package.json";
 import bunfig from "./bunfig.toml";
+import config from "./config.yaml";
 ```
 
+See the [YAML API documentation](/docs/api/yaml) for more details on YAML support.
+
 ## WASI
 
 {% callout %}

docs/runtime/loaders.md

@@ -52,15 +52,18 @@ Hello world!
 
 {% /codetabs %}
 
-## JSON and TOML
+## JSON, TOML, and YAML
 
-JSON and TOML files can be directly imported from a source file. The contents will be loaded and returned as a JavaScript object.
+JSON, TOML, and YAML files can be directly imported from a source file. The contents will be loaded and returned as a JavaScript object.
 
 ```ts
 import pkg from "./package.json";
 import data from "./data.toml";
+import config from "./config.yaml";
 ```
 
+For more details on YAML support, see the [YAML API documentation](/docs/api/yaml).
+
 ## WASI
 
 {% callout %}

docs/test/runtime-behavior.md

@@ -12,6 +12,8 @@ test("NODE_ENV is set to test", () => {
 });
 ```
 
+When `NODE_ENV` is set to `"test"`, Bun will not load `.env.local` files. This ensures consistent test environments across different executions by preventing local overrides during testing. Instead, use `.env.test` for test-specific environment variables, which should be committed to your repository for consistency across all developers and CI environments.
+
 #### `$TZ` environment variable
 
 By default, all `bun test` runs use UTC (`Etc/UTC`) as the time zone unless overridden by the `TZ` environment variable. This ensures consistent date and time behavior across different development environments.

package.json

@@ -1,15 +1,16 @@
 {
   "private": true,
   "name": "bun",
-  "version": "1.2.21",
+  "version": "1.2.22",
   "workspaces": [
     "./packages/bun-types",
     "./packages/@types/bun"
   ],
   "devDependencies": {
-    "bun-tracestrings": "github:oven-sh/bun.report#912ca63e26c51429d3e6799aa2a6ab079b188fd8",
     "@lezer/common": "^1.2.3",
     "@lezer/cpp": "^1.1.3",
+    "@types/bun": "workspace:*",
+    "bun-tracestrings": "github:oven-sh/bun.report#912ca63e26c51429d3e6799aa2a6ab079b188fd8",
     "esbuild": "^0.21.4",
     "mitata": "^0.1.11",
     "peechy": "0.4.34",

packages/bun-native-bundler-plugin-api/bundler_plugin.h

@@ -18,9 +18,11 @@ typedef enum {
   BUN_LOADER_BASE64 = 10,
   BUN_LOADER_DATAURL = 11,
   BUN_LOADER_TEXT = 12,
+  BUN_LOADER_HTML = 17,
+  BUN_LOADER_YAML = 18,
 } BunLoader;
 
-const BunLoader BUN_LOADER_MAX = BUN_LOADER_TEXT;
+const BunLoader BUN_LOADER_MAX = BUN_LOADER_YAML;
 
 typedef struct BunLogOptions {
   size_t __struct_size;

packages/bun-types/deprecated.d.ts

@@ -1,4 +1,35 @@
 declare module "bun" {
+  /** @deprecated This type is unused in Bun's types and might be removed in the near future */
+  type Platform =
+    | "aix"
+    | "android"
+    | "darwin"
+    | "freebsd"
+    | "haiku"
+    | "linux"
+    | "openbsd"
+    | "sunos"
+    | "win32"
+    | "cygwin"
+    | "netbsd";
+
+  /** @deprecated This type is unused in Bun's types and might be removed in the near future */
+  type Architecture = "arm" | "arm64" | "ia32" | "mips" | "mipsel" | "ppc" | "ppc64" | "s390" | "s390x" | "x64";
+
+  /** @deprecated This type is unused in Bun's types and might be removed in the near future */
+  type UncaughtExceptionListener = (error: Error, origin: UncaughtExceptionOrigin) => void;
+
+  /**
+   * Most of the time the unhandledRejection will be an Error, but this should not be relied upon
+   * as *anything* can be thrown/rejected, it is therefore unsafe to assume that the value is an Error.
+   *
+   * @deprecated This type is unused in Bun's types and might be removed in the near future
+   */
+  type UnhandledRejectionListener = (reason: unknown, promise: Promise<unknown>) => void;
+
+  /** @deprecated This type is unused in Bun's types and might be removed in the near future */
+  type MultipleResolveListener = (type: MultipleResolveType, promise: Promise<unknown>, value: unknown) => void;
+
   /**
    * Consume all data from a {@link ReadableStream} until it closes or errors.
    *

packages/bun-types/experimental.d.ts

@@ -191,7 +191,9 @@ declare module "bun" {
      * };
      * ```
      */
-    export type SSGPage<Params extends SSGParamsLike = SSGParamsLike> = React.ComponentType<SSGPageProps<Params>>;
+    export type SSGPage<Params extends SSGParamsLike = SSGParamsLike> = import("react").ComponentType<
+      SSGPageProps<Params>
+    >;
 
     /**
      * getStaticPaths is Bun's implementation of SSG (Static Site Generation) path determination.

packages/bun-types/extensions.d.ts

@@ -8,6 +8,16 @@ declare module "*.toml" {
   export = contents;
 }
 
+declare module "*.yaml" {
+  var contents: any;
+  export = contents;
+}
+
+declare module "*.yml" {
+  var contents: any;
+  export = contents;
+}
+
 declare module "*.jsonc" {
   var contents: any;
   export = contents;

packages/bun-types/index.d.ts

@@ -21,6 +21,8 @@
 /// <reference path="./redis.d.ts" />
 /// <reference path="./shell.d.ts" />
 /// <reference path="./experimental.d.ts" />
+/// <reference path="./sql.d.ts" />
+/// <reference path="./security.d.ts" />
 
 /// <reference path="./bun.ns.d.ts" />
 

packages/bun-types/overrides.d.ts

@@ -24,6 +24,12 @@ declare module "stream/web" {
   }
 }
 
+declare module "url" {
+  interface URLSearchParams {
+    toJSON(): Record<string, string>;
+  }
+}
+
 declare global {
   namespace NodeJS {
     interface ProcessEnv extends Bun.Env {}

packages/bun-types/security.d.ts

@@ -0,0 +1,101 @@
+declare module "bun" {
+  /**
+   * `bun install` security related declarations
+   */
+  export namespace Security {
+    export interface Package {
+      /**
+       * The name of the package
+       */
+      name: string;
+
+      /**
+       * The resolved version to be installed that matches the requested range.
+       *
+       * This is the exact version string, **not** a range.
+       */
+      version: string;
+
+      /**
+       * The URL of the tgz of this package that Bun will download
+       */
+      tarball: string;
+
+      /**
+       * The range that was requested by the command
+       *
+       * This could be a tag like `beta` or a semver range like `>=4.0.0`
+       */
+      requestedRange: string;
+    }
+
+    /**
+     * Advisory represents the result of a security scan result of a package
+     */
+    export interface Advisory {
+      /**
+       * Level represents the degree of danger for a security advisory
+       *
+       * Bun behaves differently depending on the values returned from the
+       * {@link Scanner.scan `scan()`} hook:
+       *
+       * > In any case, Bun *always* pretty prints *all* the advisories,
+       * > but...
+       * >
+       * > → if any **fatal**, Bun will immediately cancel the installation
+       * > and quit with a non-zero exit code
+       * >
+       * > → else if any **warn**, Bun will either ask the user if they'd like
+       * > to continue with the install if in a TTY environment, or
+       * > immediately exit if not.
+       */
+      level: "fatal" | "warn";
+
+      /**
+       * The name of the package attempting to be installed.
+       */
+      package: string;
+
+      /**
+       * If available, this is a url linking to a CVE or report online so
+       * users can learn more about the advisory.
+       */
+      url: string | null;
+
+      /**
+       * If available, this is a brief description of the advisory that Bun
+       * will print to the user.
+       */
+      description: string | null;
+    }
+
+    export interface Scanner {
+      /**
+       * This is the version of the scanner implementation. It may change in
+       * future versions, so we will use this version to discriminate between
+       * such versions. It's entirely possible this API changes in the future
+       * so much that version 1 would no longer be supported.
+       *
+       * The version is required because third-party scanner package versions
+       * are inherently unrelated to Bun versions
+       */
+      version: "1";
+
+      /**
+       * Perform an advisory check when a user ran `bun add <package>
+       * [...packages]` or other related/similar commands.
+       *
+       * If this function throws an error, Bun will immediately stop the
+       * install process and print the error to the user.
+       *
+       * @param info An object containing an array of packages to be added.
+       * The package array will contain all proposed dependencies, including
+       * transitive ones. More simply, that means it will include dependencies
+       * of the packages the user wants to add.
+       *
+       * @returns A list of advisories.
+       */
+      scan: (info: { packages: Package[] }) => Promise<Advisory[]>;
+    }
+  }
+}

packages/bun-types/shell.d.ts

@@ -211,7 +211,7 @@ declare module "bun" {
      * try {
      *   const result = await $`exit 1`;
      * } catch (error) {
-     *   if (error instanceof ShellError) {
+     *   if (error instanceof $.ShellError) {
      *     console.log(error.exitCode); // 1
      *   }
      * }

packages/bun-types/sql.d.ts

@@ -0,0 +1,809 @@
+import type * as BunSQLite from "bun:sqlite";
+
+declare module "bun" {
+  /**
+   * Represents a reserved connection from the connection pool Extends SQL with
+   * additional release functionality
+   */
+  interface ReservedSQL extends SQL, Disposable {
+    /**
+     * Releases the client back to the connection pool
+     */
+    release(): void;
+  }
+
+  /**
+   * Represents a client within a transaction context Extends SQL with savepoint
+   * functionality
+   */
+  interface TransactionSQL extends SQL {
+    /**
+     * Creates a savepoint within the current transaction
+     */
+    savepoint<T>(name: string, fn: SQL.SavepointContextCallback<T>): Promise<T>;
+    savepoint<T>(fn: SQL.SavepointContextCallback<T>): Promise<T>;
+
+    /**
+     * The reserve method pulls out a connection from the pool, and returns a
+     * client that wraps the single connection.
+     *
+     * Using reserve() inside of a transaction will return a brand new
+     * connection, not one related to the transaction. This matches the
+     * behaviour of the `postgres` package.
+     */
+    reserve(): Promise<ReservedSQL>;
+  }
+
+  namespace SQL {
+    class SQLError extends Error {
+      constructor(message: string);
+    }
+
+    class PostgresError extends SQLError {
+      public readonly code: string;
+      public readonly errno: string | undefined;
+      public readonly detail: string | undefined;
+      public readonly hint: string | undefined;
+      public readonly severity: string | undefined;
+      public readonly position: string | undefined;
+      public readonly internalPosition: string | undefined;
+      public readonly internalQuery: string | undefined;
+      public readonly where: string | undefined;
+      public readonly schema: string | undefined;
+      public readonly table: string | undefined;
+      public readonly column: string | undefined;
+      public readonly dataType: string | undefined;
+      public readonly constraint: string | undefined;
+      public readonly file: string | undefined;
+      public readonly line: string | undefined;
+      public readonly routine: string | undefined;
+
+      constructor(
+        message: string,
+        options: {
+          code: string;
+          errno?: string | undefined;
+          detail?: string;
+          hint?: string | undefined;
+          severity?: string | undefined;
+          position?: string | undefined;
+          internalPosition?: string;
+          internalQuery?: string;
+          where?: string | undefined;
+          schema?: string;
+          table?: string | undefined;
+          column?: string | undefined;
+          dataType?: string | undefined;
+          constraint?: string;
+          file?: string | undefined;
+          line?: string | undefined;
+          routine?: string | undefined;
+        },
+      );
+    }
+
+    class MySQLError extends SQLError {
+      public readonly code: string;
+      public readonly errno: number | undefined;
+      public readonly sqlState: string | undefined;
+      constructor(message: string, options: { code: string; errno: number | undefined; sqlState: string | undefined });
+    }
+
+    class SQLiteError extends SQLError {
+      public readonly code: string;
+      public readonly errno: number;
+      public readonly byteOffset?: number | undefined;
+
+      constructor(message: string, options: { code: string; errno: number; byteOffset?: number | undefined });
+    }
+
+    type AwaitPromisesArray<T extends Array<PromiseLike<any>>> = {
+      [K in keyof T]: Awaited<T[K]>;
+    };
+
+    type ContextCallbackResult<T> = T extends Array<PromiseLike<any>> ? AwaitPromisesArray<T> : Awaited<T>;
+    type ContextCallback<T, SQL> = (sql: SQL) => Bun.MaybePromise<T>;
+
+    interface SQLiteOptions extends BunSQLite.DatabaseOptions {
+      adapter?: "sqlite";
+
+      /**
+       * Specify the path to the database file
+       *
+       * Examples:
+       *
+       * - `sqlite://:memory:`
+       * - `sqlite://./path/to/database.db`
+       * - `sqlite:///Users/bun/projects/my-app/database.db`
+       * - `./dev.db`
+       * - `:memory:`
+       *
+       * @default ":memory:"
+       */
+      filename?: URL | ":memory:" | (string & {}) | undefined;
+
+      /**
+       * Callback executed when a connection attempt completes (SQLite)
+       * Receives an Error on failure, or null on success.
+       */
+      onconnect?: ((err: Error | null) => void) | undefined;
+
+      /**
+       * Callback executed when a connection is closed (SQLite)
+       * Receives the closing Error or null.
+       */
+      onclose?: ((err: Error | null) => void) | undefined;
+    }
+
+    interface PostgresOrMySQLOptions {
+      /**
+       * Connection URL (can be string or URL object)
+       */
+      url?: URL | string | undefined;
+
+      /**
+       * Database server hostname
+       * @default "localhost"
+       */
+      host?: string | undefined;
+
+      /**
+       * Database server hostname (alias for host)
+       * @deprecated Prefer {@link host}
+       * @default "localhost"
+       */
+      hostname?: string | undefined;
+
+      /**
+       * Database server port number
+       * @default 5432
+       */
+      port?: number | string | undefined;
+
+      /**
+       * Database user for authentication
+       * @default "postgres"
+       */
+      username?: string | undefined;
+
+      /**
+       * Database user for authentication (alias for username)
+       * @deprecated Prefer {@link username}
+       * @default "postgres"
+       */
+      user?: string | undefined;
+
+      /**
+       * Database password for authentication
+       * @default ""
+       */
+      password?: string | (() => MaybePromise<string>) | undefined;
+
+      /**
+       * Database password for authentication (alias for password)
+       * @deprecated Prefer {@link password}
+       * @default ""
+       */
+      pass?: string | (() => MaybePromise<string>) | undefined;
+
+      /**
+       * Name of the database to connect to
+       * @default The username value
+       */
+      database?: string | undefined;
+
+      /**
+       * Name of the database to connect to (alias for database)
+       * @deprecated Prefer {@link database}
+       * @default The username value
+       */
+      db?: string | undefined;
+
+      /**
+       * Database adapter/driver to use
+       * @default "postgres"
+       */
+      adapter?: "postgres" | "mysql" | "mariadb";
+
+      /**
+       * Maximum time in seconds to wait for connection to become available
+       * @default 0 (no timeout)
+       */
+      idleTimeout?: number | undefined;
+
+      /**
+       * Maximum time in seconds to wait for connection to become available (alias for idleTimeout)
+       * @deprecated Prefer {@link idleTimeout}
+       * @default 0 (no timeout)
+       */
+      idle_timeout?: number | undefined;
+
+      /**
+       * Maximum time in seconds to wait when establishing a connection
+       * @default 30
+       */
+      connectionTimeout?: number | undefined;
+
+      /**
+       * Maximum time in seconds to wait when establishing a connection (alias for connectionTimeout)
+       * @deprecated Prefer {@link connectionTimeout}
+       * @default 30
+       */
+      connection_timeout?: number | undefined;
+
+      /**
+       * Maximum time in seconds to wait when establishing a connection (alias
+       * for connectionTimeout)
+       * @deprecated Prefer {@link connectionTimeout}
+       * @default 30
+       */
+      connectTimeout?: number | undefined;
+
+      /**
+       * Maximum time in seconds to wait when establishing a connection (alias
+       * for connectionTimeout)
+       * @deprecated Prefer {@link connectionTimeout}
+       * @default 30
+       */
+      connect_timeout?: number | undefined;
+
+      /**
+       * Maximum lifetime in seconds of a connection
+       * @default 0 (no maximum lifetime)
+       */
+      maxLifetime?: number | undefined;
+
+      /**
+       * Maximum lifetime in seconds of a connection (alias for maxLifetime)
+       * @deprecated Prefer {@link maxLifetime}
+       * @default 0 (no maximum lifetime)
+       */
+      max_lifetime?: number | undefined;
+
+      /**
+       * Whether to use TLS/SSL for the connection
+       * @default false
+       */
+      tls?: TLSOptions | boolean | undefined;
+
+      /**
+       * Whether to use TLS/SSL for the connection (alias for tls)
+       * @default false
+       */
+      ssl?: TLSOptions | boolean | undefined;
+
+      /**
+       * Unix domain socket path for connection
+       * @default undefined
+       */
+      path?: string | undefined;
+
+      /**
+       * Callback executed when a connection attempt completes
+       * Receives an Error on failure, or null on success.
+       */
+      onconnect?: ((err: Error | null) => void) | undefined;
+
+      /**
+       * Callback executed when a connection is closed
+       * Receives the closing Error or null.
+       */
+      onclose?: ((err: Error | null) => void) | undefined;
+
+      /**
+       * Postgres client runtime configuration options
+       *
+       * @see https://www.postgresql.org/docs/current/runtime-config-client.html
+       */
+      connection?: Record<string, string | boolean | number> | undefined;
+
+      /**
+       * Maximum number of connections in the pool
+       * @default 10
+       */
+      max?: number | undefined;
+
+      /**
+       * By default values outside i32 range are returned as strings. If this is
+       * true, values outside i32 range are returned as BigInts.
+       * @default false
+       */
+      bigint?: boolean | undefined;
+
+      /**
+       * Automatic creation of prepared statements
+       * @default true
+       */
+      prepare?: boolean | undefined;
+    }
+
+    /**
+     * Configuration options for SQL client connection and behavior
+     *
+     * @example
+     * ```ts
+     * const config: Bun.SQL.Options = {
+     *   host: 'localhost',
+     *   port: 5432,
+     *   user: 'dbuser',
+     *   password: 'secretpass',
+     *   database: 'myapp',
+     *   idleTimeout: 30,
+     *   max: 20,
+     *   onconnect: (client) => {
+     *     console.log('Connected to database');
+     *   }
+     * };
+     * ```
+     */
+    type Options = SQLiteOptions | PostgresOrMySQLOptions;
+
+    /**
+     * Represents a SQL query that can be executed, with additional control
+     * methods Extends Promise to allow for async/await usage
+     */
+    interface Query<T> extends Promise<T> {
+      /**
+       * Indicates if the query is currently executing
+       */
+      active: boolean;
+
+      /**
+       * Indicates if the query has been cancelled
+       */
+      cancelled: boolean;
+
+      /**
+       * Cancels the executing query
+       */
+      cancel(): Query<T>;
+
+      /**
+       * Executes the query as a simple query, no parameters are allowed but can
+       * execute multiple commands separated by semicolons
+       */
+      simple(): Query<T>;
+
+      /**
+       * Executes the query
+       */
+      execute(): Query<T>;
+
+      /**
+       * Returns the raw query result
+       */
+      raw(): Query<T>;
+
+      /**
+       * Returns only the values from the query result
+       */
+      values(): Query<T>;
+    }
+
+    /**
+     * Callback function type for transaction contexts
+     * @param sql Function to execute SQL queries within the transaction
+     */
+    type TransactionContextCallback<T> = ContextCallback<T, TransactionSQL>;
+
+    /**
+     * Callback function type for savepoint contexts
+     * @param sql Function to execute SQL queries within the savepoint
+     */
+    type SavepointContextCallback<T> = ContextCallback<T, SavepointSQL>;
+
+    /**
+     * SQL.Helper represents a parameter or serializable
+     * value inside of a query.
+     *
+     * @example
+     * ```ts
+     * const helper = sql(users, 'id');
+     * await sql`insert into users ${helper}`;
+     * ```
+     */
+    interface Helper<T> {
+      readonly value: T[];
+      readonly columns: (keyof T)[];
+    }
+  }
+
+  interface SQL extends AsyncDisposable {
+    /**
+     * Executes a SQL query using template literals
+     * @example
+     * ```ts
+     * const [user] = await sql<Users[]>`select * from users where id = ${1}`;
+     * ```
+     */
+    <T = any>(strings: TemplateStringsArray, ...values: unknown[]): SQL.Query<T>;
+
+    /**
+     * Execute a SQL query using a string
+     *
+     * @example
+     * ```ts
+     * const users = await sql<User[]>`SELECT * FROM users WHERE id = ${1}`;
+     * ```
+     */
+    <T = any>(string: string): SQL.Query<T>;
+
+    /**
+     * Helper function for inserting an object into a query
+     *
+     * @example
+     * ```ts
+     * // Insert an object
+     * const result = await sql`insert into users ${sql(users)} returning *`;
+     *
+     * // Or pick specific columns
+     * const result = await sql`insert into users ${sql(users, "id", "name")} returning *`;
+     *
+     * // Or a single object
+     * const result = await sql`insert into users ${sql(user)} returning *`;
+     * ```
+     */
+    <T extends { [Key in PropertyKey]: unknown }>(obj: T | T[] | readonly T[]): SQL.Helper<T>; // Contributor note: This is the same as the signature below with the exception of the columns and the Pick<T, Keys>
+
+    /**
+     * Helper function for inserting an object into a query, supporting specific columns
+     *
+     * @example
+     * ```ts
+     * // Insert an object
+     * const result = await sql`insert into users ${sql(users)} returning *`;
+     *
+     * // Or pick specific columns
+     * const result = await sql`insert into users ${sql(users, "id", "name")} returning *`;
+     *
+     * // Or a single object
+     * const result = await sql`insert into users ${sql(user)} returning *`;
+     * ```
+     */
+    <T extends { [Key in PropertyKey]: unknown }, Keys extends keyof T = keyof T>(
+      obj: T | T[] | readonly T[],
+      ...columns: readonly Keys[]
+    ): SQL.Helper<Pick<T, Keys>>; // Contributor note: This is the same as the signature above with the exception of this signature tracking keys
+
+    /**
+     * Helper function for inserting any serializable value into a query
+     *
+     * @example
+     * ```ts
+     * const result = await sql`SELECT * FROM users WHERE id IN ${sql([1, 2, 3])}`;
+     * ```
+     */
+    <T>(value: T): SQL.Helper<T>;
+  }
+
+  /**
+   * Main SQL client interface providing connection and transaction management
+   */
+  class SQL {
+    /**
+     * Creates a new SQL client instance
+     *
+     * @param connectionString - The connection string for the SQL client
+     *
+     * @example
+     * ```ts
+     * const sql = new SQL("postgres://localhost:5432/mydb");
+     * const sql = new SQL(new URL("postgres://localhost:5432/mydb"));
+     * ```
+     */
+    constructor(connectionString: string | URL);
+
+    /**
+     * Creates a new SQL client instance with options
+     *
+     * @param connectionString - The connection string for the SQL client
+     * @param options - The options for the SQL client
+     *
+     * @example
+     * ```ts
+     * const sql = new SQL("postgres://localhost:5432/mydb", { idleTimeout: 1000 });
+     * ```
+     */
+    constructor(
+      connectionString: string | URL,
+      options: Bun.__internal.DistributedOmit<SQL.Options, "url" | "filename">,
+    );
+
+    /**
+     * Creates a new SQL client instance with options
+     *
+     * @param options - The options for the SQL client
+     *
+     * @example
+     * ```ts
+     * const sql = new SQL({ url: "postgres://localhost:5432/mydb", idleTimeout: 1000 });
+     * ```
+     */
+    constructor(options?: SQL.Options);
+
+    /**
+     * Current client options
+     */
+    options: Bun.__internal.DistributedMerge<SQL.Options>;
+
+    /**
+     * Commits a distributed transaction also know as prepared transaction in postgres or XA transaction in MySQL
+     *
+     * @param name - The name of the distributed transaction
+     *
+     * @throws {Error} If the adapter does not support distributed transactions (e.g., SQLite)
+     *
+     * @example
+     * ```ts
+     * await sql.commitDistributed("my_distributed_transaction");
+     * ```
+     */
+    commitDistributed(name: string): Promise<void>;
+
+    /**
+     * Rolls back a distributed transaction also know as prepared transaction in postgres or XA transaction in MySQL
+     *
+     * @param name - The name of the distributed transaction
+     *
+     * @throws {Error} If the adapter does not support distributed transactions (e.g., SQLite)
+     *
+     * @example
+     * ```ts
+     * await sql.rollbackDistributed("my_distributed_transaction");
+     * ```
+     */
+    rollbackDistributed(name: string): Promise<void>;
+
+    /** Waits for the database connection to be established
+     *
+     * @example
+     * ```ts
+     * await sql.connect();
+     * ```
+     */
+    connect(): Promise<SQL>;
+
+    /**
+     * Closes the database connection with optional timeout in seconds. If timeout is 0, it will close immediately, if is not provided it will wait for all queries to finish before closing.
+     *
+     * @param options - The options for the close
+     *
+     * @example
+     * ```ts
+     * await sql.close({ timeout: 1 });
+     * ```
+     */
+    close(options?: { timeout?: number }): Promise<void>;
+
+    /**
+     * Closes the database connection with optional timeout in seconds. If timeout is 0, it will close immediately, if is not provided it will wait for all queries to finish before closing.
+     * This is an alias of {@link SQL.close}
+     *
+     * @param options - The options for the close
+     *
+     * @example
+     * ```ts
+     * await sql.end({ timeout: 1 });
+     * ```
+     */
+    end(options?: { timeout?: number }): Promise<void>;
+
+    /**
+     * Flushes any pending operations
+     *
+     * @throws {Error} If the adapter does not support flushing (e.g., SQLite)
+     *
+     * @example
+     * ```ts
+     * sql.flush();
+     * ```
+     */
+    flush(): void;
+
+    /**
+     * The reserve method pulls out a connection from the pool, and returns a client that wraps the single connection.
+     *
+     * This can be used for running queries on an isolated connection.
+     * Calling reserve in a reserved Sql will return a new reserved connection,  not the same connection (behavior matches postgres package).
+     *
+     * @throws {Error} If the adapter does not support connection pooling (e.g., SQLite)s
+     *
+     * @example
+     * ```ts
+     * const reserved = await sql.reserve();
+     * await reserved`select * from users`;
+     * await reserved.release();
+     * // with in a production scenario would be something more like
+     * const reserved = await sql.reserve();
+     * try {
+     *   // ... queries
+     * } finally {
+     *   await reserved.release();
+     * }
+     *
+     * // Bun supports Symbol.dispose and Symbol.asyncDispose
+     * // always release after context (safer)
+     * using reserved = await sql.reserve()
+     * await reserved`select * from users`
+     * ```
+     */
+    reserve(): Promise<ReservedSQL>;
+
+    /**
+     * Begins a new transaction.
+     *
+     * Will reserve a connection for the transaction and supply a scoped sql instance for all transaction uses in the callback function. sql.begin will resolve with the returned value from the callback function.
+     * BEGIN is automatically sent with the optional options, and if anything fails ROLLBACK will be called so the connection can be released and execution can continue.
+     * @example
+     * const [user, account] = await sql.begin(async sql => {
+     *   const [user] = await sql`
+     *     insert into users (
+     *       name
+     *     ) values (
+     *       'Murray'
+     *     )
+     *     returning *
+     *   `
+     *   const [account] = await sql`
+     *     insert into accounts (
+     *       user_id
+     *     ) values (
+     *       ${ user.user_id }
+     *     )
+     *     returning *
+     *   `
+     *   return [user, account]
+     * })
+     */
+    begin<const T>(fn: SQL.TransactionContextCallback<T>): Promise<SQL.ContextCallbackResult<T>>;
+
+    /**
+     * Begins a new transaction with options.
+     *
+     * Will reserve a connection for the transaction and supply a scoped sql instance for all transaction uses in the callback function. sql.begin will resolve with the returned value from the callback function.
+     * BEGIN is automatically sent with the optional options, and if anything fails ROLLBACK will be called so the connection can be released and execution can continue.
+     * @example
+     * const [user, account] = await sql.begin("read write", async sql => {
+     *   const [user] = await sql`
+     *     insert into users (
+     *       name
+     *     ) values (
+     *       'Murray'
+     *     )
+     *     returning *
+     *   `
+     *   const [account] = await sql`
+     *     insert into accounts (
+     *       user_id
+     *     ) values (
+     *       ${ user.user_id }
+     *     )
+     *     returning *
+     *   `
+     *   return [user, account]
+     * })
+     */
+    begin<const T>(options: string, fn: SQL.TransactionContextCallback<T>): Promise<SQL.ContextCallbackResult<T>>;
+
+    /**
+     * Alternative method to begin a transaction.
+     *
+     * Will reserve a connection for the transaction and supply a scoped sql instance for all transaction uses in the callback function. sql.transaction will resolve with the returned value from the callback function.
+     * BEGIN is automatically sent with the optional options, and if anything fails ROLLBACK will be called so the connection can be released and execution can continue.
+     * @alias begin
+     * @example
+     * const [user, account] = await sql.transaction(async sql => {
+     *   const [user] = await sql`
+     *     insert into users (
+     *       name
+     *     ) values (
+     *       'Murray'
+     *     )
+     *     returning *
+     *   `
+     *   const [account] = await sql`
+     *     insert into accounts (
+     *       user_id
+     *     ) values (
+     *       ${ user.user_id }
+     *     )
+     *     returning *
+     *   `
+     *   return [user, account]
+     * })
+     */
+    transaction<const T>(fn: SQL.TransactionContextCallback<T>): Promise<SQL.ContextCallbackResult<T>>;
+
+    /**
+     * Alternative method to begin a transaction with options
+     * Will reserve a connection for the transaction and supply a scoped sql instance for all transaction uses in the callback function. sql.transaction will resolve with the returned value from the callback function.
+     * BEGIN is automatically sent with the optional options, and if anything fails ROLLBACK will be called so the connection can be released and execution can continue.
+     *
+     * @alias {@link begin}
+     *
+     * @example
+     * const [user, account] = await sql.transaction("read write", async sql => {
+     *   const [user] = await sql`
+     *     insert into users (
+     *       name
+     *     ) values (
+     *       'Murray'
+     *     )
+     *     returning *
+     *   `
+     *   const [account] = await sql`
+     *     insert into accounts (
+     *       user_id
+     *     ) values (
+     *       ${ user.user_id }
+     *     )
+     *     returning *
+     *   `
+     *   return [user, account]
+     * });
+     */
+    transaction<const T>(options: string, fn: SQL.TransactionContextCallback<T>): Promise<SQL.ContextCallbackResult<T>>;
+
+    /**
+     * Begins a distributed transaction
+     * Also know as Two-Phase Commit, in a distributed transaction, Phase 1 involves the coordinator preparing nodes by ensuring data is written and ready to commit, while Phase 2 finalizes with nodes committing or rolling back based on the coordinator's decision, ensuring durability and releasing locks.
+     * In PostgreSQL and MySQL distributed transactions persist beyond the original session, allowing privileged users or coordinators to commit/rollback them, ensuring support for distributed transactions, recovery, and administrative tasks.
+     * beginDistributed will automatic rollback if any exception are not caught, and you can commit and rollback later if everything goes well.
+     * PostgreSQL natively supports distributed transactions using PREPARE TRANSACTION, while MySQL uses XA Transactions, and MSSQL also supports distributed/XA transactions. However, in MSSQL, distributed transactions are tied to the original session, the DTC coordinator, and the specific connection.
+     * These transactions are automatically committed or rolled back following the same rules as regular transactions, with no option for manual intervention from other sessions, in MSSQL distributed transactions are used to coordinate transactions using Linked Servers.
+     *
+     * @throws {Error} If the adapter does not support distributed transactions (e.g., SQLite)
+     *
+     * @example
+     * await sql.beginDistributed("numbers", async sql => {
+     *   await sql`create table if not exists numbers (a int)`;
+     *   await sql`insert into numbers values(1)`;
+     * });
+     * // later you can call
+     * await sql.commitDistributed("numbers");
+     * // or await sql.rollbackDistributed("numbers");
+     */
+    beginDistributed<const T>(
+      name: string,
+      fn: SQL.TransactionContextCallback<T>,
+    ): Promise<SQL.ContextCallbackResult<T>>;
+
+    /** Alternative method to begin a distributed transaction
+     * @alias {@link beginDistributed}
+     */
+    distributed<const T>(name: string, fn: SQL.TransactionContextCallback<T>): Promise<SQL.ContextCallbackResult<T>>;
+
+    /**If you know what you're doing, you can use unsafe to pass any string you'd like.
+     * Please note that this can lead to SQL injection if you're not careful.
+     * You can also nest sql.unsafe within a safe sql expression. This is useful if only part of your fraction has unsafe elements.
+     * @example
+     * const result = await sql.unsafe(`select ${danger} from users where id = ${dragons}`)
+     */
+    unsafe<T = any>(string: string, values?: any[]): SQL.Query<T>;
+
+    /**
+     * Reads a file and uses the contents as a query.
+     * Optional parameters can be used if the file includes $1, $2, etc
+     * @example
+     * const result = await sql.file("query.sql", [1, 2, 3]);
+     */
+    file<T = any>(filename: string, values?: any[]): SQL.Query<T>;
+  }
+
+  /**
+   * SQL client
+   */
+  const sql: SQL;
+
+  /**
+   * SQL client for PostgreSQL
+   *
+   * @deprecated Prefer {@link Bun.sql}
+   */
+  const postgres: SQL;
+
+  /**
+   * Represents a savepoint within a transaction
+   */
+  interface SavepointSQL extends SQL {}
+}

packages/bun-types/sqlite.d.ts

@@ -24,6 +24,66 @@
  * | `null`          | `NULL`                 |
  */
 declare module "bun:sqlite" {
+  /**
+   * Options for {@link Database}
+   */
+  export interface DatabaseOptions {
+    /**
+     * Open the database as read-only (no write operations, no create).
+     *
+     * Equivalent to {@link constants.SQLITE_OPEN_READONLY}
+     */
+    readonly?: boolean;
+
+    /**
+     * Allow creating a new database
+     *
+     * Equivalent to {@link constants.SQLITE_OPEN_CREATE}
+     */
+    create?: boolean;
+
+    /**
+     * Open the database as read-write
+     *
+     * Equivalent to {@link constants.SQLITE_OPEN_READWRITE}
+     */
+    readwrite?: boolean;
+
+    /**
+     * When set to `true`, integers are returned as `bigint` types.
+     *
+     * When set to `false`, integers are returned as `number` types and truncated to 52 bits.
+     *
+     * @default false
+     * @since v1.1.14
+     */
+    safeIntegers?: boolean;
+
+    /**
+     * When set to `false` or `undefined`:
+     * - Queries missing bound parameters will NOT throw an error
+     * - Bound named parameters in JavaScript need to exactly match the SQL query.
+     *
+     * @example
+     * ```ts
+     * const db = new Database(":memory:", { strict: false });
+     * db.run("INSERT INTO foo (name) VALUES ($name)", { $name: "foo" });
+     * ```
+     *
+     * When set to `true`:
+     * - Queries missing bound parameters will throw an error
+     * - Bound named parameters in JavaScript no longer need to be `$`, `:`, or `@`. The SQL query will remain prefixed.
+     *
+     * @example
+     * ```ts
+     * const db = new Database(":memory:", { strict: true });
+     * db.run("INSERT INTO foo (name) VALUES ($name)", { name: "foo" });
+     * ```
+     * @since v1.1.14
+     */
+    strict?: boolean;
+  }
+
   /**
    * A SQLite3 database
    *
@@ -53,8 +113,6 @@ declare module "bun:sqlite" {
    * ```ts
    * const db = new Database("mydb.sqlite", {readonly: true});
    * ```
-   *
-   * @category Database
    */
   export class Database implements Disposable {
     /**
@@ -63,96 +121,19 @@ declare module "bun:sqlite" {
      * @param filename The filename of the database to open. Pass an empty string (`""`) or `":memory:"` or undefined for an in-memory database.
      * @param options defaults to `{readwrite: true, create: true}`. If a number, then it's treated as `SQLITE_OPEN_*` constant flags.
      */
-    constructor(
-      filename?: string,
-      options?:
-        | number
-        | {
-            /**
-             * Open the database as read-only (no write operations, no create).
-             *
-             * Equivalent to {@link constants.SQLITE_OPEN_READONLY}
-             */
-            readonly?: boolean;
-            /**
-             * Allow creating a new database
-             *
-             * Equivalent to {@link constants.SQLITE_OPEN_CREATE}
-             */
-            create?: boolean;
-            /**
-             * Open the database as read-write
-             *
-             * Equivalent to {@link constants.SQLITE_OPEN_READWRITE}
-             */
-            readwrite?: boolean;
-
-            /**
-             * When set to `true`, integers are returned as `bigint` types.
-             *
-             * When set to `false`, integers are returned as `number` types and truncated to 52 bits.
-             *
-             * @default false
-             * @since v1.1.14
-             */
-            safeIntegers?: boolean;
-
-            /**
-             * When set to `false` or `undefined`:
-             * - Queries missing bound parameters will NOT throw an error
-             * - Bound named parameters in JavaScript need to exactly match the SQL query.
-             *
-             * @example
-             * ```ts
-             * const db = new Database(":memory:", { strict: false });
-             * db.run("INSERT INTO foo (name) VALUES ($name)", { $name: "foo" });
-             * ```
-             *
-             * When set to `true`:
-             * - Queries missing bound parameters will throw an error
-             * - Bound named parameters in JavaScript no longer need to be `$`, `:`, or `@`. The SQL query will remain prefixed.
-             *
-             * @example
-             * ```ts
-             * const db = new Database(":memory:", { strict: true });
-             * db.run("INSERT INTO foo (name) VALUES ($name)", { name: "foo" });
-             * ```
-             * @since v1.1.14
-             */
-            strict?: boolean;
-          },
-    );
+    constructor(filename?: string, options?: number | DatabaseOptions);
 
     /**
+     * Open or create a SQLite3 databases
+     *
+     * @param filename The filename of the database to open. Pass an empty string (`""`) or `":memory:"` or undefined for an in-memory database.
+     * @param options defaults to `{readwrite: true, create: true}`. If a number, then it's treated as `SQLITE_OPEN_*` constant flags.
+     *
      * This is an alias of `new Database()`
      *
      * See {@link Database}
      */
-    static open(
-      filename: string,
-      options?:
-        | number
-        | {
-            /**
-             * Open the database as read-only (no write operations, no create).
-             *
-             * Equivalent to {@link constants.SQLITE_OPEN_READONLY}
-             */
-            readonly?: boolean;
-            /**
-             * Allow creating a new database
-             *
-             * Equivalent to {@link constants.SQLITE_OPEN_CREATE}
-             */
-            create?: boolean;
-            /**
-             * Open the database as read-write
-             *
-             * Equivalent to {@link constants.SQLITE_OPEN_READWRITE}
-             */
-            readwrite?: boolean;
-          },
-    ): Database;
+    static open(filename: string, options?: number | DatabaseOptions): Database;
 
     /**
      * Execute a SQL query **without returning any results**.
@@ -203,8 +184,11 @@ declare module "bun:sqlite" {
      * @returns `Database` instance
      */
     run<ParamsType extends SQLQueryBindings[]>(sql: string, ...bindings: ParamsType[]): Changes;
+
     /**
      * This is an alias of {@link Database.run}
+     *
+     * @deprecated Prefer {@link Database.run}
      */
     exec<ParamsType extends SQLQueryBindings[]>(sql: string, ...bindings: ParamsType[]): Changes;
 
@@ -351,6 +335,16 @@ declare module "bun:sqlite" {
      */
     static setCustomSQLite(path: string): boolean;
 
+    /**
+     * Closes the database when using the async resource proposal
+     *
+     * @example
+     * ```
+     * using db = new Database("myapp.db");
+     * doSomethingWithDatabase(db);
+     * // Automatically closed when `db` goes out of scope
+     * ```
+     */
     [Symbol.dispose](): void;
 
     /**
@@ -744,6 +738,30 @@ declare module "bun:sqlite" {
      */
     values(...params: ParamsType): Array<Array<string | bigint | number | boolean | Uint8Array>>;
 
+    /**
+     * Execute the prepared statement and return all results as arrays of
+     * `Uint8Array`s.
+     *
+     * This is similar to `values()` but returns all values as Uint8Array
+     * objects, regardless of their original SQLite type.
+     *
+     * @param params optional values to bind to the statement. If omitted, the
+     * statement is run with the last bound values or no parameters if there are
+     * none.
+     *
+     * @example
+     * ```ts
+     * const stmt = db.prepare("SELECT * FROM foo WHERE bar = ?");
+     *
+     * stmt.raw("baz");
+     * // => [[Uint8Array(24)]]
+     *
+     * stmt.raw();
+     * // => [[Uint8Array(24)]]
+     * ```
+     */
+    raw(...params: ParamsType): Array<Array<Uint8Array | null>>;
+
     /**
      * The names of the columns returned by the prepared statement.
      * @example

packages/bun-types/test-globals.d.ts

@@ -3,7 +3,7 @@
 // This file gets loaded by developers including the following triple slash directive:
 //
 // ```ts
-// /// <reference types="bun/test-globals" />
+// /// <reference types="bun-types/test-globals" />
 // ```
 
 declare var test: typeof import("bun:test").test;
@@ -19,3 +19,6 @@ declare var setDefaultTimeout: typeof import("bun:test").setDefaultTimeout;
 declare var mock: typeof import("bun:test").mock;
 declare var spyOn: typeof import("bun:test").spyOn;
 declare var jest: typeof import("bun:test").jest;
+declare var xit: typeof import("bun:test").xit;
+declare var xtest: typeof import("bun:test").xtest;
+declare var xdescribe: typeof import("bun:test").xdescribe;

packages/bun-types/test.d.ts

@@ -262,6 +262,15 @@ declare module "bun:test" {
    * @param fn the function that defines the tests
    */
   export const describe: Describe;
+  /**
+   * Skips a group of related tests.
+   *
+   * This is equivalent to calling `describe.skip()`.
+   *
+   * @param label the label for the tests
+   * @param fn the function that defines the tests
+   */
+  export const xdescribe: Describe;
   /**
    * Runs a function, once, before all the tests.
    *
@@ -515,7 +524,17 @@ declare module "bun:test" {
    * @param fn the test function
    */
   export const test: Test;
-  export { test as it };
+  export { test as it, xtest as xit };
+
+  /**
+   * Skips a test.
+   *
+   * This is equivalent to calling `test.skip()`.
+   *
+   * @param label the label for the test
+   * @param fn the test function
+   */
+  export const xtest: Test;
 
   /**
    * Asserts that a value matches some criteria.

scripts/build.mjs

@@ -5,7 +5,9 @@ import { chmodSync, cpSync, existsSync, mkdirSync, readFileSync } from "node:fs"
 import { basename, join, relative, resolve } from "node:path";
 import {
   formatAnnotationToHtml,
+  getSecret,
   isCI,
+  isWindows,
   parseAnnotations,
   printEnvironment,
   reportAnnotationToBuildKite,
@@ -214,14 +216,47 @@ function parseOptions(args, flags = []) {
 async function spawn(command, args, options, label) {
   const effectiveArgs = args.filter(Boolean);
   const description = [command, ...effectiveArgs].map(arg => (arg.includes(" ") ? JSON.stringify(arg) : arg)).join(" ");
+  let env = options?.env;
+
   console.log("$", description);
 
   label ??= basename(command);
 
   const pipe = process.env.CI === "true";
+
+  if (isBuildkite()) {
+    if (process.env.BUN_LINK_ONLY && isWindows) {
+      env ||= options?.env || { ...process.env };
+
+      // Pass signing secrets directly to the build process
+      // The PowerShell signing script will handle certificate decoding
+      env.SM_CLIENT_CERT_PASSWORD = getSecret("SM_CLIENT_CERT_PASSWORD", {
+        redact: true,
+        required: true,
+      });
+      env.SM_CLIENT_CERT_FILE = getSecret("SM_CLIENT_CERT_FILE", {
+        redact: true,
+        required: true,
+      });
+      env.SM_API_KEY = getSecret("SM_API_KEY", {
+        redact: true,
+        required: true,
+      });
+      env.SM_KEYPAIR_ALIAS = getSecret("SM_KEYPAIR_ALIAS", {
+        redact: true,
+        required: true,
+      });
+      env.SM_HOST = getSecret("SM_HOST", {
+        redact: true,
+        required: true,
+      });
+    }
+  }
+
   const subprocess = nodeSpawn(command, effectiveArgs, {
     stdio: pipe ? "pipe" : "inherit",
     ...options,
+    env,
   });
 
   let killedManually = false;

scripts/runner.node.mjs

@@ -565,6 +565,7 @@ async function runTests() {
             };
             if ((basename(execPath).includes("asan") || !isCI) && shouldValidateExceptions(testPath)) {
               env.BUN_JSC_validateExceptionChecks = "1";
+              env.BUN_JSC_dumpSimulatedThrows = "1";
             }
             return runTest(title, async () => {
               const { ok, error, stdout, crashes } = await spawnBun(execPath, {
@@ -1288,6 +1289,7 @@ async function spawnBunTest(execPath, testPath, options = { cwd }) {
   };
   if ((basename(execPath).includes("asan") || !isCI) && shouldValidateExceptions(relative(cwd, absPath))) {
     env.BUN_JSC_validateExceptionChecks = "1";
+    env.BUN_JSC_dumpSimulatedThrows = "1";
   }
 
   const { ok, error, stdout, crashes } = await spawnBun(execPath, {

scripts/vs-shell.ps1

@@ -40,7 +40,25 @@ if ($args.Count -gt 0) {
     $commandArgs = @($args[1..($args.Count - 1)] | % {$_})
   }
 
-  Write-Host "$ $command $commandArgs"
+  # Don't print the full command as it may contain sensitive information like certificates
+  # Just show the command name and basic info
+  $displayArgs = @()
+  foreach ($arg in $commandArgs) {
+    if ($arg -match "^-") {
+      # Include flags
+      $displayArgs += $arg
+    } elseif ($arg -match "\.(mjs|js|ts|cmake|zig|cpp|c|h|exe)$") {
+      # Include file names
+      $displayArgs += $arg
+    } elseif ($arg.Length -gt 100) {
+      # Truncate long arguments (likely certificates or encoded data)
+      $displayArgs += "[REDACTED]"
+    } else {
+      $displayArgs += $arg
+    }
+  }
+  
+  Write-Host "$ $command $displayArgs"
   & $command $commandArgs
   exit $LASTEXITCODE
 }

src/HTMLScanner.zig

@@ -58,7 +58,7 @@ pub fn onHTMLParseError(this: *HTMLScanner, message: []const u8) void {
         this.source,
         logger.Loc.Empty,
         message,
-    ) catch bun.outOfMemory();
+    ) catch |err| bun.handleOom(err);
 }
 
 pub fn onTag(this: *HTMLScanner, _: *lol.Element, path: []const u8, url_attribute: []const u8, kind: ImportKind) void {

src/StandaloneModuleGraph.zig

@@ -55,7 +55,7 @@ pub const StandaloneModuleGraph = struct {
 
     // by normalized file path
     pub fn find(this: *const StandaloneModuleGraph, name: []const u8) ?*File {
-        if (!isBunStandaloneFilePath(base_path)) {
+        if (!isBunStandaloneFilePath(name)) {
             return null;
         }
 
@@ -248,7 +248,7 @@ pub const StandaloneModuleGraph = struct {
                     };
 
                     const source_files = serialized.sourceFileNames();
-                    const slices = bun.default_allocator.alloc(?[]u8, source_files.len * 2) catch bun.outOfMemory();
+                    const slices = bun.handleOom(bun.default_allocator.alloc(?[]u8, source_files.len * 2));
 
                     const file_names: [][]const u8 = @ptrCast(slices[0..source_files.len]);
                     const decompressed_contents_slice = slices[source_files.len..][0..source_files.len];
@@ -348,7 +348,7 @@ pub const StandaloneModuleGraph = struct {
         var entry_point_id: ?usize = null;
         var string_builder = bun.StringBuilder{};
         var module_count: usize = 0;
-        for (output_files) |output_file| {
+        for (output_files) |*output_file| {
             string_builder.countZ(output_file.dest_path);
             string_builder.countZ(prefix);
             if (output_file.value == .buffer) {
@@ -395,7 +395,7 @@ pub const StandaloneModuleGraph = struct {
         var source_map_arena = bun.ArenaAllocator.init(allocator);
         defer source_map_arena.deinit();
 
-        for (output_files) |output_file| {
+        for (output_files) |*output_file| {
             if (!output_file.output_kind.isFileInStandaloneMode()) {
                 continue;
             }
@@ -492,15 +492,28 @@ pub const StandaloneModuleGraph = struct {
 
     const page_size = std.heap.page_size_max;
 
-    pub const InjectOptions = struct {
-        windows_hide_console: bool = false,
+    pub const InjectOptions = bun.options.WindowsOptions;
+
+    pub const CompileResult = union(enum) {
+        success: void,
+        error_message: []const u8,
+
+        pub fn fail(msg: []const u8) CompileResult {
+            return .{ .error_message = msg };
+        }
+
+        pub fn deinit(this: *const @This()) void {
+            if (this.* == .error_message) {
+                bun.default_allocator.free(this.error_message);
+            }
+        }
     };
 
     pub fn inject(bytes: []const u8, self_exe: [:0]const u8, inject_options: InjectOptions, target: *const CompileTarget) bun.FileDescriptor {
         var buf: bun.PathBuffer = undefined;
         var zname: [:0]const u8 = bun.span(bun.fs.FileSystem.instance.tmpname("bun-build", &buf, @as(u64, @bitCast(std.time.milliTimestamp()))) catch |err| {
             Output.prettyErrorln("<r><red>error<r><d>:<r> failed to get temporary file name: {s}", .{@errorName(err)});
-            Global.exit(1);
+            return bun.invalid_fd;
         });
 
         const cleanup = struct {
@@ -530,7 +543,7 @@ pub const StandaloneModuleGraph = struct {
 
                 bun.copyFile(in, out).unwrap() catch |err| {
                     Output.prettyErrorln("<r><red>error<r><d>:<r> failed to copy bun executable into temporary file: {s}", .{@errorName(err)});
-                    Global.exit(1);
+                    return bun.invalid_fd;
                 };
                 const file = bun.sys.openFileAtWindows(
                     bun.invalid_fd,
@@ -542,7 +555,7 @@ pub const StandaloneModuleGraph = struct {
                     },
                 ).unwrap() catch |e| {
                     Output.prettyErrorln("<r><red>error<r><d>:<r> failed to open temporary file to copy bun into\n{}", .{e});
-                    Global.exit(1);
+                    return bun.invalid_fd;
                 };
 
                 break :brk file;
@@ -585,7 +598,7 @@ pub const StandaloneModuleGraph = struct {
                                         std.fs.path.sep_str,
                                         zname,
                                         &.{0},
-                                    }) catch bun.outOfMemory();
+                                    }) catch |e| bun.handleOom(e);
                                     zname = zname_z[0..zname_z.len -| 1 :0];
                                     continue;
                                 }
@@ -596,7 +609,8 @@ pub const StandaloneModuleGraph = struct {
                                 }
 
                                 Output.prettyErrorln("<r><red>error<r><d>:<r> failed to open temporary file to copy bun into\n{}", .{err});
-                                Global.exit(1);
+                                // No fd to cleanup yet, just return error
+                                return bun.invalid_fd;
                             }
                         },
                     }
@@ -618,7 +632,7 @@ pub const StandaloneModuleGraph = struct {
 
                             Output.prettyErrorln("<r><red>error<r><d>:<r> failed to open bun executable to copy from as read-only\n{}", .{err});
                             cleanup(zname, fd);
-                            Global.exit(1);
+                            return bun.invalid_fd;
                         },
                     }
                 }
@@ -630,8 +644,9 @@ pub const StandaloneModuleGraph = struct {
             bun.copyFile(self_fd, fd).unwrap() catch |err| {
                 Output.prettyErrorln("<r><red>error<r><d>:<r> failed to copy bun executable into temporary file: {s}", .{@errorName(err)});
                 cleanup(zname, fd);
-                Global.exit(1);
+                return bun.invalid_fd;
             };
+
             break :brk fd;
         };
 
@@ -641,18 +656,18 @@ pub const StandaloneModuleGraph = struct {
                 if (input_result.err) |err| {
                     Output.prettyErrorln("Error reading standalone module graph: {}", .{err});
                     cleanup(zname, cloned_executable_fd);
-                    Global.exit(1);
+                    return bun.invalid_fd;
                 }
                 var macho_file = bun.macho.MachoFile.init(bun.default_allocator, input_result.bytes.items, bytes.len) catch |err| {
                     Output.prettyErrorln("Error initializing standalone module graph: {}", .{err});
                     cleanup(zname, cloned_executable_fd);
-                    Global.exit(1);
+                    return bun.invalid_fd;
                 };
                 defer macho_file.deinit();
                 macho_file.writeSection(bytes) catch |err| {
                     Output.prettyErrorln("Error writing standalone module graph: {}", .{err});
                     cleanup(zname, cloned_executable_fd);
-                    Global.exit(1);
+                    return bun.invalid_fd;
                 };
                 input_result.bytes.deinit();
 
@@ -660,7 +675,7 @@ pub const StandaloneModuleGraph = struct {
                     .err => |err| {
                         Output.prettyErrorln("Error seeking to start of temporary file: {}", .{err});
                         cleanup(zname, cloned_executable_fd);
-                        Global.exit(1);
+                        return bun.invalid_fd;
                     },
                     else => {},
                 }
@@ -668,19 +683,19 @@ pub const StandaloneModuleGraph = struct {
                 var file = bun.sys.File{ .handle = cloned_executable_fd };
                 const writer = file.writer();
                 const BufferedWriter = std.io.BufferedWriter(512 * 1024, @TypeOf(writer));
-                var buffered_writer = bun.default_allocator.create(BufferedWriter) catch bun.outOfMemory();
+                var buffered_writer = bun.handleOom(bun.default_allocator.create(BufferedWriter));
                 buffered_writer.* = .{
                     .unbuffered_writer = writer,
                 };
                 macho_file.buildAndSign(buffered_writer.writer()) catch |err| {
                     Output.prettyErrorln("Error writing standalone module graph: {}", .{err});
                     cleanup(zname, cloned_executable_fd);
-                    Global.exit(1);
+                    return bun.invalid_fd;
                 };
                 buffered_writer.flush() catch |err| {
                     Output.prettyErrorln("Error flushing standalone module graph: {}", .{err});
                     cleanup(zname, cloned_executable_fd);
-                    Global.exit(1);
+                    return bun.invalid_fd;
                 };
                 if (comptime !Environment.isWindows) {
                     _ = bun.c.fchmod(cloned_executable_fd.native(), 0o777);
@@ -692,18 +707,18 @@ pub const StandaloneModuleGraph = struct {
                 if (input_result.err) |err| {
                     Output.prettyErrorln("Error reading standalone module graph: {}", .{err});
                     cleanup(zname, cloned_executable_fd);
-                    Global.exit(1);
+                    return bun.invalid_fd;
                 }
                 var pe_file = bun.pe.PEFile.init(bun.default_allocator, input_result.bytes.items) catch |err| {
                     Output.prettyErrorln("Error initializing PE file: {}", .{err});
                     cleanup(zname, cloned_executable_fd);
-                    Global.exit(1);
+                    return bun.invalid_fd;
                 };
                 defer pe_file.deinit();
                 pe_file.addBunSection(bytes) catch |err| {
                     Output.prettyErrorln("Error adding Bun section to PE file: {}", .{err});
                     cleanup(zname, cloned_executable_fd);
-                    Global.exit(1);
+                    return bun.invalid_fd;
                 };
                 input_result.bytes.deinit();
 
@@ -711,7 +726,7 @@ pub const StandaloneModuleGraph = struct {
                     .err => |err| {
                         Output.prettyErrorln("Error seeking to start of temporary file: {}", .{err});
                         cleanup(zname, cloned_executable_fd);
-                        Global.exit(1);
+                        return bun.invalid_fd;
                     },
                     else => {},
                 }
@@ -721,7 +736,7 @@ pub const StandaloneModuleGraph = struct {
                 pe_file.write(writer) catch |err| {
                     Output.prettyErrorln("Error writing PE file: {}", .{err});
                     cleanup(zname, cloned_executable_fd);
-                    Global.exit(1);
+                    return bun.invalid_fd;
                 };
                 // Set executable permissions when running on POSIX hosts, even for Windows targets
                 if (comptime !Environment.isWindows) {
@@ -735,7 +750,7 @@ pub const StandaloneModuleGraph = struct {
                     total_byte_count = bytes.len + 8 + (Syscall.setFileOffsetToEndWindows(cloned_executable_fd).unwrap() catch |err| {
                         Output.prettyErrorln("<r><red>error<r><d>:<r> failed to seek to end of temporary file\n{}", .{err});
                         cleanup(zname, cloned_executable_fd);
-                        Global.exit(1);
+                        return bun.invalid_fd;
                     });
                 } else {
                     const seek_position = @as(u64, @intCast(brk: {
@@ -744,7 +759,7 @@ pub const StandaloneModuleGraph = struct {
                             .err => |err| {
                                 Output.prettyErrorln("{}", .{err});
                                 cleanup(zname, cloned_executable_fd);
-                                Global.exit(1);
+                                return bun.invalid_fd;
                             },
                         };
 
@@ -771,7 +786,7 @@ pub const StandaloneModuleGraph = struct {
                                 },
                             );
                             cleanup(zname, cloned_executable_fd);
-                            Global.exit(1);
+                            return bun.invalid_fd;
                         },
                         else => {},
                     }
@@ -784,8 +799,7 @@ pub const StandaloneModuleGraph = struct {
                         .err => |err| {
                             Output.prettyErrorln("<r><red>error<r><d>:<r> failed to write to temporary file\n{}", .{err});
                             cleanup(zname, cloned_executable_fd);
-
-                            Global.exit(1);
+                            return bun.invalid_fd;
                         },
                     }
                 }
@@ -800,12 +814,42 @@ pub const StandaloneModuleGraph = struct {
             },
         }
 
-        if (Environment.isWindows and inject_options.windows_hide_console) {
+        if (Environment.isWindows and inject_options.hide_console) {
             bun.windows.editWin32BinarySubsystem(.{ .handle = cloned_executable_fd }, .windows_gui) catch |err| {
                 Output.err(err, "failed to disable console on executable", .{});
                 cleanup(zname, cloned_executable_fd);
+                return bun.invalid_fd;
+            };
+        }
 
-                Global.exit(1);
+        // Set Windows icon and/or metadata if any options are provided (single operation)
+        if (Environment.isWindows and (inject_options.icon != null or
+            inject_options.title != null or
+            inject_options.publisher != null or
+            inject_options.version != null or
+            inject_options.description != null or
+            inject_options.copyright != null))
+        {
+            var zname_buf: bun.OSPathBuffer = undefined;
+            const zname_w = bun.strings.toWPathNormalized(&zname_buf, zname) catch |err| {
+                Output.err(err, "failed to resolve executable path", .{});
+                cleanup(zname, cloned_executable_fd);
+                return bun.invalid_fd;
+            };
+
+            // Single call to set all Windows metadata at once
+            bun.windows.rescle.setWindowsMetadata(
+                zname_w.ptr,
+                inject_options.icon,
+                inject_options.title,
+                inject_options.publisher,
+                inject_options.version,
+                inject_options.description,
+                inject_options.copyright,
+            ) catch |err| {
+                Output.err(err, "failed to set Windows metadata on executable", .{});
+                cleanup(zname, cloned_executable_fd);
+                return bun.invalid_fd;
             };
         }
 
@@ -821,7 +865,43 @@ pub const StandaloneModuleGraph = struct {
         var needs_download: bool = true;
         const dest_z = target.exePath(&exe_path_buf, version_str, env, &needs_download);
         if (needs_download) {
-            try target.downloadToPath(env, allocator, dest_z);
+            target.downloadToPath(env, allocator, dest_z) catch |err| {
+                // For CLI, provide detailed error messages and exit
+                switch (err) {
+                    error.TargetNotFound => {
+                        Output.errGeneric(
+                            \\Does this target and version of Bun exist?
+                            \\
+                            \\404 downloading {} from npm registry
+                        , .{target.*});
+                    },
+                    error.NetworkError => {
+                        Output.errGeneric(
+                            \\Failed to download cross-compilation target.
+                            \\
+                            \\Network error downloading {} from npm registry
+                        , .{target.*});
+                    },
+                    error.InvalidResponse => {
+                        Output.errGeneric(
+                            \\Failed to verify the integrity of the downloaded tarball.
+                            \\
+                            \\The downloaded content for {} appears to be corrupted
+                        , .{target.*});
+                    },
+                    error.ExtractionFailed => {
+                        Output.errGeneric(
+                            \\Failed to extract the downloaded tarball.
+                            \\
+                            \\Could not extract executable for {}
+                        , .{target.*});
+                    },
+                    else => {
+                        Output.errGeneric("Failed to download {}: {s}", .{ target.*, @errorName(err) });
+                    },
+                }
+                return error.DownloadFailed;
+            };
         }
 
         return try allocator.dupeZ(u8, dest_z);
@@ -836,30 +916,69 @@ pub const StandaloneModuleGraph = struct {
         outfile: []const u8,
         env: *bun.DotEnv.Loader,
         output_format: bun.options.Format,
-        windows_hide_console: bool,
-        windows_icon: ?[]const u8,
+        windows_options: bun.options.WindowsOptions,
         compile_exec_argv: []const u8,
-    ) !void {
-        const bytes = try toBytes(allocator, module_prefix, output_files, output_format, compile_exec_argv);
-        if (bytes.len == 0) return;
+        self_exe_path: ?[]const u8,
+    ) !CompileResult {
+        const bytes = toBytes(allocator, module_prefix, output_files, output_format, compile_exec_argv) catch |err| {
+            return CompileResult.fail(std.fmt.allocPrint(allocator, "failed to generate module graph bytes: {s}", .{@errorName(err)}) catch "failed to generate module graph bytes");
+        };
+        if (bytes.len == 0) return CompileResult.fail("no output files to bundle");
+        defer allocator.free(bytes);
 
-        const fd = inject(
+        var free_self_exe = false;
+        const self_exe = if (self_exe_path) |path| brk: {
+            free_self_exe = true;
+            break :brk bun.handleOom(allocator.dupeZ(u8, path));
+        } else if (target.isDefault())
+            bun.selfExePath() catch |err| {
+                return CompileResult.fail(std.fmt.allocPrint(allocator, "failed to get self executable path: {s}", .{@errorName(err)}) catch "failed to get self executable path");
+            }
+        else blk: {
+            var exe_path_buf: bun.PathBuffer = undefined;
+            var version_str_buf: [1024]u8 = undefined;
+            const version_str = std.fmt.bufPrintZ(&version_str_buf, "{}", .{target}) catch {
+                return CompileResult.fail("failed to format target version string");
+            };
+            var needs_download: bool = true;
+            const dest_z = target.exePath(&exe_path_buf, version_str, env, &needs_download);
+
+            if (needs_download) {
+                target.downloadToPath(env, allocator, dest_z) catch |err| {
+                    const msg = switch (err) {
+                        error.TargetNotFound => std.fmt.allocPrint(allocator, "Target platform '{}' is not available for download. Check if this version of Bun supports this target.", .{target}) catch "Target platform not available for download",
+                        error.NetworkError => std.fmt.allocPrint(allocator, "Network error downloading executable for '{}'. Check your internet connection and proxy settings.", .{target}) catch "Network error downloading executable",
+                        error.InvalidResponse => std.fmt.allocPrint(allocator, "Downloaded file for '{}' appears to be corrupted. Please try again.", .{target}) catch "Downloaded file is corrupted",
+                        error.ExtractionFailed => std.fmt.allocPrint(allocator, "Failed to extract executable for '{}'. The download may be incomplete.", .{target}) catch "Failed to extract downloaded executable",
+                        error.UnsupportedTarget => std.fmt.allocPrint(allocator, "Target '{}' is not supported", .{target}) catch "Unsupported target",
+                        else => std.fmt.allocPrint(allocator, "Failed to download '{}': {s}", .{ target, @errorName(err) }) catch "Download failed",
+                    };
+                    return CompileResult.fail(msg);
+                };
+            }
+
+            free_self_exe = true;
+            break :blk bun.handleOom(allocator.dupeZ(u8, dest_z));
+        };
+
+        defer if (free_self_exe) {
+            allocator.free(self_exe);
+        };
+
+        var fd = inject(
             bytes,
-            if (target.isDefault())
-                bun.selfExePath() catch |err| {
-                    Output.err(err, "failed to get self executable path", .{});
-                    Global.exit(1);
-                }
-            else
-                download(allocator, target, env) catch |err| {
-                    Output.err(err, "failed to download cross-compiled bun executable", .{});
-                    Global.exit(1);
-                },
-            .{ .windows_hide_console = windows_hide_console },
+            self_exe,
+            windows_options,
             target,
         );
+        defer if (fd != bun.invalid_fd) fd.close();
         bun.debugAssert(fd.kind == .system);
 
+        if (Environment.isPosix) {
+            // Set executable permissions (0o755 = rwxr-xr-x) - makes it executable for owner, readable/executable for group and others
+            _ = Syscall.fchmod(fd, 0o755);
+        }
+
         if (Environment.isWindows) {
             var outfile_buf: bun.OSPathBuffer = undefined;
             const outfile_slice = brk: {
@@ -871,52 +990,89 @@ pub const StandaloneModuleGraph = struct {
             };
 
             bun.windows.moveOpenedFileAtLoose(fd, .fromStdDir(root_dir), outfile_slice, true).unwrap() catch |err| {
-                if (err == error.EISDIR) {
-                    Output.errGeneric("{} is a directory. Please choose a different --outfile or delete the directory", .{bun.fmt.utf16(outfile_slice)});
-                } else {
-                    Output.err(err, "failed to move executable to result path", .{});
-                }
-
                 _ = bun.windows.deleteOpenedFile(fd);
-
-                Global.exit(1);
+                if (err == error.EISDIR) {
+                    return CompileResult.fail(std.fmt.allocPrint(allocator, "{s} is a directory. Please choose a different --outfile or delete the directory", .{outfile}) catch "outfile is a directory");
+                } else {
+                    return CompileResult.fail(std.fmt.allocPrint(allocator, "failed to move executable to result path: {s}", .{@errorName(err)}) catch "failed to move executable");
+                }
             };
-            fd.close();
 
-            if (windows_icon) |icon_utf8| {
-                var icon_buf: bun.OSPathBuffer = undefined;
-                const icon = bun.strings.toWPathNormalized(&icon_buf, icon_utf8);
-                bun.windows.rescle.setIcon(outfile_slice, icon) catch {
-                    Output.warn("Failed to set executable icon", .{});
+            fd.close();
+            fd = bun.invalid_fd;
+
+            // Set Windows icon and/or metadata using unified function
+            if (windows_options.icon != null or
+                windows_options.title != null or
+                windows_options.publisher != null or
+                windows_options.version != null or
+                windows_options.description != null or
+                windows_options.copyright != null)
+            {
+                // Need to get the full path to the executable
+                var full_path_buf: bun.OSPathBuffer = undefined;
+                const full_path = brk: {
+                    // Get the directory path
+                    var dir_buf: bun.PathBuffer = undefined;
+                    const dir_path = bun.getFdPath(bun.FD.fromStdDir(root_dir), &dir_buf) catch |err| {
+                        return CompileResult.fail(std.fmt.allocPrint(allocator, "Failed to get directory path: {s}", .{@errorName(err)}) catch "Failed to get directory path");
+                    };
+
+                    // Join with the outfile name
+                    const full_path_str = bun.path.joinAbsString(dir_path, &[_][]const u8{outfile}, .auto);
+                    const full_path_w = bun.strings.toWPathNormalized(&full_path_buf, full_path_str);
+                    const buf_u16 = bun.reinterpretSlice(u16, &full_path_buf);
+                    buf_u16[full_path_w.len] = 0;
+                    break :brk buf_u16[0..full_path_w.len :0];
+                };
+
+                bun.windows.rescle.setWindowsMetadata(
+                    full_path.ptr,
+                    windows_options.icon,
+                    windows_options.title,
+                    windows_options.publisher,
+                    windows_options.version,
+                    windows_options.description,
+                    windows_options.copyright,
+                ) catch |err| {
+                    return CompileResult.fail(std.fmt.allocPrint(allocator, "Failed to set Windows metadata: {s}", .{@errorName(err)}) catch "Failed to set Windows metadata");
                 };
             }
-            return;
+            return .success;
         }
 
         var buf: bun.PathBuffer = undefined;
         const temp_location = bun.getFdPath(fd, &buf) catch |err| {
-            Output.prettyErrorln("<r><red>error<r><d>:<r> failed to get path for fd: {s}", .{@errorName(err)});
-            Global.exit(1);
+            return CompileResult.fail(std.fmt.allocPrint(allocator, "failed to get path for fd: {s}", .{@errorName(err)}) catch "failed to get path for file descriptor");
+        };
+        const temp_posix = std.posix.toPosixPath(temp_location) catch |err| {
+            return CompileResult.fail(std.fmt.allocPrint(allocator, "path too long: {s}", .{@errorName(err)}) catch "path too long");
+        };
+        const outfile_basename = std.fs.path.basename(outfile);
+        const outfile_posix = std.posix.toPosixPath(outfile_basename) catch |err| {
+            return CompileResult.fail(std.fmt.allocPrint(allocator, "outfile name too long: {s}", .{@errorName(err)}) catch "outfile name too long");
         };
 
         bun.sys.moveFileZWithHandle(
             fd,
             bun.FD.cwd(),
-            bun.sliceTo(&(try std.posix.toPosixPath(temp_location)), 0),
+            bun.sliceTo(&temp_posix, 0),
             .fromStdDir(root_dir),
-            bun.sliceTo(&(try std.posix.toPosixPath(std.fs.path.basename(outfile))), 0),
+            bun.sliceTo(&outfile_posix, 0),
         ) catch |err| {
-            if (err == error.IsDir or err == error.EISDIR) {
-                Output.prettyErrorln("<r><red>error<r><d>:<r> {} is a directory. Please choose a different --outfile or delete the directory", .{bun.fmt.quote(outfile)});
-            } else {
-                Output.prettyErrorln("<r><red>error<r><d>:<r> failed to rename {s} to {s}: {s}", .{ temp_location, outfile, @errorName(err) });
-            }
-            _ = Syscall.unlink(
-                &(try std.posix.toPosixPath(temp_location)),
-            );
+            fd.close();
+            fd = bun.invalid_fd;
 
-            Global.exit(1);
+            _ = Syscall.unlink(&temp_posix);
+
+            if (err == error.IsDir or err == error.EISDIR) {
+                return CompileResult.fail(std.fmt.allocPrint(allocator, "{s} is a directory. Please choose a different --outfile or delete the directory", .{outfile}) catch "outfile is a directory");
+            } else {
+                return CompileResult.fail(std.fmt.allocPrint(allocator, "failed to rename {s} to {s}: {s}", .{ temp_location, outfile, @errorName(err) }) catch "failed to rename file");
+            }
         };
+
+        return .success;
     }
 
     pub fn fromExecutable(allocator: std.mem.Allocator) !?StandaloneModuleGraph {
@@ -1202,7 +1358,7 @@ pub const StandaloneModuleGraph = struct {
                 const compressed_file = compressed_codes[@intCast(index)].slice(this.map.bytes);
                 const size = bun.zstd.getDecompressedSize(compressed_file);
 
-                const bytes = bun.default_allocator.alloc(u8, size) catch bun.outOfMemory();
+                const bytes = bun.handleOom(bun.default_allocator.alloc(u8, size));
                 const result = bun.zstd.decompress(bytes, compressed_file);
 
                 if (result == .err) {
@@ -1322,7 +1478,6 @@ const w = std.os.windows;
 
 const bun = @import("bun");
 const Environment = bun.Environment;
-const Global = bun.Global;
 const Output = bun.Output;
 const SourceMap = bun.sourcemap;
 const StringPointer = bun.StringPointer;

src/Watcher.zig

@@ -322,7 +322,7 @@ fn appendFileAssumeCapacity(
     const watchlist_id = this.watchlist.len;
 
     const file_path_: string = if (comptime clone_file_path)
-        bun.asByteSlice(this.allocator.dupeZ(u8, file_path) catch bun.outOfMemory())
+        bun.asByteSlice(bun.handleOom(this.allocator.dupeZ(u8, file_path)))
     else
         file_path;
 
@@ -409,7 +409,7 @@ fn appendDirectoryAssumeCapacity(
     };
 
     const file_path_: string = if (comptime clone_file_path)
-        bun.asByteSlice(this.allocator.dupeZ(u8, file_path) catch bun.outOfMemory())
+        bun.asByteSlice(bun.handleOom(this.allocator.dupeZ(u8, file_path)))
     else
         file_path;
 
@@ -529,7 +529,7 @@ pub fn appendFileMaybeLock(
             }
         }
     }
-    this.watchlist.ensureUnusedCapacity(this.allocator, 1 + @as(usize, @intCast(@intFromBool(parent_watch_item == null)))) catch bun.outOfMemory();
+    bun.handleOom(this.watchlist.ensureUnusedCapacity(this.allocator, 1 + @as(usize, @intCast(@intFromBool(parent_watch_item == null)))));
 
     if (autowatch_parent_dir) {
         parent_watch_item = parent_watch_item orelse switch (this.appendDirectoryAssumeCapacity(dir_fd, parent_dir, parent_dir_hash, clone_file_path)) {
@@ -595,7 +595,7 @@ pub fn addDirectory(
         return .{ .result = @truncate(idx) };
     }
 
-    this.watchlist.ensureUnusedCapacity(this.allocator, 1) catch bun.outOfMemory();
+    bun.handleOom(this.watchlist.ensureUnusedCapacity(this.allocator, 1));
 
     return this.appendDirectoryAssumeCapacity(fd, file_path, hash, clone_file_path);
 }

src/allocators.zig

@@ -244,7 +244,7 @@ pub fn BSSList(comptime ValueType: type, comptime _count: anytype) type {
 
         pub fn init(allocator: std.mem.Allocator) *Self {
             if (!loaded) {
-                instance = bun.default_allocator.create(Self) catch bun.outOfMemory();
+                instance = bun.handleOom(bun.default_allocator.create(Self));
                 // Avoid struct initialization syntax.
                 // This makes Bun start about 1ms faster.
                 // https://github.com/ziglang/zig/issues/24313
@@ -330,7 +330,7 @@ pub fn BSSStringList(comptime _count: usize, comptime _item_length: usize) type
 
         pub fn init(allocator: std.mem.Allocator) *Self {
             if (!loaded) {
-                instance = bun.default_allocator.create(Self) catch bun.outOfMemory();
+                instance = bun.handleOom(bun.default_allocator.create(Self));
                 // Avoid struct initialization syntax.
                 // This makes Bun start about 1ms faster.
                 // https://github.com/ziglang/zig/issues/24313
@@ -513,7 +513,7 @@ pub fn BSSMap(comptime ValueType: type, comptime count: anytype, comptime store_
                 // Avoid struct initialization syntax.
                 // This makes Bun start about 1ms faster.
                 // https://github.com/ziglang/zig/issues/24313
-                instance = bun.default_allocator.create(Self) catch bun.outOfMemory();
+                instance = bun.handleOom(bun.default_allocator.create(Self));
                 instance.index = IndexMap{};
                 instance.allocator = allocator;
                 instance.overflow_list.zero();
@@ -666,7 +666,7 @@ pub fn BSSMap(comptime ValueType: type, comptime count: anytype, comptime store_
 
         pub fn init(allocator: std.mem.Allocator) *Self {
             if (!instance_loaded) {
-                instance = bun.default_allocator.create(Self) catch bun.outOfMemory();
+                instance = bun.handleOom(bun.default_allocator.create(Self));
                 // Avoid struct initialization syntax.
                 // This makes Bun start about 1ms faster.
                 // https://github.com/ziglang/zig/issues/24313

src/allocators/AllocationScope.zig

@@ -1,19 +1,24 @@
 //! AllocationScope wraps another allocator, providing leak and invalid free assertions.
 //! It also allows measuring how much memory a scope has allocated.
+//!
+//! AllocationScope is conceptually a pointer, so it can be moved without invalidating allocations.
+//! Therefore, it isn't necessary to pass an AllocationScope by pointer.
 
-const AllocationScope = @This();
+const Self = @This();
 
 pub const enabled = bun.Environment.enableAllocScopes;
 
-parent: Allocator,
-state: if (enabled) struct {
+internal_state: if (enabled) *State else Allocator,
+
+const State = struct {
+    parent: Allocator,
     mutex: bun.Mutex,
     total_memory_allocated: usize,
     allocations: std.AutoHashMapUnmanaged([*]const u8, Allocation),
     frees: std.AutoArrayHashMapUnmanaged([*]const u8, Free),
     /// Once `frees` fills up, entries are overwritten from start to end.
     free_overwrite_index: std.math.IntFittingRange(0, max_free_tracking + 1),
-} else void,
+};
 
 pub const max_free_tracking = 2048 - 1;
 
@@ -36,55 +41,72 @@ pub const Extra = union(enum) {
     const RefCountDebugData = @import("../ptr/ref_count.zig").DebugData;
 };
 
-pub fn init(parent: Allocator) AllocationScope {
-    return if (comptime enabled)
-        .{
-            .parent = parent,
-            .state = .{
-                .total_memory_allocated = 0,
-                .allocations = .empty,
-                .frees = .empty,
-                .free_overwrite_index = 0,
-                .mutex = .{},
-            },
-        }
+pub fn init(parent_alloc: Allocator) Self {
+    const state = if (comptime enabled)
+        bun.new(State, .{
+            .parent = parent_alloc,
+            .total_memory_allocated = 0,
+            .allocations = .empty,
+            .frees = .empty,
+            .free_overwrite_index = 0,
+            .mutex = .{},
+        })
     else
-        .{ .parent = parent, .state = {} };
+        parent_alloc;
+    return .{ .internal_state = state };
 }
 
-pub fn deinit(scope: *AllocationScope) void {
-    if (comptime enabled) {
-        scope.state.mutex.lock();
-        defer scope.state.allocations.deinit(scope.parent);
-        const count = scope.state.allocations.count();
-        if (count == 0) return;
-        Output.errGeneric("Allocation scope leaked {d} allocations ({})", .{
-            count,
-            bun.fmt.size(scope.state.total_memory_allocated, .{}),
-        });
-        var it = scope.state.allocations.iterator();
-        var n: usize = 0;
-        while (it.next()) |entry| {
-            Output.prettyErrorln("- {any}, len {d}, at:", .{ entry.key_ptr.*, entry.value_ptr.len });
-            bun.crash_handler.dumpStackTrace(entry.value_ptr.allocated_at.trace(), trace_limits);
+pub fn deinit(scope: Self) void {
+    if (comptime !enabled) return;
 
-            switch (entry.value_ptr.extra) {
-                .none => {},
-                inline else => |t| t.onAllocationLeak(@constCast(entry.key_ptr.*[0..entry.value_ptr.len])),
-            }
+    const state = scope.internal_state;
+    state.mutex.lock();
+    defer bun.destroy(state);
+    defer state.allocations.deinit(state.parent);
+    const count = state.allocations.count();
+    if (count == 0) return;
+    Output.errGeneric("Allocation scope leaked {d} allocations ({})", .{
+        count,
+        bun.fmt.size(state.total_memory_allocated, .{}),
+    });
+    var it = state.allocations.iterator();
+    var n: usize = 0;
+    while (it.next()) |entry| {
+        Output.prettyErrorln("- {any}, len {d}, at:", .{ entry.key_ptr.*, entry.value_ptr.len });
+        bun.crash_handler.dumpStackTrace(entry.value_ptr.allocated_at.trace(), trace_limits);
 
-            n += 1;
-            if (n >= 8) {
-                Output.prettyErrorln("(only showing first 10 leaks)", .{});
-                break;
-            }
+        switch (entry.value_ptr.extra) {
+            .none => {},
+            inline else => |t| t.onAllocationLeak(@constCast(entry.key_ptr.*[0..entry.value_ptr.len])),
+        }
+
+        n += 1;
+        if (n >= 8) {
+            Output.prettyErrorln("(only showing first 10 leaks)", .{});
+            break;
         }
-        Output.panic("Allocation scope leaked {}", .{bun.fmt.size(scope.state.total_memory_allocated, .{})});
     }
+    Output.panic("Allocation scope leaked {}", .{bun.fmt.size(state.total_memory_allocated, .{})});
 }
 
-pub fn allocator(scope: *AllocationScope) Allocator {
-    return if (comptime enabled) .{ .ptr = scope, .vtable = &vtable } else scope.parent;
+pub fn allocator(scope: Self) Allocator {
+    const state = scope.internal_state;
+    return if (comptime enabled) .{ .ptr = state, .vtable = &vtable } else state;
+}
+
+pub fn parent(scope: Self) Allocator {
+    const state = scope.internal_state;
+    return if (comptime enabled) state.parent else state;
+}
+
+pub fn total(self: Self) usize {
+    if (comptime !enabled) @compileError("AllocationScope must be enabled");
+    return self.internal_state.total_memory_allocated;
+}
+
+pub fn numAllocations(self: Self) usize {
+    if (comptime !enabled) @compileError("AllocationScope must be enabled");
+    return self.internal_state.allocations.count();
 }
 
 const vtable: Allocator.VTable = .{
@@ -107,60 +129,61 @@ pub const free_trace_limits: bun.crash_handler.WriteStackTraceLimits = .{
 };
 
 fn alloc(ctx: *anyopaque, len: usize, alignment: std.mem.Alignment, ret_addr: usize) ?[*]u8 {
-    const scope: *AllocationScope = @ptrCast(@alignCast(ctx));
-    scope.state.mutex.lock();
-    defer scope.state.mutex.unlock();
-    scope.state.allocations.ensureUnusedCapacity(scope.parent, 1) catch
+    const state: *State = @ptrCast(@alignCast(ctx));
+
+    state.mutex.lock();
+    defer state.mutex.unlock();
+    state.allocations.ensureUnusedCapacity(state.parent, 1) catch
         return null;
-    const result = scope.parent.vtable.alloc(scope.parent.ptr, len, alignment, ret_addr) orelse
+    const result = state.parent.vtable.alloc(state.parent.ptr, len, alignment, ret_addr) orelse
         return null;
-    scope.trackAllocationAssumeCapacity(result[0..len], ret_addr, .none);
+    trackAllocationAssumeCapacity(state, result[0..len], ret_addr, .none);
     return result;
 }
 
-fn trackAllocationAssumeCapacity(scope: *AllocationScope, buf: []const u8, ret_addr: usize, extra: Extra) void {
+fn trackAllocationAssumeCapacity(state: *State, buf: []const u8, ret_addr: usize, extra: Extra) void {
     const trace = StoredTrace.capture(ret_addr);
-    scope.state.allocations.putAssumeCapacityNoClobber(buf.ptr, .{
+    state.allocations.putAssumeCapacityNoClobber(buf.ptr, .{
         .allocated_at = trace,
         .len = buf.len,
         .extra = extra,
     });
-    scope.state.total_memory_allocated += buf.len;
+    state.total_memory_allocated += buf.len;
 }
 
 fn free(ctx: *anyopaque, buf: []u8, alignment: std.mem.Alignment, ret_addr: usize) void {
-    const scope: *AllocationScope = @ptrCast(@alignCast(ctx));
-    scope.state.mutex.lock();
-    defer scope.state.mutex.unlock();
-    const invalid = scope.trackFreeAssumeLocked(buf, ret_addr);
+    const state: *State = @ptrCast(@alignCast(ctx));
+    state.mutex.lock();
+    defer state.mutex.unlock();
+    const invalid = trackFreeAssumeLocked(state, buf, ret_addr);
 
-    scope.parent.vtable.free(scope.parent.ptr, buf, alignment, ret_addr);
+    state.parent.vtable.free(state.parent.ptr, buf, alignment, ret_addr);
 
     // If asan did not catch the free, panic now.
     if (invalid) @panic("Invalid free");
 }
 
-fn trackFreeAssumeLocked(scope: *AllocationScope, buf: []const u8, ret_addr: usize) bool {
-    if (scope.state.allocations.fetchRemove(buf.ptr)) |entry| {
-        scope.state.total_memory_allocated -= entry.value.len;
+fn trackFreeAssumeLocked(state: *State, buf: []const u8, ret_addr: usize) bool {
+    if (state.allocations.fetchRemove(buf.ptr)) |entry| {
+        state.total_memory_allocated -= entry.value.len;
 
         free_entry: {
-            scope.state.frees.put(scope.parent, buf.ptr, .{
+            state.frees.put(state.parent, buf.ptr, .{
                 .allocated_at = entry.value.allocated_at,
                 .freed_at = StoredTrace.capture(ret_addr),
             }) catch break :free_entry;
             // Store a limited amount of free entries
-            if (scope.state.frees.count() >= max_free_tracking) {
-                const i = scope.state.free_overwrite_index;
-                scope.state.free_overwrite_index = @mod(scope.state.free_overwrite_index + 1, max_free_tracking);
-                scope.state.frees.swapRemoveAt(i);
+            if (state.frees.count() >= max_free_tracking) {
+                const i = state.free_overwrite_index;
+                state.free_overwrite_index = @mod(state.free_overwrite_index + 1, max_free_tracking);
+                state.frees.swapRemoveAt(i);
             }
         }
         return false;
     } else {
         bun.Output.errGeneric("Invalid free, pointer {any}, len {d}", .{ buf.ptr, buf.len });
 
-        if (scope.state.frees.get(buf.ptr)) |free_entry_const| {
+        if (state.frees.get(buf.ptr)) |free_entry_const| {
             var free_entry = free_entry_const;
             bun.Output.printErrorln("Pointer allocated here:", .{});
             bun.crash_handler.dumpStackTrace(free_entry.allocated_at.trace(), trace_limits);
@@ -176,27 +199,29 @@ fn trackFreeAssumeLocked(scope: *AllocationScope, buf: []const u8, ret_addr: usi
     }
 }
 
-pub fn assertOwned(scope: *AllocationScope, ptr: anytype) void {
+pub fn assertOwned(scope: Self, ptr: anytype) void {
     if (comptime !enabled) return;
     const cast_ptr: [*]const u8 = @ptrCast(switch (@typeInfo(@TypeOf(ptr)).pointer.size) {
         .c, .one, .many => ptr,
         .slice => if (ptr.len > 0) ptr.ptr else return,
     });
-    scope.state.mutex.lock();
-    defer scope.state.mutex.unlock();
-    _ = scope.state.allocations.getPtr(cast_ptr) orelse
+    const state = scope.internal_state;
+    state.mutex.lock();
+    defer state.mutex.unlock();
+    _ = state.allocations.getPtr(cast_ptr) orelse
         @panic("this pointer was not owned by the allocation scope");
 }
 
-pub fn assertUnowned(scope: *AllocationScope, ptr: anytype) void {
+pub fn assertUnowned(scope: Self, ptr: anytype) void {
     if (comptime !enabled) return;
     const cast_ptr: [*]const u8 = @ptrCast(switch (@typeInfo(@TypeOf(ptr)).pointer.size) {
         .c, .one, .many => ptr,
         .slice => if (ptr.len > 0) ptr.ptr else return,
     });
-    scope.state.mutex.lock();
-    defer scope.state.mutex.unlock();
-    if (scope.state.allocations.getPtr(cast_ptr)) |owned| {
+    const state = scope.internal_state;
+    state.mutex.lock();
+    defer state.mutex.unlock();
+    if (state.allocations.getPtr(cast_ptr)) |owned| {
         Output.warn("Owned pointer allocated here:");
         bun.crash_handler.dumpStackTrace(owned.allocated_at.trace(), trace_limits, trace_limits);
     }
@@ -205,17 +230,18 @@ pub fn assertUnowned(scope: *AllocationScope, ptr: anytype) void {
 
 /// Track an arbitrary pointer. Extra data can be stored in the allocation,
 /// which will be printed when a leak is detected.
-pub fn trackExternalAllocation(scope: *AllocationScope, ptr: []const u8, ret_addr: ?usize, extra: Extra) void {
+pub fn trackExternalAllocation(scope: Self, ptr: []const u8, ret_addr: ?usize, extra: Extra) void {
     if (comptime !enabled) return;
-    scope.state.mutex.lock();
-    defer scope.state.mutex.unlock();
-    scope.state.allocations.ensureUnusedCapacity(scope.parent, 1) catch bun.outOfMemory();
-    trackAllocationAssumeCapacity(scope, ptr, ptr.len, ret_addr orelse @returnAddress(), extra);
+    const state = scope.internal_state;
+    state.mutex.lock();
+    defer state.mutex.unlock();
+    bun.handleOom(state.allocations.ensureUnusedCapacity(state.parent, 1));
+    trackAllocationAssumeCapacity(state, ptr, ptr.len, ret_addr orelse @returnAddress(), extra);
 }
 
 /// Call when the pointer from `trackExternalAllocation` is freed.
 /// Returns true if the free was invalid.
-pub fn trackExternalFree(scope: *AllocationScope, slice: anytype, ret_addr: ?usize) bool {
+pub fn trackExternalFree(scope: Self, slice: anytype, ret_addr: ?usize) bool {
     if (comptime !enabled) return false;
     const ptr: []const u8 = switch (@typeInfo(@TypeOf(slice))) {
         .pointer => |p| switch (p.size) {
@@ -231,23 +257,25 @@ pub fn trackExternalFree(scope: *AllocationScope, slice: anytype, ret_addr: ?usi
     };
     // Empty slice usually means invalid pointer
     if (ptr.len == 0) return false;
-    scope.state.mutex.lock();
-    defer scope.state.mutex.unlock();
-    return trackFreeAssumeLocked(scope, ptr, ret_addr orelse @returnAddress());
+    const state = scope.internal_state;
+    state.mutex.lock();
+    defer state.mutex.unlock();
+    return trackFreeAssumeLocked(state, ptr, ret_addr orelse @returnAddress());
 }
 
-pub fn setPointerExtra(scope: *AllocationScope, ptr: *anyopaque, extra: Extra) void {
+pub fn setPointerExtra(scope: Self, ptr: *anyopaque, extra: Extra) void {
     if (comptime !enabled) return;
-    scope.state.mutex.lock();
-    defer scope.state.mutex.unlock();
-    const allocation = scope.state.allocations.getPtr(ptr) orelse
+    const state = scope.internal_state;
+    state.mutex.lock();
+    defer state.mutex.unlock();
+    const allocation = state.allocations.getPtr(ptr) orelse
         @panic("Pointer not owned by allocation scope");
     allocation.extra = extra;
 }
 
-pub inline fn downcast(a: Allocator) ?*AllocationScope {
+pub inline fn downcast(a: Allocator) ?Self {
     return if (enabled and a.vtable == &vtable)
-        @ptrCast(@alignCast(a.ptr))
+        .{ .internal_state = @ptrCast(@alignCast(a.ptr)) }
     else
         null;
 }

src/analytics.zig

@@ -112,6 +112,7 @@ pub const Features = struct {
     pub var unsupported_uv_function: usize = 0;
     pub var exited: usize = 0;
     pub var yarn_migration: usize = 0;
+    pub var yaml_parse: usize = 0;
 
     comptime {
         @export(&napi_module_register, .{ .name = "Bun__napi_module_register_count" });

src/api/schema.d.ts

@@ -21,46 +21,58 @@ export const enum Loader {
   css = 5,
   file = 6,
   json = 7,
-  toml = 8,
-  wasm = 9,
-  napi = 10,
-  base64 = 11,
-  dataurl = 12,
-  text = 13,
-  sqlite = 14,
-  html = 15,
+  jsonc = 8,
+  toml = 9,
+  wasm = 10,
+  napi = 11,
+  base64 = 12,
+  dataurl = 13,
+  text = 14,
+  bunsh = 15,
+  sqlite = 16,
+  sqlite_embedded = 17,
+  html = 18,
+  yaml = 19,
 }
 export const LoaderKeys: {
   1: "jsx";
-  jsx: "jsx";
   2: "js";
-  js: "js";
   3: "ts";
-  ts: "ts";
   4: "tsx";
-  tsx: "tsx";
   5: "css";
-  css: "css";
   6: "file";
-  file: "file";
   7: "json";
-  json: "json";
-  8: "toml";
-  toml: "toml";
-  9: "wasm";
-  wasm: "wasm";
-  10: "napi";
-  napi: "napi";
-  11: "base64";
-  base64: "base64";
-  12: "dataurl";
-  dataurl: "dataurl";
-  13: "text";
-  text: "text";
-  14: "sqlite";
-  sqlite: "sqlite";
-  15: "html";
-  "html": "html";
+  8: "jsonc";
+  9: "toml";
+  10: "wasm";
+  11: "napi";
+  12: "base64";
+  13: "dataurl";
+  14: "text";
+  15: "bunsh";
+  16: "sqlite";
+  17: "sqlite_embedded";
+  18: "html";
+  19: "yaml";
+  jsx: 1;
+  js: 2;
+  ts: 3;
+  tsx: 4;
+  css: 5;
+  file: 6;
+  json: 7;
+  jsonc: 8;
+  toml: 9;
+  wasm: 10;
+  napi: 11;
+  base64: 12;
+  dataurl: 13;
+  text: 14;
+  bunsh: 15;
+  sqlite: 16;
+  sqlite_embedded: 17;
+  html: 18;
+  yaml: 19;
 };
 export const enum FrameworkEntryPointType {
   client = 1,

src/api/schema.js

@@ -1,34 +1,42 @@
 const Loader = {
-  "1": 1,
-  "2": 2,
-  "3": 3,
-  "4": 4,
-  "5": 5,
-  "6": 6,
-  "7": 7,
-  "8": 8,
-  "9": 9,
-  "10": 10,
-  "11": 11,
-  "12": 12,
-  "13": 13,
-  "14": 14,
-  "15": 15,
-  "jsx": 1,
-  "js": 2,
-  "ts": 3,
-  "tsx": 4,
-  "css": 5,
-  "file": 6,
-  "json": 7,
-  "toml": 8,
-  "wasm": 9,
-  "napi": 10,
-  "base64": 11,
-  "dataurl": 12,
-  "text": 13,
-  "sqlite": 14,
-  "html": 15,
+  "1": "jsx",
+  "2": "js",
+  "3": "ts",
+  "4": "tsx",
+  "5": "css",
+  "6": "file",
+  "7": "json",
+  "8": "jsonc",
+  "9": "toml",
+  "10": "wasm",
+  "11": "napi",
+  "12": "base64",
+  "13": "dataurl",
+  "14": "text",
+  "15": "bunsh",
+  "16": "sqlite",
+  "17": "sqlite_embedded",
+  "18": "html",
+  "19": "yaml",
+  jsx: 1,
+  js: 2,
+  ts: 3,
+  tsx: 4,
+  css: 5,
+  file: 6,
+  json: 7,
+  jsonc: 8,
+  toml: 9,
+  wasm: 10,
+  napi: 11,
+  base64: 12,
+  dataurl: 13,
+  text: 14,
+  bunsh: 15,
+  sqlite: 16,
+  sqlite_embedded: 17,
+  html: 18,
+  yaml: 19,
 };
 const LoaderKeys = {
   "1": "jsx",
@@ -38,29 +46,37 @@ const LoaderKeys = {
   "5": "css",
   "6": "file",
   "7": "json",
-  "8": "toml",
-  "9": "wasm",
-  "10": "napi",
-  "11": "base64",
-  "12": "dataurl",
-  "13": "text",
-  "14": "sqlite",
-  "15": "html",
-  "jsx": "jsx",
-  "js": "js",
-  "ts": "ts",
-  "tsx": "tsx",
-  "css": "css",
-  "file": "file",
-  "json": "json",
-  "toml": "toml",
-  "wasm": "wasm",
-  "napi": "napi",
-  "base64": "base64",
-  "dataurl": "dataurl",
-  "text": "text",
-  "sqlite": "sqlite",
-  "html": "html",
+  "8": "jsonc",
+  "9": "toml",
+  "10": "wasm",
+  "11": "napi",
+  "12": "base64",
+  "13": "dataurl",
+  "14": "text",
+  "15": "bunsh",
+  "16": "sqlite",
+  "17": "sqlite_embedded",
+  "18": "html",
+  "19": "yaml",
+  jsx: "jsx",
+  js: "js",
+  ts: "ts",
+  tsx: "tsx",
+  css: "css",
+  file: "file",
+  json: "json",
+  jsonc: "jsonc",
+  toml: "toml",
+  wasm: "wasm",
+  napi: "napi",
+  base64: "base64",
+  dataurl: "dataurl",
+  text: "text",
+  bunsh: "bunsh",
+  sqlite: "sqlite",
+  sqlite_embedded: "sqlite_embedded",
+  html: "html",
+  yaml: "yaml",
 };
 const FrameworkEntryPointType = {
   "1": 1,

src/api/schema.zig

@@ -322,22 +322,26 @@ pub const FileWriter = Writer(std.fs.File);
 
 pub const api = struct {
     pub const Loader = enum(u8) {
-        _none,
-        jsx,
-        js,
-        ts,
-        tsx,
-        css,
-        file,
-        json,
-        toml,
-        wasm,
-        napi,
-        base64,
-        dataurl,
-        text,
-        sqlite,
-        html,
+        _none = 255,
+        jsx = 1,
+        js = 2,
+        ts = 3,
+        tsx = 4,
+        css = 5,
+        file = 6,
+        json = 7,
+        jsonc = 8,
+        toml = 9,
+        wasm = 10,
+        napi = 11,
+        base64 = 12,
+        dataurl = 13,
+        text = 14,
+        bunsh = 15,
+        sqlite = 16,
+        sqlite_embedded = 17,
+        html = 18,
+        yaml = 19,
         _,
 
         pub fn jsonStringify(self: @This(), writer: anytype) !void {
@@ -2816,7 +2820,7 @@ pub const api = struct {
         token: []const u8,
 
         pub fn dupe(this: NpmRegistry, allocator: std.mem.Allocator) NpmRegistry {
-            const buf = allocator.alloc(u8, this.url.len + this.username.len + this.password.len + this.token.len) catch bun.outOfMemory();
+            const buf = bun.handleOom(allocator.alloc(u8, this.url.len + this.username.len + this.password.len + this.token.len));
 
             var out: NpmRegistry = .{
                 .url = "",
@@ -3041,6 +3045,8 @@ pub const api = struct {
 
         node_linker: ?bun.install.PackageManager.Options.NodeLinker = null,
 
+        security_scanner: ?[]const u8 = null,
+
         pub fn decode(reader: anytype) anyerror!BunInstall {
             var this = std.mem.zeroes(BunInstall);
 

src/ast/BundledAst.zig

@@ -193,7 +193,7 @@ pub fn addUrlForCss(
             const encode_len = bun.base64.encodeLen(contents);
             const data_url_prefix_len = "data:".len + mime_type.len + ";base64,".len;
             const total_buffer_len = data_url_prefix_len + encode_len;
-            var encoded = allocator.alloc(u8, total_buffer_len) catch bun.outOfMemory();
+            var encoded = bun.handleOom(allocator.alloc(u8, total_buffer_len));
             _ = std.fmt.bufPrint(encoded[0..data_url_prefix_len], "data:{s};base64,", .{mime_type}) catch unreachable;
             const len = bun.base64.encode(encoded[data_url_prefix_len..], contents);
             break :url_for_css encoded[0 .. data_url_prefix_len + len];

src/ast/E.zig

@@ -434,7 +434,7 @@ pub const Number = struct {
 
         if (Environment.isNative) {
             var buf: [124]u8 = undefined;
-            return allocator.dupe(u8, bun.fmt.FormatDouble.dtoa(&buf, value)) catch bun.outOfMemory();
+            return bun.handleOom(allocator.dupe(u8, bun.fmt.FormatDouble.dtoa(&buf, value)));
         } else {
             // do not attempt to implement the spec here, it would be error prone.
         }
@@ -909,7 +909,7 @@ pub const String = struct {
         return if (bun.strings.isAllASCII(utf8))
             init(utf8)
         else
-            init(bun.strings.toUTF16AllocForReal(allocator, utf8, false, false) catch bun.outOfMemory());
+            init(bun.handleOom(bun.strings.toUTF16AllocForReal(allocator, utf8, false, false)));
     }
 
     pub fn slice8(this: *const String) []const u8 {
@@ -924,11 +924,11 @@ pub const String = struct {
 
     pub fn resolveRopeIfNeeded(this: *String, allocator: std.mem.Allocator) void {
         if (this.next == null or !this.isUTF8()) return;
-        var bytes = std.ArrayList(u8).initCapacity(allocator, this.rope_len) catch bun.outOfMemory();
+        var bytes = bun.handleOom(std.ArrayList(u8).initCapacity(allocator, this.rope_len));
         bytes.appendSliceAssumeCapacity(this.data);
         var str = this.next;
         while (str) |part| {
-            bytes.appendSlice(part.data) catch bun.outOfMemory();
+            bun.handleOom(bytes.appendSlice(part.data));
             str = part.next;
         }
         this.data = bytes.items;
@@ -937,7 +937,7 @@ pub const String = struct {
 
     pub fn slice(this: *String, allocator: std.mem.Allocator) []const u8 {
         this.resolveRopeIfNeeded(allocator);
-        return this.string(allocator) catch bun.outOfMemory();
+        return bun.handleOom(this.string(allocator));
     }
 
     pub var empty = String{};

src/ast/Expr.zig

@@ -474,7 +474,7 @@ pub inline fn isString(expr: *const Expr) bool {
 
 pub inline fn asString(expr: *const Expr, allocator: std.mem.Allocator) ?string {
     switch (expr.data) {
-        .e_string => |str| return str.string(allocator) catch bun.outOfMemory(),
+        .e_string => |str| return bun.handleOom(str.string(allocator)),
         else => return null,
     }
 }
@@ -3072,9 +3072,9 @@ pub const Data = union(Tag) {
             .e_null => jsc.JSValue.null,
             .e_undefined => .js_undefined,
             .e_boolean => |boolean| if (boolean.value)
-                jsc.JSValue.true
+                .true
             else
-                jsc.JSValue.false,
+                .false,
             .e_number => |e| e.toJS(),
             // .e_big_int => |e| e.toJS(ctx, exception),
 

src/ast/ImportScanner.zig

@@ -217,7 +217,7 @@ pub fn scan(
                             result.* = alias;
                         }
                         strings.sortDesc(sorted);
-                        p.named_imports.ensureUnusedCapacity(p.allocator, sorted.len) catch bun.outOfMemory();
+                        bun.handleOom(p.named_imports.ensureUnusedCapacity(p.allocator, sorted.len));
 
                         // Create named imports for these property accesses. This will
                         // cause missing imports to generate useful warnings.
@@ -236,7 +236,7 @@ pub fn scan(
                                     .namespace_ref = namespace_ref,
                                     .import_record_index = st.import_record_index,
                                 },
-                            ) catch bun.outOfMemory();
+                            ) catch |err| bun.handleOom(err);
 
                             const name: LocRef = item;
                             const name_ref = name.ref.?;
@@ -262,7 +262,7 @@ pub fn scan(
                     p.named_imports.ensureUnusedCapacity(
                         p.allocator,
                         st.items.len + @as(usize, @intFromBool(st.default_name != null)) + @as(usize, @intFromBool(st.star_name_loc != null)),
-                    ) catch bun.outOfMemory();
+                    ) catch |err| bun.handleOom(err);
 
                     if (st.star_name_loc) |loc| {
                         record.contains_import_star = true;

src/ast/NewStore.zig

@@ -78,7 +78,7 @@ pub fn NewStore(comptime types: []const type, comptime count: usize) type {
         pub fn init() *Store {
             log("init", .{});
             // Avoid initializing the entire struct.
-            const prealloc = backing_allocator.create(PreAlloc) catch bun.outOfMemory();
+            const prealloc = bun.handleOom(backing_allocator.create(PreAlloc));
             prealloc.zero();
 
             return &prealloc.metadata;

src/ast/P.zig

@@ -565,7 +565,7 @@ pub fn NewParser_(
 
         pub fn transposeRequire(noalias p: *P, arg: Expr, state: *const TransposeState) Expr {
             if (!p.options.features.allow_runtime) {
-                const args = p.allocator.alloc(Expr, 1) catch bun.outOfMemory();
+                const args = bun.handleOom(p.allocator.alloc(Expr, 1));
                 args[0] = arg;
                 return p.newExpr(
                     E.Call{
@@ -607,8 +607,8 @@ pub fn NewParser_(
 
                         // Note that this symbol may be completely removed later.
                         var path_name = fs.PathName.init(path.text);
-                        const name = path_name.nonUniqueNameString(p.allocator) catch bun.outOfMemory();
-                        const namespace_ref = p.newSymbol(.other, name) catch bun.outOfMemory();
+                        const name = bun.handleOom(path_name.nonUniqueNameString(p.allocator));
+                        const namespace_ref = bun.handleOom(p.newSymbol(.other, name));
 
                         p.imports_to_convert_from_require.append(p.allocator, .{
                             .namespace = .{
@@ -616,8 +616,8 @@ pub fn NewParser_(
                                 .loc = arg.loc,
                             },
                             .import_record_id = import_record_index,
-                        }) catch bun.outOfMemory();
-                        p.import_items_for_namespace.put(p.allocator, namespace_ref, ImportItemForNamespaceMap.init(p.allocator)) catch bun.outOfMemory();
+                        }) catch |err| bun.handleOom(err);
+                        bun.handleOom(p.import_items_for_namespace.put(p.allocator, namespace_ref, ImportItemForNamespaceMap.init(p.allocator)));
                         p.recordUsage(namespace_ref);
 
                         if (!state.is_require_immediately_assigned_to_decl) {
@@ -1994,6 +1994,9 @@ pub fn NewParser_(
                 p.jest.afterEach = try p.declareCommonJSSymbol(.unbound, "afterEach");
                 p.jest.beforeAll = try p.declareCommonJSSymbol(.unbound, "beforeAll");
                 p.jest.afterAll = try p.declareCommonJSSymbol(.unbound, "afterAll");
+                p.jest.xit = try p.declareCommonJSSymbol(.unbound, "xit");
+                p.jest.xtest = try p.declareCommonJSSymbol(.unbound, "xtest");
+                p.jest.xdescribe = try p.declareCommonJSSymbol(.unbound, "xdescribe");
             }
 
             if (p.options.features.react_fast_refresh) {
@@ -2019,7 +2022,7 @@ pub fn NewParser_(
         fn ensureRequireSymbol(p: *P) void {
             if (p.runtime_imports.__require != null) return;
             const static_symbol = generatedSymbolName("__require");
-            p.runtime_imports.__require = declareSymbolMaybeGenerated(p, .other, logger.Loc.Empty, static_symbol, true) catch bun.outOfMemory();
+            p.runtime_imports.__require = bun.handleOom(declareSymbolMaybeGenerated(p, .other, logger.Loc.Empty, static_symbol, true));
             p.runtime_imports.put("__require", p.runtime_imports.__require.?);
         }
 
@@ -2232,8 +2235,8 @@ pub fn NewParser_(
             {
                 p.log.level = .verbose;
 
-                p.log.addDebugFmt(p.source, loc, p.allocator, "Expected this scope (.{s})", .{@tagName(kind)}) catch bun.outOfMemory();
-                p.log.addDebugFmt(p.source, order.loc, p.allocator, "Found this scope (.{s})", .{@tagName(order.scope.kind)}) catch bun.outOfMemory();
+                bun.handleOom(p.log.addDebugFmt(p.source, loc, p.allocator, "Expected this scope (.{s})", .{@tagName(kind)}));
+                bun.handleOom(p.log.addDebugFmt(p.source, order.loc, p.allocator, "Found this scope (.{s})", .{@tagName(order.scope.kind)}));
 
                 p.panic("Scope mismatch while visiting", .{});
             }
@@ -2280,8 +2283,8 @@ pub fn NewParser_(
                     if (p.scopes_in_order.items[last_i]) |prev_scope| {
                         if (prev_scope.loc.start >= loc.start) {
                             p.log.level = .verbose;
-                            p.log.addDebugFmt(p.source, prev_scope.loc, p.allocator, "Previous Scope", .{}) catch bun.outOfMemory();
-                            p.log.addDebugFmt(p.source, loc, p.allocator, "Next Scope", .{}) catch bun.outOfMemory();
+                            bun.handleOom(p.log.addDebugFmt(p.source, prev_scope.loc, p.allocator, "Previous Scope", .{}));
+                            bun.handleOom(p.log.addDebugFmt(p.source, loc, p.allocator, "Next Scope", .{}));
                             p.panic("Scope location {d} must be greater than {d}", .{ loc.start, prev_scope.loc.start });
                         }
                     }
@@ -2956,7 +2959,7 @@ pub fn NewParser_(
                 scope: js_ast.TSNamespaceScope,
             };
 
-            var pair = p.allocator.create(Pair) catch bun.outOfMemory();
+            var pair = bun.handleOom(p.allocator.create(Pair));
             pair.map = .{};
             pair.scope = .{
                 .exported_members = &pair.map,
@@ -3328,7 +3331,7 @@ pub fn NewParser_(
                     p.allocator,
                     "panic here",
                     .{},
-                ) catch bun.outOfMemory();
+                ) catch |err| bun.handleOom(err);
             }
 
             p.log.level = .verbose;
@@ -4529,9 +4532,9 @@ pub fn NewParser_(
             if ((symbol.kind == .ts_namespace or symbol.kind == .ts_enum) and
                 !p.emitted_namespace_vars.contains(name_ref))
             {
-                p.emitted_namespace_vars.putNoClobber(allocator, name_ref, {}) catch bun.outOfMemory();
+                bun.handleOom(p.emitted_namespace_vars.putNoClobber(allocator, name_ref, {}));
 
-                var decls = allocator.alloc(G.Decl, 1) catch bun.outOfMemory();
+                var decls = bun.handleOom(allocator.alloc(G.Decl, 1));
                 decls[0] = G.Decl{ .binding = p.b(B.Identifier{ .ref = name_ref }, name_loc) };
 
                 if (p.enclosing_namespace_arg_ref == null) {
@@ -4542,7 +4545,7 @@ pub fn NewParser_(
                             .decls = G.Decl.List.init(decls),
                             .is_export = is_export,
                         }, stmt_loc),
-                    ) catch bun.outOfMemory();
+                    ) catch |err| bun.handleOom(err);
                 } else {
                     // Nested namespace: "let"
                     stmts.append(
@@ -4550,7 +4553,7 @@ pub fn NewParser_(
                             .kind = .k_let,
                             .decls = G.Decl.List.init(decls),
                         }, stmt_loc),
-                    ) catch bun.outOfMemory();
+                    ) catch |err| bun.handleOom(err);
                 }
             }
 
@@ -4589,10 +4592,10 @@ pub fn NewParser_(
                 }, name_loc);
             };
 
-            var func_args = allocator.alloc(G.Arg, 1) catch bun.outOfMemory();
+            var func_args = bun.handleOom(allocator.alloc(G.Arg, 1));
             func_args[0] = .{ .binding = p.b(B.Identifier{ .ref = arg_ref }, name_loc) };
 
-            var args_list = allocator.alloc(ExprNodeIndex, 1) catch bun.outOfMemory();
+            var args_list = bun.handleOom(allocator.alloc(ExprNodeIndex, 1));
             args_list[0] = arg_expr;
 
             // TODO: if unsupported features includes arrow functions
@@ -5463,15 +5466,15 @@ pub fn NewParser_(
         pub fn generateTempRefWithScope(p: *P, default_name: ?string, scope: *Scope) Ref {
             const name = (if (p.willUseRenamer()) default_name else null) orelse brk: {
                 p.temp_ref_count += 1;
-                break :brk std.fmt.allocPrint(p.allocator, "__bun_temp_ref_{x}$", .{p.temp_ref_count}) catch bun.outOfMemory();
+                break :brk bun.handleOom(std.fmt.allocPrint(p.allocator, "__bun_temp_ref_{x}$", .{p.temp_ref_count}));
             };
-            const ref = p.newSymbol(.other, name) catch bun.outOfMemory();
+            const ref = bun.handleOom(p.newSymbol(.other, name));
 
             p.temp_refs_to_declare.append(p.allocator, .{
                 .ref = ref,
-            }) catch bun.outOfMemory();
+            }) catch |err| bun.handleOom(err);
 
-            scope.generated.append(p.allocator, &.{ref}) catch bun.outOfMemory();
+            bun.handleOom(scope.generated.append(p.allocator, &.{ref}));
 
             return ref;
         }
@@ -5557,7 +5560,7 @@ pub fn NewParser_(
                                 if (decl.value) |*decl_value| {
                                     const value_loc = decl_value.loc;
                                     p.recordUsage(ctx.stack_ref);
-                                    const args = p.allocator.alloc(Expr, 3) catch bun.outOfMemory();
+                                    const args = bun.handleOom(p.allocator.alloc(Expr, 3));
                                     args[0] = Expr{
                                         .data = .{ .e_identifier = .{ .ref = ctx.stack_ref } },
                                         .loc = stmt.loc,
@@ -5591,14 +5594,14 @@ pub fn NewParser_(
                     switch (stmt.data) {
                         .s_directive, .s_import, .s_export_from, .s_export_star => {
                             // These can't go in a try/catch block
-                            result.append(stmt) catch bun.outOfMemory();
+                            bun.handleOom(result.append(stmt));
                             continue;
                         },
 
                         .s_class => {
                             if (stmt.data.s_class.is_export) {
                                 // can't go in try/catch; hoist out
-                                result.append(stmt) catch bun.outOfMemory();
+                                bun.handleOom(result.append(stmt));
                                 continue;
                             }
                         },
@@ -5609,14 +5612,14 @@ pub fn NewParser_(
 
                         .s_export_clause => |data| {
                             // Merge export clauses together
-                            exports.appendSlice(data.items) catch bun.outOfMemory();
+                            bun.handleOom(exports.appendSlice(data.items));
                             continue;
                         },
 
                         .s_function => {
                             if (should_hoist_fns) {
                                 // Hoist function declarations for cross-file ESM references
-                                result.append(stmt) catch bun.outOfMemory();
+                                bun.handleOom(result.append(stmt));
                                 continue;
                             }
                         },
@@ -5635,7 +5638,7 @@ pub fn NewParser_(
                                             },
                                             .alias = p.symbols.items[identifier.ref.inner_index].original_name,
                                             .alias_loc = decl.binding.loc,
-                                        }) catch bun.outOfMemory();
+                                        }) catch |err| bun.handleOom(err);
                                         local.kind = .k_var;
                                     }
                                 }
@@ -5666,12 +5669,12 @@ pub fn NewParser_(
                     caught_ref,
                     err_ref,
                     has_err_ref,
-                }) catch bun.outOfMemory();
+                }) catch |err| bun.handleOom(err);
                 p.declared_symbols.ensureUnusedCapacity(
                     p.allocator,
                     // 5 to include the _promise decl later on:
                     if (ctx.has_await_using) 5 else 4,
-                ) catch bun.outOfMemory();
+                ) catch |err| bun.handleOom(err);
                 p.declared_symbols.appendAssumeCapacity(.{ .is_top_level = is_top_level, .ref = ctx.stack_ref });
                 p.declared_symbols.appendAssumeCapacity(.{ .is_top_level = is_top_level, .ref = caught_ref });
                 p.declared_symbols.appendAssumeCapacity(.{ .is_top_level = is_top_level, .ref = err_ref });
@@ -5682,7 +5685,7 @@ pub fn NewParser_(
                     p.recordUsage(ctx.stack_ref);
                     p.recordUsage(err_ref);
                     p.recordUsage(has_err_ref);
-                    const args = p.allocator.alloc(Expr, 3) catch bun.outOfMemory();
+                    const args = bun.handleOom(p.allocator.alloc(Expr, 3));
                     args[0] = Expr{
                         .data = .{ .e_identifier = .{ .ref = ctx.stack_ref } },
                         .loc = loc,
@@ -5701,7 +5704,7 @@ pub fn NewParser_(
                 const finally_stmts = finally: {
                     if (ctx.has_await_using) {
                         const promise_ref = p.generateTempRef("_promise");
-                        scope.generated.append(p.allocator, &.{promise_ref}) catch bun.outOfMemory();
+                        bun.handleOom(scope.generated.append(p.allocator, &.{promise_ref}));
                         p.declared_symbols.appendAssumeCapacity(.{ .is_top_level = is_top_level, .ref = promise_ref });
 
                         const promise_ref_expr = p.newExpr(E.Identifier{ .ref = promise_ref }, loc);
@@ -5711,10 +5714,10 @@ pub fn NewParser_(
                         }, loc);
                         p.recordUsage(promise_ref);
 
-                        const statements = p.allocator.alloc(Stmt, 2) catch bun.outOfMemory();
+                        const statements = bun.handleOom(p.allocator.alloc(Stmt, 2));
                         statements[0] = p.s(S.Local{
                             .decls = decls: {
-                                const decls = p.allocator.alloc(Decl, 1) catch bun.outOfMemory();
+                                const decls = bun.handleOom(p.allocator.alloc(Decl, 1));
                                 decls[0] = .{
                                     .binding = p.b(B.Identifier{ .ref = promise_ref }, loc),
                                     .value = call_dispose,
@@ -5739,7 +5742,7 @@ pub fn NewParser_(
 
                         break :finally statements;
                     } else {
-                        const single = p.allocator.alloc(Stmt, 1) catch bun.outOfMemory();
+                        const single = bun.handleOom(p.allocator.alloc(Stmt, 1));
                         single[0] = p.s(S.SExpr{ .value = call_dispose }, call_dispose.loc);
                         break :finally single;
                     }
@@ -5747,10 +5750,10 @@ pub fn NewParser_(
 
                 // Wrap everything in a try/catch/finally block
                 p.recordUsage(caught_ref);
-                result.ensureUnusedCapacity(2 + @as(usize, @intFromBool(exports.items.len > 0))) catch bun.outOfMemory();
+                bun.handleOom(result.ensureUnusedCapacity(2 + @as(usize, @intFromBool(exports.items.len > 0))));
                 result.appendAssumeCapacity(p.s(S.Local{
                     .decls = decls: {
-                        const decls = p.allocator.alloc(Decl, 1) catch bun.outOfMemory();
+                        const decls = bun.handleOom(p.allocator.alloc(Decl, 1));
                         decls[0] = .{
                             .binding = p.b(B.Identifier{ .ref = ctx.stack_ref }, loc),
                             .value = p.newExpr(E.Array{}, loc),
@@ -5765,10 +5768,10 @@ pub fn NewParser_(
                     .catch_ = .{
                         .binding = p.b(B.Identifier{ .ref = caught_ref }, loc),
                         .body = catch_body: {
-                            const statements = p.allocator.alloc(Stmt, 1) catch bun.outOfMemory();
+                            const statements = bun.handleOom(p.allocator.alloc(Stmt, 1));
                             statements[0] = p.s(S.Local{
                                 .decls = decls: {
-                                    const decls = p.allocator.alloc(Decl, 2) catch bun.outOfMemory();
+                                    const decls = bun.handleOom(p.allocator.alloc(Decl, 2));
                                     decls[0] = .{
                                         .binding = p.b(B.Identifier{ .ref = err_ref }, loc),
                                         .value = p.newExpr(E.Identifier{ .ref = caught_ref }, loc),
@@ -5824,7 +5827,7 @@ pub fn NewParser_(
                 },
                 .e_array => |arr| for (arr.items.slice()) |*item| {
                     if (item.data != .e_string) {
-                        p.log.addError(p.source, item.loc, import_meta_hot_accept_err) catch bun.outOfMemory();
+                        bun.handleOom(p.log.addError(p.source, item.loc, import_meta_hot_accept_err));
                         continue;
                     }
                     item.data = p.rewriteImportMetaHotAcceptString(item.data.e_string, item.loc) orelse
@@ -5837,7 +5840,7 @@ pub fn NewParser_(
         }
 
         fn rewriteImportMetaHotAcceptString(p: *P, str: *E.String, loc: logger.Loc) ?Expr.Data {
-            str.toUTF8(p.allocator) catch bun.outOfMemory();
+            bun.handleOom(str.toUTF8(p.allocator));
             const specifier = str.data;
 
             const import_record_index = for (p.import_records.items, 0..) |import_record, i| {
@@ -5845,7 +5848,7 @@ pub fn NewParser_(
                     break i;
                 }
             } else {
-                p.log.addError(p.source, loc, import_meta_hot_accept_err) catch bun.outOfMemory();
+                bun.handleOom(p.log.addError(p.source, loc, import_meta_hot_accept_err));
                 return null;
             };
 
@@ -5917,7 +5920,7 @@ pub fn NewParser_(
                     val,
                     module_path,
                     p.newExpr(E.String{ .data = original_name }, logger.Loc.Empty),
-                }) catch bun.outOfMemory(),
+                }) catch |err| bun.handleOom(err),
             }, logger.Loc.Empty);
         }
 
@@ -5949,7 +5952,7 @@ pub fn NewParser_(
                 p.declared_symbols.append(p.allocator, .{
                     .is_top_level = true,
                     .ref = ctx_storage.*.?.signature_cb,
-                }) catch bun.outOfMemory();
+                }) catch |err| bun.handleOom(err);
 
                 break :init &(ctx_storage.*.?);
             };
@@ -5972,7 +5975,7 @@ pub fn NewParser_(
                 .e_import_identifier,
                 .e_commonjs_export_identifier,
                 => |id, tag| {
-                    const gop = ctx.user_hooks.getOrPut(p.allocator, id.ref) catch bun.outOfMemory();
+                    const gop = bun.handleOom(ctx.user_hooks.getOrPut(p.allocator, id.ref));
                     if (!gop.found_existing) {
                         gop.value_ptr.* = .{
                             .data = @unionInit(Expr.Data, @tagName(tag), id),
@@ -5995,7 +5998,7 @@ pub fn NewParser_(
                 // re-allocated entirely to fit. Only one slot of new capacity
                 // is used since we know this statement list is not going to be
                 // appended to afterwards; This function is a post-visit handler.
-                const new_stmts = p.allocator.alloc(Stmt, stmts.items.len + 1) catch bun.outOfMemory();
+                const new_stmts = bun.handleOom(p.allocator.alloc(Stmt, stmts.items.len + 1));
                 @memcpy(new_stmts[1..], stmts.items);
                 stmts.deinit();
                 stmts.* = ListManaged(Stmt).fromOwnedSlice(p.allocator, new_stmts);
@@ -6023,14 +6026,14 @@ pub fn NewParser_(
                 .value = p.newExpr(E.Call{
                     .target = Expr.initIdentifier(p.react_refresh.create_signature_ref, loc),
                 }, loc),
-            }}) catch bun.outOfMemory() }, loc);
+            }}) catch |err| bun.handleOom(err) }, loc);
         }
 
         pub fn getReactRefreshHookSignalInit(p: *P, ctx: *ReactRefresh.HookContext, function_with_hook_calls: Expr) Expr {
             const loc = logger.Loc.Empty;
 
             const final = ctx.hasher.final();
-            const hash_data = p.allocator.alloc(u8, comptime bun.base64.encodeLenFromSize(@sizeOf(@TypeOf(final)))) catch bun.outOfMemory();
+            const hash_data = bun.handleOom(p.allocator.alloc(u8, comptime bun.base64.encodeLenFromSize(@sizeOf(@TypeOf(final)))));
             bun.assert(bun.base64.encode(hash_data, std.mem.asBytes(&final)) == hash_data.len);
 
             const have_custom_hooks = ctx.user_hooks.count() > 0;
@@ -6041,7 +6044,7 @@ pub fn NewParser_(
                 2 +
                     @as(usize, @intFromBool(have_force_arg)) +
                     @as(usize, @intFromBool(have_custom_hooks)),
-            ) catch bun.outOfMemory();
+            ) catch |err| bun.handleOom(err);
 
             args[0] = function_with_hook_calls;
             args[1] = p.newExpr(E.String{ .data = hash_data }, loc);
@@ -6056,7 +6059,7 @@ pub fn NewParser_(
                             p.s(S.Return{ .value = p.newExpr(E.Array{
                                 .items = ExprNodeList.init(ctx.user_hooks.values()),
                             }, loc) }, loc),
-                        }) catch bun.outOfMemory(),
+                        }) catch |err| bun.handleOom(err),
                         .loc = loc,
                     },
                     .prefer_expr = true,
@@ -6195,7 +6198,7 @@ pub fn NewParser_(
                 //   })
                 //
                 //  which is then called in `evaluateCommonJSModuleOnce`
-                var args = allocator.alloc(Arg, 5 + @as(usize, @intFromBool(p.has_import_meta))) catch bun.outOfMemory();
+                var args = bun.handleOom(allocator.alloc(Arg, 5 + @as(usize, @intFromBool(p.has_import_meta))));
                 args[0..5].* = .{
                     Arg{ .binding = p.b(B.Identifier{ .ref = p.exports_ref }, logger.Loc.Empty) },
                     Arg{ .binding = p.b(B.Identifier{ .ref = p.require_ref }, logger.Loc.Empty) },
@@ -6204,7 +6207,7 @@ pub fn NewParser_(
                     Arg{ .binding = p.b(B.Identifier{ .ref = p.dirname_ref }, logger.Loc.Empty) },
                 };
                 if (p.has_import_meta) {
-                    p.import_meta_ref = p.newSymbol(.other, "$Bun_import_meta") catch bun.outOfMemory();
+                    p.import_meta_ref = bun.handleOom(p.newSymbol(.other, "$Bun_import_meta"));
                     args[5] = Arg{ .binding = p.b(B.Identifier{ .ref = p.import_meta_ref }, logger.Loc.Empty) };
                 }
 
@@ -6220,7 +6223,7 @@ pub fn NewParser_(
 
                 total_stmts_count += @as(usize, @intCast(@intFromBool(preserve_strict_mode)));
 
-                const stmts_to_copy = allocator.alloc(Stmt, total_stmts_count) catch bun.outOfMemory();
+                const stmts_to_copy = bun.handleOom(allocator.alloc(Stmt, total_stmts_count));
                 {
                     var remaining_stmts = stmts_to_copy;
                     if (preserve_strict_mode) {
@@ -6254,7 +6257,7 @@ pub fn NewParser_(
                     logger.Loc.Empty,
                 );
 
-                var top_level_stmts = p.allocator.alloc(Stmt, 1) catch bun.outOfMemory();
+                var top_level_stmts = bun.handleOom(p.allocator.alloc(Stmt, 1));
                 top_level_stmts[0] = p.s(
                     S.SExpr{
                         .value = wrapper,
@@ -6334,8 +6337,8 @@ pub fn NewParser_(
                             p.allocator,
                             "require_{any}",
                             .{p.source.fmtIdentifier()},
-                        ) catch bun.outOfMemory(),
-                    ) catch bun.outOfMemory();
+                        ) catch |err| bun.handleOom(err),
+                    ) catch |err| bun.handleOom(err);
                 }
 
                 break :brk Ref.None;

src/ast/Parser.zig

@@ -446,7 +446,7 @@ pub const Parser = struct {
         if (p.options.bundle) {
             // The bundler requires a part for generated module wrappers. This
             // part must be at the start as it is referred to by index.
-            before.append(js_ast.Part{}) catch bun.outOfMemory();
+            bun.handleOom(before.append(js_ast.Part{}));
         }
 
         // --inspect-brk
@@ -460,7 +460,7 @@ pub const Parser = struct {
                 js_ast.Part{
                     .stmts = debugger_stmts,
                 },
-            ) catch bun.outOfMemory();
+            ) catch |err| bun.handleOom(err);
         }
 
         // When "using" declarations appear at the top level, we change all TDZ
@@ -713,7 +713,7 @@ pub const Parser = struct {
                     var import_part_stmts = remaining_stmts[0..1];
                     remaining_stmts = remaining_stmts[1..];
 
-                    p.module_scope.generated.push(p.allocator, deferred_import.namespace.ref.?) catch bun.outOfMemory();
+                    bun.handleOom(p.module_scope.generated.push(p.allocator, deferred_import.namespace.ref.?));
 
                     import_part_stmts[0] = Stmt.alloc(
                         S.Import,

src/ast/SideEffects.zig

@@ -347,7 +347,7 @@ pub const SideEffects = enum(u1) {
         const stack_bottom = stack.items.len;
         defer stack.shrinkRetainingCapacity(stack_bottom);
 
-        stack.append(.{ .bin = expr.data.e_binary }) catch bun.outOfMemory();
+        bun.handleOom(stack.append(.{ .bin = expr.data.e_binary }));
 
         // Build stack up of expressions
         var left: Expr = expr.data.e_binary.left;
@@ -357,7 +357,7 @@ pub const SideEffects = enum(u1) {
                 .bin_strict_ne,
                 .bin_comma,
                 => {
-                    stack.append(.{ .bin = left_bin }) catch bun.outOfMemory();
+                    bun.handleOom(stack.append(.{ .bin = left_bin }));
                     left = left_bin.left;
                 },
                 else => break,

src/ast/foldStringAddition.zig

@@ -182,7 +182,7 @@ pub fn foldStringAddition(l: Expr, r: Expr, allocator: std.mem.Allocator, kind:
                                             allocator,
                                             E.TemplatePart,
                                             &.{ left.parts, right.parts },
-                                        ) catch bun.outOfMemory();
+                                        ) catch |err| bun.handleOom(err);
                                     return lhs;
                                 }
                             } else {

src/ast/maybe.zig

@@ -459,12 +459,12 @@ pub fn AstMaybe(
                             p.allocator,
                             id.ref,
                             .{},
-                        ) catch bun.outOfMemory();
+                        ) catch |err| bun.handleOom(err);
                         const inner_use = gop.value_ptr.getOrPutValue(
                             p.allocator,
                             name,
                             .{},
-                        ) catch bun.outOfMemory();
+                        ) catch |err| bun.handleOom(err);
                         inner_use.value_ptr.count_estimate += 1;
                     }
                 },
@@ -572,8 +572,8 @@ pub fn AstMaybe(
                                     p.allocator,
                                     "import.meta.hot.{s} does not exist",
                                     .{name},
-                                ) catch bun.outOfMemory(),
-                            ) catch bun.outOfMemory();
+                                ) catch |err| bun.handleOom(err),
+                            ) catch |err| bun.handleOom(err);
                             return .{ .data = .e_undefined, .loc = loc };
                         }
                     },

src/ast/parseProperty.zig

@@ -347,7 +347,7 @@ pub fn ParseProperty(
                         // Handle invalid identifiers in property names
                         // https://github.com/oven-sh/bun/issues/12039
                         if (p.lexer.token == .t_syntax_error) {
-                            p.log.addRangeErrorFmt(p.source, name_range, p.allocator, "Unexpected {}", .{bun.fmt.quote(name)}) catch bun.outOfMemory();
+                            bun.handleOom(p.log.addRangeErrorFmt(p.source, name_range, p.allocator, "Unexpected {}", .{bun.fmt.quote(name)}));
                             return error.SyntaxError;
                         }
 

src/ast/parseStmt.zig

@@ -376,8 +376,8 @@ pub fn ParseStmt(
                                 .{
                                     path_name.fmtIdentifier(),
                                 },
-                            ) catch bun.outOfMemory(),
-                        ) catch bun.outOfMemory();
+                            ) catch |err| bun.handleOom(err),
+                        ) catch |err| bun.handleOom(err);
 
                         if (comptime track_symbol_usage_during_parse_pass) {
                             // In the scan pass, we need _some_ way of knowing *not* to mark as unused

src/ast/parseTypescript.zig

@@ -210,7 +210,7 @@ pub fn ParseTypescript(
             p.popScope();
 
             if (!opts.is_typescript_declare) {
-                name.ref = p.declareSymbol(.ts_namespace, name_loc, name_text) catch bun.outOfMemory();
+                name.ref = bun.handleOom(p.declareSymbol(.ts_namespace, name_loc, name_text));
                 try p.ref_to_ts_namespace_member.put(p.allocator, name.ref.?, ns_member_data);
             }
 
@@ -288,7 +288,7 @@ pub fn ParseTypescript(
                 name.ref = try p.declareSymbol(.ts_enum, name_loc, name_text);
                 _ = try p.pushScopeForParsePass(.entry, loc);
                 p.current_scope.ts_namespace = ts_namespace;
-                p.ref_to_ts_namespace_member.putNoClobber(p.allocator, name.ref.?, enum_member_data) catch bun.outOfMemory();
+                bun.handleOom(p.ref_to_ts_namespace_member.putNoClobber(p.allocator, name.ref.?, enum_member_data));
             }
 
             try p.lexer.expect(.t_open_brace);
@@ -329,7 +329,7 @@ pub fn ParseTypescript(
                 exported_members.put(p.allocator, value.name, .{
                     .loc = value.loc,
                     .data = .enum_property,
-                }) catch bun.outOfMemory();
+                }) catch |err| bun.handleOom(err);
 
                 if (p.lexer.token != .t_comma and p.lexer.token != .t_semicolon) {
                     break;
@@ -376,7 +376,7 @@ pub fn ParseTypescript(
                 } else {
                     arg_ref = p.declareSymbol(.hoisted, name_loc, name_text) catch unreachable;
                 }
-                p.ref_to_ts_namespace_member.put(p.allocator, arg_ref, enum_member_data) catch bun.outOfMemory();
+                bun.handleOom(p.ref_to_ts_namespace_member.put(p.allocator, arg_ref, enum_member_data));
                 ts_namespace.arg_ref = arg_ref;
 
                 p.popScope();
@@ -406,7 +406,7 @@ pub fn ParseTypescript(
                         if (i != null) count += 1;
                     }
 
-                    const items = p.allocator.alloc(ScopeOrder, count) catch bun.outOfMemory();
+                    const items = bun.handleOom(p.allocator.alloc(ScopeOrder, count));
                     var i: usize = 0;
                     for (p.scopes_in_order.items[scope_index..]) |item| {
                         items[i] = item orelse continue;
@@ -414,7 +414,7 @@ pub fn ParseTypescript(
                     }
                     break :scope_order_clone items;
                 },
-            ) catch bun.outOfMemory();
+            ) catch |err| bun.handleOom(err);
 
             return p.s(S.Enum{
                 .name = name,

src/ast/visit.zig

@@ -860,11 +860,11 @@ pub fn Visit(
                                         // Merge the two identifiers back into a single one
                                         p.symbols.items[hoisted_ref.innerIndex()].link = name_ref;
                                     }
-                                    non_fn_stmts.append(stmt) catch bun.outOfMemory();
+                                    bun.handleOom(non_fn_stmts.append(stmt));
                                     continue;
                                 }
 
-                                const gpe = fn_stmts.getOrPut(name_ref) catch bun.outOfMemory();
+                                const gpe = bun.handleOom(fn_stmts.getOrPut(name_ref));
                                 var index = gpe.value_ptr.*;
                                 if (!gpe.found_existing) {
                                     index = @as(u32, @intCast(let_decls.items.len));
@@ -889,7 +889,7 @@ pub fn Visit(
                                                 },
                                                 data.func.name.?.loc,
                                             ),
-                                        }) catch bun.outOfMemory();
+                                        }) catch |err| bun.handleOom(err);
                                     }
                                 }
 

src/ast/visitExpr.zig

@@ -311,12 +311,12 @@ pub fn VisitExpr(
                                         .items = e_.children,
                                         .is_single_line = e_.children.len < 2,
                                     }, e_.close_tag_loc),
-                                }) catch bun.outOfMemory();
+                                }) catch |err| bun.handleOom(err);
                             } else if (e_.children.len == 1) {
                                 props.append(allocator, G.Property{
                                     .key = children_key,
                                     .value = e_.children.ptr[0],
-                                }) catch bun.outOfMemory();
+                                }) catch |err| bun.handleOom(err);
                             }
 
                             // Either:
@@ -490,7 +490,7 @@ pub fn VisitExpr(
                     // Note that we only append to the stack (and therefore allocate memory
                     // on the heap) when there are nested binary expressions. A single binary
                     // expression doesn't add anything to the stack.
-                    p.binary_expression_stack.append(v) catch bun.outOfMemory();
+                    bun.handleOom(p.binary_expression_stack.append(v));
                     v = BinaryExpressionVisitor{
                         .e = left_binary.?,
                         .loc = left.loc,
@@ -1449,8 +1449,8 @@ pub fn VisitExpr(
                                     p.allocator,
                                     "\"useState\" is not available in a server component. If you need interactivity, consider converting part of this to a Client Component (by adding `\"use client\";` to the top of the file).",
                                     .{},
-                                ) catch bun.outOfMemory(),
-                            ) catch bun.outOfMemory();
+                                ) catch |err| bun.handleOom(err),
+                            ) catch |err| bun.handleOom(err);
                         }
                     }
                 }
@@ -1542,7 +1542,7 @@ pub fn VisitExpr(
 
                 if (react_hook_data) |*hook| try_mark_hook: {
                     const stmts = p.nearest_stmt_list orelse break :try_mark_hook;
-                    stmts.append(p.getReactRefreshHookSignalDecl(hook.signature_cb)) catch bun.outOfMemory();
+                    bun.handleOom(stmts.append(p.getReactRefreshHookSignalDecl(hook.signature_cb)));
 
                     p.handleReactRefreshPostVisitFunctionBody(&stmts_list, hook);
                     e_.body.stmts = stmts_list.items;
@@ -1568,7 +1568,7 @@ pub fn VisitExpr(
 
                 if (react_hook_data) |*hook| try_mark_hook: {
                     const stmts = p.nearest_stmt_list orelse break :try_mark_hook;
-                    stmts.append(p.getReactRefreshHookSignalDecl(hook.signature_cb)) catch bun.outOfMemory();
+                    bun.handleOom(stmts.append(p.getReactRefreshHookSignalDecl(hook.signature_cb)));
                     final_expr = p.getReactRefreshHookSignalInit(hook, expr);
                 }
 

src/ast/visitStmt.zig

@@ -287,7 +287,7 @@ pub fn VisitStmt(
                         if (p.current_scope.parent == null and p.will_wrap_module_in_try_catch_for_using) {
                             try stmts.ensureUnusedCapacity(2);
 
-                            const decls = p.allocator.alloc(G.Decl, 1) catch bun.outOfMemory();
+                            const decls = bun.handleOom(p.allocator.alloc(G.Decl, 1));
                             decls[0] = .{
                                 .binding = p.b(B.Identifier{ .ref = data.default_name.ref.? }, data.default_name.loc),
                                 .value = data.value.expr,
@@ -295,7 +295,7 @@ pub fn VisitStmt(
                             stmts.appendAssumeCapacity(p.s(S.Local{
                                 .decls = G.Decl.List.init(decls),
                             }, stmt.loc));
-                            const items = p.allocator.alloc(js_ast.ClauseItem, 1) catch bun.outOfMemory();
+                            const items = bun.handleOom(p.allocator.alloc(js_ast.ClauseItem, 1));
                             items[0] = js_ast.ClauseItem{
                                 .alias = "default",
                                 .alias_loc = data.default_name.loc,
@@ -343,7 +343,7 @@ pub fn VisitStmt(
                             }
 
                             if (react_hook_data) |*hook| {
-                                stmts.append(p.getReactRefreshHookSignalDecl(hook.signature_cb)) catch bun.outOfMemory();
+                                bun.handleOom(stmts.append(p.getReactRefreshHookSignalDecl(hook.signature_cb)));
 
                                 data.value = .{
                                     .expr = p.getReactRefreshHookSignalInit(hook, p.newExpr(
@@ -402,7 +402,7 @@ pub fn VisitStmt(
                                                 .value = data.value.expr,
                                             },
                                         }),
-                                    }, stmt.loc)) catch bun.outOfMemory();
+                                    }, stmt.loc)) catch |err| bun.handleOom(err);
 
                                     data.value = .{ .expr = .initIdentifier(ref_to_use, stmt.loc) };
 
@@ -515,7 +515,7 @@ pub fn VisitStmt(
                     data.func.flags.remove(.is_export);
 
                     const enclosing_namespace_arg_ref = p.enclosing_namespace_arg_ref orelse bun.outOfMemory();
-                    stmts.ensureUnusedCapacity(3) catch bun.outOfMemory();
+                    bun.handleOom(stmts.ensureUnusedCapacity(3));
                     stmts.appendAssumeCapacity(stmt.*);
                     stmts.appendAssumeCapacity(Stmt.assign(
                         p.newExpr(E.Dot{
@@ -547,7 +547,7 @@ pub fn VisitStmt(
                             }}),
                         }, stmt.loc));
                     } else {
-                        stmts.append(stmt.*) catch bun.outOfMemory();
+                        bun.handleOom(stmts.append(stmt.*));
                     }
                 } else if (mark_as_dead) {
                     if (p.options.features.replace_exports.getPtr(original_name)) |replacement| {
@@ -1200,7 +1200,7 @@ pub fn VisitStmt(
                         const first = p.s(S.Local{
                             .kind = init2.kind,
                             .decls = bindings: {
-                                const decls = p.allocator.alloc(G.Decl, 1) catch bun.outOfMemory();
+                                const decls = bun.handleOom(p.allocator.alloc(G.Decl, 1));
                                 decls[0] = .{
                                     .binding = p.b(B.Identifier{ .ref = id.ref }, loc),
                                     .value = p.newExpr(E.Identifier{ .ref = temp_ref }, loc),
@@ -1210,7 +1210,7 @@ pub fn VisitStmt(
                         }, loc);
 
                         const length = if (data.body.data == .s_block) data.body.data.s_block.stmts.len else 1;
-                        const statements = p.allocator.alloc(Stmt, 1 + length) catch bun.outOfMemory();
+                        const statements = bun.handleOom(p.allocator.alloc(Stmt, 1 + length));
                         statements[0] = first;
                         if (data.body.data == .s_block) {
                             @memcpy(statements[1..], data.body.data.s_block.stmts);
@@ -1315,10 +1315,10 @@ pub fn VisitStmt(
                     try p.top_level_enums.append(p.allocator, data.name.ref.?);
                 }
 
-                p.recordDeclaredSymbol(data.name.ref.?) catch bun.outOfMemory();
-                p.pushScopeForVisitPass(.entry, stmt.loc) catch bun.outOfMemory();
+                bun.handleOom(p.recordDeclaredSymbol(data.name.ref.?));
+                bun.handleOom(p.pushScopeForVisitPass(.entry, stmt.loc));
                 defer p.popScope();
-                p.recordDeclaredSymbol(data.arg) catch bun.outOfMemory();
+                bun.handleOom(p.recordDeclaredSymbol(data.arg));
 
                 const allocator = p.allocator;
                 // Scan ahead for any variables inside this namespace. This must be done
@@ -1327,7 +1327,7 @@ pub fn VisitStmt(
                 // We need to convert the uses into property accesses on the namespace.
                 for (data.values) |value| {
                     if (value.ref.isValid()) {
-                        p.is_exported_inside_namespace.put(allocator, value.ref, data.arg) catch bun.outOfMemory();
+                        bun.handleOom(p.is_exported_inside_namespace.put(allocator, value.ref, data.arg));
                     }
                 }
 
@@ -1336,7 +1336,7 @@ pub fn VisitStmt(
                 // without initializers are initialized to undefined.
                 var next_numeric_value: ?f64 = 0.0;
 
-                var value_exprs = ListManaged(Expr).initCapacity(allocator, data.values.len) catch bun.outOfMemory();
+                var value_exprs = bun.handleOom(ListManaged(Expr).initCapacity(allocator, data.values.len));
 
                 var all_values_are_pure = true;
 
@@ -1373,7 +1373,7 @@ pub fn VisitStmt(
                                     p.allocator,
                                     value.ref,
                                     .{ .enum_number = num.value },
-                                ) catch bun.outOfMemory();
+                                ) catch |err| bun.handleOom(err);
 
                                 next_numeric_value = num.value + 1.0;
                             },
@@ -1386,7 +1386,7 @@ pub fn VisitStmt(
                                     p.allocator,
                                     value.ref,
                                     .{ .enum_string = str },
-                                ) catch bun.outOfMemory();
+                                ) catch |err| bun.handleOom(err);
                             },
                             else => {
                                 if (visited.knownPrimitive() == .string) {
@@ -1409,7 +1409,7 @@ pub fn VisitStmt(
                             p.allocator,
                             value.ref,
                             .{ .enum_number = num },
-                        ) catch bun.outOfMemory();
+                        ) catch |err| bun.handleOom(err);
                     } else {
                         value.value = p.newExpr(E.Undefined{}, value.loc);
                     }
@@ -1451,7 +1451,7 @@ pub fn VisitStmt(
 
                     // String-valued enums do not form a two-way map
                     if (has_string_value) {
-                        value_exprs.append(assign_target) catch bun.outOfMemory();
+                        bun.handleOom(value_exprs.append(assign_target));
                     } else {
                         // "Enum[assignTarget] = 'Name'"
                         value_exprs.append(
@@ -1465,7 +1465,7 @@ pub fn VisitStmt(
                                 }, value.loc),
                                 name_as_e_string.?,
                             ),
-                        ) catch bun.outOfMemory();
+                        ) catch |err| bun.handleOom(err);
                         p.recordUsage(data.arg);
                     }
                 }

src/bake.zig

@@ -93,7 +93,7 @@ pub const StringRefList = struct {
     pub const empty: StringRefList = .{ .strings = .{} };
 
     pub fn track(al: *StringRefList, str: ZigString.Slice) []const u8 {
-        al.strings.append(bun.default_allocator, str) catch bun.outOfMemory();
+        bun.handleOom(al.strings.append(bun.default_allocator, str));
         return str.slice();
     }
 
@@ -261,7 +261,7 @@ pub const Framework = struct {
                 .{ .code = bun.runtimeEmbedFile(.src, "bake/bun-framework-react/client.tsx") },
                 .{ .code = bun.runtimeEmbedFile(.src, "bake/bun-framework-react/server.tsx") },
                 .{ .code = bun.runtimeEmbedFile(.src, "bake/bun-framework-react/ssr.tsx") },
-            }) catch bun.outOfMemory(),
+            }) catch |err| bun.handleOom(err),
         };
     }
 

src/bake/DevServer/Assets.zig

@@ -41,7 +41,7 @@ pub fn replacePath(
 ) !EntryIndex {
     assert(assets.owner().magic == .valid);
     defer assert(assets.files.count() == assets.refs.items.len);
-    const alloc = assets.owner().allocator;
+    const alloc = assets.owner().allocator();
     debug.log("replacePath {} {} - {s}/{s} ({s})", .{
         bun.fmt.quote(abs_path),
         content_hash,
@@ -100,9 +100,9 @@ pub fn replacePath(
 /// means there is already data here.
 pub fn putOrIncrementRefCount(assets: *Assets, content_hash: u64, ref_count: u32) !?**StaticRoute {
     defer assert(assets.files.count() == assets.refs.items.len);
-    const file_index_gop = try assets.files.getOrPut(assets.owner().allocator, content_hash);
+    const file_index_gop = try assets.files.getOrPut(assets.owner().allocator(), content_hash);
     if (!file_index_gop.found_existing) {
-        try assets.refs.append(assets.owner().allocator, ref_count);
+        try assets.refs.append(assets.owner().allocator(), ref_count);
         return file_index_gop.value_ptr;
     } else {
         assets.refs.items[file_index_gop.index] += ref_count;

src/bake/DevServer/DevAllocator.zig

@@ -0,0 +1,19 @@
+const Self = @This();
+
+maybe_scope: if (AllocationScope.enabled) AllocationScope else void,
+
+pub fn get(self: Self) Allocator {
+    return if (comptime AllocationScope.enabled)
+        self.maybe_scope.allocator()
+    else
+        bun.default_allocator;
+}
+
+pub fn scope(self: Self) ?AllocationScope {
+    return if (comptime AllocationScope.enabled) self.maybe_scope else null;
+}
+
+const bun = @import("bun");
+const std = @import("std");
+const AllocationScope = bun.allocators.AllocationScope;
+const Allocator = std.mem.Allocator;

src/bake/DevServer/DirectoryWatchStore.zig

@@ -47,6 +47,7 @@ pub fn trackResolutionFailure(store: *DirectoryWatchStore, import_source: []cons
         .json,
         .jsonc,
         .toml,
+        .yaml,
         .wasm,
         .napi,
         .base64,
@@ -100,14 +101,14 @@ fn insert(
     });
 
     if (store.dependencies_free_list.items.len == 0)
-        try store.dependencies.ensureUnusedCapacity(dev.allocator, 1);
+        try store.dependencies.ensureUnusedCapacity(dev.allocator(), 1);
 
-    const gop = try store.watches.getOrPut(dev.allocator, bun.strings.withoutTrailingSlashWindowsPath(dir_name_to_watch));
+    const gop = try store.watches.getOrPut(dev.allocator(), bun.strings.withoutTrailingSlashWindowsPath(dir_name_to_watch));
     const specifier_cloned = if (specifier[0] == '.' or std.fs.path.isAbsolute(specifier))
-        try dev.allocator.dupe(u8, specifier)
+        try dev.allocator().dupe(u8, specifier)
     else
-        try std.fmt.allocPrint(dev.allocator, "./{s}", .{specifier});
-    errdefer dev.allocator.free(specifier_cloned);
+        try std.fmt.allocPrint(dev.allocator(), "./{s}", .{specifier});
+    errdefer dev.allocator().free(specifier_cloned);
 
     if (gop.found_existing) {
         const dep = store.appendDepAssumeCapacity(.{
@@ -163,8 +164,8 @@ fn insert(
             if (owned_fd) "from dir cache" else "owned fd",
         });
 
-    const dir_name = try dev.allocator.dupe(u8, dir_name_to_watch);
-    errdefer dev.allocator.free(dir_name);
+    const dir_name = try dev.allocator().dupe(u8, dir_name_to_watch);
+    errdefer dev.allocator().free(dir_name);
 
     gop.key_ptr.* = bun.strings.withoutTrailingSlashWindowsPath(dir_name);
 

src/bake/DevServer/ErrorReportRequest.zig

@@ -22,7 +22,7 @@ body: uws.BodyReaderMixin(@This(), "body", runWithBody, finalize),
 pub fn run(dev: *DevServer, _: *Request, resp: anytype) void {
     const ctx = bun.new(ErrorReportRequest, .{
         .dev = dev,
-        .body = .init(dev.allocator),
+        .body = .init(dev.allocator()),
     });
     ctx.dev.server.?.onPendingRequest();
     ctx.body.readBody(resp);
@@ -41,8 +41,8 @@ pub fn runWithBody(ctx: *ErrorReportRequest, body: []const u8, r: AnyResponse) !
     var s = std.io.fixedBufferStream(body);
     const reader = s.reader();
 
-    var sfa_general = std.heap.stackFallback(65536, ctx.dev.allocator);
-    var sfa_sourcemap = std.heap.stackFallback(65536, ctx.dev.allocator);
+    var sfa_general = std.heap.stackFallback(65536, ctx.dev.allocator());
+    var sfa_sourcemap = std.heap.stackFallback(65536, ctx.dev.allocator());
     const temp_alloc = sfa_general.get();
     var arena = std.heap.ArenaAllocator.init(temp_alloc);
     defer arena.deinit();
@@ -169,8 +169,8 @@ pub fn runWithBody(ctx: *ErrorReportRequest, body: []const u8, r: AnyResponse) !
 
                 if (runtime_lines == null) {
                     const file = result.entry_files.get(@intCast(index - 1));
-                    if (file != .empty) {
-                        const json_encoded_source_code = file.ref.data.quotedContents();
+                    if (file.get()) |source_map| {
+                        const json_encoded_source_code = source_map.quotedContents();
                         // First line of interest is two above the target line.
                         const target_line = @as(usize, @intCast(frame.position.line.zeroBased()));
                         first_line_of_interest = target_line -| 2;
@@ -238,7 +238,7 @@ pub fn runWithBody(ctx: *ErrorReportRequest, body: []const u8, r: AnyResponse) !
         ) catch {},
     }
 
-    var out: std.ArrayList(u8) = .init(ctx.dev.allocator);
+    var out: std.ArrayList(u8) = .init(ctx.dev.allocator());
     errdefer out.deinit();
     const w = out.writer();
 

src/bake/DevServer/HmrSocket.zig

@@ -12,7 +12,7 @@ referenced_source_maps: std.AutoHashMapUnmanaged(SourceMapStore.Key, void),
 inspector_connection_id: i32 = -1,
 
 pub fn new(dev: *DevServer, res: anytype) *HmrSocket {
-    return bun.create(dev.allocator, HmrSocket, .{
+    return bun.create(dev.allocator(), HmrSocket, .{
         .dev = dev,
         .is_from_localhost = if (res.getRemoteSocketInfo()) |addr|
             if (addr.is_ipv6)
@@ -54,7 +54,7 @@ pub fn onMessage(s: *HmrSocket, ws: AnyWebSocket, msg: []const u8, opcode: uws.O
                 return ws.close();
             const source_map_id = SourceMapStore.Key.init(@as(u64, generation) << 32);
             if (s.dev.source_maps.removeOrUpgradeWeakRef(source_map_id, .upgrade)) {
-                s.referenced_source_maps.put(s.dev.allocator, source_map_id, {}) catch
+                s.referenced_source_maps.put(s.dev.allocator(), source_map_id, {}) catch
                     bun.outOfMemory();
             }
         },
@@ -164,9 +164,9 @@ pub fn onMessage(s: *HmrSocket, ws: AnyWebSocket, msg: []const u8, opcode: uws.O
                     event.entry_points,
                     true,
                     std.time.Timer.start() catch @panic("timers unsupported"),
-                ) catch bun.outOfMemory();
+                ) catch |err| bun.handleOom(err);
 
-                event.entry_points.deinit(s.dev.allocator);
+                event.entry_points.deinit(s.dev.allocator());
             },
         },
         .console_log => {
@@ -256,9 +256,9 @@ pub fn onClose(s: *HmrSocket, ws: AnyWebSocket, exit_code: i32, message: []const
     while (it.next()) |key| {
         s.dev.source_maps.unref(key.*);
     }
-    s.referenced_source_maps.deinit(s.dev.allocator);
+    s.referenced_source_maps.deinit(s.dev.allocator());
     bun.debugAssert(s.dev.active_websocket_connections.remove(s));
-    s.dev.allocator.destroy(s);
+    s.dev.allocator().destroy(s);
 }
 
 fn notifyInspectorClientNavigation(s: *const HmrSocket, pattern: []const u8, rbi: RouteBundle.Index.Optional) void {

src/bake/DevServer/HotReloadEvent.zig

@@ -52,12 +52,12 @@ pub fn isEmpty(ev: *const HotReloadEvent) bool {
 }
 
 pub fn appendFile(event: *HotReloadEvent, allocator: Allocator, file_path: []const u8) void {
-    _ = event.files.getOrPut(allocator, file_path) catch bun.outOfMemory();
+    _ = bun.handleOom(event.files.getOrPut(allocator, file_path));
 }
 
 pub fn appendDir(event: *HotReloadEvent, allocator: Allocator, dir_path: []const u8, maybe_sub_path: ?[]const u8) void {
     if (dir_path.len == 0) return;
-    _ = event.dirs.getOrPut(allocator, dir_path) catch bun.outOfMemory();
+    _ = bun.handleOom(event.dirs.getOrPut(allocator, dir_path));
 
     const sub_path = maybe_sub_path orelse return;
     if (sub_path.len == 0) return;
@@ -67,7 +67,7 @@ pub fn appendDir(event: *HotReloadEvent, allocator: Allocator, dir_path: []const
     const starts_with_sep = platform.isSeparator(sub_path[0]);
     const sep_offset: i32 = if (ends_with_sep and starts_with_sep) -1 else 1;
 
-    event.extra_files.ensureUnusedCapacity(allocator, @intCast(@as(i32, @intCast(dir_path.len + sub_path.len)) + sep_offset + 1)) catch bun.outOfMemory();
+    bun.handleOom(event.extra_files.ensureUnusedCapacity(allocator, @intCast(@as(i32, @intCast(dir_path.len + sub_path.len)) + sep_offset + 1)));
     event.extra_files.appendSliceAssumeCapacity(if (ends_with_sep) dir_path[0 .. dir_path.len - 1] else dir_path);
     event.extra_files.appendAssumeCapacity(platform.separator());
     event.extra_files.appendSliceAssumeCapacity(sub_path);
@@ -110,8 +110,8 @@ pub fn processFileList(
                     // this resolution result is not preserved as passing it
                     // into BundleV2 is too complicated. the resolution is
                     // cached, anyways.
-                    event.appendFile(dev.allocator, dep.source_file_path);
-                    dev.directory_watchers.freeDependencyIndex(dev.allocator, index) catch bun.outOfMemory();
+                    event.appendFile(dev.allocator(), dep.source_file_path);
+                    bun.handleOom(dev.directory_watchers.freeDependencyIndex(dev.allocator(), index));
                 } else {
                     // rebuild a new linked list for unaffected files
                     dep.next = new_chain;
@@ -123,23 +123,23 @@ pub fn processFileList(
                 entry.first_dep = new_first_dep;
             } else {
                 // without any files to depend on this watcher is freed
-                dev.directory_watchers.freeEntry(dev.allocator, watcher_index);
+                dev.directory_watchers.freeEntry(dev.allocator(), watcher_index);
             }
         }
     };
 
     var rest_extra = event.extra_files.items;
     while (bun.strings.indexOfChar(rest_extra, 0)) |str| {
-        event.files.put(dev.allocator, rest_extra[0..str], {}) catch bun.outOfMemory();
+        bun.handleOom(event.files.put(dev.allocator(), rest_extra[0..str], {}));
         rest_extra = rest_extra[str + 1 ..];
     }
     if (rest_extra.len > 0) {
-        event.files.put(dev.allocator, rest_extra, {}) catch bun.outOfMemory();
+        bun.handleOom(event.files.put(dev.allocator(), rest_extra, {}));
     }
 
     const changed_file_paths = event.files.keys();
     inline for (.{ &dev.server_graph, &dev.client_graph }) |g| {
-        g.invalidate(changed_file_paths, entry_points, temp_alloc) catch bun.outOfMemory();
+        bun.handleOom(g.invalidate(changed_file_paths, entry_points, temp_alloc));
     }
 
     if (entry_points.set.count() == 0) {
@@ -163,10 +163,9 @@ pub fn processFileList(
 
     if (dev.has_tailwind_plugin_hack) |*map| {
         for (map.keys()) |abs_path| {
-            const file = dev.client_graph.bundled_files.get(abs_path) orelse
-                continue;
-            if (file.flags.kind == .css)
-                entry_points.appendCss(temp_alloc, abs_path) catch bun.outOfMemory();
+            const file = (dev.client_graph.bundled_files.get(abs_path) orelse continue).unpack();
+            if (file.kind() == .css)
+                bun.handleOom(entry_points.appendCss(temp_alloc, abs_path));
         }
     }
 }
@@ -188,7 +187,7 @@ pub fn run(first: *HotReloadEvent) void {
         return;
     }
 
-    var sfb = std.heap.stackFallback(4096, dev.allocator);
+    var sfb = std.heap.stackFallback(4096, dev.allocator());
     const temp_alloc = sfb.get();
     var entry_points: EntryPointList = .empty;
     defer entry_points.deinit(temp_alloc);
@@ -213,7 +212,7 @@ pub fn run(first: *HotReloadEvent) void {
     switch (dev.testing_batch_events) {
         .disabled => {},
         .enabled => |*ev| {
-            ev.append(dev, entry_points) catch bun.outOfMemory();
+            bun.handleOom(ev.append(dev, entry_points));
             dev.publish(.testing_watch_synchronization, &.{
                 MessageId.testing_watch_synchronization.char(),
                 1,

src/bake/DevServer/PackedMap.zig

@@ -1,23 +1,14 @@
-/// Packed source mapping data for a single file.
-/// Owned by one IncrementalGraph file and/or multiple SourceMapStore entries.
-pub const PackedMap = @This();
+//! Packed source mapping data for a single file.
+//! Owned by one IncrementalGraph file and/or multiple SourceMapStore entries.
+const Self = @This();
 
-const RefCount = bun.ptr.RefCount(@This(), "ref_count", destroy, .{
-    .destructor_ctx = *DevServer,
-});
-
-ref_count: RefCount,
-/// Allocated by `dev.allocator`. Access with `.vlq()`
+/// Allocated by `dev.allocator()`. Access with `.vlq()`
 /// This is stored to allow lazy construction of source map files.
-vlq_ptr: [*]u8,
-vlq_len: u32,
-vlq_allocator: std.mem.Allocator,
+vlq_: ScopedOwned([]u8),
 /// The bundler runs quoting on multiple threads, so it only makes
 /// sense to preserve that effort for concatenation and
 /// re-concatenation.
-// TODO: rename to `escaped_source_*`
-quoted_contents_ptr: [*]u8,
-quoted_contents_len: u32,
+escaped_source: Owned([]u8),
 /// Used to track the last state of the source map chunk. This
 /// is used when concatenating chunks. The generated column is
 /// not tracked because it is always zero (all chunks end in a
@@ -27,22 +18,13 @@ end_state: struct {
     original_line: i32,
     original_column: i32,
 },
-/// There is 32 bits of extra padding in this struct. These are used while
-/// implementing `DevServer.memoryCost` to check which PackedMap entries are
-/// already counted for.
-bits_used_for_memory_cost_dedupe: u32 = 0,
 
-pub fn newNonEmpty(chunk: SourceMap.Chunk, quoted_contents: []u8) bun.ptr.RefPtr(PackedMap) {
-    assert(chunk.buffer.list.items.len > 0);
+pub fn newNonEmpty(chunk: SourceMap.Chunk, escaped_source: Owned([]u8)) bun.ptr.Shared(*Self) {
     var buffer = chunk.buffer;
-    const slice = buffer.toOwnedSlice();
+    assert(!buffer.isEmpty());
     return .new(.{
-        .ref_count = .init(),
-        .vlq_ptr = slice.ptr,
-        .vlq_len = @intCast(slice.len),
-        .vlq_allocator = buffer.allocator,
-        .quoted_contents_ptr = quoted_contents.ptr,
-        .quoted_contents_len = @intCast(quoted_contents.len),
+        .vlq_ = .fromDynamic(buffer.toDynamicOwned()),
+        .escaped_source = escaped_source,
         .end_state = .{
             .original_line = chunk.end_state.original_line,
             .original_column = chunk.end_state.original_column,
@@ -50,125 +32,90 @@ pub fn newNonEmpty(chunk: SourceMap.Chunk, quoted_contents: []u8) bun.ptr.RefPtr
     });
 }
 
-fn destroy(self: *@This(), _: *DevServer) void {
-    self.vlq_allocator.free(self.vlq());
-    bun.destroy(self);
+pub fn deinit(self: *Self) void {
+    self.vlq_.deinit();
+    self.escaped_source.deinit();
 }
 
-pub fn memoryCost(self: *const @This()) usize {
-    return self.vlq_len + self.quoted_contents_len + @sizeOf(@This());
+pub fn memoryCost(self: *const Self) usize {
+    return self.vlq().len + self.quotedContents().len + @sizeOf(Self);
 }
 
-/// When DevServer iterates everything to calculate memory usage, it passes
-/// a generation number along which is different on each sweep, but
-/// consistent within one. It is used to avoid counting memory twice.
-pub fn memoryCostWithDedupe(self: *@This(), new_dedupe_bits: u32) usize {
-    if (self.bits_used_for_memory_cost_dedupe == new_dedupe_bits) {
-        return 0; // already counted.
-    }
-    self.bits_used_for_memory_cost_dedupe = new_dedupe_bits;
-    return self.memoryCost();
-}
-
-pub fn vlq(self: *const @This()) []u8 {
-    return self.vlq_ptr[0..self.vlq_len];
+pub fn vlq(self: *const Self) []const u8 {
+    return self.vlq_.getConst();
 }
 
 // TODO: rename to `escapedSource`
-pub fn quotedContents(self: *const @This()) []u8 {
-    return self.quoted_contents_ptr[0..self.quoted_contents_len];
+pub fn quotedContents(self: *const Self) []const u8 {
+    return self.escaped_source.getConst();
 }
 
 comptime {
+    // `ci_assert` builds add a `safety.ThreadLock`
     if (!Environment.ci_assert) {
-        assert_eql(@sizeOf(@This()), @sizeOf(usize) * 7);
-        assert_eql(@alignOf(@This()), @alignOf(usize));
+        assert_eql(@sizeOf(Self), @sizeOf(usize) * 5);
+        assert_eql(@alignOf(Self), @alignOf(usize));
     }
 }
 
+const PackedMap = Self;
+
+pub const LineCount = bun.GenericIndex(u32, u8);
+
 /// HTML, CSS, Assets, and failed files do not have source maps. These cases
 /// should never allocate an object. There is still relevant state for these
-/// files to encode, so those fields fit within the same 64 bits the pointer
-/// would have used.
-///
-/// The tag is stored out of line with `Untagged`
-/// - `IncrementalGraph(.client).File` offloads this bit into `File.Flags`
-/// - `SourceMapStore.Entry` uses `MultiArrayList`
-pub const RefOrEmpty = union(enum(u1)) {
-    ref: bun.ptr.RefPtr(PackedMap),
-    empty: Empty,
+/// files to encode, so a tagged union is used.
+pub const Shared = union(enum) {
+    some: bun.ptr.Shared(*PackedMap),
+    none: void,
+    line_count: LineCount,
 
-    pub const Empty = struct {
-        /// Number of lines to skip when there is an associated JS chunk.
-        line_count: bun.GenericIndex(u32, u8).Optional,
-        /// This technically is not source-map related, but
-        /// all HTML files have no source map, so this can
-        /// fit in this space.
-        html_bundle_route_index: RouteBundle.Index.Optional,
-    };
+    pub fn get(self: Shared) ?*PackedMap {
+        return switch (self) {
+            .some => |ptr| ptr.get(),
+            else => null,
+        };
+    }
 
-    pub const blank_empty: @This() = .{ .empty = .{
-        .line_count = .none,
-        .html_bundle_route_index = .none,
-    } };
-
-    pub fn deref(map: *const @This(), dev: *DevServer) void {
-        switch (map.*) {
-            .ref => |ptr| ptr.derefWithContext(dev),
-            .empty => {},
+    pub fn take(self: *Shared) ?bun.ptr.Shared(*PackedMap) {
+        switch (self.*) {
+            .some => |ptr| {
+                self.* = .none;
+                return ptr;
+            },
+            else => return null,
         }
     }
 
-    pub fn dupeRef(map: *const @This()) @This() {
-        return switch (map.*) {
-            .ref => |ptr| .{ .ref = ptr.dupeRef() },
-            .empty => map.*,
+    pub fn clone(self: Shared) Shared {
+        return switch (self) {
+            .some => |ptr| .{ .some = ptr.clone() },
+            else => self,
         };
     }
 
-    pub fn untag(map: @This()) Untagged {
-        return switch (map) {
-            .ref => |ptr| .{ .ref = ptr },
-            .empty => |empty| .{ .empty = empty },
-        };
+    pub fn deinit(self: Shared) void {
+        switch (self) {
+            .some => |ptr| ptr.deinit(),
+            else => {},
+        }
     }
 
-    pub const Tag = @typeInfo(@This()).@"union".tag_type.?;
-    pub const Untagged = brk: {
-        @setRuntimeSafety(Environment.isDebug); // do not store a union tag in windows release
-        break :brk union {
-            ref: bun.ptr.RefPtr(PackedMap),
-            empty: Empty,
-
-            pub const blank_empty = RefOrEmpty.blank_empty.untag();
-
-            pub fn decode(untagged: @This(), tag: Tag) RefOrEmpty {
-                return switch (tag) {
-                    .ref => .{ .ref = untagged.ref },
-                    .empty => .{ .empty = untagged.empty },
-                };
-            }
-
-            comptime {
-                if (!Environment.isDebug) {
-                    assert_eql(@sizeOf(@This()), @sizeOf(usize));
-                    assert_eql(@alignOf(@This()), @alignOf(usize));
-                }
-            }
+    /// Amortized memory cost across all references to the same `PackedMap`
+    pub fn memoryCost(self: Shared) usize {
+        return switch (self) {
+            .some => |ptr| ptr.get().memoryCost() / ptr.strongCount(),
+            else => 0,
         };
-    };
+    }
 };
 
-const std = @import("std");
-
 const bun = @import("bun");
 const Environment = bun.Environment;
 const SourceMap = bun.sourcemap;
 const assert = bun.assert;
 const assert_eql = bun.assert_eql;
-const bake = bun.bake;
 const Chunk = bun.bundle_v2.Chunk;
-const RefPtr = bun.ptr.RefPtr;
 
-const DevServer = bake.DevServer;
-const RouteBundle = DevServer.RouteBundle;
+const Owned = bun.ptr.Owned;
+const ScopedOwned = bun.ptr.ScopedOwned;

src/bake/DevServer/SerializedFailure.zig

@@ -9,12 +9,12 @@
 /// for deterministic output; there is code in DevServer that uses `swapRemove`.
 pub const SerializedFailure = @This();
 
-/// Serialized data is always owned by dev.allocator
+/// Serialized data is always owned by dev.allocator()
 /// The first 32 bits of this slice contain the owner
 data: []u8,
 
 pub fn deinit(f: SerializedFailure, dev: *DevServer) void {
-    dev.allocator.free(f.data);
+    dev.allocator().free(f.data);
 }
 
 /// The metaphorical owner of an incremental file error. The packed variant
@@ -110,7 +110,7 @@ pub fn initFromJs(dev: *DevServer, owner: Owner, value: JSValue) !SerializedFail
         @panic("TODO");
     }
     // Avoid small re-allocations without requesting so much from the heap
-    var sfb = std.heap.stackFallback(65536, dev.allocator);
+    var sfb = std.heap.stackFallback(65536, dev.allocator());
     var payload = std.ArrayList(u8).initCapacity(sfb.get(), 65536) catch
         unreachable; // enough space
     const w = payload.writer();
@@ -120,7 +120,7 @@ pub fn initFromJs(dev: *DevServer, owner: Owner, value: JSValue) !SerializedFail
 
     // Avoid-recloning if it is was moved to the hap
     const data = if (payload.items.ptr == &sfb.buffer)
-        try dev.allocator.dupe(u8, payload.items)
+        try dev.allocator().dupe(u8, payload.items)
     else
         payload.items;
 
@@ -137,7 +137,7 @@ pub fn initFromLog(
     assert(messages.len > 0);
 
     // Avoid small re-allocations without requesting so much from the heap
-    var sfb = std.heap.stackFallback(65536, dev.allocator);
+    var sfb = std.heap.stackFallback(65536, dev.allocator());
     var payload = std.ArrayList(u8).initCapacity(sfb.get(), 65536) catch
         unreachable; // enough space
     const w = payload.writer();
@@ -154,7 +154,7 @@ pub fn initFromLog(
 
     // Avoid-recloning if it is was moved to the hap
     const data = if (payload.items.ptr == &sfb.buffer)
-        try dev.allocator.dupe(u8, payload.items)
+        try dev.allocator().dupe(u8, payload.items)
     else
         payload.items;
 

src/bake/DevServer/SourceMapStore.zig

@@ -1,14 +1,14 @@
-/// Storage for source maps on `/_bun/client/{id}.js.map`
-///
-/// All source maps are referenced counted, so that when a websocket disconnects
-/// or a bundle is replaced, the unreachable source map URLs are revoked. Source
-/// maps that aren't reachable from IncrementalGraph can still be reached by
-/// a browser tab if it has a callback to a previously loaded chunk; so DevServer
-/// should be aware of it.
-pub const SourceMapStore = @This();
+//! Storage for source maps on `/_bun/client/{id}.js.map`
+//!
+//! All source maps are referenced counted, so that when a websocket disconnects
+//! or a bundle is replaced, the unreachable source map URLs are revoked. Source
+//! maps that aren't reachable from IncrementalGraph can still be reached by
+//! a browser tab if it has a callback to a previously loaded chunk; so DevServer
+//! should be aware of it.
+const Self = @This();
 
 /// See `SourceId` for what the content of u64 is.
-pub const Key = bun.GenericIndex(u64, .{ "Key of", SourceMapStore });
+pub const Key = bun.GenericIndex(u64, .{ "Key of", Self });
 
 entries: AutoArrayHashMapUnmanaged(Key, Entry),
 /// When a HTML bundle is loaded, it places a "weak reference" to the
@@ -20,7 +20,7 @@ weak_refs: bun.LinearFifo(WeakRef, .{ .Static = weak_ref_entry_max }),
 /// Shared
 weak_ref_sweep_timer: EventLoopTimer,
 
-pub const empty: SourceMapStore = .{
+pub const empty: Self = .{
     .entries = .empty,
     .weak_ref_sweep_timer = .initPaused(.DevServerSweepSourceMaps),
     .weak_refs = .init(),
@@ -54,6 +54,7 @@ pub const SourceId = packed struct(u64) {
 /// `SourceMapStore.Entry` is the information + refcount holder to
 /// construct the actual JSON file associated with a bundle/hot update.
 pub const Entry = struct {
+    dev_allocator: DevAllocator,
     /// Sum of:
     /// - How many active sockets have code that could reference this source map?
     /// - For route bundle client scripts, +1 until invalidation.
@@ -62,13 +63,13 @@ pub const Entry = struct {
     /// Outer slice is owned, inner slice is shared with IncrementalGraph.
     paths: []const []const u8,
     /// Indexes are off by one because this excludes the HMR Runtime.
-    files: bun.MultiArrayList(PackedMap.RefOrEmpty),
+    files: bun.MultiArrayList(PackedMap.Shared),
     /// The memory cost can be shared between many entries and IncrementalGraph
     /// So this is only used for eviction logic, to pretend this was the only
     /// entry. To compute the memory cost of DevServer, this cannot be used.
     overlapping_memory_cost: u32,
 
-    pub fn sourceContents(entry: @This()) []const bun.StringPointer {
+    pub fn sourceContents(entry: Entry) []const bun.StringPointer {
         return entry.source_contents[0..entry.file_paths.len];
     }
 
@@ -145,16 +146,16 @@ pub const Entry = struct {
         j.pushStatic(
             \\],"sourcesContent":["// (Bun's internal HMR runtime is minified)"
         );
-        for (map_files.items(.tags), map_files.items(.data)) |tag, chunk| {
-            // For empty chunks, put a blank entry. This allows HTML
-            // files to get their stack remapped, despite having no
-            // actual mappings.
-            if (tag == .empty) {
+        for (0..map_files.len) |i| {
+            const chunk = map_files.get(i);
+            const source_map = chunk.get() orelse {
+                // For empty chunks, put a blank entry. This allows HTML files to get their stack
+                // remapped, despite having no actual mappings.
                 j.pushStatic(",\"\"");
                 continue;
-            }
+            };
             j.pushStatic(",");
-            const quoted_slice = chunk.ref.data.quotedContents();
+            const quoted_slice = source_map.quotedContents();
             if (quoted_slice.len == 0) {
                 bun.debugAssert(false); // vlq without source contents!
                 j.pushStatic(",\"// Did not have source contents for this file.\n// This is a bug in Bun's bundler and should be reported with a reproduction.\"");
@@ -210,20 +211,10 @@ pub const Entry = struct {
         var lines_between: u32 = runtime.line_count + 2;
 
         // Join all of the mappings together.
-        for (map_files.items(.tags), map_files.items(.data), 1..) |tag, chunk, source_index| switch (tag) {
-            .empty => {
-                lines_between += (chunk.empty.line_count.unwrap() orelse
-                    // NOTE: It is too late to compute this info since the
-                    // bundled text may have been freed already. For example, a
-                    // HMR chunk is never persisted.
-                    @panic("Missing internal precomputed line count.")).get();
-
-                // - Empty file has no breakpoints that could remap.
-                // - Codegen of HTML files cannot throw.
-                continue;
-            },
-            .ref => {
-                const content = chunk.ref.data;
+        for (0..map_files.len) |i| switch (map_files.get(i)) {
+            .some => |source_map| {
+                const source_index = i + 1;
+                const content = source_map.get();
                 const start_state: SourceMap.SourceMapState = .{
                     .source_index = @intCast(source_index),
                     .generated_line = @intCast(lines_between),
@@ -249,24 +240,37 @@ pub const Entry = struct {
                     .original_column = content.end_state.original_column,
                 };
             },
+            .line_count => |count| {
+                lines_between += count.get();
+                // - Empty file has no breakpoints that could remap.
+                // - Codegen of HTML files cannot throw.
+            },
+            .none => {
+                // NOTE: It is too late to compute the line count since the bundled text may
+                // have been freed already. For example, a HMR chunk is never persisted.
+                @panic("Missing internal precomputed line count.");
+            },
         };
     }
 
-    pub fn deinit(entry: *Entry, dev: *DevServer) void {
-        _ = VoidFieldTypes(Entry){
+    pub fn deinit(entry: *Entry) void {
+        useAllFields(Entry, .{
+            .dev_allocator = {},
             .ref_count = assert(entry.ref_count == 0),
             .overlapping_memory_cost = {},
             .files = {
-                for (entry.files.items(.tags), entry.files.items(.data)) |tag, data| {
-                    switch (tag) {
-                        .ref => data.ref.derefWithContext(dev),
-                        .empty => {},
-                    }
+                const files = entry.files.slice();
+                for (0..files.len) |i| {
+                    files.get(i).deinit();
                 }
-                entry.files.deinit(dev.allocator);
+                entry.files.deinit(entry.allocator());
             },
-            .paths = dev.allocator.free(entry.paths),
-        };
+            .paths = entry.allocator().free(entry.paths),
+        });
+    }
+
+    fn allocator(entry: *const Entry) Allocator {
+        return entry.dev_allocator.get();
     }
 };
 
@@ -297,10 +301,18 @@ pub const WeakRef = struct {
     }
 };
 
-pub fn owner(store: *SourceMapStore) *DevServer {
+pub fn owner(store: *Self) *DevServer {
     return @alignCast(@fieldParentPtr("source_maps", store));
 }
 
+fn dev_allocator(store: *Self) DevAllocator {
+    return store.owner().dev_allocator();
+}
+
+fn allocator(store: *Self) Allocator {
+    return store.dev_allocator().get();
+}
+
 const PutOrIncrementRefCount = union(enum) {
     /// If an *Entry is returned, caller must initialize some
     /// fields with the source map data.
@@ -308,11 +320,13 @@ const PutOrIncrementRefCount = union(enum) {
     /// Already exists, ref count was incremented.
     shared: *Entry,
 };
-pub fn putOrIncrementRefCount(store: *SourceMapStore, script_id: Key, ref_count: u32) !PutOrIncrementRefCount {
-    const gop = try store.entries.getOrPut(store.owner().allocator, script_id);
+
+pub fn putOrIncrementRefCount(store: *Self, script_id: Key, ref_count: u32) !PutOrIncrementRefCount {
+    const gop = try store.entries.getOrPut(store.allocator(), script_id);
     if (!gop.found_existing) {
         bun.debugAssert(ref_count > 0); // invalid state
         gop.value_ptr.* = .{
+            .dev_allocator = store.dev_allocator(),
             .ref_count = ref_count,
             .overlapping_memory_cost = undefined,
             .paths = undefined,
@@ -326,29 +340,29 @@ pub fn putOrIncrementRefCount(store: *SourceMapStore, script_id: Key, ref_count:
     }
 }
 
-pub fn unref(store: *SourceMapStore, key: Key) void {
+pub fn unref(store: *Self, key: Key) void {
     unrefCount(store, key, 1);
 }
 
-pub fn unrefCount(store: *SourceMapStore, key: Key, count: u32) void {
+pub fn unrefCount(store: *Self, key: Key, count: u32) void {
     const index = store.entries.getIndex(key) orelse
         return bun.debugAssert(false);
     unrefAtIndex(store, index, count);
 }
 
-fn unrefAtIndex(store: *SourceMapStore, index: usize, count: u32) void {
+fn unrefAtIndex(store: *Self, index: usize, count: u32) void {
     const e = &store.entries.values()[index];
     e.ref_count -= count;
     if (bun.Environment.enable_logs) {
         mapLog("dec {x}, {d} | {d} -> {d}", .{ store.entries.keys()[index].get(), count, e.ref_count + count, e.ref_count });
     }
     if (e.ref_count == 0) {
-        e.deinit(store.owner());
+        e.deinit();
         store.entries.swapRemoveAt(index);
     }
 }
 
-pub fn addWeakRef(store: *SourceMapStore, key: Key) void {
+pub fn addWeakRef(store: *Self, key: Key) void {
     // This function expects that `weak_ref_entry_max` is low.
     const entry = store.entries.getPtr(key) orelse
         return bun.debugAssert(false);
@@ -390,7 +404,7 @@ pub fn addWeakRef(store: *SourceMapStore, key: Key) void {
 }
 
 /// Returns true if the ref count was incremented (meaning there was a source map to transfer)
-pub fn removeOrUpgradeWeakRef(store: *SourceMapStore, key: Key, mode: enum(u1) {
+pub fn removeOrUpgradeWeakRef(store: *Self, key: Key, mode: enum(u1) {
     /// Remove the weak ref entirely
     remove = 0,
     /// Convert the weak ref into a strong ref
@@ -420,7 +434,7 @@ pub fn removeOrUpgradeWeakRef(store: *SourceMapStore, key: Key, mode: enum(u1) {
     return true;
 }
 
-pub fn locateWeakRef(store: *SourceMapStore, key: Key) ?struct { index: usize, ref: WeakRef } {
+pub fn locateWeakRef(store: *Self, key: Key) ?struct { index: usize, ref: WeakRef } {
     for (0..store.weak_refs.count) |i| {
         const ref = store.weak_refs.peekItem(i);
         if (ref.key() == key) return .{ .index = i, .ref = ref };
@@ -430,7 +444,7 @@ pub fn locateWeakRef(store: *SourceMapStore, key: Key) ?struct { index: usize, r
 
 pub fn sweepWeakRefs(timer: *EventLoopTimer, now_ts: *const bun.timespec) EventLoopTimer.Arm {
     mapLog("sweepWeakRefs", .{});
-    const store: *SourceMapStore = @fieldParentPtr("weak_ref_sweep_timer", timer);
+    const store: *Self = @fieldParentPtr("weak_ref_sweep_timer", timer);
     assert(store.owner().magic == .valid);
 
     const now: u64 = @max(now_ts.sec, 0);
@@ -461,23 +475,23 @@ pub const GetResult = struct {
     index: bun.GenericIndex(u32, Entry),
     mappings: SourceMap.Mapping.List,
     file_paths: []const []const u8,
-    entry_files: *const bun.MultiArrayList(PackedMap.RefOrEmpty),
+    entry_files: *const bun.MultiArrayList(PackedMap.Shared),
 
-    pub fn deinit(self: *@This(), allocator: Allocator) void {
-        self.mappings.deinit(allocator);
+    pub fn deinit(self: *@This(), alloc: Allocator) void {
+        self.mappings.deinit(alloc);
         // file paths and source contents are borrowed
     }
 };
 
 /// This is used in exactly one place: remapping errors.
 /// In that function, an arena allows reusing memory between different source maps
-pub fn getParsedSourceMap(store: *SourceMapStore, script_id: Key, arena: Allocator, gpa: Allocator) ?GetResult {
+pub fn getParsedSourceMap(store: *Self, script_id: Key, arena: Allocator, gpa: Allocator) ?GetResult {
     const index = store.entries.getIndex(script_id) orelse
         return null; // source map was collected.
     const entry = &store.entries.values()[index];
 
-    const script_id_decoded: SourceMapStore.SourceId = @bitCast(script_id.get());
-    const vlq_bytes = entry.renderMappings(script_id_decoded.kind, arena, arena) catch bun.outOfMemory();
+    const script_id_decoded: SourceId = @bitCast(script_id.get());
+    const vlq_bytes = bun.handleOom(entry.renderMappings(script_id_decoded.kind, arena, arena));
 
     switch (SourceMap.Mapping.parse(
         gpa,
@@ -509,11 +523,12 @@ const SourceMap = bun.sourcemap;
 const StringJoiner = bun.StringJoiner;
 const assert = bun.assert;
 const bake = bun.bake;
-const VoidFieldTypes = bun.meta.VoidFieldTypes;
+const useAllFields = bun.meta.useAllFields;
 const EventLoopTimer = bun.api.Timer.EventLoopTimer;
 
 const DevServer = bun.bake.DevServer;
 const ChunkKind = DevServer.ChunkKind;
+const DevAllocator = DevServer.DevAllocator;
 const PackedMap = DevServer.PackedMap;
 const dumpBundle = DevServer.dumpBundle;
 const mapLog = DevServer.mapLog;

src/bake/DevServer/memory_cost.zig

@@ -23,12 +23,9 @@ pub fn memoryCostDetailed(dev: *DevServer) MemoryCost {
     var js_code: usize = 0;
     var source_maps: usize = 0;
     var assets: usize = 0;
-    const dedupe_bits: u32 = @truncate(@abs(std.time.nanoTimestamp()));
-    const discard = voidFieldTypeDiscardHelper;
     // See https://github.com/ziglang/zig/issues/21879
-    _ = VoidFieldTypes(DevServer){
+    useAllFields(DevServer, .{
         // does not contain pointers
-        .allocator = {},
         .assume_perfect_incremental_bundling = {},
         .bun_watcher = {},
         .bundles_since_last_error = {},
@@ -71,13 +68,13 @@ pub fn memoryCostDetailed(dev: *DevServer) MemoryCost {
             other_bytes += bundle.memoryCost();
         },
         .server_graph = {
-            const cost = dev.server_graph.memoryCostDetailed(dedupe_bits);
+            const cost = dev.server_graph.memoryCostDetailed();
             incremental_graph_server += cost.graph;
             js_code += cost.code;
             source_maps += cost.source_maps;
         },
         .client_graph = {
-            const cost = dev.client_graph.memoryCostDetailed(dedupe_bits);
+            const cost = dev.client_graph.memoryCostDetailed();
             incremental_graph_client += cost.graph;
             js_code += cost.code;
             source_maps += cost.source_maps;
@@ -92,15 +89,13 @@ pub fn memoryCostDetailed(dev: *DevServer) MemoryCost {
             other_bytes += memoryCostArrayHashMap(dev.source_maps.entries);
             for (dev.source_maps.entries.values()) |entry| {
                 source_maps += entry.files.memoryCost();
-                for (entry.files.items(.tags), entry.files.items(.data)) |tag, data| {
-                    switch (tag) {
-                        .ref => source_maps += data.ref.data.memoryCostWithDedupe(dedupe_bits),
-                        .empty => {},
-                    }
+                const files = entry.files.slice();
+                for (0..files.len) |i| {
+                    source_maps += files.get(i).memoryCost();
                 }
             }
         },
-        .incremental_result = discard(VoidFieldTypes(IncrementalResult){
+        .incremental_result = useAllFields(IncrementalResult, .{
             .had_adjusted_edges = {},
             .client_components_added = {
                 other_bytes += memoryCostArrayList(dev.incremental_result.client_components_added);
@@ -176,7 +171,7 @@ pub fn memoryCostDetailed(dev: *DevServer) MemoryCost {
             },
             .enable_after_bundle => {},
         },
-    };
+    });
     return .{
         .assets = assets,
         .incremental_graph_client = incremental_graph_client,
@@ -210,12 +205,10 @@ const std = @import("std");
 
 const bun = @import("bun");
 const jsc = bun.jsc;
+const useAllFields = bun.meta.useAllFields;
 const HTMLBundle = jsc.API.HTMLBundle;
 
 const DevServer = bun.bake.DevServer;
 const DeferredRequest = DevServer.DeferredRequest;
 const HmrSocket = DevServer.HmrSocket;
 const IncrementalResult = DevServer.IncrementalResult;
-
-const VoidFieldTypes = bun.meta.VoidFieldTypes;
-const voidFieldTypeDiscardHelper = bun.meta.voidFieldTypeDiscardHelper;

src/bun.js.zig

@@ -468,6 +468,7 @@ pub const Run = struct {
 
         bun.api.napi.fixDeadCodeElimination();
         bun.crash_handler.fixDeadCodeElimination();
+        @import("./bun.js/bindings/JSSecrets.zig").fixDeadCodeElimination();
         vm.globalExit();
     }
 

src/bun.js/ConsoleObject.zig

@@ -1371,7 +1371,7 @@ pub const Formatter = struct {
                     .UnlinkedEvalCodeBlock,
                     .UnlinkedFunctionCodeBlock,
                     .CodeBlock,
-                    .JSImmutableButterfly,
+                    .JSCellButterfly,
                     .JSSourceCode,
                     .JSScriptFetcher,
                     .JSScriptFetchParameters,
@@ -2060,7 +2060,7 @@ pub const Formatter = struct {
             if (!this.stack_check.isSafeToRecurse()) {
                 this.failed = true;
                 if (this.can_throw_stack_overflow) {
-                    this.globalThis.throwStackOverflow();
+                    return this.globalThis.throwStackOverflow();
                 }
                 return;
             }

src/bun.js/Debugger.zig

@@ -56,7 +56,7 @@ pub fn waitForDebuggerIfNecessary(this: *VirtualMachine) void {
         // TODO: remove this when tickWithTimeout actually works properly on Windows.
         if (debugger.wait_for_connection == .shortly) {
             uv.uv_update_time(this.uvLoop());
-            var timer = bun.default_allocator.create(uv.Timer) catch bun.outOfMemory();
+            var timer = bun.handleOom(bun.default_allocator.create(uv.Timer));
             timer.* = std.mem.zeroes(uv.Timer);
             timer.init(this.uvLoop());
             const onDebuggerTimer = struct {