asktty 2.0.0 → 3.0.0

data/lib/asktty/prompts/confirm_prompt.rb

@@ -1,106 +1,52 @@
 # frozen_string_literal: true
 
 module AskTTY
-  class ConfirmPrompt
-    def self.ask(title:, details: nil, value: false, &validator)
-      new(title: title, details: details, value: value, validator: validator).ask
-    end
-
-    private_class_method :new
-
-    def initialize(title:, details: nil, value: false, validator: nil)
-      @title = title.to_s
-      @details = details&.to_s
+  class ConfirmPrompt < Internal::Prompt
+    def initialize(title:, details: nil, value: false, &validator)
+      super(title: title, details: details, &validator)
 
       raise AskTTY::Error, "value must be true or false" unless [true, false].include?(value)
 
       @value = value
-      @validator = validator
     end
 
-    def ask
-      error_message = nil
-      validation_checked = false
-
-      Internal::Terminal.open do |session|
-        loop do
-          session.render(render(width: session.width, error_message: error_message))
-
-          case session.read_key
-          when :enter
-            unless validation_checked
-              error_message = validation_message
-              validation_checked = true
-            end
-
-            next if error_message
-
-            session.render(submitted_render(width: session.width))
-            return @value
-          when :left, "h"
-            previous_value = @value
-            @value = true
+    private
 
-            if @value != previous_value
-              error_message = validation_message
-              validation_checked = true
-            end
-          when :right, "l"
-            previous_value = @value
-            @value = false
+    def body_lines(width:, height:)
+      raise AskTTY::Error, "terminal is too short for prompt" if height < 2
 
-            if @value != previous_value
-              error_message = validation_message
-              validation_checked = true
-            end
-          end
-        end
-      end
-    end
+      buttons = [
+        Internal::ANSIStyle.apply("  Yes  ", @value ? :focused_button : :blurred_button),
+        Internal::ANSIStyle.apply("  No  ", @value ? :blurred_button : :focused_button)
+      ]
 
-    private
+      row = buttons.join(" ")
+      return ["", row] if Internal::Rendering.display_width(row) <= width
 
-    def render(width:, error_message: nil)
-      Internal::Rendering.prompt_frame(
-        title: @title,
-        details: @details,
-        help_items: help_items,
-        error_message: error_message,
-        width: width,
-        gap_before_body: true
-      ) do |content_width|
-        button_lines(content_width)
+      if buttons.any? { |button| Internal::Rendering.display_width(button) > width }
+        raise AskTTY::Error, "terminal is too narrow for confirmation prompt"
       end
-    end
 
-    def submitted_render(width:)
-      Internal::Rendering.submitted_frame(@title, @value ? "Yes" : "No", width: width)
+      [""] + buttons
     end
 
-    def button_lines(content_width)
-      yes_button = @value ? Internal::ANSIStyle.focused_button("Yes") : Internal::ANSIStyle.blurred_button("Yes")
-      no_button = @value ? Internal::ANSIStyle.blurred_button("No") : Internal::ANSIStyle.focused_button("No")
+    def handle_key(key)
+      previous_value = @value
 
-      row = "#{yes_button} #{no_button}"
-
-      return [row] if Internal::Rendering.display_width(row) <= content_width
-
-      button_width = [
-        Internal::Rendering.display_width(yes_button),
-        Internal::Rendering.display_width(no_button)
-      ].max
-
-      raise AskTTY::Error, "terminal is too narrow for confirmation prompt" if button_width > content_width
+      case key
+      when :left, "h" then @value = true
+      when :right, "l" then @value = false
+      end
 
-      [yes_button, no_button]
+      validate if @value != previous_value
     end
 
     def help_items
-      ["enter (submit)", "left/right (select option)"]
+      super + [["left/right", "select option"]]
     end
 
-    def validation_message
-      Internal::Validation.message_for(@value, @validator)
+    def summary
+      @value ? "Yes" : "No"
     end
   end
 end

data/lib/asktty/prompts/input_prompt.rb

@@ -1,18 +1,91 @@
 # frozen_string_literal: true
 
 module AskTTY
