markdown_exec 2.6.0 → 2.7.1

data/lib/hash_delegator.rb

@@ -264,10 +264,9 @@ module HashDelegatorSelf
   end
 
   # find tables in multiple lines and format horizontally
-  def tables_into_columns!(blocks_menu, delegate_object)
+  def tables_into_columns!(blocks_menu, delegate_object, screen_width_for_table)
     return unless delegate_object[:tables_into_columns]
 
-    screenwidth = delegate_object[:console_width]
     lines = blocks_menu.map(&:oname)
     text_tables = TableExtractor.extract_tables(
       lines,
@@ -301,10 +300,10 @@ module HashDelegatorSelf
       # replace text in each block
       range.each.with_index do |block_ind, ind|
         fcb = blocks_menu[block_ind]
-        fcb.s3formatted_table_row = fcb.padded = table__hs[ind] ####
+        fcb.s3formatted_table_row = fcb.padded = table__hs[ind]
         fcb.padded_width = table__hs[ind].padded_width
         if fcb.center
-          cw = (screenwidth - table__hs[ind].padded_width) / 2
+          cw = (screen_width_for_table - table__hs[ind].padded_width) / 2
           if cw.positive?
             indent = ' ' * cw
             fcb.s3indent = fcb.indent = indent
@@ -321,7 +320,7 @@ module HashDelegatorSelf
   # s0printable: line_obj[:text],
   # s1decorated: decorated,
   # s2title = fcb.oname
-  # s3formatted_table_row = fcb.padded = table__hs[ind]####
+  # s3formatted_table_row = fcb.padded = table__hs[ind]
 
   # Creates a TTY prompt with custom settings. Specifically,
   #  it disables the default 'cross' symbol and
@@ -642,8 +641,6 @@ module MarkdownExec
                      position: :final)
     end
 
-    public
-
     # Appends a chrome block, which is a menu option for Back or Exit
     #
     # @param all_blocks [Array] The current blocks in the menu
@@ -776,7 +773,7 @@ module MarkdownExec
     end
 
     def assign_key_value_in_bash(key, value)
