@simon_he/pi 0.0.88 → 0.0.90

package/dist/index.cjs

@@ -61,50 +61,58 @@ var __privateWrapper = (obj, member, setter, getter) => ({
   }
 });
 
-// node_modules/.pnpm/picocolors@1.0.0/node_modules/picocolors/picocolors.js
+// node_modules/.pnpm/picocolors@1.0.1/node_modules/picocolors/picocolors.js
 var require_picocolors = __commonJS({
-  "node_modules/.pnpm/picocolors@1.0.0/node_modules/picocolors/picocolors.js"(exports, module2) {
-    var tty2 = require("tty");
-    var isColorSupported = !("NO_COLOR" in process.env || process.argv.includes("--no-color")) && ("FORCE_COLOR" in process.env || process.argv.includes("--color") || process.platform === "win32" || tty2.isatty(1) && process.env.TERM !== "dumb" || "CI" in process.env);
+  "node_modules/.pnpm/picocolors@1.0.1/node_modules/picocolors/picocolors.js"(exports, module2) {
+    var argv = process.argv || [];
+    var env2 = process.env;
+    var isColorSupported = !("NO_COLOR" in env2 || argv.includes("--no-color")) && ("FORCE_COLOR" in env2 || argv.includes("--color") || process.platform === "win32" || require != null && require("tty").isatty(1) && env2.TERM !== "dumb" || "CI" in env2);
     var formatter = (open, close, replace = open) => (input) => {
       let string = "" + input;
       let index = string.indexOf(close, open.length);
       return ~index ? open + replaceClose(string, close, replace, index) + close : open + string + close;
     };
     var replaceClose = (string, close, replace, index) => {
-      let start = string.substring(0, index) + replace;
-      let end = string.substring(index + close.length);
-      let nextIndex = end.indexOf(close);
-      return ~nextIndex ? start + replaceClose(end, close, replace, nextIndex) : start + end;
+      let result = "";
+      let cursor = 0;
+      do {
+        result += string.substring(cursor, index) + replace;
+        cursor = index + close.length;
+        index = string.indexOf(close, cursor);
+      } while (~index);
+      return result + string.substring(cursor);
+    };
+    var createColors = (enabled = isColorSupported) => {
+      let init = enabled ? formatter : () => String;
+      return {
+        isColorSupported: enabled,
+        reset: init("\x1B[0m", "\x1B[0m"),
+        bold: init("\x1B[1m", "\x1B[22m", "\x1B[22m\x1B[1m"),
+        dim: init("\x1B[2m", "\x1B[22m", "\x1B[22m\x1B[2m"),
+        italic: init("\x1B[3m", "\x1B[23m"),
+        underline: init("\x1B[4m", "\x1B[24m"),
+        inverse: init("\x1B[7m", "\x1B[27m"),
+        hidden: init("\x1B[8m", "\x1B[28m"),
+        strikethrough: init("\x1B[9m", "\x1B[29m"),
+        black: init("\x1B[30m", "\x1B[39m"),
+        red: init("\x1B[31m", "\x1B[39m"),
+        green: init("\x1B[32m", "\x1B[39m"),
+        yellow: init("\x1B[33m", "\x1B[39m"),
+        blue: init("\x1B[34m", "\x1B[39m"),
+        magenta: init("\x1B[35m", "\x1B[39m"),
+        cyan: init("\x1B[36m", "\x1B[39m"),
+        white: init("\x1B[37m", "\x1B[39m"),
+        gray: init("\x1B[90m", "\x1B[39m"),
+        bgBlack: init("\x1B[40m", "\x1B[49m"),
+        bgRed: init("\x1B[41m", "\x1B[49m"),
+        bgGreen: init("\x1B[42m", "\x1B[49m"),
+        bgYellow: init("\x1B[43m", "\x1B[49m"),
+        bgBlue: init("\x1B[44m", "\x1B[49m"),
+        bgMagenta: init("\x1B[45m", "\x1B[49m"),
+        bgCyan: init("\x1B[46m", "\x1B[49m"),
+        bgWhite: init("\x1B[47m", "\x1B[49m")
+      };
     };
-    var createColors = (enabled = isColorSupported) => ({
-      isColorSupported: enabled,
-      reset: enabled ? (s) => `\x1B[0m${s}\x1B[0m` : String,
-      bold: enabled ? formatter("\x1B[1m", "\x1B[22m", "\x1B[22m\x1B[1m") : String,
-      dim: enabled ? formatter("\x1B[2m", "\x1B[22m", "\x1B[22m\x1B[2m") : String,
-      italic: enabled ? formatter("\x1B[3m", "\x1B[23m") : String,
-      underline: enabled ? formatter("\x1B[4m", "\x1B[24m") : String,
-      inverse: enabled ? formatter("\x1B[7m", "\x1B[27m") : String,
-      hidden: enabled ? formatter("\x1B[8m", "\x1B[28m") : String,
-      strikethrough: enabled ? formatter("\x1B[9m", "\x1B[29m") : String,
-      black: enabled ? formatter("\x1B[30m", "\x1B[39m") : String,
-      red: enabled ? formatter("\x1B[31m", "\x1B[39m") : String,
-      green: enabled ? formatter("\x1B[32m", "\x1B[39m") : String,
-      yellow: enabled ? formatter("\x1B[33m", "\x1B[39m") : String,
-      blue: enabled ? formatter("\x1B[34m", "\x1B[39m") : String,
-      magenta: enabled ? formatter("\x1B[35m", "\x1B[39m") : String,
-      cyan: enabled ? formatter("\x1B[36m", "\x1B[39m") : String,
-      white: enabled ? formatter("\x1B[37m", "\x1B[39m") : String,
-      gray: enabled ? formatter("\x1B[90m", "\x1B[39m") : String,
-      bgBlack: enabled ? formatter("\x1B[40m", "\x1B[49m") : String,
-      bgRed: enabled ? formatter("\x1B[41m", "\x1B[49m") : String,
-      bgGreen: enabled ? formatter("\x1B[42m", "\x1B[49m") : String,
-      bgYellow: enabled ? formatter("\x1B[43m", "\x1B[49m") : String,
-      bgBlue: enabled ? formatter("\x1B[44m", "\x1B[49m") : String,
-      bgMagenta: enabled ? formatter("\x1B[45m", "\x1B[49m") : String,
-      bgCyan: enabled ? formatter("\x1B[46m", "\x1B[49m") : String,
-      bgWhite: enabled ? formatter("\x1B[47m", "\x1B[49m") : String
-    });
     module2.exports = createColors();
     module2.exports.createColors = createColors;
   }
@@ -6751,7 +6759,7 @@ function getLatestVersion(pkg, isZh6 = true) {
 var import_lazy_js_utils2 = require("lazy-js-utils");
 
 // package.json
-var version = "0.0.88";
+var version = "0.0.90";
 
 // src/help.ts
 var isZh2 = process.env.PI_Lang === "zh";
@@ -6807,6 +6815,7 @@ async function installDeps() {
 
 // src/pi.ts
 var import_process2 = __toESM(require("process"), 1);
+var import_console = require("console");
 var import_lazy_js_utils5 = require("lazy-js-utils");
 var import_picocolors4 = __toESM(require_picocolors(), 1);
 
@@ -6887,10 +6896,27 @@ async function pi(params, pkg, executor = "ni") {
     loading_status = await loading(text);
   }
   const runSockets = executor.split(" ")[0] === "npm" ? ` --max-sockets=${maxSockets}` : "";
-  const { status, result } = await (0, import_lazy_js_utils5.useNodeWorker)({
+  let { status, result } = await (0, import_lazy_js_utils5.useNodeWorker)({
     params: `${executor}${newParams ? ` ${newParams}` : runSockets}`,
-    stdio
+    stdio,
+    errorExit: false
   });
+  if (result.includes("pnpm versions with respective Node.js version support")) {
+    (0, import_console.log)(result);
+    (0, import_console.log)(
+      import_picocolors4.default.yellow(
+        isZh3 ? "\u6B63\u5728\u5C1D\u8BD5\u4F7F\u7528 npm \u518D\u6B21\u6267\u884C..." : "Trying to use npm to run again..."
+      )
+    );
+    const { status: newStatus, result: newResult } = (0, import_lazy_js_utils5.jsShell)(
+      `npm install${newParams ? ` ${newParams}` : runSockets}`,
+      {
+        stdio
+      }
+    );
+    status = newStatus;
+    result = newResult;
+  }
   if (stdio === "inherit")
     loading_status = await loading("");
   const end = Date.now();
@@ -6953,6 +6979,7 @@ async function pil(params) {
       )} | sed "s/,/\\n/g" | gum filter --no-limit --placeholder=" \u{1F914}${process.env.PI_Lang === "zh" ? "\u8BF7\u9009\u62E9\u4E00\u4E2A\u9700\u8981\u83B7\u53D6\u6700\u65B0\u7248\u672C\u7684\u4F9D\u8D56" : "Please select a dependency that needs to obtain the latest version."}"`,
       "pipe"
     );
+    console.log({ choose, status });
     if (status === 130) {
       console.log(import_picocolors5.default.dim("\u5DF2\u53D6\u6D88"));
       process.exit(0);
@@ -6970,6 +6997,7 @@ async function pil(params) {
   let latestPkgname = params;
   const reg = /\s(-[dDwW]+)/g;
   const suffix = [];
+  console.log({ params });
   let command = latestPkgname = (await getParams(params)).replace(
     reg,
     (_, k) => {
@@ -6977,12 +7005,12 @@ async function pil(params) {
       return "";
     }
   );
-  latestPkgname = latestPkgname.replaceAll("@latest", "").split(" ").map((i) => {
+  latestPkgname = latestPkgname.replace(/@latest/g, "").split(" ").filter(Boolean).map((i) => {
     const v = dependencies[i] || devDependencies[i];
     return `${i}$${v}`;
   }).join(" ");
   command = command.replace(/\s+/, " ").split(" ").map((i, index) => `${i} ${suffix[index] || "-s"}`).join(" ");
-  return await pi(command, latestPkgname.replaceAll("@latest", ""), "pil");
+  return await pi(command, latestPkgname.replace(/@latest/g, ""), "pil");
 }
 
 // src/pinit.ts

package/dist/index.js

@@ -62,50 +62,58 @@ var __privateWrapper = (obj, member, setter, getter) => ({
   }
 });
 
-// node_modules/.pnpm/picocolors@1.0.0/node_modules/picocolors/picocolors.js
+// node_modules/.pnpm/picocolors@1.0.1/node_modules/picocolors/picocolors.js
 var require_picocolors = __commonJS({
-  "node_modules/.pnpm/picocolors@1.0.0/node_modules/picocolors/picocolors.js"(exports, module) {
-    var tty2 = __require("tty");
-    var isColorSupported = !("NO_COLOR" in process.env || process.argv.includes("--no-color")) && ("FORCE_COLOR" in process.env || process.argv.includes("--color") || process.platform === "win32" || tty2.isatty(1) && process.env.TERM !== "dumb" || "CI" in process.env);
+  "node_modules/.pnpm/picocolors@1.0.1/node_modules/picocolors/picocolors.js"(exports, module) {
+    var argv = process.argv || [];
+    var env2 = process.env;
+    var isColorSupported = !("NO_COLOR" in env2 || argv.includes("--no-color")) && ("FORCE_COLOR" in env2 || argv.includes("--color") || process.platform === "win32" || __require != null && __require("tty").isatty(1) && env2.TERM !== "dumb" || "CI" in env2);
     var formatter = (open, close, replace = open) => (input) => {
       let string = "" + input;
       let index = string.indexOf(close, open.length);
       return ~index ? open + replaceClose(string, close, replace, index) + close : open + string + close;
     };
     var replaceClose = (string, close, replace, index) => {
-      let start = string.substring(0, index) + replace;
-      let end = string.substring(index + close.length);
-      let nextIndex = end.indexOf(close);
-      return ~nextIndex ? start + replaceClose(end, close, replace, nextIndex) : start + end;
+      let result = "";
+      let cursor = 0;
+      do {
+        result += string.substring(cursor, index) + replace;
+        cursor = index + close.length;
+        index = string.indexOf(close, cursor);
+      } while (~index);
+      return result + string.substring(cursor);
+    };
+    var createColors = (enabled = isColorSupported) => {
+      let init = enabled ? formatter : () => String;
+      return {
+        isColorSupported: enabled,
+        reset: init("\x1B[0m", "\x1B[0m"),
+        bold: init("\x1B[1m", "\x1B[22m", "\x1B[22m\x1B[1m"),
+        dim: init("\x1B[2m", "\x1B[22m", "\x1B[22m\x1B[2m"),
+        italic: init("\x1B[3m", "\x1B[23m"),
+        underline: init("\x1B[4m", "\x1B[24m"),
+        inverse: init("\x1B[7m", "\x1B[27m"),
+        hidden: init("\x1B[8m", "\x1B[28m"),
+        strikethrough: init("\x1B[9m", "\x1B[29m"),
+        black: init("\x1B[30m", "\x1B[39m"),
+        red: init("\x1B[31m", "\x1B[39m"),
+        green: init("\x1B[32m", "\x1B[39m"),
+        yellow: init("\x1B[33m", "\x1B[39m"),
+        blue: init("\x1B[34m", "\x1B[39m"),
+        magenta: init("\x1B[35m", "\x1B[39m"),
+        cyan: init("\x1B[36m", "\x1B[39m"),
+        white: init("\x1B[37m", "\x1B[39m"),
+        gray: init("\x1B[90m", "\x1B[39m"),
+        bgBlack: init("\x1B[40m", "\x1B[49m"),
+        bgRed: init("\x1B[41m", "\x1B[49m"),
+        bgGreen: init("\x1B[42m", "\x1B[49m"),
+        bgYellow: init("\x1B[43m", "\x1B[49m"),
+        bgBlue: init("\x1B[44m", "\x1B[49m"),
+        bgMagenta: init("\x1B[45m", "\x1B[49m"),
+        bgCyan: init("\x1B[46m", "\x1B[49m"),
+        bgWhite: init("\x1B[47m", "\x1B[49m")
+      };
     };
-    var createColors = (enabled = isColorSupported) => ({
-      isColorSupported: enabled,
-      reset: enabled ? (s) => `\x1B[0m${s}\x1B[0m` : String,
-      bold: enabled ? formatter("\x1B[1m", "\x1B[22m", "\x1B[22m\x1B[1m") : String,
-      dim: enabled ? formatter("\x1B[2m", "\x1B[22m", "\x1B[22m\x1B[2m") : String,
-      italic: enabled ? formatter("\x1B[3m", "\x1B[23m") : String,
-      underline: enabled ? formatter("\x1B[4m", "\x1B[24m") : String,
-      inverse: enabled ? formatter("\x1B[7m", "\x1B[27m") : String,
-      hidden: enabled ? formatter("\x1B[8m", "\x1B[28m") : String,
-      strikethrough: enabled ? formatter("\x1B[9m", "\x1B[29m") : String,
-      black: enabled ? formatter("\x1B[30m", "\x1B[39m") : String,
-      red: enabled ? formatter("\x1B[31m", "\x1B[39m") : String,
-      green: enabled ? formatter("\x1B[32m", "\x1B[39m") : String,
-      yellow: enabled ? formatter("\x1B[33m", "\x1B[39m") : String,
-      blue: enabled ? formatter("\x1B[34m", "\x1B[39m") : String,
-      magenta: enabled ? formatter("\x1B[35m", "\x1B[39m") : String,
-      cyan: enabled ? formatter("\x1B[36m", "\x1B[39m") : String,
-      white: enabled ? formatter("\x1B[37m", "\x1B[39m") : String,
-      gray: enabled ? formatter("\x1B[90m", "\x1B[39m") : String,
-      bgBlack: enabled ? formatter("\x1B[40m", "\x1B[49m") : String,
-      bgRed: enabled ? formatter("\x1B[41m", "\x1B[49m") : String,
-      bgGreen: enabled ? formatter("\x1B[42m", "\x1B[49m") : String,
-      bgYellow: enabled ? formatter("\x1B[43m", "\x1B[49m") : String,
-      bgBlue: enabled ? formatter("\x1B[44m", "\x1B[49m") : String,
-      bgMagenta: enabled ? formatter("\x1B[45m", "\x1B[49m") : String,
-      bgCyan: enabled ? formatter("\x1B[46m", "\x1B[49m") : String,
-      bgWhite: enabled ? formatter("\x1B[47m", "\x1B[49m") : String
-    });
     module.exports = createColors();
     module.exports.createColors = createColors;
   }
@@ -6755,7 +6763,7 @@ function getLatestVersion(pkg, isZh6 = true) {
 import { jsShell as jsShell2 } from "lazy-js-utils";
 
 // package.json
-var version = "0.0.88";
+var version = "0.0.90";
 
 // src/help.ts
 var isZh2 = process.env.PI_Lang === "zh";
@@ -6812,6 +6820,7 @@ async function installDeps() {
 // src/pi.ts
 var import_picocolors4 = __toESM(require_picocolors(), 1);
 import process9 from "process";
+import { log } from "console";
 import { getPkgTool as getPkgTool2, jsShell as jsShell5, useNodeWorker } from "lazy-js-utils";
 
 // src/detectNode.ts
@@ -6891,10 +6900,27 @@ async function pi(params, pkg, executor = "ni") {
     loading_status = await loading(text);
   }
   const runSockets = executor.split(" ")[0] === "npm" ? ` --max-sockets=${maxSockets}` : "";
-  const { status, result } = await useNodeWorker({
+  let { status, result } = await useNodeWorker({
     params: `${executor}${newParams ? ` ${newParams}` : runSockets}`,
-    stdio
+    stdio,
+    errorExit: false
   });
+  if (result.includes("pnpm versions with respective Node.js version support")) {
+    log(result);
+    log(
+      import_picocolors4.default.yellow(
+        isZh3 ? "\u6B63\u5728\u5C1D\u8BD5\u4F7F\u7528 npm \u518D\u6B21\u6267\u884C..." : "Trying to use npm to run again..."
+      )
+    );
+    const { status: newStatus, result: newResult } = jsShell5(
+      `npm install${newParams ? ` ${newParams}` : runSockets}`,
+      {
+        stdio
+      }
+    );
+    status = newStatus;
+    result = newResult;
+  }
   if (stdio === "inherit")
     loading_status = await loading("");
   const end = Date.now();
@@ -6957,6 +6983,7 @@ async function pil(params) {
       )} | sed "s/,/\\n/g" | gum filter --no-limit --placeholder=" \u{1F914}${process.env.PI_Lang === "zh" ? "\u8BF7\u9009\u62E9\u4E00\u4E2A\u9700\u8981\u83B7\u53D6\u6700\u65B0\u7248\u672C\u7684\u4F9D\u8D56" : "Please select a dependency that needs to obtain the latest version."}"`,
       "pipe"
     );
+    console.log({ choose, status });
     if (status === 130) {
       console.log(import_picocolors5.default.dim("\u5DF2\u53D6\u6D88"));
       process.exit(0);
@@ -6974,6 +7001,7 @@ async function pil(params) {
   let latestPkgname = params;
   const reg = /\s(-[dDwW]+)/g;
   const suffix = [];
+  console.log({ params });
   let command = latestPkgname = (await getParams(params)).replace(
     reg,
     (_, k) => {
@@ -6981,12 +7009,12 @@ async function pil(params) {
       return "";
     }
   );
-  latestPkgname = latestPkgname.replaceAll("@latest", "").split(" ").map((i) => {
+  latestPkgname = latestPkgname.replace(/@latest/g, "").split(" ").filter(Boolean).map((i) => {
     const v = dependencies[i] || devDependencies[i];
     return `${i}$${v}`;
   }).join(" ");
   command = command.replace(/\s+/, " ").split(" ").map((i, index) => `${i} ${suffix[index] || "-s"}`).join(" ");
-  return await pi(command, latestPkgname.replaceAll("@latest", ""), "pil");
+  return await pi(command, latestPkgname.replace(/@latest/g, ""), "pil");
 }
 
 // src/pinit.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@simon_he/pi",
   "type": "module",
-  "version": "0.0.88",
+  "version": "0.0.90",
   "description": "",
   "author": "Simon He",
   "license": "MIT",
@@ -65,19 +65,19 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "ccommand": "^1.0.61",
+    "ccommand": "^1.0.63",
     "fast-glob": "latest",
-    "lazy-js-utils": "^0.0.92",
-    "semver": "^7.6.0"
+    "lazy-js-utils": "^0.0.94",
+    "semver": "^7.6.2"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^0.34.2",
-    "@types/node": "^18.19.31",
+    "@types/node": "^18.19.39",
     "bumpp": "^8.2.1",
     "eslint": "^8.57.0",
     "lint-staged": "^13.3.0",
     "ora": "^6.3.1",
-    "picocolors": "^1.0.0",
+    "picocolors": "^1.0.1",
     "pnpm": "^7.33.7",
     "prettier": "^2.8.8",
     "rimraf": "^3.0.2",