typr 1.9.3 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdabc3f928eb42904b0f1cd0778384bca290ae56dfbb050236cda6a6578d19e8
-  data.tar.gz: 236970a28d8cd9265651985504a60a8113cdfaf2b8378303388c0a9e4883469e
+  metadata.gz: 161bd96f71319182c99bb701e88d300079e95bcfd6c3b321bf5c881a3ecac8b8
+  data.tar.gz: 7b90f171d5198a35920fff37c63106f1ab9741951e808484b33a51ebc9f692f5
 SHA512:
-  metadata.gz: 82420afecbc67164d9271e315cd571f33898f4f4ae4ee4186da231cbb6d461df5714180e47c6237d7a54224fd0742777084d44c38e221931f763418bdc19df7d
-  data.tar.gz: cafd2cf36cdbf58e70249042e7952ca1048325b61ae404b0c4a154eabcb9684cbe8bf75b3aaee239d0c169da7057826a1b7e1bcae1e6dd2b81fa9145942424d9
+  metadata.gz: 9655c6b636981a7577ab9e82c0af6fdd971cec905bcf47ca9e627812b09d637f32df4b708b11f9826e0dc1134c592af2ac1e5fffeb33022ba24c9b8a85669dd1
+  data.tar.gz: e0fb7b084fc514c7f8ad4107e0085e976c8558b98576b97343ddbb278b19b44ac739f40ca1779dbff220c8fd50e1d7e3dc24ca14a66d19630ec2a4acadaf67bc

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## [vx.y.z] — __DATE__
 
+## [v1.9.4] — 2026-10-30
+
+### Added
+- Emoji sequence widths stop lying per terminal: `Typr.emoji_width` matches `$TERM` against a measured bare-name table (`kitty`/`ghostty`/`foot`/`wezterm`/`konsole`/`alacritty` styles) and every display-width measurement (`real_size`, `clip`, `text_width`, `slice_width`, `Text` wrapping) passes the mode to `unicode-display_width`, so filename columns no longer book the cells the terminal never prints (e.g. `🧟‍♀️🧟‍♂️` measured 31 against a 27-cell render). Unmatched terminals keep `:auto`, the library's own detection
+
+### Fixed
+- Bash completion candidates that carry descriptions (`--opt        (what it does)`) show the description in the pick grid but insert only the option — the word clips at the tab or two-space separator, filenames with single spaces stay intact
+
+### Changed
+- `Typr.read_line` gains `prefixes:` — command-start characters stripped from the query before completion matching; the candidates are then looked up through `bash -ic` (commands, options, files) when `completions:` is nil, so the completion engine is no longer `Line#cli` private glue and any prompt can carry it
+- `Line#cli` is gone — `ask`'s `[:line, opts]` question forwards its options (`initial`, `redraw`, `history`, `prefixes`, `regex`, `completions`) straight to `Typr.read_line`
+
 ## [v1.9.3] — 2026-10-19
 
 ### Fixed

data/README.md

@@ -31,9 +31,9 @@ The default terminal frontend is pure ANSI on raw TTY input — **no ncurses**.
 
 ### Colors
 
-Named colors (basic, shades, and `dark_*`), grey shades `grey0`–`grey100`, the terminal's 8-bit palette, and RGB triplets for true-color terminals. Every component takes a per-part `colors:` hash (columns, headers, hints, search matches, …). A component-level `regex:` key maps `Regexp => color` to tint typed input (`Typr.read_line`/`Line#cli`) and the rows of `Typr::Text` areas, or names a scheme — `:generic` or `:shell`; when two patterns match the same span the earlier key wins, so order overlapping patterns longest-first. Colors may be any value `color_code` accepts — named color, `greyN`, an 8-bit index, an RGB triplet like `[10, 200, 30]`, or a `[fg, bg]` pair. Header bars render bold by default.
+Named colors (basic, shades, and `dark_*`), grey shades `grey0`–`grey100`, the terminal's 8-bit palette, and RGB triplets for true-color terminals. Every component takes a per-part `colors:` hash (columns, headers, hints, search matches, …). A component-level `regex:` key maps `Regexp => color` to tint typed input (`Typr.read_line`) and the rows of `Typr::Text` areas, or names a scheme — `:generic` or `:shell`; when two patterns match the same span the earlier key wins, so order overlapping patterns longest-first. Colors may be any value `color_code` accepts — named color, `greyN`, an 8-bit index, an RGB triplet like `[10, 200, 30]`, or a `[fg, bg]` pair. Header bars render bold by default.
 
