markdown_exec 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2777165b185482931d9fe8e519921490e8e252dcb93d141abf52fc6e53b95ba7
-  data.tar.gz: c5925bd62f6853ad701946a2ecca3bf57c8b967b7f65c9990f72c17748591398
+  metadata.gz: bf1cce75f6ae919ebb237862e74ade141e6300426e514331b4410cf7cfa0b27e
+  data.tar.gz: 2ea6f8f6fa47f01b324b6663c6c1dcd0f69a0c2a164d7591f5c714d9618b90a4
 SHA512:
-  metadata.gz: 0f534d77704be9418666e804a2bf1ecfd6c41ae4cee8b0c7f3c7753f2967b88b257e1962f3f8dc9565af09a697f75fb823054f062bffea9a7aabef9d9bae885e
-  data.tar.gz: 18bcdb411c4655bb3f99c8e7557adf7d872c0562fcfeef18700134578dcc9c8e8ecf9992c43c82521eb773aad6d97a95e7f6859d90a36ded25a2ac88e3a2babc
+  metadata.gz: 87b6c3f35b0fd85b06dc1d94afc6c145fd27989def6972dcaf66e85a8c899e3550376efa9b0e70efe2327e403a46615b6c51a5210653bf5bdd0e1c6946d477f7
+  data.tar.gz: 78fd6cb33feabb7a94c0df274528cf2ffd0d4b60e1bf37328304a125b71edc44c6fd884c003af7088b0953923cee3e3a2b3f39b139b1559bf0b2b4337792ecc9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    markdown_exec (2.7.1)
+    markdown_exec (2.7.2)
       clipboard (~> 1.3.6)
       open3 (~> 0.1.1)
       optparse (~> 0.1.1)

data/bats/border.bats

@@ -0,0 +1,8 @@
+#!/usr/bin/env bats
+
+load 'test_helper'
+
+@test 'Border - ' {
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/border.md \
+   'A: 1_  B: 2_'
+}

data/bats/document-shell.bats

@@ -0,0 +1,9 @@
+#!/usr/bin/env bats
+
+load 'test_helper'
+
+@test 'document_shell - required' {
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/document-shell.md \
+   --dump-inherited-lines t '* Exit' \
+   '  inherited_lines_  - : : from required_  - : : from document_shell'
+}

data/bin/tab_completion.sh

