natty-ui 0.9.2 → 0.9.4

data/lib/natty-ui/text.rb

@@ -0,0 +1,213 @@
+# frozen_string_literal: true
+
+require_relative 'ansi'
+
+module NattyUI
+  module Text
+    class << self
+      def plain(str) = Ansi.blemish(plain_but_ansi(str))
+
+      def plain_but_ansi(str)
+        (str = str.to_s).empty? and return str
+        str.gsub(/(\[\[((?~\]\]))\]\])/) do
+          match = Regexp.last_match[2]
+          next match.size == 1 ? nil : "[[#{match[1..]}]]" if match[0] == '/'
+          Ansi.try_convert(match) ? nil : "[[#{match}]]"
+        end
+      end
+
+      def embellish(str)
+        (str = str.to_s).empty? and return str
+        reset = false
+        str =
+          str.gsub(/(\[\[((?~\]\]))\]\])/) do
+            match = Regexp.last_match[2]
+            if match[0] == '/'
+              next "[[#{match[1..]}]]" if match.size > 1
+              reset = false
+              next Ansi::RESET
+            end
+            ansi = Ansi.try_convert(match)
+            ansi ? reset = ansi : "[[#{match}]]"
+          end
+        reset ? "#{str}#{Ansi::RESET}" : str
+      end
+
+      def width(str)
+        return 0 if (str = plain(str)).empty?
+        str = str.encode(UTF_8) if str.encoding != UTF_8
+        width = 0
+        in_zero_width = false
+        str.scan(WIDTH_SCANNER) do |np_start, np_end, _csi, _osc, gc|
+          if in_zero_width
+            in_zero_width = false if np_end
+            next
+          end
+          next in_zero_width = true if np_start
+          width += char_width(gc) if gc
+        end
+        width
+      end
+
+      def char_width(char)
+        ord = char.ord
+        return SPECIAL_CHARS[ord] || 2 if ord <= 0x1f
+        return 1 if ord <= 0x7e
+        size = EastAsianWidth[ord]
+        return @ambiguous_char_width if size == -1
+        if size == 1 && char.size >= 2
+          sco = char[1].ord
+          # Halfwidth Dakuten Handakuten
+          return sco == 0xff9e || sco == 0xff9f ? 2 : 1
+        end
+        size
+      end
+
+      def simple_each_line(strs, &block)
+        strs.each { _1.to_s.each_line(chomp: true, &block) }
+        nil
+      end
+
+      def each_line(strs, max_width)
+        return if (max_width = max_width.to_i) <= 0
+        strs.each do |str|
+          str
+            .to_s
+            .each_line(chomp: true) do |line|
+              next yield(line) if line.empty?
+              current = String.new(encoding: line.encoding)
+              seq = current.dup
+              width = 0
+              in_zero_width = false
+              line = line.encode(UTF_8) if line.encoding != UTF_8
+              line.scan(WIDTH_SCANNER) do |np_start, np_end, csi, osc, gc|
+                next in_zero_width = (current << "\1") if np_start
+                next in_zero_width = !(current << "\2") if np_end
+                next (current << osc) && (seq << osc) if osc
+                if csi
+                  current << csi
+                  next if in_zero_width
+                  next seq.clear if csi == "\e[m" || csi == "\e[0m"
+                  next seq << csi
+                end
+                next current << gc if in_zero_width
+                cw = char_width(gc)
+                if (width += cw) > max_width
+                  yield(current)
+                  width = cw
+                  current = seq.dup
+                end
+                current << gc
+              end
+              yield(current)
+            end
+        end
+        nil
+      end
+
+      def each_line_with_size(strs, max_width)
+        return if (max_width = max_width.to_i) <= 0
+        strs.each do |str|
+          str
+            .to_s
+            .each_line(chomp: true) do |line|
+              next yield(line, 0) if line.empty?
+              current = String.new(encoding: line.encoding)
+              seq = current.dup
+              width = 0
+              in_zero_width = false
+              line = line.encode(UTF_8) if line.encoding != UTF_8
+              line.scan(WIDTH_SCANNER) do |np_start, np_end, csi, osc, gc|
+                next in_zero_width = (current << "\1") if np_start
+                next in_zero_width = !(current << "\2") if np_end
+                next (current << osc) && (seq << osc) if osc
+                if csi
+                  current << csi
+                  next if in_zero_width
+                  next seq.clear if csi == "\e[m" || csi == "\e[0m"
+                  next seq << csi
+                end
+                next current << gc if in_zero_width
+                cw = char_width(gc)
+                if (width += cw) > max_width
+                  yield(current, width - cw)
+                  width = cw
+                  current = seq.dup
+                end
+                current << gc
+              end
+              yield(current, width)
+            end
+        end
+        nil
+      end
+
+      def as_lines(strs, max_width)
+        ret = []
+        each_line(strs, max_width) { ret << _1 }
+        ret
+      end
+
+      def prepare_print(args, kwargs, screen_columns, &cvt)
+        prefix = kwargs[:prefix] and prefix = prefix.empty? ? '' : cvt[prefix]
+        suffix = kwargs[:suffix] and suffix = suffix.empty? ? '' : cvt[suffix]
+        return ["#{prefix}#{suffix}"] if args.empty?
+        ret = []
+        each_line(
+          args.map!(&cvt),
+          kwargs.fetch(:max_width) do
+            screen_columns.call -
+              kwargs.fetch(:prefix_width) { width(prefix) } -
+              kwargs.fetch(:suffix_width) { width(suffix) }
+          end
+        ) { ret << "#{prefix}#{_1}#{suffix}" }
+        ret
+      end
+    end
+
+    UTF_8 = Encoding::UTF_8
+
+    WIDTH_SCANNER = /\G(?:(\1)|(\2)|(#{Ansi::CSI})|(#{Ansi::OSC})|(\X))/
+
+    SPECIAL_CHARS = {
+      0x00 => 0,
+      0x01 => 1,
+      0x02 => 1,
+      0x03 => 1,
+      0x04 => 1,
+      0x05 => 0,
+      0x06 => 1,
+      0x07 => 0,
+      0x08 => 0,
+      0x09 => 8,
+      0x0a => 0,
+      0x0b => 0,
+      0x0c => 0,
+      0x0d => 0,
+      0x0e => 0,
+      0x0f => 0,
+      0x10 => 1,
+      0x11 => 1,
+      0x12 => 1,
+      0x13 => 1,
+      0x14 => 1,
+      0x15 => 1,
+      0x16 => 1,
+      0x17 => 1,
+      0x18 => 1,
+      0x19 => 1,
+      0x1a => 1,
+      0x1b => 1,
+      0x1c => 1,
+      0x1d => 1,
+      0x1e => 1,
+      0x1f => 1
+    }.compare_by_identity.freeze
+
+    autoload(:EastAsianWidth, File.join(__dir__, 'text', 'east_asian_width'))
+
+    @ambiguous_char_width = 1
+  end
+
+  private_constant :Text
+end

data/lib/natty-ui/version.rb

@@ -2,5 +2,5 @@
 
 module NattyUI
   # The version number of the gem.
-  VERSION = '0.9.2'
+  VERSION = '0.9.4'
 end

data/lib/natty-ui/wrapper/ask.rb

@@ -60,7 +60,7 @@ module NattyUI
         @parent.print(
           question,
           prefix: "#{glyph} #{Ansi[255]}",
-          prefix_width: NattyUI.display_width(glyph) + 1,
+          prefix_width: Text.width(glyph) + 1,
           suffix_width: 0
         )
       end

data/lib/natty-ui/wrapper/element.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../features'
+require_relative 'features'
 
 module NattyUI
   class Wrapper

data/lib/natty-ui/wrapper/horizontal_rule.rb

@@ -20,7 +20,7 @@ module NattyUI
       protected
 
       def call(symbol)
-        size = NattyUI.display_width(symbol = symbol.to_s)
+        size = Text.width(symbol = symbol.to_s)
         return @parent.puts if size == 0
         max_width = available_width
         @parent.print(

data/lib/natty-ui/wrapper/list_in_columns.rb

@@ -57,9 +57,7 @@ module NattyUI
         return @parent if list.empty?
         list.flatten!
         cvt = cvt(glyph, list.size)
-        list.map! do |item|
-          Item.new(item = cvt[item], NattyUI.display_width(item))
-        end
+        list.map! { |item| Item.new(item = cvt[item], Text.width(item)) }
         if compact
           each_compacted(list, available_width - 1) { @parent.puts(_1) }
         else
@@ -71,27 +69,27 @@ module NattyUI
       def cvt(glyph, size)
         case glyph
         when nil, false
-          ->(s) { NattyUI.embellish(s) }
+          ->(s) { Text.embellish(s) }
         when :hex
           pad = size.to_s(16).size
           glyph = 0
           lambda do |s|
-            "#{(glyph += 1).to_s(16).rjust(pad, '0')} #{NattyUI.embellish(s)}"
+            "#{(glyph += 1).to_s(16).rjust(pad, '0')} #{Text.embellish(s)}"
           end
         when Integer
           pad = (glyph + size).to_s.size
           glyph -= 1
-          ->(s) { "#{(glyph += 1).to_s.rjust(pad)} #{NattyUI.embellish(s)}" }
+          ->(s) { "#{(glyph += 1).to_s.rjust(pad)} #{Text.embellish(s)}" }
         when Symbol
           lambda do |s|
             "#{
               t = glyph
               glyph = glyph.succ
               t
-            } #{NattyUI.embellish(s)}"
+            } #{Text.embellish(s)}"
           end
         else
-          ->(s) { "#{glyph} #{NattyUI.embellish(s)}" }
+          ->(s) { "#{glyph} #{Text.embellish(s)}" }
         end
       end
 

data/lib/natty-ui/wrapper/message.rb

@@ -95,7 +95,7 @@ module NattyUI
 
       def initialize(parent, title:, glyph:)
         glyph = parent.wrapper.glyph(glyph) || glyph
-        prefix_width = NattyUI.display_width(glyph) + 1
+        prefix_width = Text.width(glyph) + 1
         super(
           parent,
           prefix: ' ' * prefix_width,

data/lib/natty-ui/wrapper/query.rb

@@ -69,7 +69,6 @@ module NattyUI
           .to_h { |str, i| [i + 1, str] }
           .merge!(kw_choices)
           .transform_keys!(&:to_s)
-          .transform_values! { _1.to_s.gsub(/[[:space:]]/, ' ') }
       end
 
       def read(choices, result)

data/lib/natty-ui/wrapper/request.rb

@@ -40,7 +40,7 @@ module NattyUI
         @parent.print(
           question,
           prefix: "#{glyph} #{Ansi[255]}",
-          prefix_width: NattyUI.display_width(glyph) + 1,
+          prefix_width: Text.width(glyph) + 1,
           suffix_width: 0
         )
         (wrapper.stream << ANSI_PREFIX).flush if wrapper.ansi?

data/lib/natty-ui/wrapper/section.rb

@@ -103,9 +103,9 @@ module NattyUI
       def initialize(
         parent,
         prefix:,
-        prefix_width: NattyUI.display_width(prefix),
+        prefix_width: Text.width(prefix),
         suffix: nil,
-        suffix_width: NattyUI.display_width(suffix)
+        suffix_width: Text.width(suffix)
       )
         super(parent)
         @prefix = prefix

data/lib/natty-ui/wrapper/table.rb

@@ -53,8 +53,8 @@ module NattyUI
     #       %w[kiwi 1.5$ Newzeeland]
     #     )
     def table(*table, type: :simple)
-      table = Table.new(*table)
-      yield(table) if block_given?
+      return _element(:Table, table, type) unless block_given?
+      yield(table = Table.new(table))
       _element(:Table, table.rows, type)
     end
 
@@ -74,7 +74,7 @@ module NattyUI
     #   #   kiwi: 1.5$
     #
     def pairs(seperator = ': ', **kwargs)
-      _element(:Pairs, Table.new(**kwargs).rows, seperator)
+      _element(:Pairs, kwargs.to_a, seperator)
     end
 
     class Table
@@ -93,11 +93,7 @@ module NattyUI
         self
       end
 
-      def initialize(*args, **kwargs)
-        @rows = []
-        args.each { add_row(*_1) }
-        kwargs.each_pair { add_row(*_1) }
-      end
+      def initialize(rows) = (@rows = rows)
     end
     private_constant :Table
   end
@@ -143,7 +139,7 @@ module NattyUI
           rows,
           @parent.available_width - 1,
           seperator,
-          NattyUI.plain(seperator, ansi: false)[-1] == ' '
+          Text.plain(seperator)[-1] == ' '
         ) { @parent.puts(_1) }
         @parent
       end
@@ -170,7 +166,7 @@ module NattyUI
 
       def self.each_simple_line(rows, max_width, col_div, first_right)
         return if rows.empty?
-        gen = new(rows, max_width, NattyUI.display_width(col_div))
+        gen = new(rows, max_width, Text.width(col_div))
         return unless gen.ok?
         gen.aligns[0] = :right if first_right
         gen.each { yield(_1.join(col_div)) }
@@ -182,7 +178,7 @@ module NattyUI
         @rows =
           rows.map do |row|
             row.map do |col|
-              col = NattyUI.embellish(col).each_line(chomp: true).to_a
+              col = Text.embellish(col).each_line(chomp: true).to_a
               col.empty? ? col << '' : col
             end
           end
@@ -218,7 +214,7 @@ module NattyUI
       private
 
       def align(str, width, alignment)
-        return str unless (width -= NattyUI.display_width(str)).positive?
+        return str unless (width -= Text.width(str)).positive?
         return str + (' ' * width) if alignment == :left
         (' ' * width) << str
       end
@@ -239,9 +235,7 @@ module NattyUI
           diff.each do |col_idx|
             adjust_to = adjusted[col_idx]
             next if matrix[row_idx][col_idx] <= adjust_to
-            ary = NattyUI.each_line(*row[col_idx], max_width: adjust_to).to_a
-            ary.pop if ary.last.empty?
-            row[col_idx] = ary
+            row[col_idx] = Text.as_lines(row[col_idx], adjust_to)
           end
         end
         adjusted
@@ -249,9 +243,7 @@ module NattyUI
 
       def create_matrix
         ret =
-          @rows.map do |row|
-            row.map { |col| col.map { NattyUI.display_width(_1) }.max }
-          end
+          @rows.map { |row| row.map { |col| col.map { Text.width(_1) }.max } }
         cc = ret.max_by(&:size).size
         ret.each { (add = cc - _1.size).nonzero? and _1.fill(0, _1.size, add) }
       end

data/lib/natty-ui/wrapper.rb

@@ -51,9 +51,8 @@ module NattyUI
     #   @param [#to_s] ... objects to print
     #   @return [Wrapper] itself
     def puts(*args, **kwargs)
-      args = prepare_print(args, kwargs)
+      @stream.puts(args = prepare_print(args, kwargs))
       @lines_written += args.size
-      @stream.puts(args)
       @stream.flush
       self
     end
@@ -64,9 +63,8 @@ module NattyUI
     #   @param [#to_s] ... objects to print
     #   @return [Wrapper] itself
     def print(*args, **kwargs)
-      args = prepare_print(args, kwargs).to_a
+      @stream.print(*(args = prepare_print(args, kwargs)))
       @lines_written += args.size - 1
-      @stream.print(*args)
       @stream.flush
       self
     end
@@ -168,24 +166,7 @@ module NattyUI
     protected
 
     def prepare_print(args, kwargs)
-      _prepare_print(args, kwargs) { NattyUI.plain(_1, ansi: false) }
-    end
-
-    def _prepare_print(args, kwargs, &cvt)
-      prefix = kwargs[:prefix] and prefix = prefix.empty? ? '' : cvt[prefix]
-      suffix = kwargs[:suffix] and suffix = suffix.empty? ? '' : cvt[suffix]
-      return ["#{prefix}#{suffix}"] if args.empty?
-      NattyUI
-        .each_line(
-          *args.map!(&cvt),
-          max_width:
-            kwargs.fetch(:max_width) do
-              screen_columns -
-                kwargs.fetch(:prefix_width) { NattyUI.display_width(prefix) } -
-                kwargs.fetch(:suffix_width) { NattyUI.display_width(suffix) }
-            end
-        )
-        .map { "#{prefix}#{_1}#{suffix}" }
+      Text.prepare_print(args, kwargs, -> { screen_columns }) { Text.plain(_1) }
     end
 
     def temp_func

data/lib/natty-ui.rb

@@ -1,14 +1,6 @@
 # frozen_string_literal: true
 
-unless defined?(Reline)
-  # load the Reline::Unicode part only
-  # @!visibility private
-  module Reline
-    # @!visibility private
-    def self.ambiguous_width = 1
-  end
-  require 'reline/unicode'
-end
+require_relative 'natty-ui/text'
 require_relative 'natty-ui/wrapper'
 require_relative 'natty-ui/ansi_wrapper'
 
@@ -54,24 +46,24 @@ module NattyUI
       wrapper_class(stream, ansi).__send__(:new, stream)
     end
 
-    # Test if the given `stream` can be used for output
+    # Test if the given `stream` can be used for input
     #
     # @param [IO] stream IO instance to test
     # @return [Boolean] whether if the given stream is usable
-    def valid_out?(stream)
-      (stream.is_a?(IO) && !stream.closed? && stream.stat.writable?) ||
-        (stream.is_a?(StringIO) && !stream.closed_write?)
+    def valid_in?(stream)
+      (stream.is_a?(IO) && !stream.closed? && stream.stat.readable?) ||
+        (stream.is_a?(StringIO) && !stream.closed_read?)
     rescue StandardError
       false
     end
 
-    # Test if the given `stream` can be used for input
+    # Test if the given `stream` can be used for output
     #
     # @param [IO] stream IO instance to test
     # @return [Boolean] whether if the given stream is usable
-    def valid_in?(stream)
-      (stream.is_a?(IO) && !stream.closed? && stream.stat.readable?) ||
-        (stream.is_a?(StringIO) && !stream.closed_read?)
+    def valid_out?(stream)
+      (stream.is_a?(IO) && !stream.closed? && stream.stat.writable?) ||
+        (stream.is_a?(StringIO) && !stream.closed_write?)
     rescue StandardError
       false
     end
@@ -80,23 +72,7 @@ module NattyUI
     #
     # @param [#to_s] str string to edit
     # @return [String] edited string
-    def embellish(str)
-      return +'' if (str = str.to_s).empty?
-      reset = false
-      str =
-        str.gsub(/(\[\[((?~\]\]))\]\])/) do
-          match = Regexp.last_match[2]
-          if match[0] == '/'
-            next "[[#{match[1..]}]]" if match.size > 1
-            reset = false
-            Ansi::RESET
-          else
-            ansi = Ansi.try_convert(match)
-            ansi ? reset = ansi : "[[#{match}]]"
-          end
-        end
-      reset ? "#{str}#{Ansi::RESET}" : str
-    end
+    def embellish(str) = Text.embellish(str)
 
     # Remove embedded attribute descriptions from given string.
     #
