Merge branch 'main' into jarred/request-finalizer

Make it clearer this refers to JS request object
safer
2026-02-04 07:58:54 +00:00 · 2023-04-26 01:31:09 -07:00 · 2023-04-25 22:09:56 -07:00 · 2023-04-25 21:59:19 -07:00 · 2023-04-25 21:47:42 -07:00
807 changed files with 75543 additions and 156384 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,26 +8,3 @@ src/bun.js/bindings/sqlite/sqlite3_local.h linguist-vendored
 *.zig text eol=lf
 src/bun.js/bindings/simdutf.cpp linguist-vendored
 src/bun.js/bindings/simdutf.h linguist-vendored
-
-src/js/out/WebCoreJSBuiltins.cpp linguist-generated
-src/js/out/WebCoreJSBuiltins.h linguist-generated
-src/js/out/WebCoreJSBuiltins.d.ts linguist-generated
-
-src/bun.js/bindings/ZigGeneratedClasses.h linguist-generated
-src/bun.js/bindings/ZigGeneratedClasses.cpp linguist-generated
-
-src/bun.js/bindings/ZigGeneratedCode.h linguist-generated
-src/bun.js/bindings/ZigGeneratedCode.cpp linguist-generated
-
-src/bun.js/bindings/headers.h linguist-generated
-src/bun.js/bindings/headers.zig linguist-generated
-
-src/bun.js/bindings/JSSink.h linguist-generated
-src/bun.js/bindings/JSSink.zig linguist-generated
-
-src/bun.js/bindings/ZigGeneratedClasses+DOMClientIsoSubspaces.h linguist-generated
-src/bun.js/bindings/ZigGeneratedClasses+DOMIsoSubspaces.h linguist-generated
-src/bun.js/bindings/ZigGeneratedClasses+lazyStructureHeader.h linguist-generated
-src/bun.js/bindings/ZigGeneratedClasses+lazyStructureImpl.h linguist-generated
-
-docs/**/* linguist-documentation
--- a/.github/workflows/bun-deploy-site.yml
+++ b/.github/workflows/bun-deploy-site.yml
@@ -12,7 +12,6 @@ jobs:
  deploy:
    name: Deploy site
    runs-on: ubuntu-latest
-    if: github.repository_owner == 'oven-sh'
    steps:
      - name: Trigger Vercel build
-        run: curl ${{ secrets.VERCEL_DEPLOY_HOOK }}
+        run: curl ${{ secrets.VERCEL_DEPLOY_HOOK }}
--- a/.github/workflows/bun-ecosystem-test.yml
+++ b/.github/workflows/bun-ecosystem-test.yml
@@ -1,50 +0,0 @@
-name: bun-ecosystem-test
-
-on:
-  schedule:
-    - cron: "0 15 * * *" # every day at 7am PST
-  workflow_dispatch:
-    inputs:
-      version:
-        description: "The version of Bun to run"
-        required: true
-        default: "canary"
-        type: string
-jobs:
-  test:
-    name: ${{ matrix.tag }}
-    runs-on: ${{ matrix.os }}
-    if: github.repository_owner == 'oven-sh'
-    timeout-minutes: 10
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            tag: linux-x64
-            url: linux/x64?avx2=true
-          - os: ubuntu-latest
-            tag: linux-x64-baseline
-            url: linux/x64?baseline=true
-          # FIXME: runner fails with "No tests found"?
-          #- os: macos-latest
-          #  tag: darwin-x64
-          #  url: darwin/x64?avx2=true
-          - os: macos-latest
-            tag: darwin-x64-baseline
-            url: darwin/x64?baseline=true
-    steps:
-      - id: checkout
-        name: Checkout
-        uses: Bhacaz/checkout-files@v2
-        with:
-          files: packages/bun-internal-test
-      - id: setup
-        name: Setup
-        uses: oven-sh/setup-bun@v1
-        with:
-          bun-download-url: https://bun.sh/download/${{ github.event.inputs.version }}/${{ matrix.url }}
-      - id: test
-        name: Test
-        working-directory: packages/bun-internal-test
-        run: bun run test:ecosystem
--- a/.github/workflows/bun-linux-aarch64.yml
+++ b/.github/workflows/bun-linux-aarch64.yml
@@ -1,9 +1,4 @@
 name: bun-linux
-
-concurrency:
-  group: bun-linux-aarch64-${{ github.ref }}
-  cancel-in-progress: true
-
 env:
  REGISTRY: ghcr.io
  IMAGE_NAME: ${{ github.repository }}
@@ -26,7 +21,6 @@ jobs:
  linux:
    name: ${{matrix.tag}}
    runs-on: ${{matrix.runner}}
-    if: github.repository_owner == 'oven-sh'
    timeout-minutes: 90
    strategy:
      matrix:
@@ -36,7 +30,7 @@ jobs:
            arch: aarch64
            build_arch: arm64
            runner: linux-arm64
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-linux-arm64-lto.tar.gz"
+            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-linux-arm64-lto.tar.gz"
            webkit_basename: "bun-webkit-linux-arm64-lto"
            build_machine_arch: aarch64

--- a/.github/workflows/bun-linux-build.yml
+++ b/.github/workflows/bun-linux-build.yml
@@ -1,9 +1,4 @@
 name: bun-linux
-
-concurrency:
-  group: bun-linux-build-${{ github.ref }}
-  cancel-in-progress: true
-
 env:
  REGISTRY: ghcr.io
  IMAGE_NAME: ${{ github.repository }}
@@ -35,7 +30,6 @@ jobs:
  linux:
    name: ${{matrix.tag}}
    runs-on: ${{matrix.runner}}
-    if: github.repository_owner == 'oven-sh'
    timeout-minutes: 90
    strategy:
      fail-fast: false
@@ -46,7 +40,7 @@ jobs:
            arch: x86_64
            build_arch: amd64
            runner: big-ubuntu
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-linux-amd64-lto.tar.gz"
+            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-linux-amd64-lto.tar.gz"
            webkit_basename: "bun-webkit-linux-amd64-lto"
            build_machine_arch: x86_64
          - cpu: nehalem
@@ -54,7 +48,7 @@ jobs:
            arch: x86_64
            build_arch: amd64
            runner: big-ubuntu
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-linux-amd64-lto.tar.gz"
+            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-linux-amd64-lto.tar.gz"
            webkit_basename: "bun-webkit-linux-amd64-lto"
            build_machine_arch: x86_64

--- a/.github/workflows/bun-mac-aarch64.yml
+++ b/.github/workflows/bun-mac-aarch64.yml
@@ -1,9 +1,4 @@
 name: bun-macOS-aarch64
-
-concurrency:
-  group: bun-macOS-aarch64-${{ github.ref }}
-  cancel-in-progress: true
-
 env:
  REGISTRY: ghcr.io
  IMAGE_NAME: ${{ github.repository }}
@@ -33,7 +28,6 @@ jobs:
  macos-object-files:
    name: macOS Object
    runs-on: med-ubuntu
-    if: github.repository_owner == 'oven-sh'
    strategy:
      matrix:
        include:
@@ -106,7 +100,6 @@ jobs:
  macOS-cpp:
    name: macOS C++
    runs-on: ${{ matrix.runner }}
-    if: github.repository_owner == 'oven-sh'
    timeout-minutes: 90
    strategy:
      matrix:
@@ -117,7 +110,7 @@ jobs:
          #   obj: bun-obj-darwin-x64-baseline
          #   runner: macos-11
          #   artifact: bun-obj-darwin-x64-baseline
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-amd64-lto.tar.gz"
+          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz"
          #   dependencies: true
          #   compile_obj: false
          # - cpu: haswell
@@ -126,7 +119,7 @@ jobs:
          #   obj: bun-obj-darwin-x64
          #   runner: macos-11
          #   artifact: bun-obj-darwin-x64
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-amd64-lto.tar.gz"
+          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz"
          #   dependencies: true
          #   compile_obj: false
          # - cpu: nehalem
@@ -135,7 +128,7 @@ jobs:
          #   obj: bun-obj-darwin-x64-baseline
          #   runner: macos-11
          #   artifact: bun-obj-darwin-x64-baseline
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-amd64-lto.tar.gz"
+          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz"
          #   dependencies: false
          #   compile_obj: true
          # - cpu: haswell
@@ -144,7 +137,7 @@ jobs:
          #   obj: bun-obj-darwin-x64
          #   runner: macos-11
          #   artifact: bun-obj-darwin-x64
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-amd64-lto.tar.gz"
+          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz"
          #   dependencies: false
          #   compile_obj: true
          - cpu: native
@@ -152,7 +145,7 @@ jobs:
            tag: bun-darwin-aarch64
            obj: bun-obj-darwin-aarch64
            artifact: bun-obj-darwin-aarch64
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-arm64-lto.tar.gz"
+            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-arm64-lto.tar.gz"
            runner: macos-arm64
            dependencies: true
            compile_obj: true
@@ -244,7 +237,6 @@ jobs:
  macOS:
    name: macOS Link
    runs-on: ${{ matrix.runner }}
-    if: github.repository_owner == 'oven-sh'
    needs: [macOS-cpp, macos-object-files]
    timeout-minutes: 90
    strategy:
@@ -257,7 +249,7 @@ jobs:
          #   package: bun-darwin-x64
          #   runner: macos-11
          #   artifact: bun-obj-darwin-x64-baseline
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-amd64-lto.tar.gz"
+          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz"
          # - cpu: haswell
          #   arch: x86_64
          #   tag: bun-darwin-x64
@@ -265,14 +257,14 @@ jobs:
          #   package: bun-darwin-x64
          #   runner: macos-11
          #   artifact: bun-obj-darwin-x64
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-amd64-lto.tar.gz"
+          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz"
          - cpu: native
            arch: aarch64
            tag: bun-darwin-aarch64
            obj: bun-obj-darwin-aarch64
            package: bun-darwin-aarch64
            artifact: bun-obj-darwin-aarch64
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-arm64-lto.tar.gz"
+            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-arm64-lto.tar.gz"
            runner: macos-arm64
    steps:
      - uses: actions/checkout@v3
@@ -396,7 +388,7 @@ jobs:
    name: Tests ${{matrix.tag}}
    runs-on: ${{ matrix.runner }}
    needs: [macOS]
-    if: github.event_name == 'pull_request' && github.repository_owner == 'oven-sh'
+    if: github.event_name == 'pull_request'
    timeout-minutes: 10
    outputs:
      failing_tests: ${{ steps.test.outputs.failing_tests }}
--- a/.github/workflows/bun-mac-x64-baseline.yml
+++ b/.github/workflows/bun-mac-x64-baseline.yml
@@ -1,9 +1,4 @@
 name: bun-macOS-x64-baseline
-
-concurrency:
-  group: bun-macOS-x64-baseline-${{ github.ref }}
-  cancel-in-progress: true
-
 env:
  REGISTRY: ghcr.io
  IMAGE_NAME: ${{ github.repository }}
@@ -33,7 +28,6 @@ jobs:
  macos-object-files:
    name: macOS Object
    runs-on: med-ubuntu
-    if: github.repository_owner == 'oven-sh'
    strategy:
      matrix:
        include:
@@ -106,7 +100,6 @@ jobs:
  macOS-cpp:
    name: macOS C++
    runs-on: ${{ matrix.runner }}
-    if: github.repository_owner == 'oven-sh'
    timeout-minutes: 90
    strategy:
      matrix:
@@ -117,7 +110,7 @@ jobs:
            obj: bun-obj-darwin-x64-baseline
            runner: macos-11
            artifact: bun-obj-darwin-x64-baseline
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-amd64-lto.tar.gz"
+            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz"
            dependencies: true
            compile_obj: false
          # - cpu: haswell
@@ -126,7 +119,7 @@ jobs:
          #   obj: bun-obj-darwin-x64
          #   runner: macos-11
          #   artifact: bun-obj-darwin-x64
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-amd64-lto.tar.gz"
+          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz"
          #   dependencies: true
          #   compile_obj: false
          - cpu: nehalem
@@ -135,7 +128,7 @@ jobs:
            obj: bun-obj-darwin-x64-baseline
            runner: macos-11
            artifact: bun-obj-darwin-x64-baseline
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-amd64-lto.tar.gz"
+            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz"
            dependencies: false
            compile_obj: true
          # - cpu: haswell
@@ -144,7 +137,7 @@ jobs:
          #   obj: bun-obj-darwin-x64
          #   runner: macos-11
          #   artifact: bun-obj-darwin-x64
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-amd64-lto.tar.gz"
+          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz"
          #   dependencies: false
          #   compile_obj: true
          # - cpu: native
@@ -152,7 +145,7 @@ jobs:
          #   tag: bun-darwin-aarch64
          #   obj: bun-obj-darwin-aarch64
          #   artifact: bun-obj-darwin-aarch64
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-amd64-lto.tar.gz"
+          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz"
          #   runner: macos-arm64
          #   dependencies: true
          #   compile_obj: true
@@ -245,7 +238,6 @@ jobs:
  macOS:
    name: macOS Link
    runs-on: ${{ matrix.runner }}
-    if: github.repository_owner == 'oven-sh'
    needs: [macOS-cpp, macos-object-files]
    timeout-minutes: 90
    strategy:
@@ -258,7 +250,7 @@ jobs:
            package: bun-darwin-x64
            runner: macos-11
            artifact: bun-obj-darwin-x64-baseline
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-amd64-lto.tar.gz"
+            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz"
          # - cpu: haswell
          #   arch: x86_64
          #   tag: bun-darwin-x64
@@ -266,14 +258,14 @@ jobs:
          #   package: bun-darwin-x64
          #   runner: macos-11
          #   artifact: bun-obj-darwin-x64
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-amd64-lto.tar.gz"
+          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz"
          # - cpu: native
          #   arch: aarch64
          #   tag: bun-darwin-aarch64
          #   obj: bun-obj-darwin-aarch64
          #   package: bun-darwin-aarch64
          #   artifact: bun-obj-darwin-aarch64
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-amd64-lto.tar.gz"
+          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz"
          #   runner: macos-arm64
    steps:
      - uses: actions/checkout@v3
@@ -400,7 +392,7 @@ jobs:
    name: Tests ${{matrix.tag}}
    runs-on: ${{ matrix.runner }}
    needs: [macOS]
-    if: github.event_name == 'pull_request' && github.repository_owner == 'oven-sh'
+    if: github.event_name == 'pull_request'
    timeout-minutes: 30
    outputs:
      failing_tests: ${{ steps.test.outputs.failing_tests }}
--- a/.github/workflows/bun-mac-x64.yml
+++ b/.github/workflows/bun-mac-x64.yml
@@ -1,9 +1,4 @@
 name: bun-macOS-x64
-
-concurrency:
-  group: bun-macOS-x64-${{ github.ref }}
-  cancel-in-progress: true
-
 env:
  REGISTRY: ghcr.io
  IMAGE_NAME: ${{ github.repository }}
@@ -33,7 +28,6 @@ jobs:
  macos-object-files:
    name: macOS Object
    runs-on: med-ubuntu
-    if: github.repository_owner == 'oven-sh'
    strategy:
      matrix:
        include:
@@ -106,7 +100,6 @@ jobs:
  macOS-cpp:
    name: macOS C++
    runs-on: ${{ matrix.runner }}
-    if: github.repository_owner == 'oven-sh'
    timeout-minutes: 90
    strategy:
      matrix:
@@ -117,7 +110,7 @@ jobs:
          #   obj: bun-obj-darwin-x64-baseline
          #   runner: macos-11
          #   artifact: bun-obj-darwin-x64-baseline
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-amd64-lto.tar.gz"
+          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz"
          #   dependencies: true
          #   compile_obj: false
          - cpu: haswell
@@ -126,7 +119,7 @@ jobs:
            obj: bun-obj-darwin-x64
            runner: macos-11
            artifact: bun-obj-darwin-x64
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-amd64-lto.tar.gz"
+            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz"
            dependencies: true
            compile_obj: false
          # - cpu: nehalem
@@ -135,7 +128,7 @@ jobs:
          #   obj: bun-obj-darwin-x64-baseline
          #   runner: macos-11
          #   artifact: bun-obj-darwin-x64-baseline
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-amd64-lto.tar.gz"
+          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz"
          #   dependencies: false
          #   compile_obj: true
          - cpu: haswell
@@ -144,7 +137,7 @@ jobs:
            obj: bun-obj-darwin-x64
            runner: macos-11
            artifact: bun-obj-darwin-x64
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-amd64-lto.tar.gz"
+            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz"
            dependencies: false
            compile_obj: true
          # - cpu: native
@@ -152,7 +145,7 @@ jobs:
          #   tag: bun-darwin-aarch64
          #   obj: bun-obj-darwin-aarch64
          #   artifact: bun-obj-darwin-aarch64
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-arm64-lto.tar.gz"
+          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-arm64-lto.tar.gz"
          #   runner: macos-arm64
          #   dependencies: true
          #   compile_obj: true
@@ -247,7 +240,6 @@ jobs:
  macOS:
    name: macOS Link
    runs-on: ${{ matrix.runner }}
-    if: github.repository_owner == 'oven-sh'
    needs: [macOS-cpp, macos-object-files]
    timeout-minutes: 90
    strategy:
@@ -260,7 +252,7 @@ jobs:
          #   package: bun-darwin-x64
          #   runner: macos-11
          #   artifact: bun-obj-darwin-x64-baseline
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-amd64-lto.tar.gz"
+          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz"
          - cpu: haswell
            arch: x86_64
            tag: bun-darwin-x64
@@ -268,14 +260,14 @@ jobs:
            package: bun-darwin-x64
            runner: macos-11
            artifact: bun-obj-darwin-x64
-            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-amd64-lto.tar.gz"
+            webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz"
          # - cpu: native
          #   arch: aarch64
          #   tag: bun-darwin-aarch64
          #   obj: bun-obj-darwin-aarch64
          #   package: bun-darwin-aarch64
          #   artifact: bun-obj-darwin-aarch64
