fpf-cli 1.6.10 → 1.6.12

package/fpf

@@ -3,7 +3,7 @@
 set -euo pipefail
 
 SCRIPT_NAME="fpf"
-SCRIPT_VERSION="1.6.10"
+SCRIPT_VERSION="1.6.12"
 TMP_ROOT="${TMPDIR:-/tmp}/fpf"
 SESSION_TMP_ROOT=""
 HELP_FILE=""
@@ -642,80 +642,168 @@ rank_display_rows_by_query() {
     local query="$1"
     local input_file="$2"
     local ranked_file
+    local has_exact=0
+    local candidate
 
     [[ -n "${query}" ]] || return 0
 
+    while IFS= read -r candidate; do
+        [[ -n "${candidate}" ]] || continue
+        if awk -F'\t' -v cand="${candidate}" 'tolower($2) == tolower(cand) { found=1; exit } END { exit (found ? 0 : 1) }' "${input_file}"; then
+            has_exact=1
+            break
+        fi
+    done < <(exact_query_candidates "${query}" | awk '!seen[$0]++')
+
     ranked_file="$(mktemp "${SESSION_TMP_ROOT}/ranked.XXXXXX")"
 
-    awk -F'\t' -v query="${query}" '
+    awk -F'\t' -v query="${query}" -v has_exact="${has_exact}" '
         function lower(s) { return tolower(s) }
+        function normalize(s, t) {
+            t = lower(s)
+            gsub(/[^[:alnum:]]+/, "", t)
+            return t
+        }
         BEGIN {
             q = lower(query)
+            gsub(/^[[:space:]]+|[[:space:]]+$/, "", q)
+            q_norm = normalize(q)
+
+            token_total = split(q, raw_tokens, /[^[:alnum:]]+/)
+            query_token_count = 0
+            for (i = 1; i <= token_total; i++) {
+                if (raw_tokens[i] != "") {
+                    query_tokens[++query_token_count] = raw_tokens[i]
+                }
+            }
         }
         {
-            mgr = $1
             pkg = $2
             desc = $3
 
             pkg_l = lower(pkg)
             desc_l = lower(desc)
+            pkg_norm = normalize(pkg_l)
+            desc_norm = normalize(desc_l)
+
+            pkg_token_hits = 0
+            desc_token_hits = 0
+            for (i = 1; i <= query_token_count; i++) {
+                token = query_tokens[i]
+                if (index(pkg_l, token) > 0 || index(pkg_norm, token) > 0) {
+                    pkg_token_hits++
+                }
+                if (index(desc_l, token) > 0 || index(desc_norm, token) > 0) {
+                    desc_token_hits++
+                }
+            }
+
+            pkg_token_count = 0
+            split(pkg_l, pkg_parts, /[^[:alnum:]]+/)
+            for (i in pkg_parts) {
+                if (pkg_parts[i] != "") {
+                    pkg_token_count++
+                }
+            }
 
-            score = 8
+            score = 12
             if (q != "") {
-                if (pkg_l == q) {
+                if (pkg_l == q || (q_norm != "" && pkg_norm == q_norm)) {
                     score = 0
-                } else if (index(pkg_l, q) == 1) {
+                } else if (q_norm != "" && index(pkg_norm, q_norm) == 1) {
                     score = 1
-                } else if (index(pkg_l, q) > 0) {
+                } else if (query_token_count > 1 && pkg_token_hits == query_token_count) {
                     score = 2
-                } else if (index(desc_l, q) > 0) {
+                } else if (q_norm != "" && index(pkg_norm, q_norm) > 0) {
                     score = 3
+                } else if (query_token_count > 0 && pkg_token_hits > 0) {
+                    score = 4
+                } else if (query_token_count > 0 && desc_token_hits == query_token_count) {
+                    score = 5
+                } else if (query_token_count > 0 && desc_token_hits > 0) {
+                    score = 6
                 }
             }
 
-            mgr_score = 9
-            if (mgr == "bun") {
-                mgr_score = 0
-            } else if (mgr == "npm") {
-                mgr_score = 1
-            } else if (mgr == "brew") {
-                mgr_score = 2
+            if (q != "" && has_exact == 1 && pkg_token_hits == query_token_count && query_token_count > 0 && pkg_token_count > query_token_count) {
+                score += 5
             }
 
-            print score "\t" mgr_score "\t" length(pkg) "\t" pkg_l "\t" $0
+            if (q != "" && desc_l ~ /(plugin|template|starter|boilerplate|router|hooks?|mcp|integration)/) {
+                score += 2
+            }
+
+            mgr_bias = 0
+            if (mgr == "npm") {
+                mgr_bias = 4
+            } else if (mgr == "bun") {
+                mgr_bias = 3
+            }
+
+            print score "\t" mgr_bias "\t" (99 - pkg_token_hits) "\t" (99 - desc_token_hits) "\t" length(pkg) "\t" pkg_l "\t" $0
         }
     ' "${input_file}" |
-        sort -t $'\t' -k1,1n -k2,2n -k3,3n -k4,4 |
-        awk -F'\t' '{ print $5 "\t" $6 "\t" $7 }' >"${ranked_file}"
+        sort -t $'\t' -k1,1n -k2,2n -k3,3n -k4,4n -k5,5n -k6,6 |
+        awk -F'\t' '{ print $7 "\t" $8 "\t" $9 }' >"${ranked_file}"
 
     mv "${ranked_file}" "${input_file}"
 }
 
-query_is_single_token() {
+exact_query_candidates() {
     local query="$1"
-    [[ -n "${query}" && "${query}" != *[[:space:]]* ]]
+    local compact_query=""
+    local dashed_query=""
+    local underscored_query=""
+    local nospace_query=""
+
+    compact_query="$(printf "%s" "${query}" | awk '{$1=$1; print}')"
+    [[ -n "${compact_query}" ]] || return 0
+
+    printf "%s\n" "${compact_query}"
+
+    if [[ "${compact_query}" == *[[:space:]]* ]]; then
+        dashed_query="${compact_query// /-}"
+        underscored_query="${compact_query// /_}"
+        nospace_query="${compact_query// /}"
+        printf "%s\n" "${dashed_query}"
+        printf "%s\n" "${underscored_query}"
+        printf "%s\n" "${nospace_query}"
+    fi
 }
 
 exact_match_entry() {
     local manager="$1"
     local query="$2"
+    local candidate
 
-    if ! query_is_single_token "${query}"; then
+    if [[ -z "${query}" ]]; then
         return 0
     fi
 
-    case "${manager}" in
-        brew)
-            if brew info --formula "${query}" >/dev/null 2>&1 || brew info --cask "${query}" >/dev/null 2>&1; then
-                printf "%s\t-\n" "${query}"
-            fi
-            ;;
-        npm|bun)
-            if command_exists npm && npm view "${query}" name >/dev/null 2>&1; then
-                printf "%s\t-\n" "${query}"
-            fi
-            ;;
-    esac
+    while IFS= read -r candidate; do
+        [[ -n "${candidate}" ]] || continue
+
+        case "${manager}" in
+            brew)
+                if brew info --formula "${candidate}" >/dev/null 2>&1 || brew info --cask "${candidate}" >/dev/null 2>&1; then
+                    printf "%s\t-\n" "${candidate}"
+                    return 0
+                fi
+                ;;
+            npm)
+                if command_exists npm && npm view "${candidate}" name >/dev/null 2>&1; then
+                    printf "%s\t-\n" "${candidate}"
+                    return 0
+                fi
+                ;;
+            bun)
+                if bun info "${candidate}" >/dev/null 2>&1 || (command_exists npm && npm view "${candidate}" name >/dev/null 2>&1); then
+                    printf "%s\t-\n" "${candidate}"
+                    return 0
+                fi
+                ;;
+        esac
+    done < <(exact_query_candidates "${query}" | awk '!seen[$0]++')
 }
 
 manager_search_entries() {
@@ -724,10 +812,14 @@ manager_search_entries() {
     local effective_query="${query}"
     local npm_search_limit=500
     local line_limit=0
+    local query_line_limit=40
+    local effective_limit=0
 
     if [[ -z "${query}" ]]; then
         npm_search_limit="${FPF_NO_QUERY_NPM_LIMIT:-120}"
         line_limit="${FPF_NO_QUERY_RESULT_LIMIT:-120}"
+    else
+        query_line_limit="${FPF_QUERY_PER_MANAGER_LIMIT:-40}"
     fi
 
     if ! [[ "${npm_search_limit}" =~ ^[0-9]+$ ]] || [[ "${npm_search_limit}" -eq 0 ]]; then
@@ -738,9 +830,19 @@ manager_search_entries() {
         line_limit=0
     fi
 
+    if ! [[ "${query_line_limit}" =~ ^[0-9]+$ ]]; then
+        query_line_limit=40
+    fi
+
+    if [[ "${line_limit}" -gt 0 ]]; then
+        effective_limit="${line_limit}"
+    else
+        effective_limit="${query_line_limit}"
+    fi
+
     if [[ -z "${effective_query}" ]]; then
         case "${manager}" in
-            apt|dnf|pacman|zypper|emerge|choco|scoop|snap|flatpak)
+            apt|dnf|pacman|zypper|emerge|choco|scoop|snap)
                 effective_query="a"
                 ;;
             brew|npm|bun)
