@vltpkg/cli-js 1.3.8 → 1.5.0

package/{chunk-6D54UN4T.js → chunk-5KW6AOTT.js}

@@ -12,7 +12,7 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   asError,
   isObject
-} from "./chunk-IBGFQR23.js";
+} from "./chunk-6LZM3I4Q.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/chunk-6IF3RJND.js

@@ -0,0 +1,81 @@
+var global = globalThis;
+import {Buffer} from "node:buffer";
+import {setTimeout as _vlt_setTimeout,clearTimeout as _vlt_clearTimeout,setImmediate as _vlt_setImmediate,clearImmediate as _vlt_clearImmediate,setInterval as _vlt_setInterval,clearInterval as _vlt_clearInterval} from "node:timers";
+globalThis.setTimeout = _vlt_setTimeout;
+globalThis.clearTimeout = _vlt_clearTimeout;
+globalThis.setImmediate = _vlt_setImmediate;
+globalThis.clearImmediate = _vlt_clearImmediate;
+globalThis.setInterval = _vlt_setInterval;
+globalThis.clearInterval = _vlt_clearInterval;
+import {createRequire as _vlt_createRequire} from "node:module";
+var require = _vlt_createRequire(import.meta.filename);
+
+// ../../src/tar/src/clonefile.ts
+import { isBuiltin } from "node:module";
+var codes = {
+  1: "EPERM",
+  2: "ENOENT",
+  5: "EIO",
+  13: "EACCES",
+  17: "EEXIST",
+  18: "EXDEV",
+  20: "ENOTDIR",
+  22: "EINVAL",
+  28: "ENOSPC",
+  45: "ENOTSUP",
+  62: "ELOOP",
+  63: "ENAMETOOLONG"
+};
+var lib;
+var load = () => {
+  if (lib !== void 0) return lib;
+  lib = null;
+  if (process.platform !== "darwin" || !isBuiltin("node:ffi")) {
+    return lib;
+  }
+  const emitWarning = process.emitWarning;
+  process.emitWarning = (warning, ...rest) => {
+    const [type] = rest;
+    const name = typeof type === "string" ? type : type?.type;
+    if (name !== "ExperimentalWarning" || !/\bFFI\b/.test(String(warning))) {
+      emitWarning.call(process, warning, ...rest);
+    }
+  };
+  try {
+    const ffi = process.getBuiltinModule("node:ffi");
+    const system = new ffi.DynamicLibrary("libSystem.B.dylib");
+    lib = {
+      clonefile: system.getFunction("clonefile", {
+        return: "int32",
+        arguments: ["string", "string", "uint32"]
+      }),
+      error: system.getFunction("__error", {
+        return: "pointer",
+        arguments: []
+      }),
+      getInt32: ffi.getInt32
+    };
+  } catch {
+  } finally {
+    process.emitWarning = emitWarning;
+  }
+  return lib;
+};
+var cloneAvailable = () => !!load();
+var cloneDir = (src, dst) => {
+  const l = load();
+  if (!l) return "ENOTSUP";
+  try {
+    if (l.clonefile(src, dst, 0) === 0) return true;
+    const errno = l.getInt32(l.error(), 0);
+    return codes[errno] ?? `E${errno}`;
+  } catch {
+    lib = null;
+    return "ENOTSUP";
+  }
+};
+
+export {
+  cloneAvailable,
+  cloneDir
+};

package/{chunk-IBGFQR23.js → chunk-6LZM3I4Q.js}

@@ -16,7 +16,27 @@ import {
 } from "./chunk-WZWDS3W4.js";
 
 // ../../src/fast-split/src/index.ts
