bun run prettier:extra

packages/bun-debug-adapter-protocol/src/debugger/adapter.ts

@@ -2,13 +2,13 @@ import type { InspectorEventMap } from "../../../bun-inspector-protocol/src/insp
 import type { JSC } from "../../../bun-inspector-protocol/src/protocol";
 import type { DAP } from "../protocol";
 // @ts-ignore
-import { spawn, ChildProcess } from "node:child_process";
+import { ChildProcess, spawn } from "node:child_process";
 import { EventEmitter } from "node:events";
-import { WebSocketInspector, remoteObjectToString } from "../../../bun-inspector-protocol/index";
+import { AddressInfo, createServer } from "node:net";
+import * as path from "node:path";
+import { remoteObjectToString, WebSocketInspector } from "../../../bun-inspector-protocol/index";
 import { randomUnixPath, TCPSocketSignal, UnixSignal } from "./signal";
 import { Location, SourceMap } from "./sourcemap";
-import { createServer, AddressInfo } from "node:net";
-import * as path from "node:path";
 
 export async function getAvailablePort(): Promise<number> {
   const server = createServer();

packages/bun-vscode/example/hello.ts

@@ -2,8 +2,6 @@ type OS = "Windows";
 
 Bun.serve({
   fetch(req: Request) {
-    return new Response(
-      `Hello, ${"Windows" as OS}!`
-    );
-  }
+    return new Response(`Hello, ${"Windows" as OS}!`);
+  },
 });

packages/bun-vscode/scripts/dev.mjs

@@ -1,21 +1,24 @@
 import { defineConfig } from "@vscode/test-cli";