@@ -13,7 +13,7 @@ __filedirs_all()
 }
 
 _mde_echo_version() {
-  echo "2.7.1"
+  echo "2.7.2"
 }
 
 _mde() {

data/docs/dev/block-type-vars.md

@@ -5,6 +5,10 @@ VAULT: 1
 echo "Species: $Species"
 echo "VAULT: $VAULT"
 ```
+| Variable| Value
+| -| -
+| Species| ${Species}
+| VAULT| ${VAULT}
 @import bats-document-configuration.md
 ```vars :(document_vars)
 Species: Not specified

data/docs/dev/border.md

@@ -0,0 +1,7 @@
+```vars
+A: 1
+B: 2
+```
+@import bats-document-configuration.md
+```opts :(document_opts)
+```

data/docs/dev/command-substitution.md

@@ -11,6 +11,7 @@ echo "current base name is now $(basename `pwd`)"
 ```link
 load: file_$(basename `pwd`).sh
 ```
+/ This should not be evaluated $(err). It errs with "Error: HashDelegator.blocks_from_nested_files -- Shell script execution failed: /bin/bash: line 2: err: command not found"
 @import bats-document-configuration.md
 ```opts :(document_opts)
 heading1_center: false

data/docs/dev/document-shell.md

@@ -0,0 +1,6 @@
+```bash :(required)
+: from required
+```
+```bash :(document_shell) +(required)
+: from document_shell
+```

data/lib/fcb.rb

@@ -35,6 +35,14 @@ module MarkdownExec
       }.merge(options)
     end
 
+    def code_name_included?(*names)
+      names.include?(@attrs[:oname])
+    end
+
+    def code_name_exp?(regexp)
+      Regexp.new(regexp) =~ @attrs[:oname]
+    end
+
     # Derives a title from the body of an FCB object.
     # @param fcb [Object] The FCB object whose title is to be derived.
     # @return [String] The derived title.
@@ -152,23 +160,27 @@ module MarkdownExec
       @attrs.to_yaml
     end
 
-    # Expand variables in `dname` and `body` attributes
+    # Expand variables in attributes
+    ####
     def expand_variables_in_attributes!(pattern, replacements)
-      ### update name, nickname, title, label ???
-
-      # Replace variables in `dname` using the replacements dictionary
+      @attrs[:raw_dname] ||= @attrs[:dname]
       @attrs[:dname] = @attrs[:dname]&.gsub(pattern) do |match|
         replacements[match]
       end
+
+      @attrs[:raw_s0printable] ||= @attrs[:s0printable]
       @attrs[:s0printable] = @attrs[:s0printable]&.gsub(pattern) do |match|
         replacements[match]
       end
+
+      @attrs[:raw_s1decorated] ||= @attrs[:s1decorated]
       @attrs[:s1decorated] = @attrs[:s1decorated]&.gsub(pattern) do |match|
         replacements[match]
       end
 
       # Replace variables in each line of `body` if `body` is present
       if @attrs[:body]
+        @attrs[:raw_body] ||= @attrs[:body]
         @attrs[:body] = @attrs[:body]&.map do |line|
           if line.empty?
             line

data/lib/filter.rb

@@ -136,14 +136,14 @@ module MarkdownExec
       if options[:hide_blocks_by_name]
         filters[:hidden_name] =
           !!(options[:block_name_hidden_match].present? &&
-                    name =~ Regexp.new(options[:block_name_hidden_match]))
+                    fcb.code_name_exp?(options[:block_name_hidden_match]))
       end
       filters[:include_name] =
         !!(options[:block_name_include_match].present? &&
-                  name =~ Regexp.new(options[:block_name_include_match]))
+                  fcb.code_name_exp?(options[:block_name_include_match]))
       filters[:wrap_name] =
         !!(options[:block_name_wrapper_match].present? &&
-                  name =~ Regexp.new(options[:block_name_wrapper_match]))
+                  fcb.code_name_exp?(options[:block_name_wrapper_match]))
     end
 
     # Evaluates the filter settings to make a final decision on
@@ -227,27 +227,6 @@ if $PROGRAM_NAME == __FILE__
   require_relative 'constants'
 
   module MarkdownExec
-    # Define a mock fenced code block class for testing purposes
-    class FCB
-      attr_accessor :chrome, :disabled, :oname, :shell, :start_line, :type
-
-      def initialize(
-        chrome: false, dname: nil, oname: nil,
-        shell: '', start_line: nil, type: nil
-      )
-        @chrome = chrome
-        @dname = dname
-        @oname = oname
-        @shell = shell
-        @type = type
-        @start_line = start_line
-      end
-
-      def fetch(key, default)
-        instance_variable_get("@#{key}") || default
-      end
-    end
-
     class FilterTest < Minitest::Test
       def setup
         @options = {}

data/lib/hash_delegator.rb

@@ -361,10 +361,10 @@ module HashDelegatorSelf
   # @param [String] line The line to be processed.
   # @param [Array<Symbol>] selected_types A list of message types to check.
   # @param [Proc] block The block to be called with the line data.
-  def yield_line_if_selected(line, selected_types, id: '', &block)
+  def yield_line_if_selected(line, selected_types, source_id: '', &block)
     return unless block && block_type_selected?(selected_types, :line)
 
-    block.call(:line, MarkdownExec::FCB.new(body: [line], id: id))
+    block.call(:line, MarkdownExec::FCB.new(body: [line], id: source_id))
   end
 end
 
@@ -600,52 +600,72 @@ module MarkdownExec
       end
     end
 
-    def add_back_option(id: '', menu_blocks:)
-      append_chrome_block(id: id, menu_blocks: menu_blocks,
-                          menu_state: MenuState::BACK)
+    def add_back_option(menu_blocks:, source_id: '')
+      append_chrome_block(
+        menu_blocks: menu_blocks,
+        menu_state: MenuState::BACK,
+        source_id: source_id
+      )
     end
 
-    def add_exit_option(id: '', menu_blocks:)
-      append_chrome_block(id: id, menu_blocks: menu_blocks,
-                          menu_state: MenuState::EXIT)
+    def add_exit_option(menu_blocks:, source_id: '')
+      append_chrome_block(
+        menu_blocks: menu_blocks,
+        menu_state: MenuState::EXIT,
+        source_id: source_id
+      )
     end
 
-    def add_inherited_lines(menu_blocks:, link_state:)
-      append_inherited_lines(menu_blocks: menu_blocks, link_state: link_state)
+    def add_inherited_lines(link_state:, menu_blocks:)
+      append_inherited_lines(
+        link_state: link_state,
+        menu_blocks: menu_blocks
+      )
     end
 
     # Modifies the provided menu blocks array by adding 'Back' and 'Exit' options,
     # along with initial and final dividers, based on the delegate object's configuration.
     #
     # @param menu_blocks [Array] The array of menu block elements to be modified.
-    def add_menu_chrome_blocks!(id: '', menu_blocks:, link_state:)
+    def add_menu_chrome_blocks!(link_state:, menu_blocks:, source_id: '')
       return unless @delegate_object[:menu_link_format].present?
 
-      if @delegate_object[:menu_with_inherited_lines]
-        add_inherited_lines(menu_blocks: menu_blocks,
-                            link_state: link_state)
-      end
+      add_inherited_lines(
+        link_state: link_state,
+        menu_blocks: menu_blocks
+      ) if @delegate_object[:menu_with_inherited_lines]
 
       # back before exit
-      add_back_option(id: "#{id}.back",
-                      menu_blocks: menu_blocks) if should_add_back_option?
+      add_back_option(
+        menu_blocks: menu_blocks,
+        source_id: "#{source_id}.back"
+      ) if should_add_back_option?
 
       # exit after other options
-      if @delegate_object[:menu_with_exit]
-        add_exit_option(id: "#{id}.exit", menu_blocks: menu_blocks)
-      end
 
-      append_divider(id: "#{id}.init", menu_blocks: menu_blocks,
-                     position: :initial)
-      append_divider(id: "#{id}.final", menu_blocks: menu_blocks,
-                     position: :final)
+      add_exit_option(
+        menu_blocks: menu_blocks,
+        source_id: "#{source_id}.exit"
+      ) if @delegate_object[:menu_with_exit]
+
+      append_divider(
+        menu_blocks: menu_blocks,
+        position: :initial,
+        source_id: "#{source_id}.init"
+      )
+
+      append_divider(
+        menu_blocks: menu_blocks,
+        position: :final,
+        source_id: "#{source_id}.final"
+      )
     end
 
     # Appends a chrome block, which is a menu option for Back or Exit
     #
     # @param all_blocks [Array] The current blocks in the menu
     # @param type [Symbol] The type of chrome block to add (:back or :exit)
-    def append_chrome_block(menu_blocks:, menu_state:, id: '')
+    def append_chrome_block(menu_blocks:, menu_state:, source_id: '')
       case menu_state
       when MenuState::BACK
         history_state_partition
@@ -683,7 +703,7 @@ module MarkdownExec
         dname: HashDelegator.new(@delegate_object).string_send_color(
           formatted_name, :menu_chrome_color
         ),
-        id: id,
+        id: source_id.to_s,
         type: BlockType::CHROME,
         nickname: formatted_name,
         oname: formatted_name
@@ -703,10 +723,10 @@ module MarkdownExec
     #
     # @param menu_blocks [Array] The array of menu block elements.
     # @param position [Symbol] The position to insert the divider (:initial or :final).
-    def append_divider(id: '', menu_blocks:, position:)
+    def append_divider(menu_blocks:, position:, source_id: '')
       return unless divider_formatting_present?(position)
 
-      divider = create_divider(position, id: id)
+      divider = create_divider(position, source_id: source_id)
       position == :initial ? menu_blocks.unshift(divider) : menu_blocks.push(divider)
     end
 
@@ -715,7 +735,7 @@ module MarkdownExec
     #
     # @param menu_blocks [Array] The array of menu block elements.
     # @param position [Symbol] The position to insert the divider (:initial or :final).
-    def append_inherited_lines(menu_blocks:, link_state:, position: top)
+    def append_inherited_lines(link_state:, menu_blocks:, position: top)
       return unless link_state.inherited_lines_present?
 
       insert_at_top = @delegate_object[:menu_inherited_lines_at_top]
@@ -783,13 +803,31 @@ module MarkdownExec
 
     # private
 
+    def expand_references!(fcb, link_state)
+      expand_variable_references!(
+        blocks: [fcb],
+        initial_code_required: false,
+        link_state: link_state
+      )
+      expand_variable_references!(
+        blocks: [fcb],
+        echo_format: '%s',
+        group_name: :command,
+        initial_code_required: false,
+        key_format: '$(%s)',
+        link_state: link_state,
+        pattern: options_command_substitution_regexp
+      )
+    end
+
     # Iterates through nested files to collect various types
     #  of blocks, including dividers, tasks, and others.
     # 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(
-      link_state: @dml_link_state || LinkState.new
+      link_state: @dml_link_state || LinkState.new,
+      source_id: nil
     )
       register_console_attributes(@delegate_object)
       @decor_patterns_from_delegate_object_for_block_create = collect_line_decor_patterns(@delegate_object)
@@ -799,22 +837,6 @@ module MarkdownExec
       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]
@@ -822,20 +844,25 @@ 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: "#{source_id}_bfnf_b_#{count}"
             ) do |oname, color|
               apply_block_type_color_option(oname, color)
             end
+          else
+            expand_references!(fcb, link_state)
           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)
+            # expand references only if block is recognized (not a comment)
+            create_and_add_chrome_blocks(
+              blocks, fcb, id: "#{source_id}_bfnf_l_#{count}", init_ids: init_ids
+            ) do
+              # expand references only if block is recognized (not a comment)
+              expand_references!(fcb, link_state)
+            end
           end
         end
       end
@@ -1134,8 +1161,10 @@ module MarkdownExec
     end
 
     # Check if the expression contains wildcard characters
-    def contains_wildcards?(expr)
-      expr.match(%r{\*|\?|\[})
+    def contains_glob?(str)
+      return false if str.nil?
+
+      str.match?(/[\*\?\[\{\}]/)
     end
 
     def copy_to_clipboard(required_lines)
@@ -1200,7 +1229,8 @@ module MarkdownExec
       collapse: nil, color_method:, decor_patterns: [],
       disabled: true, format_option:, id: '',
       level: 0, match_data:, type: '',
-      wrap: nil
+      wrap: nil,
+      fcb: nil
     )
       line_cap = NamedCaptureExtractor.extract_named_group2(match_data)
       # replace tabs in indent
@@ -1256,23 +1286,44 @@ module MarkdownExec
         )
 
         line_obj[:line] = line_obj[:indent] + line_obj[:text]
-        blocks.push FCB.new(
-          center: center,
-          chrome: true,
-          collapse: collapse.nil? ? (line_obj[:collapse] == COLLAPSIBLE_TOKEN_COLLAPSE) : collapse,
-          token: line_obj[:collapse],
-          disabled: disabled ? TtyMenu::DISABLE : nil,
-          id: "#{id}.#{index}",
-          level: level,
-          s0indent: indent,
-          s0printable: line_obj[:text],
-          s1decorated: decorated,
-          dname: line_obj[:indent] + decorated,
-          indent: line_obj[:indent],
-          oname: line_obj[:text],
-          text: line_obj[:text],
-          type: type
-        )
+
+        if fcb.nil?
+          fcb = FCB.new(
+            center: center,
+            chrome: true,
+            collapse: collapse.nil? ? (line_obj[:collapse] == COLLAPSIBLE_TOKEN_COLLAPSE) : collapse,
+            token: line_obj[:collapse],
+            disabled: disabled ? TtyMenu::DISABLE : nil,
+            id: "#{id}.#{index}",
+            level: level,
+            s0indent: indent,
+            s0printable: line_obj[:text],
+            s1decorated: decorated,
+            dname: line_obj[:indent] + decorated,
+            indent: line_obj[:indent],
+            oname: line_obj[:text],
+            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
       end
       line_caps.count
     end
@@ -1292,6 +1343,12 @@ module MarkdownExec
           next
         end
 
+        if block_given?
+          # expand references only if block is recognized (not a comment)
+          yield if block_given?
+          mbody = fcb.body[0].match @delegate_object[criteria[:match]]
+        end
+
         create_and_add_chrome_block(
           blocks: blocks,
           case_conversion: criteria[:case_conversion],
@@ -1312,6 +1369,7 @@ module MarkdownExec
           decor_patterns:
             @decor_patterns_from_delegate_object_for_block_create,
           disabled: !(criteria[:collapsible] && @delegate_object[criteria[:collapsible]]),
+          fcb: fcb,
           id: "#{id}.#{index}",
           format_option: criteria[:format] &&
                          @delegate_object[criteria[:format]],
@@ -1324,7 +1382,7 @@ module MarkdownExec
       end
     end
 
-    def create_divider(position, id: '')
+    def create_divider(position, source_id: '')
       divider_key = if position == :initial
                       :menu_initial_divider
                     else
@@ -1337,7 +1395,7 @@ module MarkdownExec
         chrome: true,
         disabled: TtyMenu::DISABLE,
         dname: string_send_color(oname, :menu_divider_color),
-        id: id,
+        id: source_id,
         oname: oname
       )
     end
@@ -1420,9 +1478,10 @@ module MarkdownExec
 
     def dml_menu_append_chrome_item(
       name, count, type,
-      id: '',
+      always_create: true,
+      always_enable: true,
       menu_state: MenuState::LOAD,
-      always_create: true, always_enable: true
+      source_id: ''
     )
       raise unless name.present?
       raise if @dml_menu_blocks.nil?
@@ -1432,7 +1491,7 @@ module MarkdownExec
       # create menu item when it is needed (count > 0)
       #
       if item.nil? && (always_create || count.positive?)
-        item = append_chrome_block(id: id,
+        item = append_chrome_block(source_id: source_id,
                                    menu_blocks: @dml_menu_blocks,
                                    menu_state: menu_state)
       end
@@ -1688,11 +1747,7 @@ module MarkdownExec
 
       elsif COLLAPSIBLE_TYPES.include?(selected.type)
         debounce_reset
-        if @compressed_ids.keys.include?(selected.id)
-          @compressed_ids.delete(selected.id)
-        else
-          @compressed_ids.merge!(selected.id => selected.level)
-        end
+        menu_toggle_collapsible_block(selected)
         LoadFileLinkState.new(LoadFile::REUSE, link_state)
 
       elsif debounce_allows
@@ -1880,15 +1935,25 @@ module MarkdownExec
       view: @delegate_object[:vars_block_filename_view]
     )
       block_data = HashDelegator.parse_yaml_data_from_body(selected.body)
-      if selected_option = select_option_with_metadata(
+
+      dirs = Dir.glob(
+        File.join(
+          Dir.pwd,
+          block_data['directory'] || directory,
+          block_data['glob'] || glob
+        )
+      )
+
+      if !contains_glob?(block_data['directory']) &&
+         !contains_glob?(block_data['glob'])
+        if dirs[0]
+          File.readlines(dirs[0], chomp: true)
+        else
+          warn 'No matching file found.'
+        end
+      elsif selected_option = select_option_with_metadata(
         prompt_title,
-        [exit_prompt] + Dir.glob(
-          File.join(
-            Dir.pwd,
-            block_data['directory'] || directory,
-            block_data['glob'] || glob
-          )
-        ).sort.map do |file|
+        [exit_prompt] + dirs.sort.map do |file|
           { name: format(
             block_data['view'] || view,
             NamedCaptureExtractor.extract_named_group2(
@@ -1908,7 +1973,7 @@ module MarkdownExec
           File.readlines(selected_option.oname, chomp: true)
         end
       else
-        warn 'No matching files found'
+        warn 'No matching files found.'
       end
     end
 
@@ -2175,6 +2240,7 @@ module MarkdownExec
       key_format: '${%s}',
       pattern: nil
     )
+      # defined($x) ? '' : ($x = 1; pp [__LINE__, caller.deref])
       pattern ||= options_variable_expression_regexp
       return if pattern.nil?
 
@@ -2397,7 +2463,7 @@ module MarkdownExec
          Regexp.new(@delegate_object.fetch(
                       :fenced_start_and_end_regex, '^(?<indent> *)`{3,}'
                     )),