-          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/may20/bun-webkit-macos-arm64-lto.tar.gz"
+          #   webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-arm64-lto.tar.gz"
          #   runner: macos-arm64
    steps:
      - uses: actions/checkout@v3
@@ -402,7 +394,7 @@ jobs:
    name: Tests ${{matrix.tag}}
    runs-on: ${{ matrix.runner }}
    needs: [macOS]
-    if: github.event_name == 'pull_request' && github.repository_owner == 'oven-sh'
+    if: github.event_name == 'pull_request'
    timeout-minutes: 30
    outputs:
      failing_tests: ${{ steps.test.outputs.failing_tests }}
--- a/.github/workflows/bun-release-canary.yml
+++ b/.github/workflows/bun-release-canary.yml
@@ -8,7 +8,6 @@ jobs:
  sign:
    name: Sign Release
    runs-on: ubuntu-latest
-    if: github.repository_owner == 'oven-sh'
    defaults:
      run:
        working-directory: packages/bun-release
@@ -41,7 +40,6 @@ jobs:
    name: Release to NPM
    runs-on: ubuntu-latest
    needs: sign
-    if: github.repository_owner == 'oven-sh'
    defaults:
      run:
        working-directory: packages/bun-release
@@ -110,7 +108,6 @@ jobs:
    name: Release to Dockerhub
    runs-on: ubuntu-latest
    needs: sign
-    if: github.repository_owner == 'oven-sh'
    steps:
      - id: checkout
        name: Checkout
@@ -152,7 +149,6 @@ jobs:
    name: Upload to S3
    runs-on: ubuntu-latest
    needs: sign
-    if: github.repository_owner == 'oven-sh'
    defaults:
      run:
        working-directory: packages/bun-release
--- a/.github/workflows/bun-release-types-canary.yml
+++ b/.github/workflows/bun-release-types-canary.yml
@@ -11,7 +11,6 @@ jobs:
  npm-types:
    name: Release types to NPM
    runs-on: ubuntu-latest
-    if: github.repository_owner == 'oven-sh'
    defaults:
      run:
        working-directory: packages/bun-types
--- a/.github/workflows/bun-release.yml
+++ b/.github/workflows/bun-release.yml
@@ -14,7 +14,6 @@ jobs:
  sign:
    name: Sign Release
    runs-on: ubuntu-latest
-    if: github.repository_owner == 'oven-sh'
    defaults:
      run:
        working-directory: packages/bun-release
@@ -54,7 +53,6 @@ jobs:
    name: Release to NPM
    runs-on: ubuntu-latest
    needs: sign
-    if: github.repository_owner == 'oven-sh'
    defaults:
      run:
        working-directory: packages/bun-release
@@ -87,7 +85,6 @@ jobs:
    name: Release types to NPM
    runs-on: ubuntu-latest
    needs: sign
-    if: github.repository_owner == 'oven-sh'
    defaults:
      run:
        working-directory: packages/bun-types
@@ -130,7 +127,6 @@ jobs:
    name: Release to Dockerhub
    runs-on: ubuntu-latest
    needs: sign
-    if: github.repository_owner == 'oven-sh'
    steps:
      - id: checkout
        name: Checkout
@@ -181,7 +177,6 @@ jobs:
    name: Release to Homebrew
    runs-on: ubuntu-latest
    needs: sign
-    if: github.repository_owner == 'oven-sh'
    steps:
      - id: checkout
        name: Checkout
@@ -223,7 +218,6 @@ jobs:
    name: Upload to S3
    runs-on: ubuntu-latest
    needs: sign
-    if: github.repository_owner == 'oven-sh'
    defaults:
      run:
        working-directory: packages/bun-release
--- a/.github/workflows/bun-typecheck.yml
+++ b/.github/workflows/bun-typecheck.yml
@@ -0,0 +1,34 @@
+name: typecheck
+on:
+  push:
+    branches: [main]
+    paths:
+      - "packages/bun-types/**"
+      - "test/**"
+
+  pull_request:
+    branches:
+      - main
+    paths:
+      - "packages/bun-types/**"
+      - "test/**"
+
+jobs:
+  tests:
+    name: check-tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+      - name: Install bun
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: canary
+      - name: Install dependencies
+        run: bun install
+      - name: Install dependencies
+        run: bun install
+        working-directory: test
+      - name: Typecheck tests
+        run: bun run typecheck
--- a/.github/workflows/run-test-manually.yml
+++ b/.github/workflows/run-test-manually.yml
@@ -0,0 +1,59 @@
+name: Run Tests Manually
+
+on:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Version"
+        required: true
+        default: "canary"
+        type: string
+      use_bun:
+        description: "Use Bun?"
+        required: true
+        default: true
+        type: boolean
+jobs:
+  linux-test:
+    name: Tests ${{matrix.tag}} ${{github.event.inputs.version}}
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - tag: linux-x64
+          - tag: linux-x64-baseline
+    steps:
+      - id: checkout
+        name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: false
+      - id: install-npm
+        name: Install (npm)
+        run: |
+          npm install @oven/bun-${{matrix.tag}}@${{github.event.inputs.version}}
+          chmod +x node_modules/@oven/bun-${{matrix.tag}}/bin/bun
+          sudo cp node_modules/@oven/bun-${{matrix.tag}}/bin/bun /usr/bin/bun
+      - id: test
+        name: Test
+        if: ${{github.event.inputs.use_bun == 'true'}}
+        run: |
+          bun install
+          bun install --cwd test/bun.js
+          bun install --cwd test/bun.js/third-party/body-parser-test
+          cd packages/bun-internal-test
+          bun install
+          bun run test
+      - id: test-node-runner
+        name: Test (node runner)
+        if: ${{github.event.inputs.use_bun == 'false'}}
+        run: |
+          bun install
+          bun install --cwd test/bun.js
+          bun install --cwd test/bun.js/third-party/body-parser-test
+          cd packages/bun-internal-test
+          bun install
+          node src/runner.node.mjs
--- a/.gitignore
+++ b/.gitignore
@@ -116,8 +116,3 @@ src/bun.js/debug-bindings-obj
 failing-tests.txt
 test.txt
 myscript.sh
-
-cold-jsc-start
-cold-jsc-start.d
-
-/test.ts
--- a/.gitmodules
+++ b/.gitmodules
@@ -65,7 +65,3 @@ fetchRecurseSubmodules = false
 [submodule "src/deps/c-ares"]
 	path = src/deps/c-ares
 	url = https://github.com/c-ares/c-ares.git
-[submodule "src/deps/zstd"]
-	path = src/deps/zstd
-	url = https://github.com/facebook/zstd.git
-	ignore = dirty
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,6 +1,6 @@
 src/fallback.html
 src/bun.js/WebKit
-src/js/out
+src/bun.js/builtins/js
 src/*.out.js
 src/*out.*.js
 src/deps
@@ -10,4 +10,3 @@ test/snapshots
 test/snapshots-no-hmr
 test/js/deno/*.test.ts
 test/js/deno/**/*.test.ts
-bench/react-hello-world/react-hello-world.node.js
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -15,15 +15,15 @@
        "${workspaceFolder}/src/bun.js/bindings/webcore/",
        "${workspaceFolder}/src/bun.js/bindings/sqlite/",
        "${workspaceFolder}/src/bun.js/bindings/webcrypto/",
-        "${workspaceFolder}/src/js/builtins/",
-        "${workspaceFolder}/src/js/out",
+        "${workspaceFolder}/src/bun.js/builtins/",
+        "${workspaceFolder}/src/bun.js/builtins/cpp",
        "${workspaceFolder}/src/deps/boringssl/include/",
        "${workspaceFolder}/src/deps",
-        "${workspaceFolder}/src/deps/uws/uSockets/src",
-        "${workspaceFolder}/src/deps/uws/src"
+        "${workspaceFolder}/src/deps/uws/uSockets/src"
      ],
      "browse": {
        "path": [
+          "${workspaceFolder}/../webkit-build/include/",
          "${workspaceFolder}/bun-webkit/include/",
          "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/",
          "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/ICU/Headers/",
@@ -33,14 +33,12 @@
          "${workspaceFolder}/src/bun.js/bindings/*",
          "${workspaceFolder}/src/bun.js/bindings/sqlite/",
          "${workspaceFolder}/src/bun.js/bindings/webcrypto/",
-          "${workspaceFolder}/src/bun.js/bindings/webcore/",
-          "${workspaceFolder}/src/js/builtins/*",
-          "${workspaceFolder}/src/js/out/*",
+          "${workspaceFolder}/src/bun.js/builtins/*",
+          "${workspaceFolder}/src/bun.js/builtins/cpp/*",
          "${workspaceFolder}/src/bun.js/modules/*",
          "${workspaceFolder}/src/deps",
          "${workspaceFolder}/src/deps/boringssl/include/",
-          "${workspaceFolder}/src/deps/uws/uSockets/src",
-          "${workspaceFolder}/src/deps/uws/src"
+          "${workspaceFolder}/src/deps/uws/uSockets/src"
        ],
        "limitSymbolsToIncludedHeaders": true,
        "databaseFilename": ".vscode/cppdb"
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,209 +1,129 @@
 {
-  // The usage of BUN_GARBAGE_COLLECTOR_LEVEL=2 is important for debugging
-  // It will force the garbage collector to run after every test and every call to expect()
-  // it makes our tests very slow
-  // But it helps catch memory bugs
-
-  // SIGHUP must be ignored or the debugger will pause when a spawned subprocess exits:
-  // { "initCommands": ["process handle -p false -s false -n false SIGHUP"] }
  "version": "0.2.0",
  "configurations": [
    {
      "type": "lldb",
      "request": "launch",
-      "name": "bun test [file]",
+      "name": "bun test",
      "program": "bun-debug",
-      "args": ["test", "${file}"],
-      "cwd": "${fileDirname}",
+      "args": ["wiptest", "${file}"],
+      "cwd": "${workspaceFolder}",
      "env": {
-        "FORCE_COLOR": "1",
-        "BUN_DEBUG_QUIET_LOGS": "1",
-        "BUN_GARBAGE_COLLECTOR_LEVEL": "2"
+        "FORCE_COLOR": "1"
      },
-      "initCommands": ["process handle -p false -s false -n false SIGHUP"],
      "console": "internalConsole"
    },
    {
      "type": "lldb",
      "request": "launch",
-      "name": "bun test [file] (fast)",
+      "name": "bun test --watch",
      "program": "bun-debug",
-      "args": ["test", "${file}"],
-      "cwd": "${fileDirname}",
+      "args": ["--watch", "test", "${file}"],
+      "cwd": "${workspaceFolder}",
+      "env": {
+        "FORCE_COLOR": "1"
+      },
+      "console": "internalConsole"
+    },
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "bun test (all)",
+      "program": "bun-debug",
+      "args": ["wiptest"],
+      "cwd": "${workspaceFolder}/test",
      "env": {
        "FORCE_COLOR": "1",
-        "BUN_DEBUG_QUIET_LOGS": "1"
+        "BUN_GARBAGE_COLLECTOR_LEVEL": "2"
+      },
+      "console": "internalConsole"
+    },
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "bun run current file",
+      "program": "bun-debug",
+      "args": ["${file}"],
+      "cwd": "${file}/../../",
+      "env": {
+        "FORCE_COLOR": "1"
+      },
+      "console": "internalConsole"
+    },
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "bun run (watch)",
+      "program": "bun-debug",
+      "args": ["--watch", "${file}"],
+      "cwd": "${file}/../../",
+      "env": {
+        "FORCE_COLOR": "1"
+      },
+      "console": "internalConsole"
+    },
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "bun run (hot)",
+      "program": "bun-debug",
+      "args": ["--hot", "${file}"],
+      "cwd": "${file}/../../",
+      "env": {
+        "FORCE_COLOR": "1"
+      },
+      "console": "internalConsole"
+    },
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "bun run",
+      "program": "bun-debug",
+      "args": ["check.tsx", "-c"],
+      "cwd": "${env:HOME}/Build/react-ssr",
+      "env": {
+        "FORCE_COLOR": "1"
      },
-      "initCommands": ["process handle -p false -s false -n false SIGHUP"],
      "console": "internalConsole"
    },

    {
      "type": "lldb",
      "request": "launch",
-      "name": "bun test [file] (verbose)",
+      "name": "bun http example",
      "program": "bun-debug",
-      "args": ["test", "${file}"],
-      "cwd": "${fileDirname}",
+      "args": ["run", "examples/http.ts"],
+      "cwd": "${workspaceFolder}",
      "env": {
        "FORCE_COLOR": "1"
      },
-      "initCommands": ["process handle -p false -s false -n false SIGHUP"],
      "console": "internalConsole"
    },
    {
      "type": "lldb",
      "request": "launch",
-      "name": "bun test [file] --watch",
+      "name": "bun http file example",
      "program": "bun-debug",
-      "args": ["test", "--watch", "${file}"],
-      "cwd": "${fileDirname}",
-      "env": {
-        "FORCE_COLOR": "1",
-        "BUN_DEBUG_QUIET_LOGS": "1"
-      },
-      "initCommands": ["process handle -p false -s false -n false SIGHUP"],
-      "console": "internalConsole"
-    },
-    {
-      "type": "lldb",
-      "request": "launch",
-      "name": "bun test [file] --only",
-      "program": "bun-debug",
-      "args": ["test", "--only", "${file}"],
-      "cwd": "${fileDirname}",
-      "env": {
-        "FORCE_COLOR": "1",
-        "BUN_DEBUG_QUIET_LOGS": "1"
-      },
-      "initCommands": ["process handle -p false -s false -n false SIGHUP"],
-      "console": "internalConsole"
-    },
-    {
-      "type": "lldb",
-      "request": "launch",
-      "name": "bun test [*]",
-      "program": "bun-debug",
-      "args": ["test"],
-      "cwd": "${workspaceFolder}/test",
-      "env": {
-        "FORCE_COLOR": "1",
-        "BUN_DEBUG_QUIET_LOGS": "1",
-        "BUN_GARBAGE_COLLECTOR_LEVEL": "2"
-      },
-      "initCommands": ["process handle -p false -s false -n false SIGHUP"],
-      "console": "internalConsole"
-    },
-    {
-      "type": "lldb",
-      "request": "launch",
-      "name": "bun test [*] (fast)",
-      "program": "bun-debug",
-      "args": ["test"],
-      "cwd": "${workspaceFolder}/test",
-      "env": {
-        "FORCE_COLOR": "1",
-        "BUN_DEBUG_QUIET_LOGS": "1"
-      },
-      "initCommands": ["process handle -p false -s false -n false SIGHUP"],
-      "console": "internalConsole"
-    },
-    {
-      "type": "lldb",
-      "request": "launch",
-      "name": "bun test [*] --only",
-      "program": "bun-debug",
-      "args": ["test", "--only"],
-      "cwd": "${workspaceFolder}/test",
-      "env": {
-        "FORCE_COLOR": "1",
-        "BUN_DEBUG_QUIET_LOGS": "1"
-      },
-      "initCommands": ["process handle -p false -s false -n false SIGHUP"],
-      "console": "internalConsole"
-    },
-    {
-      "type": "lldb",
-      "request": "launch",
-      "name": "bun run [file]",
-      "program": "bun-debug",
-      "args": ["run", "${file}"],
-      "cwd": "${fileDirname}",
-      "env": {
-        "FORCE_COLOR": "1",
-        "BUN_DEBUG_QUIET_LOGS": "1"
-      },
-      "initCommands": ["process handle -p false -s false -n false SIGHUP"],
-      "console": "internalConsole"
-    },
-    {
-      "type": "lldb",
-      "request": "launch",
-      "name": "bun run [Inspect]",
-      "program": "bun-debug",
-      "args": ["--inspect-brk", "${file}"],
-      "cwd": "${fileDirname}",
-      "env": {
-        "FORCE_COLOR": "1",
-        "BUN_DEBUG_QUIET_LOGS": "1"
-      },
-      "initCommands": ["process handle -p false -s false -n false SIGHUP"],
-      "console": "internalConsole"
-    },
-    {
-      "type": "lldb",
-      "request": "launch",
-      "name": "bun run [file] (gc)",
-      "program": "bun-debug",
-      "args": ["run", "${file}"],
-      "cwd": "${fileDirname}",
-      "env": {
-        "FORCE_COLOR": "1",
-        "BUN_DEBUG_QUIET_LOGS": "1",
-        "BUN_GARBAGE_COLLECTOR_LEVEL": "2"
-      },
-      "initCommands": ["process handle -p false -s false -n false SIGHUP"],
-      "console": "internalConsole"
-    },
-    {
-      "type": "lldb",
-      "request": "launch",
-      "name": "bun run [file] (verbose)",
-      "program": "bun-debug",
-      "args": ["run", "${file}"],
-      "cwd": "${fileDirname}",
+      "args": ["run", "examples/bun/http-file.ts"],
+      "cwd": "${workspaceFolder}",
      "env": {
        "FORCE_COLOR": "1"
      },
-      "initCommands": ["process handle -p false -s false -n false SIGHUP"],
      "console": "internalConsole"
    },
    {
      "type": "lldb",
      "request": "launch",
-      "name": "bun run [file] --watch",
+      "name": "bun html-rewriter example",
      "program": "bun-debug",
-      "args": ["run", "--watch", "${file}"],
-      "cwd": "${fileDirname}",
+      "args": ["run", "examples/bun/html-rewriter.ts"],
+      "cwd": "${workspaceFolder}",
      "env": {
        "FORCE_COLOR": "1"
      },
-      "initCommands": ["process handle -p false -s false -n false SIGHUP"],
-      "console": "internalConsole"
-    },
-    {
-      "type": "lldb",
-      "request": "launch",
-      "name": "bun run [file] --hot",
-      "program": "bun-debug",
-      "args": ["run", "--hot", "${file}"],
-      "cwd": "${fileDirname}",
-      "env": {
-        "FORCE_COLOR": "1"
-      },
-      "initCommands": ["process handle -p false -s false -n false SIGHUP"],
      "console": "internalConsole"
    },
