@tertium/hlpr 0.3.4 → 0.4.0

package/README.md

@@ -2,6 +2,16 @@
 
 A CLI utility for running shell scripts with variable substitution and TypeScript-based commands.
 
+## Platform Support
+
+hlpr works on all major operating systems:
+
+- ✅ **Linux** - Fully supported
+- ✅ **macOS** - Fully supported
+- ✅ **Windows** - Requires [Git for Windows](https://git-scm.com/download/win) (includes Git Bash)
+
+**Note for Windows users:** Shell script commands (`.sh` files) require Bash, which is included with Git for Windows. TypeScript commands work on all platforms.
+
 ## Installation
 
 ```bash

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) {
@@ -81,8 +87,61 @@ async function safeRename(oldPath, newPath) {
     }
   }
 }
+async function updateFileReferences(filePath, renames) {
+  const content = await fs.readFile(filePath, "utf-8");
+  let updated = content;
+  for (const { from, to } of renames) {
+    const fromBasename = path.basename(from);
+    const toBasename = path.basename(to);
+    if (fromBasename === toBasename)
+      continue;
+    const fromWithoutExt = fromBasename.replace(/\.[^.]+$/, "");
+    const toWithoutExt = toBasename.replace(/\.[^.]+$/, "");
+    const importPattern1 = new RegExp(`(['"\`])([./]*(?:[^'"\`]*/)?)${escapeRegex(fromWithoutExt)}\\1`, "g");
+    updated = updated.replace(importPattern1, (_match, quote, pathPart) => {
+      return `${quote}${pathPart}${toWithoutExt}${quote}`;
+    });
+    const importPattern2 = new RegExp(`(['"\`])([./]*(?:[^'"\`]*/)?)${escapeRegex(fromBasename)}\\1`, "g");
+    updated = updated.replace(importPattern2, (_match, quote, pathPart) => {
+      return `${quote}${pathPart}${toBasename}${quote}`;
+    });
+  }
+  if (updated !== content) {
+    await fs.writeFile(filePath, updated, "utf-8");
+    return true;
+  }
+  return false;
+}
+function escapeRegex(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+async function isTextFile(filePath) {
+  try {
+    const fd = await fs.open(filePath, "r");
+    const buffer = Buffer.alloc(512);
+    const { bytesRead } = await fd.read(buffer, 0, 512, 0);
+    await fd.close();
+    if (bytesRead === 0)
+      return true;
+    for (let i = 0;i < bytesRead; i++) {
+      if (buffer[i] === 0)
+        return false;
+    }
+    let printableCount = 0;
+    for (let i = 0;i < bytesRead; i++) {
+      const byte = buffer[i];
+      if (byte >= 32 && byte <= 126 || byte === 9 || byte === 10 || byte === 13) {
+        printableCount++;
+      }
+    }
+    return printableCount / bytesRead > 0.85;
+  } catch {
+    return false;
+  }
+}
 async function renameRecursive(root, style = "title_underscore", options = {}) {
   const performed = [];
+  const updateContentEnabled = options.updateContent ?? true;
   async function walk(current) {
     const entries = await fs.readdir(current, { withFileTypes: true });
     for (const e of entries) {
@@ -120,19 +179,50 @@ async function renameRecursive(root, style = "title_underscore", options = {}) {
     }
   }
   await walk(root);
+  if (!options.dryRun && updateContentEnabled && performed.length > 0) {
+    const filesToUpdate = [];
+    async function collectFiles(dir) {
+      const entries = await fs.readdir(dir, { withFileTypes: true });
+      for (const e of entries) {
+        const full = path.join(dir, e.name);
+        if (e.isFile()) {
+          filesToUpdate.push(full);
+        } else if (e.isDirectory()) {
+          await collectFiles(full);
+        }
+      }
+    }
+    await collectFiles(root);
+    for (const file of filesToUpdate) {
+      try {
+        if (await isTextFile(file)) {
+          await updateFileReferences(file, performed);
+        }
+      } catch (err) {}
+    }
+  }
   return performed;
 }
 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] [--no-update-content]");
+    console.log("Styles: title_underscore, pascal_underscore, snake, kebab, camel, pascal, upper, lower");
+    console.log("Options:");
+    console.log("  --dry, -n              Preview changes without applying them");
+    console.log("  --no-update-content    Skip updating import/require statements in files");
+    process.exit(0);
+  }
   const dryRun = args.includes("--dry") || args.includes("-n");
+  const updateContent = !args.includes("--no-update-content");
   if (!rootArg || !styleArg) {
-    console.error("Usage: rename <root> <style> [--dry|-n]");
-    console.error("Styles: title_underscore, snake, kebab, camel, pascal, upper, lower");
+    console.error("Usage: rename <root> <style> [--dry|-n] [--no-update-content]");
+    console.error("Styles: title_underscore, pascal_underscore, snake, kebab, camel, pascal, upper, lower");
     process.exit(1);
   }
-  renameRecursive(rootArg, styleArg, { dryRun }).then((performed) => {
+  renameRecursive(rootArg, styleArg, { dryRun, updateContent }).then((performed) => {
     if (dryRun) {
       console.log(`Dry run - would rename ${performed.length} items:`);
     } else {

package/bin/commands/git/fodd.sh

@@ -1 +1,4 @@
+#!/bin/bash
+# @description Fetch and update develop branch from origin
+
 git fetch origin develop:develop

package/bin/commands/git/precommit.sh

@@ -1,3 +1,6 @@
+#!/bin/bash
+# @description Run build and stage bin/ directory before commit
+
 echo "Running build before commit..."
 bun run build
 git add bin/

package/bin/commands/git/switch-clean.sh

@@ -0,0 +1,68 @@
+#!/bin/bash
+# @description Safely switch to a branch and delete the previous one (local & remote)
+
+# Git switch and clean: Safely switch to a branch and delete the old one
+# Usage: switch-clean <target-branch>
+
+set -e
+
+# Get target branch from argument
+TARGET_BRANCH="$1"
+
+if [ -z "$TARGET_BRANCH" ]; then
+  echo "Error: Target branch is required"
+  echo "Usage: switch-clean <target-branch>"
+  exit 1
+fi
+
+# Get current branch
+CURRENT_BRANCH=$(git branch --show-current)
+
+if [ -z "$CURRENT_BRANCH" ]; then
+  echo "Error: Not on a branch (detached HEAD)"
+  exit 1
+fi
+
+# Check if already on target branch
+if [ "$CURRENT_BRANCH" = "$TARGET_BRANCH" ]; then
+  echo "Error: Already on branch '$TARGET_BRANCH'"
+  exit 1
+fi
+
+# Check for uncommitted changes
+if ! git diff-index --quiet HEAD --; then
+  echo "Error: You have uncommitted changes. Please commit or stash them first."
+  exit 1
+fi
+
+# Check if current branch has unpushed commits
+UNPUSHED=$(git log @{u}.. --oneline 2>/dev/null || echo "")
+if [ -n "$UNPUSHED" ]; then
+  echo "Error: Current branch '$CURRENT_BRANCH' has unpushed commits:"
+  echo "$UNPUSHED"
+  exit 1
+fi
+
+# Fetch target branch from origin
+echo "Fetching $TARGET_BRANCH from origin..."
+git fetch origin "$TARGET_BRANCH:$TARGET_BRANCH" 2>/dev/null || {
+  echo "Error: Failed to fetch branch '$TARGET_BRANCH' from origin"
+  exit 1
+}
+
+# Checkout to target branch
+echo "Switching to $TARGET_BRANCH..."
+git checkout "$TARGET_BRANCH"
+
+# Delete local branch
+echo "Deleting local branch $CURRENT_BRANCH..."
+git branch -d "$CURRENT_BRANCH"
+
+# Delete remote branch if it exists
+if git ls-remote --exit-code --heads origin "$CURRENT_BRANCH" > /dev/null 2>&1; then
+  echo "Deleting remote branch $CURRENT_BRANCH..."
+  git push origin --delete "$CURRENT_BRANCH"
+  echo "✓ Switched to '$TARGET_BRANCH' and deleted '$CURRENT_BRANCH' (local & remote)"
+else
+  echo "✓ Switched to '$TARGET_BRANCH' and deleted '$CURRENT_BRANCH' (local only)"
+fi

package/bin/commands/hello/world.sh

@@ -1 +1,4 @@
+#!/bin/bash
+# @description Print a personalized hello world message
+
 echo "Hello World, {{name}}"

package/bin/commands/nvm/install.sh

@@ -1 +1,4 @@
+#!/bin/bash
+# @description Install Node Version Manager (nvm)
+
 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash

package/bin/commands/nvm/lts.sh

@@ -1,2 +1,5 @@
+#!/bin/bash
+# @description Install and use Node.js LTS version
+
 nvm install --lts
 nvm use --lts

package/bin/commands/ssh/init-dir.sh

@@ -1,6 +1,16 @@
-mkdir ~/.ssh
+#!/bin/bash
+# @description Initialize SSH directory with proper permissions
+
+# Create .ssh directory if it doesn't exist
+mkdir -p ~/.ssh
+
+# Create files if they don't exist
 touch ~/.ssh/known_hosts
 touch ~/.ssh/config
+
+# Set permissions (works on Unix/Linux/macOS and Git Bash on Windows)
 chmod 700 ~/.ssh
 chmod 644 ~/.ssh/known_hosts
 chmod 644 ~/.ssh/config
+
+echo "✓ SSH directory initialized at ~/.ssh"

package/bin/index.js

@@ -23,7 +23,7 @@ async function getVersion() {
 function detectShell() {
   const isWindows = os.platform() === "win32";
   if (isWindows) {
-    return "powershell";
+    return "bash";
   }
   return "bash";
 }
@@ -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.4.0",
   "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",