-        fcb: MarkdownExec::FCB.new,
+        fcb: MarkdownExec::FCB.new(id: 'INIT'),
         in_fenced_block: false,
         headings: []
       }
@@ -2419,16 +2485,16 @@ module MarkdownExec
 
         update_line_and_block_state(
           nested_line, state, selected_types,
-          id: "#{@delegate_object[:filename]}:#{index}",
+          source_id: "#{@delegate_object[:filename]}_ibfnf_#{index}",
           &block
         )
       end
     end
 
-    def iter_source_blocks(source, &block)
+    def iter_source_blocks(source, source_id: nil, &block)
       case source
       when 1
-        blocks_from_nested_files.each(&block)
+        blocks_from_nested_files(source_id: source_id).each(&block)
       when 2
         @dml_blocks_in_file.each(&block)
       when 3
@@ -2548,12 +2614,14 @@ module MarkdownExec
       }
     end
 
-    def list_blocks
+    def list_blocks(source_id: nil)
       message = @delegate_object[:list_blocks_message]
       block_eval = @delegate_object[:list_blocks_eval]
 
       list = []
-      iter_source_blocks(@delegate_object[:list_blocks_type]) do |block|
+      iter_source_blocks(
+        @delegate_object[:list_blocks_type], source_id: source_id
+      ) do |block|
         list << (block_eval.present? ? eval(block_eval) : block.send(message))
       end
       list.compact!
