@tertium/hlpr 0.3.5 → 0.5.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
@@ -186,7 +196,7 @@ git clone https://github.com/tertiumnon/hlpr.git
 npm install
 
 # Build the project
-npm run build
+bun run build
 
 # Link for local development
 npm link

package/bin/commands/deploy/deploy/deploy.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+# @description Deploy application to remote server with environment variables
+
+SKIP_BUILD="{{SKIP_BUILD}}"
+DEPLOY_USER="{{DEPLOY_USER}}"
+DEPLOY_HOST="{{DEPLOY_HOST}}"
+DEPLOY_PATH="{{DEPLOY_PATH}}"
+APP_NAME="{{APP_NAME}}"
+
+echo "Deploying to $DEPLOY_HOST:$DEPLOY_PATH"
+echo "=========================================="
+
+# Build phase (unless skip-build is set)
+if [ "$SKIP_BUILD" != "true" ]; then
+  echo "Building..."
+  bun run build
+  if [ $? -ne 0 ]; then
+    echo "✗ Build failed"
+    exit 1
+  fi
+fi
+
+# Deploy phase
+echo ""
+echo "Copying files to remote server..."
+scp -r dist/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/
+if [ $? -ne 0 ]; then
+  echo "✗ SCP failed"
+  exit 1
+fi
+
+echo ""
+echo "Installing dependencies and restarting service..."
+ssh $DEPLOY_USER@$DEPLOY_HOST "cd $DEPLOY_PATH && bun install --production && pm2 restart $APP_NAME --update-env"
+if [ $? -ne 0 ]; then
+  echo "✗ Remote deployment failed"
+  exit 1
+fi
+
+echo ""
+echo "✓ Deployment complete!"

package/bin/commands/deploy/deploy.js

@@ -0,0 +1,93 @@
+#!/usr/bin/env node
+
+// src/commands/deploy/deploy.ts
+import { execSync } from "child_process";
+import { existsSync, readFileSync } from "fs";
+import * as path from "path";
+import { fileURLToPath } from "url";
+var __filename2 = fileURLToPath(import.meta.url);
+var __dirname2 = path.dirname(__filename2);
+function loadEnv(projectDir) {
+  const envPath = path.join(projectDir, ".env");
+  if (!existsSync(envPath)) {
+    console.error("Error: .env file not found");
+    console.error(`Please copy .env.example to .env in ${projectDir}`);
+    process.exit(1);
+  }
+  const env = {};
+  const content = readFileSync(envPath, "utf-8");
+  content.split(`
+`).forEach((line) => {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#"))
+      return;
+    const [key, ...valueParts] = trimmed.split("=");
+    if (key && valueParts.length > 0) {
+      env[key.trim()] = valueParts.join("=").trim();
+    }
+  });
+  return env;
+}
+function validate(env) {
+  const required = ["DEPLOY_USER", "DEPLOY_HOST", "DEPLOY_PATH", "APP_NAME"];
+  const missing = required.filter((key) => !env[key]);
+  if (missing.length > 0) {
+    console.error(`Error: Missing environment variables: ${missing.join(", ")}`);
+    process.exit(1);
+  }
+}
+function executeScript(scriptContent, variables, cwd) {
+  let script = scriptContent;
+  for (const [key, value] of Object.entries(variables)) {
+    script = script.replace(new RegExp(`{{${key}}}`, "g"), value);
+  }
+  const lines = script.split(`
+`);
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#") || trimmed.startsWith("#!/"))
+      continue;
+    try {
+      console.log(`→ ${trimmed}`);
+      execSync(trimmed, {
+        stdio: "inherit",
+        cwd,
+        shell: true
+      });
+    } catch (error) {
+      console.error(`
+✗ Command failed: ${trimmed}
+`);
+      process.exit(1);
+    }
+  }
+}
+function deploy() {
+  const skipBuild = process.argv[2] === "skip-build";
+  const projectDir = process.cwd();
+  const env = loadEnv(projectDir);
+  validate(env);
+  const scriptPath = path.join(__dirname2, "deploy.sh");
+  if (!existsSync(scriptPath)) {
+    console.error(`Error: Deploy script not found at ${scriptPath}`);
+    process.exit(1);
+  }
+  const scriptContent = readFileSync(scriptPath, "utf-8");
+  const variables = {
+    ...env,
+    SKIP_BUILD: skipBuild ? "true" : "false"
+  };
+  console.log(`
+Deploying to ${env.DEPLOY_HOST}:${env.DEPLOY_PATH}`);
+  console.log(`==========================================
+`);
+  try {
+    executeScript(scriptContent, variables, projectDir);
+  } catch (error) {
+    console.error(`
+✗ Deployment failed: ${error.message}
+`);
+    process.exit(1);
+  }
+}
+deploy();

package/bin/commands/deploy/deploy.service.js