-import { dirname, join } from "node:path";
 import { existsSync, mkdirSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
 
 const workspacePath = dirname(import.meta.dirname);
 const vscodePath = join(workspacePath, ".vscode-test");
 const vscodeTestPath = join(vscodePath, "launch.test.js");
 
-if(!existsSync(vscodeTestPath)) {
+if (!existsSync(vscodeTestPath)) {
   mkdirSync(vscodePath, { recursive: true });
-  writeFileSync(vscodeTestPath, `// Generated by ${import.meta.filename}
+  writeFileSync(
+    vscodeTestPath,
+    `// Generated by ${import.meta.filename}
 // A test that intentionally waits forever and does nothing,
 // so you can debug and test the VSCode extension in a clean environment.
 suite("VSCode extension", function () {
   this.timeout(Number.MAX_SAFE_INTEGER);
   test("wait forever", (done) => {});
 });
-`);
+`,
+  );
 }
 
 export default defineConfig({

packages/bun-vscode/src/features/debug.ts

@@ -1,8 +1,14 @@
 import { DebugSession } from "@vscode/debugadapter";
 import { tmpdir } from "node:os";
 import * as vscode from "vscode";
-import { DAP, TCPSocketSignal } from "../../../bun-debug-adapter-protocol";
-import { DebugAdapter, getAvailablePort, UnixSignal, getRandomId } from "../../../bun-debug-adapter-protocol";
+import {
+  DAP,
+  DebugAdapter,
+  getAvailablePort,
+  getRandomId,
+  TCPSocketSignal,
+  UnixSignal,
+} from "../../../bun-debug-adapter-protocol";
 
 export const DEBUG_CONFIGURATION: vscode.DebugConfiguration = {
   type: "bun",

src/codegen/kit-codegen.ts

@@ -1,152 +1,153 @@
-import { join, basename } from 'node:path';
-import { writeFileSync, existsSync } from 'node:fs';
-import assert from 'node:assert';
+import assert from "node:assert";
+import { existsSync, writeFileSync } from "node:fs";
+import { basename, join } from "node:path";
 
 // arg parsing
 const options = {};
 for (const arg of process.argv.slice(2)) {
-  if(!arg.startsWith('--')) {
-    console.error('Unknown argument ' + arg);
+  if (!arg.startsWith("--")) {
+    console.error("Unknown argument " + arg);
     process.exit(1);
   }
-  const split = arg.split('=');
-  const value = split[1] || 'true';
+  const split = arg.split("=");
+  const value = split[1] || "true";
   options[split[0].slice(2)] = value;
 }
 
 let { codegen_root, debug } = options as any;
-if (!codegen_root) {console.error('Missing --codegen_root=...'); process.exit(1);}
-if (debug === 'false' || debug === '0' || debug == 'OFF') debug = false;
+if (!codegen_root) {
+  console.error("Missing --codegen_root=...");
+  process.exit(1);
+}
+if (debug === "false" || debug === "0" || debug == "OFF") debug = false;
 
-const kit_dir = join(import.meta.dirname, '../kit');
+const kit_dir = join(import.meta.dirname, "../kit");
 process.chdir(kit_dir); // to make bun build predictable in development
 
-const results = await Promise.allSettled(['client', 'server'].map(async mode => {
-  let result = await Bun.build({
-    entrypoints: [join(kit_dir, 'hmr-runtime.ts')],
-    define: {
-      mode: JSON.stringify(mode),
-      IS_BUN_DEVELOPMENT: String(!!debug),
-    },
-    minify: {
-      syntax: true,
-    }
-  });
-  if(!result.success) throw new AggregateError(result.logs);
-  assert(result.outputs.length === 1, 'must bundle to a single file');
-  // @ts-ignore
-  let code = await result.outputs[0].text();
-
-  // A second pass is used to convert global variables into parameters, while
-  // allowing for renaming to properly function when minification is enabled.
-  const in_names = [
-    'input_graph',
-    'config',
-    mode === 'server' && 'server_fetch_function'
-  ].filter(Boolean);
-  const combined_source = `
+const results = await Promise.allSettled(
+  ["client", "server"].map(async mode => {
+    let result = await Bun.build({
+      entrypoints: [join(kit_dir, "hmr-runtime.ts")],
+      define: {
+        mode: JSON.stringify(mode),
+        IS_BUN_DEVELOPMENT: String(!!debug),
+      },
+      minify: {
+        syntax: true,
+      },
+    });
+    if (!result.success) throw new AggregateError(result.logs);
+    assert(result.outputs.length === 1, "must bundle to a single file");
+    // @ts-ignore
+    let code = await result.outputs[0].text();
+
+    // A second pass is used to convert global variables into parameters, while
+    // allowing for renaming to properly function when minification is enabled.
+    const in_names = ["input_graph", "config", mode === "server" && "server_fetch_function"].filter(Boolean);
+    const combined_source = `
     __marker__;
-    let ${in_names.join(',')};
-    __marker__(${in_names.join(',')});
+    let ${in_names.join(",")};
+    __marker__(${in_names.join(",")});
     ${code};
   `;
-  const generated_entrypoint = join(kit_dir, `.runtime-${mode}.generated.ts`);
-
-  writeFileSync(generated_entrypoint, combined_source);
-  using _ = {[Symbol.dispose] : () => {
-    try {
-      rmSync(generated_entrypoint);
-    } catch {}
-  }};
-
-  result = await Bun.build({
-    entrypoints: [generated_entrypoint],
-    minify: {
-      syntax: true,
-      whitespace: !debug,
-      identifiers: !debug,
+    const generated_entrypoint = join(kit_dir, `.runtime-${mode}.generated.ts`);
+
+    writeFileSync(generated_entrypoint, combined_source);
+    using _ = {
+      [Symbol.dispose]: () => {
+        try {
+          rmSync(generated_entrypoint);
+        } catch {}
+      },
+    };
+
+    result = await Bun.build({
+      entrypoints: [generated_entrypoint],
+      minify: {
+        syntax: true,
+        whitespace: !debug,
+        identifiers: !debug,
+      },
+    });
+    if (!result.success) throw new AggregateError(result.logs);
+    assert(result.outputs.length === 1, "must bundle to a single file");
+    // @ts-ignore
+    code = await result.outputs[0].text();
+
+    let names: string = "";
+    code = code
+      .replace(/(\n?)\s*__marker__.*__marker__\((.+?)\);\s*/s, (_, n, captured) => {
+        names = captured;
+        return n;
+      })
+      .replace(`// ${basename(generated_entrypoint)}`, "")
+      .trim();
+    assert(names, "missing name");
+
+    if (debug) {
+      code = "\n  " + code.replace(/\n/g, "\n  ") + "\n";
     }
-  });
-  if(!result.success) throw new AggregateError(result.logs);
-  assert(result.outputs.length === 1, 'must bundle to a single file');
-  // @ts-ignore
-  code = await result.outputs[0].text();
-
-  let names: string = '';
-  code = code
-    .replace(/(\n?)\s*__marker__.*__marker__\((.+?)\);\s*/s, (_, n, captured) => {
-      names = captured;
-      return n;
-    })
-    .replace(`// ${basename(generated_entrypoint)}`, '')
-    .trim();
-  assert(names, 'missing name');
-
-  if (debug) {
-    code = '\n  ' + code.replace(/\n/g, '\n  ') + '\n';
-  }
 
-  if (code[code.length - 1] === ';') code = code.slice(0, -1);
+    if (code[code.length - 1] === ";") code = code.slice(0, -1);
 
-  if (mode === 'server') {
-    const server_fetch_function = names.split(',')[2].trim();
-    code = debug
-      ? `${code}  return ${server_fetch_function};\n`
-      : `${code};return ${server_fetch_function};`
-  }
+    if (mode === "server") {
+      const server_fetch_function = names.split(",")[2].trim();
+      code = debug ? `${code}  return ${server_fetch_function};\n` : `${code};return ${server_fetch_function};`;
+    }
 
-  code = debug
-    ? `((${names}) => {${code}})({\n`
-    : `((${names})=>{${code}})({`;
+    code = debug ? `((${names}) => {${code}})({\n` : `((${names})=>{${code}})({`;
 
-  if (mode === 'server') {
-    code = `export default await ${code}`;
-  }
+    if (mode === "server") {
+      code = `export default await ${code}`;
+    }
 
-  writeFileSync(join(codegen_root, `kit.${mode}.js`), code);
-}));
+    writeFileSync(join(codegen_root, `kit.${mode}.js`), code);
+  }),
+);
 
 // print failures in a de-duplicated fashion.
-interface Err { kind: 'client' | 'server' | 'both', err: any }
+interface Err {
+  kind: "client" | "server" | "both";
+  err: any;
+}
 const failed = [
-  { kind: 'client', result: results[0] },
-  { kind: 'server', result: results[1] },
+  { kind: "client", result: results[0] },
+  { kind: "server", result: results[1] },
 ]
-  .filter(x => x.result.status === 'rejected')
+  .filter(x => x.result.status === "rejected")
   .map(x => ({ kind: x.kind, err: x.result.reason })) as Err[];
-if(failed.length > 0) {
+if (failed.length > 0) {
   const flattened_errors: Err[] = [];
   for (const { kind, err } of failed) {
     if (err instanceof AggregateError) {
       flattened_errors.push(...err.errors.map(err => ({ kind, err })));
     }
     flattened_errors.push({ kind, err });
   }
-  for(let i = 0; i < flattened_errors.length; i++) {
+  for (let i = 0; i < flattened_errors.length; i++) {
     const x = flattened_errors[i];
     if (!x.err?.message) continue;
     for (const other of flattened_errors.slice(0, i)) {
-      if(other.err?.message === x.err.message || other.err.stack === x.err.stack) {
-        other.kind = 'both';
+      if (other.err?.message === x.err.message || other.err.stack === x.err.stack) {
+        other.kind = "both";
         flattened_errors.splice(i, 1);
         i -= 1;
         continue;
       }
     }
   }
-  let current = '';
-  for(const { kind, err } of flattened_errors) {
-    if(kind !== current) {
-      const map = { both: 'runtime', client: 'client runtime', server: 'server runtime' }
+  let current = "";
+  for (const { kind, err } of flattened_errors) {
+    if (kind !== current) {
+      const map = { both: "runtime", client: "client runtime", server: "server runtime" };
       console.error(`Errors while bundling Kit ${map[kind]}:`);
     }
     console.error(err);
   }
   process.exit(1);
 } else {
-  console.log('-> kit.client.js, kit.server.js');
+  console.log("-> kit.client.js, kit.server.js");
 
-  const empty_file = join(codegen_root, 'kit_empty_file');
-  if (!existsSync(empty_file))
-    writeFileSync(empty_file, 'this is used to fulfill a cmake dependency');
+  const empty_file = join(codegen_root, "kit_empty_file");
+  if (!existsSync(empty_file)) writeFileSync(empty_file, "this is used to fulfill a cmake dependency");
 }

src/js/internal/debugger.ts

@@ -1,12 +1,4 @@
-import type {
-  ServerWebSocket,
-  Socket,
-  SocketHandler,
-  TCPSocketConnectOptions,
-  UnixSocketOptions,
-  WebSocketHandler,
-  Server as WebSocketServer,
-} from "bun";
+import type { ServerWebSocket, Socket, SocketHandler, WebSocketHandler, Server as WebSocketServer } from "bun";
 
 export default function (
   executionContextId: string,

src/kit/client/overlay.ts

@@ -1,27 +1,30 @@
-import { css } from '../macros' with { type: 'macro' };
+import { css } from "../macros" with { type: "macro" };
 
 // Create a root element to contain all our our DOM nodes.
 var root!: HTMLElement;
 var mount;
 
-if (mode === 'client') {
+if (mode === "client") {
   mount = function mount() {
-    const wrap = document.createElement('bun-hmr');
-    wrap.setAttribute('style', 'position:absolute;display:block;top:0;left:0;width:100%;height:100%;background:transparent');
-    const shadow = wrap.attachShadow({ mode: 'open' });
-
+    const wrap = document.createElement("bun-hmr");
+    wrap.setAttribute(
+      "style",
+      "position:absolute;display:block;top:0;left:0;width:100%;height:100%;background:transparent",
+    );
+    const shadow = wrap.attachShadow({ mode: "open" });
+
     const sheet = new CSSStyleSheet();
-    sheet.replace(css('client/overlay.css', IS_BUN_DEVELOPMENT));
-    shadow.adoptedStyleSheets = [ sheet ];
-  
-    root = document.createElement('main');
+    sheet.replace(css("client/overlay.css", IS_BUN_DEVELOPMENT));
+    shadow.adoptedStyleSheets = [sheet];
+
+    root = document.createElement("main");
     shadow.appendChild(root);
     document.body.appendChild(wrap);
-  }
+  };
 }
 
 export function showErrorOverlay(e) {
   mount();
-  console.error(e);  
-  root.innerHTML = `<div class='error'><h1>oh no, a client side error happened:</h1><pre><code>${e?.message ? `${e?.name ?? (e?.constructor?.name) ?? 'Error'}: ${e.message}\n` : JSON.stringify(e)}${e?.message ? e?.stack : ''}</code></pre></div>`;
+  console.error(e);
+  root.innerHTML = `<div class='error'><h1>oh no, a client side error happened:</h1><pre><code>${e?.message ? `${e?.name ?? e?.constructor?.name ?? "Error"}: ${e.message}\n` : JSON.stringify(e)}${e?.message ? e?.stack : ""}</code></pre></div>`;
 }