lechnerio-git-hooks 1.1.7 → 1.1.9

package/hooks/post-commit

@@ -1,292 +1,303 @@
-#!/bin/bash
-
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-CYAN='\033[0;36m'
-GRAY='\033[0;90m'
-NC='\033[0m'
-
-if [ "$_SKIP_POST_COMMIT" = "1" ]; then
-    exit 0
-fi
-export _SKIP_POST_COMMIT=1
-
-DRY_RUN=${1:-false}
-
-get_version() {
-    node -p "require('./package.json').version"
-}
-
-get_subpatch() {
-    local ver=$(get_version)
-    if [[ "$ver" =~ ^[0-9]+\.[0-9]+\.[0-9]+([a-z])$ ]]; then
-        echo "${BASH_REMATCH[1]}"
-    else
-        echo ""
-    fi
-}
-
-get_base_version() {
-    local ver=$(get_version)
-    echo "$ver" | sed 's/[a-z]$//'
-}
-
-next_subpatch() {
-    local current_sub=$(get_subpatch)
-    if [ -z "$current_sub" ]; then
-        echo "a"
-    else
-        echo "$current_sub" | tr 'a-y' 'b-z'
-    fi
-}
-
-set_version() {
-    local new_ver="$1"
-    node -e "
-const fs = require('fs');
-const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8'));
-pkg.version = '$new_ver';
-fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\n');
-"
-}
-
-bump_and_amend() {
-    local new_ver="$1"
-    local label="$2"
-    set_version "$new_ver"
-    git add package.json
-    git commit --amend --no-edit
-    git tag -f -a "v${new_ver}" -m "v${new_ver}"
-    node scripts/generate-changelog.mjs 2>/dev/null
-    git add data/changelog.json
-    git commit --amend --no-edit --no-verify
-    git tag -f -a "v${new_ver}" -m "v${new_ver}"
-    echo -e "${GREEN}✅ $label version bumped to ${new_ver}${NC}"
-}
-
-commit_message=$(git log -1 --pretty=%B)
-if [[ "$commit_message" == *"Bump version"* ]] || [[ "$commit_message" == *"bump version"* ]]; then
-    echo -e "${YELLOW}⏭️  Skipping post-commit actions for version bump commit${NC}"
-    exit 0
-fi
-
-echo
-echo -e "${GREEN}🎉 Commit completed successfully!${NC}"
-echo
-
-node scripts/generate-changelog.mjs 2>/dev/null
-if ! git diff --quiet data/changelog.json 2>/dev/null; then
-    git add data/changelog.json
-    git commit --amend --no-edit --no-verify
-    echo -e "${CYAN}📋 Changelog updated${NC}"
-    echo
-fi
-
-files_changed=$(git diff --name-only HEAD~1 HEAD 2>/dev/null | wc -l)
-lines_changed=$(git diff --shortstat HEAD~1 HEAD 2>/dev/null)
-
-if [ "$files_changed" -eq 0 ] || [ -z "$lines_changed" ]; then
-    echo -e "${YELLOW}⚠️  No file changes detected in this commit.${NC}"
-    echo -e "${YELLOW}⏭️  Skipping version bump.${NC}"
-    echo
-
-    if [ -n "$POST_ACTION" ]; then
-        choice="$POST_ACTION"
-    elif exec < /dev/tty 2>/dev/null; then
-        echo -e "${CYAN}What would you like to do next?${NC}"
-        echo
-        echo "1) Push to GitHub"
-        echo "2) Merge to Main"
-        echo -e "${GRAY}0) None${NC}"
-        echo
-        echo -n "Select option (1-2, Enter for Default or 0 to skip): "
-        read -r choice
-        choice=${choice:-1}
-    else
-        choice=0
-    fi
-    echo
-
-    case $choice in
-        1)
-            echo -e "${YELLOW}✈️  Pushing to GitHub...${NC}"
-            if [ "$DRY_RUN" = "true" ]; then
-                echo -e "${YELLOW}[DRY RUN] Would execute: git push${NC}"
-            else
-                git push --follow-tags && git push --tags
-                if [ $? -eq 0 ]; then
-                    echo -e "${GREEN}✅ Successfully pushed to GitHub${NC}"
-                else
-                    echo -e "${RED}❌ Failed to push to GitHub${NC}"
-                fi
-            fi
-            ;;
-        2)
-            echo -e "${YELLOW}🔄 Merging to main...${NC}"
-            if [ "$DRY_RUN" = "true" ]; then
-                echo -e "${YELLOW}[DRY RUN] Would execute: git checkout main && git merge $(git branch --show-current)${NC}"
-            else
-                current_branch=$(git branch --show-current)
-                git checkout main
-                git merge "$current_branch"
-                if [ $? -eq 0 ]; then
-                    echo -e "${GREEN}✅ Successfully merged to main${NC}"
-                    git checkout "$current_branch"
-                else
-                    echo -e "${RED}❌ Failed to merge to main${NC}"
-                    git checkout "$current_branch"
-                fi
-            fi
-            ;;
-        0)
-            echo -e "${YELLOW}⏭️  Skipping additional actions${NC}"
-            ;;
-    esac
-    echo
-    exit 0
-fi
-
-echo -e "${BLUE}📝 Changes in this commit:${NC}"
-echo -e "${YELLOW}$lines_changed${NC}"
-echo
-
-current_ver=$(get_version)
-base_ver=$(get_base_version)
-sub=$(get_subpatch)
-next_sub=$(next_subpatch)
-
-IFS='.' read -r major minor patch_raw <<< "$base_ver"
-patch=$((patch_raw))
-next_patch=$((patch + 1))
-next_minor=$((minor + 1))
-next_major=$((major + 1))
-
-subtle_ver="${base_ver}${next_sub}"
-patch_ver="${major}.${minor}.${next_patch}"
-minor_ver="${major}.${next_minor}.0"
-major_ver="${next_major}.0.0"
-
-if [ -n "$VERSION_BUMP" ]; then
-    version_choice="$VERSION_BUMP"
-elif exec < /dev/tty 2>/dev/null; then
-    echo -e "${CYAN}What version bump would you like to apply?${NC}"
-    echo
-    echo -e "1) Subtle Bump ${YELLOW}(default)${NC} ${GRAY}${current_ver} -> ${subtle_ver}${NC} - typos, formatting, comments, etc."
-    echo -e "2) Bump Patch ${GRAY}${current_ver} -> ${patch_ver}${NC} - bug fixes, small changes"
-    echo -e "3) Bump Minor ${GRAY}${current_ver} -> ${minor_ver}${NC} - new features, backwards compatible"
-    echo -e "4) Bump Major ${GRAY}${current_ver} -> ${major_ver}${NC} - breaking changes"
-    echo -e "${GRAY}0) Nothing - skip version bump${NC}"
-    echo
-    echo -n "Select option (1-4, Enter for Default or 0 to skip): "
-    read -r version_choice
-    version_choice=${version_choice:-1}
-else
-    echo -e "${YELLOW}⏭️  No TTY available and VERSION_BUMP not set, skipping version bump${NC}"
-    version_choice=0
-fi
-
-echo
-
-case $version_choice in
-    1)
-        echo -e "${YELLOW}📦 Subtle bump...${NC}"
-        if [ "$DRY_RUN" = "true" ]; then
-            echo -e "${YELLOW}[DRY RUN] Would bump to ${subtle_ver}${NC}"
-        else
-            bump_and_amend "$subtle_ver" "Subtle"
-        fi
-        ;;
-    2)
-        echo -e "${YELLOW}📦 Bumping patch version...${NC}"
-        if [ "$DRY_RUN" = "true" ]; then
-            echo -e "${YELLOW}[DRY RUN] Would bump to ${patch_ver}${NC}"
-        else
-            bump_and_amend "$patch_ver" "Patch"
-        fi
-        ;;
-    3)
-        echo -e "${YELLOW}📦 Bumping minor version...${NC}"
-        if [ "$DRY_RUN" = "true" ]; then
-            echo -e "${YELLOW}[DRY RUN] Would bump to ${minor_ver}${NC}"
-        else
-            bump_and_amend "$minor_ver" "Minor"
-        fi
-        ;;
-    4)
-        echo -e "${YELLOW}📦 Bumping major version...${NC}"
-        if [ "$DRY_RUN" = "true" ]; then
-            echo -e "${YELLOW}[DRY RUN] Would bump to ${major_ver}${NC}"
-        else
-            bump_and_amend "$major_ver" "Major"
-        fi
-        ;;
-    0)
-        echo -e "${YELLOW}⏭️  Skipping version bump${NC}"
-        ;;
-    *)
-        echo -e "${RED}❌ Invalid option. Skipping version bump${NC}"
-        ;;
-esac
-
-echo
-
-if [ -n "$POST_ACTION" ]; then
-    choice="$POST_ACTION"
-elif exec < /dev/tty 2>/dev/null; then
-    echo -e "${CYAN}What would you like to do next?${NC}"
-    echo
-    echo -e "1) Push to GitHub ${YELLOW}(default)${NC}"
-    echo "2) Merge to Main"
-    echo -e "${GRAY}0) None${NC}"
-    echo
-    echo -n "Select option (1-2, Enter for Default or 0 to skip): "
-    read -r choice
-    choice=${choice:-1}
-else
-    choice=0
-fi
-
-echo
-
-case $choice in
-    1)
-        echo -e "${YELLOW}✈️  Pushing to GitHub...${NC}"
-        if [ "$DRY_RUN" = "true" ]; then
-            echo -e "${YELLOW}[DRY RUN] Would execute: git push --follow-tags && git push --tags${NC}"
-        else
-            git push --follow-tags && git push --tags
-            if [ $? -eq 0 ]; then
-                echo -e "${GREEN}✅ Successfully pushed to GitHub${NC}"
-            else
-                echo -e "${RED}❌ Failed to push to GitHub${NC}"
-            fi
-        fi
-        ;;
-    2)
-        echo -e "${YELLOW}🔄 Merging to main...${NC}"
-        if [ "$DRY_RUN" = "true" ]; then
-            echo -e "${YELLOW}[DRY RUN] Would execute: git checkout main && git merge $(git branch --show-current)${NC}"
-        else
-            current_branch=$(git branch --show-current)
-            git checkout main
-            git merge "$current_branch"
-            if [ $? -eq 0 ]; then
-                echo -e "${GREEN}✅ Successfully merged to main${NC}"
-                git checkout "$current_branch"
-            else
-                echo -e "${RED}❌ Failed to merge to main${NC}"
-                git checkout "$current_branch"
-            fi
-        fi
-        ;;
-    0)
-        echo -e "${YELLOW}⏭️  Skipping additional actions${NC}"
-        ;;
-    *)
-        echo -e "${RED}❌ Invalid option. Skipping additional actions${NC}"
-        ;;
-esac
-
-echo
+#!/bin/bash
+
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+CYAN='\033[0;36m'
+GRAY='\033[0;90m'
+NC='\033[0m'
+
+if [ "$_SKIP_POST_COMMIT" = "1" ]; then
+    exit 0
+fi
+export _SKIP_POST_COMMIT=1
+
+DRY_RUN=${1:-false}
+
+# --- utility functions ---
+
+typecheck_before_push() {
+    if [ ! -f "tsconfig.json" ]; then
+        return 0
+    fi
+    echo -e "${CYAN}🔍 Running type check before push...${NC}"
+    if npx tsc --noEmit 2>&1; then
+        echo -e "${GREEN}✅ Type check passed${NC}"
+        return 0
+    else
+        echo -e "${RED}❌ Type check failed — push aborted${NC}"
+        echo -e "${YELLOW}Fix the errors above and try again.${NC}"
+        return 1
+    fi
+}
+
+get_version() {
+    node -p "require('./package.json').version"
+}
+
+get_subpatch() {
+    local ver=$(get_version)
+    if [[ "$ver" =~ ^[0-9]+\.[0-9]+\.[0-9]+([a-z])$ ]]; then
+        echo "${BASH_REMATCH[1]}"
+    else
+        echo ""
+    fi
+}
+
+get_base_version() {
+    local ver=$(get_version)
+    echo "$ver" | sed 's/[a-z]$//'
+}
+
+next_subpatch() {
+    local current_sub=$(get_subpatch)
+    if [ -z "$current_sub" ]; then
+        echo "a"
+    else
+        echo "$current_sub" | tr 'a-y' 'b-z'
+    fi
+}
+
+set_version() {
+    local new_ver="$1"
+    node -e "
+const fs = require('fs');
+const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8'));
+pkg.version = '$new_ver';
+fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\n');
+"
+}
+
+bump_and_amend() {
+    local new_ver="$1"
+    local label="$2"
+    set_version "$new_ver"
+    git add package.json
+    git commit --amend --no-edit
+    git tag -f -a "v${new_ver}" -m "v${new_ver}"
+    node scripts/generate-changelog.mjs 2>/dev/null
+    git add data/changelog.json
+    git commit --amend --no-edit --no-verify
+    git tag -f -a "v${new_ver}" -m "v${new_ver}"
+    echo -e "${GREEN}✅ $label version bumped to ${new_ver}${NC}"
+}
+
+do_push() {
+    echo -e "${YELLOW}✈️  Pushing to GitHub...${NC}"
+    if [ "$DRY_RUN" = "true" ]; then
+        echo -e "${YELLOW}[DRY RUN] Would execute: git push --follow-tags && git push --tags${NC}"
+        return
+    fi
+    typecheck_before_push || return
+    git push --follow-tags && git push --tags
+    if [ $? -eq 0 ]; then
+        echo -e "${GREEN}✅ Successfully pushed to GitHub${NC}"
+    else
+        echo -e "${RED}❌ Failed to push to GitHub${NC}"
+    fi
+}
+
+do_merge() {
+    echo -e "${YELLOW}🔄 Merging to main...${NC}"
+    if [ "$DRY_RUN" = "true" ]; then
+        echo -e "${YELLOW}[DRY RUN] Would execute: git checkout main && git merge $(git branch --show-current)${NC}"
+        return
+    fi
+    local current_branch=$(git branch --show-current)
+    git checkout main
+    git merge "$current_branch"
+    if [ $? -eq 0 ]; then
+        echo -e "${GREEN}✅ Successfully merged to main${NC}"
+    else
+        echo -e "${RED}❌ Failed to merge to main${NC}"
+    fi
+    git checkout "$current_branch"
+}
+
+do_merge_and_push() {
+    echo -e "${YELLOW}🔄 Merging to main + pushing...${NC}"
+    if [ "$DRY_RUN" = "true" ]; then
+        echo -e "${YELLOW}[DRY RUN] Would execute: git push --follow-tags && git push --tags${NC}"
+        echo -e "${YELLOW}[DRY RUN] Would execute: git checkout main && git pull && git merge <branch> && git push${NC}"
+        return
+    fi
+    typecheck_before_push || return
+    local current_branch=$(git branch --show-current)
+    echo -e "${YELLOW}✈️  Pushing ${current_branch}...${NC}"
+    if ! git push --follow-tags || ! git push --tags; then
+        echo -e "${RED}❌ Failed to push ${current_branch}${NC}"
+        return
+    fi
+    echo -e "${GREEN}✅ Pushed ${current_branch}${NC}"
+    if ! git checkout main; then
+        echo -e "${RED}❌ Failed to checkout main${NC}"
+        return
+    fi
+    if ! git pull; then
+        echo -e "${RED}❌ Failed to pull main${NC}"
+        git checkout "$current_branch"
+        return
+    fi
+    if ! git merge "$current_branch"; then
+        echo -e "${RED}❌ Failed to merge ${current_branch} into main${NC}"
+        git checkout "$current_branch"
+        return
+    fi
+    echo -e "${GREEN}✅ Merged ${current_branch} into main${NC}"
+    if ! git push; then
+        echo -e "${RED}❌ Failed to push main${NC}"
+        git checkout "$current_branch"
+        return
+    fi
+    echo -e "${GREEN}✅ Pushed main${NC}"
+    git checkout "$current_branch"
+    echo -e "${GREEN}✅ Back on ${current_branch}${NC}"
+}
+
+run_post_action() {
+    local choice
+    if [ -n "$POST_ACTION" ]; then
+        choice="$POST_ACTION"
+    elif exec < /dev/tty 2>/dev/null; then
+        echo -e "${CYAN}What would you like to do next?${NC}"
+        echo
+        echo -e "1) Push to GitHub ${YELLOW}(default)${NC}"
+        echo "2) Merge to Main"
+        echo "3) Merge to Main + Push"
+        echo -e "${GRAY}0) None${NC}"
+        echo
+        echo -n "Select option (1-3, Enter for Default or 0 to skip): "
+        read -r choice
+        choice=${choice:-1}
+    else
+        choice=0
+    fi
+    echo
+
+    case $choice in
+        1) do_push ;;
+        2) do_merge ;;
+        3) do_merge_and_push ;;
+        0) echo -e "${YELLOW}⏭️  Skipping additional actions${NC}" ;;
+        *) echo -e "${RED}❌ Invalid option. Skipping additional actions${NC}" ;;
+    esac
+    echo
+}
+
+# --- main flow ---
+
+commit_message=$(git log -1 --pretty=%B)
+if [[ "$commit_message" == *"Bump version"* ]] || [[ "$commit_message" == *"bump version"* ]]; then
+    echo -e "${YELLOW}⏭️  Skipping post-commit actions for version bump commit${NC}"
+    exit 0
+fi
+
+echo
+echo -e "${GREEN}🎉 Commit completed successfully!${NC}"
+echo
+
+node scripts/generate-changelog.mjs 2>/dev/null
+if ! git diff --quiet data/changelog.json 2>/dev/null; then
+    git add data/changelog.json
+    git commit --amend --no-edit --no-verify
+    echo -e "${CYAN}📋 Changelog updated${NC}"
+    echo
+fi
+
+files_changed=$(git diff --name-only HEAD~1 HEAD 2>/dev/null | wc -l)
+lines_changed=$(git diff --shortstat HEAD~1 HEAD 2>/dev/null)
+
+if [ "$files_changed" -eq 0 ] || [ -z "$lines_changed" ]; then
+    echo -e "${YELLOW}⚠️  No file changes detected in this commit.${NC}"
+    echo -e "${YELLOW}⏭️  Skipping version bump.${NC}"
+    echo
+    run_post_action
+    exit 0
+fi
+
+echo -e "${BLUE}📝 Changes in this commit:${NC}"
+echo -e "${YELLOW}$lines_changed${NC}"
+echo
+
+current_ver=$(get_version)
+base_ver=$(get_base_version)
+sub=$(get_subpatch)
+next_sub=$(next_subpatch)
+
+IFS='.' read -r major minor patch_raw <<< "$base_ver"
+patch=$((patch_raw))
+next_patch=$((patch + 1))
+next_minor=$((minor + 1))
+next_major=$((major + 1))
+
+subtle_ver="${base_ver}${next_sub}"
+patch_ver="${major}.${minor}.${next_patch}"
+minor_ver="${major}.${next_minor}.0"
+major_ver="${next_major}.0.0"
+
+if [ -n "$VERSION_BUMP" ]; then
+    version_choice="$VERSION_BUMP"
+elif exec < /dev/tty 2>/dev/null; then
+    echo -e "${CYAN}What version bump would you like to apply?${NC}"
+    echo
+    echo -e "1) Subtle Bump ${YELLOW}(default)${NC} ${GRAY}${current_ver} -> ${subtle_ver}${NC} - typos, formatting, comments, etc."
+    echo -e "2) Bump Patch ${GRAY}${current_ver} -> ${patch_ver}${NC} - bug fixes, small changes"
+    echo -e "3) Bump Minor ${GRAY}${current_ver} -> ${minor_ver}${NC} - new features, backwards compatible"
+    echo -e "4) Bump Major ${GRAY}${current_ver} -> ${major_ver}${NC} - breaking changes"
+    echo -e "${GRAY}0) Nothing - skip version bump${NC}"
+    echo
+    echo -n "Select option (1-4, Enter for Default or 0 to skip): "
+    read -r version_choice
+    version_choice=${version_choice:-1}
+else
+    echo -e "${YELLOW}⏭️  No TTY available and VERSION_BUMP not set, skipping version bump${NC}"
+    version_choice=0
+fi
+
+echo
+
+case $version_choice in
+    1)
+        echo -e "${YELLOW}📦 Subtle bump...${NC}"
+        if [ "$DRY_RUN" = "true" ]; then
+            echo -e "${YELLOW}[DRY RUN] Would bump to ${subtle_ver}${NC}"
+        else
+            bump_and_amend "$subtle_ver" "Subtle"
+        fi
+        ;;
+    2)
+        echo -e "${YELLOW}📦 Bumping patch version...${NC}"
+        if [ "$DRY_RUN" = "true" ]; then
+            echo -e "${YELLOW}[DRY RUN] Would bump to ${patch_ver}${NC}"
+        else
+            bump_and_amend "$patch_ver" "Patch"
+        fi
+        ;;
+    3)
+        echo -e "${YELLOW}📦 Bumping minor version...${NC}"
+        if [ "$DRY_RUN" = "true" ]; then
+            echo -e "${YELLOW}[DRY RUN] Would bump to ${minor_ver}${NC}"
+        else
+            bump_and_amend "$minor_ver" "Minor"
+        fi
+        ;;
+    4)
+        echo -e "${YELLOW}📦 Bumping major version...${NC}"
+        if [ "$DRY_RUN" = "true" ]; then
+            echo -e "${YELLOW}[DRY RUN] Would bump to ${major_ver}${NC}"
+        else
+            bump_and_amend "$major_ver" "Major"
+        fi
+        ;;
+    0)
+        echo -e "${YELLOW}⏭️  Skipping version bump${NC}"
+        ;;
+    *)
+        echo -e "${RED}❌ Invalid option. Skipping version bump${NC}"
+        ;;
+esac
+
+echo
+
+run_post_action

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lechnerio-git-hooks",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "Shared git hooks for lechnerio projects",
   "type": "module",
   "scripts": {