typr 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fc328e46b4b4d36e0d3f68eb0a50f8068934469ec5e9d5d84099755685732ad
-  data.tar.gz: 254c5a5842474b4fc550a0aff5fbaa772e961a6aca9a9a8f90ed1a89cc761e51
+  metadata.gz: 75b5f8bf6bcd9c1e957f87f8ef47eaec83784cefcc3903ea9e68b25f0280d7af
+  data.tar.gz: 1e92d998f96105408ac13e6c43f49ae2a44cdf0b2e6e34596f55749228beff29
 SHA512:
-  metadata.gz: eeae3cd67ce492706bc952e8422adea09d300f115928c074411c2589f5dae577ff4ad73e610e6a9b279007a93205e81fa9579c59d3f404f2778f52b06cb26e24
-  data.tar.gz: 735a2236dbd0868674f4727572f578237f34165ab04d683179dd45464918099719c422503b386915f2df4895f1d5228550e6ee9bc25a9bf607d650eff8e8153c
+  metadata.gz: 3fb8fb7f24580c81250951138b3600037ce3eef21acc48a17c79db4c3fe5cceddd8037e1cb04548d85d2fde048426fa90c08846b09b9c8b2ad06472106813058
+  data.tar.gz: 83f72c57b64e9515c27ddea087bdce0ad2d935e98b697a7e8b5d0de9885aa9dab18f15143437e4b8f0136899d5a6b08c5b7712dbd8f5b8d2f41ab56cb8c5d598

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ## [vx.y.z] — __DATE__
 
