@zairakai/js-dev-tools 1.2.4 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zairakai/js-dev-tools",
-  "version": "1.2.4",
+  "version": "1.3.0",
   "description": "The unified and centralized development toolkit for JavaScript/TypeScript projects - ESLint, Prettier, Stylelint, Knip, Vitest, Git Hooks, and GitLab CI pipeline templates",
   "keywords": [
     "dev-tools",

package/tools/make/core.mk

@@ -52,5 +52,8 @@ include $(NPM_DIRECTORY_TOOLS_MAKE_DIR)test.mk
 # 10. BATS shell script testing
 include $(NPM_DIRECTORY_TOOLS_MAKE_DIR)bats.mk
 
-# 11. Utilities (git, npm)
+# 11. Utilities (npm, maintenance)
 include $(NPM_DIRECTORY_TOOLS_MAKE_DIR)utils.mk
+
+# 12. Shared utilities (git, hooks, doctor)
+include $(NPM_DIRECTORY_TOOLS_MAKE_DIR)utils-shared.mk

package/tools/make/utils-shared.mk

@@ -0,0 +1,24 @@
+# Shared Utility Targets
+# Targets duplicated across PHP and JS toolchains
+
+## —— 🧰 Utils ——
+.PHONY: doctor
+doctor: ## Run environment diagnostics
+	@bash $(NPM_DIRECTORY_TOOLS_SCRIPTS_DIR)/doctor.sh
+
+## —— 🌿 Git ——
+.PHONY: install-hooks
+install-hooks: ## Install git hooks into .git/hooks
+	@bash $(NPM_DIRECTORY_TOOLS_SCRIPTS_DIR)/install-hooks.sh
+
+.PHONY: git-update
+git-update: ## Fast-forward all local branches that track a remote
+	@bash $(NPM_DIRECTORY_TOOLS_PACKAGE_ROOT)/tools/scripts/git-update.sh
+
+.PHONY: git-cleanup
+git-cleanup: ## Remove local branches whose remote tracking branch no longer exists
+	@bash $(NPM_DIRECTORY_TOOLS_PACKAGE_ROOT)/tools/scripts/git-cleanup.sh
+
+.PHONY: git-rebase
+git-rebase: ## Rebase the current branch to the selected one
+	@bash $(NPM_DIRECTORY_TOOLS_TOOLS_SCRIPTS_DIR)/git-rebase.sh

package/tools/make/utils.mk

@@ -23,22 +23,6 @@ package-validate: ## Validate package.json and lockfile sync
 	@$(NPM_DIRECTORY_TOOLS_PROJECT_ROOT)/node_modules/.bin/sort-package-json --check package.json
 
 ## —— 🧰 Utils ——
-.PHONY: doctor
-doctor: ## Run environment diagnostics
-	@bash $(NPM_DIRECTORY_TOOLS_SCRIPTS_DIR)/doctor.sh
-
 .PHONY: outdated
 outdated: ## Check for outdated npm dependencies
 	@bash $(NPM_DIRECTORY_TOOLS_SCRIPTS_DIR)/outdated.sh
-
-.PHONY: install-hooks
-install-hooks: ## Install git hooks into .git/hooks
-	@bash $(NPM_DIRECTORY_TOOLS_SCRIPTS_DIR)/install-hooks.sh
-
-.PHONY: git-update
-git-update: ## Fast-forward all local branches that track a remote
-	@bash $(NPM_DIRECTORY_TOOLS_PACKAGE_ROOT)/tools/scripts/git-update.sh
-
-.PHONY: git-cleanup
-git-cleanup: ## Remove local branches whose remote tracking branch no longer exists
-	@bash $(NPM_DIRECTORY_TOOLS_PACKAGE_ROOT)/tools/scripts/git-cleanup.sh

package/tools/scripts/git-rebase.sh

@@ -0,0 +1,107 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+echo ""
+echo "==== Interactive Rebase ===="
+echo ""
+
+# Ensure on branch
+current_branch=$(git symbolic-ref --short HEAD 2>/dev/null || true)
+
+if [ -z "$current_branch" ]; then
+  echo "Detached HEAD. Abort."
+  exit 1
+fi
+
+# Check clean working tree
+if ! git diff-index --quiet HEAD --; then
+  echo "Working tree dirty. Commit or stash first."
+  exit 1
+fi
+
+echo "Current branch : $current_branch"
+echo ""
+
+# Fetch latest remotes
+git fetch --all --prune
+
+# Build branch list
+mapfile -t local_branches < <(git for-each-ref --format='%(refname:short)' refs/heads/)
+mapfile -t remote_branches < <(git for-each-ref --format='%(refname:short)' refs/remotes/origin/)
+
+echo "Select branch to rebase onto:"
+echo ""
+
+index=1
+
+# Display local branches
+echo "---- Local branches ----"
+for branch in "${local_branches[@]}"; do
+  echo "[$index] $branch"
+  ((index++))
+done
+
+# Display remote branches
+echo ""
+echo "---- Remote branches (origin) ----"
+for branch in "${remote_branches[@]}"; do
+  echo "[$index] $branch"
+  ((index++))
+done
+
+echo ""
+
+# Read user choice
+read -rp "Enter number: " choice
+
+# Validate input
+if ! [[ "$choice" =~ ^[0-9]+$ ]]; then
+  echo "Invalid input."
+  exit 1
+fi
+
+# Resolve selected branch
+total_local=${#local_branches[@]}
+
+if (( choice <= total_local )); then
+  target_branch="${local_branches[$((choice-1))]}"
+else
+  target_branch="${remote_branches[$((choice-total_local-1))]}"
+fi
+
+# Prevent rebasing onto itself
+if [ "$target_branch" = "$current_branch" ]; then
+  echo "Cannot rebase onto the same branch."
+  exit 1
+fi
+
+echo ""
+echo "Rebasing '$current_branch' onto '$target_branch'..."
+echo ""
+
+# Rebase
+if git rebase "$target_branch"; then
+  echo ""
+  echo "==== Rebase OK ===="
+  echo ""
+
+  read -rp "Force push now? [y/N] " -n 1
+  echo ""
+
+  if [[ $REPLY =~ ^[Yy]$ ]]; then
+    git push --force-with-lease
+    echo "Push completed."
+  else
+    echo "Push skipped."
+  fi
+
+else
+  echo ""
+  echo "==== Conflict ===="
+  echo "Resolve conflicts, then:"
+  echo "  git rebase --continue"
+  echo ""
+  echo "Or abort:"
+  echo "  git rebase --abort"
+  exit 1
+fi