+
    {
      "type": "lldb",
      "request": "launch",
@@ -218,14 +138,12 @@
      "request": "launch",
      "name": "bun build debug",
      "program": "bun-debug",
-      "args": ["bun", "${file}"],
+      "args": ["bun", "./test/fixtures/bundle/trivial/index.js"],
      "cwd": "${workspaceFolder}",
      "console": "internalConsole",
      "env": {
        "BUN_CONFIG_MINIFY_WHITESPACE": "1"
-      },
-      // SIGHUP must be ignored or the debugger will pause when a spawned subprocess exits.
-      "initCommands": ["process handle -p false -s false -n false SIGHUP"]
+      }
    },
    {
      "type": "lldb",
@@ -283,7 +201,7 @@
        "--splitting",
        "bun",
        "/Users/jarred/Code/bun-rsc/components/Message.tsx",
-        "/Users/jarred/Code/bun-rsc/components/Button.tsx"
+        "/Users/jarred/Code/bun-rsc/components/Button.tsx",
      ],
      "cwd": "/Users/jarred/Code/bun-rsc",
      "console": "internalConsole",
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -37,6 +37,8 @@
  "[yaml]": {
    "editor.formatOnSave": true
  },
+  "zig.beforeDebugCmd": "make build-unit ${file} ${filter} ${bin}",
+  "zig.testCmd": "make test ${file} ${filter} ${bin}",
  "[markdown]": {
    "editor.unicodeHighlight.ambiguousCharacters": false,
    "editor.unicodeHighlight.invisibleCharacters": false,
@@ -75,9 +77,7 @@
    "src/deps/lol-html": true,
    "src/deps/c-ares": true,
    "src/deps/tinycc": true,
-    "src/deps/zstd": true,
-    "test/snippets/package-json-exports/_node_modules_copy": true,
-    "src/js/out": true
+    "test/snippets/package-json-exports/_node_modules_copy": true
  },
  "C_Cpp.files.exclude": {
    "**/.vscode": true,
@@ -204,18 +204,7 @@
    "compare": "cpp",
    "concepts": "cpp",
    "typeindex": "cpp",
-    "__verbose_abort": "cpp",
-    "__std_stream": "cpp",
-    "any": "cpp",
-    "charconv": "cpp",
-    "csignal": "cpp",
-    "format": "cpp",
-    "forward_list": "cpp",
-    "future": "cpp",
-    "regex": "cpp",
-    "span": "cpp",
-    "valarray": "cpp",
-    "codecvt": "cpp"
+    "__verbose_abort": "cpp"
  },
  "cmake.configureOnOpen": false,
  "C_Cpp.errorSquiggles": "enabled",
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -59,9 +59,7 @@ The module loader is in [`src/bun.js/module_loader.zig`](src/bun.js/module_loade

 ### JavaScript Builtins

-TODO: update this with the new build process that uses TypeScript and `$` instead of `@`.
-
-JavaScript builtins are located in [`src/js/builtins/*.ts`](src/js/builtins).
+JavaScript builtins are located in [`src/bun.js/builtins/*.js`](src/bun.js/builtins).

 These files support a JavaScriptCore-only syntax for internal slots. `@` is used to access an internal slot. For example: `new @Array(123)` will create a new `Array` similar to `new Array(123)`, except if a library modifies the `Array` global, it will not affect the internal slot (`@Array`). These names must be allow-listed in `BunBuiltinNames.h` (though JavaScriptCore allowlists some names by default).

--- a/30
+++ b/30
@@ -10,7 +10,7 @@ ARG ARCH=x86_64
 ARG BUILD_MACHINE_ARCH=x86_64
 ARG TRIPLET=${ARCH}-linux-gnu
 ARG BUILDARCH=amd64
-ARG WEBKIT_TAG=may20
+ARG WEBKIT_TAG=feb9
 ARG ZIG_TAG=jul1
 ARG ZIG_VERSION="0.11.0-dev.2571+31738de28"
 ARG WEBKIT_BASENAME="bun-webkit-linux-$BUILDARCH"
@@ -503,33 +503,6 @@ ENV LIB_ICU_PATH=${WEBKIT_DIR}/lib

 RUN --mount=type=cache,target=/ccache cd $BUN_DIR && make sqlite

-FROM bun-base as zstd
-
-ARG DEBIAN_FRONTEND
-ARG GITHUB_WORKSPACE
-ARG ZIG_PATH
-# Directory extracts to "bun-webkit"
-ARG WEBKIT_DIR
-ARG BUN_RELEASE_DIR
-ARG BUN_DEPS_OUT_DIR
-ARG BUN_DIR
-
-ARG CPU_TARGET
-ENV CPU_TARGET=${CPU_TARGET}
-
-ENV CCACHE_DIR=/ccache
-
-COPY Makefile ${BUN_DIR}/Makefile
-COPY src/deps/zstd ${BUN_DIR}/src/deps/zstd
-COPY .prettierrc.cjs ${BUN_DIR}/.prettierrc.cjs
-
-WORKDIR $BUN_DIR
-
-ENV JSC_BASE_DIR=${WEBKIT_DIR}
-ENV LIB_ICU_PATH=${WEBKIT_DIR}/lib
-
-RUN --mount=type=cache,target=/ccache cd $BUN_DIR && make zstd
-
 FROM scratch as build_release_cpp

 COPY --from=compile_cpp /tmp/*.o /
@@ -562,7 +535,6 @@ COPY --from=lolhtml ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
 COPY --from=mimalloc ${BUN_DEPS_OUT_DIR}/*.o ${BUN_DEPS_OUT_DIR}/
 COPY --from=picohttp ${BUN_DEPS_OUT_DIR}/*.o ${BUN_DEPS_OUT_DIR}/
 COPY --from=sqlite ${BUN_DEPS_OUT_DIR}/*.o  ${BUN_DEPS_OUT_DIR}/
-COPY --from=zstd ${BUN_DEPS_OUT_DIR}/*.a  ${BUN_DEPS_OUT_DIR}/
 COPY --from=tinycc ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
 COPY --from=uws ${BUN_DEPS_OUT_DIR}/*.a ${BUN_DEPS_OUT_DIR}/
 COPY --from=uws ${BUN_DEPS_OUT_DIR}/*.o ${BUN_DEPS_OUT_DIR}/
--- a/157
+++ b/157
@@ -20,7 +20,6 @@ CPU_TARGET ?= native
 MARCH_NATIVE = -mtune=$(CPU_TARGET)
 NATIVE_OR_OLD_MARCH =

-MMD_IF_LOCAL = 
 DEFAULT_MIN_MACOS_VERSION=
 ARCH_NAME :=
 DOCKER_BUILDARCH =
@@ -42,14 +41,8 @@ endif
 MIN_MACOS_VERSION ?= $(DEFAULT_MIN_MACOS_VERSION)
 BUN_BASE_VERSION = 0.6

-CI ?= false
-
 AR=

-ifeq ($(CI), false)
-	MMD_IF_LOCAL = -MMD
-endif
-
 BUN_OR_NODE = $(shell which bun 2>/dev/null || which node 2>/dev/null)

 CXX_VERSION=c++2a
@@ -84,7 +77,6 @@ ZIG ?= $(shell which zig 2>/dev/null || echo -e "error: Missing zig. Please make
 # so if that's resolved, it won't build for C++
 REAL_CC = $(shell which clang-15 2>/dev/null || which clang 2>/dev/null)
 REAL_CXX = $(shell which clang++-15 2>/dev/null || which clang++ 2>/dev/null)
-CLANG_FORMAT = $(shell which clang-format-15 2>/dev/null || which clang-format 2>/dev/null)

 CC = $(REAL_CC)
 CXX = $(REAL_CXX)
@@ -181,7 +173,7 @@ AR = $(shell which llvm-ar-15 2>/dev/null || which llvm-ar 2>/dev/null || which
 endif

 OPTIMIZATION_LEVEL=-O3 $(MARCH_NATIVE)
-DEBUG_OPTIMIZATION_LEVEL= -O1 $(MARCH_NATIVE) -gdwarf-4
+DEBUG_OPTIMIZATION_LEVEL= -O1 $(MARCH_NATIVE)
 CFLAGS_WITHOUT_MARCH = $(MACOS_MIN_FLAG) $(OPTIMIZATION_LEVEL) -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden
 BUN_CFLAGS = $(MACOS_MIN_FLAG) $(MARCH_NATIVE)  $(OPTIMIZATION_LEVEL) -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden
 BUN_TMP_DIR := /tmp/make-bun
@@ -293,14 +285,14 @@ SRC_WEBCORE_FILES := $(wildcard $(SRC_DIR)/webcore/*.cpp)
 SRC_SQLITE_FILES := $(wildcard $(SRC_DIR)/sqlite/*.cpp)
 SRC_NODE_OS_FILES := $(wildcard $(SRC_DIR)/node_os/*.cpp)
 SRC_IO_FILES := $(wildcard src/io/*.cpp)
-SRC_BUILTINS_FILES := $(wildcard  src/js/out/*.cpp)
+SRC_BUILTINS_FILES := $(wildcard  src/bun.js/builtins/*.cpp)
 SRC_WEBCRYPTO_FILES := $(wildcard $(SRC_DIR)/webcrypto/*.cpp)

 OBJ_FILES := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRC_FILES))
 WEBCORE_OBJ_FILES := $(patsubst $(SRC_DIR)/webcore/%.cpp,$(OBJ_DIR)/%.o,$(SRC_WEBCORE_FILES))
 SQLITE_OBJ_FILES := $(patsubst $(SRC_DIR)/sqlite/%.cpp,$(OBJ_DIR)/%.o,$(SRC_SQLITE_FILES))
 NODE_OS_OBJ_FILES := $(patsubst $(SRC_DIR)/node_os/%.cpp,$(OBJ_DIR)/%.o,$(SRC_NODE_OS_FILES))
-BUILTINS_OBJ_FILES := $(patsubst src/js/out/%.cpp,$(OBJ_DIR)/%.o,$(SRC_BUILTINS_FILES))
+BUILTINS_OBJ_FILES := $(patsubst src/bun.js/builtins/%.cpp,$(OBJ_DIR)/%.o,$(SRC_BUILTINS_FILES))
 IO_FILES := $(patsubst src/io/%.cpp,$(OBJ_DIR)/%.o,$(SRC_IO_FILES))
 MODULES_OBJ_FILES := $(patsubst $(MODULES_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(MODULES_FILES))
 WEBCRYPTO_OBJ_FILES := $(patsubst $(SRC_DIR)/webcrypto/%.cpp,$(OBJ_DIR)/%.o,$(SRC_WEBCRYPTO_FILES))
@@ -309,7 +301,7 @@ DEBUG_OBJ_FILES := $(patsubst $(SRC_DIR)/%.cpp,$(DEBUG_OBJ_DIR)/%.o,$(SRC_FILES)
 DEBUG_WEBCORE_OBJ_FILES := $(patsubst $(SRC_DIR)/webcore/%.cpp,$(DEBUG_OBJ_DIR)/%.o,$(SRC_WEBCORE_FILES))
 DEBUG_SQLITE_OBJ_FILES := $(patsubst $(SRC_DIR)/sqlite/%.cpp,$(DEBUG_OBJ_DIR)/%.o,$(SRC_SQLITE_FILES))
 DEBUG_NODE_OS_OBJ_FILES := $(patsubst $(SRC_DIR)/node_os/%.cpp,$(DEBUG_OBJ_DIR)/%.o,$(SRC_NODE_OS_FILES))
-DEBUG_BUILTINS_OBJ_FILES := $(patsubst src/js/out/%.cpp,$(DEBUG_OBJ_DIR)/%.o,$(SRC_BUILTINS_FILES))
+DEBUG_BUILTINS_OBJ_FILES := $(patsubst src/bun.js/builtins/%.cpp,$(DEBUG_OBJ_DIR)/%.o,$(SRC_BUILTINS_FILES))
 DEBUG_IO_FILES := $(patsubst src/io/%.cpp,$(DEBUG_OBJ_DIR)/%.o,$(SRC_IO_FILES))
 DEBUG_MODULES_OBJ_FILES := $(patsubst $(MODULES_DIR)/%.cpp,$(DEBUG_OBJ_DIR)/%.o,$(MODULES_FILES))
 DEBUG_WEBCRYPTO_OBJ_FILES := $(patsubst $(SRC_DIR)/webcrypto/%.cpp, $(DEBUG_OBJ_DIR)/%.o, $(SRC_WEBCRYPTO_FILES))
@@ -330,12 +322,12 @@ ALL_JSC_INCLUDE_DIRS := -I$(WEBKIT_RELEASE_DIR)/WTF/Headers \
 		-I$(WEBKIT_RELEASE_DIR)/WTF/PrivateHeaders

 SHARED_INCLUDE_DIR = -I$(realpath src/bun.js/bindings)/ \
-		-I$(realpath src/js/builtins/) \
-		-I$(realpath src/js/out/) \
+		-I$(realpath src/bun.js/builtins/) \
 		-I$(realpath src/bun.js/bindings) \
 		-I$(realpath src/bun.js/bindings/webcore) \
 		-I$(realpath src/bun.js/bindings/webcrypto) \
 		-I$(realpath src/bun.js/bindings/sqlite) \
+		-I$(realpath src/bun.js/builtins/cpp) \
 		-I$(realpath src/bun.js/bindings/node_os) \
 		-I$(realpath src/bun.js/modules) \
 		-I$(JSC_INCLUDE_DIR)
@@ -352,7 +344,7 @@ LINUX_INCLUDE_DIRS := $(ALL_JSC_INCLUDE_DIRS) \
 UWS_INCLUDE_DIR := -I$(BUN_DEPS_DIR)/uws/uSockets/src -I$(BUN_DEPS_DIR)/uws/src -I$(BUN_DEPS_DIR)


-INCLUDE_DIRS := $(UWS_INCLUDE_DIR) -I$(BUN_DEPS_DIR)/mimalloc/include -I$(BUN_DEPS_DIR)/zstd/include -Isrc/napi -I$(BUN_DEPS_DIR)/boringssl/include -I$(BUN_DEPS_DIR)/c-ares/include
+INCLUDE_DIRS := $(UWS_INCLUDE_DIR) -I$(BUN_DEPS_DIR)/mimalloc/include -Isrc/napi -I$(BUN_DEPS_DIR)/boringssl/include -I$(BUN_DEPS_DIR)/c-ares/include


 ifeq ($(OS_NAME),linux)
@@ -460,7 +452,6 @@ ARCHIVE_FILES_WITHOUT_LIBCRYPTO = $(MINIMUM_ARCHIVE_FILES) \
 		-ltcc \
 		-lusockets \
 		-lcares \
-		-lzstd \
 		$(BUN_DEPS_OUT_DIR)/libuwsockets.o

 ARCHIVE_FILES = $(ARCHIVE_FILES_WITHOUT_LIBCRYPTO)
@@ -537,6 +528,9 @@ get-%  : ; @echo $($*)
 print-version:
 	@echo $(PACKAGE_JSON_VERSION)

+
+
+
 # Prevent dependency on libtcc1 so it doesn't do filesystem lookups
 TINYCC_CFLAGS= -DTCC_LIBTCC1=\"\0\"

@@ -554,12 +548,24 @@ tinycc:
 PYTHON=$(shell which python 2>/dev/null || which python3 2>/dev/null || which python2 2>/dev/null)

 .PHONY: builtins
-builtins:
-	NODE_ENV=production bun src/js/builtins/codegen/index.ts --minify
-
-.PHONY: esm
-esm:
-	NODE_ENV=production bun src/js/build-esm.ts
+builtins: ## to generate builtins
+	@if [ -z "$(WEBKIT_DIR)" ] || [ ! -d "$(WEBKIT_DIR)/Source" ]; then echo "WebKit is not cloned. Please run make init-submodules"; exit 1; fi
+	rm -f src/bun.js/bindings/*Builtin*.cpp src/bun.js/bindings/*Builtin*.h src/bun.js/bindings/*Builtin*.cpp
+	rm -rf src/bun.js/builtins/cpp
+	mkdir -p src/bun.js/builtins/cpp
+	$(PYTHON) $(realpath $(WEBKIT_DIR)/Source/JavaScriptCore/Scripts/generate-js-builtins.py) -i $(realpath src)/bun.js/builtins/js  -o $(realpath src)/bun.js/builtins/cpp --framework WebCore --force
+	$(PYTHON) $(realpath $(WEBKIT_DIR)/Source/JavaScriptCore/Scripts/generate-js-builtins.py) -i $(realpath src)/bun.js/builtins/js  -o $(realpath src)/bun.js/builtins/cpp --framework WebCore --wrappers-only
+	rm -rf /tmp/1.h src/bun.js/builtins/cpp/WebCoreJSBuiltinInternals.h.1
+	echo -e '// clang-format off\nnamespace Zig { class GlobalObject; }\n#include "root.h"\n' >> /tmp/1.h
+	cat /tmp/1.h  src/bun.js/builtins/cpp/WebCoreJSBuiltinInternals.h > src/bun.js/builtins/cpp/WebCoreJSBuiltinInternals.h.1
+	mv src/bun.js/builtins/cpp/WebCoreJSBuiltinInternals.h.1 src/bun.js/builtins/cpp/WebCoreJSBuiltinInternals.h
+	rm -rf /tmp/1.h src/bun.js/builtins/cpp/WebCoreJSBuiltinInternals.h.1
+	echo -e '// clang-format off\nnamespace Zig { class GlobalObject; }\n#include "root.h"\n' >> /tmp/1.h
+	cat /tmp/1.h  src/bun.js/builtins/cpp/WebCoreJSBuiltinInternals.cpp > src/bun.js/builtins/cpp/WebCoreJSBuiltinInternals.cpp.1
+	mv src/bun.js/builtins/cpp/WebCoreJSBuiltinInternals.cpp.1 src/bun.js/builtins/cpp/WebCoreJSBuiltinInternals.cpp
+	$(SED) -i -e 's/class JSDOMGlobalObject/using JSDOMGlobalObject = Zig::GlobalObject/' src/bun.js/builtins/cpp/WebCoreJSBuiltinInternals.h
+	# this is the one we actually build
+	mv src/bun.js/builtins/cpp/*JSBuiltin*.cpp src/bun.js/builtins

 .PHONY: generate-builtins
 generate-builtins: builtins
@@ -630,9 +636,6 @@ compile-ffi-test:

 sqlite:

-.PHONY: zstd
-zstd:
-	cd $(BUN_DEPS_DIR)/zstd && rm -rf build-cmake-debug && cmake $(CMAKE_FLAGS) -DZSTD_BUILD_STATIC=ON -B build-cmake-debug -S build/cmake -G Ninja && ninja -C build-cmake-debug && cp build-cmake-debug/lib/libzstd.a $(BUN_DEPS_OUT_DIR)/libzstd.a

 .PHONY: libarchive
 libarchive:
@@ -677,7 +680,6 @@ require:
 	@which aclocal > /dev/null || (echo -e  "ERROR: automake is required. Install with:\n\n    $(POSIX_PKG_MANAGER) install automake"; exit 1)
 	@which $(LIBTOOL) > /dev/null || (echo -e "ERROR: libtool is required. Install with:\n\n    $(POSIX_PKG_MANAGER) install libtool"; exit 1)
 	@which ninja > /dev/null || (echo -e "ERROR: Ninja is required. Install with:\n\n    $(POSIX_PKG_MANAGER) install $(PKGNAME_NINJA)"; exit 1)
-	@which pkg-config > /dev/null || (echo -e "ERROR: pkg-config is required. Install with:\n\n    $(POSIX_PKG_MANAGER) install pkg-config"; exit 1)
 	@echo "You have the dependencies installed! Woo"

 init-submodules:
@@ -687,10 +689,6 @@ init-submodules:
 build-obj:
 	$(ZIG) build obj -Doptimize=ReleaseFast -Dcpu="$(CPU_TARGET)"

-.PHONY: build-obj-small
-build-obj-small:
-	$(ZIG) build obj -Doptimize=ReleaseSmall -Dcpu="$(CPU_TARGET)"
-
 .PHONY: dev-build-obj-wasm
 dev-build-obj-wasm:
 	$(ZIG) build bun-wasm -Dtarget=wasm32-freestanding
@@ -769,10 +767,10 @@ sign-macos-aarch64:
 	gon sign.macos-aarch64.json

 cls:
-	@echo -e "\n\n---\n\n"
+	@echo "\n\n---\n\n"

 jsc-check:
-	@ls $(JSC_BASE_DIR)  >/dev/null 2>&1 || (echo -e "Failed to access WebKit build. Please compile the WebKit submodule using the Dockerfile at $(shell pwd)/src/javascript/WebKit/Dockerfile and then copy from /output in the Docker container to $(JSC_BASE_DIR). You can override the directory via JSC_BASE_DIR. \n\n 	DOCKER_BUILDKIT=1 docker build -t bun-webkit $(shell pwd)/src/bun.js/WebKit -f $(shell pwd)/src/bun.js/WebKit/Dockerfile --progress=plain\n\n 	docker container create bun-webkit\n\n 	# Get the container ID\n	docker container ls\n\n 	docker cp DOCKER_CONTAINER_ID_YOU_JUST_FOUND:/output $(JSC_BASE_DIR)" && exit 1)
+	@ls $(JSC_BASE_DIR)  >/dev/null 2>&1 || (echo "Failed to access WebKit build. Please compile the WebKit submodule using the Dockerfile at $(shell pwd)/src/javascript/WebKit/Dockerfile and then copy from /output in the Docker container to $(JSC_BASE_DIR). You can override the directory via JSC_BASE_DIR. \n\n 	DOCKER_BUILDKIT=1 docker build -t bun-webkit $(shell pwd)/src/bun.js/WebKit -f $(shell pwd)/src/bun.js/WebKit/Dockerfile --progress=plain\n\n 	docker container create bun-webkit\n\n 	# Get the container ID\n	docker container ls\n\n 	docker cp DOCKER_CONTAINER_ID_YOU_JUST_FOUND:/output $(JSC_BASE_DIR)" && exit 1)
 	@ls $(JSC_INCLUDE_DIR)  >/dev/null 2>&1 || (echo "Failed to access WebKit include directory at $(JSC_INCLUDE_DIR)." && exit 1)
 	@ls $(JSC_LIB)  >/dev/null 2>&1 || (echo "Failed to access WebKit lib directory at $(JSC_LIB)." && exit 1)

@@ -795,7 +793,7 @@ release-safe: prerelease release-safe-only

 .PHONY: fmt-cpp
 fmt-cpp:
-	cd src/bun.js/bindings && $(CLANG_FORMAT) *.cpp *.h -i
+	cd src/bun.js/bindings && clang-format *.cpp *.h -i

 .PHONY: fmt-zig
 fmt-zig:
@@ -910,6 +908,7 @@ bun-codesign-release-local:
 bun-codesign-release-local-debug:


+
 .PHONY: jsc
 jsc: jsc-build jsc-copy-headers jsc-bindings
 .PHONY: jsc-build
@@ -921,6 +920,7 @@ jsc-bindings: headers bindings
 clone-submodules:
 	git -c submodule."src/bun.js/WebKit".update=none submodule update --init --recursive --depth=1 --progress

+CLANG_FORMAT := $(shell command -v clang-format 2> /dev/null)

 .PHONY: headers
 headers:
@@ -1085,7 +1085,7 @@ dev-obj-linux:
 	$(ZIG) build obj -Dtarget=x86_64-linux-gnu -Dcpu="$(CPU_TARGET)"

 .PHONY: dev
-dev: mkdir-dev esm dev-obj bun-link-lld-debug
+dev: mkdir-dev dev-obj bun-link-lld-debug

 mkdir-dev:
 	mkdir -p $(DEBUG_PACKAGE_DIR)
@@ -1115,6 +1115,7 @@ jsc-copy-headers:
 	cp $(WEBKIT_DIR)/Source/JavaScriptCore/bytecode/ObjectPropertyConditionSet.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/ObjectPropertyConditionSet.h
 	cp $(WEBKIT_DIR)/Source/JavaScriptCore/bytecode/PolyProtoAccessChain.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/PolyProtoAccessChain.h
 	cp $(WEBKIT_DIR)/Source/JavaScriptCore/bytecode/InlineCacheCompiler.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/InlineCacheCompiler.h
+	cp $(WEBKIT_DIR)/Source/JavaScriptCore/bytecode/PutKind.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/PutKind.h
 	cp $(WEBKIT_DIR)/Source/JavaScriptCore/bytecode/StructureStubClearingWatchpoint.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/StructureStubClearingWatchpoint.h
 	cp $(WEBKIT_DIR)/Source/JavaScriptCore/bytecode/AdaptiveInferredPropertyValueWatchpointBase.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/AdaptiveInferredPropertyValueWatchpointBase.h
 	cp $(WEBKIT_DIR)/Source/JavaScriptCore/bytecode/StubInfoSummary.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/StubInfoSummary.h
@@ -1148,9 +1149,6 @@ jsc-copy-headers:
 	cp $(WEBKIT_DIR)/Source/JavaScriptCore/runtime/AsyncFunctionPrototype.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/AsyncFunctionPrototype.h
 	cp $(WEBKIT_DIR)/Source/JavaScriptCore/runtime/SymbolObject.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/SymbolObject.h
 	cp $(WEBKIT_DIR)/Source/JavaScriptCore/runtime/JSGenerator.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/JSGenerator.h
-	cp $(WEBKIT_DIR)/Source/JavaScriptCore/bytecode/UnlinkedFunctionCodeBlock.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/UnlinkedFunctionCodeBlock.h
-	cp $(WEBKIT_DIR)/Source/JavaScriptCore/runtime/AggregateError.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/AggregateError.h
-	cp $(WEBKIT_DIR)/Source/JavaScriptCore/API/JSWeakValue.h  $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/JSWeakValue.h
 	find $(WEBKIT_RELEASE_DIR)/JavaScriptCore/Headers/JavaScriptCore/ -name "*.h" -exec cp {} $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/ \;

 # This is a workaround for a JSC bug that impacts aarch64
@@ -1300,7 +1298,7 @@ jsc-bindings-mac: bindings
 MIMALLOC_VALGRIND_ENABLED_FLAG =

 ifeq ($(OS_NAME),linux)
-	MIMALLOC_VALGRIND_ENABLED_FLAG = -DMI_TRACK_VALGRIND=ON
+	MIMALLOC_VALGRIND_ENABLED_FLAG = -DMI_VALGRIND=ON
 endif


@@ -1322,9 +1320,8 @@ mimalloc-debug:
 			-DMI_OVERRIDE=OFF \
 			-DCMAKE_C_FLAGS="$(CFLAGS)" \
 			-DCMAKE_CXX_FLAGS="$(CFLAGS)" \
-			-GNinja \
 			. \
-			&& ninja
+			&& make -j $(CPUS);
 	cp $(BUN_DEPS_DIR)/mimalloc/$(_MIMALLOC_DEBUG_FILE) $(BUN_DEPS_OUT_DIR)/$(MIMALLOC_FILE)


@@ -1346,9 +1343,8 @@ mimalloc:
 			-DMI_OVERRIDE=OFF \
 			-DMI_OSX_ZONE=OFF \
 			-DCMAKE_C_FLAGS="$(CFLAGS)" \
-			-GNinja \
-			 . \
-			&& ninja;
+			 .\
+			&& make -j $(CPUS);
 	cp $(BUN_DEPS_DIR)/mimalloc/$(MIMALLOC_INPUT_PATH) $(BUN_DEPS_OUT_DIR)/$(MIMALLOC_FILE)


@@ -1383,19 +1379,6 @@ bun-relink-copy:
 	mkdir -p $(PACKAGE_DIR)
 	cp $(BUN_DEPLOY_DIR).o $(BUN_RELEASE_BIN).o

-.PHONY: bun-link-lld-profile profile
-bun-link-lld-profile:
-	$(CXX) $(BUN_LLD_FLAGS) $(SYMBOLS) -g -gdwarf-4 -fno-omit-frame-pointer \
-		$(BUN_RELEASE_BIN).o \
-		-o $(BUN_RELEASE_BIN) \
-		-W \
-		$(OPTIMIZATION_LEVEL) $(RELEASE_FLAGS)
-	rm -rf $(BUN_RELEASE_BIN).dSYM
-	cp $(BUN_RELEASE_BIN) $(BUN_RELEASE_BIN)-profile
-	@rm -f $(BUN_RELEASE_BIN).o.o # workaround for https://github.com/ziglang/zig/issues/14080
-
-build-profile: build-obj bun-link-lld-profile bun-codesign-release-local
-
 bun-link-lld-release:
 	$(CXX) $(BUN_LLD_FLAGS) $(SYMBOLS) \
 		$(BUN_RELEASE_BIN).o \
@@ -1446,11 +1429,11 @@ wasm-return1:
 generate-classes:
 	bun src/bun.js/scripts/generate-classes.ts
 	$(ZIG) fmt src/bun.js/bindings/generated_classes.zig
-	$(CLANG_FORMAT) -i src/bun.js/bindings/ZigGeneratedClasses.h src/bun.js/bindings/ZigGeneratedClasses.cpp
+	clang-format -i src/bun.js/bindings/ZigGeneratedClasses.h src/bun.js/bindings/ZigGeneratedClasses.cpp

 generate-sink:
 	bun src/bun.js/scripts/generate-jssink.js
-	$(CLANG_FORMAT) -i  src/bun.js/bindings/JSSink.cpp  src/bun.js/bindings/JSSink.h
+	clang-format -i  src/bun.js/bindings/JSSink.cpp  src/bun.js/bindings/JSSink.h
 	$(WEBKIT_DIR)/Source/JavaScriptCore/create_hash_table src/bun.js/bindings/JSSink.cpp > src/bun.js/bindings/JSSinkLookupTable.h
 	$(SED) -i -e 's/#include "Lookup.h"//' src/bun.js/bindings/JSSinkLookupTable.h
 	$(SED) -i -e 's/namespace JSC {//' src/bun.js/bindings/JSSinkLookupTable.h
@@ -1474,7 +1457,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
 	$(CXX_WITH_CCACHE) $(CLANG_FLAGS) $(UWS_INCLUDE) \
 		$(MACOS_MIN_FLAG) \
 		$(OPTIMIZATION_LEVEL) \
-		${MMD_IF_LOCAL} \
+		-MMD \
 		-fno-exceptions \
 		-fno-rtti \
 		-ferror-limit=1000 \
@@ -1485,7 +1468,7 @@ $(OBJ_DIR)/%.o: src/bun.js/modules/%.cpp
 	$(CXX_WITH_CCACHE) $(CLANG_FLAGS) $(UWS_INCLUDE) \
 		$(MACOS_MIN_FLAG) \
 		$(OPTIMIZATION_LEVEL) \
-		${MMD_IF_LOCAL} \
+		-MMD \
 		-fno-exceptions \
 		-fno-rtti \
 		-ferror-limit=1000 \
@@ -1496,7 +1479,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/webcore/%.cpp
 	$(CXX_WITH_CCACHE) $(CLANG_FLAGS) \
 		$(MACOS_MIN_FLAG) \
 		$(OPTIMIZATION_LEVEL) \
-		${MMD_IF_LOCAL} \
+		-MMD \
 		-fno-exceptions \
 		-fno-rtti \
 		-ferror-limit=1000 \
@@ -1507,7 +1490,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/sqlite/%.cpp
 	$(CXX_WITH_CCACHE) $(CLANG_FLAGS) \
 		$(MACOS_MIN_FLAG) \
 		$(OPTIMIZATION_LEVEL) \
-		${MMD_IF_LOCAL} \
+		-MMD \
 		-fno-exceptions \
 		-fno-rtti \
 		-ferror-limit=1000 \
@@ -1518,7 +1501,7 @@ $(OBJ_DIR)/%.o: src/io/%.cpp
 	$(CXX_WITH_CCACHE) $(CLANG_FLAGS) \
 		$(MACOS_MIN_FLAG) \
 		$(OPTIMIZATION_LEVEL) \
-		${MMD_IF_LOCAL} \
+		-MMD \
 		-fno-exceptions \
 		-fno-rtti \
 		-ferror-limit=1000 \
@@ -1529,18 +1512,18 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/node_os/%.cpp
 	$(CXX_WITH_CCACHE) $(CLANG_FLAGS) \
 		$(MACOS_MIN_FLAG) \
 		$(OPTIMIZATION_LEVEL) \
-		${MMD_IF_LOCAL} \
+		-MMD \
 		-fno-exceptions \
 		-fno-rtti \
 		-ferror-limit=1000 \
 		$(EMIT_LLVM) \
 		-c -o $@ $<

-$(OBJ_DIR)/%.o: src/js/out/%.cpp
+$(OBJ_DIR)/%.o: src/bun.js/builtins/%.cpp
 	$(CXX_WITH_CCACHE) $(CLANG_FLAGS) \
 		$(MACOS_MIN_FLAG) \
 		$(OPTIMIZATION_LEVEL) \
-		${MMD_IF_LOCAL} \
+		-MMD \
 		-fno-exceptions \
 		-fno-rtti \
 		-ferror-limit=1000 \
@@ -1552,7 +1535,7 @@ $(OBJ_DIR)/%.o: src/bun.js/bindings/webcrypto/%.cpp
 	$(CXX_WITH_CCACHE) $(CLANG_FLAGS) \
 		$(MACOS_MIN_FLAG) \
 		$(OPTIMIZATION_LEVEL) \
-		${MMD_IF_LOCAL} \
+		-MMD \
 		-fno-exceptions \
 		-fno-rtti \
 		-ferror-limit=1000 \
@@ -1566,7 +1549,7 @@ $(DEBUG_OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
 	$(CXX_WITH_CCACHE) $(CLANG_FLAGS) $(UWS_INCLUDE) \
 		$(MACOS_MIN_FLAG) \
 		$(DEBUG_OPTIMIZATION_LEVEL) \
-		${MMD_IF_LOCAL} \
+		-MMD \
 		-fno-exceptions \
 		-fno-rtti \
 		-ferror-limit=1000 \
@@ -1581,7 +1564,7 @@ $(DEBUG_OBJ_DIR)/%.o: $(SRC_DIR)/webcore/%.cpp
 	$(CXX_WITH_CCACHE) $(CLANG_FLAGS) \
 		$(MACOS_MIN_FLAG) \
 		$(DEBUG_OPTIMIZATION_LEVEL) \
-		${MMD_IF_LOCAL} \
+		-MMD \
 		-fno-exceptions \
 		-fno-rtti \
 		-ferror-limit=1000 \
@@ -1594,7 +1577,7 @@ $(DEBUG_OBJ_DIR)/%.o: src/io/%.cpp
 	$(CXX_WITH_CCACHE) $(CLANG_FLAGS) \
 		$(MACOS_MIN_FLAG) \
 		$(DEBUG_OPTIMIZATION_LEVEL) \
-		${MMD_IF_LOCAL} \
+		-MMD \
 		-fno-exceptions \
 		-fno-rtti \
 		-ferror-limit=1000 \
@@ -1610,7 +1593,7 @@ $(DEBUG_OBJ_DIR)/%.o: $(SRC_DIR)/sqlite/%.cpp
 	$(CXX_WITH_CCACHE) $(CLANG_FLAGS) \
 		$(MACOS_MIN_FLAG) \
 		$(DEBUG_OPTIMIZATION_LEVEL) \
-		${MMD_IF_LOCAL} \
+		-MMD \
 		-fno-exceptions \
 		-fno-rtti \
 		-ferror-limit=1000 \
@@ -1625,7 +1608,7 @@ $(DEBUG_OBJ_DIR)/%.o: $(SRC_DIR)/node_os/%.cpp
 	$(CXX_WITH_CCACHE) $(CLANG_FLAGS) \
 		$(MACOS_MIN_FLAG) \
 		$(DEBUG_OPTIMIZATION_LEVEL) \
-		${MMD_IF_LOCAL} \
+		-MMD \
 		-fno-exceptions \
 		-fno-rtti \
 		-ferror-limit=1000 \
@@ -1635,12 +1618,12 @@ $(DEBUG_OBJ_DIR)/%.o: $(SRC_DIR)/node_os/%.cpp

 # $(DEBUG_OBJ_DIR) is not included here because it breaks
 # detecting if a file needs to be rebuilt
-.PHONY: src/js/out/builtins/%.cpp
-$(DEBUG_OBJ_DIR)/%.o: src/js/out/%.cpp
+.PHONY: src/bun.js/builtins/%.cpp
+$(DEBUG_OBJ_DIR)/%.o: src/bun.js/builtins/%.cpp
 	$(CXX_WITH_CCACHE) $(CLANG_FLAGS) \
 		$(MACOS_MIN_FLAG) \
 		$(DEBUG_OPTIMIZATION_LEVEL) \
-		${MMD_IF_LOCAL} \
+		-MMD \
 		-fno-exceptions \
 		-fno-rtti \
 		-ferror-limit=1000 \
@@ -1653,7 +1636,7 @@ $(DEBUG_OBJ_DIR)/%.o: src/bun.js/modules/%.cpp
 	$(CXX_WITH_CCACHE) $(CLANG_FLAGS) \
 		$(MACOS_MIN_FLAG) \
 		$(DEBUG_OPTIMIZATION_LEVEL) \
-		${MMD_IF_LOCAL} \
+		-MMD \
 		-fno-exceptions \
 		-fno-rtti \
 		-ferror-limit=1000 \
@@ -1667,7 +1650,7 @@ $(DEBUG_OBJ_DIR)/%.o: src/bun.js/bindings/webcrypto/%.cpp
 	$(CXX_WITH_CCACHE) $(CLANG_FLAGS) \
 		$(MACOS_MIN_FLAG) \
 		$(DEBUG_OPTIMIZATION_LEVEL) \
-		${MMD_IF_LOCAL} \
+		-MMD \
 		-fno-exceptions \
 		-I$(SRC_DIR) \
 		-fno-rtti \
@@ -1842,24 +1825,8 @@ copy-to-bun-release-dir-bin:
 PACKAGE_MAP = --pkg-begin async_io $(BUN_DIR)/src/io/io_darwin.zig --pkg-begin bun $(BUN_DIR)/src/bun_redirect.zig --pkg-end --pkg-end --pkg-begin javascript_core $(BUN_DIR)/src/jsc.zig --pkg-begin bun $(BUN_DIR)/src/bun_redirect.zig --pkg-end --pkg-end --pkg-begin bun $(BUN_DIR)/src/bun_redirect.zig --pkg-end


-.PHONY: cold-jsc-start
-cold-jsc-start:
-	$(CXX_WITH_CCACHE) $(CLANG_FLAGS) \
-		$(MACOS_MIN_FLAG) \
-		$(OPTIMIZATION_LEVEL) \
-		${MMD_IF_LOCAL} \
-		-fno-exceptions \
-		-fno-rtti \
-		-ferror-limit=1000 \
-		$(LIBICONV_PATH) \
-		$(DEFAULT_LINKER_FLAGS) \
-		$(PLATFORM_LINKER_FLAGS) \
-		$(ICU_FLAGS) \
-		$(JSC_FILES) \
-		misctools/cold-jsc-start.cpp -o cold-jsc-start
-
 .PHONY: vendor-without-npm
-vendor-without-npm: node-fallbacks runtime_js fallback_decoder bun_error mimalloc picohttp zlib boringssl libarchive lolhtml sqlite usockets uws tinycc c-ares zstd
+vendor-without-npm: node-fallbacks runtime_js fallback_decoder bun_error mimalloc picohttp zlib boringssl libarchive lolhtml sqlite usockets uws tinycc c-ares

 .PHONY: vendor-without-check
 vendor-without-check: npm-install vendor-without-npm
@@ -1879,7 +1846,7 @@ regenerate-bindings:
 	@make bindings -j$(CPU_COUNT)

 .PHONY: setup
-setup: vendor-dev identifier-cache clean-bindings
+setup: vendor-dev builtins identifier-cache clean-bindings
 	make jsc-check
 	make bindings -j$(CPU_COUNT)
 	@echo ""
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ bunx cowsay 'Hello, world!'   # execute a package
 Bun supports Linux (x64 & arm64) and macOS (x64 & Apple Silicon).

 > **Linux users** — Kernel version 5.6 or higher is strongly recommended, but the minimum is 5.1.
->
+> 
 > **Windows users** — Bun does not currently provide a native Windows build. We're working on this; progress can be tracked at [this issue](https://github.com/oven-sh/bun/issues/43). In the meantime, use one of the installation methods below for Windows Subsystem for Linux.

 ```sh
@@ -67,6 +67,7 @@ docker pull oven/bun
 docker run --rm --init --ulimit memlock=-1:-1 oven/bun
 ```

+
 ### Upgrade

 To upgrade to the latest version of Bun, run:
@@ -99,7 +100,7 @@ bun upgrade --canary
  - [Runtime](https://bun.sh/docs/runtime/index)
  - [Module resolution](https://bun.sh/docs/runtime/modules)
  - [Hot &amp; live reloading](https://bun.sh/docs/runtime/hot)
-  - [Plugins](https://bun.sh/docs/bundler/plugins)
+  - [Plugins](https://bun.sh/docs/runtime/plugins)
 - Ecosystem
  - [Node.js](https://bun.sh/docs/ecosystem/nodejs)
  - [TypeScript](https://bun.sh/docs/ecosystem/typescript)
@@ -126,6 +127,7 @@ bun upgrade --canary
  - [DNS](https://bun.sh/docs/api/dns)
  - [Node-API](https://bun.sh/docs/api/node-api)

+
 ## Contributing

 Refer to the [Project > Development](https://bun.sh/docs/project/development) guide to start contributing to Bun.
--- a/bench/bun.lockb
+++ b/bench/bun.lockb
--- a/bench/bundle/.gitignore
+++ b/bench/bundle/.gitignore
@@ -1,171 +0,0 @@
-# Based on https://raw.githubusercontent.com/github/gitignore/main/Node.gitignore
-
-# Logs
-
-logs
-_.log
-npm-debug.log_
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-.pnpm-debug.log*
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-
-report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
-
-# Runtime data
-
-pids
-_.pid
-_.seed
-\*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-
-lib-cov
-
-# Coverage directory used by tools like istanbul
-
-coverage
-\*.lcov
-
-# nyc test coverage
-
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-
-bower_components
-
-# node-waf configuration
-
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-
-build/Release
-
-# Dependency directories
-
-node_modules/
-jspm_packages/
-
-# Snowpack dependency directory (https://snowpack.dev/)
-
-web_modules/
-
-# TypeScript cache
-
-\*.tsbuildinfo
-
-# Optional npm cache directory
-
-.npm
-
-# Optional eslint cache
-
-.eslintcache
-
-# Optional stylelint cache
-
-.stylelintcache
-
-# Microbundle cache
-
-.rpt2_cache/
-.rts2_cache_cjs/
-.rts2_cache_es/
-.rts2_cache_umd/
-
-# Optional REPL history
-
-.node_repl_history
-
-# Output of 'npm pack'
-
-\*.tgz
-
-# Yarn Integrity file
-
-.yarn-integrity
-
-# dotenv environment variable files
-
-.env
-.env.development.local
-.env.test.local
-.env.production.local
-.env.local
-
-# parcel-bundler cache (https://parceljs.org/)
-
-.cache
-.parcel-cache
-
-# Next.js build output
-
-.next
-out
-
-# Nuxt.js build / generate output
-
-.nuxt
-dist
-
-# Gatsby files
-
-.cache/
-
-# Comment in the public line in if your project uses Gatsby and not Next.js
-
-# https://nextjs.org/blog/next-9-1#public-directory-support
-
-# public
-
-# vuepress build output
-
-.vuepress/dist
-
-# vuepress v2.x temp and cache directory
-
-.temp
-.cache
-
-# Docusaurus cache and generated files
-
-.docusaurus
-
-# Serverless directories
-
-.serverless/
-
-# FuseBox cache
-
-.fusebox/
-
-# DynamoDB Local files
-
-.dynamodb/
-
-# TernJS port file
-
-.tern-port
-
-# Stores VSCode versions used for testing VSCode extensions
-
-.vscode-test
-
-# yarn v2
-
-.yarn/cache
-.yarn/unplugged
-.yarn/build-state.yml
-.yarn/install-state.gz
-.pnp.\*
-
-esbuild
--- a/bench/bundle/README.md
+++ b/bench/bundle/README.md
@@ -1,40 +0,0 @@
-# Bundler benchmark
-
-This is a performance benchmark of the following bundlers:
-
- Bun
- esbuild
- Parcel 2
- Rollup + Terser
- Webpack
-
-It is an exact copy of [`esbuild`'s benchmark](https://github.com/evanw/esbuild/blob/main/Makefile), aside from the fact that Bun [has been added](https://github.com/colinhacks/esbuild/commit/1b928b7981aa7edfadf77fcf8931bb8d6f38cd96). The benchmark bundles 10 copies of the large [three.js](https://threejs.org/), with minification and source maps enabled.
-
-To run the benchmark:
-
-```sh
-$ chmod +x run-bench.sh
-$ ./run-bench.sh
-```
-
-Various output will be written to the console by each bundler. Scan through the results for lines that look like this underneath each bundler output:
-
-```sh
-real <number>
-user <number>
-sys <number>
-```
-
-These lines are generated by the `time` command which is used to benchmark each build.
-
-## Results
-
-The `real` results, as run on a 16-inch M1 Macbook Pro:
-
-| Bundler | Time   |
-| ------- | ------ |
-| Bun     | 0.17s  |
-| esbuild | 0.33s  |
-| Rollup  | 18.82s |
-| Webpack | 26.21  |
-| Parcel  | 17.95s |
--- a/bench/bundle/bun.lockb
+++ b/bench/bundle/bun.lockb
--- a/bench/bundle/index.ts
+++ b/bench/bundle/index.ts
@@ -1 +0,0 @@
-console.log("Hello via Bun!");
--- a/bench/bundle/package.json
+++ b/bench/bundle/package.json
@@ -1,8 +0,0 @@
-{
-  "name": "bundle",
-  "module": "index.ts",
-  "type": "module",
-  "devDependencies": {
-    "bun-types": "^0.5.0"
-  }
-}
--- a/bench/bundle/run-bench.sh
+++ b/bench/bundle/run-bench.sh
@@ -1,3 +0,0 @@
-git clone git@github.com:colinhacks/esbuild.git
-cd esbuild
-make bench-three
--- a/bench/bundle/tsconfig.json
+++ b/bench/bundle/tsconfig.json
@@ -1,20 +0,0 @@
-{
-  "compilerOptions": {
-    "lib": [
-      "ESNext"
-    ],
-    "module": "esnext",
-    "target": "esnext",
-    "moduleResolution": "bundler",
-    "strict": true,
-    "downlevelIteration": true,
-    "skipLibCheck": true,
-    "jsx": "react-jsx",
-    "allowSyntheticDefaultImports": true,
-    "forceConsistentCasingInFileNames": true,
-    "allowJs": true,
-    "types": [
-      "bun-types" // add Bun global
-    ]
-  }
-}
--- a/bench/emitter/implementations.mjs
+++ b/bench/emitter/implementations.mjs
@@ -1,31 +0,0 @@
-import EventEmitter3 from "eventemitter3";
-import { group } from "mitata";
-import EventEmitterNative from "node:events";
-
-export const implementations = [
-  {
-    EventEmitter: EventEmitterNative,
-    name: process.isBun ? (EventEmitterNative.init ? "bun" : "C++") : "node:events",
-    monkey: true,
-  },
-  // { EventEmitter: EventEmitter3, name: "EventEmitter3" },
-].filter(Boolean);
-
-for (const impl of implementations) {
-  impl.EventEmitter?.setMaxListeners?.(Infinity);
-}
-
-export function groupForEmitter(name, cb) {
-  if (implementations.length === 1) {
-    return cb({
-      ...implementations[0],
-      name: `${name}: ${implementations[0].name}`,
-    });
-  } else {
-    return group(name, () => {
-      for (let impl of implementations) {
-        cb(impl);
-      }
-    });
-  }
-}
--- a/bench/emitter/microbench.mjs
+++ b/bench/emitter/microbench.mjs
@@ -1,96 +0,0 @@
-import { bench, run } from "mitata";
-import { groupForEmitter } from "./implementations.mjs";
-
-var id = 0;
-
-groupForEmitter("single emit", ({ EventEmitter, name }) => {
-  const emitter = new EventEmitter();
-
-  emitter.on("hello", event => {
-    event.preventDefault();
-  });
-
-  bench(name, () => {
-    emitter.emit("hello", {
-      preventDefault() {
-        id++;
-      },
-    });
-  });
-});
-
-groupForEmitter("on x 10_000 (handler)", ({ EventEmitter, name }) => {
-  const emitter = new EventEmitter();
-
-  bench(name, () => {
-    var cb = event => {
-      event.preventDefault();
-    };
-    emitter.on("hey", cb);
-    var called = false;
-    for (let i = 0; i < 10_000; i++)
-      emitter.emit("hey", {
-        preventDefault() {
-          id++;
-          called = true;
-        },
-      });
-
-    if (!called) throw new Error("not called");
-  });
-});
-
-// for (let { impl: EventEmitter, name, monkey } of []) {
-//   if (monkey) {
-//     var monkeyEmitter = Object.assign({}, EventEmitter.prototype);
-//     monkeyEmitter.on("hello", event => {
-//       event.preventDefault();
-//     });
-
-//     bench(`[monkey] ${className}.emit`, () => {
-//       var called = false;
-//       monkeyEmitter.emit("hello", {
-//         preventDefault() {
-//           id++;
-//           called = true;
-//         },
-//       });
-
-//       if (!called) {
-//         throw new Error("monkey failed");
-//       }
-//     });
-
-//     bench(`[monkey] ${className}.on x 10_000 (handler)`, () => {
-//       var cb = () => {
-//         event.preventDefault();
-//       };
-//       monkeyEmitter.on("hey", cb);
-//       for (let i = 0; i < 10_000; i++)
-//         monkey.emit("hey", {
-//           preventDefault() {
-//             id++;
-//           },
-//         });
-//       monkeyEmitter.off("hey", cb);
-//     });
-//   }
-// }
-
-// var target = new EventTarget();
-// target.addEventListener("hello", event => {});
-// bench("EventTarget.dispatch", () => {
-//   target.dispatchEvent(event);
-// });
-
-// var hey = new Event("hey");
-
-// bench("EventTarget.on x 10_000 (handler)", () => {
-//   var handler = event => {};
-//   target.addEventListener("hey", handler);
-
-//   for (let i = 0; i < 10_000; i++) target.dispatchEvent(hey);
-//   target.removeEventListener("hey", handler);
-// });
-
-await run();
--- a/bench/emitter/microbench_once.mjs
+++ b/bench/emitter/microbench_once.mjs
@@ -1,40 +0,0 @@
-import { bench, run } from "mitata";
-import { groupForEmitter } from "./implementations.mjs";
-
-var id = 0;
-
-groupForEmitter("test 1", ({ EventEmitter, name }) => {
-  const emitter = new EventEmitter();
-
-  emitter.on("hello", event => {
-    event.preventDefault();
-  });
-
-  bench(name, () => {
-    emitter.once("hello", event => {
-      event.preventDefault();
-    });
-    emitter.emit("hello", {
-      preventDefault() {
-        id++;
-      },
-    });
-  });
-});
-
-groupForEmitter("test 2", ({ EventEmitter, name }) => {
-  const emitter = new EventEmitter();
-
-  bench(name, () => {
-    emitter.once("hello", event => {
-      event.preventDefault();
-    });
-    emitter.emit("hello", {
-      preventDefault() {
-        id++;
-      },
-    });
-  });
-});
-
-await run();
--- a/bench/emitter/realworld_stream.mjs
+++ b/bench/emitter/realworld_stream.mjs
@@ -1,63 +0,0 @@
-import { bench, run } from "mitata";
-import { groupForEmitter } from "./implementations.mjs";
-
-// Psuedo RNG is derived from https://stackoverflow.com/a/424445
-let rngState = 123456789;
-function nextInt() {
-  const m = 0x80000000; // 2**31;
-  const a = 1103515245;
-  const c = 12345;
-  rngState = (a * rngState + c) % m;
-  return rngState;
-}
-function nextRange(start, end) {
-  // returns in range [start, end): including start, excluding end
-  // can't modulu nextInt because of weak randomness in lower bits
-  const rangeSize = end - start;
-  const randomUnder1 = nextInt() / 0x7fffffff; // 2**31 - 1
-  return start + Math.floor(randomUnder1 * rangeSize);
-}
-
-const chunks = new Array(1024).fill(null).map((_, j) => {
-  const arr = new Uint8Array(1024);
-  for (let i = 0; i < arr.length; i++) {
-    arr[i] = nextRange(0, 256);
-  }
-  return arr;
-});
-
-groupForEmitter("stream simulation", ({ EventEmitter, name }) => {
-  bench(name, () => {
-    let id = 0;
-    const stream = new EventEmitter();
-
-    stream.on("start", res => {
-      if (res.status !== 200) throw new Error("not 200");
-    });
-
-    const recived = [];
-    stream.on("data", req => {
-      recived.push(req);
-    });
-
-    stream.on("end", ev => {
-      ev.preventDefault();
-    });
-
-    // simulate a stream
-    stream.emit("start", { status: 200 });
-    for (let chunk of chunks) {
-      stream.emit("data", chunk);
-    }
-    stream.emit("end", {
-      preventDefault() {
-        id++;
-      },
-    });
-
-    if (id !== 1) throw new Error("not implemented right");
-    if (recived.length !== 1024) throw new Error("not implemented right");
-  });
-});
-
-await run();
--- a/bench/package-lock.json
+++ b/bench/package-lock.json
--- a/bench/package.json
+++ b/bench/package.json
@@ -1,13 +1,11 @@
 {
  "name": "bench",
  "dependencies": {
-    "@babel/core": "^7.16.10",
-    "@babel/preset-react": "^7.16.7",
-    "@swc/core": "^1.2.133",
-    "benchmark": "^2.1.4",
+    "mitata": "^0.1.6",
    "esbuild": "^0.14.12",
-    "eventemitter3": "^5.0.0",
-    "mitata": "^0.1.6"
+    "@swc/core": "^1.2.133",
+    "@babel/core": "^7.16.10",
+    "@babel/preset-react": "^7.16.7"
  },
  "scripts": {
    "ffi": "cd ffi && bun run deps && bun run build && bun run bench",
--- a/bench/react-hello-world/react-hello-world.jsx
+++ b/bench/react-hello-world/react-hello-world.jsx
@@ -1,5 +1,5 @@
 // to run this:
-//  NODE_ENV=production bun react-hello-world.jsx
+//  NODE_ENV=production bun --jsx-production react-hello-world.jsx

 // Make sure you're using react-dom@18.3.0 or later.
 // Currently that is available at react-dom@next (which is installed in this repository)
--- a/bench/react-hello-world/react-hello-world.node.js
+++ b/bench/react-hello-world/react-hello-world.node.js
--- a/bench/snippets/array-arguments-slice.mjs
+++ b/bench/snippets/array-arguments-slice.mjs
@@ -1,4 +1,4 @@
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";

 function doIt(...args) {
  // we use .at() to prevent constant folding optimizations
--- a/bench/snippets/array-map.mjs
+++ b/bench/snippets/array-map.mjs
@@ -1,5 +1,5 @@
 // https://github.com/oven-sh/bun/issues/1096
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";

 const identity = x => x;

--- a/bench/snippets/array-shift.mjs
+++ b/bench/snippets/array-shift.mjs
@@ -1,4 +1,4 @@
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";

 var myArray = new Array(5);
 bench("[1, 2, 3, 4, 5].shift()", () => {
--- a/bench/snippets/arraybuffersink.mjs
+++ b/bench/snippets/arraybuffersink.mjs
@@ -1,6 +1,5 @@
-// @runtime bun
 import { ArrayBufferSink } from "bun";
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";

 var short = "Hello World!";
 var shortUTF16 = "Hello World 💕💕💕";
--- a/bench/snippets/assert.mjs
+++ b/bench/snippets/assert.mjs
@@ -1,4 +1,4 @@
-import { bench, group, run } from "./runner.mjs";
+import { bench, group, run } from "mitata";
 import * as assert from "assert";

 bench("deepEqual", () => {
--- a/bench/snippets/buffer-create.mjs
+++ b/bench/snippets/buffer-create.mjs
@@ -1,9 +1,6 @@
-// @runtime bun,node,deno
-import { bench, run } from "./runner.mjs";
-import process from "node:process";
-import { Buffer } from "node:buffer";
+import { bench, run } from "mitata";

-const N = parseInt(process.env.RUN_COUNTER ?? "10000", 10);
+const N = parseInt(process.argv.slice(2).at(0) || "10", 10);
 var isBuffer = new Buffer(0);
 var isNOtBuffer = "not a buffer";

--- a/bench/snippets/bun.lockb
+++ b/bench/snippets/bun.lockb
--- a/bench/snippets/concat.js
+++ b/bench/snippets/concat.js
@@ -1,4 +1,4 @@
-import { bench, group, run } from "./runner.mjs";
+import { bench, group, run } from "mitata";
 import { readFileSync } from "fs";
 import { allocUnsafe } from "bun";

--- a/bench/snippets/crypto-2190.mjs
+++ b/bench/snippets/crypto-2190.mjs
@@ -1,29 +0,0 @@
-// https://github.com/oven-sh/bun/issues/2190
-import { bench, run } from "mitata";
-import { createHash } from "node:crypto";
-
-const data =
-  "Delightful remarkably mr on announcing themselves entreaties favourable. About to in so terms voice at. Equal an would is found seems of. The particular friendship one sufficient terminated frequently themselves. It more shed went up is roof if loud case. Delay music in lived noise an. Beyond genius really enough passed is up.";
-
-const scenarios = [
-  { alg: "md5", digest: "hex" },
-  { alg: "md5", digest: "base64" },
-  { alg: "sha1", digest: "hex" },
-  { alg: "sha1", digest: "base64" },
-  { alg: "sha256", digest: "hex" },
-  { alg: "sha256", digest: "base64" },
-];
-
-for (const { alg, digest } of scenarios) {
-  bench(`${alg}-${digest}`, () => {
-    createHash(alg).update(data).digest(digest);
-  });
-
-  if ("Bun" in globalThis) {
-    bench(`${alg}-${digest} (Bun.CryptoHasher)`, () => {
-      new Bun.CryptoHasher(alg).update(data).digest(digest);
-    });
-  }
-}
-
-run();
--- a/bench/snippets/crypto-hasher.mjs
+++ b/bench/snippets/crypto-hasher.mjs
@@ -1,15 +1,15 @@
 // so it can run in environments without node module resolution
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";

 import crypto from "node:crypto";

-var foo = Buffer.allocUnsafe(512);
+var foo = Buffer.allocUnsafe(16384);
 foo.fill(123);

 // if ("Bun" in globalThis) {
 //   const { CryptoHasher } = Bun;
-//   bench("Bun.CryptoHasher(sha512)", () => {
-//     var hasher = new CryptoHasher("sha512");
+//   bench("CryptoHasher Blake2b256", () => {
+//     var hasher = new CryptoHasher("blake2b256");
 //     hasher.update(foo);
 //     hasher.digest();
 //   });
--- a/bench/snippets/crypto-stream.mjs
+++ b/bench/snippets/crypto-stream.mjs
@@ -1,26 +0,0 @@
-// https://github.com/oven-sh/bun/issues/2190
-import { bench, run } from "mitata";
-import { createHash } from "node:crypto";
-
-const data =
-  "Delightful remarkably mr on announcing themselves entreaties favourable. About to in so terms voice at. Equal an would is found seems of. The particular friendship one sufficient terminated frequently themselves. It more shed went up is roof if loud case. Delay music in lived noise an. Beyond genius really enough passed is up.";
-
-const scenarios = [
-  { alg: "md5", digest: "hex" },
-  { alg: "md5", digest: "base64" },
-  { alg: "sha1", digest: "hex" },
-  { alg: "sha1", digest: "base64" },
-  { alg: "sha256", digest: "hex" },
-  { alg: "sha256", digest: "base64" },
-];
-
-for (const { alg, digest } of scenarios) {
-  bench(`${alg}-${digest}`, () => {
-    const hasher = createHash(alg);
-    hasher.write(data);
-    hasher.end();
-    hasher.read();
-  });
-}
-
-run();
--- a/bench/snippets/deep-equals.js
+++ b/bench/snippets/deep-equals.js
@@ -1,4 +1,4 @@
-import { bench, group, run } from "./runner.mjs";
+import { bench, group, run } from "mitata";
 import fastDeepEquals from "fast-deep-equal/es6/index";
 // const Date = globalThis.Date;

--- a/bench/snippets/dns.node.mjs
+++ b/bench/snippets/dns.node.mjs
@@ -1,5 +1,5 @@
 import { lookup, resolve } from "node:dns/promises";
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";

 bench("(cached) dns.lookup remote x 50", async () => {
  var tld = "example.com";
--- a/bench/snippets/dns.ts
+++ b/bench/snippets/dns.ts
@@ -1,5 +1,5 @@
 import { dns } from "bun";
-import { bench, run, group } from "./runner.mjs";
+import { bench, run, group } from "mitata";

 async function forEachBackend(name, fn) {
  group(name, () => {
--- a/bench/snippets/emitter.mjs
+++ b/bench/snippets/emitter.mjs
@@ -0,0 +1,101 @@
+// **so this file can run in node**
+import { createRequire } from "node:module";
+const require = createRequire(import.meta.url);
+// --
+
+const EventEmitterNative = require("node:events").EventEmitter;
+const TypedEmitter = require("tiny-typed-emitter").TypedEmitter;
+const EventEmitter3 = require("eventemitter3").EventEmitter;
+import { bench, run } from "../../node_modules/mitata/src/cli.mjs";
+const event = new Event("hello");
+var id = 0;
+for (let [EventEmitter, className] of [
+  [EventEmitterNative, "EventEmitter"],
+  [TypedEmitter, "TypedEmitter"],
+  [EventEmitter3, "EventEmitter3"],
+]) {
+  const emitter = new EventEmitter();
+
+  emitter.on("hello", event => {
+    event.preventDefault();
+  });
+
+  bench(`${className}.emit`, () => {
+    emitter.emit("hello", {
+      preventDefault() {
+        id++;
+      },
+    });
+  });
+
+  bench(`${className}.on x 10_000 (handler)`, () => {
+    var cb = event => {
+      event.preventDefault();
+    };
+    emitter.on("hey", cb);
+    var called = false;
+    for (let i = 0; i < 10_000; i++)
+      emitter.emit("hey", {
+        preventDefault() {
+          id++;
+          called = true;
+        },
+      });
+    emitter.off("hey", cb);
+
+    if (!called) throw new Error("not called");
+  });
+
+  if (EventEmitter !== EventEmitter3) {
+    var monkey = Object.assign({}, EventEmitter.prototype);
+    monkey.on("hello", event => {
+      event.preventDefault();
+    });
+
+    bench(`[monkey] ${className}.emit`, () => {
+      var called = false;
+      monkey.emit("hello", {
+        preventDefault() {
+          id++;
+          called = true;
+        },
+      });
+
+      if (!called) {
+        throw new Error("monkey failed");
+      }
+    });
+
+    bench(`[monkey] ${className}.on x 10_000 (handler)`, () => {
+      var cb = () => {
+        event.preventDefault();
+      };
+      monkey.on("hey", cb);
+      for (let i = 0; i < 10_000; i++)
+        monkey.emit("hey", {
+          preventDefault() {
+            id++;
+          },
+        });
+      monkey.off("hey", cb);
+    });
+  }
+}
+
+var target = new EventTarget();
+target.addEventListener("hello", event => {});
+bench("EventTarget.dispatch", () => {
+  target.dispatchEvent(event);
+});
+
+var hey = new Event("hey");
+
+bench("EventTarget.on x 10_000 (handler)", () => {
+  var handler = event => {};
+  target.addEventListener("hey", handler);
+
+  for (let i = 0; i < 10_000; i++) target.dispatchEvent(hey);
+  target.removeEventListener("hey", handler);
+});
+
+await run();
--- a/bench/snippets/escapeHTML.js
+++ b/bench/snippets/escapeHTML.js
@@ -1,5 +1,5 @@
-import { group } from "./runner.mjs";
-import { bench, run } from "./runner.mjs";
+import { group } from "mitata";
+import { bench, run } from "mitata";
 import { encode as htmlEntityEncode } from "html-entities";
 import { escape as heEscape } from "he";

--- a/bench/snippets/ffi-overhead.mjs
+++ b/bench/snippets/ffi-overhead.mjs
@@ -1,5 +1,5 @@
 import { viewSource, dlopen, CString, ptr, toBuffer, toArrayBuffer, FFIType, callback } from "bun:ffi";
-import { bench, group, run } from "./runner.mjs";
+import { bench, group, run } from "mitata";

 const types = {
  returns_true: {
--- a/bench/snippets/index-of.mjs
+++ b/bench/snippets/index-of.mjs
@@ -1,4 +1,4 @@
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";

 const input =
  "Hello, World! foo bar baz qux quux corge grault garply waldo fred plugh xyzzy thud z a b c d e f g h i j k l m n o p q r s t u v w x y z".split(
--- a/bench/snippets/json-parse-stringify.mjs
+++ b/bench/snippets/json-parse-stringify.mjs
@@ -1,57 +0,0 @@
-import { bench, run } from "./runner.mjs";
-
-var obj = {
-  "restApiRoot": "/api",
-  "host": "0.0.0.0",
-  "port": 3000,
-  "remoting": {
-    "context": false,
-    "rest": {
-      "handleErrors": false,
-      "normalizeHttpPath": false,
-      "xml": false,
-    },
-    "json": {
-      "strict": false,
-      "limit": "100kb",
-    },
-    "urlencoded": {
-      "extended": true,
-      "limit": "100kb",
-      boop: {
-        "restApiRoot": "/api",
-        "host": "0.0.0.0",
-        "port": 3000,
-        "remoting": {
-          "context": false,
-          "rest": {
-            "handleErrors": false,
-            "normalizeHttpPath": false,
-            "xml": false,
-          },
-          "json": {
-            "strict": false,
-            "limit": "100kb",
-          },
-          "urlencoded": {
-            "extended": true,
-            "limit": "100kb",
-          },
-          "cors": false,
-        },
-      },
-    },
-    "cors": false,
-  },
-};
-var big = JSON.stringify(obj);
-
-bench("JSON.parse(obj)", () => {
-  globalThis.foo = JSON.parse(big);
-});
-
-bench("JSON.stringify(obj)", () => {
-  globalThis.bar = JSON.stringify(obj);
-});
-
-await run();
--- a/bench/snippets/native-overhead.mjs
+++ b/bench/snippets/native-overhead.mjs
@@ -1,4 +1,4 @@
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";

 // These are no-op C++ functions that are exported to JS.
 const lazy = globalThis[Symbol.for("Bun.lazy")];
--- a/bench/snippets/node-vm.mjs
+++ b/bench/snippets/node-vm.mjs
@@ -1,42 +0,0 @@
-// @runtime node, bun
-import { bench, run } from "./runner.mjs";
-import * as vm from "node:vm";
-
-const context = {
-  animal: "cat",
-  count: 2,
-};
-
-const script = new vm.Script("animal = 'hey'");
-
-vm.createContext(context);
-
-bench("vm.Script.runInContext", () => {
-  script.runInContext(context);
-});
-
-bench("vm.Script.runInThisContext", () => {
-  script.runInThisContext(context);
-});
-
-bench("vm.Script.runInNewContext", () => {
-  script.runInNewContext(context);
-});
-
-bench("vm.runInContext", () => {
-  vm.runInContext("animal = 'hey'", context);
-});
-
-bench("vm.runInNewContext", () => {
-  vm.runInNewContext("animal = 'hey'", context);
-});
-
-bench("vm.runInThisContext", () => {
-  vm.runInThisContext("animal = 'hey'", context);
-});
-
-bench("vm.createContext", () => {
-  vm.createContext({ yo: 1 });
-});
-
-await run();
--- a/bench/snippets/noop.js
+++ b/bench/snippets/noop.js
@@ -1,4 +1,4 @@
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";

 var noop = globalThis[Symbol.for("Bun.lazy")]("noop");
 var { function: noopFn, callback } = noop;
--- a/bench/snippets/object-values.mjs
+++ b/bench/snippets/object-values.mjs
@@ -24,7 +24,7 @@ const obj = {
  w: 23,
 };

-import { bench, group, run } from "./runner.mjs";
+import { bench, group, run } from "mitata";

 var val = 0;
 bench("Object.values(literal)", () => {
--- a/bench/snippets/package.json
+++ b/bench/snippets/package.json
@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "eventemitter3": "^5.0.0",
+    "tiny-typed-emitter": "latest"
+  },
+  "prettier": "../../.prettierrc.cjs"
+}
--- a/bench/snippets/performance-now-overhead.js
+++ b/bench/snippets/performance-now-overhead.js
@@ -1,5 +1,5 @@
-import { group } from "./runner.mjs";
-import { bench, run } from "./runner.mjs";
+import { group } from "mitata";
+import { bench, run } from "mitata";
 bench("performance.now x 1000", () => {
  for (let i = 0; i < 1000; i++) {
    performance.now();
--- a/bench/snippets/process.mjs
+++ b/bench/snippets/process.mjs
@@ -1,4 +1,4 @@
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";

 bench("process.stderr.write('hey')", () => {
  process.stderr.write("hey");
--- a/bench/snippets/react-dom-render.bun.js
+++ b/bench/snippets/react-dom-render.bun.js
@@ -1,4 +1,4 @@
-import { bench, group, run } from "./runner.mjs";
+import { bench, group, run } from "mitata";
 import { renderToReadableStream } from "react-dom/server.browser";
 import { renderToReadableStream as renderToReadableStreamBun } from "react-dom/server";

--- a/bench/snippets/read-file.mjs
+++ b/bench/snippets/read-file.mjs
@@ -1,5 +1,5 @@
 import { readFileSync, writeFileSync } from "node:fs";
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";

 var short = (function () {
  const text = "Hello World!";
--- a/bench/snippets/readdir.mjs
+++ b/bench/snippets/readdir.mjs
@@ -1,5 +1,5 @@
 import { readdirSync } from "fs";
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";
 import { argv } from "process";

 const dir = argv.length > 2 ? argv[2] : "/tmp";
--- a/bench/snippets/runner-entrypoint.js
+++ b/bench/snippets/runner-entrypoint.js
@@ -1,244 +0,0 @@
-// note: this isn't done yet
-// we look for `// @runtime` in the file to determine which runtimes to run the benchmark in
-import { spawnSync } from "bun";
-import { readdirSync, readFileSync } from "node:fs";
-import { Database } from "bun:sqlite";
-import { extname, basename } from "path";
-
-const exts = [".js", ".ts", ".mjs", ".tsx"];
-
-const runtimes = {
-  bun: process.execPath,
-  node: process.env.NODE ?? Bun.which("node"),
-  deno: process.env.DENO ?? Bun.which("deno"),
-};
-
-if (process.env.BUN_ONLY) {
-  delete runtimes.node;
-  delete runtimes.deno;
-}
-
-function getEntry(sourceContents, file) {
-  const targetLineStart = sourceContents.indexOf("// @runtime ");
-  if (targetLineStart === -1) {
-    return;
-  }
-
-  const targetLineEnd = sourceContents.indexOf("\n", targetLineStart);
-  if (targetLineEnd === -1) {
-    return;
-  }
-
-  const targetLine = sourceContents.slice(targetLineStart, targetLineEnd);
-  const targets = targetLine
-    .slice("// @runtime ".length)
-    .split(/[,\s]+/gm)
-    .map(a => a.trim().toLowerCase())
-    .filter(Boolean)
-    .sort();
-
-  if (targets.length === 0) {
-    throw new TypeError("No targets specified in " + JSON.stringify(file) + "\n> " + JSON.stringify(targetLine) + "\n");
-  }
-
-  var cmds = {};
-  for (let target of targets) {
-    if (!(target in runtimes)) {
-      throw new TypeError(
-        "Unknown target " + JSON.stringify(target) + "\n> " + targetLine + "\n file:" + JSON.stringify(file),
-      );
-    }
-
-    switch (target) {
-      case "bun": {
-        if (!runtimes.bun) {
-          continue;
-        }
-
-        cmds.bun = [runtimes.bun, "run", file];
-        break;
-      }
-
-      case "node": {
-        if (!runtimes.node) {
-          continue;
-        }
-        cmds.node = [runtimes.node, file];
-        break;
-      }
-
-      case "deno": {
-        if (!runtimes.deno) {
-          continue;
-        }
-        cmds.deno = [runtimes.deno, "run", "-A", "--unstable", file];
-        break;
-      }
-
-      default: {
-        throw new Error("This should not be reached.");
-        break;
-      }
-    }
-  }
-
-  if (Object.keys(cmds).length === 0) {
-    return;
-  }
-
-  return cmds;
-}
-
-function scan() {
-  const queue = [];
-  for (let file of readdirSync(import.meta.dir)) {
-    if (!exts.includes(extname(file))) continue;
-    if (file.includes("runner")) continue;
-
-    const cmds = getEntry(readFileSync(file, "utf8"), file);
-    if (!cmds) continue;
-
-    queue.push({ file, cmds });
-  }
-
-  return queue;
-}
-
-const env = {
-  ...process.env,
-  BENCHMARK_RUNNER: "1",
-  NODE_NO_WARNINGS: "1",
-  NODE_OPTIONS: "--no-warnings",
-  BUN_DEBUG_QUIET_LOGS: "1",
-  NO_COLOR: "1",
-  DISABLE_COLORS: "1",
-};
-
-function* run({ cmds, file }) {
-  const benchmarkID = basename(file)
-    .toLowerCase()
-    .replace(/\.m?js$/, "")
-    .replace(/\.tsx?$/, "")
-    .replace(".node", "")
-    .replace(".deno", "")
-    .replace(".bun", "");
-
-  // if benchmarkID doesn't contain only words, letters or numbers or dashes or underscore, throw
-  if (!/^[a-z0-9_-]+$/i.test(benchmarkID)) {
-    throw new Error(
-      "Benchmark files must only contain /a-zA-Z0-9-_/ " +
-        JSON.stringify(benchmarkID) +
-        " in file " +
-        JSON.stringify(file),
-    );
-  }
-
-  for (let runtime in cmds) {
-    const timestamp = Date.now();
-    const spawnStart = performance.now();
-    var { stdout, exitCode } = spawnSync({
-      cmd: cmds[runtime],
-      env,
-      stderr: "inherit",
-      stdout: "pipe",
-    });
-    const spawnElapsed = performance.now() - spawnStart;
-    stdout = stdout.toString();
-    try {
-      const json = JSON.parse(stdout.trim());
-      yield {
-        file: file,
-        benchmarkID,
-        result: json,
-        runtime: runtime,
-        timestamp,
-        elapsed: spawnElapsed,
-        runtimeVersion: (runtime === "bun"
-          ? `${Bun.version}-${Bun.revision}`
-          : String(json?.runtime).split(" ").at(1)
-        ).replace(/^v/, ""),
-      };
-    } catch (e) {
-      console.error("Failing file", file);
-      console.error(JSON.stringify(cmds[runtime]));
-      console.error(stdout.toString());
-      throw e;
-    }
-
-    if (exitCode !== 0) {
-      throw new Error("Non-zero exit code in file " + JSON.stringify(file) + ", runtime: " + JSON.stringify(runtime));
-    }
-  }
-}
-
-const db = Database.open(process.RUNNER_DB_PATH ?? `runs-${process.platform}-${process.arch}.db`);
-db.run(`CREATE TABLE IF NOT EXISTS benchmarkResults (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    results TEXT NOT NULL
-);`);
-db.run(`
-CREATE TABLE IF NOT EXISTS runs (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    runtime TEXT NOT NULL,
-    runtimeVersion TEXT NOT NULL,
-    benchmarkID TEXT NOT NULL,
-    timestamp INTEGER NOT NULL,
-    elapsed REAL NOT NULL,
-    benchmarkResultID INTEGER NOT NULL
-);
-
-
-`);
-db.run(`CREATE INDEX IF NOT EXISTS runs_benchmarkID ON runs (benchmarkID);`);
-db.run(`CREATE INDEX IF NOT EXISTS runs_timestamp ON runs (timestamp);`);
-db.run(`CREATE INDEX IF NOT EXISTS runs_runtime ON runs (runtime);`);
-db.run(`CREATE INDEX IF NOT EXISTS runs_runtimeVersion ON runs (runtimeVersion);`);
-db.run(`CREATE INDEX IF NOT EXISTS runs_benchmarkResultID ON runs (benchmarkResultID);`);
-
-// TODO: finish this
-for (let result of scan()) {
-  var prevBenchmarkID = null;
-  for (let {
-    runtime,
-    benchmarkID,
-    runtimeVersion,
-    timestamp,
-    elapsed,
-    file,
-    result: { benchmarks },
-  } of run(result)) {
-    if (prevBenchmarkID !== benchmarkID) {
-      console.log("\n" + `${benchmarkID}:`);
-      prevBenchmarkID = benchmarkID;
-    }
-
-    console.log(
-      " ",
-      `[${Math.round(elapsed)}ms]`,
-      "Executed",
-      JSON.stringify(benchmarkID),
-      "in",
-      runtime,
-      runtimeVersion,
-      "(" + file + ")",
-    );
-    const { id: benchmarkResultID } = db
-      .query(
-        `
-        INSERT INTO benchmarkResults (results) VALUES (?) RETURNING id
-      `,
-      )
-      .get(JSON.stringify(benchmarks));
-    db.run(
-      `
-      INSERT INTO runs (runtime, runtimeVersion, benchmarkID, timestamp, elapsed, benchmarkResultID) VALUES (
-        ?, ?, ?, ?, ?, ?)`,
-      runtime,
-      runtimeVersion,
-      benchmarkID,
-      timestamp,
-      elapsed,
-      benchmarkResultID,
-    );
-  }
-}
--- a/bench/snippets/runner.mjs
+++ b/bench/snippets/runner.mjs
@@ -1,22 +0,0 @@
-import * as Mitata from "../node_modules/mitata/src/cli.mjs";
-import process from "node:process";
-
-const asJSON = !!process?.env?.BENCHMARK_RUNNER;
-
-export function run(opts = {}) {
-  opts ??= {};
-
-  if (asJSON) {
-    opts.json = true;
-  }
-
-  return Mitata.run(opts);
-}
-
-export function bench(name, fn) {
-  return Mitata.bench(name, fn);
-}
-
-export function group(name, fn) {
-  return Mitata.group(name, fn);
-}
--- a/bench/snippets/sha512.js
+++ b/bench/snippets/sha512.js
@@ -1,4 +1,4 @@
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";
 import { SHA512 } from "bun";

 bench('SHA512.hash("hello world")', () => {
--- a/bench/snippets/sha512.node.mjs
+++ b/bench/snippets/sha512.node.mjs
@@ -1,4 +1,4 @@
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";
 import { createHash } from "crypto";

 bench('createHash("sha256").update("hello world").digest()', () => {
--- a/bench/snippets/spawn-hugemem.mjs
+++ b/bench/snippets/spawn-hugemem.mjs
@@ -1,5 +1,5 @@
 import { spawnSync } from "bun";
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";

 var memory = new Uint8Array(128 * 1024 * 1024);
 memory.fill(10);
--- a/bench/snippets/spawn-hugemem.node.mjs
+++ b/bench/snippets/spawn-hugemem.node.mjs
@@ -1,5 +1,5 @@
 import { spawnSync } from "child_process";
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";

 var memory = new Uint8Array(128 * 1024 * 1024);
 memory.fill(10);
--- a/bench/snippets/spawn.mjs
+++ b/bench/snippets/spawn.mjs
@@ -1,5 +1,5 @@
 import { spawnSync } from "bun";
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";

 bench("spawnSync echo hi", () => {
  spawnSync({ cmd: ["echo", "hi"] });
--- a/bench/snippets/spawn.node.mjs
+++ b/bench/snippets/spawn.node.mjs
@@ -1,6 +1,5 @@
-// @runtime bun,node,deno
-import { spawnSync } from "node:child_process";
-import { bench, run } from "./runner.mjs";
+import { spawnSync } from "child_process";
+import { bench, run } from "mitata";

 bench("spawnSync echo hi", () => {
  spawnSync("echo", ["hi"], { encoding: "buffer", shell: false });
--- a/bench/snippets/stat.mjs
+++ b/bench/snippets/stat.mjs
@@ -1,5 +1,5 @@
 import { readdirSync, statSync } from "fs";
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";
 import { argv } from "process";

 const dir = argv.length > 2 ? argv[2] : "/tmp";
--- a/bench/snippets/stderr.mjs
+++ b/bench/snippets/stderr.mjs
@@ -1,4 +1,4 @@
-import { run, bench } from "./runner.mjs";
+import { run, bench } from "mitata";

 var writer = globalThis.Bun ? Bun.stderr.writer() : undefined;
 if (writer)
--- a/bench/snippets/string-decoder.mjs
+++ b/bench/snippets/string-decoder.mjs
@@ -1,4 +1,4 @@
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";
 import { StringDecoder } from "string_decoder";

 var short = Buffer.from("Hello World!");
--- a/bench/snippets/text-encoder.mjs
+++ b/bench/snippets/text-encoder.mjs
@@ -1,4 +1,4 @@
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";

 var short = "Hello World!";
 var shortUTF16 = "Hello World 💕💕💕";
--- a/bench/snippets/transpiler.mjs
+++ b/bench/snippets/transpiler.mjs
@@ -1,7 +1,7 @@
 import { readFileSync } from "fs";
 import { dirname } from "path";
 import { fileURLToPath } from "url";
-import { bench, run, group } from "./runner.mjs";
+import { bench, run, group } from "mitata";
 import { createRequire } from "module";
 const require = createRequire(import.meta.url);
 const esbuild_ = require("esbuild/lib/main");
--- a/bench/snippets/write-file-huge.mjs
+++ b/bench/snippets/write-file-huge.mjs
@@ -1,42 +0,0 @@
-import { Buffer } from "node:buffer";
-import { writeFile } from "node:fs/promises";
-import { bench, run } from "./runner.mjs";
-
-var hugeFile = Buffer.alloc(1024 * 1024 * 64);
-var medFile = Buffer.alloc(1024 * 1024 * 16);
-var humongousFile = Buffer.alloc(1024 * 1024 * 256);
-
-bench(
-  `fs.writeFile ${new Intl.NumberFormat("en-US", {
-    style: "unit",
-    unit: "megabyte",
-    unitDisplay: "narrow",
-  }).format(humongousFile.byteLength / 1024 / 1024)}`,
-  async () => {
-    await writeFile("/tmp/bun.bench-out.humongousFile.txt" + ((Math.random() * 65432) | 0).toString(16), humongousFile);
-  },
-);
-
-bench(
-  `fs.writeFile ${new Intl.NumberFormat("en-US", {
-    style: "unit",
-    unit: "megabyte",
-    unitDisplay: "narrow",
-  }).format(hugeFile.byteLength / 1024 / 1024)}`,
-  async () => {
-    await writeFile("/tmp/bun.bench-out.huge.txt" + ((Math.random() * 65432) | 0).toString(16), hugeFile);
-  },
-);
-
-bench(
-  `fs.writeFile ${new Intl.NumberFormat("en-US", {
-    style: "unit",
-    unit: "megabyte",
-    unitDisplay: "narrow",
-  }).format(medFile.byteLength / 1024 / 1024)}`,
-  async () => {
-    await writeFile("/tmp/bun.bench-out.medium.txt" + ((Math.random() * 65432) | 0).toString(16), medFile);
-  },
-);
-
-await run();
--- a/bench/snippets/write-file.mjs
+++ b/bench/snippets/write-file.mjs
@@ -1,5 +1,5 @@
 import { readFileSync, writeFileSync } from "node:fs";
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";

 var short = "Hello World!";
 var shortUTF16 = "Hello World 💕💕💕";
--- a/bench/snippets/write.bun.js
+++ b/bench/snippets/write.bun.js
@@ -1,4 +1,4 @@
-import { bench, run } from "./runner.mjs";
+import { bench, run } from "mitata";
 import { write } from "bun";
 import { openSync } from "fs";

--- a/bench/snippets/write.node.mjs
+++ b/bench/snippets/write.node.mjs
@@ -1,9 +1,7 @@
-// @runtime node, bun, deno
-import { bench, run } from "./runner.mjs";
-import { Buffer } from "node:buffer";
-import { openSync } from "node:fs";
-import { writeFile } from "node:fs/promises";
-import { writeSync as write } from "node:fs";
+import { bench, run } from "mitata";
+import { openSync } from "fs";
+import { writeFile } from "fs/promises";
+import { writeSync as write } from "fs";

 bench("writeFile(/tmp/foo.txt, short string)", async () => {
  await writeFile("/tmp/foo.txt", "short string", "utf8");
--- a/bench/socketio/client.js
+++ b/bench/socketio/client.js
@@ -1,61 +0,0 @@
-const { io } = require("socket.io-client");
-const port = process.env.PORT || 3000;
-
-const URL = `ws://localhost:${port}`;
-const MAX_CLIENTS = 250;
-const BATCHSIZE = MAX_CLIENTS / 10;
-const BATCH_INTERVAL_IN_MS = 1000;
-const EMIT_INTERVAL_IN_MS = 50;
-
-let clientCount = 0;
-let lastReport = new Date().getTime();
-let packetsSinceLastReport = 0;
-
-const clients = [];
-const createClient = () => {
-  const socket = io(URL);
-  clients.push(socket);
-
-  socket.on("server to client event", () => {
-    packetsSinceLastReport++;
-  });
-
-  socket.on("disconnect", reason => {
-    console.log(`disconnect due to ${reason}`);
-  });
-};
-
-let emitInterval = null;
-
-const createClients = () => {
-  for (let i = 0; i < BATCHSIZE; i++) {
-    createClient();
-    clientCount++;
-  }
-
-  if (clientCount < MAX_CLIENTS) {
-    setTimeout(createClients, BATCH_INTERVAL_IN_MS);
-  }
-  if (!emitInterval) {
-    emitInterval = setInterval(() => {
-      clients.forEach(socket => {
-        socket.emit("client to server event", "hello world");
-      });
-    }, EMIT_INTERVAL_IN_MS);
-  }
-};
-
-createClients();
-
-const printReport = () => {
-  const now = new Date().getTime();
-  const durationSinceLastReport = (now - lastReport) / 1000;
-  const packetsPerSeconds = (packetsSinceLastReport / durationSinceLastReport).toFixed(2);
-
-  console.log(`client count: ${clientCount} ; average packets received per second: ${packetsPerSeconds}`);
-
-  packetsSinceLastReport = 0;
-  lastReport = now;
-};
-
-setInterval(printReport, 1000);
--- a/bench/socketio/server.js
+++ b/bench/socketio/server.js
@@ -1,13 +0,0 @@
-const http = require("http").createServer();
-
-const io = require("socket.io")(http);
-const port = process.env.PORT || 3000;
-io.on("connection", socket => {
-  socket.on("client to server event", msg => {
-    io.emit("server to client event", msg);
-  });
-});
-
-http.listen(port, () => {
-  console.log(`Socket.IO server running at http://localhost:${port}/`);
-});
--- a/bench/sqlite/bun.lockb
+++ b/bench/sqlite/bun.lockb
--- a/bench/sqlite/deno.js
+++ b/bench/sqlite/deno.js
@@ -1,4 +1,4 @@
-import { Database } from "https://deno.land/x/sqlite3@0.9.1/mod.ts";
+import { Database } from "https://deno.land/x/sqlite3@0.8.0/mod.ts";
 import { run, bench } from "../node_modules/mitata/src/cli.mjs";

 const db = new Database("./src/northwind.sqlite");
--- a/bench/sqlite/package-lock.json
+++ b/bench/sqlite/package-lock.json
@@ -0,0 +1,728 @@
+{
+  "name": "bench",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "bench",
+      "dependencies": {
+        "better-sqlite3": "^8.0.1"
+      }
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/better-sqlite3": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.0.1.tgz",
+      "integrity": "sha512-JhTZjpyapA1icCEjIZB4TSSgkGdFgpWZA2Wszg7Cf4JwJwKQmbvuNnJBeR+EYG/Z29OXvR4G//Rbg31BW/Z7Yg==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "prebuild-install": "^7.1.0"
+      }
+    },
+    "node_modules/bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dependencies": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
+    "node_modules/bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+    },
+    "node_modules/decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "dependencies": {
+        "mimic-response": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/detect-libc": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
+      "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/expand-template": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
+    },
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+    },
+    "node_modules/github-from-package": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+      "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/mimic-response": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
+    },
+    "node_modules/mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
+    },
+    "node_modules/napi-build-utils": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
+      "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
+    },
+    "node_modules/node-abi": {
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.22.0.tgz",
+      "integrity": "sha512-u4uAs/4Zzmp/jjsD9cyFYDXeISfUWaAVWshPmDZOFOv4Xl4SbzTXm53I04C2uRueYJ+0t5PEtLH/owbn2Npf/w==",
+      "dependencies": {
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/prebuild-install": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
+      "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
+      "dependencies": {
+        "detect-libc": "^2.0.0",
+        "expand-template": "^2.0.3",
+        "github-from-package": "0.0.0",
+        "minimist": "^1.2.3",
+        "mkdirp-classic": "^0.5.3",
+        "napi-build-utils": "^1.0.1",
+        "node-abi": "^3.3.0",
+        "pump": "^3.0.0",
+        "rc": "^1.2.7",
+        "simple-get": "^4.0.0",
+        "tar-fs": "^2.0.0",
+        "tunnel-agent": "^0.6.0"
+      },
+      "bin": {
+        "prebuild-install": "bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "dependencies": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "bin": {
+        "rc": "cli.js"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/semver": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/simple-get": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
+      "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "decompress-response": "^6.0.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "node_modules/tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "dependencies": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    }
+  },
+  "dependencies": {
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+    },
+    "better-sqlite3": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.0.1.tgz",
+      "integrity": "sha512-JhTZjpyapA1icCEjIZB4TSSgkGdFgpWZA2Wszg7Cf4JwJwKQmbvuNnJBeR+EYG/Z29OXvR4G//Rbg31BW/Z7Yg==",
+      "requires": {
+        "bindings": "^1.5.0",
+        "prebuild-install": "^7.1.0"
+      }
+    },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
+    "bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "requires": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "requires": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+    },
+    "decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "requires": {
+        "mimic-response": "^3.1.0"
+      }
+    },
+    "deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
+    },
+    "detect-libc": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
+      "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "expand-template": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="
+    },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
+    },
+    "fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+    },
+    "github-from-package": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+      "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="
+    },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+    },
+    "lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "requires": {
+        "yallist": "^4.0.0"
+      }
+    },
+    "mimic-response": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="
+    },
+    "minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
+    },
+    "mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
+    },
+    "napi-build-utils": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
+      "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
+    },
+    "node-abi": {
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.22.0.tgz",
+      "integrity": "sha512-u4uAs/4Zzmp/jjsD9cyFYDXeISfUWaAVWshPmDZOFOv4Xl4SbzTXm53I04C2uRueYJ+0t5PEtLH/owbn2Npf/w==",
+      "requires": {
+        "semver": "^7.3.5"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "prebuild-install": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
+      "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
+      "requires": {
+        "detect-libc": "^2.0.0",
+        "expand-template": "^2.0.3",
+        "github-from-package": "0.0.0",
+        "minimist": "^1.2.3",
+        "mkdirp-classic": "^0.5.3",
+        "napi-build-utils": "^1.0.1",
+        "node-abi": "^3.3.0",
+        "pump": "^3.0.0",
+        "rc": "^1.2.7",
+        "simple-get": "^4.0.0",
+        "tar-fs": "^2.0.0",
+        "tunnel-agent": "^0.6.0"
+      }
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "requires": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      }
+    },
+    "readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+    },
+    "semver": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "requires": {
+        "lru-cache": "^6.0.0"
+      }
+    },
+    "simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="
+    },
+    "simple-get": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
+      "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
+      "requires": {
+        "decompress-response": "^6.0.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="
+    },
+    "tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "requires": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "requires": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      }
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    },
+    "yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    }
+  }
+}
--- a/bench/stream-file-upload-client/.gitignore
+++ b/bench/stream-file-upload-client/.gitignore
@@ -1 +0,0 @@
-hello.txt
--- a/bench/stream-file-upload-client/README.md
+++ b/bench/stream-file-upload-client/README.md
@@ -1,35 +0,0 @@
-# HTTP request file upload benchmark
-
-This is a simple benchmark of uploading a file to a web server in different runtimes.
-
-## Usage
-
-Generate a file to upload (default is `hello.txt`):
-
-```bash
-bun generate-file.js
-```
-
-Run the server:
-
-```bash
-node server-node.mjs
-```
-
-Run the benchmark in bun:
-
-```bash
-bun stream-file-bun.js
-```
-
-Run the benchmark in node:
-
-```bash
-node stream-file-node.mjs
-```
-
-Run the benchmark in deno:
-
-```bash
-deno run -A stream-file-deno.js
-```
--- a/bench/stream-file-upload-client/generate-file.js
+++ b/bench/stream-file-upload-client/generate-file.js
--- a/bench/stream-file-upload-client/server-node.mjs
+++ b/bench/stream-file-upload-client/server-node.mjs
@@ -1,15 +0,0 @@
-import { createServer } from "node:http";
-const server = createServer((req, res) => {
-  var chunkSize = 0;
-  req.on("data", chunk => {
-    chunkSize += chunk.byteLength;
-  });
-
-  req.on("end", () => {
-    console.log("Received", chunkSize, "bytes");
-    res.end(`${chunkSize}`);
-  });
-});
-server.listen(parseInt(process.env.PORT ?? "3000"), (err, port) => {
-  console.log(`http://localhost:${server.address().port}`);
-});
--- a/bench/stream-file-upload-client/stream-file-bun.js
+++ b/bench/stream-file-upload-client/stream-file-bun.js
@@ -1,9 +0,0 @@
-import { file } from "bun";
-console.time("stream-file-bun");
-const response = await fetch(process.env.URL ?? "http://localhost:3000", {
-  method: "POST",
-  body: file(process.env.FILE ?? "hello.txt"),
-});
-console.timeEnd("stream-file-bun");
-
-console.log("Sent", await response.text(), "bytes");
--- a/bench/stream-file-upload-client/stream-file-deno.js
+++ b/bench/stream-file-upload-client/stream-file-deno.js
@@ -1,12 +0,0 @@
-const file = await Deno.open(Deno.env.get("FILE") ?? "hello.txt", {
-  read: true,
-});
-
-console.time("stream-file-deno");
-const response = await fetch(Deno.env.get("URL") ?? "http://localhost:3000", {
-  method: "POST",
-  body: file.readable,
-});
-console.timeEnd("stream-file-deno");
-
-console.log("Sent", await response.text(), "bytes");
--- a/bench/stream-file-upload-client/stream-file-node.mjs
+++ b/bench/stream-file-upload-client/stream-file-node.mjs
@@ -1,19 +0,0 @@
-import { createReadStream } from "node:fs";
-import http from "node:http";
-
-console.time("stream-file-node");
-createReadStream(process.env.FILE ?? "hello.txt")
-  .pipe(
-    http
-      .request(process.env.URL ?? "http://localhost:3000", {
-        method: "POST",
-      })
-      .on("response", response => {
-        response.on("data", data => {
-          console.log("Sent", parseInt(data.toString(), 10), "bytes");
-        });
-      }),
-  )
-  .on("close", () => {
-    console.timeEnd("stream-file-node");
-  });
--- a/build.zig
+++ b/build.zig
@@ -71,24 +71,6 @@ const BunBuildOptions = struct {
    sizegen: bool = false,
    base_path: [:0]const u8 = "",

-    runtime_js_version: u64 = 0,
-    fallback_html_version: u64 = 0,
-
-    pub fn updateRuntime(this: *BunBuildOptions) anyerror!void {
-        var runtime_out_file = try std.fs.cwd().openFile("src/runtime.out.js", .{ .mode = .read_only });
-        const runtime_hash = std.hash.Wyhash.hash(
-            0,
-            try runtime_out_file.readToEndAlloc(std.heap.page_allocator, try runtime_out_file.getEndPos()),
-        );
-        this.runtime_js_version = runtime_hash;
-        var fallback_out_file = try std.fs.cwd().openFile("src/fallback.out.js", .{ .mode = .read_only });
-        const fallback_hash = std.hash.Wyhash.hash(
-            0,
-            try fallback_out_file.readToEndAlloc(std.heap.page_allocator, try fallback_out_file.getEndPos()),
-        );
-        this.fallback_html_version = fallback_hash;
-    }
-
    pub fn step(this: BunBuildOptions, b: anytype) *std.build.OptionsStep {
        var opts = b.addOptions();
        opts.addOption(@TypeOf(this.canary), "is_canary", this.canary);
@@ -97,8 +79,6 @@ const BunBuildOptions = struct {
        opts.addOption(@TypeOf(this.bindgen), "bindgen", this.bindgen);
        opts.addOption(@TypeOf(this.sizegen), "sizegen", this.sizegen);
        opts.addOption(@TypeOf(this.base_path), "base_path", this.base_path);
-        opts.addOption(@TypeOf(this.runtime_js_version), "runtime_js_version", this.runtime_js_version);
-        opts.addOption(@TypeOf(this.fallback_html_version), "fallback_html_version", this.fallback_html_version);
        return opts;
    }
 };
@@ -125,6 +105,28 @@ const fmt = struct {
    }
 };

+fn updateRuntime() anyerror!void {
+    var runtime_out_file = try std.fs.cwd().openFile("src/runtime.out.js", .{ .mode = .read_only });
+    const runtime_hash = std.hash.Wyhash.hash(
+        0,
+        try runtime_out_file.readToEndAlloc(std.heap.page_allocator, try runtime_out_file.getEndPos()),
+    );
+    const runtime_version_file = std.fs.cwd().createFile("src/runtime.version", .{ .truncate = true }) catch std.debug.panic("Failed to create src/runtime.version", .{});
+    defer runtime_version_file.close();
+    runtime_version_file.writer().print("{any}", .{fmt.hexInt(runtime_hash)}) catch unreachable;
+    var fallback_out_file = try std.fs.cwd().openFile("src/fallback.out.js", .{ .mode = .read_only });
+    const fallback_hash = std.hash.Wyhash.hash(
+        0,
+        try fallback_out_file.readToEndAlloc(std.heap.page_allocator, try fallback_out_file.getEndPos()),
+    );
+
+    const fallback_version_file = std.fs.cwd().createFile("src/fallback.version", .{ .truncate = true }) catch std.debug.panic("Failed to create src/fallback.version", .{});
+
+    fallback_version_file.writer().print("{any}", .{fmt.hexInt(fallback_hash)}) catch unreachable;
+
+    fallback_version_file.close();
+}
+
 var x64 = "x64";
 var optimize: std.builtin.OptimizeMode = undefined;

@@ -192,6 +194,8 @@ pub fn build(b: *Build) !void {
    else
        "root.zig";

+    updateRuntime() catch {};
+
    const min_version: std.builtin.Version = if (target.getOsTag() != .freestanding)
        target.getOsVersionMin().semver
    else
@@ -267,8 +271,6 @@ pub fn build(b: *Build) !void {
            obj.target.cpu_model = .{ .explicit = &std.Target.aarch64.cpu.generic };
        }

-        try default_build_options.updateRuntime();
-
        // we have to dump to stderr because stdout is read by zls
        std.io.getStdErr().writer().print("Build {s} v{} - v{} ({s})\n", .{
            triplet,
@@ -452,9 +454,38 @@ pub fn build(b: *Build) !void {
        }

        try configureObjectStep(b, headers_obj, @TypeOf(target), target, obj.main_pkg_path.?);
+        try linkObjectFiles(b, headers_obj, target);

        headers_step.dependOn(&headers_obj.step);
        headers_obj.addOptions("build_options", default_build_options.step(b));
+
+        // var iter = headers_obj.modules.iterator();
+        // while (iter.next()) |item| {
+        //     const module = @ptrCast(*Module, item.value_ptr);
+        // }
+        // // while (headers_obj.modules.)
+        // for (headers_obj.packages.items) |pkg_| {
+        //     const pkg: std.build.Pkg = pkg_;
+        //     if (std.mem.eql(u8, pkg.name, "clap")) continue;
+        //     var test_ = b.addTestSource(pkg.source);
+
+        //     b
+        //         .test_.setMainPkgPath(obj.main_pkg_path.?);
+        //     try configureObjectStep(b, test_, @TypeOf(target), target, obj.main_pkg_path.?);
+        //     try linkObjectFiles(b, test_, target);
+        //     test_.addOptions("build_options", default_build_options.step(b));
+
+        //     if (pkg.dependencies) |children| {
+        //         test_.packages = std.ArrayList(std.build.Pkg).init(b.allocator);
+        //         try test_.packages.appendSlice(children);
+        //     }
+
+        //     var before = b.addLog("\x1b[" ++ color_map.get("magenta").? ++ "\x1b[" ++ color_map.get("b").? ++ "[{s} tests]" ++ "\x1b[" ++ color_map.get("d").? ++ " ----\n\n" ++ "\x1b[0m", .{pkg.name});
+        //     var after = b.addLog("\x1b[" ++ color_map.get("d").? ++ "–––---\n\n" ++ "\x1b[0m", .{});
+        //     headers_step.dependOn(&before.step);
+        //     headers_step.dependOn(&test_.step);
+        //     headers_step.dependOn(&after.step);
+        // }
    }

    b.default_step.dependOn(obj_step);
@@ -462,6 +493,67 @@ pub fn build(b: *Build) !void {

 pub var original_make_fn: ?*const fn (step: *std.build.Step) anyerror!void = null;

+// Due to limitations in std.build.Builder
+// we cannot use this with debugging
+// so I am leaving this here for now, with the eventual intent to switch to std.build.Builder
+// but it is dead code
+pub fn linkObjectFiles(b: *Build, obj: *CompileStep, target: anytype) !void {
+    if (target.getOsTag() == .freestanding)
+        return;
+    var dirs_to_search = std.BoundedArray([]const u8, 32).init(0) catch unreachable;
+    const arm_brew_prefix: []const u8 = "/opt/homebrew";
+    const x86_brew_prefix: []const u8 = "/usr/local";
+    try dirs_to_search.append(b.env_map.get("BUN_DEPS_OUT_DIR") orelse b.env_map.get("BUN_DEPS_DIR") orelse @as([]const u8, b.pathFromRoot("src/deps")));
+    if (target.getOsTag() == .macos) {
+        if (target.getCpuArch().isAARCH64()) {
+            try dirs_to_search.append(comptime arm_brew_prefix ++ "/opt/icu4c/lib/");
+        } else {
+            try dirs_to_search.append(comptime x86_brew_prefix ++ "/opt/icu4c/lib/");
+        }
+    }
+
+    if (b.env_map.get("JSC_LIB")) |jsc| {
+        try dirs_to_search.append(jsc);
+    }
+
+    var added = std.AutoHashMap(u64, void).init(b.allocator);
+
+    const files_we_care_about = std.ComptimeStringMap([]const u8, .{
+        .{ "libmimalloc.o", "libmimalloc.o" },
+        .{ "libz.a", "libz.a" },
+        .{ "libarchive.a", "libarchive.a" },
+        .{ "libssl.a", "libssl.a" },
+        .{ "picohttpparser.o", "picohttpparser.o" },
+        .{ "libcrypto.boring.a", "libcrypto.boring.a" },
+        .{ "libicuuc.a", "libicuuc.a" },
+        .{ "libicudata.a", "libicudata.a" },
+        .{ "libicui18n.a", "libicui18n.a" },
+        .{ "libJavaScriptCore.a", "libJavaScriptCore.a" },
+        .{ "libWTF.a", "libWTF.a" },
+        .{ "libbmalloc.a", "libbmalloc.a" },
+        .{ "liblolhtml.a", "liblolhtml.a" },
+        .{ "uSockets.a", "uSockets.a" },
+    });
+
+    for (dirs_to_search.slice()) |deps_path| {
+        var deps_dir = std.fs.cwd().openIterableDir(deps_path, .{}) catch continue;
+        var iterator = deps_dir.iterate();
+        obj.addIncludePath(deps_path);
+        obj.addLibraryPath(deps_path);
+
+        while (iterator.next() catch null) |entr| {
+            const entry: std.fs.IterableDir.Entry = entr;
+            if (files_we_care_about.get(entry.name)) |obj_name| {
+                var has_added = try added.getOrPut(std.hash.Wyhash.hash(0, obj_name));
+                if (!has_added.found_existing) {
+                    var paths = [_][]const u8{ deps_path, obj_name };
+                    obj.addObjectFile(try std.fs.path.join(b.allocator, &paths));
+                }
+            }
+        }
+    }
+}
+
 pub fn configureObjectStep(b: *std.build.Builder, obj: *CompileStep, comptime Target: type, target: Target, main_pkg_path: []const u8) !void {
    obj.setMainPkgPath(main_pkg_path);

--- a/bun.lockb
+++ b/bun.lockb
--- a/completions/bun.bash
+++ b/completions/bun.bash
@@ -119,7 +119,7 @@ _bun_completions() {
        --jsx-runtime)
            COMPREPLY=( $(compgen -W "automatic classic" -- "${cur_word}") );
            return;;
-        --target)
+        --platform)
            COMPREPLY=( $(compgen -W "browser node bun" -- "${cur_word}") );
            return;;
        -l|--loader)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jarred Sumner	97e2b133e3	Merge branch 'main' into jarred/request-finalizer	2023-04-26 01:31:09 -07:00
Jarred Sumner	b957087fe6	Make it clearer this refers to JS request object	2023-04-25 22:09:56 -07:00
Jarred Sumner	88d47cceb4	safer	2023-04-25 21:59:19 -07:00
Jarred Sumner	6259dfdfd1	Fix crash	2023-04-25 21:47:42 -07:00