-      if value =~ /["$\\`]/
+      if value.to_s =~ /["$\\`]/
         # requiring ShellWords to write into Bash scripts
         "#{key}=#{Shellwords.escape(value)}"
       else
@@ -791,7 +788,9 @@ module MarkdownExec
     # The method categorizes blocks based on their type and processes them accordingly.
     #
     # @return [Array<FCB>] An array of FCB objects representing the blocks.
-    def blocks_from_nested_files
+    def blocks_from_nested_files(
+      link_state: @dml_link_state || LinkState.new
+    )
       register_console_attributes(@delegate_object)
       @decor_patterns_from_delegate_object_for_block_create = collect_line_decor_patterns(@delegate_object)
 
@@ -799,6 +798,23 @@ module MarkdownExec
       blocks = []
       iter_blocks_from_nested_files do |btype, fcb|
         count += 1
+
+        # text substitution in menu
+        #
+        expand_references = lambda do |fcb|
+          expand_variable_references!(blocks: [fcb], link_state: link_state,
+                                      initial_code_required: false)
+          expand_variable_references!(
+            blocks: [fcb],
+            echo_format: '%s',
+            initial_code_required: false,
+            key_format: '$(%s)',
+            link_state: link_state,
+            group_name: :command,
+            pattern: options_command_substitution_regexp
+          )
+        end
+
         case btype
         when :blocks
           if @delegate_object[:bash]
@@ -806,16 +822,18 @@ module MarkdownExec
               block_calls_scan: @delegate_object[:block_calls_scan],
               block_name_match: @delegate_object[:block_name_match],
               block_name_nick_match: @delegate_object[:block_name_nick_match],
-              id: "*#{count}",
+              id: "*#{count}"
             ) do |oname, color|
               apply_block_type_color_option(oname, color)
             end
           end
+          expand_references.call(fcb)
           blocks << fcb
         when :filter # types accepted
           %i[blocks line]
         when :line
           unless @delegate_object[:no_chrome]
+            expand_references.call(fcb)
             create_and_add_chrome_blocks(blocks, fcb, id: "*#{count}",
                                                       init_ids: init_ids)
           end
@@ -853,10 +871,12 @@ module MarkdownExec
 
     # private
 
-    def build_replacement_dictionary(commands, link_state)
+    def build_replacement_dictionary(commands, link_state,
+                                     initial_code_required: false, key_format:)
       evaluate_shell_expressions(
-        link_state.inherited_lines_block, commands,
-        key_format: "${%s}" # no need to escape variable name for regexp
+        (link_state&.inherited_lines_block || ''), commands,
+        initial_code_required: initial_code_required,
+        key_format: key_format
       ) # !!t
     end
 
@@ -1022,9 +1042,7 @@ module MarkdownExec
     end
 
     def command_execute_in_own_window_format_arguments(
-      home: Dir.pwd,
-      erls:,
-      rest: ''
+      erls:, home: Dir.pwd, rest: ''
     )
       {
         batch_index: @run_state.batch_index,
@@ -1145,19 +1163,21 @@ module MarkdownExec
     end
 
     def count_named_group_occurrences(
-      blocks, pattern, exclude_types: [BlockType::SHELL]
+      blocks, pattern, exclude_types: [BlockType::SHELL],
+      group_name:
     )
       # Initialize a counter for named group occurrences
       occurrence_count = Hash.new(0)
+      return occurrence_count if pattern == //
 
       blocks.each do |block|
         # Skip processing for shell-type blocks
         next if exclude_types.include?(block.type)
 
         # Scan each block name for matches of the pattern
-        block.oname.scan(pattern) do |(_, variable_name)|
+        ([block.oname || ''] + block.body).join("\n").scan(pattern) do |(_, _variable_name)|
           pattern.match($LAST_MATCH_INFO.to_s) # Reapply match for named groups
-          occurrence_count[$LAST_MATCH_INFO[:variable]] += 1
+          occurrence_count[$LAST_MATCH_INFO[group_name]] += 1
         end
       end
 
@@ -1175,18 +1195,14 @@ module MarkdownExec
     # @param color_method [Symbol] The color method to apply
     #  to the block's display name.
     # return number of lines added
-    def create_and_add_chrome_block(blocks:, match_data:,
-                                    collapse: nil,
-                                    format_option:, color_method:,
-                                    case_conversion: nil,
-                                    center: nil,
-                                    decor_patterns: [],
-                                    disabled: true,
-                                    id: '',
-                                    level: 0,
-                                    type: '',
-                                    wrap: nil)
-      line_cap = NamedCaptureExtractor::extract_named_group2(match_data)
+    def create_and_add_chrome_block(
+      blocks:, case_conversion: nil, center: nil,
+      collapse: nil, color_method:, decor_patterns: [],
+      disabled: true, format_option:, id: '',
+      level: 0, match_data:, type: '',
+      wrap: nil
+    )
+      line_cap = NamedCaptureExtractor.extract_named_group2(match_data)
       # replace tabs in indent
       line_cap[:indent] ||= ''
       line_cap[:indent] = line_cap[:indent].dup if line_cap[:indent].frozen?
@@ -1199,11 +1215,9 @@ module MarkdownExec
       line_cap[:collapse] ||= ''
       line_cap[:line] ||= ''
 
-      accepted_width = @delegate_object[:console_width] - 2
-
       line_caps = [line_cap]
-      if wrap && line_cap[:text].length > accepted_width
-        wrapper = StringWrapper.new(width: accepted_width - line_cap[:indent].length)
+      if wrap && line_cap[:text].length > screen_width_for_wrapping
+        wrapper = StringWrapper.new(width: screen_width_for_wrapping - line_cap[:indent].length)
         line_caps = wrapper.wrap(line_cap[:text]).map do |wrapped_line|
           line_cap.dup.merge(text: wrapped_line)
         end
@@ -1212,8 +1226,8 @@ module MarkdownExec
       if center
         line_caps.each do |line_obj|
           line_obj[:indent] =
-            if line_obj[:text].length < accepted_width
-              ' ' * ((accepted_width - line_obj[:text].length) / 2)
+            if line_obj[:text].length < screen_width_for_wrapping
+              ' ' * ((screen_width_for_wrapping - line_obj[:text].length) / 2)
             else
               ''
             end
@@ -1248,8 +1262,6 @@ module MarkdownExec
           collapse: collapse.nil? ? (line_obj[:collapse] == COLLAPSIBLE_TOKEN_COLLAPSE) : collapse,
           token: line_obj[:collapse],
           disabled: disabled ? TtyMenu::DISABLE : nil,
-          ####
-          # id: "#{@delegate_object[:filename]}:#{index}",
           id: "#{id}.#{index}",
           level: level,
           s0indent: indent,
@@ -1292,7 +1304,7 @@ module MarkdownExec
                     when COLLAPSIBLE_TOKEN_EXPAND
                       false
                     else
-                      false####
+                      false
                     end,
 
           color_method: criteria[:color] &&
@@ -1864,6 +1876,7 @@ module MarkdownExec
       exit_prompt: @delegate_object[:prompt_filespec_back],
       filename_pattern: @delegate_object[:vars_block_filename_pattern],
       glob: @delegate_object[:document_configurations_glob],
+      menu_options: HashDelegator.options_for_tty_menu(@delegate_object),
       view: @delegate_object[:vars_block_filename_view]
     )
       block_data = HashDelegator.parse_yaml_data_from_body(selected.body)
@@ -1878,7 +1891,7 @@ module MarkdownExec
         ).sort.map do |file|
           { name: format(
             block_data['view'] || view,
-            NamedCaptureExtractor::extract_named_group2(
+            NamedCaptureExtractor.extract_named_group2(
               file.match(
                 Regexp.new(block_data['filename_pattern'] ||
                            filename_pattern)
@@ -1887,13 +1900,15 @@ module MarkdownExec
           ),
             oname: file }
         end,
-        simple_menu_options
+        menu_options.merge(
+          cycle: true
+        )
       )
         if selected_option.dname != exit_prompt
           File.readlines(selected_option.oname, chomp: true)
         end
       else
-        warn "No matching files found" ###
+        warn 'No matching files found'
       end
     end
 
@@ -1964,7 +1979,7 @@ module MarkdownExec
                        end
 
       save_filespec_from_expression(directory_glob).tap do |save_filespec|
-        if save_filespec && save != exit_prompt
+        if save_filespec && save_filespec != exit_prompt
           begin
             File.write(save_filespec,
                        HashDelegator.join_code_lines(code_lines))
@@ -2140,7 +2155,9 @@ module MarkdownExec
     )
       # update blocks
       #
-      Regexp.union(replacements.keys).tap do |pattern|
+      Regexp.union(replacements.keys.map do |word|
+                     Regexp.new(Regexp.escape(word))
+                   end).tap do |pattern|
         menu_blocks.each do |block|
           next if exclude_types.include?(block.type)
 
@@ -2150,25 +2167,31 @@ module MarkdownExec
     end
 
     def expand_variable_references!(
-      # echo_format: 'echo "$%s"',
       echo_format: 'echo $%s',
       link_state:,
       blocks:,
-      pattern: Regexp.new(@delegate_object[:variable_expression_regexp])
+      group_name: :variable,
+      initial_code_required: false,
+      key_format: '${%s}',
+      pattern: nil
     )
-      # Count occurrences of named groups in each block
-      variable_counts = count_named_group_occurrences(blocks, pattern)
+      pattern ||= options_variable_expression_regexp
+      return if pattern.nil?
+
+      variable_counts = count_named_group_occurrences(blocks, pattern,
+                                                      group_name: group_name)
+      return if variable_counts.nil?
 
-      # Generate echo commands for each variable based on its count
       echo_commands = generate_echo_commands(variable_counts, echo_format)
 
-      # Build a dictionary to replace variables with the corresponding commands
-      replacements = build_replacement_dictionary(echo_commands, link_state)
+      replacements = build_replacement_dictionary(
+        echo_commands, link_state,
+        initial_code_required: initial_code_required,
+        key_format: key_format
+      )
 
-      # Exit early if no replacements are needed
       return if replacements.nil?
 
-      # Expand each block with replacements from the dictionary
       expand_blocks_with_replacements(blocks, replacements)
     end
 
@@ -2284,7 +2307,7 @@ module MarkdownExec
       # commands to echo variables
       #
       commands = {}
-      variable_counts.each do |variable, count|
+      variable_counts.each do |variable, _count|
         command = format(echo_format, variable)
         commands[variable] = command
       end
@@ -2380,8 +2403,6 @@ module MarkdownExec
       }
     end
 
