@joule-sh/code 0.20.1 → 0.22.0

package/README.md

@@ -23,16 +23,12 @@ as an optional dependency and skips everywhere it does not apply:
 | `linux-x64` | `@joule-sh/code-linux-x64` |
 | `darwin-x64` | `@joule-sh/code-darwin-x64` |
 | `darwin-arm64` | `@joule-sh/code-darwin-arm64` |
+| `win32-x64` | `@joule-sh/code-win32-x64` |
 
 Every one of them carries the garbage collector it needs, so there is nothing
 to install alongside. The Linux binary is linked statically against musl and
 needs nothing at all from the machine it lands on.
 
-**There is no Windows build yet.** Installing here prints a message saying so
-and pointing at
-[#173](https://github.com/joule-sh/code/issues/173). Until that lands, joule
-runs on Windows inside WSL.
-
 ## If npm skipped the binary
 
 npm has a [long-standing bug](https://github.com/npm/cli/issues/4828) where it

package/lib/download.js

@@ -34,7 +34,7 @@ function checkIntegrity(bytes, integrity) {
 }
 
 function untar(tarball, into) {
-  const result = spawnSync("tar", ["-xzf", tarball, "-C", into], { encoding: "utf8" });
+  const result = spawnSync("tar", ["--force-local", "-xzf", tarball, "-C", into], { encoding: "utf8" });
   if (result.error) { return "could not run tar: " + result.error.message; }
   if (result.status !== 0) { return "tar exited " + result.status + ": " + (result.stderr || "").trim(); }
   return "";

package/lib/platform.js

@@ -3,7 +3,6 @@
 const REPO = "https://github.com/joule-sh/code";
 const SCOPE = "@joule-sh";
 const WRAPPER = SCOPE + "/code";
-const WINDOWS_ISSUE = REPO + "/issues/173";
 const NPM_BUG = "https://github.com/npm/cli/issues/4828";
 const OVERRIDE = "JOULE_BINARY_PATH";
 
@@ -11,6 +10,7 @@ const BUILT = {
   "linux-x64": SCOPE + "/code-linux-x64",
   "darwin-x64": SCOPE + "/code-darwin-x64",
   "darwin-arm64": SCOPE + "/code-darwin-arm64",
+  "win32-x64": SCOPE + "/code-win32-x64",
 };
 
 const BINARIES = ["joule", "relay", "joule-daemon"];
@@ -32,12 +32,12 @@ function isWindows(id) {
   return id.startsWith("win32-");
 }
 
-function windowsNotice() {
-  return [
-    "joule: there is no Windows build of joule yet, so there is no binary for this package to install here.",
-    "       " + WINDOWS_ISSUE + " is the ticket for the Windows binary; watch that rather than this package.",
-    "       Until it lands, joule runs on Windows through WSL: open a WSL shell and install it from inside there.",
-  ].join("\n");
+function exeSuffix(id) {
+  return isWindows(id) ? ".exe" : "";
+}
+
+function binaryFile(name, id) {
+  return name + exeSuffix(id);
 }
 
 function unsupportedNotice(id) {
@@ -63,7 +63,6 @@ function missingNotice(id, version) {
 }
 
 function notice(id, version) {
-  if (isWindows(id)) { return windowsNotice(); }
   if (packageFor(id) === "") { return unsupportedNotice(id); }
   return missingNotice(id, version);
 }
@@ -72,7 +71,6 @@ module.exports = {
   REPO,
   SCOPE,
   WRAPPER,
-  WINDOWS_ISSUE,
   OVERRIDE,
   BINARIES,
   COMMANDS,
@@ -80,7 +78,8 @@ module.exports = {
   packageFor,
   supported,
   isWindows,
-  windowsNotice,
+  exeSuffix,
+  binaryFile,
   unsupportedNotice,
   missingNotice,
   notice,

package/lib/postinstall.js

@@ -19,10 +19,11 @@ function warn(message) {
   console.error(message);
 }
 
-function makeExecutable(dir) {
+function makeExecutable(dir, id) {
   const changed = [];
+  if (platform.isWindows(id)) { return changed; }
   for (const name of platform.BINARIES) {
-    const file = path.join(dir, name);
+    const file = path.join(dir, platform.binaryFile(name, id));
     if (!fs.existsSync(file)) { continue; }
     const mode = fs.statSync(file).mode & 0o777;
     const wanted = mode | 0o111;
@@ -72,10 +73,10 @@ function restore() {
   for (const command of platform.COMMANDS) { writeCommand(command, ""); }
 }
 
-function smoke(dir) {
+function smoke(dir, id) {
   const failures = [];
   for (const name of platform.BINARIES) {
-    const file = path.join(dir, name);
+    const file = path.join(dir, platform.binaryFile(name, id));
     if (!fs.existsSync(file)) { failures.push(name + " is missing from " + dir); continue; }
     const result = spawnSync(file, ["--version"], { encoding: "utf8" });
     if (result.error) { failures.push(name + " will not run: " + result.error.message); continue; }
@@ -106,10 +107,6 @@ async function obtain(id) {
 }
 
 async function main(id) {
-  if (platform.isWindows(id)) {
-    warn(platform.windowsNotice());
-    return 1;
-  }
   if (platform.packageFor(id) === "") {
     warn(platform.unsupportedNotice(id));
     return 1;
@@ -120,7 +117,7 @@ async function main(id) {
     warn(platform.notice(id, resolve.selfVersion()));
     return 1;
   }
-  const changed = makeExecutable(found.dir);
+  const changed = makeExecutable(found.dir, id);
   if (changed.length > 0) {
     say("joule: restored the execute bit on " + changed.join(", ") + ", which an npm tarball does not carry reliably.");
   }
@@ -134,7 +131,7 @@ async function main(id) {
     const unsigned = adHocSign(found.dir);
     for (const failure of unsigned) { warn("joule: " + failure); }
   }
-  const broken = smoke(found.dir);
+  const broken = smoke(found.dir, id);
   if (broken.length > 0) {
     restore();
     for (const failure of broken) { warn("joule: " + failure); }
@@ -143,7 +140,7 @@ async function main(id) {
     return 1;
   }
   for (const command of platform.COMMANDS) {
-    writeCommand(command, path.join(found.dir, command));
+    writeCommand(command, platform.isWindows(id) ? "" : path.join(found.dir, command));
   }
   say("joule: " + found.source + " installed to " + found.dir + ", and " + platform.COMMANDS.join(" and ") + " point at it.");
   return 0;

package/lib/resolve.js

@@ -32,9 +32,9 @@ function packageDir(pkg) {
   }
 }
 
-function holdsBinaries(dir) {
+function holdsBinaries(dir, id) {
   if (dir === "") { return false; }
-  return platform.BINARIES.every((name) => fs.existsSync(path.join(dir, name)));
+  return platform.BINARIES.every((name) => fs.existsSync(path.join(dir, platform.binaryFile(name, id))));
 }
 
 function vendorDir() {
@@ -42,16 +42,15 @@ function vendorDir() {
 }
 
 function binaryDir(id) {
-  if (platform.isWindows(id)) { return { dir: "", source: "" }; }
   const override = overrideDir();
   if (override !== "") { return { dir: override, source: platform.OVERRIDE }; }
   const pkg = platform.packageFor(id);
   if (pkg !== "") {
     const installed = path.join(packageDir(pkg), "bin");
-    if (holdsBinaries(installed)) { return { dir: installed, source: pkg }; }
+    if (holdsBinaries(installed, id)) { return { dir: installed, source: pkg }; }
   }
   const vendored = path.join(VENDOR, "bin");
-  if (holdsBinaries(vendored)) { return { dir: vendored, source: "vendor" }; }
+  if (holdsBinaries(vendored, id)) { return { dir: vendored, source: "vendor" }; }
   return { dir: "", source: "" };
 }
 
@@ -60,7 +59,7 @@ function binaryPath(name, id) {
   if (found.dir === "") {
     throw new Error(platform.notice(id, selfVersion()));
   }
-  const file = path.join(found.dir, name);
+  const file = path.join(found.dir, platform.binaryFile(name, id));
   if (!fs.existsSync(file)) {
     throw new Error("joule: " + found.source + " has no " + name + " in " + found.dir + ".");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joule-sh/code",
-  "version": "0.20.1",
+  "version": "0.22.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -37,8 +37,9 @@
     "postinstall": "node lib/postinstall.js"
   },
   "optionalDependencies": {
-    "@joule-sh/code-linux-x64": "0.20.1",
-    "@joule-sh/code-darwin-x64": "0.20.1",
-    "@joule-sh/code-darwin-arm64": "0.20.1"
+    "@joule-sh/code-linux-x64": "0.22.0",
+    "@joule-sh/code-darwin-x64": "0.22.0",
+    "@joule-sh/code-darwin-arm64": "0.22.0",
+    "@joule-sh/code-win32-x64": "0.22.0"
   }
 }