@initx-plugin/manager 0.0.2 → 0.0.4

package/dist/index.d.mts

@@ -5,7 +5,7 @@ declare class PluginManagerPlugin extends InitxPlugin {
         matching: string;
         description: string;
     }[];
-    handle(_ctx: InitxContext, type: string, ...others: string[]): Promise<void>;
+    handle(context: InitxContext, type: string, ...others: string[]): Promise<void>;
 }
 
 export { PluginManagerPlugin as default };

package/dist/index.d.ts

@@ -5,7 +5,7 @@ declare class PluginManagerPlugin extends InitxPlugin {
         matching: string;
         description: string;
     }[];
-    handle(_ctx: InitxContext, type: string, ...others: string[]): Promise<void>;
+    handle(context: InitxContext, type: string, ...others: string[]): Promise<void>;
 }
 
 export { PluginManagerPlugin as default };

package/dist/index.mjs

@@ -1,10 +1,9 @@
 import { fetchPlugins, InitxPlugin } from '@initx-plugin/core';
-import { c, log, inquirer } from '@initx-plugin/utils';
+import { c, loadingFunction, log, inquirer } from '@initx-plugin/utils';
 import { green, blue, reset, dim, gray } from 'picocolors';
-import ora from 'ora';
 import path from 'node:path';
-import fs from 'fs-extra';
 import columnify from 'columnify';
+import fs from 'fs-extra';
 
 const installedPluginInfo = {
   once: false,
@@ -24,12 +23,6 @@ function nameColor(name) {
   }
   return blue(name);
 }
