@ijuantm/simpl-addon 2.6.2 → 2.6.3

package/install.js

@@ -147,49 +147,53 @@ const closestMatch = (input, options) => {
 
 // --- Fuzzy addon resolution with interactive prompts ---
 
-const resolveAddon = async (input, addons) => {
-  if (addons.includes(input)) return input;
-
-  const suggestion = closestMatch(input, addons);
-  console.log();
-  log(`  ${COLORS.red}✗${COLORS.reset} Add-on ${COLORS.bold}${input}${COLORS.reset} not found`, 'red');
-
-  if (suggestion) {
-    log(`  ${COLORS.yellow}Did you mean:${COLORS.reset} ${COLORS.cyan}${suggestion}${COLORS.reset}?`);
+const promptAddon = async (addons, firstInput = null) => {
+  const askSuggestion = async (input) => {
+    const suggestion = closestMatch(input, addons);
     console.log();
+    log(`  ${COLORS.red}✗${COLORS.reset} Add-on ${COLORS.bold}${input}${COLORS.reset} not found`, 'red');
 
-    const answer = await promptUser(`  Use "${suggestion}"? ${COLORS.dim}(y/n — n shows available add-ons)${COLORS.reset}`);
-    const a = answer.toLowerCase();
+    if (suggestion) {
+      log(`  ${COLORS.yellow}Did you mean:${COLORS.reset} ${COLORS.cyan}${suggestion}${COLORS.reset}?`);
+      console.log();
 
-    if (a === 'yes' || a === 'y') return suggestion;
+      while (true) {
+        const answer = await promptUser(`  Use "${suggestion}"? ${COLORS.dim}(yes / no — no lists available add-ons)${COLORS.reset}`);
+        const a = answer.toLowerCase();
 
-    if (a !== 'no' && a !== 'n') {
-      log(`  ${COLORS.dim}Please answer y or n${COLORS.reset}`);
+        if (a === 'yes' || a === 'y') return suggestion;
+        if (a === 'no' || a === 'n') break;
+
+        log(`  ${COLORS.dim}Please answer yes or no${COLORS.reset}`);
+      }
     }
-  }
 
-  console.log();
-  log(`  ${COLORS.bold}Available add-ons:${COLORS.reset}`, 'blue');
-  listAddons(addons);
-  console.log();
+    console.log();
+    log(`  ${COLORS.bold}Available add-ons:${COLORS.reset}`, 'blue');
+    listAddons(addons);
+    console.log();
+
+    return null;
+  };
+
+  let pending = firstInput;
 
   while (true) {
-    const input2 = await promptUser(`  Add-on to install ${COLORS.dim}(name or number)${COLORS.reset}`);
+    const input = pending || await promptUser(`  Add-on to install ${COLORS.dim}(name or number)${COLORS.reset}`);
+    pending = null;
 
-    if (!input2) {
+    if (!input) {
       log(`  ${COLORS.red}✗${COLORS.reset} Selection cannot be empty`, 'red');
       console.log();
       continue;
     }
 
-    const numInput = parseInt(input2, 10);
+    const numInput = parseInt(input, 10);
     if (!isNaN(numInput) && numInput >= 1 && numInput <= addons.length) return addons[numInput - 1];
-    if (addons.includes(input2)) return input2;
+    if (addons.includes(input)) return input;
 
-    const suggestion2 = closestMatch(input2, addons);
-    log(`  ${COLORS.red}✗${COLORS.reset} Invalid selection ${COLORS.bold}${input2}${COLORS.reset}`, 'red');
-    if (suggestion2) log(`  ${COLORS.dim}Did you mean ${COLORS.reset}${COLORS.cyan}${suggestion2}${COLORS.reset}${COLORS.dim}?${COLORS.reset}`);
-    console.log();
+    const resolved = await askSuggestion(input);
+    if (resolved) return resolved;
   }
 };
 
@@ -608,7 +612,7 @@ const main = async () => {
   let addonName;
 
   if (parsed.addon) {
-    addonName = await resolveAddon(parsed.addon, addons);
+    addonName = await promptAddon(addons, parsed.addon);
     printAnswer('  Add-on to install', addonName);
   } else {
     console.log();
@@ -616,31 +620,7 @@ const main = async () => {
     listAddons(addons);
     console.log();
 
-    while (true) {
-      const input = await promptUser(`  Add-on to install ${COLORS.dim}(name or number)${COLORS.reset}`);
-
-      if (!input) {
-        log(`  ${COLORS.red}✗${COLORS.reset} Selection cannot be empty`, 'red');
-        console.log();
-        continue;
-      }
-
-      const numInput = parseInt(input, 10);
-      if (!isNaN(numInput) && numInput >= 1 && numInput <= addons.length) {
-        addonName = addons[numInput - 1];
-        break;
-      }
-
-      if (addons.includes(input)) {
-        addonName = input;
-        break;
-      }
-
-      const suggestion = closestMatch(input, addons);
-      log(`  ${COLORS.red}✗${COLORS.reset} Invalid selection ${COLORS.bold}${input}${COLORS.reset}`, 'red');
-      if (suggestion) log(`  ${COLORS.dim}Did you mean ${COLORS.reset}${COLORS.cyan}${suggestion}${COLORS.reset}${COLORS.dim}?${COLORS.reset}`);
-      console.log();
-    }
+    addonName = await promptAddon(addons);
   }
 
   console.log();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ijuantm/simpl-addon",
   "description": "CLI tool to install Simpl framework add-ons.",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "scripts": {
     "link": "npm link",
     "unlink": "npm unlink -g @ijuantm/simpl-addon"