clack 0.4.6 → 0.6.0

data/lib/clack/prompts/autocomplete_multiselect.rb

@@ -29,7 +29,7 @@ module Clack
     class AutocompleteMultiselect < Core::Prompt
       include Core::OptionsHelper
       include Core::TextInputHelper
-      include Core::ScrollHelper
+      include Core::SelectionManager
 
       # @param message [String] the prompt message
       # @param options [Array<Hash, String>] list of options to filter
@@ -42,6 +42,9 @@ module Clack
       #   across label, value, and hint is used.
       # @param opts [Hash] additional options passed to {Core::Prompt}
       def initialize(message:, options:, max_items: 5, placeholder: nil, required: true, initial_values: [], filter: nil, **opts)
+        if opts.key?(:initial_value)
+          raise ArgumentError, "AutocompleteMultiselect uses initial_values: (plural), not initial_value:"
+        end
         super(message:, **opts)
         @all_options = normalize_options(options)
         @max_items = max_items
@@ -50,9 +53,9 @@ module Clack
         @filter = filter
         @search_text = ""
         @cursor = 0
-        @selected_index = 0
+        @option_index = 0
         @scroll_offset = 0
-        valid_values = Set.new(@all_options.map { |o| o[:value] })
+        valid_values = Set.new(@all_options.map { |o| o.value })
         @selected = Set.new(initial_values) & valid_values
         update_filtered
       end
@@ -84,24 +87,16 @@ module Clack
       def toggle_current
         return if @filtered.empty?
 
-        opt = @filtered[@selected_index]
-        return if opt[:disabled]
+        opt = @filtered[@option_index]
+        return if opt.disabled
 
-        if @selected.include?(opt[:value])
-          @selected.delete(opt[:value])
-        else
-          @selected.add(opt[:value])
-        end
+        toggle_value(opt.value)
       end
 
       def submit
-        if @required && @selected.empty?
-          @error_message = "Please select at least one option. Press #{Colors.cyan("space")} to select, #{Colors.cyan("enter")} to submit"
-          @state = :error
-          return
-        end
+        return unless validate_selection
 
-        @value = @selected.to_a
+        update_selection_value
         super
       end
 
@@ -112,9 +107,9 @@ module Clack
         lines << help_line
         lines << "#{active_bar}  #{Colors.dim("Search:")} #{input_display}#{match_count}\n"
 
-        visible_items.each_with_index do |opt, idx|
+        visible_options.each_with_index do |opt, idx|
           actual_idx = @scroll_offset + idx
-          lines << "#{active_bar}  #{option_display(opt, actual_idx == @selected_index)}\n"
+          lines << "#{active_bar}  #{option_display(opt, actual_idx == @option_index)}\n"
         end
 
         lines << "#{active_bar}  #{Colors.yellow("No matches found")}\n" if @filtered.empty? && !@search_text.empty?
@@ -130,9 +125,7 @@ module Clack
         lines.join
       end
 
-      def final_display
-        @all_options.select { |o| @selected.include?(o[:value]) }.map { |o| o[:label] }.join(", ")
-      end
+      def final_display = selected_labels(@all_options)
 
       private
 
@@ -146,7 +139,7 @@ module Clack
       def handle_text_input(key)
         return unless super
 
-        @selected_index = 0
+        @option_index = 0
         @scroll_offset = 0
         update_filtered
       end
@@ -173,18 +166,18 @@ module Clack
         end
       end
 
-      def scroll_items = @filtered
+      def navigable_items = @filtered
 
       def option_display(opt, active)
-        selected = @selected.include?(opt[:value])
+        selected = @selected.include?(opt.value)
         checkbox = if selected
           Colors.green(Symbols::S_CHECKBOX_SELECTED)
         else
           Colors.dim(Symbols::S_CHECKBOX_INACTIVE)
         end
 
-        label = active ? opt[:label] : Colors.dim(opt[:label])
-        hint = (opt[:hint] && active) ? Colors.dim(" (#{opt[:hint]})") : ""
+        label = active ? opt.label : Colors.dim(opt.label)
+        hint = (opt.hint && active) ? Colors.dim(" (#{opt.hint})") : ""
 
         "#{checkbox} #{label}#{hint}"
       end

