@tertium/hlpr 0.3.3 → 0.3.5

package/bin/commands/file/rename/rename.js

@@ -8,30 +8,36 @@ function splitWords(s) {
 function transformBasename(basename, style) {
   if (!basename)
     return basename;
-  if (basename.includes(".") && !basename.startsWith("."))
-    return basename;
   const leadingDot = basename.startsWith(".") ? "." : "";
-  const core = leadingDot ? basename.slice(1) : basename;
+  let core = leadingDot ? basename.slice(1) : basename;
+  let ext = "";
+  const firstDot = core.indexOf(".");
+  if (firstDot !== -1) {
+    ext = core.slice(firstDot);
+    core = core.slice(0, firstDot);
+  }
   const words = splitWords(core);
   if (words.length === 0)
     return basename;
   switch (style) {
     case "title_underscore":
-      return leadingDot + words.map(cap).join("_");
+      return leadingDot + words.map(cap).join("_") + ext;
     case "snake":
-      return leadingDot + words.map((w) => w.toLowerCase()).join("_");
+      return leadingDot + words.map((w) => w.toLowerCase()).join("_") + ext;
     case "kebab":
-      return leadingDot + words.map((w) => w.toLowerCase()).join("-");
+      return leadingDot + words.map((w) => w.toLowerCase()).join("-") + ext;
     case "camel":
-      return leadingDot + words.map((w, i) => i === 0 ? w.toLowerCase() : cap(w)).join("");
+      return leadingDot + words.map((w, i) => i === 0 ? w.toLowerCase() : cap(w)).join("") + ext;
     case "pascal":
-      return leadingDot + words.map(cap).join("");
+      return leadingDot + words.map(cap).join("") + ext;
+    case "pascal_underscore":
+      return leadingDot + words.map(cap).join("_") + ext;
     case "upper":
-      return leadingDot + words.join("_").toUpperCase();
+      return leadingDot + words.join("_").toUpperCase() + ext;
     case "lower":
-      return leadingDot + words.join("_").toLowerCase();
+      return leadingDot + words.join("_").toLowerCase() + ext;
     default:
-      return basename;
+      return leadingDot + core + ext;
   }
 }
 function cap(s) {
@@ -126,10 +132,15 @@ if (import.meta.url.endsWith(process.argv[1]?.replace(/\\/g, "/"))) {
   const args = process.argv.slice(2);
   const rootArg = args[0];
   const styleArg = args[1];
+  if (args.includes("--help") || args.includes("-h") || args.includes("/help") || args.includes("/h") || args.includes("/?")) {
+    console.log("Usage: rename <root> <style> [--dry|-n]");
+    console.log("Styles: title_underscore, pascal_underscore, snake, kebab, camel, pascal, upper, lower");
+    process.exit(0);
+  }
   const dryRun = args.includes("--dry") || args.includes("-n");
   if (!rootArg || !styleArg) {
     console.error("Usage: rename <root> <style> [--dry|-n]");
-    console.error("Styles: title_underscore, snake, kebab, camel, pascal, upper, lower");
+    console.error("Styles: title_underscore, pascal_underscore, snake, kebab, camel, pascal, upper, lower");
     process.exit(1);
   }
   renameRecursive(rootArg, styleArg, { dryRun }).then((performed) => {

package/bin/index.js

@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 // src/index.ts
 import { readFile } from "node:fs/promises";
 import { exec } from "node:child_process";
@@ -76,6 +78,142 @@ async function executeCommand(command, variables) {
     });
   });
 }
+async function showHelp() {
+  async function getCommandDescription(filePath) {
+    try {
+      const content = await readFile(filePath, "utf-8");
+      const descMatch = content.match(/(?:\/\/|#)\s*@description\s+(.+)/);
+      if (descMatch) {
+        return descMatch[1].trim();
+      }
+      const dir = path.dirname(filePath);
+      const readmePath = path.join(dir, "README.md");
+      if (fs.existsSync(readmePath)) {
+        const readme = await readFile(readmePath, "utf-8");
+        const firstLine = readme.split(`
+`).find((line) => line.trim() && !line.startsWith("#"));
+        if (firstLine) {
+          return firstLine.trim();
+        }
+      }
+    } catch (error) {}
+    return;
+  }
+  async function discoverCommands(commandsDir) {
+    const commands2 = [];
+    try {
+      const categories = await fs.promises.readdir(commandsDir, { withFileTypes: true });
+      for (const category of categories) {
+        if (!category.isDirectory())
+          continue;
+        const categoryPath = path.join(commandsDir, category.name);
+        const items = await fs.promises.readdir(categoryPath, { withFileTypes: true });
+        for (const item of items) {
+          if (item.isDirectory()) {
+            const nestedJsPath = path.join(categoryPath, item.name, `${item.name}.js`);
+            const nestedShPath = path.join(categoryPath, item.name, `${item.name}.sh`);
+            let commandPath;
+            let commandType;
+            if (fs.existsSync(nestedJsPath)) {
+              commandPath = nestedJsPath;
+              commandType = "typescript";
+            } else if (fs.existsSync(nestedShPath)) {
+              commandPath = nestedShPath;
+              commandType = "shell";
+            } else {
+              continue;
+            }
+            const description = await getCommandDescription(commandPath);
+            commands2.push({
+              category: category.name,
+              name: item.name,
+              type: commandType,
+              path: commandPath,
+              description
+            });
+          } else if (item.name.endsWith(".js")) {
+            const jsPath = path.join(categoryPath, item.name);
+            const commandName = path.basename(item.name, ".js");
+            if (commandName !== "test" && !commandName.endsWith(".test")) {
+              const description = await getCommandDescription(jsPath);
+              commands2.push({
+                category: category.name,
+                name: commandName,
+                type: "typescript",
+                path: jsPath,
+                description
+              });
+            }
+          } else if (item.name.endsWith(".sh")) {
+            const shPath = path.join(categoryPath, item.name);
+            const commandName = path.basename(item.name, ".sh");
+            const description = await getCommandDescription(shPath);
+            commands2.push({
+              category: category.name,
+              name: commandName,
+              type: "shell",
+              path: shPath,
+              description
+            });
+          }
+        }
+      }
+    } catch (error) {}
+    return commands2;
+  }
+  const version = await getVersion();
+  const binCommandsDir = path.join(__dirname2, "commands");
+  const srcCommandsDir = path.join(__dirname2, "..", "src", "commands");
+  const commands = [
+    ...await discoverCommands(binCommandsDir),
+    ...await discoverCommands(srcCommandsDir)
+  ];
+  const uniqueCommands = commands.filter((cmd, index, self) => index === self.findIndex((c) => c.category === cmd.category && c.name === cmd.name));
+  console.log(`
+╔════════════════════════════════════════════════════════════╗`);
+  console.log(`║              hlpr - Helper CLI Tool v${version.padEnd(16)}║`);
+  console.log(`╚════════════════════════════════════════════════════════════╝
+`);
+  console.log("USAGE:");
+  console.log(`  hlpr [options] <category> <command> [args...]
+`);
+  console.log("OPTIONS:");
+  console.log("  -f              Force execution (continue on errors)");
+  console.log("  -v, --version   Show version information");
+  console.log("  help, -h, --help, /h, /help, /?");
+  console.log(`                  Show this help message
+`);
+  console.log(`AVAILABLE COMMANDS:
+`);
+  const grouped = uniqueCommands.reduce((acc, cmd) => {
+    if (!acc[cmd.category]) {
+      acc[cmd.category] = [];
+    }
+    acc[cmd.category].push(cmd);
+    return acc;
+  }, {});
+  const sortedCategories = Object.keys(grouped).sort();
+  for (const category of sortedCategories) {
+    console.log(`  ${category}:`);
+    const categoryCommands = grouped[category].sort((a, b) => a.name.localeCompare(b.name));
+    for (const cmd of categoryCommands) {
+      const typeLabel = cmd.type === "typescript" ? "(TS)" : "(sh)";
+      const cmdDisplay = cmd.category === cmd.name ? `hlpr ${cmd.name}`.padEnd(35) : `hlpr ${cmd.category} ${cmd.name}`.padEnd(35);
+      if (cmd.description) {
+        console.log(`    ${cmdDisplay} ${typeLabel.padEnd(6)} ${cmd.description}`);
+      } else {
+        console.log(`    ${cmdDisplay} ${typeLabel}`);
+      }
+    }
+    console.log("");
+  }
+  console.log("EXAMPLES:");
+  console.log("  hlpr help");
+  console.log("  hlpr file rename --style kebab --dir ./src");
+  console.log("  hlpr ssh init-dir");
+  console.log(`  hlpr -f git precommit
+`);
+}
 async function main() {
   if (commandArgs[0] === "--version" || commandArgs[0] === "-v") {
     const version = await getVersion();
@@ -83,17 +221,8 @@ async function main() {
     process.exit(0);
   }
   if (commandArgs.length === 0 || commandArgs[0] === "help" || commandArgs[0] === "--help" || commandArgs[0] === "-h" || commandArgs[0] === "/help" || commandArgs[0] === "/h" || commandArgs[0] === "/?") {
-    const helpScriptPath = path.join(__dirname2, "..", "bin", "commands", "help", "help.js");
-    if (fs.existsSync(helpScriptPath)) {
-      const helpCommand = `node "${helpScriptPath}"`;
-      await executeCommand(helpCommand, {});
-      rl.close();
-      process.exit(0);
-    } else {
-      console.error("Please provide a command. Example: hlpr ssh init-dir");
-      console.error("Run 'hlpr help' for available commands.");
-      process.exit(1);
-    }
+    await showHelp();
+    process.exit(0);
   }
   try {
     const category = commandArgs[0];
@@ -133,11 +262,20 @@ async function main() {
       process.exit(1);
     }
     if (isTypeScriptCommand) {
-      const tsArgs = restArgs.length > 0 && restArgs[0] && fs.existsSync(path.join(scriptDir, "commands", category, restArgs[0])) ? process.argv.slice(4) : process.argv.slice(3);
+      let tsArgs;
+      if (restArgs.length > 0 && restArgs[0] && scriptPath) {
+        const subcategory = restArgs[0];
+        const isNested = path.basename(scriptPath) === `${subcategory}.js` && path.basename(path.dirname(scriptPath)) === subcategory;
+        tsArgs = isNested ? process.argv.slice(4) : process.argv.slice(3);
+      } else {
+        tsArgs = process.argv.slice(3);
+      }
       const finalCommand = `node "${scriptPath}" ${tsArgs.join(" ")}`;
       console.log(`Executing command: ${finalCommand}`);
       const success2 = await executeCommand(finalCommand, {});
-      if (!success2 && !forceFlag) {
+      const helpFlags = ["-h", "--help", "help", "/h", "/help", "/?"];
+      const isHelpInvocation = tsArgs.some((arg) => helpFlags.includes(arg));
+      if (!success2 && !forceFlag && !isHelpInvocation) {
         console.error("Command failed, stopping execution.");
         process.exit(1);
       }
@@ -179,9 +317,7 @@ async function main() {
     rl.close();
   }
 }
-if (import.meta.url.startsWith("file:") && process.argv[1] && import.meta.url.endsWith(process.argv[1].replace(/\\/g, "/"))) {
-  main();
-}
-export {
-  main
-};
+main().catch((error) => {
+  console.error("Fatal error:", error);
+  process.exit(1);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tertium/hlpr",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "Windows and *Nix utility for typical programming activity",
   "author": "Vitalii Balabanov",
   "email": "tertiumnon@gmail.com",
@@ -11,6 +11,7 @@
     "build:commands": "node build-commands.js",
     "build": "bun run build:main && bun run build:commands",
     "test": "bun test",
+    "test:e2e": "node scripts/test-rename-e2e.cjs",
     "prepublishOnly": "npm run build",
     "release:minor": "node node_modules/@tertium/js/scripts/release.js minor",
     "release:patch": "node node_modules/@tertium/js/scripts/release.js patch",