@simon_he/pi 0.1.18 → 0.1.19

package/dist/index.cjs

@@ -46,7 +46,7 @@ var import_node_process = __toESM(require("process"), 1);
 var import_node = require("lazy-js-utils/node");
 
 // package.json
-var version = "0.1.18";
+var version = "0.1.19";
 
 // src/help.ts
 var isZh = import_node_process.default.env.PI_Lang === "zh";
@@ -218,6 +218,8 @@ async function getParams(params) {
             return params.replace(W, "");
           if (w.test(params))
             return params.replace(w, "");
+          if (d.test(params))
+            return params.replace(d, " -D");
         }
         if ((await (0, import_node5.getPkg)())?.workspaces) {
           if (D.test(params))
@@ -231,10 +233,10 @@ async function getParams(params) {
         if (Dw.test(params))
           return params.replace(Dw, " -DW");
         if (W.test(params))
-          return params.replace(w, " -W");
+          return params.replace(W, " -W");
         return params;
       default:
-        return params;
+        return d.test(params) ? params.replace(d, " -D") : params;
     }
   } catch {
     console.log(
@@ -434,16 +436,45 @@ async function pil(params) {
     const v = dependencies[i] || devDependencies[i];
     return `${i}$${v}`;
   }).join(" ");
-  const group = {};
-  const items = command.replace(/\s+/, " ").trim().split(" ").map((i, idx) => [i, suffix[idx] || "-s"]);
-  for (const [pkg, flag] of items) {
-    if (!group[flag])
-      group[flag] = [];
-    group[flag].push(pkg);
+  const tokens = command.replace(/\s+/, " ").trim().split(" ").filter(Boolean);
+  const pkgs = tokens.filter((t) => !t.startsWith("-"));
+  let globalWorkspaceFlag = null;
+  const perFlags = [];
+  let assignIdx = 0;
+  for (const f of suffix) {
+    if (/^-(?:w|W)$/.test(f)) {
+      globalWorkspaceFlag = f;
+      continue;
+    }
+    perFlags[assignIdx++] = f;
   }
-  const cmds = Object.entries(group).map(
-    ([flag, pkgs]) => `${pkgs.join(" ")} ${flag}`
-  );
+  const normalizeFlag = (f) => {
+    if (!f)
+      return "";
+    if (/^-s$/i.test(f) || /^-S$/.test(f))
+      return "";
+    return f;
+  };
+  const combineWorkspace = (f, w2) => {
+    if (!w2)
+      return f;
+    if (/w/i.test(f))
+      return f;
+    if (!f)
+      return w2;
+    if (/d/i.test(f))
+      return `-D${w2.slice(1)}`;
+    return w2;
+  };
+  const finalFlags = pkgs.map((_, i) => combineWorkspace(normalizeFlag(perFlags[i]), globalWorkspaceFlag));
+  const group = {};
+  pkgs.forEach((p, i) => {
+    const key = finalFlags[i] || "";
+    if (!group[key])
+      group[key] = [];
+    group[key].push(p);
+  });
+  const cmds = Object.entries(group).map(([flag, list]) => `${list.join(" ")}${flag ? ` ${flag}` : ""}`);
   return await pi(cmds, latestPkgname.replace(/@latest/g, ""), "pil");
 }
 

package/dist/index.js

@@ -25,7 +25,7 @@ import process from "process";
 import { jsShell } from "lazy-js-utils/node";
 
 // package.json
-var version = "0.1.18";
+var version = "0.1.19";
 
 // src/help.ts
 var isZh = process.env.PI_Lang === "zh";
@@ -197,6 +197,8 @@ async function getParams(params) {
             return params.replace(W, "");
           if (w.test(params))
             return params.replace(w, "");
+          if (d.test(params))
+            return params.replace(d, " -D");
         }
         if ((await getPkg2())?.workspaces) {
           if (D.test(params))
@@ -210,10 +212,10 @@ async function getParams(params) {
         if (Dw.test(params))
           return params.replace(Dw, " -DW");
         if (W.test(params))
-          return params.replace(w, " -W");
+          return params.replace(W, " -W");
         return params;
       default:
-        return params;
+        return d.test(params) ? params.replace(d, " -D") : params;
     }
   } catch {
     console.log(
@@ -413,16 +415,45 @@ async function pil(params) {
     const v = dependencies[i] || devDependencies[i];
     return `${i}$${v}`;
   }).join(" ");
-  const group = {};
-  const items = command.replace(/\s+/, " ").trim().split(" ").map((i, idx) => [i, suffix[idx] || "-s"]);
-  for (const [pkg, flag] of items) {
-    if (!group[flag])
-      group[flag] = [];
-    group[flag].push(pkg);
+  const tokens = command.replace(/\s+/, " ").trim().split(" ").filter(Boolean);
+  const pkgs = tokens.filter((t) => !t.startsWith("-"));
+  let globalWorkspaceFlag = null;
+  const perFlags = [];
+  let assignIdx = 0;
+  for (const f of suffix) {
+    if (/^-(?:w|W)$/.test(f)) {
+      globalWorkspaceFlag = f;
+      continue;
+    }
+    perFlags[assignIdx++] = f;
   }
-  const cmds = Object.entries(group).map(
-    ([flag, pkgs]) => `${pkgs.join(" ")} ${flag}`
-  );
+  const normalizeFlag = (f) => {
+    if (!f)
+      return "";
+    if (/^-s$/i.test(f) || /^-S$/.test(f))
+      return "";
+    return f;
+  };
+  const combineWorkspace = (f, w2) => {
+    if (!w2)
+      return f;
+    if (/w/i.test(f))
+      return f;
+    if (!f)
+      return w2;
+    if (/d/i.test(f))
+      return `-D${w2.slice(1)}`;
+    return w2;
+  };
+  const finalFlags = pkgs.map((_, i) => combineWorkspace(normalizeFlag(perFlags[i]), globalWorkspaceFlag));
+  const group = {};
+  pkgs.forEach((p, i) => {
+    const key = finalFlags[i] || "";
+    if (!group[key])
+      group[key] = [];
+    group[key].push(p);
+  });
+  const cmds = Object.entries(group).map(([flag, list]) => `${list.join(" ")}${flag ? ` ${flag}` : ""}`);
   return await pi(cmds, latestPkgname.replace(/@latest/g, ""), "pil");
 }
 

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@simon_he/pi",
   "type": "module",
-  "version": "0.1.18",
-  "packageManager": "pnpm@10.15.1",
+  "version": "0.1.19",
+  "packageManager": "pnpm@10.18.1",
   "description": "An intelligent cross-platform package manager and CLI tool that autodetects project environments (Node.mjs, Go, Rust, Python) with beautiful loading animations and smart command execution.",
   "author": {
     "name": "Simon He",