markdown_exec 2.7.2 → 2.7.4

data/lib/hash_delegator.rb

@@ -43,6 +43,7 @@ require_relative 'table_extractor'
 require_relative 'text_analyzer'
 
 $pd = false unless defined?($pd)
+$table_cell_truncate = true
 
 class String
   # Checks if the string is not empty.
@@ -91,6 +92,10 @@ module HashDelegatorSelf
     blocks.find { |item| item.send(msg) == value } || default
   end
 
+  def block_select(blocks, msg, value, default = nil)
+    blocks.select { |item| item.send(msg) == value }
+  end
+
   def code_merge(*bodies)
     merge_lists(*bodies)
   end
@@ -287,9 +292,25 @@ module HashDelegatorSelf
           row: delegate_object[:table_row_color],
           separator_line: delegate_object[:table_separator_line_color]
         },
-        lines: lines
+        lines: lines,
+        table_width: screen_width_for_table,
+        truncate: $table_cell_truncate
       )
 
+      truncated_table_cell = false
+      table__hs.each do |table_hs|
+        table_hs.substrings.each do |substrings|
+          substrings.each do |node|
+            if node[:text].class == TrackedString
+              truncated_table_cell = node[:text].truncated
+              break if truncated_table_cell
+            end
+          end
+          break if truncated_table_cell
+        end
+        break if truncated_table_cell
+      end
+
       unless table__hs.count == range.size
         raise 'Invalid result from MarkdownTableFormatter.format_table()'
       end
@@ -313,6 +334,13 @@ module HashDelegatorSelf
         end
         fcb.s3indent ||= ''
         fcb.dname = fcb.indented_decorated = fcb.s3indent + fcb.s3formatted_table_row.decorate
+
+        if ind.zero?
+          fcb.truncated_table_cell = truncated_table_cell
+          # if truncated_table_cell
+          fcb.delete_key(:disabled)
+          # end
+        end
       end
     end
   end
@@ -577,7 +605,8 @@ module MarkdownExec
       @p_params = {}
       @p_rest = []
 
-      @compressed_ids = nil
+      @compressed_ids = {}
+      @expanded_ids = {}
     end
 
     ##
@@ -898,8 +927,10 @@ module MarkdownExec
 
     # private
 
-    def build_replacement_dictionary(commands, link_state,
-                                     initial_code_required: false, key_format:)
+    def build_replacement_dictionary(
+      commands, link_state,
+      initial_code_required: false, key_format:
+    )
       evaluate_shell_expressions(
         (link_state&.inherited_lines_block || ''), commands,
         initial_code_required: initial_code_required,
@@ -980,15 +1011,18 @@ module MarkdownExec
     # sets ENV
     def code_from_vars_block_to_set_environment_variables(selected)
       code_lines = []
-      YAML.load(selected.body.join("\n"))&.each do |key, value|
-        ENV[key] = value.to_s
-        code_lines.push "#{key}=#{Shellwords.escape(value)}"
+      case data = YAML.load(selected.body.join("\n"))
+      when Hash
+        data.each do |key, value|
+          ENV[key] = value.to_s
+          code_lines.push "#{key}=#{Shellwords.escape(value)}"
 
-        next unless @delegate_object[:menu_vars_set_format].present?
+          next unless @delegate_object[:menu_vars_set_format].present?
 
-        formatted_string = format(@delegate_object[:menu_vars_set_format],
-                                  { key: key, value: value })
-        print string_send_color(formatted_string, :menu_vars_set_color)
+          formatted_string = format(@delegate_object[:menu_vars_set_format],
+                                    { key: key, value: value })
+          print string_send_color(formatted_string, :menu_vars_set_color)
+        end
       end
       code_lines
     end
@@ -1225,18 +1259,26 @@ module MarkdownExec
     #  to the block's display name.
     # return number of lines added
     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,
-      fcb: nil
+      blocks:,
+      case_conversion: nil,
+      center: nil,
+      collapse: nil,
+      color_method:,
+      decor_patterns: [],
+      disabled: true,
+      fcb: nil,
+      format_option:,
+      id: '',
+      level: 0,
+      match_data:,
+      type: '',
+      wrap: nil
     )