data/lib/clack/prompts/confirm.rb

@@ -33,42 +33,20 @@ module Clack
 
       protected
 
-      def handle_key(key)
-        return if terminal_state?
-
-        action = Core::Settings.action?(key)
-
+      def handle_input(key, action)
         case action
-        when :cancel
-          @state = :cancel
-        when :enter
-          submit
-        when :left, :up
-          @value = true
-        when :right, :down
-          @value = false
+        when :left, :up then @value = true
+        when :right, :down then @value = false
         else
-          handle_char(key)
-        end
-      end
-
-      def handle_char(key)
-        case key&.downcase
-        when "y"
-          @value = true
-        when "n"
-          @value = false
+          case key&.downcase
+          when "y" then @value = true
+          when "n" then @value = false
+          end
         end
       end
 
       def build_frame
-        lines = []
-        lines << "#{bar}\n"
-        lines << "#{symbol_for_state}  #{@message}\n"
-        lines << help_line
-        lines << "#{bar}  #{options_display}\n"
-        lines << "#{Colors.gray(Symbols::S_BAR_END)}\n"
-        lines.join
+        "#{frame_header}#{bar}  #{options_display}\n#{frame_footer}"
       end
 
       def final_display = @value ? @active_label : @inactive_label

data/lib/clack/prompts/date.rb

@@ -83,20 +83,7 @@ module Clack
       end
 
       def build_frame
-        lines = []
-        lines << "#{bar}\n"
-        lines << "#{symbol_for_state}  #{@message}\n"
-        lines << help_line
-        lines << "#{active_bar}  #{date_display}\n"
-        lines << "#{bar_end}\n" if %i[active initial].include?(@state)
-
-        validation_lines = validation_message_lines
-        if validation_lines.any?
-          lines[-1] = validation_lines.first
-          lines.concat(validation_lines[1..])
-        end
-
-        lines.join
+        "#{frame_header}#{active_bar}  #{date_display}\n#{frame_footer}"
       end
 
       def final_display = formatted_date

data/lib/clack/prompts/group_multiselect.rb

@@ -34,6 +34,8 @@ module Clack
     #   )
     #
     class GroupMultiselect < Core::Prompt
+      include Core::SelectionManager
+
       # @param message [String] the prompt message
       # @param options [Array<Hash>] groups, each with :label and :options (Array<Hash, String>)
       # @param initial_values [Array] values to pre-select
@@ -52,45 +54,34 @@ module Clack
         cursor_at: nil,
         **opts
       )
+        if opts.key?(:initial_value)
+          raise ArgumentError, "GroupMultiselect uses initial_values: (plural), not initial_value:"
+        end
         super(message:, **opts)
         @groups = normalize_groups(options)
         @flat_items = build_flat_items
-        valid_values = Set.new(@flat_items.select { |item| item[:type] == :option }.map { |item| item[:value] })
+        valid_values = Set.new(@flat_items.select { |item| item.is_a?(Core::GroupOption) }.map(&:value))
         @selected = Set.new(initial_values) & valid_values
         @required = required
         @selectable_groups = selectable_groups
         @group_spacing = group_spacing
-        @cursor = find_initial_cursor(cursor_at)
+        @option_index = find_initial_cursor(cursor_at)
         update_value
       end
 
       protected
 
-      def handle_key(key)
-        return if terminal_state?
-
-        action = Core::Settings.action?(key)
-
+      def handle_input(_key, action)
         case action
-        when :cancel
-          @state = :cancel
-        when :enter
-          submit
-        when :up
-          move_cursor(-1)
-        when :down
-          move_cursor(1)
-        when :space
-          toggle_current
+        when :up then move_cursor(-1)
+        when :down then move_cursor(1)
+        when :space then toggle_current
         end
       end
 
       def submit
-        if @required && @selected.empty?
-          @error_message = "Please select at least one option. Press #{Colors.cyan("space")} to select, #{Colors.cyan("enter")} to submit"
-          @state = :error
-          return
-        end
+        return unless validate_selection
+
         super
       end
 