-    public
-
     # Iterates through blocks in a file, applying the provided block to each line.
     # The iteration only occurs if the file exists.
     # @yield [Symbol] :filter Yields to obtain selected messages for processing.
@@ -2392,15 +2413,15 @@ module MarkdownExec
       selected_types = yield :filter
       cfile.readlines(
         @delegate_object[:filename],
-        import_paths: @delegate_object[:import_paths]&.split(':')
+        import_paths: options_import_paths
       ).each_with_index do |nested_line, index|
-        if nested_line
-          update_line_and_block_state(
-            nested_line, state, selected_types,
-            id: "#{@delegate_object[:filename]}:#{index}",
-            &block
-          )
-        end
+        next unless nested_line
+
+        update_line_and_block_state(
+          nested_line, state, selected_types,
+          id: "#{@delegate_object[:filename]}:#{index}",
+          &block
+        )
       end
     end
 
@@ -2580,7 +2601,7 @@ module MarkdownExec
     end
 
     def load_cli_or_user_selected_block(all_blocks: [], menu_blocks: [],
-                                        default: nil)
+                                        prior_answer: nil)
       if @delegate_object[:block_name].present?
         block = all_blocks.find do |item|
           item.pub_name == @delegate_object[:block_name]
@@ -2588,7 +2609,7 @@ module MarkdownExec
         source = OpenStruct.new(block_name_from_ui: false)
       else
         block_state = wait_for_user_selected_block(all_blocks, menu_blocks,
-                                                   default)
+                                                   prior_answer)
         return if block_state.nil?
 
         block = block_state.block