-Pass `regex: :generic` and `Typr::Text` paints numbers cyan, colon-separated keys yellow, quoted strings green, bracketed groups magenta, and remaining punctuation grey — override with a custom map, disable with `regex: {}` (the default: unpainted). Each painted span restores only the `default` foreground, so the row's own background (alternating stripes, search highlight, padding) survives; `Line#cli` colors the typed command with the `:shell` scheme (first word red, `--options` blue) when configured; it no longer tints the completion grid. Set `regex: {}` to turn a scheme off.
+Pass `regex: :generic` and `Typr::Text` paints numbers cyan, colon-separated keys yellow, quoted strings green, bracketed groups magenta, and remaining punctuation grey — override with a custom map, disable with `regex: {}` (the default: unpainted). Each painted span restores only the `default` foreground, so the row's own background (alternating stripes, search highlight, padding) survives; `Typr.read_line` colors typed command lines with the `:shell` scheme (first word red, `--options` blue) when configured; it no longer tints the completion grid. Set `regex: {}` to turn a scheme off.
 
 ### Frontends
 
@@ -197,15 +197,15 @@ Typr.read_line "/", completions: ->(query, cursor) {
 Strict question types:
 - `Array` — pick a row from an object/column (hint-driven)
 - `:key` — read a single key
-- `:line` — read a line of text
+- `[:line, opts]` — read a line of text, opts forwarded to `Typr.read_line`
 
 The question and answer are rendered in `@colors[:question]`/`@colors[:answer]`.
 
-### `Line#cli`
-Prompts for a single command line with TAB completion matched against the shell (bash commands, options, and files). `initial:` seeds the line; `history:` recalls previous commands with Up/Down; `prefixes:` lists command-start characters stripped before matching; `redraw:` repaints while the completion grid is up. With `regex: :shell` the typed command tints red for the first word, blue for `--options`. Completion candidates are plain strings.
+### `Typr.read_line`
+Prompts for a line of text with optional TAB completion. `initial:` seeds the line; `history:` recalls previous input with Up/Down; `completions:` takes a callable `(prefix) → candidates` and replaces the current word with the picked one; `prefixes:` lists command-start characters that are stripped from the word before matching, and when set with `completions:` nil the candidates come from the shell (`bash -ic`, commands, options, and files — also used by filecon's prompts); `redraw:` repaints while the completion grid is up. With `regex: :shell` the typed command tints red for the first word, blue for `--options`. Completion candidates are plain strings.
 
 ```ruby
-line.cli "> ", initial: "ls ", history: @recent
+Typr.read_line "> ", initial: "ls ", history: @recent, prefixes: "|+=!"
 ```
 
 ### Layout properties (all components)

data/lib/line.rb

@@ -108,7 +108,9 @@ class Line < Space
   #           editor via Typr.read_line prefilled with +initial+ instead
   #           of a widget pick.
   #   :key  - a single keypress via Typr.read_key
-  #   :line - interactive line editor via Typr.read_line at the cursor
+  #   :line - interactive line editor via Typr.read_line at the cursor;
+  #     [:line, opts] forwards opts (initial, redraw, history, prefixes,
+  #     regex, completions) to read_line
   #
   # Every entry — including a trailing +with:+ — is simply another
   # question in order (a +with:+ entry is labeled "with" when drawn), so
@@ -146,9 +148,8 @@ class Line < Space
         case object
           when Array
             if object.first == :line
-              opts = object[1] || {}
               answer << Typr.read_line(colored + color_code(@colors[:answer]),
-                left: left, top: top, initial: opts[:initial] || "")
+                left: left, top: top, **(object[1] || {}))
             else
               answer << object.first.pick(object[1], **(object[3] || {}))
             end
@@ -170,65 +171,6 @@ class Line < Space
     return ( answer.one? ? answer.first : answer )
   end
 
-  ##
-  # Prompt for a single command line at the cursor: +prompt+ rendered in
-  # the line's default color, typed input in the answer color. TAB
-  # matches the current word against the shell (commands, options, files)
-  # and replaces it through the pick grid. Regions of the typed input
-  # matching @colors[:regex] are colored as they are typed (with the
-  # :shell scheme: the first word red, double-dash options blue).
-  #
-  # +history+ is an Array whose entries Up/Down walk; +prefixes+ lists
-  # command-start characters stripped before completion matching;
-  # +redraw+ repaints the caller's screen after a completion pick;
-  # +regex+ overrides @colors[:regex] for this prompt.
-  #
-  #   line.cli "> ", initial: "cp %name"
-  #   #=> "cp source.txt" (or nil on Escape)
-  #   line.cli "> ", history: @recent, prefixes: "$>"
-  #
-  # @param prompt [String] rendered before the typed input
-  # @param initial [String] prefilled input
-  # @return [String, nil] the accepted command, or nil on Escape
-
-  def cli prompt, initial: '', redraw: nil, history: nil, prefixes: nil, regex: nil
-    re = /\A[#{Regexp.escape(prefixes || '|+=!')}]/
-    source = ->(query) {
-      bash_candidates(query.sub(re, '')).split("\n").reject(&:empty?).uniq }
-    colored = color_code(@colors[:default]).to_s + prompt + color_code(@colors[:answer])
-    Typr.read_line(colored, left: left, top: top, initial: initial,
-      completions: source, redraw: redraw, regex: regex || @colors[:regex], history: history)
-  end
-
-  private
-
-  def bash_candidates part
-    IO.popen([{ 'COMP_LINE' => part, 'COMP_POINT' => part.bytesize.to_s },
-      'bash', '-ic', <<~SH], err: '/dev/null', &:read)
-      set +m; shopt -s expand_aliases
-      export PS1= PS2= PS3= PS4= PROMPT_COMMAND=
-      read -r -a COMP_WORDS <<< "$COMP_LINE"
-      [ "$COMP_LINE" != "${COMP_LINE% }" ] && COMP_WORDS+=( "" )
-      COMP_CWORD=$(( ${#COMP_WORDS[@]} - 1 ))
-      [ "$COMP_CWORD" -lt 0 ] && COMP_CWORD=0
-      cur=${COMP_WORDS[COMP_CWORD]}
-      if declare -F __load_completion >/dev/null 2>&1; then
-        __load_completion "${COMP_WORDS[0]}" 2>/dev/null
-      elif declare -F _completion_loader >/dev/null 2>&1; then
-        _completion_loader "${COMP_WORDS[0]}" 2>/dev/null
-      fi
-      Fn=$(complete -p "${COMP_WORDS[0]}" 2>/dev/null | awk '{print $(NF-1)}')
-      type "$Fn" >/dev/null 2>&1 && "$Fn" "${COMP_WORDS[0]}" "$cur" 2>/dev/null
-      if [ -z "${COMPREPLY[*]}" ]; then
-        if [ "$COMP_CWORD" -eq 0 ]; then compgen -A command -A alias -A file -- "$cur"
-        else compgen -A file -- "$cur"; fi
-      else printf '%s\n' "${COMPREPLY[@]}"
-      fi
-    SH
-  end
-
-  public
-
   ##
   # Construct a Line. Position via the {Space} boundaries; +default+ sets
   # the text shown after {#reset}, +bindings+ the keybinding labels.

data/lib/terminal.rb

@@ -179,7 +179,7 @@ module Typr
         next
       end
       break if used >= max
-      size = Unicode::DisplayWidth.of token
+      size = Unicode::DisplayWidth.of token, emoji: emoji_width
       if used + size <= max
         kept << token
         used += size
@@ -190,7 +190,7 @@ module Typr
         width = 0
         out = ""
         clusters.each do |cluster|
-          width += Unicode::DisplayWidth.of cluster
+          width += Unicode::DisplayWidth.of cluster, emoji: emoji_width
           break if width > need
           out << cluster
         end
@@ -248,7 +248,38 @@ module Typr
   # @param str [String] text possibly containing ANSI escapes
   # @return [Integer] width in cells
 
-  def real_size str; Unicode::DisplayWidth.of( sanitize(str) ) end
+  def real_size str
+    Unicode::DisplayWidth.of sanitize(str), emoji: emoji_width
+  end
+
+  ##
+  # Emoji sequence cell widths, matched bare-name into $TERM (first hit).
+  # Emoji ligatures render differently per terminal, so one mode never
+  # fits them all: kitty/ghostty/foot ligate emoji ZWJ sequences to 2
+  # cells, and wezterm/konsole keep their ligating quirk modes. Terminal
+  # probe data — counting the true cursor positions after rendering —
+  # showed alacritty among the unlisted ones: it splits zombies with
+  # unwidened ♀/♂ signs, so its render coincides with the library's own
+  # per-codepoint count (:none under :auto) and needs no entry. Falls
+  # back to :auto, the unicode-display_width library's own
+  # detection — which for unknown terminals is a per-codepoint count that
+  # matches the tofu/lower-fidelity rendering of e.g. urxvt and xterm.
+  # Measured with cursor reports: render the sequence, ask the cursor
+  # where it ended up.
+  #
+  #   Typr.emoji_width               # the running terminal's mode
+  #   Typr.emoji_width 'xterm-kitty' #=> :rgi
+  #   Typr.emoji_width 'vt102'       #=> :auto
+  #
+  # @param term [String] terminal name, $TERM by default
+  # @return [Symbol] +:rgi+, +:all+, +:all_no_vs16+, or +:auto+
+
+  def emoji_width term = ENV["TERM"].to_s
+    EMOJI.find { |matcher, _| matcher === term }&.last || :auto
+  end
+
+  module_function :emoji_width
+  public :emoji_width
 
   ##
   # Coerce a string into Integer, Float, or Boolean when it matches those
@@ -378,6 +409,16 @@ module Typr
     }
   }
 
+  # Unicode::DisplayWidth emoji measurement modes by bare terminal-name
+  # match against $TERM (see Typr.emoji_width for the details).
+  EMOJI = {
+    /kitty/     => :rgi,
+    /ghostty/   => :rgi,
+    /foot/      => :rgi,
+    /wezterm/   => :all_no_vs16,
+    /konsole/   => :all
+  }
+
   # Returns +str+ with every region matched by the keys of +regex+ wrapped in
   # the associated color, restoring +base+ after each region. Non-matching
   # text passes through untouched. +regex+ may be nil or empty (no-op), and
@@ -658,14 +699,24 @@ module Typr
   # @param left [Integer] screen column (0-based)
   # @param top [Integer] screen row (0-based)
   # @param initial [String] prefilled query
-  # @param completions [#call, nil] +->(prefix) { candidates }+ or nil
+  # @param completions [#call, nil] +->(prefix) { candidates }+ or nil;
+  #   a candidate may carry a description after a tab or run of spaces —
+  #   shown in the pick grid, stripped from the inserted word
   # @param redraw [#call, nil] zero-arg repaint after a completion pick
   # @param regex [Hash, Symbol, nil] paint map or scheme (see {.paint})
   # @param history [Array<String>, nil] previous queries for Up/Down
+  # @param prefixes [String, nil] command-prefix characters stripped from the
+  #   query before completion lookup; when set with +completions+ nil, TAB
+  #   completes through +bash -ic+ (commands, options, files)
   # @param block [Proc] +->(key, query, cursor)+ inspector (non-nil short-circuits)
   # @return [Object, nil] the query, a block short-circuit, or nil on Escape
 
-  def self.read_line prompt='', left: 0, top: 0, initial: '', completions: nil, redraw: nil, regex: nil, history: nil, &block
+  def self.read_line prompt='', left: 0, top: 0, initial: '', completions: nil, redraw: nil, regex: nil, history: nil, prefixes: nil, &block
+    if completions.nil? && prefixes
+      pre = /\A[#{Regexp.escape(prefixes)}]/
+      completions = ->(query) {
+        bash_candidates(query.sub(pre, '')).split("\n").reject(&:empty?).uniq }
+    end
     return $stdin.gets&.chomp unless $stdin.tty?
     query, cursor = initial.dup, initial.length
     hist_idx = nil
@@ -751,8 +802,9 @@ module Typr
             if picked.is_a?(Integer)
               word_start = cursor
               word_start -= 1 while word_start > 0 and query[word_start - 1] != ' '
-              query[word_start...cursor] = input[picked]
-              cursor = word_start + input[picked].length
+              word = input[picked].split(/\s{2,}|\t/, 2).first.to_s
+              query[word_start...cursor] = word
+              cursor = word_start + word.length
             end
           end
         end
@@ -762,6 +814,40 @@ module Typr
     end
   end
 
+  # Completion candidates for +part+ through an interactive bash: loads the
+  # command's completion function, falls back to commands/aliases/files at
+  # the first word and files after it. Used by {.read_line} when +prefixes+
+  # is set.
+  #
+  # @param part [String] the query with any command-prefix already stripped
+  # @return [String] candidates, one per line
+
+  def self.bash_candidates part
+    IO.popen([{ 'COMP_LINE' => part, 'COMP_POINT' => part.bytesize.to_s },
+      'bash', '-ic', <<~SH], err: '/dev/null', &:read)
+      set +m; shopt -s expand_aliases
+      export PS1= PS2= PS3= PS4= PROMPT_COMMAND=
+      read -r -a COMP_WORDS <<< "$COMP_LINE"
+      [ "$COMP_LINE" != "${COMP_LINE% }" ] && COMP_WORDS+=( "" )
+      COMP_CWORD=$(( ${#COMP_WORDS[@]} - 1 ))
+      [ "$COMP_CWORD" -lt 0 ] && COMP_CWORD=0
+      cur=${COMP_WORDS[COMP_CWORD]}
+      if declare -F __load_completion >/dev/null 2>&1; then
+        __load_completion "${COMP_WORDS[0]}" 2>/dev/null
+      elif declare -F _completion_loader >/dev/null 2>&1; then
+        _completion_loader "${COMP_WORDS[0]}" 2>/dev/null
+      fi
+      Fn=$(complete -p "${COMP_WORDS[0]}" 2>/dev/null | awk '{print $(NF-1)}')
+      type "$Fn" >/dev/null 2>&1 && "$Fn" "${COMP_WORDS[0]}" "$cur" 2>/dev/null
+      if [ -z "${COMPREPLY[*]}" ]; then
+        if [ "$COMP_CWORD" -eq 0 ]; then compgen -A command -A alias -A file -- "$cur"
+        else compgen -A file -- "$cur"; fi
+      else printf '%s\n' "${COMPREPLY[@]}"
+      fi
+    SH
+  end
+  private_class_method :bash_candidates
+
   ##
   # Display width of +str+ after stripping ANSI escapes.
   #
@@ -771,7 +857,7 @@ module Typr
   # @return [Integer] width in cells
 
   def self.text_width str
-    Unicode::DisplayWidth.of( str.gsub(/\x1b\[[^m]+m/, '') )
+    Unicode::DisplayWidth.of( str.gsub(/\x1b\[[^m]+m/, ''), emoji: emoji_width )
   end
 
   ##
@@ -797,7 +883,7 @@ module Typr
         i += seq ? seq.length : 1
         next
       end
-      cell = Unicode::DisplayWidth.of(str[i])
+      cell = Unicode::DisplayWidth.of(str[i], emoji: emoji_width)
       vis += cell
       slice << str[i] if vis > offset and vis <= offset + width
       i += 1

data/lib/text.rb

@@ -71,7 +71,7 @@ module Typr
           elsif c == ?\n
             added += 1; break
           else
-            cw = Unicode::DisplayWidth.of(c)
+            cw = Unicode::DisplayWidth.of(c, emoji: emoji_width)
             break if cells + cw > cap
             cells += cw; added += 1
           end

data/typr.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name = "typr"
-  s.version = "1.9.3"
-  s.date = "2026-10-19"
+  s.version = "1.9.4"
+  s.date = "2026-10-30"
   s.homepage = "https://codeberg.org/typr/typr"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: typr
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.9.4
 platform: ruby
 authors:
 - Kilian Reitmayr
 bindir: bin
 cert_chain: []
-date: 2026-10-19 00:00:00.000000000 Z
+date: 2026-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicode-display_width