@@ -102,8 +93,8 @@ module Clack
 
         prev_was_group = false
         @flat_items.each_with_index do |item, idx|
-          is_group = item[:type] == :group
-          is_last_in_group = item[:last_in_group]
+          is_group = item.is_a?(Core::GroupHeader)
+          is_last_in_group = item.is_a?(Core::GroupOption) ? item.last_in_group : false
 
           # Add group spacing before groups (except first)
           if is_group && !prev_was_group && idx.positive? && @group_spacing.positive?
@@ -111,9 +102,9 @@ module Clack
           end
 
           lines << if is_group
-            group_display(item, idx == @cursor)
+            group_display(item, idx == @option_index)
           else
-            option_display(item, idx == @cursor, is_last_in_group)
+            option_display(item, idx == @option_index, is_last_in_group)
           end
 
           prev_was_group = is_group
@@ -126,7 +117,7 @@ module Clack
         lines.join
       end
 
-      def final_display = selected_options.map { |o| o[:label] }.join(", ")
+      def final_display = selected_options.map(&:label).join(", ")
 
       private
 
@@ -140,41 +131,35 @@ module Clack
       end
 
       def normalize_option(opt)
-        case opt
-        when Hash
-          {value: opt[:value], label: opt[:label] || opt[:value].to_s, hint: opt[:hint], disabled: opt[:disabled] || false}
-        else
-          {value: opt, label: opt.to_s, hint: nil, disabled: false}
-        end
+        Core::OptionsHelper.normalize_option(opt)
       end
 
       def build_flat_items = @groups.flat_map { |group| flatten_group(group) }
 
       def flatten_group(group)
-        group_item = {type: :group, label: group[:label], options: group[:options]}
+        group_item = Core::GroupHeader.new(label: group[:label], options: group[:options])
         option_items = group[:options].each_with_index.map do |opt, idx|
-          {
-            type: :option,
-            value: opt[:value],
-            label: opt[:label],
-            hint: opt[:hint],
-            disabled: opt[:disabled],
+          Core::GroupOption.new(
+            value: opt.value,
+            label: opt.label,
+            hint: opt.hint,
+            disabled: opt.disabled,
             group: group,
             last_in_group: idx == group[:options].length - 1
-          }
+          )
         end
         [group_item, *option_items]
       end
 
       def selected_options
-        @flat_items.select { |item| item[:type] == :option && @selected.include?(item[:value]) }
+        @flat_items.select { |item| item.is_a?(Core::GroupOption) && @selected.include?(item.value) }
       end
 
       def find_initial_cursor(cursor_at)
         return 0 if @flat_items.empty?
 
         if cursor_at
-          idx = @flat_items.find_index { |item| item[:value] == cursor_at }
+          idx = @flat_items.find_index { |item| item.respond_to?(:value) && item.value == cursor_at }
           return idx if idx
         end
 
@@ -182,14 +167,14 @@ module Clack
       end
 
       def can_select?(item)
-        return false if item[:disabled]
-        return @selectable_groups if item[:type] == :group
+        return false if item.is_a?(Core::GroupOption) && item.disabled
+        return @selectable_groups if item.is_a?(Core::GroupHeader)
 
         true
       end
 
       def move_cursor(delta)
-        new_cursor = @cursor
+        new_cursor = @option_index
         attempts = @flat_items.length
 
         loop do
@@ -198,14 +183,14 @@ module Clack
           break if can_select?(@flat_items[new_cursor]) || attempts <= 0
         end
 
-        @cursor = new_cursor
+        @option_index = new_cursor
       end
 
       def toggle_current
-        item = @flat_items[@cursor]
+        item = @flat_items[@option_index]
         return unless can_select?(item)
 
-        if item[:type] == :group
+        if item.is_a?(Core::GroupHeader)
           toggle_group(item)
         else
           toggle_option(item)
@@ -214,7 +199,7 @@ module Clack
       end
 
       def toggle_group(group_item)
-        group_values = group_item[:options].reject { |o| o[:disabled] }.map { |o| o[:value] }
+        group_values = group_item.options.reject { |o| o.disabled }.map(&:value)
         all_selected = group_values.all? { |v| @selected.include?(v) }
 
         if all_selected
