typr 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75b5f8bf6bcd9c1e957f87f8ef47eaec83784cefcc3903ea9e68b25f0280d7af
-  data.tar.gz: 1e92d998f96105408ac13e6c43f49ae2a44cdf0b2e6e34596f55749228beff29
+  metadata.gz: 02fb4a45192b9a6bc2b3a751033a71e058b2abcb33b77d8873c991a2d6031dd1
+  data.tar.gz: 878f286e0c40eb45b0b5c5216633bc0a9ff82c7f6bc03d18531a80090936e2af
 SHA512:
-  metadata.gz: 3fb8fb7f24580c81250951138b3600037ce3eef21acc48a17c79db4c3fe5cceddd8037e1cb04548d85d2fde048426fa90c08846b09b9c8b2ad06472106813058
-  data.tar.gz: 83f72c57b64e9515c27ddea087bdce0ad2d935e98b697a7e8b5d0de9885aa9dab18f15143437e4b8f0136899d5a6b08c5b7712dbd8f5b8d2f41ab56cb8c5d598
+  metadata.gz: 921906f7edae965d3ea48ed62e8eae91a770ad63dcf7cc3f20bb8463c9bbef280bcca2d2577317e4dd6c71d48b3740630bfaedf2d8c617cc9878d01381eebb9e
+  data.tar.gz: d0db793255d8969a1181193dee6b06227efc2c0248fff99ca6407f6d5944ece37dc330e8cdabafa26229e98a299a576ebc245ea4e4ebd5a25661b20526d094cc

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## [vx.y.z] — __DATE__
 
+## [v1.8.0] — 2026-10-11
+
+### Changed
+- Sort indicator uses solid triangles (▲▼) instead of thin arrows, for a heavier mark at the same single-cell width
+
+### Fixed
+- Text paints new spans once at entry and rebuilds only reflow: scheme and content colors survive resizes and appends without stacking or stripping
+- Terminal self-test renders without scrolling and covers all named colors — status line uses raw output on the last row (`p` scrolled with inspect quotes and a newline), rows are capped to the visible area, the 256-ramp starts at a known position, the color list includes all `COLOR_MAP` names plus the full grey ramp, and the fg/bg steppers clamp to valid ids
+- String headers fit inside minimal-width boxes — the box ignored the margin in the header width, so the border overwrote the last header character; single `:max` columns provably span the widget width
+- Word jumps are documented as alt-arrow, not ctrl-arrow — README, the `read_line` doc comment, and the v1.2.0 entry called them ctrl-arrow while the bindings are `KEY_ALT_LEFT`/`KEY_ALT_RIGHT` (SGR modifier 3 = alt); the package's key modifier is alt everywhere
+- Command-line redraw overwrites in place — `read_line` cleared the row on every keypress, flashing on cursor moves; each frame now pads to end-of-line with spaces instead, so shrinking content leaves no ghosts either
+- Cursor stays hidden while the command line redraws — every keypress parked the visible cursor at the prompt between the home move and the edit-position move; each frame now hides it first and shows it at the edit position
+- Mode table corrected to standard SGR order (`dim` restored, so `slow→5` and `invert→7`) with `:steady` at position 25 for blink-off; `mode_code` stays index-by-position
+
 ## [v1.7.0] — 2026-10-02
 
 ### Fixed
@@ -100,7 +114,7 @@
 ## [v1.2.0] — 2026-08-02
 
 ### Added