@@ -104,14 +80,7 @@ module NattyUI
     # @param [:keep,:remove] ansi keep or remove ANSI codes too
     # @return [String] edited string
     def plain(str, ansi: :keep)
-      return +'' if (str = str.to_s).empty?
-      str =
-        str.gsub(/(\[\[((?~\]\]))\]\])/) do
-          match = Regexp.last_match[2]
-          next match.size == 1 ? nil : "[[#{match[1..]}]]" if match[0] == '/'
-          Ansi.try_convert(match) ? nil : "[[#{match}]]"
-        end
-      ansi == :keep ? str : Ansi.blemish(str)
+      ansi == :keep ? Text.plain_but_ansi(str) : Text.plain(str)
     end
 
     # Calculate monospace (display) width of given String.
@@ -119,54 +88,24 @@ module NattyUI
     #
     # @param [#to_s] str string to calculate
     # @return [Integer] the display size
-    def display_width(str)
-      str = plain(str).encode(Encoding::UTF_8)
-      return 0 if str.empty?
-      width = 0
-      in_zero_width = false
-      str.scan(Ansi::WIDTH_SCANNER) do |np_start, np_end, _csi, _osc, gc|
-        if in_zero_width
-          in_zero_width = false if np_end
-          next
-        end
-        next in_zero_width = true if np_start
-        width += Reline::Unicode.get_mbchar_width(gc) if gc
-      end
-      width
-    end
+    def display_width(str) = Text.width(str)
 
     # Convert given arguments into strings and yield each line.
     # Optionally limit the line width to given `max_width`.
     #
     # @overload each_line(..., max_width: nil)