-  class InputPrompt
-    def self.ask(title:, details: nil, placeholder: nil, value: nil, &validator)
-      Internal::TextInputPrompt.new(
-        title: title,
-        details: details,
-        placeholder: placeholder,
-        value: value,
-        validator: validator,
-        multiline: false
-      ).ask
-    end
-
-    private_class_method :new
+  class InputPrompt < Internal::Prompt
+    def initialize(title:, details: nil, placeholder: nil, value: nil, &validator)
+      super(title: title, details: details, &validator)
+
+      @placeholder = normalize_text(placeholder) unless placeholder.nil?
+      @value = normalize_text(value)
+    end
+
+    private
+
+    def body_lines(width:, height:)
+      placeholder = @placeholder && @value.empty?
+      wrap_width = width - 2
+
+      lines = Internal::Rendering.wrap(placeholder ? @placeholder : @value, wrap_width, words: false)
+      lines << "" if !placeholder && Internal::Rendering.display_width(lines.last) >= wrap_width
+
+      first_line = lines.first
+      lines.map! { |line| Internal::ANSIStyle.apply(line, placeholder ? :muted : :text) }
+
+      if placeholder
+        lines[0] = placeholder_with_cursor(first_line)
+      else
+        lines[-1] << Internal::ANSIStyle.apply(" ", :cursor)
+      end
+
+      lines = lines.each_with_index.map do |line, index|
+        prefix = index.zero? ? Internal::ANSIStyle.apply("> ", :prompt) : "  "
+        prefix + line
+      end
+
+      focus = @value.empty? ? 0 : lines.length - 1
+
+      Internal::Rendering.window(lines, height: height, focus: focus)
+    end
+
+    def handle_key(key)
+      updated_value =
+        case key
+        when :shift_enter, :ctrl_j
+          return unless multiline?
+
+          "#{@value}\n"
+        when :backspace
+          @value.grapheme_clusters[0...-1].join
+        when Internal::Terminal::Paste
+          @value + normalize_text(key.text)
+        when String
+          return unless key == "\t" || (key.length == 1 && key >= " ")
+
+          @value + key
+        else
+          return
+        end
+
+      return if updated_value == @value
+
+      @value = updated_value
+
+      validate
+    end
+
+    def help_items
+      multiline? ? super + [["ctrl+j", "new line"]] : super
+    end
+
+    def multiline?
+      false
+    end
+
+    def normalize_text(text)
+      text = text.to_s.gsub(/\r\n?/, "\n")
+
+      multiline? ? text : text.tr("\n", " ")
+    end
+
+    def placeholder_with_cursor(text)
+      first, *rest = text.grapheme_clusters
+      return Internal::ANSIStyle.apply(" ", :cursor) unless first
+
+      Internal::ANSIStyle.apply(first, :placeholder_cursor) + Internal::ANSIStyle.apply(rest.join, :muted)
+    end
+
+    def summary
+      multiline? ? @value.tr("\n", " ") : @value
+    end
   end
 end

data/lib/asktty/prompts/multi_select_prompt.rb

@@ -1,123 +1,53 @@
 # frozen_string_literal: true
 
 module AskTTY
-  class MultiSelectPrompt
-    def self.ask(title:, options:, details: nil, values: nil, &validator)
-      new(title: title, details: details, options: options, values: values, validator: validator).ask
-    end
-
-    private_class_method :new
-
-    def initialize(title:, options:, details: nil, values: nil, validator: nil)
-      @title = title.to_s
-      @details = details&.to_s
-      @options = Internal::Options.normalize(options)
-      @validator = validator
-
-      @values = Array(values).map do |value|
-        option = @options.find { |candidate| candidate.value == value }
+  class MultiSelectPrompt < SelectPrompt
+    def initialize(title:, options:, details: nil, values: nil, &validator)
+      super(title: title, options: options, details: details, &validator)
 
-        raise AskTTY::Error, "values contain unknown option values" unless option
+      @selected = Array.new(@options.length, false)
 
-        option.value
+      Array(values).each do |value|
+        index = option_index(value) || raise(AskTTY::Error, "values contain unknown option values")
+        @selected[index] = true
       end
 
-      @index = first_selected_index || 0
-    end
-
-    def ask
-      error_message = nil
-      validation_checked = false
-
-      Internal::Terminal.open do |session|
-        loop do
-          session.render(render(width: session.width, error_message: error_message))
-
-          case session.read_key
-          when :enter
-            unless validation_checked
-              error_message = validation_message
-              validation_checked = true
-            end
-
-            next if error_message
-
-            session.render(submitted_render(width: session.width))
-            return selected_results
-          when :up, "k"
-            move(-1)
-          when :down, "j"
-            move(1)
-          when " "
-            toggle_current
-            error_message = validation_message
-            validation_checked = true
-          end
-        end
-      end
+      @index = @selected.index(true) || 0
     end
 
     private
 