-      line_cap = NamedCaptureExtractor.extract_named_group2(match_data)
+      line_cap = NamedCaptureExtractor.extract_named_group_match_data(match_data)
       # replace tabs in indent
       line_cap[:indent] ||= ''
       line_cap[:indent] = line_cap[:indent].dup if line_cap[:indent].frozen?
-      line_cap[:indent].gsub!("\t", '    ')
+      line_cap[:indent].gsub!("\t", '    ') # TAB_SIZE = 4
       # replace tabs in text
       line_cap[:text] ||= ''
       line_cap[:text] = line_cap[:text].dup if line_cap[:text].frozen?
@@ -1264,6 +1306,7 @@ module MarkdownExec
         end
       end
 
+      use_fcb = !fcb.nil? # fcb only for the first record if any
       line_caps.each_with_index do |line_obj, index|
         next if line_obj[:text].nil?
 
@@ -1287,7 +1330,24 @@ module MarkdownExec
 
         line_obj[:line] = line_obj[:indent] + line_obj[:text]
 
-        if fcb.nil?
+        if use_fcb
+          fcb.center = center
+          fcb.chrome = true
+          fcb.collapse = collapse.nil? ? (line_obj[:collapse] == COLLAPSIBLE_TOKEN_COLLAPSE) : collapse
+          fcb.token = line_obj[:collapse]
+          fcb.disabled = disabled ? TtyMenu::DISABLE : nil
+          fcb.id = "#{id}.#{index}"
+          fcb.level = level
+          fcb.s0indent = indent
+          fcb.s0printable = line_obj[:text]
+          fcb.s1decorated = decorated
+          fcb.dname = line_obj[:indent] + decorated
+          fcb.indent = line_obj[:indent]
+          fcb.oname = line_obj[:text]
+          fcb.text = line_obj[:text]
+          fcb.type = type
+          use_fcb = false # next line is new record
+        else
           fcb = FCB.new(
             center: center,
             chrome: true,
@@ -1305,22 +1365,6 @@ module MarkdownExec
             text: line_obj[:text],
             type: type
           )
-        else
-          fcb.center = center
-          fcb.chrome = true
-          fcb.collapse = collapse.nil? ? (line_obj[:collapse] == COLLAPSIBLE_TOKEN_COLLAPSE) : collapse
-          fcb.token = line_obj[:collapse]
-          fcb.disabled = disabled ? TtyMenu::DISABLE : nil
-          fcb.id = "#{id}.#{index}"
-          fcb.level = level
-          fcb.s0indent = indent
-          fcb.s0printable = line_obj[:text]
-          fcb.s1decorated = decorated
-          fcb.dname = line_obj[:indent] + decorated
-          fcb.indent = line_obj[:indent]
-          fcb.oname = line_obj[:text]
-          fcb.text = line_obj[:text]
-          fcb.type = type
         end
 
         blocks.push fcb
@@ -1368,7 +1412,7 @@ module MarkdownExec
                         @delegate_object[criteria[:color]].to_sym,
           decor_patterns:
             @decor_patterns_from_delegate_object_for_block_create,
-          disabled: !(criteria[:collapsible] && @delegate_object[criteria[:collapsible]]),
+          disabled: fcb.truncated_table_cell.nil? && !(criteria[:collapsible] && @delegate_object[criteria[:collapsible]]),
           fcb: fcb,
           id: "#{id}.#{index}",
           format_option: criteria[:format] &&
@@ -1659,7 +1703,13 @@ module MarkdownExec
       selected:, mdoc:, block_source:, link_state: LinkState.new
     )
       # order should not be important other than else clause
-      if selected.type == BlockType::EDIT
+      if selected.type == BlockType::TEXT && !selected.truncated_table_cell.nil?
+        debounce_reset
+        $table_cell_truncate = !$table_cell_truncate
+
+        LoadFileLinkState.new(LoadFile::REUSE, link_state)
+
+      elsif selected.type == BlockType::EDIT
         debounce_reset
         vux_edit_inherited
         return :break if pause_user_exit
@@ -1804,7 +1854,7 @@ module MarkdownExec
       filename: '*',
       form: '%{line}',
       link_state:,
-      regexp: "^(?<line>.*)$",
+      regexp: '^(?<line>.*)$',
       selected:
     )
       block_data = HashDelegator.parse_yaml_data_from_body(selected.body)