+var splitTwo = (str, delim) => {
+  const a = str.indexOf(delim);
+  return a === -1 ? [str] : [str.substring(0, a), str.substring(a + delim.length)];
+};
+var splitThree = (str, delim) => {
+  const a = str.indexOf(delim);
+  if (a === -1) return [str];
+  const l = delim.length;
+  const b = str.indexOf(delim, a + l);
+  return b === -1 ? [str.substring(0, a), str.substring(a + l)] : [
+    str.substring(0, a),
+    str.substring(a + l, b),
+    str.substring(b + l)
+  ];
+};
 function fastSplit(str, delim, limit = -1, onPart) {
+  if (onPart === void 0) {
+    if (limit === 2) return splitTwo(str, delim);
+    if (limit === 3)
+      return splitThree(str, delim);
+  }
   let i = 0;
   let p = 0;
   const l = delim.length;
@@ -966,9 +986,10 @@ var defaultScopeRegistries = {
   "@jsr": "https://npm.jsr.io/"
 };
 var getOptions = (options) => ({
-  catalog: {},
   catalogs: {},
   ...options,
+  // after spread: explicit `catalog: undefined` gets default too
+  catalog: options?.catalog ?? {},
   // built-in aliases are user/service-overridable: user config wins
   "jsr-registries": {
     ...defaultJsrRegistries,
@@ -1157,19 +1178,25 @@ var Spec = class _Spec {
     }
     if (this.bareSpec.startsWith("catalog:")) {
       this.catalog = this.bareSpec.substring("catalog:".length);
-      const catalog = this.catalog ? this.options.catalogs?.[this.catalog] : this.options.catalog;
+      const { catalog: defaultCatalog, catalogs = {} } = this.options;
+      const catalog = this.catalog ? Object.hasOwn(catalogs, this.catalog) ? catalogs[this.catalog] : void 0 : Object.keys(defaultCatalog).length ? defaultCatalog : void 0;
       if (!catalog) {
-        throw this.#error("Named catalog not found", {
-          name: this.catalog,
-          validOptions: this.options.catalogs && Object.keys(this.options.catalogs)
-        });
+        throw this.#catalogError(
+          this.catalog ? `Catalog "${this.catalog}" not found for ${this.spec}` : `Default catalog not found for ${this.spec}`
+        );
       }
-      const sub = catalog[this.name];
+      const catalogName = this.catalog ? `catalog "${this.catalog}"` : "default catalog";
+      const sub = Object.hasOwn(catalog, this.name) ? catalog[this.name] : void 0;
       if (!sub) {
-        throw this.#error("Name not found in catalog", {
-          name: this.name,
-          validOptions: Object.keys(catalog)
-        });
+        throw this.#catalogError(
+          `Package "${this.name}" not found in ${catalogName}`
+        );
+      }
+      if (sub.startsWith("catalog:")) {
+        throw this.#error(
+          `Catalog entry "${this.name}" in ${catalogName} cannot be a catalog: spec`,
+          { code: "ECONFIG", found: sub }
+        );
       }
       this.subspec = _Spec.parse(this.name, sub, this.options);
       this.type = "catalog";
@@ -1485,6 +1512,23 @@ var Spec = class _Spec {
       ].map((p) => `${p}:`)
     });
   }
+  /** ECONFIG error listing defined catalogs & ones defining this dep */
+  #catalogError(message) {
+    const { catalog, catalogs = {} } = this.options;
+    const defined = [
+      ...Object.keys(catalog).length ? [["", catalog]] : [],
+      ...Object.entries(catalogs)
+    ];
+    const validOptions = defined.map(([n]) => `catalog:${n}`);
+    const wanted = defined.filter(
+      ([, c]) => Object.hasOwn(c, this.name) && !!c[this.name]
+    ).map(([n]) => `catalog:${n}`);
+    return this.#error(message, {
+      code: "ECONFIG",
+      ...validOptions.length ? { validOptions } : {},
+      ...wanted.length ? { wanted } : {}
+    });
+  }
   #error(message, extra = {}) {
     return error(message, { spec: this.spec, ...extra }, this.#error);
   }
@@ -2551,6 +2595,7 @@ export {
   gitHostWebsites,
   defaultScopeRegistries,
   getOptions,
+  builtinProtocols,
   isSpec,
   currentDefaultRegistryName,
   Spec,

package/{chunk-FIUUAQGC.js → chunk-6W5XMVIZ.js}

@@ -9,31 +9,36 @@ globalThis.setInterval = _vlt_setInterval;
 globalThis.clearInterval = _vlt_clearInterval;
 import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
+import {
+  sortScopeLocations
+} from "./chunk-43EJ4Q42.js";
 import {
   createDiffFilesProvider
 } from "./chunk-RIYFGX27.js";
 import {
   createHostContextsMap
-} from "./chunk-WHLYMMI2.js";
+} from "./chunk-ARE7FKDG.js";
+import {
+  actual,
+  isRunResult
+} from "./chunk-4UH3KMTD.js";
+import {
+  Query
+} from "./chunk-2U4PVHP4.js";
 import {
   stderr,
   stdout,
   styleTextStdout
-} from "./chunk-XDSZO74H.js";
+} from "./chunk-WHWPAYZY.js";
 import {
   require_emoji_regex
 } from "./chunk-VTEFO2FT.js";
