@logionsh/cli 0.1.0 → 0.1.2

package/README.md

@@ -22,7 +22,7 @@ On install, the postinstall hook:
 
 1. Finds a working Python 3.12+.
 2. Installs `logion-cli==<pinned-version>` from PyPI via `pipx`/`uv`/venv.
-3. Shims the `logion` and `lgn` binaries onto your PATH.
+3. Shims the `logion` binary onto your PATH.
 
 The pinned PyPI version is baked into the npm tarball at publish
 time, so `npm install -g @logionsh/cli@0.3.0` always installs the

package/dist/bin/logion.js

@@ -25,43 +25,14 @@ var __toESM = (mod, isNodeMode, target2) => (target2 = mod != null ? __create(__
 
 // src/bin/logion.ts
 var import_node_child_process = require("child_process");
-
-// src/lib/which.ts
 var import_node_fs = __toESM(require("fs"));
+var import_node_os = __toESM(require("os"));
 var import_node_path = __toESM(require("path"));
-function candidatesForName(name) {
-  if (process.platform !== "win32") {
-    return [name];
-  }
-  const pathext = (process.env.PATHEXT ?? ".EXE;.CMD;.BAT;.COM").split(";").filter(Boolean);
-  if (import_node_path.default.extname(name)) {
-    return [name];
-  }
-  return [name, ...pathext.map((ext) => name + ext.toLowerCase())];
-}
-function which(name) {
-  const rawPath = process.env.PATH ?? "";
-  const dirs = rawPath.split(import_node_path.default.delimiter).filter(Boolean);
-  for (const dir of dirs) {
-    for (const candidate of candidatesForName(name)) {
-      const full = import_node_path.default.join(dir, candidate);
-      try {
-        const stat = import_node_fs.default.statSync(full);
-        if (stat.isFile()) {
-          return full;
-        }
-      } catch {
-      }
-    }
-  }
-  return null;
-}
-
-// src/bin/logion.ts
-var target = which("logion");
-if (!target) {
+var managedVenvDir = import_node_path.default.join(import_node_os.default.homedir(), ".logion", "npm-managed-venv");
+var target = process.platform === "win32" ? import_node_path.default.join(managedVenvDir, "Scripts", "logion.exe") : import_node_path.default.join(managedVenvDir, "bin", "logion");
+if (!import_node_fs.default.existsSync(target)) {
   process.stderr.write(
-    "logion binary not found. Reinstall with `npm install -g @logionsh/cli` or install directly via `pipx install logion-cli`.\n"
+    "logion binary not found in the npm-managed environment. Reinstall with `npm install -g @logionsh/cli` or rerun `npx @logionsh/cli`.\n"
   );
   process.exit(127);
 }

package/dist/scripts/postinstall.js

@@ -44,7 +44,10 @@ function candidatesForName(name) {
   }
   return [name, ...pathext.map((ext) => name + ext.toLowerCase())];
 }
-function which(name) {
+function which(name, options = {}) {
+  const excluded = new Set(
+    (options.excludeRealpaths ?? []).map((p) => import_node_fs.default.realpathSync.native(p))
+  );
   const rawPath = process.env.PATH ?? "";
   const dirs = rawPath.split(import_node_path.default.delimiter).filter(Boolean);
   for (const dir of dirs) {
@@ -52,7 +55,7 @@ function which(name) {
       const full = import_node_path.default.join(dir, candidate);
       try {
         const stat = import_node_fs.default.statSync(full);
-        if (stat.isFile()) {
+        if (stat.isFile() && !excluded.has(import_node_fs.default.realpathSync.native(full))) {
           return full;
         }
       } catch {
@@ -249,7 +252,6 @@ var HOME = import_node_os2.default.homedir();
 var LOGION_DIR2 = import_node_path3.default.join(HOME, ".logion");
 var MANAGED_VENV_DIR = import_node_path3.default.join(LOGION_DIR2, "npm-managed-venv");
 var MARKER_PATH = import_node_path3.default.join(LOGION_DIR2, "npm-wrapper-installer.json");
-var LOCAL_BIN = import_node_path3.default.join(HOME, ".local", "bin");
 var PLACEHOLDER_VERSION = "0.0.0-placeholder";
 function log(msg) {
   process.stderr.write(`[logion-postinstall] ${msg}
@@ -310,48 +312,15 @@ function venvBin(name) {
   }
   return import_node_path3.default.join(MANAGED_VENV_DIR, "bin", name);
 }
-function linkOrCopy(src, dest) {
-  if (import_node_fs3.default.existsSync(dest)) {
-    import_node_fs3.default.unlinkSync(dest);
-  }
-  try {
-    import_node_fs3.default.symlinkSync(src, dest);
-  } catch {
-    import_node_fs3.default.copyFileSync(src, dest);
-  }
-}
-function shimNamesFor(base) {
-  return process.platform === "win32" ? [`${base}.exe`] : [base];
-}
 function installViaVenv(version, py) {
   log(`Installing logion-cli==${version} via managed venv...`);
-  runChecked(py.cmd, [...py.args, "-m", "venv", MANAGED_VENV_DIR]);
+  runChecked(py.cmd, [...py.args, "-m", "venv", "--clear", MANAGED_VENV_DIR]);
   runChecked(venvBin("pip"), ["install", `logion-cli==${version}`]);
-  import_node_fs3.default.mkdirSync(LOCAL_BIN, { recursive: true });
-  for (const base of ["logion", "lgn"]) {
-    const src = venvBin(base);
-    if (!import_node_fs3.default.existsSync(src)) {
-      continue;
-    }
-    for (const destName of shimNamesFor(base)) {
-      const dest = import_node_path3.default.join(LOCAL_BIN, destName);
-      try {
-        linkOrCopy(src, dest);
-      } catch (error) {
-        const msg = error instanceof Error ? error.message : String(error);
-        log(
-          `Warning: could not create shim ${dest}: ${msg}. Add ${LOCAL_BIN} to PATH manually.`
-        );
-      }
-    }
-  }
 }
-function verifyInstall(version) {
-  const target = which("logion");
-  if (!target) {
-    log(
-      "Warning: logion not on PATH yet. Ensure your installer's bin directory is exported."
-    );
+function verifyInstall(version, installer) {
+  const target = installer === "venv" ? venvBin("logion") : which("logion");
+  if (!target || !import_node_fs3.default.existsSync(target)) {
+    log("Warning: logion binary was not found after install.");
     return;
   }
   const r = (0, import_node_child_process2.spawnSync)(target, ["--version"], {
@@ -371,12 +340,6 @@ function pickInstaller(forced) {
   if (forced !== void 0 && forced.length > 0) {
     return null;
   }
-  if (which("pipx")) {
-    return "pipx";
-  }
-  if (which("uv")) {
-    return "uv";
-  }
   return "venv";
 }
 function maybePrintOnboardingPointer() {
@@ -407,9 +370,7 @@ function main() {
       "Error: Python 3.12+ not found. Install Python 3.12+ or set LOGION_NPM_PYTHON."
     );
     log("See: https://www.python.org/downloads/");
-    log(
-      "Or set LOGION_NPM_SKIP_INSTALL=1 and install manually: pipx install logion-cli"
-    );
+    log("Or set LOGION_NPM_SKIP_INSTALL=1 to skip the Python CLI install.");
     process.exit(1);
   }
   log(`Using Python: ${py.cmd} ${py.args.join(" ")}`.trim());
@@ -427,7 +388,7 @@ function main() {
     installViaVenv(version, py);
   }
   writeMarker(installer, version);
-  verifyInstall(version);
+  verifyInstall(version, installer);
   maybePrintOnboardingPointer();
   log(`Installed logion-cli ${version} via ${installer}.`);
 }

package/dist/scripts/uninstall.js

@@ -41,7 +41,10 @@ function candidatesForName(name) {
   }
   return [name, ...pathext.map((ext) => name + ext.toLowerCase())];
 }
-function which(name) {
+function which(name, options = {}) {
+  const excluded = new Set(
+    (options.excludeRealpaths ?? []).map((p) => import_node_fs.default.realpathSync.native(p))
+  );
   const rawPath = process.env.PATH ?? "";
   const dirs = rawPath.split(import_node_path.default.delimiter).filter(Boolean);
   for (const dir of dirs) {
@@ -49,7 +52,7 @@ function which(name) {
       const full = import_node_path.default.join(dir, candidate);
       try {
         const stat = import_node_fs.default.statSync(full);
-        if (stat.isFile()) {
+        if (stat.isFile() && !excluded.has(import_node_fs.default.realpathSync.native(full))) {
           return full;
         }
       } catch {
@@ -64,7 +67,6 @@ var HOME = import_node_os.default.homedir();
 var LOGION_DIR = import_node_path2.default.join(HOME, ".logion");
 var MANAGED_VENV_DIR = import_node_path2.default.join(LOGION_DIR, "npm-managed-venv");
 var MARKER_PATH = import_node_path2.default.join(LOGION_DIR, "npm-wrapper-installer.json");
-var LOCAL_BIN = import_node_path2.default.join(HOME, ".local", "bin");
 function log(msg) {
   process.stderr.write(`[logion-uninstall] ${msg}
 `);
@@ -95,28 +97,13 @@ function removeManagedVenv() {
     log(`Warning: could not remove managed venv: ${msg}`);
   }
 }
-function removeShims() {
-  const names = process.platform === "win32" ? ["logion.exe", "lgn.exe", "logion.cmd", "lgn.cmd"] : ["logion", "lgn"];
-  for (const name of names) {
-    const link = import_node_path2.default.join(LOCAL_BIN, name);
-    try {
-      const stat = import_node_fs2.default.lstatSync(link);
-      if (stat.isSymbolicLink() || stat.isFile()) {
-        import_node_fs2.default.unlinkSync(link);
-      }
-    } catch {
-    }
-  }
-}
 function main() {
   const marker = readMarker();
   if (!marker) {
-    removeShims();
     return;
   }
   if (marker.installer === "venv") {
     removeManagedVenv();
-    removeShims();
   } else if (marker.installer === "pipx" && which("pipx")) {
     log("Uninstalling logion-cli via pipx...");
     tryRun("pipx", ["uninstall", "logion-cli"]);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@logionsh/cli",
-  "version": "0.1.0",
-  "description": "Logion CLI — installs and shims the canonical Python logion-cli from PyPI.",
+  "version": "0.1.2",
+  "description": "Logion CLI — installs and runs the canonical Python logion-cli from a managed environment.",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -19,8 +19,7 @@
     "agent"
   ],
   "bin": {
-    "logion": "dist/bin/logion.js",
-    "lgn": "dist/bin/lgn.js"
+    "logion": "dist/bin/logion.js"
   },
   "scripts": {
     "build": "tsup",
@@ -66,5 +65,5 @@
     "typescript-eslint": "^8.20.0",
     "vitest": "^3.2.0"
   },
-  "logionCliVersion": "0.1.0"
+  "logionCliVersion": "0.1.2"
 }

package/dist/bin/lgn.js

@@ -1,74 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target2) => (target2 = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target2, "default", { value: mod, enumerable: true }) : target2,
-  mod
-));
-
-// src/bin/lgn.ts
-var import_node_child_process = require("child_process");
-
-// src/lib/which.ts
-var import_node_fs = __toESM(require("fs"));
-var import_node_path = __toESM(require("path"));
-function candidatesForName(name) {
-  if (process.platform !== "win32") {
-    return [name];
-  }
-  const pathext = (process.env.PATHEXT ?? ".EXE;.CMD;.BAT;.COM").split(";").filter(Boolean);
-  if (import_node_path.default.extname(name)) {
-    return [name];
-  }
-  return [name, ...pathext.map((ext) => name + ext.toLowerCase())];
-}
-function which(name) {
-  const rawPath = process.env.PATH ?? "";
-  const dirs = rawPath.split(import_node_path.default.delimiter).filter(Boolean);
-  for (const dir of dirs) {
-    for (const candidate of candidatesForName(name)) {
-      const full = import_node_path.default.join(dir, candidate);
-      try {
-        const stat = import_node_fs.default.statSync(full);
-        if (stat.isFile()) {
-          return full;
-        }
-      } catch {
-      }
-    }
-  }
-  return null;
-}
-
-// src/bin/lgn.ts
-var target = which("lgn") ?? which("logion");
-if (!target) {
-  process.stderr.write(
-    "lgn/logion binary not found. Reinstall with `npm install -g @logionsh/cli` or install directly via `pipx install logion-cli`.\n"
-  );
-  process.exit(127);
-}
-var r = (0, import_node_child_process.spawnSync)(target, process.argv.slice(2), { stdio: "inherit" });
-if (r.error) {
-  process.stderr.write(`${r.error.message}
-`);
-  process.exit(1);
-}
-process.exit(r.status ?? 1);