@vltpkg/cli-js 1.3.6 → 1.3.8

package/{chunk-IXAHSTBN.js → chunk-BGA3WB7H.js}

@@ -11,17 +11,19 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   PackageInfoClient
-} from "./chunk-VI7V6OCC.js";
+} from "./chunk-DL3H4EMY.js";
 import {
+  RollbackRemove,
+  cmdShim,
   findCmdShimIfExists,
   install
-} from "./chunk-WGSYVB4F.js";
+} from "./chunk-NWHKSRO3.js";
 import {
   PathScurry
-} from "./chunk-GDYDW277.js";
+} from "./chunk-CB65DPZ2.js";
 import {
   Spec
-} from "./chunk-64VFL4WI.js";
+} from "./chunk-GZ5MYMBT.js";
 import {
   walkUp
 } from "./chunk-HTOTG4TS.js";
@@ -30,7 +32,7 @@ import {
 } from "./chunk-XNLSTHDK.js";
 import {
   parseScope
-} from "./chunk-BP3PQ67D.js";
+} from "./chunk-IBGFQR23.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
@@ -221,7 +223,7 @@ var vlxInstall = async (spec, options, promptFn) => {
 };
 
 // ../../src/vlx/src/resolve.ts
-import { resolve as resolve6 } from "node:path";
+import { resolve as resolve7 } from "node:path";
 
 // ../../src/vlx/src/add-to-path.ts
 import { delimiter } from "node:path";
@@ -279,6 +281,72 @@ var findPackage = async (name, projectRoot, packageJson) => {
   }
 };
 