@@ -2566,7 +2634,7 @@ module MarkdownExec
     # Executes a specified block once per filename.
     # @param all_blocks [Array] Array of all block elements.
     # @return [Boolean, nil] True if values were modified, nil otherwise.
-    def load_auto_opts_block(all_blocks, id: '', mdoc:)
+    def load_auto_opts_block(all_blocks, mdoc:)
       block_name = @delegate_object[:document_load_opts_block_name]
       unless block_name.present? &&
              @opts_most_recent_filename != @delegate_object[:filename]
@@ -2586,6 +2654,30 @@ module MarkdownExec
       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? &&
@@ -2628,7 +2720,7 @@ module MarkdownExec
       expanded_expression = formatted_expression(expression)
 
       # Handle wildcards or direct file specification
-      if contains_wildcards?(expanded_expression)
+      if contains_glob?(expanded_expression)
         load_filespec_wildcard_expansion(expanded_expression)
       else
         expanded_expression
@@ -2676,8 +2768,8 @@ module MarkdownExec
       [block_name_from_cli, now_using_cli]
     end
 
-    def mdoc_and_blocks_from_nested_files
-      menu_blocks = blocks_from_nested_files
+    def mdoc_and_blocks_from_nested_files(source_id: nil)
+      menu_blocks = blocks_from_nested_files(source_id: source_id)
       mdoc = MDoc.new(menu_blocks) do |nopts|
         @delegate_object.merge!(nopts)
       end
