@absolutejs/absolute 0.20.0-beta.132 → 0.20.0-beta.133

package/dist/cli/{dev-6f0gry3y.js → dev-j3dhb396.js}

@@ -15,7 +15,7 @@ import {
 } from "./index-m1vntzf1.js";
 import {
   resolveDevBunExecutable2
-} from "./index-r915cvqp.js";
+} from "./index-cc8eay5y.js";
 import"./index-43a1vvb7.js";
 import {
   updateLockMetadata,

package/dist/cli/{index-r915cvqp.js → index-cc8eay5y.js}

@@ -2,80 +2,34 @@
 // src/cli/patchedBun.ts
 import { spawnSync } from "child_process";
 import {
-  chmodSync,
   existsSync,
   mkdirSync,
   readFileSync,
-  renameSync,
   rmSync,
   writeFileSync
 } from "fs";
 import { homedir } from "os";
 import { dirname, join } from "path";
 import { createInterface } from "readline/promises";
-import { inflateRawSync } from "zlib";
 var PATCHED_BUN_RELEASE = {
   bunVersion: "1.4.2",
   issue: "https://github.com/oven-sh/bun/issues/32919",
   repo: "absolutejs/patched-bun",
-  sha256: {
-    "bun-darwin-aarch64": "75f45c72eac0c01e579f81ec48c8530bbec72406604c09abdd1fe6947ec4ac05",
-    "bun-darwin-x64": "0ad06bff1c847de7a592ecac2e92060dfc8f56361fe92ca52ece8a685cbf416d",
-    "bun-freebsd-aarch64": "bbc981e3d890b65e042fbf15128d8499acf11bf29d82b1a15efc07a8d02c424d",
-    "bun-freebsd-x64": "344e1cc9b01541ee16b93be9a946d33f9766e235aa95af758e3b7bd9ebccb354",
-    "bun-linux-aarch64": "7ad50219c85899ba5d5ffb6728cb128a08f106d99857be7f505ec6b520a2315c",
-    "bun-linux-aarch64-android": "699c6eb9a1ffcb6787811729ca8f4812e2f4d8969ac3c0bc6b4cfc8265bfd65c",
-    "bun-linux-aarch64-musl": "70089d21421103d03f9bf657bba48beefb22d58b16dd974cd552ea28d1f7c087",
-    "bun-linux-x64": "efc724f5c613ae4ae9bb884c067ac8a2b935b959a60082f204b08b4736b531e9",
-    "bun-linux-x64-android": "e68a9486017e8a2fa02d0144807e2b48b10db3a09be05ad05b66e3bbf5197610",
-    "bun-linux-x64-musl": "86afabbaacca2a652f9eb4821c5163935eac42ee4c966db323c066b95737fdaa",
-    "bun-windows-aarch64": "88157fccfac80028c45609d969da819f7ba6d9dafc3c887793188b56d4bf518c",
-    "bun-windows-x64": "6dbf24593722d1c94e9c54fafd2087a3e8966aa954f753a565e52522162634c8"
-  },
-  tag: "bun-v1.4.2-absolute.1"
+  version: "1.4.2-absolute.1"
 };
 var HOURS_PER_DAY = 24;
 var MS_PER_HOUR = 3600000;
 var ASK_LATER_MS = HOURS_PER_DAY * MS_PER_HOUR;
 var PREFERENCE_FILE = "patched-bun.json";
-var EXECUTABLE_MODE = 493;
 var VERSION_PARTS = 3;
 var PROBE_TIMEOUT_MS = 30000;
-var MUSL_LOADERS = ["/lib/ld-musl-x86_64.so.1", "/lib/ld-musl-aarch64.so.1"];
 var DEPENDENCY_FIELDS = [
   "dependencies",
   "devDependencies",
   "peerDependencies"
 ];
-var ZIP = {
-  directoryEntry: 33639248,
-  endDirectoryOffset: 16,
-  endEntryCount: 10,
-  endOfDirectory: 101010256,
-  endRecordSize: 22,
-  entryCommentLength: 32,
-  entryCompressedSize: 20,
-  entryExtraLength: 30,
-  entryHeaderSize: 46,
-  entryLocalOffset: 42,
-  entryMethod: 10,
-  entryNameLength: 28,
-  localExtraLength: 28,
-  localHeader: 67324752,
-  localHeaderSize: 30,
-  localNameLength: 26,
-  methodDeflate: 8,
-  methodStored: 0
-};
-var isAsset = (name) => Object.hasOwn(PATCHED_BUN_RELEASE.sha256, name);
-var detectLibc = () => {
-  if (process.platform === "android")
-    return "android";
-  if (MUSL_LOADERS.some((loader) => existsSync(loader)))
-    return "musl";
-  return "glibc";
-};
 var absoluteHome = (home) => join(home, ".absolutejs");
+var legacyInstallDirectory = (home) => join(absoluteHome(home), "bun");
 var compareVersions = (left, right) => {
   const parse = (version) => version.split("-")[0]?.split(".").map(Number) ?? [];
   const leftParts = parse(left);
@@ -84,29 +38,44 @@ var compareVersions = (left, right) => {
   return differences.find((difference) => difference !== 0) ?? 0;
 };
 var preferencePath = (home) => join(absoluteHome(home), PREFERENCE_FILE);
-var installedPatchedBun = (home = homedir()) => {
-  const asset = patchedBunAsset();
-  if (!asset)
+var bvmPlatformPackage = (platform = process.platform, arch = process.arch) => {
+  const system = { darwin: "darwin", linux: "linux", win32: "windows" }[platform];
+  const cpu = { arm64: "arm64", x64: "x64" }[arch];
+  if (!system || !cpu)
     return null;
-  const path = patchedBunPath(asset, home);
-  return existsSync(path) ? path : null;
+  return `@absolutejs/bvm-${system}-${cpu}`;
+};
+var bvmRunner = (bvm) => (args, inherit = false) => {
+  const result = spawnSync(bvm, args, {
+    encoding: "utf-8",
+    stdio: inherit ? "inherit" : ["ignore", "pipe", "pipe"]
+  });
+  return { status: result.status, stdout: result.stdout ?? "" };
 };
-var patchedBunAsset = (platform = process.platform, arch = process.arch, libc = detectLibc()) => {
-  const cpu = { arm64: "aarch64", x64: "x64" }[arch];
-  const system = {
-    android: "linux",
-    darwin: "darwin",
-    freebsd: "freebsd",
-    linux: "linux",
-    win32: "windows"
-  }[platform];
-  if (!cpu || !system)
+var bundledBvm = (pkg) => {
+  try {
+    const launcher = dirname(Bun.resolveSync("@absolutejs/bvm/package.json", import.meta.dir));
+    const binary = join(dirname(Bun.resolveSync(`${pkg}/package.json`, launcher)), "bin", process.platform === "win32" ? "bvm.exe" : "bvm");
+    return existsSync(binary) ? binary : null;
+  } catch {
     return null;
-  const abi = system === "linux" && libc !== "glibc" ? `-${libc}` : "";
-  const name = `bun-${system}-${cpu}${abi}`;
-  return isAsset(name) ? name : null;
+  }
+};
+var findBvm = () => {
+  const pkg = bvmPlatformPackage();
+  return (pkg ? bundledBvm(pkg) : null) ?? Bun.which("bvm");
+};
+var defaultRunner = () => {
+  const bvm = findBvm();
+  return bvm ? bvmRunner(bvm) : null;
+};
+var installedPatchedBun = (run = defaultRunner()) => {
+  if (!run)
+    return null;
+  const result = run(["which", PATCHED_BUN_RELEASE.version]);
+  const path = result.stdout.trim();
+  return result.status === 0 && path ? path : null;
 };
-var patchedBunPath = (asset, home = homedir()) => join(absoluteHome(home), "bun", PATCHED_BUN_RELEASE.tag, asset, asset.startsWith("bun-windows") ? "bun.exe" : "bun");
 var runtimeSupportsReactFastRefresh = () => {
   const options = { loader: "tsx", reactFastRefresh: true };
   try {
@@ -136,7 +105,7 @@ var patchedBunOfferState = (context) => {
     return "installed";
   if (!context.usesReact)
     return "not-a-react-project";
-  if (!context.asset)
+  if (!context.bvm)
     return "unsupported-platform";
   if (compareVersions(context.bunVersion, PATCHED_BUN_RELEASE.bunVersion) > 0)
     return "runtime-newer";
@@ -155,49 +124,6 @@ var readPatchedBunPreference = (home = homedir()) => {
     return null;
   }
 };
-var findEndOfDirectory = (view) => {
-  for (let offset = view.byteLength - ZIP.endRecordSize;offset >= 0; offset--) {
-    if (view.getUint32(offset, true) === ZIP.endOfDirectory)
-      return offset;
-  }
-  throw new Error("Not a zip archive.");
-};
-var inflateEntry = (data, method) => {
-  if (method === ZIP.methodStored)
-    return data;
-  if (method === ZIP.methodDeflate)
-    return new Uint8Array(inflateRawSync(data));
-  throw new Error(`Unsupported zip compression method ${method}.`);
-};
-var readEntryData = (archive, view, entry) => {
-  if (view.getUint32(entry.localOffset, true) !== ZIP.localHeader)
-    throw new Error("Corrupt zip entry.");
-  const dataStart = entry.localOffset + ZIP.localHeaderSize + view.getUint16(entry.localOffset + ZIP.localNameLength, true) + view.getUint16(entry.localOffset + ZIP.localExtraLength, true);
-  return inflateEntry(archive.subarray(dataStart, dataStart + entry.compressedSize), entry.method);
-};
-var readZipEntry = (archive, entryName) => {
-  const view = new DataView(archive.buffer, archive.byteOffset, archive.byteLength);
-  const end = findEndOfDirectory(view);
-  const entries = view.getUint16(end + ZIP.endEntryCount, true);
-  const decoder = new TextDecoder;
-  let cursor = view.getUint32(end + ZIP.endDirectoryOffset, true);
-  for (let index = 0;index < entries; index++) {
-    if (view.getUint32(cursor, true) !== ZIP.directoryEntry)
-      throw new Error("Corrupt zip directory.");
-    const nameLength = view.getUint16(cursor + ZIP.entryNameLength, true);
-    const nameStart = cursor + ZIP.entryHeaderSize;
-    const name = decoder.decode(archive.subarray(nameStart, nameStart + nameLength));
-    const entry = {
-      compressedSize: view.getUint32(cursor + ZIP.entryCompressedSize, true),
-      localOffset: view.getUint32(cursor + ZIP.entryLocalOffset, true),
-      method: view.getUint16(cursor + ZIP.entryMethod, true)
-    };
-    if (name === entryName)
-      return readEntryData(archive, view, entry);
-    cursor += ZIP.entryHeaderSize + nameLength + view.getUint16(cursor + ZIP.entryExtraLength, true) + view.getUint16(cursor + ZIP.entryCommentLength, true);
-  }
-  throw new Error(`${entryName} is not in the archive.`);
-};
 var writePatchedBunPreference = (preference, home = homedir()) => {
   const path = preferencePath(home);
   if (preference === null) {
@@ -208,7 +134,6 @@ var writePatchedBunPreference = (preference, home = homedir()) => {
   writeFileSync(path, `${JSON.stringify(preference, null, "\t")}
 `);
 };
-var sha256 = (bytes) => new Bun.CryptoHasher("sha256").update(bytes).digest("hex");
 var projectUsesReact = (projectDir) => {
   const hasReact = (deps) => typeof deps === "object" && deps !== null && Object.hasOwn(deps, "react");
   try {
@@ -225,33 +150,18 @@ var PATCHED_BUN_EXPLANATION = [
   `Stock Bun ignores \`reactFastRefresh\` on Bun.Transpiler (${PATCHED_BUN_RELEASE.issue}),`,
   "so React Fast Refresh cannot keep state across edits. Until Bun ships the fix,",
   `AbsoluteJS publishes Bun ${PATCHED_BUN_RELEASE.bunVersion} with only that fix: https://github.com/${PATCHED_BUN_RELEASE.repo}`,
-  "It installs to ~/.absolutejs/bun and only `absolute dev` uses it; your `bun` is unchanged."
+  "bvm installs it after checking its signature; only `absolute dev` uses it, your `bun` is unchanged."
 ];
-var installPatchedBun = async (options = {}) => {
-  const asset = options.asset ?? patchedBunAsset();
-  if (!asset)
-    throw new Error(`No patched Bun build for ${process.platform}-${process.arch}.`);
-  const home = options.home ?? homedir();
-  const log = options.log ?? console.log;
-  const url = patchedBunDownloadUrl(asset);
-  log(`Downloading ${url}`);
-  const response = await (options.fetchImpl ?? fetch)(url);
-  if (!response.ok)
-    throw new Error(`Download failed: ${url} answered ${response.status}.`);
-  const archive = new Uint8Array(await response.arrayBuffer());
-  const expected = (options.checksums ?? PATCHED_BUN_RELEASE.sha256)[asset];
-  const actual = sha256(archive);
-  if (actual !== expected)
-    throw new Error(`${asset}.zip does not match its pinned SHA-256 (expected ${expected}, got ${actual}); not installing it.`);
-  const target = patchedBunPath(asset, home);
-  const binary = readZipEntry(archive, `${asset}/${target.endsWith(".exe") ? "bun.exe" : "bun"}`);
-  mkdirSync(dirname(target), { recursive: true });
-  const staging = `${target}.${process.pid}.tmp`;
-  writeFileSync(staging, binary);
-  chmodSync(staging, EXECUTABLE_MODE);
-  renameSync(staging, target);
-  log(`Installed patched Bun ${PATCHED_BUN_RELEASE.bunVersion} at ${target}`);
-  return target;
+var installPatchedBun = (run = defaultRunner()) => {
+  if (!run)
+    throw new Error(`bvm is not available for ${process.platform}-${process.arch}; see https://github.com/absolutejs/bvm`);
+  const install = run(["install", PATCHED_BUN_RELEASE.version], true);
+  if (install.status !== 0)
+    throw new Error(`bvm could not install Bun ${PATCHED_BUN_RELEASE.version}`);
+  const path = installedPatchedBun(run);
+  if (!path)
+    throw new Error(`bvm installed Bun ${PATCHED_BUN_RELEASE.version} but cannot find it`);
+  return path;
 };
 var parsePatchedBunChoice = (answer) => {
   const normalized = answer.trim().toLowerCase();
@@ -271,7 +181,6 @@ var parsePatchedBunChoice = (answer) => {
   ];
   return choices.find(({ matches }) => matches)?.choice ?? null;
 };
-var patchedBunDownloadUrl = (asset) => `https://github.com/${PATCHED_BUN_RELEASE.repo}/releases/download/${PATCHED_BUN_RELEASE.tag}/${asset}.zip`;
 var verifyPatchedBun = (path) => {
   const probe = spawnSync(path, [
     "-e",
@@ -302,13 +211,14 @@ ${PATCHED_BUN_EXPLANATION.join(`
     prompt.close();
   }
 };
-var installVerified = async (home) => {
-  const path = await installPatchedBun({ home });
-  if (!verifyPatchedBun(path)) {
-    rmSync(path, { force: true });
+var installVerifiedPatchedBun = (home, run, verify = verifyPatchedBun) => {
+  const path = installPatchedBun(run);
+  if (!verify(path)) {
+    run?.(["uninstall", PATCHED_BUN_RELEASE.version]);
     throw new Error("the installed binary did not pass its check; removed it");
   }
   writePatchedBunPreference(null, home);
+  rmSync(legacyInstallDirectory(home), { force: true, recursive: true });
   return path;
 };
 var recordDecline = (choice, home) => {
@@ -323,17 +233,30 @@ var recordDecline = (choice, home) => {
   }, home);
   console.log("OK, asking again tomorrow. `absolute bun-patch install` installs it any time.");
 };
+var describeError = (error) => error instanceof Error ? error.message : String(error);
+var migrateLegacyPatchedBun = (home, run, verify = verifyPatchedBun) => {
+  if (!run || !existsSync(legacyInstallDirectory(home)))
+    return null;
+  console.log(`Moving AbsoluteJS's patched Bun to bvm (Bun ${PATCHED_BUN_RELEASE.version}).`);
+  try {
+    return installVerifiedPatchedBun(home, run, verify);
+  } catch (error) {
+    console.error(`Could not move the patched Bun to bvm (${describeError(error)}). Run \`absolute bun-patch install\` to retry.`);
+    return null;
+  }
+};
 var resolveDevBunExecutable2 = async (projectDir = process.cwd(), home = homedir()) => {
   if (process.env.ABSOLUTE_PATCHED_BUN === "0")
     return "bun";
-  const installed = installedPatchedBun(home);
+  const run = defaultRunner();
+  const installed = installedPatchedBun(run) ?? migrateLegacyPatchedBun(home, run);
   if (installed) {
-    console.log(`Using AbsoluteJS patched Bun ${PATCHED_BUN_RELEASE.bunVersion} for React Fast Refresh (${installed}).`);
+    console.log(`Using AbsoluteJS patched Bun ${PATCHED_BUN_RELEASE.version} for React Fast Refresh (${installed}).`);
     return installed;
   }
   const state = patchedBunOfferState({
-    asset: patchedBunAsset(),
     bunVersion: Bun.version,
+    bvm: run !== null,
     ci: Boolean(process.env.CI),
     installed: false,
     interactive: Boolean(process.stdin.isTTY && process.stdout.isTTY),
@@ -352,9 +275,9 @@ var resolveDevBunExecutable2 = async (projectDir = process.cwd(), home = homedir
     return "bun";
   }
   try {
-    return await installVerified(home);
+    return installVerifiedPatchedBun(home, run);
   } catch (error) {
-    console.error(`Could not install the patched Bun (${error instanceof Error ? error.message : String(error)}). Continuing with your bun; React edits will reload the page.`);
+    console.error(`Could not install the patched Bun (${describeError(error)}). Continuing with your bun; React edits will reload the page.`);
     return "bun";
   }
 };
@@ -374,28 +297,27 @@ var describeInstalled = (installed) => {
 };
 var printStatus = (home) => {
   const supported = runtimeSupportsReactFastRefresh();
-  console.log(`Release: ${PATCHED_BUN_RELEASE.tag} (${PATCHED_BUN_RELEASE.issue})`);
-  console.log(`Platform build: ${patchedBunAsset() ?? "none for this platform"}`);
+  const bvm = findBvm();
+  console.log(`Release: ${PATCHED_BUN_RELEASE.version} (${PATCHED_BUN_RELEASE.issue})`);
+  console.log(`bvm: ${bvm ?? "not available for this platform"}`);
   console.log(`Your bun: ${Bun.version} (${supported ? "already has the fix" : "stock, no fix"})`);
-  console.log(`Installed: ${describeInstalled(installedPatchedBun(home))}`);
+  console.log(`Installed: ${describeInstalled(installedPatchedBun(bvm ? bvmRunner(bvm) : null))}`);
   console.log(`Prompt: ${describePreference(readPatchedBunPreference(home))}`);
 };
-var bunPatch2 = async (args, home = homedir()) => {
+var bunPatch2 = (args, home = homedir()) => {
   const [action = "status"] = args;
   if (action === "status") {
     printStatus(home);
     return;
   }
   if (action === "install") {
-    await installVerified(home);
+    installVerifiedPatchedBun(home, defaultRunner());
     console.log("`absolute dev` will use it from now on.");
     return;
   }
   if (action === "remove") {
-    rmSync(join(absoluteHome(home), "bun"), {
-      force: true,
-      recursive: true
-    });
+    defaultRunner()?.(["uninstall", PATCHED_BUN_RELEASE.version], true);
+    rmSync(legacyInstallDirectory(home), { force: true, recursive: true });
     console.log("Removed the patched Bun. `absolute dev` uses your bun again.");
     return;
   }

package/dist/cli/index.js

@@ -54,7 +54,7 @@ if (command === "dev") {
   }
   const positionalArgs = stripNamedArgs("--config", "--android-device", "--ios-device").filter((arg) => arg !== "--no-mobile" && arg !== "--eager");
   const serverEntry = positionalArgs[0] ?? DEFAULT_SERVER_ENTRY;
-  const { dev } = await import("./dev-6f0gry3y.js");
+  const { dev } = await import("./dev-j3dhb396.js");
   await dev(serverEntry, configPath, {
     androidDevice,
     eager: args.includes("--eager"),
@@ -62,8 +62,8 @@ if (command === "dev") {
     mobile: !args.includes("--no-mobile")
   });
 } else if (command === "bun-patch") {
-  const { bunPatch } = await import("./patchedBun-m7vj5sks.js");
-  await bunPatch(args);
+  const { bunPatch } = await import("./patchedBun-541bbnee.js");
+  bunPatch(args);
 } else if (command === "start") {
   sendTelemetryEvent("cli:command", { command });
   const outdir = parseNamedArg("--outdir");

package/dist/cli/{patchedBun-m7vj5sks.js → patchedBun-541bbnee.js}

@@ -2,7 +2,7 @@
 import {
   resolveDevBunExecutable2,
   bunPatch2
-} from "./index-r915cvqp.js";
+} from "./index-cc8eay5y.js";
 export {
   bunPatch2 as bunPatch,
   resolveDevBunExecutable2 as resolveDevBunExecutable

package/dist/dev/serverBootstrap.js

@@ -3810,7 +3810,7 @@ var require_source_map_support = __commonJS(function(exports, module) {
 
 // node_modules/typescript/lib/typescript.js
 var require_typescript = __commonJS(function(exports, module) {
-  var __dirname = "/tmp/claude-1000/-home-alexkahn-abs-PAAS/9b0057a2-5737-48f9-9dbe-dcb83ea02b04/scratchpad/ajs-peer/node_modules/typescript/lib", __filename = "/tmp/claude-1000/-home-alexkahn-abs-PAAS/9b0057a2-5737-48f9-9dbe-dcb83ea02b04/scratchpad/ajs-peer/node_modules/typescript/lib/typescript.js";
+  var __dirname = "/tmp/claude-1000/-home-alexkahn-abs-PAAS/9b0057a2-5737-48f9-9dbe-dcb83ea02b04/scratchpad/abs-release/node_modules/typescript/lib", __filename = "/tmp/claude-1000/-home-alexkahn-abs-PAAS/9b0057a2-5737-48f9-9dbe-dcb83ea02b04/scratchpad/abs-release/node_modules/typescript/lib/typescript.js";
   /*! *****************************************************************************
   Copyright (c) Microsoft Corporation. All rights reserved.
   Licensed under the Apache License, Version 2.0 (the "License"); you may not use

package/dist/index.js

@@ -24667,7 +24667,7 @@ var init_compileAngular = __esm(() => {
 
 // node_modules/content-tag/pkg/node/content_tag.cjs
 var require_content_tag = __commonJS(function(exports, module) {
-  var __dirname = "/tmp/claude-1000/-home-alexkahn-abs-PAAS/9b0057a2-5737-48f9-9dbe-dcb83ea02b04/scratchpad/ajs-peer/node_modules/content-tag/pkg/node";
+  var __dirname = "/tmp/claude-1000/-home-alexkahn-abs-PAAS/9b0057a2-5737-48f9-9dbe-dcb83ea02b04/scratchpad/abs-release/node_modules/content-tag/pkg/node";
   var imports = {};
   imports["__wbindgen_placeholder__"] = exports;
   var wasm;
@@ -43800,5 +43800,5 @@ export {
   wrapPageHandlerWithStreamingSlots
 };
 
-//# debugId=F516D46F323DBF7064756E2164756E21
+//# debugId=6F1E1785E74A52C164756E2164756E21
 //# sourceMappingURL=index.js.map