@@ -225,45 +210,41 @@ module Clack
       end
 
       def toggle_option(item)
-        if @selected.include?(item[:value])
-          @selected.delete(item[:value])
-        else
-          @selected.add(item[:value])
-        end
+        toggle_value(item.value)
       end
 
-      def update_value = @value = @selected.to_a
+      def update_value = update_selection_value
 
       def group_display(item, active)
         if @selectable_groups
-          all_selected = item[:options].reject { |o| o[:disabled] }.all? { |o| @selected.include?(o[:value]) }
+          all_selected = item.options.reject { |o| o.disabled }.all? { |o| @selected.include?(o.value) }
           checkbox = all_selected ? Colors.green(Symbols::S_CHECKBOX_SELECTED) : Colors.dim(Symbols::S_CHECKBOX_INACTIVE)
-          label = active ? item[:label] : Colors.dim(item[:label])
+          label = active ? item.label : Colors.dim(item.label)
           "#{active_bar}  #{checkbox} #{label}\n"
         else
-          "#{active_bar}  #{Colors.dim(item[:label])}\n"
+          "#{active_bar}  #{Colors.dim(item.label)}\n"
         end
       end
 
       def option_display(item, active, is_last)
-        selected = @selected.include?(item[:value])
+        selected = @selected.include?(item.value)
         prefix = if @selectable_groups
           "#{is_last ? Symbols::S_BAR_END : Symbols::S_BAR} "
         else
           "  "
         end
