@ijuantm/simpl-addon 2.4.3 → 2.4.5

package/install.js

@@ -89,14 +89,12 @@ const showHelp = () => {
   console.log();
   log(`  ${COLORS.bold}Usage:${COLORS.reset}`, 'blue');
   log(`    ${COLORS.dim}npx @ijuantm/simpl-addon${COLORS.reset}`);
+  log(`    ${COLORS.dim}npx @ijuantm/simpl-addon <add-on>${COLORS.reset}`);
   log(`    ${COLORS.dim}npx @ijuantm/simpl-addon --help${COLORS.reset}`);
   console.log();
   log(`  ${COLORS.bold}Commands:${COLORS.reset}`, 'blue');
   log(`    ${COLORS.dim}--help, -h${COLORS.reset}    Show this help message`);
   console.log();
-  log(`  ${COLORS.bold}Examples:${COLORS.reset}`, 'blue');
-  log(`    ${COLORS.dim}npx @ijuantm/simpl-addon${COLORS.reset}`);
-  console.log();
   log(`  ${COLORS.bold}Note:${COLORS.reset}`, 'blue');
   log(`    Run this command from the root of your Simpl project.`);
   log(`    The add-on version will match your Simpl framework version.`);
@@ -136,13 +134,13 @@ const extractMarkers = (content) => {
   const markers = [];
 
   content.split('\n').forEach((line, i) => {
-    const afterMatch = line.match(/@addon-insert:after\s*\(\s*["'](.+?)["']\s*\)/);
-    const beforeMatch = line.match(/@addon-insert:before\s*\(\s*["'](.+?)["']\s*\)/);
-    const replaceMatch = line.match(/@addon-insert:replace\s*\(\s*["'](.+?)["']\s*\)/);
+    const afterMatch = line.match(/@addon-insert:after\s*\(\s*(["'])(.+?)\1\s*\)/);
+    const beforeMatch = line.match(/@addon-insert:before\s*\(\s*(["'])(.+?)\1\s*\)/);
+    const replaceMatch = line.match(/@addon-insert:replace\s*\(\s*(["'])(.+?)\1\s*\)/);
 
-    if (afterMatch) markers.push({type: 'after', lineIndex: i, searchText: afterMatch[1]});
-    else if (beforeMatch) markers.push({type: 'before', lineIndex: i, searchText: beforeMatch[1]});
-    else if (replaceMatch) markers.push({type: 'replace', lineIndex: i, markerName: replaceMatch[1]});
+    if (afterMatch) markers.push({type: 'after', lineIndex: i, searchText: afterMatch[2]});
+    else if (beforeMatch) markers.push({type: 'before', lineIndex: i, searchText: beforeMatch[2]});
+    else if (replaceMatch) markers.push({type: 'replace', lineIndex: i, markerName: replaceMatch[2]});
     else if (line.includes('@addon-insert:prepend')) markers.push({type: 'prepend', lineIndex: i});
     else if (line.includes('@addon-insert:append')) markers.push({type: 'append', lineIndex: i});
   });
@@ -262,11 +260,6 @@ const mergeFile = (targetPath, addonContent, markers, isEnv = false) => {
   return {modified: newContent !== targetContent, operations};
 };
 
-const truncateText = (text, maxLength = 80) => {
-  if (text.length <= maxLength) return text;
-  return text.substring(0, maxLength - 3) + '...';
-};
-
 const printMergeResults = (relativePath, isEnv, result) => {
   const indent = '    ';
   const varText = isEnv ? 'environment variable' : 'line';
@@ -278,10 +271,10 @@ const printMergeResults = (relativePath, isEnv, result) => {
       if (op.type === 'prepend') log(`${indent}${COLORS.green}✓${COLORS.reset} Prepended ${COLORS.bold}${op.lines}${COLORS.reset} ${varText}${op.lines !== 1 ? 's' : ''} to file start`);
       else if (op.type === 'append') log(`${indent}${COLORS.green}✓${COLORS.reset} Appended ${COLORS.bold}${op.lines}${COLORS.reset} ${varText}${op.lines !== 1 ? 's' : ''} to file end`);
       else if (op.type === 'replace') log(`${indent}${COLORS.green}✓${COLORS.reset} Replaced marker ${COLORS.cyan}${op.markerName}${COLORS.reset} with ${COLORS.bold}${op.lines}${COLORS.reset} ${varText}${op.lines !== 1 ? 's' : ''}`);
-      else if (op.type === 'after') log(`${indent}${COLORS.green}✓${COLORS.reset} Inserted ${COLORS.bold}${op.lines}${COLORS.reset} ${varText}${op.lines !== 1 ? 's' : ''} ${COLORS.cyan}after${COLORS.reset} ${COLORS.dim}${truncateText(op.searchText)}${COLORS.reset}`);
-      else if (op.type === 'before') log(`${indent}${COLORS.green}✓${COLORS.reset} Inserted ${COLORS.bold}${op.lines}${COLORS.reset} ${varText}${op.lines !== 1 ? 's' : ''} ${COLORS.cyan}before${COLORS.reset} ${COLORS.dim}${truncateText(op.searchText)}${COLORS.reset}`);
+      else if (op.type === 'after') log(`${indent}${COLORS.green}✓${COLORS.reset} Inserted ${COLORS.bold}${op.lines}${COLORS.reset} ${varText}${op.lines !== 1 ? 's' : ''} ${COLORS.cyan}after${COLORS.reset} ${COLORS.dim}${op.searchText}${COLORS.reset}`);
+      else if (op.type === 'before') log(`${indent}${COLORS.green}✓${COLORS.reset} Inserted ${COLORS.bold}${op.lines}${COLORS.reset} ${varText}${op.lines !== 1 ? 's' : ''} ${COLORS.cyan}before${COLORS.reset} ${COLORS.dim}${op.searchText}${COLORS.reset}`);
     } else if (op.type === 'notfound') {
-      const target = op.markerName ? `marker ${COLORS.dim}${op.markerName}${COLORS.reset}` : `${COLORS.dim}${truncateText(op.searchText)}${COLORS.reset}`;
+      const target = op.markerName ? `marker ${COLORS.dim}${op.markerName}${COLORS.reset}` : `${COLORS.dim}${op.searchText}${COLORS.reset}`;
       log(`${indent}${COLORS.yellow}⚠${COLORS.reset} ${COLORS.yellow}Could not find target:${COLORS.reset} ${target}`);
     } else log(`${indent}${COLORS.gray}○${COLORS.reset} ${COLORS.dim}Content already exists (${op.type})${COLORS.reset}`);
   });
@@ -398,6 +391,8 @@ const main = async () => {
     process.exit(0);
   }
 
+  const directName = firstArg && !firstArg.startsWith('-') ? firstArg : null;
+
   let version;
 
   try {
@@ -457,7 +452,7 @@ const main = async () => {
     process.exit(1);
   }
 
-  log('  📦 Fetching available add-ons...', 'bold');
+  log('  🧰 Fetching available add-ons...', 'bold');
 
   let addons;
 
@@ -479,34 +474,46 @@ const main = async () => {
     process.exit(0);
   }
 
-  log(`  ${COLORS.bold}Available add-ons:${COLORS.reset}`, 'blue');
-  addons.forEach((name, index) => log(`    ${COLORS.cyan}${index + 1}.${COLORS.reset} ${name}`));
-  console.log();
-
   let addonName;
 
-  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');
+  if (directName) {
+    if (!addons.includes(directName)) {
+      log(`  ${COLORS.red}✗${COLORS.reset} Add-on ${COLORS.bold}${directName}${COLORS.reset} not found`, 'red');
       console.log();
-      continue;
+      log(`  ${COLORS.bold}Available add-ons:${COLORS.reset}`, 'blue');
+      addons.forEach((name, index) => log(`    ${COLORS.cyan}${index + 1}.${COLORS.reset} ${name}`));
+      console.log();
+      process.exit(1);
     }
+    addonName = directName;
+  } else {
+    log(`  ${COLORS.bold}Available add-ons:${COLORS.reset}`, 'blue');
+    addons.forEach((name, index) => log(`    ${COLORS.cyan}${index + 1}.${COLORS.reset} ${name}`));
+    console.log();
 
-    const numInput = parseInt(input, 10);
-    if (!isNaN(numInput) && numInput >= 1 && numInput <= addons.length) {
-      addonName = addons[numInput - 1];
-      break;
-    }
+    while (true) {
+      const input = await promptUser(`  Add-on to install ${COLORS.dim}(name or number)${COLORS.reset}`);
 
-    if (addons.includes(input)) {
-      addonName = input;
-      break;
-    }
+      if (!input) {
+        log(`  ${COLORS.red}✗${COLORS.reset} Selection cannot be empty`, 'red');
+        console.log();
+        continue;
+      }
 
-    log(`  ${COLORS.red}✗${COLORS.reset} Invalid selection "${input}"`, 'red');
-    console.log();
+      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;
+      }
+
+      log(`  ${COLORS.red}✗${COLORS.reset} Invalid selection "${input}"`, 'red');
+      console.log();
+    }
   }
 
   console.log();
@@ -514,7 +521,7 @@ const main = async () => {
   log(`  │  ${COLORS.bold}Installing: ${COLORS.cyan}${addonName}${COLORS.reset} ${COLORS.dim}(v${version})${COLORS.reset}${' '.repeat(44 - addonName.length - version.length)}│`);
   log(`  ╰${'─'.repeat(62)}╯`);
   console.log();
-  log('  📦 Downloading add-on...', 'bold');
+  log(`  📦 Downloading ${COLORS.cyan}${addonName}${COLORS.reset} add-on...`, 'bold');
 
   let copied, skipped, toMerge;
 

package/package.json

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