@@ -2693,11 +2714,6 @@ module MarkdownExec
         @delegate_object.merge!(compressed_ids: @compressed_ids)
       )
 
-      # text substitution in menu
-      #
-      expand_variable_references!(blocks: menu_blocks, link_state: link_state)
-      # expand_command_substition!(blocks: menu_blocks, link_state: link_state)
-
       # chrome for menu
       #
       add_menu_chrome_blocks!(id: id, menu_blocks: menu_blocks,
@@ -2705,7 +2721,8 @@ module MarkdownExec
 
       ### compress empty lines
       HashDelegator.delete_consecutive_blank_lines!(menu_blocks)
-      HashDelegator.tables_into_columns!(menu_blocks, @delegate_object) ####
+      HashDelegator.tables_into_columns!(menu_blocks, @delegate_object,
+                                         screen_width_for_table)
 
       [all_blocks, menu_blocks, mdoc]
     end
@@ -2805,6 +2822,19 @@ module MarkdownExec
       )
     end
 
+    def options_command_substitution_regexp
+      Regexp.new(@delegate_object[:command_substitution_regexp] || '')
+    end
+
+    def options_import_paths
+      @delegate_object[:import_paths]&.split(':') || ''
+    end
+
+    def options_variable_expression_regexp
+      @delegate_object[:variable_expression_regexp].present? &&
+        Regexp.new(@delegate_object[:variable_expression_regexp])
+    end
+
     def output_color_formatted(data_sym, color_sym)
       formatted_string = string_send_color(@delegate_object[data_sym],
                                            color_sym)