+// ../../src/vlx/src/local.ts
+import { createHash as createHash2 } from "node:crypto";
+import {
+  mkdir as mkdir2,
+  mkdtemp,
+  readFile,
+  realpath,
+  rename,
+  rm as rm2
+} from "node:fs/promises";
+import { basename as basename2, resolve as resolve6 } from "node:path";
+import { pathToFileURL as pathToFileURL2 } from "node:url";
+var localDir = async (spec) => {
+  const { type, file } = spec.final;
+  if (type !== "file" || !file) return;
+  const dir = resolve6(file);
+  return await dirExists(dir) ? dir : void 0;
+};
+var vlxLocal = async (dir, packageJson) => {
+  const manifest = packageJson.read(dir);
+  const bins = Object.entries(manifest.bin ?? {});
+  const heads = await Promise.all(
+    bins.map(async ([k, v]) => {
+      const target = resolve6(dir, v);
+      const data = await readFile(target, "utf8").catch(
+        (cause) => {
+          throw error(`Bin target not found: ${k} -> ${v}`, {
+            path: target,
+            cause
+          });
+        }
+      );
+      return `\0${k}\0${v}\0${data.trim().split(/\r*\n/)[0]}`;
+    })
+  );
+  const key = createHash2("sha512").update(dir + heads.join("")).digest("hex").substring(0, 16);
+  const cache = new XDG("vlt/vlx-local").cache();
+  await mkdir2(cache, { recursive: true });
+  const path = resolve6(await realpath(cache), key);
+  if (!await dirExists(path)) {
+    const tmp = await mkdtemp(`${path}-`);
+    const remover = new RollbackRemove();
+    await Promise.all(
+      bins.map(
+        ([k, v]) => cmdShim(
+          resolve6(dir, v),
+          resolve6(tmp, "node_modules/.bin", k),
+          remover
+        )
+      )
+    );
+    remover.confirm();
+    await rename(tmp, path).catch(async (er) => {
+      if (!await dirExists(path)) throw er;
+      await rm2(tmp, { recursive: true, force: true });
+    });
+  }
+  return {
+    path,
+    name: manifest.name ?? basename2(dir),
+    version: manifest.version,
+    resolved: String(pathToFileURL2(dir)),
+    arg0: inferDefaultExecutable(manifest)?.[0]
+  };
+};
+
 // ../../src/vlx/src/resolve.ts
 var vlxResolve = async (positionals, options, promptFn) => {
   const noArgs = positionals.length === 0;
@@ -289,22 +357,30 @@ var vlxResolve = async (positionals, options, promptFn) => {
     if (!arg0) {
       return void 0;
     }
-    const found = await findExecutable(arg0, projectRoot);
+    const found = arg0 === "." || arg0 === ".." || /[\\/]/.test(arg0) ? void 0 : await findExecutable(arg0, projectRoot);
     if (found) return found;
     pkgOption = arg0;
     arg0 = void 0;
   }
   let pkgTarget = void 0;
+  let dir;
   if (pkgOption) {
-    const pkgSpec = Spec.parseArgs(pkgOption, options);
+    const pkgSpec = Spec.parseArgs(
+      // bare . / .. are paths, not names
+      pkgOption === "." || pkgOption === ".." ? `${pkgOption}/` : pkgOption,
+      options
+    );
     const { name, bareSpec } = pkgSpec.final;
     if (!bareSpec) {
       pkgTarget = await findPackage(name, projectRoot, packageJson);
+    } else {
+      dir = await localDir(pkgSpec);
+      if (dir) pkgTarget = await vlxLocal(dir, packageJson);
     }
     pkgTarget ??= await vlxInstall(pkgSpec, options, promptFn);
   }
   if (pkgTarget) {
-    addToPATH(resolve6(pkgTarget.path, "node_modules/.bin"));
+    addToPATH(resolve7(pkgTarget.path, "node_modules/.bin"));
     if (noArgs) return void 0;
   }
   if (!arg0) {
@@ -316,7 +392,7 @@ var vlxResolve = async (positionals, options, promptFn) => {
     arg0 = pkgTarget.arg0;
     if (!arg0) {
       const { name, version, bin } = packageJson.read(
-        resolve6(pkgTarget.path, "node_modules", pkgTarget.name)
+        dir ?? resolve7(pkgTarget.path, "node_modules", pkgTarget.name)
       );
       throw error("Package executable could not be inferred", {
         name,

package/{chunk-GDYDW277.js → chunk-CB65DPZ2.js}

@@ -13,10 +13,10 @@ import {
   graphRun,
   graphRunSync,
   joinDepIDTuple
-} from "./chunk-JIQBZ2UT.js";
+} from "./chunk-SV4WK3KX.js";
 import {
   Spec
-} from "./chunk-64VFL4WI.js";
+} from "./chunk-GZ5MYMBT.js";
 import {
   load,
   parse as parse2,
@@ -43,7 +43,7 @@ import {
   parse,
   parseRange,
   satisfies
-} from "./chunk-BP3PQ67D.js";
+} from "./chunk-IBGFQR23.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
@@ -363,198 +363,6 @@ var require_promise_retry = __commonJS({
   }
 });
 
-// ../../src/git/src/spawn.ts
-var import_promise_retry = __toESM(require_promise_retry(), 1);
-
-// ../../src/git/src/make-error.ts
-var connectionErrorRe = new RegExp(
-  [
-    "remote error: Internal Server Error",
-    "The remote end hung up unexpectedly",
-    "Connection timed out",
-    "Operation timed out",
-    "Failed to connect to .* Timed out",
-    "Connection reset by peer",
-    "SSL_ERROR_SYSCALL",
-    "The requested URL returned error: 503"
-  ].join("|")
-);
-var missingPathspecRe = /pathspec .* did not match any file\(s\) known to git/;
-var makeError = (result) => connectionErrorRe.test(result.stderr) ? [
-  (n) => n < 3,
-  error("A git connection error occurred", result)
-] : missingPathspecRe.test(result.stderr) ? [null, error("The git reference could not be found", result)] : [null, error("An unknown git error occurred", result)];
-
-// ../../src/git/src/opts.ts
-var gitEnv = {
-  GIT_ASKPASS: "echo",
-  GIT_SSH_COMMAND: "ssh -oStrictHostKeyChecking=accept-new"
-};
-var opts = (opts2 = {}) => ({
-  acceptFail: true,
-  ...opts2,
-  env: opts2.env ?? { ...gitEnv, ...process.env },
-  stdio: "pipe",
-  stdioString: true,
-  shell: false
-});
-
-// ../../src/git/src/which.ts
-var gitPath = void 0;
-var which = (opts2 = {}) => {
-  if (opts2.git) {
-    return opts2.git;
-  }
-  let whichError = void 0;
-  if (opts2.git !== false) {
-    if (!gitPath) {
-      try {
-        gitPath = whichSync("git");
-      } catch (er) {
-        whichError = er;
-      }
-    }
-  }
-  if (!gitPath || opts2.git === false) {
-    return error(
-      "No git binary found in $PATH",
-      {
-        code: "ENOGIT",
-        cause: whichError
-      },
-      which
-    );
-  }
-  return gitPath;
-};
-
-// ../../src/git/src/spawn.ts
-var spawn = async (gitArgs, opts2 = {}) => {
-  const gitPath2 = which(opts2);
-  if (gitPath2 instanceof Error) {
-    throw gitPath2;
-  }
-  const args = opts2.allowReplace || gitArgs[0] === "--no-replace-objects" ? gitArgs : ["--no-replace-objects", ...gitArgs];
-  const retryOpts = {
-    retries: opts2["fetch-retries"] || 3,
-    factor: opts2["fetch-retry-factor"] || 2,
-    maxTimeout: opts2["fetch-retry-maxtimeout"] || 6e4,
-    minTimeout: opts2["fetch-retry-mintimeout"] || 1e3
-  };
-  return (0, import_promise_retry.default)(async (retryFn, num) => {
-    const result = await promiseSpawn(gitPath2, args, opts(opts2));
-    if (result.status || result.signal) {
-      const [shouldRetry, gitError] = makeError(result);
-      if (!shouldRetry?.(num)) {
-        throw gitError;
-      }
-      retryFn(gitError);
-    }
-    return result;
-  }, retryOpts);
-};
-
-// ../../src/git/src/is.ts
-import { stat } from "node:fs/promises";
-var is = ({ cwd = process.cwd() } = {}) => stat(cwd + "/.git").then(
-  () => true,
-  () => false
-);
-
-// ../../src/git/src/is-clean.ts
-var isClean = async (opts2 = {}) => {
-  const result = await spawn(
-    ["status", "--porcelain=v1", "-uno"],
-    opts2
-  );
-  if (result.status || result.signal) {
-    throw error("git isClean check failed", result);
-  }
-  for (const line of result.stdout.split(/\r?\n+/)) {
-    if (line.trim()) return false;
-  }
-  return true;
-};
-
-// ../../src/git-scp-url/src/index.ts
-var knownProtocols = /* @__PURE__ */ new Set([
-  "http:",
-  "https:",
-  "git:",
-  "git+ssh:",
-  "git+https:",
-  "ssh:"
-]);
-var memo = /* @__PURE__ */ new Map();
-var correctProtocol = (arg) => {
-  const firstColon = arg.indexOf(":");
-  const proto = arg.slice(0, firstColon + 1);
-  const doubleSlash = arg.indexOf("//");
-  if (knownProtocols.has(proto)) {
-    if (doubleSlash === firstColon + 1) {
-      return arg;
-    }
-    return proto + "//" + arg.slice(firstColon + 1);
-  }
-  const firstAt = arg.indexOf("@");
-  if (firstAt > -1) {
-    if (firstAt > firstColon) {
-      return `git+ssh://${arg}`;
-    } else {
-      return arg;
-    }
-  }
-  return proto + "//" + arg.slice(firstColon + 1);
-};
-var correctUrl = (url) => {
-  const firstAt = url.indexOf("@");
-  const lastHash = url.lastIndexOf("#");
-  let firstColon = url.indexOf(":");
-  let lastColon = url.lastIndexOf(
-    ":",
-    lastHash > -1 ? lastHash : Infinity
-  );
-  let corrected = url;
-  if (lastColon > firstAt) {
-    corrected = url.slice(0, lastColon) + "/" + url.slice(lastColon + 1);
-    firstColon = corrected.indexOf(":");
-    lastColon = corrected.lastIndexOf(":");
-  }
-  if (firstColon === -1 && !url.includes("//")) {
-    corrected = `git+ssh://${corrected}`;
-  }
-  return corrected;
-};
-var gitScpURL = (url) => {
-  const memoized = memo.get(url);
-  if (memoized) return memoized;
-  try {
-    const result = new URL(url);
-    if (result.hostname) {
-      memo.set(url, result);
-      return result;
-    }
-  } catch {
-  }
-  try {
-    const result = new URL(correctUrl(correctProtocol(url)));
-    if (result.hostname) {
-      memo.set(url, result);
-      return result;
-    }
-  } catch {
-  }
-  return void 0;
-};
-
-// ../../src/git/src/clone.ts
-import { mkdir, stat as stat2 } from "node:fs/promises";
-import { basename, resolve as resolve2 } from "node:path";
-import { fileURLToPath as fileURLToPath2 } from "node:url";
-
-// ../../src/git/src/is-windows.ts
-var isWindows = (opts2) => (opts2.fakePlatform || process.platform) === "win32";
-
 // ../../src/pick-manifest/src/index.ts
 import { readFileSync } from "node:fs";
 var parsedNodeVersion = Version.parse(process.version);
@@ -784,6 +592,198 @@ function pickManifest(packument, wanted, opts2 = {}) {
   return found?.mani;
 }
 
+// ../../src/git/src/spawn.ts
+var import_promise_retry = __toESM(require_promise_retry(), 1);
+
+// ../../src/git/src/make-error.ts
+var connectionErrorRe = new RegExp(
+  [
+    "remote error: Internal Server Error",
+    "The remote end hung up unexpectedly",
+    "Connection timed out",
+    "Operation timed out",
+    "Failed to connect to .* Timed out",
+    "Connection reset by peer",
+    "SSL_ERROR_SYSCALL",
+    "The requested URL returned error: 503"
+  ].join("|")
+);
+var missingPathspecRe = /pathspec .* did not match any file\(s\) known to git/;
+var makeError = (result) => connectionErrorRe.test(result.stderr) ? [
+  (n) => n < 3,
+  error("A git connection error occurred", result)
+] : missingPathspecRe.test(result.stderr) ? [null, error("The git reference could not be found", result)] : [null, error("An unknown git error occurred", result)];
+
+// ../../src/git/src/opts.ts
+var gitEnv = {
+  GIT_ASKPASS: "echo",
+  GIT_SSH_COMMAND: "ssh -oStrictHostKeyChecking=accept-new"
+};
+var opts = (opts2 = {}) => ({
+  acceptFail: true,
+  ...opts2,
+  env: opts2.env ?? { ...gitEnv, ...process.env },
+  stdio: "pipe",
+  stdioString: true,
+  shell: false
+});
+
+// ../../src/git/src/which.ts
+var gitPath = void 0;
+var which = (opts2 = {}) => {
+  if (opts2.git) {
+    return opts2.git;
+  }
+  let whichError = void 0;
+  if (opts2.git !== false) {
+    if (!gitPath) {
+      try {
+        gitPath = whichSync("git");
+      } catch (er) {
+        whichError = er;
+      }
+    }
+  }
+  if (!gitPath || opts2.git === false) {
+    return error(
+      "No git binary found in $PATH",
+      {
+        code: "ENOGIT",
+        cause: whichError
+      },
+      which
+    );
+  }
+  return gitPath;
+};
+
+// ../../src/git/src/spawn.ts
+var spawn = async (gitArgs, opts2 = {}) => {
+  const gitPath2 = which(opts2);
+  if (gitPath2 instanceof Error) {
+    throw gitPath2;
+  }
+  const args = opts2.allowReplace || gitArgs[0] === "--no-replace-objects" ? gitArgs : ["--no-replace-objects", ...gitArgs];
+  const retryOpts = {
+    retries: opts2["fetch-retries"] || 3,
+    factor: opts2["fetch-retry-factor"] || 2,
+    maxTimeout: opts2["fetch-retry-maxtimeout"] || 6e4,
+    minTimeout: opts2["fetch-retry-mintimeout"] || 1e3
+  };
+  return (0, import_promise_retry.default)(async (retryFn, num) => {
+    const result = await promiseSpawn(gitPath2, args, opts(opts2));
+    if (result.status || result.signal) {
+      const [shouldRetry, gitError] = makeError(result);
+      if (!shouldRetry?.(num)) {
+        throw gitError;
+      }
+      retryFn(gitError);
+    }
+    return result;
+  }, retryOpts);
+};
+
+// ../../src/git/src/is.ts
+import { stat } from "node:fs/promises";
+var is = ({ cwd = process.cwd() } = {}) => stat(cwd + "/.git").then(
+  () => true,
+  () => false
+);
+
+// ../../src/git/src/is-clean.ts
+var isClean = async (opts2 = {}) => {
+  const result = await spawn(
+    ["status", "--porcelain=v1", "-uno"],
+    opts2
+  );
+  if (result.status || result.signal) {
+    throw error("git isClean check failed", result);
+  }
+  for (const line of result.stdout.split(/\r?\n+/)) {
+    if (line.trim()) return false;
+  }
+  return true;
+};
+
+// ../../src/git-scp-url/src/index.ts
+var knownProtocols = /* @__PURE__ */ new Set([
+  "http:",
+  "https:",
+  "git:",
+  "git+ssh:",
+  "git+https:",
+  "ssh:"
+]);
+var memo = /* @__PURE__ */ new Map();
+var correctProtocol = (arg) => {
+  const firstColon = arg.indexOf(":");
+  const proto = arg.slice(0, firstColon + 1);
+  const doubleSlash = arg.indexOf("//");
+  if (knownProtocols.has(proto)) {
+    if (doubleSlash === firstColon + 1) {
+      return arg;
+    }
+    return proto + "//" + arg.slice(firstColon + 1);
+  }
+  const firstAt = arg.indexOf("@");
+  if (firstAt > -1) {
+    if (firstAt > firstColon) {
+      return `git+ssh://${arg}`;
+    } else {
+      return arg;
+    }
+  }
+  return proto + "//" + arg.slice(firstColon + 1);
+};
+var correctUrl = (url) => {
+  const firstAt = url.indexOf("@");
+  const lastHash = url.lastIndexOf("#");
+  let firstColon = url.indexOf(":");
+  let lastColon = url.lastIndexOf(
+    ":",
+    lastHash > -1 ? lastHash : Infinity
+  );
+  let corrected = url;
+  if (lastColon > firstAt) {
+    corrected = url.slice(0, lastColon) + "/" + url.slice(lastColon + 1);
+    firstColon = corrected.indexOf(":");
+    lastColon = corrected.lastIndexOf(":");
+  }
+  if (firstColon === -1 && !url.includes("//")) {
+    corrected = `git+ssh://${corrected}`;
+  }
+  return corrected;
+};
+var gitScpURL = (url) => {
+  const memoized = memo.get(url);
+  if (memoized) return memoized;
+  try {
+    const result = new URL(url);
+    if (result.hostname) {
+      memo.set(url, result);
+      return result;
+    }
+  } catch {
+  }
+  try {
+    const result = new URL(correctUrl(correctProtocol(url)));
+    if (result.hostname) {
+      memo.set(url, result);
+      return result;
+    }
+  } catch {
+  }
+  return void 0;
+};
+
+// ../../src/git/src/clone.ts
+import { mkdir, stat as stat2 } from "node:fs/promises";
+import { basename, resolve as resolve2 } from "node:path";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+
+// ../../src/git/src/is-windows.ts
+var isWindows = (opts2) => (opts2.fakePlatform || process.platform) === "win32";
+
 // ../../src/git/src/revs.ts
 import { fileURLToPath } from "node:url";