fatty 0.99.0 → 0.99.3

data/lib/fatty/session/prompt_session.rb

@@ -11,26 +11,26 @@ module Fatty
     def id = :prompt
 
     def initialize(initial: "", prompt: "> ", title: "Prompt", message: nil, kind: nil,
-      history_ctx: nil, history_path: :default)
-      super(keymap: Keymaps.emacs, views: [])
+                   history_ctx: nil, history_path: :default, history: nil, save_history: true)
+      super(keymap: Keymaps.emacs)
       @title = title&.to_s
       @message = message&.to_s
       @kind = kind&.to_sym
-
-      @history = Fatty::History.for_path(history_path)
+      @save_history = !!save_history
+      @history = history || Fatty::History.for_path(history_path)
       @field = Fatty::InputField.new(
         prompt: prompt,
-        history: @history,
         history_kind: :prompt,
+        history: @history,
         history_ctx: history_ctx,
       )
       @field.buffer.replace(initial.to_s)
-
+      @field.buffer.bol
       @win = nil
     end
 
     #########################################################################################
-    # Framework and Session Hooks
+    # Session Protocol
     #########################################################################################
 
     def init(terminal:)
@@ -39,11 +39,27 @@ module Fatty
       []
     end
 
-    def keymap_contexts
-      [:prompt, :text, :terminal]
+    def update(command)
+      commands =
+        case command.action
+        when :key
+          ev = command.payload.fetch(:event)
+          action, args = resolve_action(ev)
+          if action
+            normalize_action_result(apply_action(action, args, event: ev))
+          else
+            []
+          end
+        when :terminal_paste
+          field.act_on(:paste, command.payload.fetch(:text, ""), env: action_env(event: nil))
+          []
+        else
+          []
+        end
+      Array(commands)
     end
 
-    def view(screen:, renderer:)
+    def view
       return unless @win
 
       renderer.render_prompt_popup(session: self)
@@ -55,20 +71,26 @@ module Fatty
 
     action_on :session
 
-    desc "Accept prompt input"
     action :prompt_accept do
-      text = @field.accept_line.to_s
+      text = @field.accept_line(save_history: @save_history).to_s
+
       [
-        [:terminal, :send_modal_owner, [:cmd, :prompt_result, { kind: @kind, text: text }]],
-        [:terminal, :pop_modal],
+        Command.terminal(
+          :send_modal_owner,
+          command: Command.session(:self, :prompt_result, kind: @kind, text: text),
+        ),
+        Command.terminal(:pop_modal),
       ]
     end
 
     desc "Cancel prompt input"
     action :prompt_cancel do
       [
-        [:terminal, :send_modal_owner, [:cmd, :prompt_cancelled, prompt_payload]],
-        [:terminal, :pop_modal],
+        Command.terminal(
+          :send_modal_owner,
+          command: Command.session(:self, :prompt_cancelled, **prompt_payload),
+        ),
+        Command.terminal(:pop_modal),
       ]
     end
 
@@ -82,16 +104,38 @@ module Fatty
       end
     end
 
-    def handle_action(action, args, event:)
-      env = action_env(event: event)
+    #########################################################################################
+    # Other public API methods
+    #########################################################################################
 
-      result =
-        with_virtual_suffix_sync do
-          @field.act_on(action, *args, env: env)
-        end
-      result.is_a?(Array) ? result : []
+    def state
+      [
+        title.to_s.dup.freeze,
+        message.to_s.dup.freeze,
+        field.prompt_text.to_s.dup.freeze,
+        field.buffer.text.to_s.dup.freeze,
+        field.buffer.cursor,
+        field.buffer.virtual_suffix.to_s.dup.freeze,
+        renderer.screen.rows,
+        renderer.screen.cols,
+      ]
+    end
+
+    private
+
+    # simplecov:disable
+
+    def keymap_contexts
+      [:prompt, :text, :terminal]
+    end
+
+    def apply_action(action, args, event:)
+      env = action_env(event: event)
+      with_virtual_suffix_sync do
+        @field.act_on(action, *args, env: env)
+      end
     rescue ActionError => e
-      Fatty.error("PromptSession#handle_action: ActionError #{e.message}", tag: :session)
+      Fatty.error("PromptSession#apply_action: ActionError #{e.message}", tag: :session)
       []
     end
 
@@ -135,8 +179,6 @@ module Fatty
       result
     end
 