@@ -1956,7 +2006,7 @@ module MarkdownExec
         [exit_prompt] + dirs.sort.map do |file|
           { name: format(
             block_data['view'] || view,
-            NamedCaptureExtractor.extract_named_group2(
+            NamedCaptureExtractor.extract_named_group_match_data(
               file.match(
                 Regexp.new(block_data['filename_pattern'] ||
                            filename_pattern)
@@ -2197,7 +2247,8 @@ module MarkdownExec
     def execute_required_lines(
       blockname: '',
       erls: {},
-      required_lines: [], shell:
+      required_lines: [],
+      shell:
     )
       if @delegate_object[:save_executed_script]
         write_command_file(blockname: blockname,
@@ -2232,15 +2283,14 @@ module MarkdownExec
     end
 
     def expand_variable_references!(
-      echo_format: 'echo $%s',
-      link_state:,
       blocks:,
+      echo_format: 'echo $%s',
       group_name: :variable,
       initial_code_required: false,
       key_format: '${%s}',
+      link_state:,
       pattern: nil
     )
-      # defined($x) ? '' : ($x = 1; pp [__LINE__, caller.deref])
       pattern ||= options_variable_expression_regexp
       return if pattern.nil?
 
@@ -2553,20 +2603,35 @@ module MarkdownExec
       label_format_above = @delegate_object[:shell_code_label_format_above]
       label_format_below = @delegate_object[:shell_code_label_format_below]
 
-      [label_format_above.present? &&
-        format(label_format_above,
-               block_source.merge({ block_name: selected.pub_name }))] +
-        output_lines.map do |line|
-          re = Regexp.new(link_block_data.fetch('pattern', '(?<line>.*)'))
-          next unless re =~ line
-
-          re.gsub_format(line,
-                         link_block_data.fetch('format',
-                                               '%{line}'))
-        end.compact +
-        [label_format_below.present? &&
-         format(label_format_below,
-                block_source.merge({ block_name: selected.pub_name }))]
+      ([
+        if label_format_above.present?
+          format(
+            label_format_above,
+            block_source.merge({ block_name: selected.pub_name })
+          )
+        else
+          nil
+        end
+      ] +
+      output_lines.map do |line|
+        re = Regexp.new(link_block_data.fetch('pattern', '(?<line>.*)'))
+        next unless re =~ line
+
+        re.gsub_format(
+          line,
+          link_block_data.fetch('format', '%{line}')
+        )
+      end +
+      [
+        if label_format_below.present?
+          format(
+            label_format_below,
+            block_source.merge({ block_name: selected.pub_name })
+          )
+        else
+          nil
+        end
+      ]).compact
     end
 
     def link_history_push_and_next(
@@ -2641,43 +2706,23 @@ module MarkdownExec
         return
       end
 
-      block = HashDelegator.block_find(all_blocks, :oname, block_name)
-      return unless block
+      blocks = HashDelegator.block_select(all_blocks, :oname, block_name)
+      return if blocks.empty?
 
-      options_state = read_show_options_and_trigger_reuse(
-        mdoc: mdoc,
-        selected: block
+      update_menu_base(
+        blocks.each.with_object({}) do |block, merged_options|
+          options_state = read_show_options_and_trigger_reuse(
+            mdoc: mdoc,
+            selected: block
+          )
+          merged_options.merge!(options_state.options)
+        end
       )
-      update_menu_base(options_state.options)
 
       @opts_most_recent_filename = @delegate_object[:filename]
       true
     end
 
-    def load_document_shell_block(all_blocks, mdoc: nil)
-      block_name = @delegate_object[:document_load_shell_block_name]
-      unless block_name.present? &&
-             @shell_most_recent_filename != @delegate_object[:filename]
-        return
-      end
-
-      fcb = HashDelegator.block_find(all_blocks, :oname, block_name)
-      return unless fcb
-
-      @shell_most_recent_filename = @delegate_object[:filename]
-
-      if mdoc
-        mdoc.collect_recursively_required_code(
-          anyname: fcb.pub_name,
-          label_format_above: @delegate_object[:shell_code_label_format_above],
-          label_format_below: @delegate_object[:shell_code_label_format_below],
-          block_source: block_source
-        )[:code]
-      else
-        fcb.body
-      end
-    end
-
     def load_auto_vars_block(all_blocks,
                              block_name: @delegate_object[:document_load_vars_block_name])
       unless block_name.present? &&
@@ -2685,11 +2730,16 @@ module MarkdownExec
         return
       end
 
-      block = HashDelegator.block_find(all_blocks, :oname, block_name)
-      return unless block
+      blocks = HashDelegator.block_select(all_blocks, :oname, block_name)
+      return if blocks.empty?
 
       @vars_most_recent_filename = @delegate_object[:filename]
-      code_from_vars_block_to_set_environment_variables(block)
+
+      (blocks.each.with_object([]) do |block, merged_options|
+        merged_options.push(
+          code_from_vars_block_to_set_environment_variables(block)
+        )
+      end).to_a
     end
 
     def load_cli_or_user_selected_block(all_blocks: [], menu_blocks: [],
@@ -2712,6 +2762,30 @@ module MarkdownExec
       SelectedBlockMenuState.new(block, source, state)
     end
 
+    def load_document_shell_block(all_blocks, mdoc: nil)
+      block_name = @delegate_object[:document_load_shell_block_name]
+      unless block_name.present? &&
+             @shell_most_recent_filename != @delegate_object[:filename]
+        return
+      end
+
+      fcb = HashDelegator.block_find(all_blocks, :oname, block_name)
+      return unless fcb
+
+      @shell_most_recent_filename = @delegate_object[:filename]
+
+      if mdoc
+        mdoc.collect_recursively_required_code(
+          anyname: fcb.pub_name,
+          label_format_above: @delegate_object[:shell_code_label_format_above],
+          label_format_below: @delegate_object[:shell_code_label_format_below],
+          block_source: block_source
+        )[:code]
+      else
+        fcb.body
+      end
+    end
+
     # format + glob + select for file in load block
     # name has references to ENV vars and doc and batch vars
     #  incl. timestamp
@@ -2782,9 +2856,11 @@ module MarkdownExec
     def mdoc_menu_and_blocks_from_nested_files(link_state, source_id: '')
       # read blocks, load document opts block, and re-process blocks
       #
+      reload_blocks = false
+
       all_blocks, mdoc = mdoc_and_blocks_from_nested_files(source_id: source_id)
       if load_auto_opts_block(all_blocks, mdoc: mdoc)
-        all_blocks, mdoc = mdoc_and_blocks_from_nested_files(source_id: source_id)
+        reload_blocks = true
       end
 
       # load document shell block
@@ -2792,6 +2868,7 @@ module MarkdownExec
       if code_lines = load_document_shell_block(all_blocks, mdoc: mdoc)
         next_state_set_code(nil, link_state, code_lines)
         link_state.inherited_lines = code_lines
+        reload_blocks = true
       end
 
       # load document vars block
@@ -2801,15 +2878,31 @@ module MarkdownExec
                                             code_lines)
         next_state_set_code(nil, link_state, new_code)
         link_state.inherited_lines = new_code
+        reload_blocks = true
+      end
+
+      if reload_blocks
+        all_blocks, mdoc = mdoc_and_blocks_from_nested_files(source_id: source_id)
       end
 
       # filter by name, collapsed
       #
-      menu_blocks, @compressed_ids = mdoc.fcbs_per_options(
-        @delegate_object.merge!(compressed_ids: @compressed_ids)
+      menu_blocks = mdoc.fcbs_per_options(
+        @delegate_object.merge!(compressed_ids: @compressed_ids,
+                                expanded_ids: @expanded_ids)
       )
 
+      # restore pre-expansion (raw) values
+      #
+      menu_blocks.each do |fcb|
+        fcb.dname = fcb.raw_dname unless fcb.raw_dname.nil?
+        fcb.s0printable = fcb.raw_s0printable unless fcb.raw_s0printable.nil?
+        fcb.s1decorated = fcb.raw_s1decorated unless fcb.raw_s1decorated.nil?
+        fcb.body = fcb.raw_body unless fcb.raw_body.nil?
+      end
+
       # re-expand blocks
+      #
       menu_blocks.each do |fcb|
         fcb.body = fcb.raw_body || fcb.body || []
         fcb.dname = fcb.raw_dname || fcb.dname
@@ -2831,6 +2924,7 @@ module MarkdownExec
       HashDelegator.tables_into_columns!(menu_blocks, @delegate_object,
                                          screen_width_for_table)
 
+
       [all_blocks, menu_blocks, mdoc]
     end
 
@@ -2891,19 +2985,16 @@ module MarkdownExec
       end
     end
 
-    def menu_compress_collapsible_block(selected)
-      @compressed_ids.merge!(selected.id => selected.level)
-    end
-
-    def menu_expand_collapsible_block(selected)
-      @compressed_ids.delete(selected.id)
-    end
-
     def menu_toggle_collapsible_block(selected)
-      if @compressed_ids.keys.include?(selected.id)
-        menu_expand_collapsible_block(selected)
-      else
-        menu_compress_collapsible_block(selected)
+      # return true if @compress_ids.key?(fcb.id) && !!@compress_ids[fcb.id]
+      # return false if @expand_ids.key?(fcb.id) && !!@expand_ids[fcb.id]
+      # binding.irb
+      if @compressed_ids.key?(selected.id) && !!@compressed_ids[selected.id]
+        @compressed_ids.delete(selected.id)
+        @expanded_ids[selected.id] = selected.level
+      else # @expand_ids.key?(fcb.id) && !!@expand_ids[fcb.id]
+        @compressed_ids[selected.id] = selected.level
+        @expanded_ids.delete(selected.id)
       end
     end
 
@@ -3376,7 +3467,6 @@ module MarkdownExec
     def saved_asset_for_history(
       file:, form:, match_info:
     )
-
       OpenStruct.new(
         file: file[(Dir.pwd.length + 1)..-1],
         full: file,
@@ -3839,10 +3929,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_group_match_data(tn)
                end,
         stdout: if (tn = rest.match(/>(?<type>\$)?(?<name>[\w.\-]+)/))
-                  NamedCaptureExtractor.extract_named_group2(tn)
+                  NamedCaptureExtractor.extract_named_group_match_data(tn)
                 end,
         title: title,
         type: fcb_title_groups.fetch(:type, ''),
@@ -4468,9 +4558,9 @@ module MarkdownExec
                         when nil
                           nil
                         when String
-                          menu_blocks.find { |block|
+                          menu_blocks.find do |block|
                             block.dname.include?(prior_answer)
-                          }&.name
+                          end&.name
                         when Struct
                           prior_answer.index || prior_answer.name
                         end

data/lib/hierarchy_string.rb

@@ -2,6 +2,15 @@
 
 require_relative 'ansi_string'
 
+class TrackedString < String
+  attr_accessor :truncated
+
+  def initialize(str)
+    super(str)
+    @truncated = false
+  end
+end
+
 # Class representing a hierarchy of substrings stored as Hash nodes
 # HierarchyString is a class that represents and manipulates strings based on a hierarchical structure.
 # The input to the class can be a single hash or an array of nested hashes, where each hash contains a

data/lib/markdown_exec/version.rb

@@ -7,5 +7,5 @@ module MarkdownExec
   BIN_NAME = 'mde'
   GEM_NAME = 'markdown_exec'
   TAP_DEBUG = 'MDE_DEBUG'
-  VERSION = '2.7.2'
+  VERSION = '2.7.4'
 end

data/lib/markdown_exec.rb

@@ -19,7 +19,6 @@ require_relative 'ansi_formatter'
 require_relative 'cached_nested_file_reader'
 require_relative 'cli'
 require_relative 'color_scheme'
-require_relative 'colorize'
 require_relative 'directory_searcher'
 require_relative 'env'
 require_relative 'exceptions'
@@ -95,7 +94,7 @@ class NamedCaptureExtractor
     str&.match(regexp)&.named_captures&.transform_keys(&:to_sym)
   end
 
-  def self.extract_named_group2(match_data)
+  def self.extract_named_group_match_data(match_data)
     match_data&.named_captures&.transform_keys(&:to_sym)
   end
 end
@@ -283,6 +282,7 @@ module MarkdownExec
     include StringUtil
 
     def initialize(options = {})
+      # ww0 'options', options, caller.deref
       @option_parser = nil
 
       @options = HashDelegator.new(options)