-import {
-  Query,
-  actual,
-  isRunResult
-} from "./chunk-NWHKSRO3.js";
 import {
   Monorepo
-} from "./chunk-CB65DPZ2.js";
+} from "./chunk-C6ZVVEFV.js";
 import {
   isErrorWithCause
-} from "./chunk-IBGFQR23.js";
+} from "./chunk-6LZM3I4Q.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
@@ -1046,11 +1051,13 @@ var ExecCommand = class {
         this.projectRoot
       );
       let graph;
+      let monorepo;
       if (mainManifest) {
+        monorepo = Monorepo.load(this.projectRoot);
         graph = actual.load({
           ...conf.options,
           mainManifest,
-          monorepo: Monorepo.load(this.projectRoot),
+          monorepo,
           loadManifests: false
         });
       }
@@ -1068,7 +1075,7 @@ var ExecCommand = class {
       const { nodes } = await query.search(queryString, {
         signal: new AbortController().signal
       });
-      this.#nodes = [];
+      const locations = [];
       for (const node of nodes) {
         const { location } = node.toJSON();
         assert(
@@ -1077,8 +1084,9 @@ var ExecCommand = class {
             found: node
           })
         );
-        this.#nodes.push(location);
+        locations.push(location);
       }
+      this.#nodes = sortScopeLocations(locations, monorepo);
     } else if (paths?.length || groups?.length || recursive) {
       this.#defaultIgnoreMissing = true;
       this.#monorepo = Monorepo.load(this.projectRoot, {
@@ -1110,16 +1118,15 @@ var ExecCommand = class {
       return this.noArgsMulti();
     }
     let failed = false;
-    const runInDir = async (cwd, label) => {
-      const result = await this.bg(this.bgArg(cwd)).catch(
-        (er) => {
-          if (isErrorWithCause(er) && isRunResult(er.cause)) {
-            this.printResult(label, er.cause);
-          }
-          failed = true;
-          throw er;
+    const runInDir = async (cwd, label, signal) => {
+      const arg = { ...this.bgArg(cwd), signal };
+      const result = await this.bg(arg).catch((er) => {
+        if (isErrorWithCause(er) && isRunResult(er.cause)) {
+          this.printResult(label, er.cause);
         }
-      );
+        failed = true;
+        throw er;
+      });
       if (!result.command) return null;
       if (!failed) this.printResult(label, result);
       return result;
@@ -1132,7 +1139,7 @@ var ExecCommand = class {
       }
     } else if (this.#monorepo) {
       const wsResultMap = await this.#monorepo.run(
-        (ws) => runInDir(ws.fullpath, ws.path)
+        (ws, signal) => runInDir(ws.fullpath, ws.path, signal)
       );
       for (const [ws, result] of wsResultMap) {
         if (result) resultMap.set(ws.path, result);

package/{chunk-OWMR2EDW.js → chunk-7UWRR6EE.js}

@@ -11,10 +11,10 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   stderr
-} from "./chunk-XDSZO74H.js";
+} from "./chunk-WHWPAYZY.js";
 import {
   urlOpen
-} from "./chunk-APMYKJI2.js";
+} from "./chunk-QNHBAGXQ.js";
 
 // ../../src/cli-sdk/src/open-url.ts
 var openUrl = async (url) => {

package/{chunk-WHLYMMI2.js → chunk-ARE7FKDG.js}

@@ -11,12 +11,14 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   actual,
-  callLimit,
   createVirtualRoot
-} from "./chunk-NWHKSRO3.js";
+} from "./chunk-4UH3KMTD.js";
+import {
+  callLimit
+} from "./chunk-2U4PVHP4.js";
 import {
   SecurityArchive
-} from "./chunk-XCDLOQZZ.js";
+} from "./chunk-SMXXFQPI.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
@@ -140,7 +142,7 @@ var reloadConfig = async (folder) => {
     unload("project");
   } catch {
   }
-  const { Config } = await import("./config-MVNXGEOQ.js");
+  const { Config } = await import("./config-TMB2X6DW.js");
   return Config.load(folder, process.argv, true);
 };