@pnpm/exe 11.0.0-beta.5 → 11.0.0-beta.6

package/dist/pnpm.mjs

@@ -1000,7 +1000,7 @@ var init_lib2 = __esm({
     "use strict";
     defaultManifest = {
       name: true ? "pnpm" : "pnpm",
-      version: true ? "11.0.0-beta.5" : "0.0.0"
+      version: true ? "11.0.0-beta.6" : "0.0.0"
     };
     pkgJson = defaultManifest;
     packageManager = {
@@ -130132,11 +130132,10 @@ function createAutoImporter() {
   function initialAuto(to, opts2) {
     if (process.platform !== "win32") {
       try {
-        const _clonePkg = createClonePkg();
-        if (!_clonePkg(to, opts2))
+        if (!tryClonePkg(to, opts2))
           return void 0;
         packageImportMethodLogger.debug({ method: "clone" });
-        auto = _clonePkg;
+        auto = createClonePkg();
         return "clone";
       } catch {
       }
@@ -130167,11 +130166,10 @@ function createCloneOrCopyImporter() {
   return (to, opts2) => auto(to, opts2);
   function initialAuto(to, opts2) {
     try {
-      const _clonePkg = createClonePkg();
-      if (!_clonePkg(to, opts2))
+      if (!tryClonePkg(to, opts2))
         return void 0;
       packageImportMethodLogger.debug({ method: "clone" });
-      auto = _clonePkg;
+      auto = createClonePkg();
       return "clone";
     } catch {
     }
@@ -130180,6 +130178,14 @@ function createCloneOrCopyImporter() {
     return auto(to, opts2);
   }
 }
+function tryClonePkg(to, opts2) {
+  if (opts2.resolvedFrom !== "store" || opts2.force || !pkgExistsAtTargetDir(to, opts2.filesMap)) {
+    const clone3 = createCloneFunction();
+    importIndexedDir({ importFile: clone3, importFileAtomic: clone3 }, to, opts2.filesMap, opts2);
+    return "clone";
+  }
+  return void 0;
+}
 function createClonePkg() {
   const clone3 = createCloneFunction();
   const withFallback = (fallback) => (src2, dest) => {
@@ -130218,9 +130224,11 @@ function pickFileFromFilesMap(filesMap) {
   return filesMap.keys().next().value;
 }
 function createCloneFunction() {
+  if (_cloneFunction)
+    return _cloneFunction;
   if (process.platform === "darwin" || process.platform === "win32") {
     const { reflinkFileSync } = __require("@reflink/reflink");
-    return (fr, to) => {
+    _cloneFunction = (fr, to) => {
       try {
         reflinkFileSync(fr, to);
       } catch (err) {
@@ -130228,15 +130236,17 @@ function createCloneFunction() {
           throw err;
       }
     };
+  } else {
+    _cloneFunction = (src2, dest) => {
+      try {
+        lib_default.copyFileSync(src2, dest, constants4.COPYFILE_FICLONE_FORCE);
+      } catch (err) {
+        if (!(util24.types.isNativeError(err) && "code" in err && err.code === "EEXIST"))
+          throw err;
+      }
+    };
   }
-  return (src2, dest) => {
-    try {
-      lib_default.copyFileSync(src2, dest, constants4.COPYFILE_FICLONE_FORCE);
-    } catch (err) {
-      if (!(util24.types.isNativeError(err) && "code" in err && err.code === "EEXIST"))
-        throw err;
-    }
-  };
+  return _cloneFunction;
 }
 function hardlinkPkg(importFile, to, opts2) {
   if (opts2.force || shouldRelinkPkg(to, opts2)) {
@@ -130313,6 +130323,7 @@ function atomicCopyFileSync(src2, dest) {
   }
   renameOverwriteSync(tmp, dest);
 }
+var _cloneFunction;
 var init_lib81 = __esm({
   "../fs/indexed-pkg-importer/lib/index.js"() {
     "use strict";
@@ -208122,7 +208133,7 @@ async function handler34(opts2, [command, ...args]) {
     });
     return resolved.id;
   }));
-  const { cacheLink, cacheExists, cachedDir } = findCache({
+  let { cacheLink, cacheExists, cachedDir } = findCache({
     packages: resolvedPkgs,
     dlxCacheMaxAge: opts2.dlxCacheMaxAge,
     cacheDir: opts2.cacheDir,
@@ -208131,29 +208142,37 @@ async function handler34(opts2, [command, ...args]) {
     supportedArchitectures: opts2.supportedArchitectures
   });
   if (!cacheExists) {
-    fs90.mkdirSync(cachedDir, { recursive: true });
-    await add_exports.handler({
-      ...opts2,
-      enableGlobalVirtualStore: opts2.enableGlobalVirtualStore ?? true,
-      bin: path165.join(cachedDir, "node_modules/.bin"),
-      dir: cachedDir,
-      lockfileDir: cachedDir,
-      allowBuilds: Object.fromEntries([...resolvedPkgAliases, ...opts2.allowBuild ?? []].map((pkg) => [pkg, true])),
-      rootProjectManifestDir: cachedDir,
-      saveProd: true,
-      // dlx will be looking for the package in the "dependencies" field!
-      saveDev: false,
-      saveOptional: false,
-      savePeer: false,
-      symlink: true,
-      workspaceDir: void 0
-    }, resolvedPkgs);
     try {
-      await symlinkDir(cachedDir, cacheLink, { overwrite: true });
-    } catch (error) {
-      if (!util42.types.isNativeError(error) || !("code" in error) || error.code !== "EBUSY" && error.code !== "EEXIST" && error.code !== "EPERM") {
-        throw error;
+      fs90.mkdirSync(cachedDir, { recursive: true });
+      await add_exports.handler({
+        ...opts2,
+        enableGlobalVirtualStore: opts2.enableGlobalVirtualStore ?? true,
+        bin: path165.join(cachedDir, "node_modules/.bin"),
+        dir: cachedDir,
+        lockfileDir: cachedDir,
+        allowBuilds: Object.fromEntries([...resolvedPkgAliases, ...opts2.allowBuild ?? []].map((pkg) => [pkg, true])),
+        rootProjectManifestDir: cachedDir,
+        saveProd: true,
+        // dlx will be looking for the package in the "dependencies" field!
+        saveDev: false,
+        saveOptional: false,
+        savePeer: false,
+        symlink: true,
+        workspaceDir: void 0
+      }, resolvedPkgs);
+      try {
+        await symlinkDir(cachedDir, cacheLink, { overwrite: true });
+      } catch (error) {
+        if (!util42.types.isNativeError(error) || !("code" in error) || error.code !== "EBUSY" && error.code !== "EEXIST" && error.code !== "EPERM") {
+          throw error;
+        }
+      }
+    } catch (err) {
+      const completedDir = getValidCacheDir(cacheLink, opts2.dlxCacheMaxAge);
+      if (completedDir == null) {
+        throw err;
       }
+      cachedDir = completedDir;
     }
   }
   const binsDir = path165.join(cachedDir, "node_modules/.bin");
@@ -248696,7 +248715,11 @@ var init_shorthands = __esm({
 
 // lib/parseCliArgs.js
 async function parseCliArgs2(inputArgv) {
-  return parseCliArgs({
+  const builtInCommandForced = inputArgv[0] === "pm";
+  if (builtInCommandForced) {
+    inputArgv.splice(0, 1);
+  }
+  const result2 = await parseCliArgs({
     fallbackCommand: "run",
     escapeArgs: ["create", "exec", "test"],
     getCommandLongName: getCommandFullName,
@@ -248706,6 +248729,7 @@ async function parseCliArgs2(inputArgv) {
     universalOptionsTypes: GLOBAL_OPTIONS,
     universalShorthands: shorthands18
   }, inputArgv);
+  return { ...result2, builtInCommandForced };
 }
 var RENAMED_OPTIONS;
 var init_parseCliArgs = __esm({
@@ -267054,28 +267078,16 @@ async function main4(inputArgv) {
     process.exitCode = 1;
     return;
   }
-  let { argv: argv2, params: cliParams, options: cliOptions, cmd, fallbackCommandUsed, unknownOptions, workspaceDir } = parsedCliArgs;
+  let { argv: argv2, params: cliParams, options: cliOptions, cmd, fallbackCommandUsed, builtInCommandForced, unknownOptions, workspaceDir } = parsedCliArgs;
   if (cmd !== null && !pnpmCmds[cmd]) {
     printError(`Unknown command '${cmd}'`, "For help, run: pnpm help");
     process.exitCode = 1;
     return;
   }
   if (unknownOptions.size > 0 && !fallbackCommandUsed && !(cmd && NOT_IMPLEMENTED_COMMAND_SET.has(cmd))) {
-    const unknownOptionsArray = Array.from(unknownOptions.keys());
-    if (unknownOptionsArray.every((option) => DEPRECATED_OPTIONS.has(option))) {
-      let deprecationMsg = `${source_default.bgYellow.black("\u2009WARN\u2009")}`;
-      if (unknownOptionsArray.length === 1) {
-        const deprecatedOption = unknownOptionsArray[0];
-        deprecationMsg += ` ${source_default.yellow(`Deprecated option: '${deprecatedOption}'`)}`;
-      } else {
-        deprecationMsg += ` ${source_default.yellow(`Deprecated options: ${unknownOptionsArray.map((unknownOption) => `'${unknownOption}'`).join(", ")}`)}`;
-      }
-      console.log(deprecationMsg);
-    } else {
-      printError(formatUnknownOptionsError(unknownOptions), `For help, run: pnpm help${cmd ? ` ${cmd}` : ""}`);
-      process.exitCode = 1;
-      return;
-    }
+    printError(formatUnknownOptionsError(unknownOptions), `For help, run: pnpm help${cmd ? ` ${cmd}` : ""}`);
+    process.exitCode = 1;
+    return;
   }
   let config;
   try {
@@ -267154,7 +267166,7 @@ async function main4(inputArgv) {
     global[REPORTER_INITIALIZED] = reporterType;
   }
   const typedCommandName = argv2.remain[0];
-  if (cmd != null && overridableByScriptCommands.has(typedCommandName) && !cliOptions.global) {
+  if (cmd != null && !builtInCommandForced && overridableByScriptCommands.has(typedCommandName) && !cliOptions.global) {
     const currentDirManifest = config.dir === config.rootProjectManifestDir ? config.rootProjectManifest : await safeReadProjectManifestOnly(config.dir);
     if (currentDirManifest?.scripts?.[typedCommandName]) {
       cmd = "run";
@@ -267324,7 +267336,7 @@ function checkPackageManager(pm2) {
     }
   }
 }
-var import_loud_rejection, import_semver47, REPORTER_INITIALIZED, DEPRECATED_OPTIONS;
+var import_loud_rejection, import_semver47, REPORTER_INITIALIZED;
 var init_main2 = __esm({
   "lib/main.js"() {
     "use strict";
@@ -267357,11 +267369,6 @@ var init_main2 = __esm({
       }
       throw err;
     });
-    DEPRECATED_OPTIONS = /* @__PURE__ */ new Set([
-      "independent-leaves",
-      "lock",
-      "resolution-strategy"
-    ]);
   }
 });
 

package/dist/worker.js

@@ -7096,11 +7096,10 @@ function createAutoImporter() {
   function initialAuto(to, opts2) {
     if (process.platform !== "win32") {
       try {
-        const _clonePkg = createClonePkg();
-        if (!_clonePkg(to, opts2))
+        if (!tryClonePkg(to, opts2))
           return void 0;
         packageImportMethodLogger.debug({ method: "clone" });
-        auto = _clonePkg;
+        auto = createClonePkg();
         return "clone";
       } catch {
       }
@@ -7131,11 +7130,10 @@ function createCloneOrCopyImporter() {
   return (to, opts2) => auto(to, opts2);
   function initialAuto(to, opts2) {
     try {
-      const _clonePkg = createClonePkg();
-      if (!_clonePkg(to, opts2))
+      if (!tryClonePkg(to, opts2))
         return void 0;
       packageImportMethodLogger.debug({ method: "clone" });
-      auto = _clonePkg;
+      auto = createClonePkg();
       return "clone";
     } catch {
     }
@@ -7144,6 +7142,14 @@ function createCloneOrCopyImporter() {
     return auto(to, opts2);
   }
 }
+function tryClonePkg(to, opts2) {
+  if (opts2.resolvedFrom !== "store" || opts2.force || !pkgExistsAtTargetDir(to, opts2.filesMap)) {
+    const clone = createCloneFunction();
+    importIndexedDir({ importFile: clone, importFileAtomic: clone }, to, opts2.filesMap, opts2);
+    return "clone";
+  }
+  return void 0;
+}
 function createClonePkg() {
   const clone = createCloneFunction();
   const withFallback = (fallback) => (src2, dest) => {
@@ -7181,10 +7187,13 @@ function pickFileFromFilesMap(filesMap) {
   }
   return filesMap.keys().next().value;
 }
+var _cloneFunction;
 function createCloneFunction() {
+  if (_cloneFunction)
+    return _cloneFunction;
   if (process.platform === "darwin" || process.platform === "win32") {
     const { reflinkFileSync } = __require("@reflink/reflink");
-    return (fr, to) => {
+    _cloneFunction = (fr, to) => {
       try {
         reflinkFileSync(fr, to);
       } catch (err) {
@@ -7192,15 +7201,17 @@ function createCloneFunction() {
           throw err;
       }
     };
+  } else {
+    _cloneFunction = (src2, dest) => {
+      try {
+        lib_default.copyFileSync(src2, dest, constants.COPYFILE_FICLONE_FORCE);
+      } catch (err) {
+        if (!(util7.types.isNativeError(err) && "code" in err && err.code === "EEXIST"))
+          throw err;
+      }
+    };
   }
-  return (src2, dest) => {
-    try {
-      lib_default.copyFileSync(src2, dest, constants.COPYFILE_FICLONE_FORCE);
-    } catch (err) {
-      if (!(util7.types.isNativeError(err) && "code" in err && err.code === "EEXIST"))
-        throw err;
-    }
-  };
+  return _cloneFunction;
 }
 function hardlinkPkg(importFile, to, opts2) {
   if (opts2.force || shouldRelinkPkg(to, opts2)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/exe",
-  "version": "11.0.0-beta.5",
+  "version": "11.0.0-beta.6",
   "description": "Fast, disk space efficient package manager",
   "keywords": [
     "pnpm",
@@ -30,18 +30,18 @@
     "@reflink/reflink": "0.1.19"
   },
   "optionalDependencies": {
-    "@pnpm/linux-x64": "11.0.0-beta.5",
-    "@pnpm/macos-arm64": "11.0.0-beta.5",
-    "@pnpm/macos-x64": "11.0.0-beta.5",
-    "@pnpm/linux-arm64": "11.0.0-beta.5",
-    "@pnpm/win-arm64": "11.0.0-beta.5",
-    "@pnpm/win-x64": "11.0.0-beta.5"
+    "@pnpm/linux-arm64": "11.0.0-beta.6",
+    "@pnpm/macos-arm64": "11.0.0-beta.6",
+    "@pnpm/linux-x64": "11.0.0-beta.6",
+    "@pnpm/win-arm64": "11.0.0-beta.6",
+    "@pnpm/win-x64": "11.0.0-beta.6",
+    "@pnpm/macos-x64": "11.0.0-beta.6"
   },
   "devDependencies": {
     "@jest/globals": "30.3.0",
     "execa": "npm:safe-execa@0.3.0",
     "tar": "^7.5.10",
-    "@pnpm/exe": "11.0.0-beta.5",
+    "@pnpm/exe": "11.0.0-beta.6",
     "@pnpm/jest-config": "1000.0.5"
   },
   "jest": {