-        hint = (item[:hint] && active) ? " #{Colors.dim("(#{item[:hint]})")}" : ""
+        hint = (item.hint && active) ? " #{Colors.dim("(#{item.hint})")}" : ""
 
-        if item[:disabled]
-          "#{active_bar}  #{Colors.dim(prefix)}#{Colors.dim(Symbols::S_CHECKBOX_INACTIVE)} #{Colors.strikethrough(Colors.dim(item[:label]))}\n"
+        if item.disabled
+          "#{active_bar}  #{Colors.dim(prefix)}#{Colors.dim(Symbols::S_CHECKBOX_INACTIVE)} #{Colors.strikethrough(Colors.dim(item.label))}\n"
         elsif active && selected
-          "#{active_bar}  #{Colors.dim(prefix)}#{Colors.green(Symbols::S_CHECKBOX_SELECTED)} #{item[:label]}#{hint}\n"
+          "#{active_bar}  #{Colors.dim(prefix)}#{Colors.green(Symbols::S_CHECKBOX_SELECTED)} #{item.label}#{hint}\n"
         elsif active
-          "#{active_bar}  #{Colors.dim(prefix)}#{Colors.cyan(Symbols::S_CHECKBOX_ACTIVE)} #{item[:label]}#{hint}\n"
+          "#{active_bar}  #{Colors.dim(prefix)}#{Colors.cyan(Symbols::S_CHECKBOX_ACTIVE)} #{item.label}#{hint}\n"
         elsif selected
-          "#{active_bar}  #{Colors.dim(prefix)}#{Colors.green(Symbols::S_CHECKBOX_SELECTED)} #{Colors.dim(item[:label])}\n"
+          "#{active_bar}  #{Colors.dim(prefix)}#{Colors.green(Symbols::S_CHECKBOX_SELECTED)} #{Colors.dim(item.label)}\n"
         else
-          "#{active_bar}  #{Colors.dim(prefix)}#{Colors.dim(Symbols::S_CHECKBOX_INACTIVE)} #{Colors.dim(item[:label])}\n"
+          "#{active_bar}  #{Colors.dim(prefix)}#{Colors.dim(Symbols::S_CHECKBOX_INACTIVE)} #{Colors.dim(item.label)}\n"
         end
       end
     end

data/lib/clack/prompts/multiline_text.rb

@@ -21,6 +21,8 @@ module Clack
     #   )
     #
     class MultilineText < Core::Prompt
+      include Core::TextInputHelper
+
       # @param message [String] the prompt message
       # @param initial_value [String, nil] pre-filled editable text (can contain newlines)
       # @option opts [Proc, nil] :validate validation proc returning error string or nil
@@ -29,7 +31,7 @@ module Clack
         super(message:, **opts)
         @lines = parse_initial_value(initial_value)
         @line_index = @lines.length - 1
-        @column = current_line.grapheme_clusters.length
+        @cursor = current_line.grapheme_clusters.length
       end
 
       protected
@@ -64,24 +66,17 @@ module Clack
         super
       end
 
-      def build_frame
-        lines = []
-        lines << "#{bar}\n"
-        lines << "#{symbol_for_state}  #{@message} #{Colors.dim("(Ctrl+D to submit)")}\n"
-        lines << help_line
-
-        @lines.each_with_index do |line, idx|
-          display = (idx == @line_index) ? line_with_cursor(line) : line
-          lines << "#{active_bar}  #{display}\n"
-        end
+      def frame_header
+        "#{bar}\n#{symbol_for_state}  #{@message} #{Colors.dim("(Ctrl+D to submit)")}\n#{help_line}"
+      end
 
-        if @state in :error | :warning
-          lines.concat(validation_message_lines)
-        else
-          lines << "#{bar_end}\n"
-        end
+      def build_frame
+        body = @lines.each_with_index.map do |line, idx|
+          display = (idx == @line_index) ? value_with_cursor : line
+          "#{active_bar}  #{display}\n"
+        end.join
 
-        lines.join
+        "#{frame_header}#{body}#{frame_footer}"
       end
 
       def build_final_frame
@@ -98,6 +93,13 @@ module Clack
         lines.join
       end
 
+      # TextInputHelper backing store: delegate to current line.
+      def text_value = current_line
+
+      def text_value=(val)
+        @lines[@line_index] = val
+      end
+
       private
 
       def parse_initial_value(value)
@@ -108,26 +110,15 @@ module Clack
 
       def current_line = @lines[@line_index] || ""
 
-      def line_with_cursor(line)
-        chars = line.grapheme_clusters
-        return cursor_block if chars.empty?
-        return "#{line}#{cursor_block}" if @column >= chars.length
-
-        before = chars[0...@column].join
-        current = Colors.inverse(chars[@column])
-        after = chars[(@column + 1)..].join
-        "#{before}#{current}#{after}"
-      end
-
       def insert_newline
         chars = current_line.grapheme_clusters
-        before = chars[0...@column].join
-        after = chars[@column..].join
+        before = chars[0...@cursor].join
+        after = chars[@cursor..].join
 
         @lines[@line_index] = before
         @lines.insert(@line_index + 1, after)
         @line_index += 1
-        @column = 0
+        @cursor = 0
       end
 
       def move_up
@@ -145,43 +136,32 @@ module Clack
       end
 
       def move_left
-        return if @column.zero?
+        return if @cursor.zero?
 
-        @column -= 1
+        @cursor -= 1
       end
 
       def move_right
         max = current_line.grapheme_clusters.length
-        return if @column >= max
+        return if @cursor >= max
 
-        @column += 1
+        @cursor += 1
       end
 
       def clamp_column
         max = current_line.grapheme_clusters.length
-        @column = [@column, max].min
-      end
-
-      def handle_text_input(key)
-        return handle_backspace if Core::Settings.backspace?(key)
-        return unless Core::Settings.printable?(key)
-
-        chars = current_line.grapheme_clusters
-        chars.insert(@column, key)
-        @lines[@line_index] = chars.join
-        @column += 1
+        @cursor = [@cursor, max].min
       end
 
+      # Override backspace to handle line merging at column 0
       def handle_backspace
-        if @column.zero?
-          return if @line_index.zero?
+        if @cursor.zero?
+          return false if @line_index.zero?
 
           merge_line_up
+          true
         else
-          chars = current_line.grapheme_clusters
-          chars.delete_at(@column - 1)
-          @lines[@line_index] = chars.join
-          @column -= 1
+          super
         end
       end
 
@@ -192,7 +172,7 @@ module Clack
         @line_index -= 1
         prev_length = current_line.grapheme_clusters.length
         @lines[@line_index] = current_line + current_content
-        @column = prev_length
+        @cursor = prev_length
       end
     end
   end