@@ -2927,9 +2957,24 @@ module MarkdownExec
     # @param opts [Hash] The options hash.
     # @return [Array<Hash>] The updated blocks menu.
     def blocks_as_menu_items(menu_blocks)
+      # prefix first active line, inactive for rest
+      active = @delegate_object[:prompt_margin_left_text]
+      inactive = ' ' * active.length
+
       select_blocks(menu_blocks).map do |fcb|
-        fcb.name = fcb.indented_decorated || (fcb.indent + (fcb.s1decorated || fcb.dname))
-        fcb.value = fcb.id || fcb.name
+        multiline = fcb.indented_decorated ||
+                    (fcb.indent + (fcb.s1decorated || fcb.dname))
+
+        fcb.name = multiline.each_line.with_index.map do |line, index|
+          if fcb.fetch(:disabled, nil).nil?
+            index.zero? ? active : inactive
+          else
+            inactive
+          end + line.chomp
+        end.join("\n")
+
+        fcb.value = fcb.id || fcb.name.split("\n").first
+
         fcb.to_h
       end
     end
@@ -2953,7 +2998,7 @@ module MarkdownExec
             in_block = false
           elsif scan1.present?
             if format1.present?
-              caps = NamedCaptureExtractor::extract_named_groups(line, scan1)
+              caps = NamedCaptureExtractor.extract_named_groups(line, scan1)
               if caps
                 formatted = format(format1, caps)
                 collected_lines << formatted
@@ -3078,6 +3123,18 @@ module MarkdownExec
       sel == MenuOptions::YES
     end
 