@@ -2687,12 +2779,19 @@ module MarkdownExec
     ## Handles the file loading and returns the blocks
     #  in the file and MDoc instance
     #
-    def mdoc_menu_and_blocks_from_nested_files(link_state, id: '')
+    def mdoc_menu_and_blocks_from_nested_files(link_state, source_id: '')
       # read blocks, load document opts block, and re-process blocks
       #
-      all_blocks, mdoc = mdoc_and_blocks_from_nested_files
-      if load_auto_opts_block(all_blocks, id: id, mdoc: mdoc)
-        all_blocks, mdoc = mdoc_and_blocks_from_nested_files
+      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)
+      end
+
+      # load document shell block
+      #
+      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
       end
 
       # load document vars block
@@ -2700,11 +2799,7 @@ module MarkdownExec
       if code_lines = load_auto_vars_block(all_blocks)
         new_code = HashDelegator.code_merge(link_state.inherited_lines,
                                             code_lines)
-        next_state_set_code(
-          nil,
-          link_state,
-          new_code
-        )
+        next_state_set_code(nil, link_state, new_code)
         link_state.inherited_lines = new_code
       end
 
@@ -2714,10 +2809,22 @@ module MarkdownExec
         @delegate_object.merge!(compressed_ids: @compressed_ids)
       )
 