-    def render(width:, error_message: nil)
-      Internal::Rendering.prompt_frame(
-        title: @title, details: @details, help_items: help_items, error_message: error_message, width: width
-      ) do |content_width|
-        option_lines(content_width)
-      end
-    end
-
-    def submitted_render(width:)
-      labels = selected_options.map(&:label).join(", ")
-
-      Internal::Rendering.submitted_frame(@title, labels, width: width)
-    end
-
-    def option_lines(content_width)
-      @options.each_with_index.flat_map do |option, index|
-        cursor = index == @index ? Internal::ANSIStyle.prompt("> ") : "  "
-        selected = @values.include?(option.value)
-        marker = selected ? Internal::ANSIStyle.selected("[•] ") : Internal::ANSIStyle.text("[ ] ")
-        style = selected ? Internal::ANSIStyle.method(:selected) : Internal::ANSIStyle.method(:text)
-
-        Internal::Rendering.prefixed_lines(
-          option.label, prefix: cursor + marker, width: content_width, style: style
-        )
+    def handle_key(key)
+      if key == " "
+        @selected[@index] = !@selected[@index]
+        validate
+      else
+        move_cursor(key)
       end
     end
 
-    def first_selected_index
-      @options.index { |option| @values.include?(option.value) }
-    end
-
     def help_items
-      ["enter (submit)", "up/down (select item)", "space (toggle item)"]
+      super + [["space", "toggle item"]]
     end
 
-    def move(offset)
-      @index = (@index + offset) % @options.length
+    def marker(index)
+      selected?(index) ? Internal::ANSIStyle.apply("[•] ", :selected) : Internal::ANSIStyle.apply("[ ] ", :text)
     end
 
-    def selected_options
-      @options.select { |option| @values.include?(option.value) }
+    def selected?(index)
+      @selected[index]
     end
 
-    def selected_results
-      selected_options.map(&:value)
+    def selected_options
+      @options.select.with_index { |_option, index| selected?(index) }
     end
 
-    def toggle_current
-      value = @options[@index].value
-
-      if @values.include?(value)
-        @values.delete(value)
-      else
-        @values << value
-      end
+    def summary
+      selected_options.map(&:label).join(", ")
     end
 
-    def validation_message
-      Internal::Validation.message_for(selected_results, @validator)
+    def value
+      selected_options.map(&:value)
     end
   end
 end

data/lib/asktty/prompts/select_prompt.rb

@@ -1,111 +1,100 @@
 # frozen_string_literal: true
 
 module AskTTY
-  class SelectPrompt
+  class SelectPrompt < Internal::Prompt
+    Option = Data.define(:label, :value)
     UNSET = Object.new.freeze
 
-    private_constant :UNSET
+    private_constant :Option, :UNSET
 
-    def self.ask(title:, options:, details: nil, value: UNSET, &validator)
-      new(title: title, details: details, options: options, value: value, validator: validator).ask
-    end
+    def initialize(title:, options:, details: nil, value: UNSET, &validator)
+      super(title: title, details: details, &validator)
 
-    private_class_method :new
+      @index = 0
+      @options = normalize_options(options)
 
-    def initialize(title:, options:, details: nil, value: UNSET, validator: nil)
-      @title = title.to_s
-      @details = details&.to_s
-      @options = Internal::Options.normalize(options)
-      @index = index_for(value)
-      @validator = validator
-    end
+      return if value.equal?(UNSET)
 
-    def ask
-      error_message = nil
-      validation_checked = false
-
-      Internal::Terminal.open do |session|
-        loop do
-          session.render(render(width: session.width, error_message: error_message))
-
-          case session.read_key
-          when :enter
-            unless validation_checked
-              error_message = validation_message
-              validation_checked = true
-            end
-
-            next if error_message
-
-            session.render(submitted_render(width: session.width))
-            return selected_option.value
-          when :up, "k"
-            previous_value = selected_option.value
-            move(-1)
-
-            if selected_option.value != previous_value
-              error_message = validation_message
-              validation_checked = true
-            end
-          when :down, "j"
-            previous_value = selected_option.value
-            move(1)
-
-            if selected_option.value != previous_value
-              error_message = validation_message
-              validation_checked = true
-            end
-          end
-        end
-      end
+      @index = option_index(value) || raise(AskTTY::Error, "value is not a valid option value")
     end
 
     private
 
-    def render(width:, error_message: nil)
-      Internal::Rendering.prompt_frame(
-        title: @title, details: @details, help_items: help_items, error_message: error_message, width: width
-      ) do |content_width|
-        option_lines(content_width)
+    def body_lines(width:, height:)
+      groups = @options.each_with_index.map do |option, index|
+        cursor = index == @index ? Internal::ANSIStyle.apply("> ", :prompt) : "  "
+
+        Internal::Rendering.prefixed_lines(
+          option.label, prefix: cursor + marker(index), width: width, style: selected?(index) ? :selected : :text
+        )
       end
-    end
 
-    def submitted_render(width:)
-      Internal::Rendering.submitted_frame(@title, selected_option.label, width: width)
+      focus = groups.take(@index).sum(&:length)
+
+      Internal::Rendering.window(groups.flatten, height: height, focus: focus)
     end
 
