@tertium/hlpr 0.3.4 → 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

@@ -262,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);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tertium/hlpr",
-  "version": "0.3.4",
+  "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",