+      # re-expand blocks
+      menu_blocks.each do |fcb|
+        fcb.body = fcb.raw_body || fcb.body || []
+        fcb.dname = fcb.raw_dname || fcb.dname
+        fcb.s0printable = fcb.raw_s0printable || fcb.s0printable
+        fcb.s1decorated = fcb.raw_s1decorated || fcb.s1decorated
+        expand_references!(fcb, link_state)
+      end
+
       # chrome for menu
       #
-      add_menu_chrome_blocks!(id: id, menu_blocks: menu_blocks,
-                              link_state: link_state)
+      add_menu_chrome_blocks!(
+        link_state: link_state,
+        menu_blocks: menu_blocks,
+        source_id: source_id
+      )
 
       ### compress empty lines
       HashDelegator.delete_consecutive_blank_lines!(menu_blocks)
@@ -2743,6 +2850,7 @@ module MarkdownExec
         dname: HashDelegator.new(@delegate_object).string_send_color(
           document_glob, :menu_inherited_lines_color
         ),
+        # 2025-01-03 menu item is disabled ∴ does not need a recall id
         oname: formatted_name
       )
 
@@ -2783,6 +2891,22 @@ 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)
+      end
+    end
+
     # If a method is missing, treat it as a key for the @delegate_object.
     def method_missing(method_name, *args, &block)
       if @delegate_object.respond_to?(method_name)
@@ -3435,7 +3559,7 @@ module MarkdownExec
       formatted = formatted_expression(expression)
 
       # Handle wildcards or direct file specification
-      if contains_wildcards?(formatted)
+      if contains_glob?(formatted)
         save_filespec_wildcard_expansion(formatted)
       else
         formatted
@@ -3579,11 +3703,14 @@ module MarkdownExec
           item == selection
         end
       end
+
+      # new FCB if selected is not an object
       if selected.instance_of?(String)
         selected = FCB.new(dname: selected)
       elsif selected.instance_of?(Hash)
         selected = FCB.new(selected)
       end
+
       unless selected
         HashDelegator.error_handler('select_option_with_metadata',
                                     error: 'menu item not found')
@@ -3651,7 +3778,9 @@ module MarkdownExec
     # @param fenced_start_extended_regex [Regexp]
     #  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)
+    def start_fenced_block(
+      line, headings, fenced_start_extended_regex, source_id: nil
+    )
       fcb_title_groups = NamedCaptureExtractor.extract_named_groups(
         line, fenced_start_extended_regex
       )
@@ -3702,6 +3831,7 @@ module MarkdownExec
         disabled: disabled,
         dname: dname,
         headings: headings,
+        id: source_id.to_s,
         indent: fcb_title_groups.fetch(:indent, ''),
         nickname: nickname,
         oname: oname,
@@ -3764,7 +3894,7 @@ module MarkdownExec
     ##
     def update_line_and_block_state(
       nested_line, state, selected_types,
-      id:,
+      source_id:,
       &block
     )
       line = nested_line.to_s
@@ -3784,7 +3914,8 @@ module MarkdownExec
           #
           state[:fcb] = start_fenced_block(
             line, state[:headings],
-            @delegate_object[:fenced_start_extended_regex]
+            @delegate_object[:fenced_start_extended_regex],
+            source_id: source_id
           )
           state[:fcb][:depth] = nested_line[:depth]
           state[:fcb][:indention] = nested_line[:indention]
@@ -3801,8 +3932,9 @@ module MarkdownExec
             @delegate_object[:menu_include_imported_notes]
         # add line if it is depth 0 or option allows it
         #
-        HashDelegator.yield_line_if_selected(line, selected_types, id: id,
-                                             &block)
+        HashDelegator.yield_line_if_selected(
+          line, selected_types, source_id: source_id, &block
+        )
       end
     end
 
@@ -4078,15 +4210,20 @@ module MarkdownExec
         end
       end
 
+      count = 0
       InputSequencer.new(
         @delegate_object[:filename],
         block_list
       ).run do |msg, data|
+        count += 1
         case msg
         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')
+          count = 0
+          vux_parse_document(source_id: "#{@delegate_object[:filename]}_vmlpd")
+          vux_menu_append_history_files(
+            formatted_choice_ostructs,
+            source_id: "#{@delegate_object[:filename]}_vmlhf"
+          )
           vux_publish_document_file_name_for_external_automation
 
         when :display_menu
@@ -4097,7 +4234,7 @@ module MarkdownExec
           # yield :end_of_cli, @delegate_object
 
           if @delegate_object[:list_blocks]
-            list_blocks
+            list_blocks(source_id: "#{@delegate_object[:filename]}_vmleoc")
             :exit
           end
 
@@ -4132,8 +4269,9 @@ module MarkdownExec
       end
     end
 
