typr 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fc328e46b4b4d36e0d3f68eb0a50f8068934469ec5e9d5d84099755685732ad
-  data.tar.gz: 254c5a5842474b4fc550a0aff5fbaa772e961a6aca9a9a8f90ed1a89cc761e51
+  metadata.gz: 3e9446e4b4389a720e2bda6b8e95f7a7144eb5b731b72f325b80f4bdea2866ed
+  data.tar.gz: 2c8d5867850febf6db6cebcee4acb6fde4b4c023007af4af54124f12f927e19f
 SHA512:
-  metadata.gz: eeae3cd67ce492706bc952e8422adea09d300f115928c074411c2589f5dae577ff4ad73e610e6a9b279007a93205e81fa9579c59d3f404f2778f52b06cb26e24
-  data.tar.gz: 735a2236dbd0868674f4727572f578237f34165ab04d683179dd45464918099719c422503b386915f2df4895f1d5228550e6ee9bc25a9bf607d650eff8e8153c
+  metadata.gz: 670f5b22e356fd91507a3335038d228c06d8eef5cb404c76783c6dfa37126f073ad90253b062b26aedc81ef15c9fcb95fde0074ffff3b15dac5fd670fa53045b
+  data.tar.gz: 8dd835d95fb86ac1a56c9390ac7a485ea17d5f5e70e917db4f18d5f6491517dfc31dc56cf07a13ffffed58ae3dc92d9f1a0600ed944c7e2ca9ecc0b67389ad94

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## [vx.y.z] — __DATE__
 
+## [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/lib/terminal.rb

@@ -247,12 +247,22 @@ 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
     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/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.6.1"
+  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.6.1
 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