+## [v1.7.0] — 2026-10-02
+
+### Fixed
+- Column hints in `pick :column` sit in the gap cell left of each column — `draw_hints` positioned them from the widget edge while rows render past the margin, so every hint landed one margin-width left of its column; overlaying the column starts overshot right instead
+- Default bottom-bar commands work in a bare browser — the key labels were display-only, so `h / f s v r m M a i ~ H` did nothing; the default bindings now populate the keymap like explicit ones, and the pick loop discards command results instead of misreading them as picks
+- `[d]irectories` left the default bar — directory history is a filecon feature; typr's unrelated `Browser#directories` row query is unchanged
+- Explicit nil widget boundaries fall back to safe defaults — the unified clamp referenced the accessor itself, recursing until `SystemStackError` (and the bottom default assumed subclass-only methods); per-name fallbacks are restored inside the clamp
+
+### Changed
+- Regex color schemes are named and opt-in — `regex:` accepts a Hash as before or a Symbol that `Typr.paint` resolves through `REGEX_SCHEMES` (`:generic` paints numbers, colon keys, quotes, brackets, and punctuation; `:shell` paints a command line's first word and `--options`); unknown symbols raise `ArgumentError`. `Text` and `Line` no longer install a default scheme, so `regex:` is empty by default and help pages, error popups, and unconfigured views render unpainted
+
+## [v1.6.1] — 2026-10-02
+
+### Fixed
+- `Typr.paint` leaves pre-existing ANSI escapes byte-identical — the regex union matched escape bytes (`ESC`, `[`, `;`, digits) as ordinary text, shredding sequences already in the string; downstream clipping then dropped the orphaned `ESC` bytes and the bare sequence bodies printed as literal text (filecon help titles showed `[38;2;…m`). Paint now matches text runs between escapes only
+
 ## [v1.6.0] — 2026-09-30
 
 ### Added

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; 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`/`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.
 
-`Typr::Text` paints numbers cyan, colon-separated keys yellow, quoted strings green, bracketed groups magenta, and remaining punctuation grey — override with `regex:`, disable with `regex: {}`. 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 (first word red, `--options` blue); 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; `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.
 
 ### Frontends
 
@@ -114,8 +114,7 @@ Typr.init
 
 @browser = Typr::Browser.new(
   directory: "/tmp",
-  right: -1, bottom: -1,
-  colors: { hints: [:white, :black] }
+  right: -1, bottom: -1
 )
 
 selected = @browser.pick   # interactive file picker, returns the absolute path
@@ -186,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` — 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, 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.
 
 ```ruby
 Typr.read_line "/", completions: ->(query, cursor) {
@@ -203,7 +202,7 @@ Strict question types:
 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). `completions: true` switches on the content; `initial:` seeds the line; `redraw:` repaints while the completion grid is up. The typed command tints with `@colors[:regex]` — default red for the first word, blue for `--options`. Completion candidates are plain strings.
+Prompts for a single command line with TAB completion matched against the shell (bash commands, options, and files). `completions: true` switches on the content; `initial:` seeds the line; `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: "cp %name %dir", completions: true, redraw: -> { show }

data/example/browser

@@ -4,35 +4,40 @@
 # Usage:
 #   cd example && ruby browser
 #   ruby browser /path/to/dir         Start in a specific directory
-#   ruby browser --select             Start in pick mode (returns path)
 #
 # Navigates directories and displays files with size and type.
 # Pass a directory path as an argument to start there.
-# Pass --select to enter pick mode — selected file is printed to stdout on exit.
+# The picked file path is printed to stdout on exit.
 #
 # Keys:
-#   arrows / jk   Navigate up/down
-#   enter          Open directory or pick file (in select mode)
-#   /              Filter files by name
-#   esc            Exit
+#   arrows        Scroll up/down
+#   pgup/pgdn     Page up/down
+#   home/end      Jump to top/bottom
+#   tab           Cycle hint characters
+#   1-9,0         Jump to the hinted row (directories change into, files pick)
+#   enter         Open directory or pick file (returns current directory)
+#   h             Keybinding help
+#   /             Live-search names
+#   f/s/v         Filter/sort/views popups
+#   r/m/M/a/i     Reset, mark, mark range, mark all, invert marks
+#   ~/H           Home directory, toggle hidden files
+#   esc           Exit
 #
-# When run with --select, the chosen file path is printed
-# to stdout after the TUI exits (piped to calling process).
+# Click a row to open it; click a bottom-bar label to run that command.
 
 require_relative '../lib/typr.rb'
 
 class BrowserTest
   include Typr
   def initialize
-    Typr.init 
-    $conf=$*.map{|arg| [arg.start_with?(/\w/), arg] }.to_h 
-    @browser = Browser.new( right: -1, bottom: -1,
-      directory: $conf[false], colors: { hints: [:white, :black] } )
+    Typr.init
+    dirs = ARGV.reject{|arg| arg.start_with?('--') }
+    @browser = Browser.new( right: -1, bottom: -1, directory: dirs.first )
   end
 
   def run
     Typr.clear
-    $file = @browser.pick $conf[true] 
+    $file = @browser.pick(:file)
   end
 end
 
@@ -40,6 +45,5 @@ begin
   BrowserTest.new.run
 ensure
   Typr.exit
-  puts $file
-end 
-
+  puts $file if $file
+end

data/example/grid

@@ -38,10 +38,11 @@ class GridTest
     @user = Line.new( top: -1, default:
       "(s)ort, (f)ilter, (r)eset, select (R)ows/(C)olumns/(F)ields, [esc] quit")
     @head = Line.new( interval: 1,
-      default: proc{ draw " %s, sort:%s filter:%s selected:%s" %
+      default: proc{ draw " %s, sort:%s filter:%s" %
         [ Time.now.strftime("%D %T"),
           (@grid.header[@grid.sorted_by] if @grid.sorted_by),
-          @grid.filters.join, @grid.selected ] } )
+          @grid.filters.join ] } )
+    @head.reset
   end
 
   def run

data/example/text

@@ -26,9 +26,7 @@
 require_relative '../lib/typr.rb'
 
 class TextTest
-  # extend Typr
   include Typr
