@initx-plugin/manager 0.0.1 → 0.0.3

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;
@@ -53,11 +46,11 @@ async function searchPlugin(pluginNames) {
     }
     try {
       const json = JSON.parse(result.content);
-      if (finedNames.includes(json.name)) {
-        continue;
-      }
-      finedNames.push(json.name);
       json.forEach((plugin) => {
+        if (finedNames.includes(plugin.name)) {
+          return;
+        }
+        finedNames.push(plugin.name);
         plugins.push({
           name: plugin.name,
           version: plugin.version,
@@ -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,6 +145,38 @@ async function showPluginList() {
   console.log(columnify(displayTable));
 }
 
+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() {
   const excludedPlugins = await fetchExcludedPlugins();
   const fetchedPlugins = await fetchPlugins();
@@ -209,38 +235,6 @@ async function fetchExcludedPlugins() {
   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)}`);
-}
-
 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) => {
@@ -261,7 +255,7 @@ class PluginManagerPlugin extends InitxPlugin {
     const [name] = others;
     switch (type) {
       case "list": {
-        showPluginList();
+        await showPluginList();
         break;
       }
       case "add": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@initx-plugin/manager",
   "type": "module",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "initx plugin manager",
   "author": "imba97",
   "license": "MIT",
@@ -24,15 +24,14 @@
     "dist"
   ],
   "dependencies": {
-    "@initx-plugin/core": "^0.0.23",
-    "@initx-plugin/utils": "^0.0.23",
+    "@initx-plugin/core": "^0.0.25",
+    "@initx-plugin/utils": "^0.0.25",
     "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",