@@ -0,0 +1,111 @@
+// src/commands/deploy/deploy.service.ts
+import { execSync } from "node:child_process";
+import * as fs from "node:fs";
+
+class DeployService {
+  config;
+  constructor(config) {
+    this.config = config;
+  }
+  log(message) {
+    console.log(`[${new Date().toISOString()}] ${message}`);
+  }
+  async copyToServer() {
+    this.log("Copying dist folder to remote server...");
+    const { remoteHost, remoteUser, deployPath, localDist, envFile } = this.config;
+    if (!fs.existsSync(localDist)) {
+      throw new Error(`Local dist folder not found: ${localDist}`);
+    }
+    const sshHost = `${remoteUser}@${remoteHost}`;
+    const tempPath = `${deployPath}_tmp`;
+    try {
+      this.log(`Creating temp directory on remote: ${tempPath}`);
+      execSync(`ssh ${sshHost} "mkdir -p ${tempPath} && rm -rf ${tempPath}/*"`, { stdio: "inherit" });
+      this.log(`Copying ${localDist} to ${sshHost}:${tempPath}/`);
+      execSync(`scp -r "${localDist}" ${sshHost}:${tempPath}/dist`, {
+        stdio: "inherit"
+      });
+      if (envFile && fs.existsSync(envFile)) {
+        this.log(`Copying ${envFile} to remote`);
+        execSync(`scp "${envFile}" ${sshHost}:${tempPath}/.env`, {
+          stdio: "inherit"
+        });
+      }
+      if (fs.existsSync("package.json")) {
+        this.log("Copying package.json to remote");
+        execSync(`scp package.json ${sshHost}:${tempPath}/`, {
+          stdio: "inherit"
+        });
+      }
+      this.log(`Moving files from temp to deploy path...`);
+      const moveCmd = `rm -rf ${deployPath}/dist && ` + `mv ${tempPath}/dist ${deployPath}/ && ` + `[ -f ${tempPath}/.env ] && mv ${tempPath}/.env ${deployPath}/.env || true && ` + `[ -f ${tempPath}/package.json ] && mv ${tempPath}/package.json ${deployPath}/ || true && ` + `rm -rf ${tempPath}`;
+      execSync(`ssh ${sshHost} "${moveCmd}"`, { stdio: "inherit" });
+      this.log("✓ Files copied successfully");
+    } catch (error) {
+      throw new Error(`Failed to copy files: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  }
+  async installDependencies() {
+    if (this.config.skipInstall) {
+      this.log("Skipping dependency installation");
+      return;
+    }
+    this.log("Installing dependencies on server...");
+    const { remoteHost, remoteUser, deployPath } = this.config;
+    const sshHost = `${remoteUser}@${remoteHost}`;
+    try {
+      const cmd = `cd ${deployPath} && bun install --production`;
+      execSync(`ssh ${sshHost} "${cmd}"`, { stdio: "inherit" });
+      this.log("✓ Dependencies installed");
+    } catch (error) {
+      this.log("⚠ Dependency installation skipped or failed");
+    }
+  }
+  async restartProcess() {
+    if (this.config.skipRestart) {
+      this.log("Skipping process restart");
+      return;
+    }
+    this.log("Restarting application via PM2...");
+    const { remoteHost, remoteUser, deployPath, appName, port } = this.config;
+    const sshHost = `${remoteUser}@${remoteHost}`;
+    try {
+      const portOpt = port ? ` --env PORT=${port}` : "";
+      const cmd = `cd ${deployPath} && ` + `(pm2 restart ${appName} --update-env 2>/dev/null || ` + `pm2 start dist/index.js --name ${appName}${portOpt} 2>/dev/null) && ` + `pm2 save 2>/dev/null || true`;
+      execSync(`ssh ${sshHost} "bash -l -c '${cmd}'"`, { stdio: "inherit" });
+      this.log("✓ Process restart attempted");
+    } catch (error) {
+      this.log("⚠ PM2 restart skipped - may need manual setup");
+    }
+  }
+  async deploy() {
+    const startTime = new Date().toISOString();
+    try {
+      this.log("Starting deployment...");
+      await this.copyToServer();
+      await this.installDependencies();
+      await this.restartProcess();
+      this.log("✅ Deployment completed successfully");
+      return {
+        success: true,
+        message: "Deployment completed successfully",
+        timestamp: startTime
+      };
+    } catch (error) {
+      const message = error instanceof Error ? error.message : "Unknown error";
+      this.log(`❌ Deployment failed: ${message}`);
+      return {
+        success: false,
+        message,
+        timestamp: startTime
+      };
+    }
+  }
+}
+async function createDeployService(config) {
+  return new DeployService(config);
+}
+export {
+  createDeployService,
+  DeployService
+};

package/bin/commands/deploy/deploy.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+# @description Deploy application to remote server with environment variables
+
+SKIP_BUILD="{{SKIP_BUILD}}"
+DEPLOY_USER="{{DEPLOY_USER}}"
+DEPLOY_HOST="{{DEPLOY_HOST}}"
+DEPLOY_PATH="{{DEPLOY_PATH}}"
+APP_NAME="{{APP_NAME}}"
+
+echo "Deploying to $DEPLOY_HOST:$DEPLOY_PATH"
+echo "=========================================="
+
+# Build phase (unless skip-build is set)
+if [ "$SKIP_BUILD" != "true" ]; then
+  echo "Building..."
+  bun run build
+  if [ $? -ne 0 ]; then
+    echo "✗ Build failed"
+    exit 1
+  fi
+fi
+
+# Deploy phase
+echo ""
+echo "Copying files to remote server..."
+scp -r dist/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/
+if [ $? -ne 0 ]; then
+  echo "✗ SCP failed"
+  exit 1
+fi
+
+echo ""
+echo "Installing dependencies and restarting service..."
+ssh $DEPLOY_USER@$DEPLOY_HOST "cd $DEPLOY_PATH && bun install --production && pm2 restart $APP_NAME --update-env"
+if [ $? -ne 0 ]; then
+  echo "✗ Remote deployment failed"
+  exit 1
+fi
+
+echo ""
+echo "✓ Deployment complete!"

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

@@ -87,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) {
@@ -126,6 +179,28 @@ 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, "/"))) {
@@ -133,17 +208,21 @@ if (import.meta.url.endsWith(process.argv[1]?.replace(/\\/g, "/"))) {
   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("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("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";
 }

package/package.json

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