@mihairo/cmt 1.0.0 → 1.1.1

package/README.md

@@ -2,7 +2,7 @@
 
 > Conventional Commits CLI — zero dependencies, one bash script.
 
-[![npm](https://img.shields.io/npm/v/cmt-cli?label=npm)](https://npmjs.com/package/cmt-cli)
+[![npm](https://img.shields.io/npm/v/@mihairo/cmt?label=npm)](https://npmjs.com/package/@mihairo/cmt)
 [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-fe5196?logo=conventionalcommits)](https://conventionalcommits.org)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
 
@@ -13,7 +13,7 @@
 **npm (any project — no Node required at runtime)**
 
 ```bash
-npm install -g cmt-cli
+npm install -g @mihairo/cmt
 ```
 
 **Homebrew**
@@ -124,7 +124,7 @@ validate it automatically — no extension needed.
 ```json
 {
   "$schema": "https://raw.githubusercontent.com/mihai-ro/cmt/main/schema/cmt.schema.json",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "customTypes": [
     {
       "type": "wip",

package/cmt

@@ -6,7 +6,7 @@
 # =============================================================================
 set -euo pipefail
 
-CC_VERSION="1.0.0"
+CC_VERSION="1.1.0"
 CC_CONFIG_FILE=".cmt.json"
 CC_SCHEMA_URL="https://raw.githubusercontent.com/mihai-ro/cmt/main/schema/cmt.schema.json"
 
@@ -227,7 +227,7 @@ load_config() {
 _pick() {
   local _var="$1" _prompt="$2"; shift 2
   local -a _items=("$@")
-  local _n=${#_items[@]} _cur=0 _top=0 _view=7 _k1 _k2 _k3
+  local _n=${#_items[@]} _cur=0 _top=0 _view=7 _k1 _k2 _k3 _last_dl=0
 
   exec 9<>/dev/tty
 
@@ -259,17 +259,17 @@ _pick() {
   }
 
   # draw the visible window of _view items starting at _top
+  # updates _last_dl with the number of lines actually drawn
   _draw() {
+    _last_dl=0
     local _i _end
     _end=$(( _top + _view ))
     [[ $_end -gt $_n ]] && _end=$_n
-    local _visible=$(( _end - _top ))
 
-    # scroll hint above
+    # scroll hint above — only when items are hidden above
     if [[ $_top -gt 0 ]]; then
       printf "  ${MUTED}↑ %d more${RESET}\033[K\n" "$_top" >&9
-    else
-      printf "\033[K\n" >&9
+      _last_dl=$(( _last_dl + 1 ))
     fi
 
     for (( _i=_top; _i<_end; _i++ )); do
@@ -278,6 +278,7 @@ _pick() {
       else
         printf "  ${MUTED}·${RESET} ${MUTED}%s${RESET}\033[K\n" "${_items[$_i]}" >&9
       fi
+      _last_dl=$(( _last_dl + 1 ))
     done
 
     # scroll hint below
@@ -287,11 +288,9 @@ _pick() {
     else
       printf "\033[K\n" >&9
     fi
+    _last_dl=$(( _last_dl + 1 ))
   }
 
-  # total drawn lines = _view items + 2 hint lines — fixed for this pick session
-  local _dl=$(( _view < _n ? _view + 2 : _n + 2 ))
-
   printf "\033[?25l" >&9
   printf "\n  ${ACCENT_BOLD}%s${RESET}\n\n" "$_prompt" >&9
   _draw
@@ -314,12 +313,13 @@ _pick() {
       j) _pick_move_down ;;
       q|$'\003') stty "$_old" <&9 2>/dev/null; trap - EXIT INT TERM; exec 9>&-; exit 1 ;;
     esac
-    printf "\033[%dA" "$_dl" >&9
+    printf "\033[%dA" "$_last_dl" >&9
+    printf "\033[J" >&9
     _draw
   done
 
   # collapse to just the selected line
-  printf "\033[%dA" "$_dl" >&9
+  printf "\033[%dA" "$_last_dl" >&9
   printf "\033[J" >&9
   printf "  ${ACCENT_BOLD}❯${RESET} ${BOLD}%s${RESET}\n" "${_items[$_cur]}" >&9
 
@@ -335,7 +335,7 @@ _pick() {
 _pick_fallback() {
   local _var="$1" _prompt="$2"; shift 2
   local -a _items=("$@") _i=1 _choice
-  printf "\n\033[1m%s\033[0m\n\n" "$_prompt" >/dev/tty
+  printf "\n\033[1m%s\033[0m\n" "$_prompt" >/dev/tty
   for _item in "${_items[@]}"; do
     printf "  %2d) %s\n" "$_i" "$_item" >/dev/tty
     _i=$(( _i + 1 ))
@@ -492,13 +492,42 @@ assemble_message() {
   COMMIT_MESSAGE="$msg"
 }
 
+_print_commit_box() {
+  local msg="$1" _max=0 _line _W _content_w _bar _bottom _max_W
+
+  _max_W=$(( ${COLUMNS:-$(tput cols 2>/dev/null || echo 80)} - 2 ))
+  [[ $_max_W -lt 50 ]] && _max_W=50
+
+  while IFS= read -r _line; do
+    [[ ${#_line} -gt $_max ]] && _max=${#_line}
+  done <<< "$msg"
+
+  _W=$(( _max + 6 ))
+  [[ $_W -lt 50 ]] && _W=50
+  [[ $_W -gt $_max_W ]] && _W=$_max_W
+  _content_w=$(( _W - 6 ))
+
+  printf -v _bar '%*s' $(( _W - 19 )) ''; _bar=${_bar// /─}
+  printf "\n  ${MUTED}╭─ commit message %s╮${RESET}\n" "$_bar" >/dev/tty
+  while IFS= read -r _line; do
+    printf "  ${MUTED}│${RESET}  ${BOLD}%-${_content_w}s${RESET}  ${MUTED}│${RESET}\n" "$_line" >/dev/tty
+  done <<< "$(printf '%s\n' "$msg" | awk -v w="$_content_w" '{
+    if (length($0) <= w) { print; next }
+    line = ""
+    for (i = 1; i <= NF; i++) {
+      if (line == "") { line = $i }
+      else if (length(line) + 1 + length($i) <= w) { line = line " " $i }
+      else { print line; line = $i }
+    }
+    if (line != "") print line
+  }')"
+  printf -v _bottom '%*s' $(( _W - 2 )) ''; _bottom=${_bottom// /─}
+  printf "  ${MUTED}╰%s╯${RESET}\n" "$_bottom" >/dev/tty
+}
+
 # confirm and commit
 confirm_and_commit() {
-  printf "\n  ${MUTED}╭─ commit message ──────────────────────────────╮${RESET}\n" >/dev/tty
-  while IFS= read -r _line; do
-    printf "  ${MUTED}│${RESET}  ${BOLD}%s${RESET}\n" "$_line" >/dev/tty
-  done <<< "$COMMIT_MESSAGE"
-  printf "  ${MUTED}╰───────────────────────────────────────────────╯${RESET}\n" >/dev/tty
+  _print_commit_box "$COMMIT_MESSAGE"
 
   printf "\n  ${ACCENT_BOLD}commit?${RESET}  ${MUTED}[Y/n/e]${RESET}  ${ACCENT}›${RESET} " >/dev/tty
   read -r ans </dev/tty
@@ -558,11 +587,8 @@ cmd_commit() {
 
   if [[ $write_only -eq 1 ]]; then
     # show preview on /dev/tty (git won't capture it — only stdout goes to the msg file)
-    printf "\n  ${MUTED}╭─ commit message ──────────────────────────────╮${RESET}\n" >/dev/tty
-    while IFS= read -r _line; do
-      printf "  ${MUTED}│${RESET}  ${BOLD}%s${RESET}\n" "$_line" >/dev/tty
-    done <<< "$COMMIT_MESSAGE"
-    printf "  ${MUTED}╰───────────────────────────────────────────────╯${RESET}\n\n" >/dev/tty
+    _print_commit_box "$COMMIT_MESSAGE"
+    printf "\n" >/dev/tty
     printf '%s' "$COMMIT_MESSAGE"
     return 0
   fi
@@ -651,7 +677,7 @@ lint_message() {
 
   # report
   local exit_code=0
-  printf "\n  ${ACCENT_BOLD}lint${RESET}  ${MUTED}%s${RESET}\n\n" "$header"
+  printf "\n  ${ACCENT_BOLD}lint${RESET}  ${MUTED}%s${RESET}\n" "$header"
 
   if [[ ${#errors[@]} -gt 0 ]]; then
     for e in "${errors[@]}"; do
@@ -738,7 +764,7 @@ cmd_log() {
   load_config
 
   local limit="${1:-20}"
-  printf "\n  ${ACCENT_BOLD}log${RESET}  ${MUTED}last %s commits${RESET}\n\n" "$limit"
+  printf "\n  ${ACCENT_BOLD}log${RESET}  ${MUTED}last %s commits${RESET}\n" "$limit"
 
   local _p_log_type='^([a-z][a-z0-9_-]*)[(:!]'
   while IFS='|' read -r hash short_hash date author subject; do
@@ -772,7 +798,7 @@ cmd_log() {
 # cmd: types
 cmd_types() {
   load_config
-  printf "\n  ${ACCENT_BOLD}commit types${RESET}\n\n"
+  printf "\n  ${ACCENT_BOLD}commit types${RESET}\n"
   for entry in "${TYPES[@]}"; do
     local t e s d badge
     IFS='|' read -r t e s d <<< "$entry"
@@ -805,7 +831,7 @@ cmd_init() {
     cat > "${git_root}/${CC_CONFIG_FILE}" << JSONEOF
 {
   "\$schema": "${CC_SCHEMA_URL}",
-  "version": "1.0.0",
+  "version": "${CC_VERSION}",
   "customTypes": [
     { "type": "wip", "emoji": "🚧", "semver": "none", "description": "Work in progress" }
   ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mihairo/cmt",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "Zero-dependency conventional commits CLI — interactive picker, linter, and git hook installer. One bash script, works in any repo.",
   "keywords": [
     "conventional-commits",

package/schema/cmt.schema.json

@@ -14,10 +14,10 @@
 
     "version": {
       "type": "string",
-      "description": "Config schema version. Currently '1.0.0'.",
+      "description": "Config schema version. Currently '1.1.0'.",
       "pattern": "^\\d+\\.\\d+\\.\\d+$",
-      "default": "1.0.0",
-      "examples": ["1.0.0"]
+      "default": "1.1.0",
+      "examples": ["1.1.0"]
     },
 
     "customTypes": {
@@ -124,7 +124,7 @@
   "examples": [
     {
       "$schema": "https://raw.githubusercontent.com/mihai-ro/cmt/main/schema/cc.schema.json",
-      "version": "1.0.0",
+      "version": "1.1.0",
       "customTypes": [
         {
           "type": "wip",