+    def prompt_margin_left_text
+      @delegate_object[:prompt_margin_left_text]
+    end
+
+    def prompt_margin_left_width
+      prompt_margin_left_text.length
+    end
+
+    def prompt_margin_right_width
+      0
+    end
+
     # public
 
     def prompt_select_code_filename(
@@ -3172,8 +3229,11 @@ module MarkdownExec
       history_files(
         @dml_link_state,
         filename:
-          asset.present? ? saved_asset_filename(asset,
-                                                @dml_link_state) : filename,
+          if asset.present?
+            saved_asset_filename(asset, @dml_link_state)
+          else
+            filename
+          end,
         path: path
       )&.map do |file|
         unless Regexp.new(regexp) =~ file
@@ -3192,24 +3252,23 @@ module MarkdownExec
     def saved_asset_for_history(
       file:, form:, match_info:
     )
-      begin
-        OpenStruct.new(
-          file: file[(Dir.pwd.length + 1)..-1],
-          full: file,
-          row: format(
-            form,
-            # default '*' so unknown parameters are given a wildcard
-            match_info.names.each_with_object(Hash.new('*')) do |name, hash|
-              hash[name.to_sym] = match_info[name]
-            end
-          )
+
+      OpenStruct.new(
+        file: file[(Dir.pwd.length + 1)..-1],
+        full: file,
+        row: format(
+          form,
+          # default '*' so unknown parameters are given a wildcard
+          match_info.names.each_with_object(Hash.new('*')) do |name, hash|
+            hash[name.to_sym] = match_info[name]
+          end
         )
-      rescue KeyError
-        # pp $!, $@
-        warn "Cannot format with: #{@delegate_object[:saved_history_format]}"
-        error_handler('saved_history_format')
-        return :break
-      end
+      )
+    rescue KeyError
+      # pp $!, $@
+      warn "Cannot format with: #{@delegate_object[:saved_history_format]}"
+      error_handler('saved_history_format')
+      :break
     end
 
     # Processes YAML data from the selected menu item, updating delegate
@@ -3282,6 +3341,8 @@ module MarkdownExec
     #   # opts will be updated with the current console dimensions
     #   #  and pagination settings.
     def register_console_attributes(opts)
+      return unless IO.console
+
       if (resized = @delegate_object[:menu_resize_terminal])
         resize_terminal
       end
@@ -3305,9 +3366,9 @@ module MarkdownExec
 
     def replace_keys_in_lines(replacement_dictionary, lines)
       # Create a regex pattern that matches any key in the replacement dictionary
-      pattern = Regexp.union(replacement_dictionary.keys.map { |key|
+      pattern = Regexp.union(replacement_dictionary.keys.map do |key|
                                "%<#{key}>"
-                             })
+                             end)
 
       # Iterate over each line and apply gsub with the replacement hash
       lines.map do |line|
@@ -3429,8 +3490,24 @@ module MarkdownExec
       ).generate_name
     end
 
+    def screen_width
+      if @delegate_object[:screen_width] && @delegate_object[:screen_width].positive?
+        @delegate_object[:screen_width]
+      else
+        @delegate_object[:console_width]
+      end
+    end
+
+    def screen_width_for_table
+      screen_width - prompt_margin_left_width - prompt_margin_right_width - 2 # prompt is symbol + space (width: 2)
+    end
+
+    def screen_width_for_wrapping
+      screen_width_for_table
+    end
+
     def select_document_if_multiple(options, files, prompt:)
-      return files if files.class == String ###
+      return files if files.class == String
       return files[0] if (count = files.count) == 1
 
       return unless count >= 2
@@ -3463,9 +3540,20 @@ module MarkdownExec
         props = {
           active_color: active_color_pastel.detach,
           # activate dynamic list searching on letter/number key presses
+          cycle: true,
           filter: true,
+          per_page: @delegate_object[:select_page_height]
         }.freeze
 
+        if menu_items.all? do |item|
+          !item.is_a?(String) && item[:disabled]
+        end
+          menu_items.each do |prompt_item|
+            puts prompt_item[:dname]
+          end
+          return
+        end
+
         # crashes if all menu options are disabled
         # crashes if default is not an existing item
         #
@@ -3484,7 +3572,6 @@ module MarkdownExec
 
       selected = menu_items.find do |item|
         if item.instance_of?(Hash)
-          # (item[:id] || item[:name] || item[:dname]) == selection
           [item[:id], item[:name], item[:dname]].include?(selection)
         elsif item.instance_of?(MarkdownExec::FCB)
           item.dname == selection || item.id == selection
@@ -3555,12 +3642,7 @@ module MarkdownExec
       menu_with_back && @link_history.prior_state_exist?
     end
 
-    def simple_menu_options(
-      per_page: @delegate_object[:select_page_height]
-    )
-      { cycle: true,
-        per_page: per_page }
-    end
+    def simple_menu_options; end
 
     # Initializes a new fenced code block (FCB) object based
     #  on the provided line and heading information.
@@ -3570,7 +3652,7 @@ module MarkdownExec
     #  Regular expression to identify fenced block start.
     # @return [MarkdownExec::FCB] A new FCB instance with the parsed attributes.
     def start_fenced_block(line, headings, fenced_start_extended_regex)
-      fcb_title_groups = NamedCaptureExtractor::extract_named_groups(
+      fcb_title_groups = NamedCaptureExtractor.extract_named_groups(
         line, fenced_start_extended_regex
       )
 
@@ -3627,10 +3709,10 @@ module MarkdownExec
         shell: fcb_title_groups.fetch(:shell, ''),
         start_line: line,
         stdin: if (tn = rest.match(/<(?<type>\$)?(?<name>[A-Za-z_-]\S+)/))
-                 NamedCaptureExtractor::extract_named_group2(tn)
+                 NamedCaptureExtractor.extract_named_group2(tn)
                end,
         stdout: if (tn = rest.match(/>(?<type>\$)?(?<name>[\w.\-]+)/))
-                  NamedCaptureExtractor::extract_named_group2(tn)
+                  NamedCaptureExtractor.extract_named_group2(tn)
                 end,
         title: title,
         type: fcb_title_groups.fetch(:type, ''),
@@ -3736,7 +3818,7 @@ module MarkdownExec
       @dml_block_state = load_cli_or_user_selected_block(
         all_blocks: @dml_blocks_in_file,
         menu_blocks: @dml_menu_blocks,
-        default: @dml_menu_default_dname
+        prior_answer: @dml_menu_default_dname
       )
       if !@dml_block_state
         # HashDelegator.error_handler('block_state missing', { abort: true })
@@ -4004,7 +4086,7 @@ module MarkdownExec
         when :parse_document # once for each menu
           vux_parse_document(id: 'vux_parse_document')
           vux_menu_append_history_files(formatted_choice_ostructs,
-                                        id: "vux_menu_append_history_files",)
+                                        id: 'vux_menu_append_history_files')
           vux_publish_document_file_name_for_external_automation
 
         when :display_menu
@@ -4156,7 +4238,6 @@ module MarkdownExec
 
       # update @delegate_object and @menu_base_options in auto_load
       #
-      # @dml_blocks_in_file, @dml_menu_blocks, @dml_mdoc, @dml_link_state =
       @dml_blocks_in_file, @dml_menu_blocks, @dml_mdoc =
         mdoc_menu_and_blocks_from_nested_files(@dml_link_state, id: id)
       dump_delobj(@dml_blocks_in_file, @dml_menu_blocks, @dml_link_state)
@@ -4220,13 +4301,14 @@ module MarkdownExec
       # user interrupts process
     end
 
-    def wait_for_user_selected_block(all_blocks, menu_blocks, default)
-      block_state = wait_for_user_selection(all_blocks, menu_blocks, default)
+    def wait_for_user_selected_block(all_blocks, menu_blocks, prior_answer)
+      block_state = wait_for_user_selection(all_blocks, menu_blocks,
+                                            prior_answer)
       handle_back_or_continue(block_state)
       block_state
     end
 
-    def wait_for_user_selection(_all_blocks, menu_blocks, default)
+    def wait_for_user_selection(_all_blocks, menu_blocks, prior_answer)
       if @delegate_object[:clear_screen_for_select_block]
         printf("\e[1;1H\e[2J")
       end
@@ -4242,10 +4324,20 @@ module MarkdownExec
                                           MenuState::EXIT)
       end
 