-    private
-
     def prompt_payload
       {
         kind: @kind,

data/lib/fatty/session/search_session.rb

@@ -10,34 +10,49 @@ module Fatty
     DEFAULT_SEARCH_HISTORY_MAX  = 200
 
     def initialize(direction: :backward, regex: false, history: nil, prefix: nil)
-      super(keymap: Keymaps.emacs, views: [])
-
+      super(keymap: Keymaps.emacs)
       @direction = direction.to_sym
       @regex = !!regex
-
       prompt = search_prompt(direction: @direction, regex: @regex)
-
+      search_session = self
       @field = Fatty::InputField.new(
         prompt: prompt,
         history: history,
-        history_kind: -> { @regex ? :search_regex : :search_string },
+        history_kind: -> { search_session.regex ? :search_regex : :search_string },
+        history_ctx: -> { { kind: :search, regex: search_session.regex } },
       )
       text = prefix.to_s
       @field.buffer.replace(text) unless text.empty?
     end
 
     #########################################################################################
-    # Framework and Session Hooks
+    # Session Prototcol
     #########################################################################################
 
-    def keymap_contexts
-      [:search, :text, :terminal]
+    def update(command)
+      commands =
+        case command.action
+        when :terminal_paste
+          field.act_on(:paste, command.payload.fetch(:text, ""), env: action_env(event: nil))
+          []
+        when :key
+          ev = command.payload.fetch(:event)
+          action, args = resolve_action(ev)
+          if action
+            normalize_action_result(apply_action(action, args, event: ev))
+          else
+            []
+          end
+        else
+          []
+        end
+      Array(commands)
     end
 
-    def view(screen:, renderer:)
+    def view
       row = screen.output_rect.rows - 1
 
-      ::Curses.curs_set(1)
+      renderer.show_cursor
       renderer.render_pager_field(
         @field,
         row: row,
@@ -75,34 +90,42 @@ module Fatty
       step_search(:backward)
     end
 
-    def handle_action(action, args, event:)
-      env = ActionEnvironment.new(
-        session: self,
-        counter: counter,
-        event: event,
-        buffer: @field.buffer,
-        field: @field,
-      )
+    private
+
+    # simplecov:disable
+
+    def keymap_contexts
+      [:search, :text, :terminal]
+    end
 
+    def apply_action(action, args, event:)
+      env = action_env(event)
       if Fatty::Actions.lookup(action)&.fetch(:on) == :session
         Fatty::Actions.call(action, env, *args)
       else
         @field.act_on(action, *args, env: env)
+        @field.sync_virtual_suffix!
       end
     rescue Fatty::ActionError
       []
     end
 
+    def action_env(event)
+      ActionEnvironment.new(
+        session: self,
+        counter: counter,
+        event: event,
+        buffer: @field.buffer,
+        field: @field,
+      )
+    end
+
     def toggle_regex
       @regex = !@regex
       @field.prompt = search_prompt(direction: @direction, regex: @regex)
       []
     end
 
-    def cancel!
-      [[:terminal, :pop_modal]]
-    end
-
     def search_prompt(direction:, regex:)
       label =
         if regex
@@ -116,21 +139,46 @@ module Fatty
       dir + label
     end
 
+    def cancel!
+      [
+        Command.terminal(
+          :send_modal_owner,
+          command: Command.session(:focused, :pager_search_cancel),
+        ),
+        Command.terminal(:pop_modal),
+      ]
+    end
+
     def search_accept
       pattern = @field.accept_line.to_s
-
-      cmds = []
-      cmds << [
-        :terminal,
-        :send_modal_owner,
-        [:cmd, :pager_search_set, { pattern: pattern, direction: direction, regex: regex }]
+      [
+        Command.terminal(
+          :send_modal_owner,
+          command: Command.session(
+            :focused,
+            :pager_search_set,
+            pattern: pattern,
+            direction: direction,
+            regex: regex,
+          ),
+        ),
+        Command.terminal(:pop_modal),
       ]
-      cmds << [:terminal, :pop_modal]
-      cmds
     end
 
     def step_search(dir)
-      [[:terminal, :send_modal_owner, [:cmd, :pager_search_step, { direction: dir }]]]
+      [
+        Command.terminal(
+          :send_modal_owner,
+          command: Command.session(
+            :focused,
+            :pager_search_step,
+            pattern: @field.buffer.text.to_s,
+            regex: regex,
+            direction: dir,
+          ),
+        ),
+      ]
     end
   end
 end