-- `Typr.read_key` / `Typr.read_line` — the public terminal input API: `read_key` reads a raw key; `read_line` is the shared interactive line editor that renders a prompt + query at any position with arrow keys, ctrl-arrow word jumps, Home/End/Delete/Backspace, Escape aborts (`nil`), Enter confirms, and an optional block runs after each keypress
+- `Typr.read_key` / `Typr.read_line` — the public terminal input API: `read_key` reads a raw key; `read_line` is the shared interactive line editor that renders a prompt + query at any position with arrow keys, alt-arrow word jumps, Home/End/Delete/Backspace, Escape aborts (`nil`), Enter confirms, and an optional block runs after each keypress
 - `Line#ask` strict question types — `Array` (pick from an object/column), `:key`, `:line`; the question and answer are rendered in `@colors[:question]`/`@colors[:answer]`
 - `Line#align` attribute (`:left`/`:right`) for text alignment in draw
 - `dark_*` named colors (`dark_red`, `dark_green`, `dark_yellow`, `dark_blue`, `dark_magenta`, `dark_cyan`) and a `COLOR_MAP` of popular named colors in `color_code`

data/README.md

@@ -185,7 +185,7 @@ Clears the full screen or a single line (`:line`).
 Reads a single keypress in raw mode. Returns the key as a String (`KEY_ESCAPE`, `?q`, arrow escape sequences), a `Typr::Mouse` struct for mouse reports, or `nil` when input is unavailable.
 
 ### `Typr.read_line(prompt, ...)`