-async function loadingFunction(message, fn) {
-  const spinner = ora(message).start();
-  return fn().finally(() => {
-    spinner.stop();
-  });
-}
 async function getInstalledPluginNames() {
   if (installedPluginInfo.once) {
     return installedPluginInfo.names;
@@ -82,7 +75,7 @@ async function addPlugin(targetPlugin) {
   if (availablePlugins.length === 2) {
     const displayContnet = [];
     for (const plugin of availablePlugins) {
-      displayContnet.push(await displayInfo(plugin));
+      displayContnet.push(await displayInfo(plugin, true));
     }
     index = await inquirer.select(
       "Which plugin do you want to install?",
@@ -126,15 +119,16 @@ async function searchAvailablePlugins(targetPlugin) {
 async function installPlugin(name) {
   return c("npm", ["install", "-g", name]);
 }
-async function displayInfo({ name, version, description }) {
+async function displayInfo({ name, version, description }, hasTab = false) {
   const isInstalled = await isInstalledPlugin(name);
+  const spaceChar = hasTab ? "	" : " ";
   const display = {
     name: nameColor(name),
     version: reset(dim(gray(`@${version}`))),
-    description: reset(description),
-    installed: isInstalled ? dim(green(" [already]")) : "	"
+    description: `${spaceChar}${reset(description)}`,
+    installed: isInstalled ? dim(green(" [already]")) : spaceChar
   };
-  return `${display.name}${display.version}${display.installed}	${display.description}`;
+  return `${display.name}${display.version}${display.installed}${display.description}`;
 }
 
 async function showPluginList() {
@@ -151,12 +145,50 @@ async function showPluginList() {
   console.log(columnify(displayTable));
 }
 
-async function updatePlugin() {
-  const excludedPlugins = await fetchExcludedPlugins();
-  const fetchedPlugins = await fetchPlugins();
+async function removePlugin(targetName) {
+  const plugins = await fetchPlugins();
+  const removePluginNames = [
+    officialName(targetName),
+    communityName(targetName)
+  ];
+  const removePlugins = plugins.filter(({ name }) => removePluginNames.includes(name));
+  if (removePlugins.length === 0) {
+    const displayNames = removePluginNames.map(nameColor).join(" or ");
+    log.warn(`Plugin ${displayNames} is not installed`);
+    return;
+  }
+  let index = 0;
+  let needConfirm = true;
+  if (removePlugins.length === 2) {
+    index = await inquirer.select("Which plugin do you want to remove?", removePlugins.map(({ name }) => nameColor(name)));
+    needConfirm = false;
+  }
+  const removePlugin2 = removePlugins[index];
+  if (needConfirm) {
+    const confirmResult = await inquirer.confirm(`Are you sure you want to remove ${nameColor(removePlugin2.name)}?`);
+    if (!confirmResult) {
+      return;
+    }
+  }
+  await loadingFunction(
+    `Removing ${nameColor(removePlugin2.name)}...`,
+    () => c("npm", ["uninstall", "-g", removePlugin2.name])
+  );
+  log.success(`Removed ${nameColor(removePlugin2.name)}`);
+}
+
+async function updatePlugin(options) {
+  const includeDev = options.dev || false;
+  const [developmentPlugins, fetchedPlugins] = await loadingFunction(
+    "Fetching plugins",
+    () => Promise.all([
+      fetchDevelopmentPlugins(),
+      fetchPlugins()
+    ])
+  );
   const pluginNames = [];
   const pluginRootMap = fetchedPlugins.reduce((acc, { name, root }) => {
-    if (excludedPlugins.includes(name)) {
+    if (!includeDev && developmentPlugins.includes(name)) {
       return acc;
     }
     pluginNames.push(name);
@@ -168,13 +200,19 @@ async function updatePlugin() {
   Object.keys(pluginRootMap).forEach((name) => {
     const packageInfo = fs.readJsonSync(path.join(pluginRootMap[name], "package.json"));
     const pluginInfo = searchPluginsInfo.find((plugin) => plugin.name === name);
-    if (!pluginInfo || packageInfo.version === pluginInfo.version) {
+    if (!pluginInfo) {
+      return;
+    }
+    const isDevelopmentPlugin = developmentPlugins.includes(name);
+    const condition = isDevelopmentPlugin ? !includeDev : packageInfo.version === pluginInfo.version;
+    if (condition) {
       return;
     }
     needUpdatePlugins.push({
       name,
       version: packageInfo.version,
-      target: pluginInfo.version
+      target: pluginInfo.version,
+      isDev: isDevelopmentPlugin
     });
   });
   if (needUpdatePlugins.length === 0) {
@@ -182,9 +220,11 @@ async function updatePlugin() {
     return;
   }
   log.info("Need update plugins:");
-  needUpdatePlugins.forEach(({ name, version, target }) => {
-    console.log(`${nameColor(name)}	${dim(gray(`${version}	->`))} ${target}`);
-  });
+  console.log(columnify(needUpdatePlugins.map(({ name, version, target, isDev }) => ({
+    name: nameColor(name),
+    version: dim(gray(`${isDev ? "[dev] " : ""}${version}`)),
+    target
+  }))));
   const confirm = await inquirer.confirm("Do you want to update these plugins?");
   if (!confirm) {
     log.warn("Update canceled");
@@ -197,71 +237,30 @@ async function updatePlugin() {
   );
   log.success(`Plugins updated: ${displayNames}`);
 }
-async function fetchExcludedPlugins() {
+async function fetchDevelopmentPlugins() {
   const npmListResult = await c("npm", ["list", "-g", "--depth=0"]);
-  const excludedPlugins = [];
+  const pluginNames = [];
   npmListResult.content.split(/\r?\n/).forEach((line) => {
     const metched = /(?:@initx-plugin\/|initx-plugin-)[^@]+/.exec(line);
     if (metched && line.includes("->")) {
-      excludedPlugins.push(metched[0]);
+      pluginNames.push(metched[0]);
     }
   });
-  return excludedPlugins;
-}
-
-async function removePlugin(targetName) {
-  const plugins = await fetchPlugins();
-  const removePluginNames = [
-    officialName(targetName),
-    communityName(targetName)
-  ];
-  const removePlugins = plugins.filter(({ name }) => removePluginNames.includes(name));
-  if (removePlugins.length === 0) {
-    const displayNames = removePluginNames.map(nameColor).join(" or ");
-    log.warn(`Plugin ${displayNames} is not installed`);
-    return;
-  }
-  let index = 0;
-  let needConfirm = true;
-  if (removePlugins.length === 2) {
-    index = await inquirer.select("Which plugin do you want to remove?", removePlugins.map(({ name }) => nameColor(name)));
-    needConfirm = false;
-  }
-  const removePlugin2 = removePlugins[index];
-  if (needConfirm) {
-    const confirmResult = await inquirer.confirm(`Are you sure you want to remove ${nameColor(removePlugin2.name)}?`);
-    if (!confirmResult) {
-      return;
-    }
-  }
-  await loadingFunction(
-    `Removing ${nameColor(removePlugin2.name)}...`,
-    () => c("npm", ["uninstall", "-g", removePlugin2.name])
-  );
-  log.success(`Removed ${nameColor(removePlugin2.name)}`);
+  return pluginNames;
 }
 
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 class PluginManagerPlugin extends InitxPlugin {
-  constructor() {
-    super(...arguments);
-    __publicField(this, "matchers", [
-      {
-        matching: "plugin",
-        description: "Plugin Manager"
-      }
-    ]);
-  }
-  async handle(_ctx, type, ...others) {
+  matchers = [
+    {
+      matching: "plugin",
+      description: "Plugin Manager"
+    }
+  ];
+  async handle(context, type, ...others) {
     const [name] = others;
     switch (type) {
       case "list": {
-        showPluginList();
+        await showPluginList();
         break;
       }
       case "add": {
@@ -269,7 +268,7 @@ class PluginManagerPlugin extends InitxPlugin {
         break;
       }
       case "update": {
-        await updatePlugin();
+        await updatePlugin(context.cliOptions);
         break;
       }
       case "remove": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@initx-plugin/manager",
   "type": "module",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "initx plugin manager",
   "author": "imba97",
   "license": "MIT",
@@ -24,24 +24,23 @@
     "dist"
   ],
   "dependencies": {
-    "@initx-plugin/core": "^0.0.23",
-    "@initx-plugin/utils": "^0.0.23",
+    "@initx-plugin/core": "^0.0.27",
+    "@initx-plugin/utils": "^0.0.27",
     "columnify": "^1.6.0",
     "fs-extra": "^11.2.0",
-    "ora": "^8.1.1",
     "picocolors": "^1.1.1"
   },
   "devDependencies": {
-    "@imba97/eslint-config": "^0.0.4",
+    "@imba97/eslint-config": "^0.0.5",
     "@types/columnify": "^1.5.4",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.9.0",
-    "bumpp": "^9.8.1",
-    "eslint": "^9.14.0",
-    "lint-staged": "^15.2.10",
+    "@types/node": "^22.10.2",
+    "bumpp": "^9.9.2",
+    "eslint": "^9.17.0",
+    "lint-staged": "^15.3.0",
     "simple-git-hooks": "^2.11.1",
-    "typescript": "^5.6.3",
-    "unbuild": "^2.0.0"
+    "typescript": "^5.7.2",
+    "unbuild": "^3.1.0"
   },
   "simple-git-hooks": {
     "pre-commit": "pnpm lint-staged"