-  # Typr.frontend :terminal
   def initialize
     Typr.init 
     @text = Text.new( 
@@ -47,7 +45,7 @@ class TextTest
     loop do
       @text.show 
       @user.show
-      case key = Typr.read( :key )
+      case key = Typr.read_key
         when KEY_ESCAPE; exit
         when ?/; @text.search
         when ?w; @user.ask( 'pick word':  [@text, :field] )

data/lib/browser.rb

@@ -340,6 +340,7 @@ module Typr
           choice = send key
           next if choice == :scroll or choice == :outside
         else
+          if @command_keys.include? key then send key; next end
           next unless choice = send( key )
         end
         next unless choice
@@ -529,6 +530,15 @@ full:    %i[ name size permissions executable printable owner group
         ( pre + ( pre.end_with?( "/" ) ? "" : text[pre.length..-1][/\A[^\/]*/] ) ).sub( %r{(?<=.)/$}, "" )
       end
 
+      @command_keys = []
+      wire = ->(label, cmd) {
+        key = extract_key(label)
+        next unless key
+        method = cmd.is_a?(Symbol) ? cmd :
+          (cmd.start_with?('!') ? cmd[1..-1].to_sym : cmd.to_sym)
+        @keymap[method] = key
+        @command_keys << key if key.size == 1
+      }
       if args[:bindings]
         bindings_labels = []
         args[:bindings].each do |label, cmd|
@@ -536,20 +546,28 @@ full:    %i[ name size permissions executable printable owner group
           colored = @colors[:actions][name] ?
             color_code( @colors[:actions][name] ) + label + color_code(@colors[:default]) : label
           bindings_labels << colored
-          key = extract_key(label)
-          next unless key
-          method = cmd.start_with?('!') ? cmd[1..-1].to_sym : cmd.to_sym
-          @keymap[method] = key
+          wire.(label, cmd)
         end
         @user ||= Line.new( parent:self, left:->{@parent.left}, top:->{@parent.bottom+1},
-          bindings: bindings_labels )
+          colors: { regex: @colors[:regex] }, bindings: bindings_labels )
       else
-        @user ||= Line.new( parent:self, left:->{@parent.left},top:->{@parent.bottom+1},
-          bindings: %w[ [h]elp [/]:search ] + @colors[:actions].map{|name,color|
-            label = "[" + name.to_s[0] + "]" + name.to_s[1..]
-            color_code( color ) + label + color_code(@colors[:default]) } +
-              %w[ [r]eset [d]irectories [m]ark [M]ark_range mark_[a]ll
-              [i]nvert_mark [~]:home [H]idden_files [back]:.. [up] [down] [pageup] [pagedown] [home] [end] [esc]:quit [return]:confirm\  ])
+        cmds = { "[h]elp" => :help, "[/]:search" => :search,
+          "[f]ilter" => :filter_view, "[s]ort" => :sort_view, "[v]iews" => :views,
+          "[r]eset" => :reset_view, "[m]ark" => :mark,
+          "[M]ark_range" => :mark_range, "mark_[a]ll" => :mark_all,
+          "[i]nvert_mark" => :mark_invert, "[~]:home" => :home,
+          "[H]idden_files" => :toggle_hidden }
+        plain = ["[h]elp", "[/]:search"] +
+          @colors[:actions].map { |name, _| "[" + name.to_s[0] + "]" + name.to_s[1..] } +
+          %w[ [r]eset [m]ark [M]ark_range mark_[a]ll
+          [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] ?
+              color_code( @colors[:actions][name] ) + label + color_code(@colors[:default]) : label } )
       end
       cd @directory
     end

data/lib/line.rb

@@ -153,8 +153,8 @@ class Line < Space
   # line's default color, typed input in the answer color. When +completions+
   # is truthy, 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: the
-  # first word red (the command), double-dash options blue.
+  # typed input matching @colors[:regex] are colored as they are typed
+  # (with the :shell scheme: the first word red, double-dash options blue).
   #
   #   line.cli "> ", initial: "cp %name"
   #   #=> "cp source.txt" (or nil on Escape)
@@ -204,9 +204,7 @@ class Line < Space
     @prompt = ?>
     super
     @bottom = @top
-    regex = { /(?:^|\s)--[^\s]+/ => :blue, /\A\S+/ => :red }
     @colors = { question: :green, answer: :yellow }.merge @colors
-    @colors[:regex] = regex if @colors[:regex].nil?
     reset
   end
 end

data/lib/space.rb

@@ -19,8 +19,11 @@ include Typr
   def %s_setting; @%s; end  
   def %s
     max=Typr.#{ name[/left|right/] ? 'width' : 'height' }
-    if !@%s;[max, #{name=='right' ? 'left+@max' :
-      'top+rows-1+headspace'}].min
+    if !@%s;[max, #{ case name
+when 'left' then '0'
+when 'top' then '0'
+when 'right' then 'left+@max'
+else 'top+[(respond_to?(:rows) ? rows : 0), 1].max-1+(respond_to?(:headspace) ? headspace : 0)' end }].min
     elsif @%s.is_a? Proc; @%s.call
     elsif @%s.is_a? Float; (max * @%s).round
     elsif @%s.negative?; max+@%s+1