-    #   @param [#to_s] ... objects to print
+    #   @param [#to_s] ... objects converted to text lines
     #   @param [#to_i, nil] max_width maximum line width
     #   @yieldparam [String] line string line
     #   @return [nil]
     # @overload each_line(..., max_width: nil)
-    #   @param [#to_s] ... objects to print
+    #   @param [#to_s] ... objects converted to text lines
     #   @param [#to_i, nil] max_width maximum line width
     #   @return [Enumerator] line enumerator
     def each_line(*strs, max_width: nil, &block)
       return to_enum(__method__, *strs, max_width: max_width) unless block
-      if max_width.nil?
-        strs.each { _1.to_s.each_line(chomp: true, &block) }
-        return nil
-      end
-      return if (max_width = max_width.to_i) <= 0
-      strs.each do |str|
-        str
-          .to_s
-          .each_line(chomp: true) do |line|
-            next yield(line) if line.empty?
-            lines, _height = Reline::Unicode.split_by_width(line, max_width)
-            lines.compact!
-            next if lines.empty?
-            lines.pop if lines[-1].empty?
-            lines.each(&block)
-          end
-      end
-      nil
+      return Text.simple_each_line(strs, &block) unless max_width
+      Text.each_line(strs, max_width, &block)
     end
 
     # Read next raw key (keyboard input) from {in_stream}.
@@ -219,11 +158,14 @@ module NattyUI
   # Instance for standard error output.
   StdErr = stderr_is_stdout? ? StdOut : new(STDERR)
 
+  dir = __dir__
+  autoload(:LineAnimation, File.join(dir, 'natty-ui', 'line_animation'))
+  autoload(:KEY_MAP, File.join(dir, 'natty-ui', 'key_map'))
+
+  private_constant :LineAnimation, :KEY_MAP
+
   @element = StdOut
   self.in_stream = STDIN
-
-  autoload(:KEY_MAP, File.join(__dir__, 'natty-ui', 'key_map'))
-  private_constant :KEY_MAP
 end
 
 # @!visibility private