-    def vux_menu_append_history_files(formatted_choice_ostructs,
-                                      id: '')
+    def vux_menu_append_history_files(
+      formatted_choice_ostructs, source_id: ''
+    )
       if @delegate_object[:menu_for_history]
         history_files(
           @dml_link_state,
@@ -4145,8 +4283,8 @@ module MarkdownExec
             dml_menu_append_chrome_item(
               formatted_choice_ostructs[:history].oname, files.count,
               'files',
-              id: id,
-              menu_state: MenuState::HISTORY
+              menu_state: MenuState::HISTORY,
+              source_id: source_id
             )
           end
         end
@@ -4168,38 +4306,38 @@ module MarkdownExec
       if files.count.positive?
         dml_menu_append_chrome_item(
           formatted_choice_ostructs[:load].dname, files.count, 'files',
-          id: "#{id}.load",
-          menu_state: MenuState::LOAD
+          menu_state: MenuState::LOAD,
+          source_id: "#{source_id}_vmahf_load"
         )
       end
       if @delegate_object[:menu_inherited_lines_edit_always] ||
          lines_count.positive?
         dml_menu_append_chrome_item(
           formatted_choice_ostructs[:edit].dname, lines_count, 'lines',
-          id: "#{id}.edit",
-          menu_state: MenuState::EDIT
+          menu_state: MenuState::EDIT,
+          source_id: "#{source_id}_vmahf_edit"
         )
       end
       if lines_count.positive?
         dml_menu_append_chrome_item(
           formatted_choice_ostructs[:save].dname, 1, '',
-          id: "#{id}.save",
-          menu_state: MenuState::SAVE
+          menu_state: MenuState::SAVE,
+          source_id: "#{source_id}_vmahf_save"
         )
       end
       if lines_count.positive?
         dml_menu_append_chrome_item(
           formatted_choice_ostructs[:view].dname, 1, '',
-          id: "#{id}.view",
-          menu_state: MenuState::VIEW
+          menu_state: MenuState::VIEW,
+          source_id: "#{source_id}_vmahf_view"
         )
       end
       # rubocop:disable Style/GuardClause
       if @delegate_object[:menu_with_shell]
         dml_menu_append_chrome_item(
           formatted_choice_ostructs[:shell].dname, 1, '',
-          id: "#{id}.shell",
-          menu_state: MenuState::SHELL
+          menu_state: MenuState::SHELL,
+          source_id: "#{source_id}_vmahf_shell"
         )
       end
       # rubocop:enable Style/GuardClause
@@ -4217,7 +4355,7 @@ module MarkdownExec
       )
     end
 
-    def vux_parse_document(id: '')
+    def vux_parse_document(source_id: '')
       @run_state.batch_index += 1
       @run_state.in_own_window = false
 
@@ -4239,7 +4377,9 @@ module MarkdownExec
       # update @delegate_object and @menu_base_options in auto_load
       #
       @dml_blocks_in_file, @dml_menu_blocks, @dml_mdoc =
-        mdoc_menu_and_blocks_from_nested_files(@dml_link_state, id: id)
+        mdoc_menu_and_blocks_from_nested_files(
+          @dml_link_state, source_id: source_id
+        )
       dump_delobj(@dml_blocks_in_file, @dml_menu_blocks, @dml_link_state)
     end
 

data/lib/input_sequencer.rb

@@ -94,13 +94,18 @@ class InputSequencer
       break if exit_when_bq_empty && bq_is_empty? && !now_menu.prior_block_was_link
 
       if now_menu.display_menu
+        # !!b
         break if run_yield(:end_of_cli, &block) == :exit
+        # !!b
 
         exit_when_bq_empty = false
         run_yield :display_menu, &block
+        # !!b
 
         choice = run_yield :user_choice, &block
+        # !!b
         break if choice == :break
+        # !!b
 
         raise BlockMissing, 'Block not recognized.' if choice.nil?
         # Exit loop and method to terminate the app
@@ -115,7 +120,9 @@ class InputSequencer
         if now_menu.block_name && !now_menu.block_name.empty?
           block_name = now_menu.block_name
         else
+          # break if bq_is_empty? # Exit loop if no more blocks to process
           if bq_is_empty? # Exit loop if no more blocks to process
+            # !!b
             run_yield :end_of_cli, &block
             break
           end

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.1'
+  VERSION = '2.7.2'
 end

data/lib/mdoc.rb

@@ -177,12 +177,12 @@ module MarkdownExec
       blocks.map do |block|
         (block[:wraps] || []).map do |wrap|
           wrap_before = wrap.sub('}', '-before}') ### hardcoded wrap name
-          @table.select { |fcb| [wrap_before, wrap].include? fcb.oname }
+          @table.select { |fcb| fcb.code_name_included?(wrap_before, wrap) }
         end.flatten(1) +
           [block] +
           (block[:wraps] || []).reverse.map do |wrap|
             wrap_after = wrap.sub('}', '-after}') ### hardcoded wrap name