data/lib/stack.rb

@@ -101,7 +101,7 @@ module Typr
       color @colors[ :hints ]
       if type.to_s[ /column/ ]
         positions( row_id )[ @hints_start..-1 ].each_with_index{ |pos, idx|
-          move( left + pos, top + row_id )
+          move( [left + @margin.size + pos - 1, left].max, top + row_id )
           draw @hints[idx] }
       else
         bottom = top + headspace + [height, rows].min - 1

data/lib/terminal.rb

@@ -239,6 +239,24 @@ module Typr
   module_function :color_code
   public :color_code
 
+  # Named regex color schemes, accepted anywhere a +regex:+ map is (Text,
+  # Line, read_line, paint). +:generic+ paints numbers, colon keys, quoted
+  # strings, bracket groups, and punctuation; +:shell+ paints a command
+  # line's first word and double-dash options.
+  REGEX_SCHEMES = {
+    generic: {
+      /\[[^\]]*\]|\([^)]*\)|\{[^}]*\}/ => :magenta,
+      /".*?"|'.*?'/                   => :green,
+      /\b\d+(?:\.\d+)?\b/             => :cyan,
+      /\b[\w.-]+:/                    => :yellow,
+      /[^\w\s]/                       => :grey60
+    },
+    shell: {
+      /(?:^|\s)--[^\s]+/ => :blue,
+      /\A\S+/            => :red
+    }
+  }
+
   # 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
@@ -247,12 +265,26 @@ module Typr
   # When two patterns match the same span, the earlier key in the Hash wins,
   # so order overlapping keys longest-first.
   #
+  # Pre-existing ANSI sequences pass through byte-identical: only the plain
+  # text between them is matched, so painting never shreds escapes that are
+  # already in the string (and a later clip cannot orphan their bodies as
+  # literal text).
+  #
   #   Typr.paint "fix WARN now", { /WARN/ => :yellow }, "\e[39;49m"
   def self.paint str, regex, base
+    if regex.is_a? Symbol
+      regex = REGEX_SCHEMES.fetch(regex) {
+        raise ArgumentError, "unknown regex scheme: #{regex.inspect}" }
+    end
     return str if regex.nil? or regex.empty?
-    str.gsub( Regexp.union( regex.keys ) ) { |m|
-      color = regex[ regex.keys.find{ |k| k === m } ]
-      color_code( color ).to_s + m + base }
+    union = Regexp.union( regex.keys )
+    ansi = /\e(?:\[[0-9;?]*[ -\/]*[@-~]|\][^\a\e]*(?:\a|\e\\)|[()=><0A])|\e/
+    str.scan( /#{ansi}|[^\e]+/ ).map { |run|
+      run.start_with?( "\e" ) ? run :
+        run.gsub( union ) { |m|
+          color = regex[ regex.keys.find{ |k| k === m } ]
+          color_code( color ).to_s + m + base }
+    }.join
   end
 
   # Read the current background/foreground color pair.

data/lib/text.rb

@@ -85,7 +85,7 @@ module Typr
         end
       end
       @lines << @data.length unless @lines.last == @data.length
-      if (r = @colors[:regex]) and !r.empty?
+      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 }
@@ -211,15 +211,7 @@ module Typr
       @data, @lines, @tail = "", [0], ""
       @search = { pattern: nil, dir: :forward, last: nil, matches: [] }
       super args
-      regex = {
-      /\[[^\]]*\]|\([^)]*\)|\{[^}]*\}/ => :magenta,
-      /".*?"|'.*?'/                   => :green,
-      /\b\d+(?:\.\d+)?\b/             => :cyan,
-      /\b[\w.-]+:/                    => :yellow,
-      /[^\w\s]/                       => :grey60
-    }
-    @colors = { header: :yellow, search: :grey20 }.merge( @colors || {} )
-    @colors[:regex] = regex if @colors[:regex].nil?
+      @colors = { header: :yellow, search: :grey20 }.merge( @colors || {} )
       @keymap = { search: ?/, search_next: ?n, search_prev: ?p }.merge @keymap
       @lastwidth = width
       self << @input

data/typr.gemspec

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