@maka/maka-cli 5.96.0 → 5.99.0

package/bundle/typescript/src/tools/self-update/binary-install.js

@@ -1,15 +1,24 @@
-// `maka update maka --binary`: an npm install opting INTO the binary
-// distribution self-update.ts already serves packaged executables from.
-// This file is the new entry condition, not a second copy of that
-// machinery -- fetchLatestRelease/assetNameFor/downloadAsset/sha256Hex/
-// digestMatches/extractArchive/swapPlanFor/executeSwapPlan all come from
-// self-update.ts unmodified; installBinaryOverNpmGlobal() below only
-// decides WHERE they run and what happens around them.
+// The two shape switches of `maka update maka`: `--binary` (an npm install
+// opting INTO the binary distribution self-update.ts already serves
+// packaged executables from) and `--npm` (the same trip back). This file is
+// the new entry condition for both, not a second copy of that machinery --
+// fetchLatestRelease/assetNameFor/downloadAsset/sha256Hex/digestMatches/
+// extractArchive/swapPlanFor/executeSwapPlan all come from self-update.ts
+// unmodified; the two installers in update-maka.ts only decide WHERE they
+// run and what happens around them.
+//
+// THE TWO DIRECTIONS ARE ONE SHAPE, MIRRORED. Both acquire the replacement
+// first, both verify it resolves ahead of what it replaces, and both leave
+// the destructive step for last -- so a failure or a "no" at any point up to
+// that step stops with the install the user already had still working. The
+// helpers below are written once and used from both directions rather than
+// once per direction, which is why the PATH composition takes a
+// prepend/remove pair instead of hard-coding which side is which.
 //
 // Everything decision-shaped here is a pure function on purpose, same
 // discipline as self-update.ts: the install-kind classification, the PATH