-            @table.select { |fcb| fcb.oname == wrap_after }
+            @table.select { |fcb| fcb.code_name_included?(wrap_after) }
           end.flatten(1)
       end.flatten(1).compact
     end
@@ -623,25 +623,22 @@ if $PROGRAM_NAME == __FILE__
       # Mocking the @table object for testing
       def setup
         @table = [
-          OpenStruct.new(oname: '{wrap1}'),
-          OpenStruct.new(oname: '{wrap2-before}'),
-          OpenStruct.new(oname: '{wrap2}'),
-          OpenStruct.new(oname: '{wrap2-after}'),
-          OpenStruct.new(oname: '{wrap3-before}'),
-          OpenStruct.new(oname: '{wrap3}'),
-          OpenStruct.new(oname: '{wrap3-after}')
+          FCB.new(oname: '{wrap1}'),
+          FCB.new(oname: '{wrap2-before}'),
+          FCB.new(oname: '{wrap2}'),
+          FCB.new(oname: '{wrap2-after}'),
+          FCB.new(oname: '{wrap3-before}'),
+          FCB.new(oname: '{wrap3}'),
+          FCB.new(oname: '{wrap3-after}')
         ]
         @mdoc = MDoc.new(@table)
       end
 
       def test_collect_wrapped_blocks
         # Test case 1: blocks with wraps
-        OpenStruct.new(oname: 'block1')
-
         assert_equal(%w[{wrap2-before} {wrap2} b {wrap2-after}],
                      @mdoc.collect_wrapped_blocks(
-                       [OpenStruct.new(oname: 'b',
-                                       wraps: ['{wrap2}'])]
+                       [FCB.new(oname: 'b', wraps: ['{wrap2}'])]
                      ).map(&:oname))
 
         assert_equal(%w[{wrap2-before} {wrap2} {wrap3-before} {wrap3} c {wrap3-after} {wrap2-after}],

data/lib/menu.src.yml

@@ -200,6 +200,12 @@
   :default: "(document_opts)"
   :procname: val_as_str
 
+- :opt_name: document_load_shell_block_name
+  :env_var: MDE_DOCUMENT_LOAD_SHELL_BLOCK_NAME
+  :description: Name of shell block to load with the document
+  :default: "(document_shell)"
+  :procname: val_as_str
+
 - :opt_name: document_load_vars_block_name
   :env_var: MDE_DOCUMENT_LOAD_VARS_BLOCK_NAME
   :description: Name of Vars block to load with the document
@@ -676,8 +682,7 @@
   :env_var: MDE_MENU_ACTIVE_COLOR_PASTEL_MESSAGES
   :description: menu_active_color_pastel_messages
   :default:
-  - bright_magenta
-  - on_black
+  - inverse
 
 - :opt_name: menu_back_at_top
   :env_var: MDE_MENU_BACK_AT_TOP

data/lib/menu.yml

@@ -166,6 +166,11 @@
   :description: Name of Opts block to load with the document
   :default: "(document_opts)"
   :procname: val_as_str
+- :opt_name: document_load_shell_block_name
+  :env_var: MDE_DOCUMENT_LOAD_SHELL_BLOCK_NAME
+  :description: Name of shell block to load with the document
+  :default: "(document_shell)"
+  :procname: val_as_str
 - :opt_name: document_load_vars_block_name
   :env_var: MDE_DOCUMENT_LOAD_VARS_BLOCK_NAME
   :description: Name of Vars block to load with the document
@@ -572,8 +577,7 @@
   :env_var: MDE_MENU_ACTIVE_COLOR_PASTEL_MESSAGES
   :description: menu_active_color_pastel_messages
   :default:
-  - bright_magenta
-  - on_black
+  - inverse
 - :opt_name: menu_back_at_top
   :env_var: MDE_MENU_BACK_AT_TOP
   :description: Display Back option at top of menu (vs bottom)

data/lib/ww.rb

@@ -24,7 +24,7 @@ def ww0(*objs,
         category: nil,
         full_backtrace: false,
         level: :debug,
-        locations: caller_locations,
+        locations: caller_locations[1..-1],
         log_file: nil,
         output: $stderr,
         single_line: false,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-10 00:00:00.000000000 Z
+date: 2025-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -108,8 +108,10 @@ files:
 - assets/select_a_file.png
 - bats/bats.bats
 - bats/block-types.bats
+- bats/border.bats
 - bats/cli.bats
 - bats/command-substitution.bats
+- bats/document-shell.bats
 - bats/fail.bats
 - bats/history.bats
 - bats/import.bats
@@ -134,9 +136,11 @@ files:
 - docs/dev/block-type-opts.md
 - docs/dev/block-type-port.md
 - docs/dev/block-type-vars.md
+- docs/dev/border.md
 - docs/dev/command-substitution.md
 - docs/dev/data-blocks.md
 - docs/dev/disable.md
+- docs/dev/document-shell.md
 - docs/dev/import-missing.md
 - docs/dev/import.md
 - docs/dev/linked-file.md