-The shared interactive line editor. Renders a prompt and query at any position with arrow keys, ctrl-arrow word jumps, Home/End/Delete/Backspace; Enter confirms, Escape aborts (`nil`). An optional block runs after each keypress and may short-circuit with a result. Pass `completions:` — a callable `->(query, cursor) { candidates }` — and TAB matches the current word against `candidates` in a pick grid: a candidate is either a string or `[text, color-pair]` to tint its pick entry. Pass `regex:` — a Hash of `Regexp => color`, or a scheme name (`:generic`, `:shell`) — and matching regions of the query are colored as they are typed, restoring the prompt's trailing color code. The editor is agnostic to where candidates come from.
+The shared interactive line editor. Renders a prompt and query at any position with arrow keys, alt-arrow word jumps, Home/End/Delete/Backspace; Enter confirms, Escape aborts (`nil`). An optional block runs after each keypress and may short-circuit with a result. Pass `completions:` — a callable `->(query, cursor) { candidates }` — and TAB matches the current word against `candidates` in a pick grid: a candidate is either a string or `[text, color-pair]` to tint its pick entry. Pass `regex:` — a Hash of `Regexp => color`, or a scheme name (`:generic`, `:shell`) — and matching regions of the query are colored as they are typed, restoring the prompt's trailing color code. The editor is agnostic to where candidates come from.
 
 ```ruby
 Typr.read_line "/", completions: ->(query, cursor) {

data/lib/browser.rb

@@ -503,7 +503,7 @@ full:    %i[ name size permissions executable printable owner group
         input: [ [->{Etc.getpwuid(Process.euid).name rescue ENV["USER"] || Etc.getlogin}, ->{@parent.directory},
           ->{@parent.filter_display},
           ->{ (s = @parent.sorted_by(true)) &&
-            "#{s} #{@parent.reverse ? "\u2193" : "\u2191"}"},
+            "#{s} #{@parent.reverse ? "\u25BC" : "\u25B2"}"},
           ->{@parent.view} ] ], format: [:min, :max, :min, :min, :min],
         colors: { columns: [@colors[:default], @colors[:default],
           @colors[:actions][:filter], @colors[:actions][:sort],
@@ -549,7 +549,7 @@ full:    %i[ name size permissions executable printable owner group
           wire.(label, cmd)
         end
         @user ||= Line.new( parent:self, left:->{@parent.left}, top:->{@parent.bottom+1},
-          colors: { regex: @colors[:regex] }, bindings: bindings_labels )
+          bindings: bindings_labels )
       else
         cmds = { "[h]elp" => :help, "[/]:search" => :search,
           "[f]ilter" => :filter_view, "[s]ort" => :sort_view, "[v]iews" => :views,
@@ -563,7 +563,6 @@ full:    %i[ name size permissions executable printable owner group
           [i]nvert_mark [~]:home [H]idden_files [back]:.. [up] [down] [pageup] [pagedown] [home] [end] [esc]:quit [return]:confirm\  ]
         plain.each { |label| wire.(label, cmds[label]) if cmds[label] }
         @user ||= Line.new( parent:self, left:->{@parent.left}, top:->{@parent.bottom+1},
-          colors: { regex: @colors[:regex] },
           bindings: plain.map { |label|
             name = label.gsub( /[\[\]]/, '' ).downcase.to_sym
             @colors[:actions][name] ?

data/lib/grid.rb

@@ -411,7 +411,7 @@ module Typr
       gaps = @margin.size + @separator.size * (columns - 1)
       sum = @widths.sum
       @max = sum + gaps - 1
-      @max = [ @max, @header.length ].max if @header.is_a?(String)
+      @max = [ @max, @header.length + @margin.size ].max if @header.is_a?(String)
       space = width - gaps
       if (extra = sum - space  ) > 0
         extra.times{ |i| @widths[ @widths.index(@widths.max) ] -= 1 }
@@ -434,7 +434,7 @@ module Typr
     def print row=nil
       return super unless row
       header = ( row == :header )
-      return draw @header[0..width-1].ljust(width) if
+      return draw @header[0...(width - @margin.size)].ljust(width - @margin.size) if
         header and @header.is_a? String
       return unless row_data = header ? @header : @data[row]
       fields = row_data.dup

data/lib/line.rb

@@ -159,13 +159,13 @@ class Line < Space
   #   line.cli "> ", initial: "cp %name"
   #   #=> "cp source.txt" (or nil on Escape)
 
-  def cli prompt, initial: '', redraw: nil, history: nil, prefixes: nil
+  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: @colors[:regex], history: history)
+      completions: source, redraw: redraw, regex: regex || @colors[:regex], history: history)
   end
 
   private

data/lib/terminal.rb

@@ -86,7 +86,8 @@ module Typr
   end
 
   # Text attributes (reset, bold, italic, ...) and named 8/256-color tables.
-  MODES =  %i[ reset bold italic underline slow fast invert ]
+  MODES =  %i[ reset bold dim italic underline slow fast invert ]
+  MODES[25] = :steady
   COLORS = %i[ black red green yellow blue magenta cyan white ]
   COLOR_MAP = {
     brown: 130, orange: 208, lime: 118, pink: 218,
@@ -407,7 +408,7 @@ module Typr
   ## Interactive line editor used for string prompts (search, %str, ...).
   #
   # Renders +prompt+ and the query at (left, top) and edits it with
-  # arrow keys, ctrl-arrow word jumps, home/end, delete and backspace.
+  # arrow keys, alt-arrow word jumps, home/end, delete and backspace.
   # Returns the query on enter, nil on escape. A block may inspect each
   # keypress after it is applied; a non-nil return short-circuits the
   # editor and becomes its return value. When stdin is not a tty, the
@@ -434,13 +435,16 @@ module Typr
     $>.print CURSOR_NORMAL
     begin
       loop do
+        $>.print CURSOR_INVISIBLE
         $>.print "\e[%i;%if" % [ top + 1, left + 1 ]
-        $>.print ERASE_LINE
         before = text_width( prompt + query[0...cursor] )
         offset = [ left + before - Typr.width, 0 ].max
         display = prompt + paint( query, regex, prompt[/\e\[[0-9;]*m\z/].to_s )
-        $>.print slice_width( display, offset, Typr.width - left + 1 )
+        line = slice_width( display, offset, Typr.width - left + 1 )
+        $>.print line
+        $>.print ' ' * (Typr.width - left + 1 - text_width(line))
         $>.print "\e[%i;%if" % [ top + 1, left + 1 + before - offset ]
+        $>.print CURSOR_NORMAL
         key = read_key
         return nil if key.nil? or key == KEY_ESCAPE
         return query if key == KEY_RETURN or key == "\n"
@@ -619,14 +623,15 @@ if __FILE__ == $0
 begin
   include Typr
   Typr.init
-  colors = COLORS + (1..9).map{|i| "grey#{i*10}" }
+  colors = COLORS + COLOR_MAP.keys.map(&:to_s) + (0..10).map{|i| "grey#{i*10}" }
   chars = (33..126).map(&:chr)
   slice = chars.count / colors.count + 1
   characters = chars.each_slice( slice ).map(&:join)
   key,fg,bg = "",150,0
   Typr.clear
+  rows = [colors.count, Typr.height - 4].min
   loop do
-    colors.each_with_index{ |color,y|
+    colors.first(rows).each_with_index{ |color,y|
       characters.each_with_index{ |chars,x|
         foreground color.to_sym;
         background colors[x].to_sym;
@@ -634,20 +639,21 @@ begin
         draw chars
       }
     }
+    move 0, rows
     (0...256).each{ |i| background i; draw ' ' }
 
     move 0, Typr.height
     color [:white, :black]
-    p "KEY: %s / %s" % [key, key]
+    draw "KEY: %s / %s" % [key, key]
     move 15, Typr.height
     color [fg,bg]
     print "     %s / %s     " % [fg,bg]
     key = Typr.read_key
     case key
-      when KEY_UP; fg+=1
-      when KEY_DOWN; fg-=1
-      when KEY_LEFT; bg-=1
-      when KEY_RIGHT; bg+=1
+      when KEY_UP; fg = [fg + 1, 255].min
+      when KEY_DOWN; fg = [fg - 1, 0].max
+      when KEY_LEFT; bg = [bg - 1, 0].max
+      when KEY_RIGHT; bg = [bg + 1, 255].max
       when KEY_ESCAPE; exit
     end
   end

data/lib/text.rb

@@ -33,13 +33,19 @@ module Typr
     #   text << "appended line"       # alias for build
 
     def build input=nil
-      ( input, @data, @lines = sanitize(@data), "", [0] ) if rebuild = !input
+      ( input, @data, @lines = @data, "", [0] ) if rebuild = !input
       return self if rebuild && input == ""
-      rows = @lines[0...-1].each_index.map{ |i| sanitize(@data[@lines[i]...@lines[i+1]]) }
+      rows = @lines[0...-1].each_index.map{ |i| @data[@lines[i]...@lines[i+1]] }
       @data = rows.join
       off = [ 0 ]; rows.each{ |row| off << off.last + row.length }
       @lines = off
       str = input.respond_to?(:read) ? input.read : input.to_s
+      if !rebuild and (r = @colors[:regex]) and r != {}
+        base = color_code( @colors[:default][0] ).to_s
+        # Paint new spans once, whole (multiline matches included); rebuilds
+        # below only reflow, so paint can neither stack nor need stripping.
+        str = Typr.paint(str, r, base)
+      end
       str = str.gsub("\t", " " * @tabspace)
       @tail = ""
       pos = 0
@@ -85,14 +91,6 @@ module Typr
         end
       end
       @lines << @data.length unless @lines.last == @data.length
-      if (r = @colors[:regex]) and r != {}
-        base = color_code( @colors[:default][0] ).to_s
-        painted = @lines[0...-1].each_index.map{ |i|
-          Typr.paint @data[@lines[i]...@lines[i+1]], r, base }
-        @data = painted.join
-        off = [ 0 ]; painted.each{ |line| off << off.last + line.length }
-        @lines = off
-      end
       highlight if @re
     end
     alias :<< :build

data/typr.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name = "typr"
-  s.version = "1.7.0"
-  s.date = "2026-10-02"
+  s.version = "1.8.0"
+  s.date = "2026-10-11"
   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.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Kilian Reitmayr
 bindir: bin
 cert_chain: []
-date: 2026-10-02 00:00:00.000000000 Z
+date: 2026-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicode-display_width