@@ -894,19 +996,21 @@ manager_search_entries() {
             ;;
         bun)
             {
-                if bun search "${effective_query}" >/dev/null 2>&1; then
-                    bun search "${effective_query}" 2>/dev/null |
-                        awk 'NR > 1 && NF > 0 { name=$1; $1=""; sub(/^[[:space:]]+/, "", $0); if ($0 == "") $0="-"; print name "\t" $0 }'
+                local bun_search_file
+                bun_search_file="$(mktemp "${SESSION_TMP_ROOT}/bun-search.XXXXXX")"
+                if bun search "${effective_query}" >"${bun_search_file}" 2>/dev/null; then
+                    awk 'NR > 1 && NF > 0 { name=$1; $1=""; sub(/^[[:space:]]+/, "", $0); if ($0 == "") $0="-"; print name "\t" $0 }' "${bun_search_file}"
                 elif command_exists npm; then
                     npm search "${effective_query}" --searchlimit="${npm_search_limit}" --parseable 2>/dev/null |
                         awk -F'\t' 'NF >= 2 { print $1 "\t" $2 }'
                 fi
+                rm -f "${bun_search_file}"
                 exact_match_entry "${manager}" "${query}"
             } || true
             ;;
     esac | awk -F'\t' 'NF >= 1 { if ($2 == "") $2 = "-"; print $1 "\t" $2 }' | awk -F'\t' '!seen[$1]++' | {
-        if [[ "${line_limit}" -gt 0 ]]; then
-            awk -v limit="${line_limit}" 'NR <= limit'
+        if [[ "${effective_limit}" -gt 0 ]]; then
+            awk -v limit="${effective_limit}" 'NR <= limit'
         else
             cat
         fi
@@ -1094,6 +1198,7 @@ collect_search_display_rows() {
     local output_file="$2"
     shift 2
     local managers=("$@")
+    local query_limit="${FPF_QUERY_RESULT_LIMIT:-80}"
 
     : >"${output_file}"
 
@@ -1140,6 +1245,11 @@ collect_search_display_rows() {
     if [[ -s "${output_file}" ]]; then
         sort -u "${output_file}" -o "${output_file}"
         rank_display_rows_by_query "${query}" "${output_file}"
+
+        if [[ -n "${query}" && "${query_limit}" =~ ^[0-9]+$ && "${query_limit}" -gt 0 ]]; then
+            awk -v limit="${query_limit}" 'NR <= limit' "${output_file}" >"${output_file}.limited"
+            mv "${output_file}.limited" "${output_file}"
+        fi
     fi
 }
 
@@ -1405,10 +1515,11 @@ run_fuzzy_selector() {
 
     local -a fzf_args=()
     fzf_args=(-q "${query}" -m \
+        -e \
         --delimiter=$'\t' \
         --with-nth=1,2,3 \
         --preview="${preview_cmd}" \
-        --preview-window=55%:wrap:border-sharp:hidden \
+        --preview-window=55%:wrap:border-sharp \
         --layout=reverse \
         --marker='>>' \
         --prompt='Search> ' \
@@ -1424,8 +1535,6 @@ run_fuzzy_selector() {
 
     if [[ -n "${reload_cmd}" ]]; then
         fzf_args+=(--bind="change:reload:${reload_cmd}")
-    else
-        fzf_args+=(-e)
     fi
 
     fzf "${fzf_args[@]}" <"${input_file}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fpf-cli",
-  "version": "1.6.10",
+  "version": "1.6.12",
   "description": "Cross-platform fuzzy package finder powered by fzf",
   "bin": {
     "fpf": "fpf"