-      # default value may not match if color is different from
+      selected_answer = case prior_answer
+                        when nil
+                          nil
+                        when String
+                          menu_blocks.find { |block|
+                            block.dname.include?(prior_answer)
+                          }&.name
+                        when Struct
+                          prior_answer.index || prior_answer.name
+                        end
+      # prior_answer value may not match if color is different from
       # originating menu (opts changed while processing)
-      selection_opts = if default && menu_blocks.map(&:dname).include?(default)
-                         @delegate_object.merge(default: default)
+      selection_opts = if selected_answer
+                         @delegate_object.merge(default: selected_answer)
                        else
                          @delegate_object
                        end
@@ -4374,6 +4466,10 @@ module MarkdownExec
     def self.next_link_state(*args, **kwargs, &block)
       super
     end
+
+    def self.options_for_tty_menu(options)
+      options.slice(:menu_active_color_pastel_messages, :select_page_height)
+    end
   end
 end
 
@@ -5135,7 +5231,7 @@ module MarkdownExec
 
     def test_iter_blocks_from_nested_files
       @hd.cfile.expect(:readlines, ['line 1', 'line 2'], ['test.md'],
-                       import_paths: nil)
+                       import_paths: '')
       selected_types = ['filtered message']
 
       result = @hd.iter_blocks_from_nested_files { selected_types }