-// construction, and the POSIX profile guess are all testable without a
-// filesystem, npm, or a real shell.
+// construction, the profile-line removal, and the POSIX profile guess are
+// all testable without a filesystem, npm, or a real shell.
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
@@ -31,13 +40,28 @@ export function binaryInstallPath(platform = process.platform) {
  * gathered facts instead of gathering them (see gatherInstallFacts()),
  * so the decision itself needs no filesystem or npm to test.
  *
- * REALPATH COMPARISON IS THE ONLY RELIABLE CHECK HERE. A Windows npm-link
- * junction does NOT report as a symlink via fs.lstatSync().isSymbolicLink()
- * -- verified directly against this machine's own global maka, a real
- * example of exactly this shape: isSymbolicLink() false, realpathSync()
- * resolving somewhere else entirely. Comparing realpathSync() against the
- * raw path is what actually catches it, on every platform, so that is the
- * only signal this function looks at.
+ * REALPATH COMPARISON IS THE ONLY THING THAT CATCHES AN npm link. A Windows
+ * npm-link junction does NOT report as a symlink via
+ * fs.lstatSync().isSymbolicLink() -- verified directly on this project's dev
+ * machine: isSymbolicLink() false, realpathSync() resolving elsewhere. So a
+ * realpath comparison it is.
+ *
+ * BUT THE COMPARISON HAS TO BE MADE RELATIVE TO THE NPM ROOT, and the first
+ * cut of this function was not. It compared the package's raw path against
+ * its own realpath and called any difference a dev link -- which is wrong
+ * for every version manager that reaches node through a symlinked prefix.
+ * nvm-for-windows makes `C:\Program Files\nodejs` itself a junction to the
+ * active version, so on that machine EVERY global package "resolves
+ * elsewhere" and --binary refused to run for an install that was as plain
+ * as they come. Homebrew, fnm, volta, asdf and n all have the same shape on
+ * POSIX. Measured, not theorised: it is why the switch this file exists for
+ * silently never worked on the machine it was written on.
+ *
+ * The distinction that actually separates the two: an ancestor-only link
+ * PRESERVES the package's position under the root, so the realpath is
+ * exactly <real root>/@maka/maka-cli. A real `npm link` points off to a
+ * working tree somewhere else entirely. Comparing against the resolved root
+ * asks that question directly.
  */
 export function classifyGlobalInstall(facts) {
     if (!facts.globalPackagePath) {
@@ -54,49 +78,121 @@ export function classifyGlobalInstall(facts) {
     }
     const raw = path.normalize(facts.globalPackagePath);
     const real = path.normalize(facts.globalPackageRealPath);
-    if (raw !== real) {
-        return {
-            kind: 'linked',
-            reason: `${facts.globalPackagePath} resolves to ${facts.globalPackageRealPath} -- that is a symlink or junction (npm link, or a manual dev link), not a release install. Replacing it with a downloaded binary would silently disconnect you from that working tree. Run this from a plain \`npm install -g @maka/maka-cli\` instead if you want the binary distribution.`,
-        };
+    if (raw === real) {
+        return { kind: 'global-npm', reason: '' };
     }
-    return { kind: 'global-npm', reason: '' };
+    // The package moved when resolved -- but if it landed exactly where the
+    // RESOLVED root puts it, nothing about the package is linked; the prefix
+    // above it is.
+    if (facts.globalNpmRootRealPath) {
+        const underRealRoot = path.normalize(path.join(facts.globalNpmRootRealPath, '@maka', 'maka-cli'));
+        if (underRealRoot === real) {
+            return { kind: 'global-npm', reason: '' };
+        }
+    }
+    return {
+        kind: 'linked',
+        reason: `${facts.globalPackagePath} resolves to ${facts.globalPackageRealPath} -- that is a symlink or junction (npm link, or a manual dev link) pointing at a working tree, not a release install.`,
+    };
+}
+/** The question --binary asks before it unlinks a dev link. Kept next to
+ *  the classification that produces the case, and pure, so the promise it
+ *  makes about the working tree is asserted rather than assumed.
+ *
+ *  IT IS A QUESTION AND NOT A REFUSAL, which it used to be. Refusing sent
+ *  the user off to run npm by hand for a step this flow can do correctly
+ *  itself -- and it is safe to do, because removing a global link removes
+ *  the LINK: the tree it points at is not npm's to delete and npm does not
+ *  touch it. What the refusal was really protecting against is the switch
+ *  happening without the user knowing, so that is what survives -- the
+ *  disclosure, asked up front, before a single byte is downloaded. */
+export function unlinkPrompt(linkPath, workingTreePath) {
+    return `Unlink ${linkPath} and install the release binary instead? The working tree at ${workingTreePath} is left alone -- only the global link to it goes, and \`npm link\` from that directory puts it back.`;
 }
 /** Gathers the facts classifyGlobalInstall() needs. The one impure half of
  *  the classification -- kept separate so the decision above stays pure. */
 export function gatherInstallFacts(globalNpmRoot) {
+    const rootReal = realPathOrUndefined(globalNpmRoot);
     const candidate = path.join(globalNpmRoot, '@maka', 'maka-cli');
     if (!fs.existsSync(candidate)) {
-        return { globalPackagePath: undefined, globalPackageRealPath: undefined };
+        return {
+            globalPackagePath: undefined,
+            globalPackageRealPath: undefined,
+            globalNpmRootRealPath: rootReal,
+        };
     }
-    let real;
+    return {
+        globalPackagePath: candidate,
+        globalPackageRealPath: realPathOrUndefined(candidate),
+        globalNpmRootRealPath: rootReal,
+    };
+}
+function realPathOrUndefined(target) {
     try {
-        real = fs.realpathSync(candidate);
+        return fs.realpathSync(target);
     }
     catch {
-        real = undefined;
+        return undefined;
     }
-    return { globalPackagePath: candidate, globalPackageRealPath: real };
+}
+/** Where npm puts the command shims for a global install: the prefix
+ *  itself on Windows, <prefix>/bin everywhere else. Both switch directions
+ *  need it -- one to take that directory OFF the verification PATH, the
+ *  other to put it back. */
+export function npmShimDirFor(npmPrefix, platform) {
+    return platform === 'win32' ? npmPrefix : path.join(npmPrefix, 'bin');
 }
 /**
- * The PATH a freshly opened shell will see once the disclosed PATH edit
- * has actually taken effect -- NOT what the currently-running process
+ * The PATH a freshly opened shell will see once a disclosed PATH edit has
+ * actually taken effect -- NOT what the currently-running process
  * inherits. A registry/profile edit never reaches an already-running
  * process, so verifying against process.env.PATH as-is would silently
- * check the OLD path (finding the npm shim pre-uninstall, or nothing
- * post-uninstall) and pass for the wrong reason. Pure: given the pieces,
- * constructs the string; the caller decides what to spawn with it.
+ * check the OLD path (finding the shim that is about to go, or nothing at
+ * all) and pass for the wrong reason. Pure: given the pieces, constructs
+ * the string; the caller decides what to spawn with it.
  *
- * npmShimDir is removed from the old PATH (not just left alongside the
- * new entry) so the constructed env matches the END STATE this flow
- * commits to -- binary replaces, never coexists on PATH either.
+ * ONE FUNCTION FOR BOTH DIRECTIONS, because they are the same edit with
+ * the arguments swapped: the incoming shape's directory goes on the front,
+ * the outgoing shape's directory comes off entirely. Removing rather than
+ * merely out-ranking it is the point -- the constructed env has to match
+ * the END STATE these flows commit to, where the two never coexist on
+ * PATH. `prepend` is also removed from the tail first, so a directory that
+ * was already on PATH is promoted rather than duplicated.
  */
-export function buildVerificationPath(input) {
+function composeVerificationPath(input) {
+    const drop = [input.remove, input.prepend]
+        .filter((d) => Boolean(d))
+        .map((d) => path.normalize(d));
     const entries = input.currentPath
         .split(input.pathSeparator)
         .filter(Boolean)
-        .filter((entry) => !input.npmShimDir || path.normalize(entry) !== path.normalize(input.npmShimDir));
-    return [input.newBinDir, ...entries].join(input.pathSeparator);
+        .filter((entry) => !drop.includes(path.normalize(entry)));
+    return [...(input.prepend ? [input.prepend] : []), ...entries].join(input.pathSeparator);
+}
+/** The `--binary` direction: the downloaded binary's directory takes the
+ *  front, npm's shim directory goes. */
+export function buildVerificationPath(input) {
+    return composeVerificationPath({
+        currentPath: input.currentPath,
+        prepend: input.newBinDir,
+        remove: input.npmShimDir,
+        pathSeparator: input.pathSeparator,
+    });
+}
+/** The `--npm` direction: the same edit run backwards. npm's shim
+ *  directory takes the front (it is usually already on PATH, which is why
+ *  composeVerificationPath promotes rather than duplicates it), and the
+ *  binary's directory comes off. The directory removed is always
+ *  binaryInstallDir() -- somewhere maka owns outright and nothing else
+ *  lives -- never whatever directory a hand-placed binary happens to sit
+ *  in, which could be /usr/local/bin. */
+export function buildRevertVerificationPath(input) {
+    return composeVerificationPath({
+        currentPath: input.currentPath,
+        prepend: input.npmShimDir,
+        remove: input.binaryBinDir,
+        pathSeparator: input.pathSeparator,
+    });
 }
 /**
  * Which shell profile a POSIX PATH edit should target, or undefined when
@@ -128,18 +224,74 @@ export function pathExportLine(shell, binDir) {
         return `fish_add_path ${binDir}`;
     return `export PATH="${binDir}:$PATH"`;
 }
+/** The comment `--binary` writes above the line it adds. Exported and used
+ *  by BOTH the write and the removal, so the two cannot drift into a state
+ *  where `--npm` leaves an orphaned comment behind. */
+export const PATH_EDIT_MARKER = '# added by `maka update maka --binary`';
+/**
+ * A shell profile with the PATH line `--binary` added taken back out,
+ * ready for `--npm` to write. Pure: string in, string out, so what it
+ * promises to leave alone is asserted rather than hoped for.
+ *
+ * MATCHES ON THE LINE, NOT ON THE MARKER, and removes the marker
+ * separately. Anchoring to the comment would strand the export whenever a
+ * user has tidied their profile, and stranding the export is the failure
+ * that matters: it silently keeps a deleted directory on PATH. Both shell
+ * dialects are checked because the profile that gets read here is not
+ * necessarily the one that was written -- $SHELL can change between the
+ * two runs.
+ */
+export function withoutPathExport(profileContents, binDir) {
+    const ours = new Set([pathExportLine('bash', binDir), pathExportLine('fish', binDir)]);
+    const kept = [];
+    let dropping = false;
+    for (const line of profileContents.split('\n')) {
+        const trimmed = line.trim();
+        if (ours.has(trimmed) || trimmed === PATH_EDIT_MARKER) {
+            // The append led with a blank line to separate its block from
+            // whatever was there before. Taking the block out has to take that
+            // separator with it, or switching back and forth leaves the profile
+            // growing a blank line per round trip. Only the FIRST line of a run
+            // reaches back, so a two-line block eats one blank, not two.
+            if (!dropping && kept.length && kept[kept.length - 1].trim() === '')
+                kept.pop();
+            dropping = true;
+            continue;
+        }
+        dropping = false;
+        kept.push(line);
+    }
+    return kept.join('\n');
+}
+/** True when the profile still carries a PATH line for this directory --
+ *  asked before prompting, so `--npm` does not offer to edit a file it has
+ *  nothing to change in. */
+export function hasPathExport(profileContents, binDir) {
+    return withoutPathExport(profileContents, binDir) !== profileContents;
+}
 /** Resolves a bare command name against a PATH string by hand, the same
  *  way a shell would -- used to PROVE the constructed verification PATH
- *  actually finds our binary first, rather than trusting that spawning
- *  "maka" and getting SOME successful output means it found the right
- *  one. Extension order matches Windows' own PATHEXT precedence
+ *  actually finds the incoming shape first, rather than trusting that
+ *  spawning "maka" and getting SOME successful output means it found the
+ *  right one. Extension order matches Windows' own PATHEXT precedence
  *  (.exe before .cmd/.bat); POSIX has no such notion, so the bare name
- *  is the only candidate there. */
-export function resolveOnPath(name, pathValue, platform, pathSeparator) {
+ *  is the only candidate there.
+ *
+ *  `ignore` is how the `--npm` direction models its own end state. That
+ *  flow verifies BEFORE it removes the binaries -- deliberately, so a
+ *  failed verification can stop with the binary still working -- which
+ *  means the files it is about to retire are still sitting on disk, still
+ *  first, and would answer the question with the very thing being
+ *  replaced. Skipping them asks what a shell will find AFTERWARDS, which
+ *  is the question worth answering. */
+export function resolveOnPath(name, pathValue, platform, pathSeparator, ignore = []) {
     const extensions = platform === 'win32' ? ['.exe', '.cmd', '.bat', ''] : [''];
+    const skip = ignore.map((p) => path.normalize(p));
     for (const dir of pathValue.split(pathSeparator).filter(Boolean)) {
         for (const ext of extensions) {
             const candidate = path.join(dir, name + ext);
+            if (skip.includes(path.normalize(candidate)))
+                continue;
             if (fs.existsSync(candidate))
                 return candidate;
         }
@@ -166,6 +318,54 @@ export async function installStagedBinary(stagedPath, targetPath, platform) {
         fs.renameSync(stagedPath, targetPath);
     }
 }
+/**
+ * Takes the binary distribution back out of service -- the last and only
+ * destructive step of `--npm`, the mirror of the npm uninstall that ends
+ * `--binary`.
+ *
+ * ON WINDOWS THIS FILE IS THE RUNNING PROCESS and cannot be deleted, so it
+ * is renamed aside to `.old` instead, exactly the trick swapPlanFor() uses
+ * to update a binary in place. Renaming is enough for the purpose: the
+ * name `maka.exe` stops resolving, which is the whole requirement. POSIX
+ * unlinks a running executable happily, so there it simply goes.
+ */
+export function retireBinaryInstall(binaryPath, platform) {
+    if (!fs.existsSync(binaryPath))
+        return { removed: false };
+    if (platform !== 'win32') {
+        fs.rmSync(binaryPath, { force: true });
+        return { removed: true };
+    }
+    const aside = `${binaryPath}.old`;
+    try {
+        fs.unlinkSync(aside);
+    }
+    catch { /* stale-or-absent either way */ }
+    fs.renameSync(binaryPath, aside);
+    return { removed: true, renamedTo: aside };
+}
+/**
+ * What to run to make a maka -- packaged or npm-installed -- print its
+ * version, used by BOTH switch directions to prove the incoming install
+ * actually runs before the outgoing one is taken away.
+ *
+ * IT IS THE `version` COMMAND AND NOT `--version`, and the difference is
+ * not cosmetic. maka's argument parser wants a command; a bare flag with
+ * no command reaches it as no command at all and it exits 1 with "Too few
+ * arguments". Both directions of this switch verify by looking for the
+ * version string in successful output, so `--version` fails that check
+ * every single time -- which is how --binary came to be a flow that could
+ * download, verify, stage and PATH-install a binary and then refuse to
+ * finish, every time, on every machine. Measured, not reasoned: `maka
+ * version` prints "Maka <x.y.z>" and exits 0, `maka --version` prints the
+ * usage banner and exits 1.
+ *
+ * A constant rather than a literal at each site because there are two
+ * sites now, and the failure mode of getting this wrong is silent: a
+ * verification that can never pass looks exactly like a careful one until
+ * somebody runs it.
+ */
+export const VERSION_PROBE_ARGV = ['version'];
 /** Compares two spawnSync-style results the way check-bundle-parity.mjs
  *  compares builds: same exit status, same combined stdout+stderr. No
  *  path-scrubbing normalization here -- both invocations run the exact

package/bundle/typescript/src/tools/self-update/binary-install.js.map

@@ -1 +1 @@
-{"version":3,"file":"binary-install.js","sourceRoot":"","sources":["../../../../../src/tools/self-update/binary-install.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"binary-install.js","sourceRoot":"","sources":["../../../../../src/tools/self-update/binary-install.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/tools/self-update/update-maka.d.ts

@@ -14,4 +14,5 @@
  */
 export declare function updateMakaCli(opts?: {
     binary?: boolean;
+    npm?: boolean;
 }): Promise<boolean>;