-    def option_lines(content_width)
-      @options.each_with_index.flat_map do |option, index|
-        prefix = index == @index ? Internal::ANSIStyle.prompt("> ") : "  "
-        style = index == @index ? Internal::ANSIStyle.method(:selected) : Internal::ANSIStyle.method(:text)
+    def handle_key(key)
+      previous_index = @index
+      move_cursor(key)
 
-        Internal::Rendering.prefixed_lines(
-          option.label, prefix: prefix, width: content_width, style: style
-        )
-      end
+      validate if @index != previous_index
     end
 
     def help_items
-      ["enter (submit)", "up/down (select item)"]
+      super + [["up/down", "select item"]]
     end
 
-    def index_for(value)
-      return 0 if value.equal?(UNSET)
-
-      @options.index { |option| option.value == value } ||
-        raise(AskTTY::Error, "value is not a valid option value")
+    def marker(_index)
+      ""
     end
 
-    def move(offset)
+    def move_cursor(key)
+      offset =
+        case key
+        when :up, "k" then -1
+        when :down, "j" then 1
+        else return
+        end
+
       @index = (@index + offset) % @options.length
     end
 
-    def selected_option
-      @options[@index]
+    def normalize_options(options)
+      raise AskTTY::Error, "options must be a non-empty array" unless options.is_a?(Array) && !options.empty?
+
+      values = []
+
+      options.map do |option|
+        raise AskTTY::Error, "options must be hashes with label and value" unless option.is_a?(Hash)
+
+        unless option.key?(:label) && option.key?(:value) && !option[:label].nil?
+          raise AskTTY::Error, "options must include label and value"
+        end
+
+        value = option[:value]
+        raise AskTTY::Error, "option values must be unique" if values.include?(value)
+
+        values << value
+
+        Option.new(option[:label].to_s, value)
+      end
+    end
+
+    def option_index(value)
+      @options.index { |option| option.value == value }
+    end
+
+    def selected?(index)
+      index == @index
+    end
+
+    def summary
+      @options[@index].label
     end
 
-    def validation_message
-      Internal::Validation.message_for(selected_option.value, @validator)
+    def value
+      @options[@index].value
     end
   end
 end

data/lib/asktty/prompts/text_prompt.rb

@@ -1,18 +1,11 @@
 # frozen_string_literal: true
 
 module AskTTY
-  class TextPrompt
-    def self.ask(title:, details: nil, placeholder: nil, value: nil, &validator)
-      Internal::TextInputPrompt.new(
-        title: title,
-        details: details,
-        placeholder: placeholder,
-        value: value,
-        validator: validator,
-        multiline: true
-      ).ask
-    end
+  class TextPrompt < InputPrompt
+    private
 
-    private_class_method :new
+    def multiline?
+      true
+    end
   end
 end

data/lib/asktty/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AskTTY
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 end

data/lib/asktty.rb

@@ -7,11 +7,10 @@ module AskTTY
 end
 
 require_relative "asktty/internal/ansi_style"
-require_relative "asktty/internal/options"
+require_relative "asktty/internal/prompt"
 require_relative "asktty/internal/rendering"
 require_relative "asktty/internal/terminal"
-require_relative "asktty/internal/validation"
-require_relative "asktty/internal/text_input_prompt"
+
 require_relative "asktty/prompts/input_prompt"
 require_relative "asktty/prompts/text_prompt"
 require_relative "asktty/prompts/select_prompt"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asktty
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Vlad Suchy
@@ -35,11 +35,9 @@ files:
 - README.md
 - lib/asktty.rb
 - lib/asktty/internal/ansi_style.rb
-- lib/asktty/internal/options.rb
+- lib/asktty/internal/prompt.rb
 - lib/asktty/internal/rendering.rb
 - lib/asktty/internal/terminal.rb
-- lib/asktty/internal/text_input_prompt.rb
-- lib/asktty/internal/validation.rb
 - lib/asktty/prompts/confirm_prompt.rb
 - lib/asktty/prompts/input_prompt.rb
 - lib/asktty/prompts/multi_select_prompt.rb

data/lib/asktty/internal/options.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module AskTTY
-  module Internal
-    module Options
-      Option = Data.define(:label, :value)
-
-      private_constant :Option
-
-      module_function
-
-      def normalize(options)
-        raise AskTTY::Error, "options must be a non-empty array" unless options.is_a?(Array) && !options.empty?
-
-        values = []
-
-        options.map do |option|
-          raise AskTTY::Error, "options must be hashes with label and value" unless option.is_a?(Hash)
-
-          unless option.key?(:label) && option.key?(:value) && !option[:label].nil?
-            raise AskTTY::Error, "options must include label and value"
-          end
-
-          value = option[:value]
-          raise AskTTY::Error, "option values must be unique" if values.include?(value)
-
-          values << value
-          Option.new(option[:label].to_s, value)
-        end
-      end
-    end
-  end
-end