markdown_exec 2.8.2 → 2.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 066c72f2f85462a89163b7834669dee6526e516ee3ebfe4be2e8b269cb4ece36
-  data.tar.gz: 48c2bce9ac82cda2cbecca5bea4564b28013cdbab7005e249e8a856d0280afa0
+  metadata.gz: dfa1920cdbee40306492b597411dff701777c0ac158dc969a02d3ac2db7351b2
+  data.tar.gz: fe5c8229410f4263b9aa394c99f1d1be61b6a119684ca5c29e8f0a7851d4391a
 SHA512:
-  metadata.gz: fe1270b8cf11efc8ad9e81cb43052bc75cfc217e362c7d6e30acb6981a6d0be749f290b9b15ce1a2655d6a7e157177c4cd975aa61de22a6f6bafe2a835285228
-  data.tar.gz: 9445285db86af55fe5ba0b784a24d30dd418ac3d1dc551183a5a1b3b865df27a6b314ddc08b4a013de5e926e023439753fe08cd4ea8d6c6da0c0d9547e4a9546
+  metadata.gz: e2566c1f28e9eb898c490aa9076d762fe76b8f2092a1b6b4a9d37ff889d02bea021cf84fad63c2f9598d7ba17d7a6ac63840d49958d6dfad9f45b57250a4d3b7
+  data.tar.gz: 44a40a84a65eb477951b6929307837cc8493e70b9fe76b5065bb86e54b2b10f07241de175552132979ddb00b5c8bdce031d64688189b78f5da9f953e74399f4a

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## [2.8.3] - 2025-02-27
+
+### Added
+
+- "echo" support to UX blocks for evaluated shell expressions
+
+  Introduces the `echo` key to UX blocks, allowing the output of an
+  evaluated shell expression to be assigned to a named variable.
+  Implements `export_echo_with_code` to execute the expression safely
+  and handle invalidated outputs. Also ensures proper transformation of
+  export values.
+
+- Persist allocated FCBs.
+
+- Read-only flag to UX menu blocks
+
+  Introduces a `readonly` flag for UX menu blocks, allowing exports to
+  specify whether a block should be immutable. The flag is assigned from
+  the export definition and enforced in the menu logic.
+
+### Changed
+
+- Correct indent of all lines displayed for a block.
+- Retain whitespace in output from shell blocks.
+- Remove a function to report the compiled version from the tab completion script. It is not used.
+
 ## [2.8.2] - 2025-02-19
 
 ### Added

data/Gemfile.lock

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

data/bats/block-type-ux-echo.bats

@@ -0,0 +1,20 @@
+#!/usr/bin/env bats
+
+load 'test_helper'
+
+@test 'automatic block - default' {
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/block-type-ux-echo.md \
+   'VAR=markdown_exec_IAB='
+}
+
+@test 'inherited lines' {
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/block-type-ux-echo.md \
+   '(menu_with_inherited_lines)' \
+   'VAR=markdown_exec_VAR=markdown_exec_IAB='
+}
+
+@test 'selected block' {
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/block-type-ux-echo.md \
+   '(VAR_has_count)' '[IAB_has_count]' \
+   'VAR=14_IAB=1414'
+}

data/bats/block-type-ux-preconditions.bats

@@ -0,0 +1,8 @@
+#!/usr/bin/env bats
+
+load 'test_helper'
+
+@test 'An undefined variable is a precondition' {
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/block-type-ux-preconditions.md \
+   'A value must exist for: MISSING_VARIABLE_SPECIES='
+}

data/bats/block-type-ux-readonly.bats

@@ -0,0 +1,10 @@
+#!/usr/bin/env bats
+
+load 'test_helper'
+
+@test 'automatic block - disabled' {
+  spec_mde_args_expect \
+   docs/dev/block-type-ux-readonly.md \
+   --list-blocks-message readonly --list-blocks-type 3 --list-blocks \
+   true
+}

data/bats/block-type-vars.bats

@@ -7,8 +7,8 @@ load 'test_helper'
 # includes output from automatic vars blocks
 @test 'Vars block - auto load' {
   BATS_OUTPUT_FILTER=A
-  spec_mde_args_expect docs/dev/block-type-vars.md show \
-   'Species = Not specified Genus = Not specified  Species: Not specified VAULT:'
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/block-type-vars.md show \
+   'Species = Not specified_Genus = Not specified__Species: Not specified_VAULT: '
 }
 
 # includes output from assignment and from shell block
@@ -22,5 +22,5 @@ load 'test_helper'
 @test 'Vars block - invalid YAML' {
   BATS_OUTPUT_FILTER=A
   spec_mde_args_expect docs/dev/block-type-vars.md '[invalid_yaml]' show \
-   'Species = Not specified Genus = Not specified  Species: Not specified VAULT:'
+   'Species = Not specified Genus = Not specified  Species: Not specified VAULT: '
 }

data/bats/indented-multi-line-output.bats

@@ -0,0 +1,9 @@
+#!/usr/bin/env bats
+
+load 'test_helper'
+
+@test 'Retain whitespace in output from shell blocks' {
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/indented-multi-line-output.md \
+   '[make-output]' \
+   '_Species_ Genus_  Family_Order'
+}

data/bats/line-decor-dynamic.bats

@@ -0,0 +1,8 @@
+#!/usr/bin/env bats
+
+load 'test_helper'
+
+@test 'Line decor, dynamic - new pattern, line_decor_pre, ansi' {
+  spec_mde_dname_doc_blocks_expect docs/dev/line-decor-dynamic.md \
+   $'\e[38;2;200;200;33m\e[48;2;60;60;32mSpecies\e[0m'
+}

data/bats/test_helper.bash

@@ -209,6 +209,16 @@ spec_mde_args_grep_filter_expect () {
   [[ -n $status ]]
 }
 
+spec_mde_dname_doc_blocks_expect () {
+  BATS_SAFE=_
+  spec_mde_args_expect "$1" \
+   "${@:2:$(($#-2))}" \
+   --list-blocks-message dname \
+   --list-blocks-type 3 \
+   --list-blocks \
+  "${!#}"
+}
+
 spec_mde_xansi_dname_doc_blocks_expect () {
   BATS_OUTPUT_FILTER=A
   BATS_SAFE=_

data/bin/tab_completion.sh

@@ -12,10 +12,6 @@ __filedirs_all()
   COMPREPLY='.'
 }
 
-_mde_echo_version() {
-  echo "2.8.2"
-}
-
 _mde() {
   local cur prev opts
   cur="${COMP_WORDS[COMP_CWORD]}"
@@ -213,4 +209,3 @@ _mde() {
 }
 
 complete -o filenames -o nospace -F _mde mde
-# _mde_echo_version

data/bin/tab_completion.sh.erb

@@ -12,10 +12,6 @@ __filedirs_all()
   COMPREPLY='.'
 }
 
-_mde_echo_version() {
-  echo "<%= MarkdownExec::VERSION %>"
-}
-
 _mde() {
   local cur prev opts
   cur="${COMP_WORDS[COMP_CWORD]}"
@@ -104,4 +100,3 @@ _mde() {
 }
 
 complete -o filenames -o nospace -F _mde mde
-# _mde_echo_version

data/docs/dev/block-type-ux-echo.md

@@ -0,0 +1,21 @@
+/ This automatic block sets VAR and displays the current value in the menu.
+```ux :[document_ux_VAR]
+default: :echo
+echo: $(basename `pwd`)
+name: VAR
+```
+/ This block is not visible. Execute to display the inherited lines for testing.
+```opts :(menu_with_inherited_lines)
+menu_with_inherited_lines: true
+```
+/ This block is not visible. Execute to set a new value, displayed by the block above.
+```ux :(VAR_has_count)
+echo: $(basename `pwd` | wc -c)
+name: VAR
+```
+/ This block is visible. Execute to set a new value, displayed by the block above.
+```ux :[IAB_has_count]
+echo: $VAR$VAR
+name: IAB
+```
+@import bats-document-configuration.md

data/docs/dev/block-type-ux-preconditions.md

@@ -0,0 +1,9 @@
+/ an automatic UX block that has a precondition that must be met before it is executed
+```ux :[document_ux_SPECIES]
+default: :exec
+exec: printf "$MISSING_VARIABLE"
+name: SPECIES
+preconditions:
+- MISSING_VARIABLE
+```
+@import bats-document-configuration.md

data/docs/dev/block-type-ux-readonly.md

@@ -0,0 +1,7 @@
+/ This automatic block sets VAR and displays the current value in the menu.
+```ux :[document_ux_VAR]
+default: Pongo tapanuliensis
+name: SPECIES
+readonly: true
+```
+@import bats-document-configuration.md

data/docs/dev/block-type-ux-require.md

@@ -4,25 +4,29 @@ ENTITY='Pongo tapanuliensis,Pongo'
 ```
 ```ux :[document_ux_SPECIES] +(shell) +[ux_GENUS]
 default: :exec
-exec: printf "${ENTITY%%,*}"
+exec: echo "${ENTITY%%,*}"
 name: SPECIES
+transform: :chomp
 ```
 / required ux block requires another
 ```ux :[ux_GENUS] +[ux_NAME]
 default: :exec
-exec: printf "${ENTITY##*,}"
+exec: echo "${ENTITY##*,}"
 name: GENUS
+transform: :chomp
 ```
 / executed in context of prior ux blocks, uses their initial values
 ```ux :[ux_NAME]
 default: :exec
-exec: printf "$SPECIES - $GENUS"
+exec: echo "$SPECIES - $GENUS"
 name: NAME
+transform: :chomp
 ```
 / executed after other ux blocks, uses their initial values
 ```ux :[document_ux_NAME2]
 default: :exec
-exec: printf "$NAME"
+exec: echo "$NAME"
 name: NAME2
+transform: :chomp
 ```
 @import bats-document-configuration.md

data/docs/dev/indented-multi-line-output.md

@@ -0,0 +1,11 @@
+/ Retain whitespace in output from shell blocks
+``` :[make-output]
+echo 'Species'
+echo -e " Genus\n  Family\tOrder"
+```
+@import bats-document-configuration.md
+```opts :(document_opts)
+line_decor_pre:
+  - :color_method: :ansi_38_2_200_200_33__48_2_60_60_32__0
+    :pattern: '%([^_]{0,64})%'
+```

data/docs/dev/line-decor-dynamic.md

@@ -0,0 +1,9 @@
+/ Demonstrate dynamic color names
+/ line_decor_pre is performed before line_decor_main and line_decor_post
+%Species%
+@import bats-document-configuration.md
+```opts :(document_opts)
+line_decor_pre:
+  - :color_method: :ansi_38_2_200_200_33__48_2_60_60_32__0
+    :pattern: '%([^_]{0,64})%'
+```

data/lib/ansi_string.rb

@@ -14,6 +14,15 @@ class AnsiString < String
   def method_missing(method_name, *args, &block)
     if dynamic_color_method?(method_name)
       case method_name.to_s
+      when /^ansi_/
+        segments = $'.split('__')
+        codes = ''
+        segments[0..-2].each do |segment|
+          codes += "\033[#{segment.split('_').join(';')}m"
+        end
+        codes += self.to_s
+        codes += "\033[#{segments.last.split('_').join(';')}m"
+        self.class.new(codes)
       when /^fg_bg_rgb_/
         bytes = $'.split('_')
         fg_bg_rgb_color(bytes[0..2].join(';'), bytes[3..5].join(';'))
@@ -148,6 +157,6 @@ class AnsiString < String
   # @param method_name [Symbol] The name of the method being checked.
   # @return [Boolean] True if the method name matches a dynamic color method.
   def dynamic_color_method?(method_name)
-    method_name.to_s =~ /^(fg_bg_rgb_|fg_bg_rgbh_|fg_rgb_|fg_rgbh_)/
+    method_name.to_s =~ /^(ansi_|fg_bg_rgb_|fg_bg_rgbh_|fg_rgb_|fg_rgbh_)/
   end
 end

data/lib/fcb.rb

@@ -20,11 +20,13 @@ def parse_yaml_of_ux_block(
   OpenStruct.new(
     allowed: export['allowed'],
     default: export['default'],
+    echo: export['echo'],
     exec: export['exec'],
     menu_format: export['menu_format'] || menu_format,
     name: name,
     preconditions: export['preconditions'],
     prompt: export['prompt'] || prompt,
+    readonly: export['readonly'].nil? ? false : export['readonly'],
     transform: export['transform'],
     validate: export['validate'] || validate
   )
@@ -137,6 +139,7 @@ module MarkdownExec
 
           @attrs[:center] = table_center
           oname = @attrs[:oname] = format(export.menu_format, export.to_h)
+          @attrs[:readonly] = export.readonly
         else
           # triggered by an empty block
           raise "Invalid data type: #{data.inspect}"
@@ -149,8 +152,6 @@ module MarkdownExec
       )
     end
 
-    private
-
     # Formats multiline body content as a title string.
     # indents all but first line with two spaces
     # so it displays correctly in menu.
@@ -182,6 +183,17 @@ module MarkdownExec
 
     public
 
+    def name_in_menu!(indented_multi_line)
+      # Indent has been extracted from the first line,
+      # remove indent from the remaining lines.
+      @attrs[:dname] =
+        if @attrs[:indent].empty?
+          indented_multi_line
+        else
+          indented_multi_line.gsub("\n#{@attrs[:indent]}", "\n")
+        end
+    end
+
     def respond_to_missing?(method_name, include_private = false)
       @attrs.key?(method_name.to_sym) || super
     end
@@ -256,8 +268,8 @@ if $PROGRAM_NAME == __FILE__
   end
 
   def sort_hash_recursively(hash)
-    hash.each_with_object({}) do |(k, v), new_hash|
-      new_hash[k] = v.is_a?(Hash) ? sort_hash_recursively(v) : v
+    hash.transform_values do |v|
+      v.is_a?(Hash) ? sort_hash_recursively(v) : v
     end.sort.to_h
   end
 

data/lib/filter.rb

@@ -127,8 +127,9 @@ module MarkdownExec
       filters[:fcb_chrome] = fcb.fetch(:chrome, false)
       filters[:shell_default] = (fcb.type == BlockType::SHELL)
 
-      if options[:block_disable_match].present? &&
-         fcb.start_line =~ Regexp.new(options[:block_disable_match])
+      if fcb.readonly ||
+         (options[:block_disable_match].present? &&
+          fcb.start_line =~ Regexp.new(options[:block_disable_match]))
         fcb.disabled = TtyMenu::DISABLE
       end
       return unless name.present?

data/lib/hash_delegator.rb

@@ -395,10 +395,17 @@ 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, source_id: '', &block)
+  def yield_line_if_selected(line, selected_types, all_fcbs: nil,
+                             source_id: '', &block)
     return unless block && block_type_selected?(selected_types, :line)
 
-    block.call(:line, MarkdownExec::FCB.new(body: [line], id: source_id))
+    block.call(:line, persist_fcb_self(all_fcbs, body: [line], id: source_id))
+  end
+
+  def persist_fcb_self(all_fcbs, options)
+    fcb = MarkdownExec::FCB.new(options)
+    all_fcbs << fcb if all_fcbs
+    fcb
   end
 end
 
@@ -609,6 +616,7 @@ module MarkdownExec
       @dml_link_state = Struct.new(:document_filename, :inherited_lines)
                               .new(@delegate_object[:filename], [])
       @dml_menu_blocks = []
+      @fcb_store = [] # all fcbs created
 
       @p_all_arguments = []
       @p_options_parsed = []
@@ -737,7 +745,7 @@ module MarkdownExec
 
       formatted_name = format(@delegate_object[:menu_link_format],
                               HashDelegator.safeval(option_name))
-      chrome_block = FCB.new(
+      chrome_block = persist_fcb(
         chrome: true,
         dname: HashDelegator.new(@delegate_object).string_send_color(
           formatted_name, :menu_chrome_color
@@ -781,7 +789,7 @@ module MarkdownExec
       chrome_blocks = link_state.inherited_lines_map do |line|
         formatted = format(@delegate_object[:menu_inherited_lines_format],
                            { line: line })
-        FCB.new(
+        persist_fcb(
           chrome: true,
           disabled: TtyMenu::DISABLE,
           dname: HashDelegator.new(@delegate_object).string_send_color(
@@ -840,25 +848,6 @@ module MarkdownExec
       end
     end
 
-    # 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.
@@ -913,30 +902,6 @@ module MarkdownExec
       HashDelegator.error_handler('blocks_from_nested_files')
     end
 
-    # find a block by its original (undecorated) name or nickname (not visible in menu)
-    # if matched, the block returned has properties that it is from cli and not ui
-    def block_state_for_name_from_cli(block_name)
-      SelectedBlockMenuState.new(
-        blocks_find_by_block_name(@dml_blocks_in_file, block_name),
-        OpenStruct.new(
-          block_name_from_cli: true,
-          block_name_from_ui: false
-        ),
-        MenuState::CONTINUE
-      )
-    end
-
-    def blocks_find_by_block_name(blocks, block_name)
-      @dml_blocks_in_file.find do |item|
-        # 2024-08-04 match oname for long block names
-        # 2024-08-04 match nickname for long block names
-        block_name == item.pub_name || block_name == item.nickname || block_name == item.oname
-      end || @dml_menu_blocks.find do |item|
-        # 2024-08-22 search in menu blocks to allow matching of automatic chrome with nickname
-        block_name == item.pub_name || block_name == item.nickname || block_name == item.oname
-      end
-    end
-
     def build_menu_options(exit_option, display_mode_option,
                            menu_entries, display_format)
       [exit_option,
@@ -1061,6 +1026,19 @@ module MarkdownExec
           exportable = true
           if only_default
             value = case export.default
+                    # echo > default
+                    when :echo
+                      raise unless export.echo.present?
+
+                      output = export_echo_with_code(
+                        export, inherited_code, code_lines, required
+                      )
+                      if output == :invalidated
+                        return :ux_exec_prohibited
+                      end
+
+                      transform_export_value(output, export)
+
                     # exec > default
                     when :exec
                       raise unless export.exec.present?
@@ -1073,6 +1051,7 @@ module MarkdownExec
                       end
 
                       transform_export_value(output, export)
+
                     # default
                     else
                       export.default.to_s
@@ -1080,8 +1059,17 @@ module MarkdownExec
           else
             value = nil
 
+            # echo > exec
+            if export.echo
+              value = export_echo_with_code(
+                export, inherited_code, code_lines, required
+              )
+              if value == :invalidated
+                return :ux_exec_prohibited
+              end
+
             # exec > allowed
-            if export.exec
+            elsif export.exec
               value = export_exec_with_code(
                 export, inherited_code, code_lines, required
               )
@@ -1382,7 +1370,7 @@ module MarkdownExec
         next if exclude_types.include?(block.type)
 
         # Scan each block name for matches of the pattern
-        ([block.oname || ''] + block.body).join("\n").scan(pattern) do |(_, _variable_name)|
+        count_named_group_occurrences_block_body_fix_indent(block).scan(pattern) do |(_, _variable_name)|
           pattern.match($LAST_MATCH_INFO.to_s) # Reapply match for named groups
           occurrence_count[$LAST_MATCH_INFO[group_name]] += 1
         end
@@ -1391,6 +1379,11 @@ module MarkdownExec
       occurrence_count
     end
 
+    def count_named_group_occurrences_block_body_fix_indent(block)
+      ### actually double the entries, but not a problem since it's used as a boolean
+      ([block.oname || ''] + block.body).join("\n")
+    end
+
     ##
     # Creates and adds a formatted block to the blocks array
     #  based on the provided match and format options.
@@ -1492,7 +1485,7 @@ module MarkdownExec
           fcb.type = type
           use_fcb = false # next line is new record
         else
-          fcb = FCB.new(
+          fcb = persist_fcb(
             center: center,
             chrome: true,
             collapse: collapse.nil? ? (line_obj[:collapse] == COLLAPSIBLE_TOKEN_COLLAPSE) : collapse,
@@ -1579,7 +1572,7 @@ module MarkdownExec
       oname = format(@delegate_object[:menu_divider_format],
                      HashDelegator.safeval(@delegate_object[divider_key]))
 
-      FCB.new(
+      persist_fcb(
         chrome: true,
         disabled: TtyMenu::DISABLE,
         dname: string_send_color(oname, :menu_divider_color),
@@ -1989,7 +1982,7 @@ module MarkdownExec
     end
 
     def execute_block_in_state(block_name)
-      @dml_block_state = block_state_for_name_from_cli(block_name)
+      @dml_block_state = find_block_state_by_name(block_name)
       dump_and_warn_block_state(name: block_name,
                                 selected: @dml_block_state.block)
       next_block_state =
@@ -2449,6 +2442,23 @@ module MarkdownExec
       end
     end
 
+    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
+
     def expand_variable_references!(
       blocks:,
       echo_format: 'echo $%s',
@@ -2479,6 +2489,18 @@ module MarkdownExec
       expand_blocks_with_replacements(blocks, replacements)
     end
 
+    def export_echo_with_code(export, inherited_code, code_lines, required)
+      value = execute_temporary_script(
+        %Q{eval printf '%s' "#{export.echo}"},
+        (inherited_code || []) +
+         code_lines + required[:code]
+      )
+      if value == :invalidated
+        warn "A value must exist for: #{export.preconditions.join(', ')}"
+      end
+      value
+    end
+
     def export_exec_with_code(export, inherited_code, code_lines, required)
       value = execute_temporary_script(
         export.exec,
@@ -2524,6 +2546,31 @@ module MarkdownExec
       { size: file_size, lines: line_count }
     end
 
+    # Search in @dml_blocks_in_file first,
+    # fallback to @dml_menu_blocks if not found.
+    def find_block_by_name(blocks, block_name)
+      match_block = ->(item) do
+        [item.pub_name, item.nickname,
+         item.oname, item.s2title].include?(block_name)
+      end
+
+      @dml_blocks_in_file.find(&match_block) ||
+       @dml_menu_blocks.find(&match_block)
+    end
+
+    # find a block by its original (undecorated) name or nickname (not visible in menu)
+    # if matched, the block returned has properties that it is from cli and not ui
+    def find_block_state_by_name(block_name)
+      SelectedBlockMenuState.new(
+        find_block_by_name(@dml_blocks_in_file, block_name),
+        OpenStruct.new(
+          block_name_from_cli: true,
+          block_name_from_ui: false
+        ),
+        MenuState::CONTINUE
+      )
+    end
+
     def format_and_execute_command(
       code_lines:,
       erls:,
@@ -2532,6 +2579,7 @@ module MarkdownExec
       formatted_command = code_lines.flatten.join("\n")
       @fout.fout fetch_color(data_sym: :script_execution_head,
                              color_sym: :script_execution_frame_color)
+
       command_execute(
         formatted_command,
         args: @pass_args,
@@ -2641,10 +2689,8 @@ module MarkdownExec
       @process_mutex.synchronize do
         Thread.new do
           stream.each_line do |line|
-            line.strip!
             if @run_state.files.streams
-              @run_state.files.append_stream_line(file_type,
-                                                  line)
+              @run_state.files.append_stream_line(file_type, line)
             end
 
             puts line if @delegate_object[:output_stdout]
@@ -2692,7 +2738,7 @@ module MarkdownExec
          Regexp.new(@delegate_object.fetch(
                       :fenced_start_and_end_regex, '^(?<indent> *)`{3,}'
                     )),
-        fcb: MarkdownExec::FCB.new(id: 'INIT'),
+        fcb: persist_fcb(id: 'INIT'),
         in_fenced_block: false,
         headings: []
       }
@@ -3180,7 +3226,7 @@ module MarkdownExec
       #
       menu_blocks.each do |fcb|
         fcb.body = fcb.raw_body || fcb.body || []
-        fcb.dname = fcb.raw_dname || fcb.dname
+        fcb.name_in_menu!(fcb.raw_dname || fcb.dname)
         fcb.s0printable = fcb.raw_s0printable || fcb.s0printable
         fcb.s1decorated = fcb.raw_s1decorated || fcb.s1decorated
         expand_references!(fcb, link_state)
@@ -3212,7 +3258,7 @@ module MarkdownExec
       #
       return unless block.nil?
 
-      chrome_block = FCB.new(
+      chrome_block = persist_fcb(
         chrome: true,
         disabled: TtyMenu::DISABLE,
         dname: HashDelegator.new(@delegate_object).string_send_color(
@@ -3371,6 +3417,12 @@ module MarkdownExec
         prompt_select_continue == MenuState::EXIT
     end
 
+    def persist_fcb(options)
+      MarkdownExec::FCB.new(options).tap do |fcb|
+        @fcb_store << fcb
+      end
+    end
+
     def pop_add_current_code_to_head_and_trigger_load(
       link_state, block_names, code_lines,
       dependencies, selected, next_block_name: nil
@@ -4195,7 +4247,7 @@ module MarkdownExec
                    TtyMenu::ENABLE
                  end
 
-      MarkdownExec::FCB.new(
+      persist_fcb(
         body: [],
         call: rest.match(
           Regexp.new(@delegate_object[:block_calls_scan])
@@ -4320,7 +4372,9 @@ module MarkdownExec
         # add line if it is depth 0 or option allows it
         #
         HashDelegator.yield_line_if_selected(
-          line, selected_types, source_id: source_id, &block
+          line, selected_types,
+          all_fcbs: @fcb_store,
+          source_id: source_id, &block
         )
       end
     end
@@ -4359,7 +4413,7 @@ module MarkdownExec
     end
 
     def vux_execute_and_prompt(block_name)
-      @dml_block_state = block_state_for_name_from_cli(block_name)
+      @dml_block_state = find_block_state_by_name(block_name)
       if @dml_block_state.block &&
          @dml_block_state.block.type == BlockType::OPTS
         debounce_reset
@@ -4532,7 +4586,8 @@ module MarkdownExec
 
       inherited_block_names = []
       inherited_dependencies = {}
-      selected = FCB.new(oname: 'load_code')
+      selected = persist_fcb(oname: 'load_code')
+
       pop_add_current_code_to_head_and_trigger_load(
         @dml_link_state, inherited_block_names,
         code_lines, inherited_dependencies, selected
@@ -4800,7 +4855,7 @@ module MarkdownExec
     def vux_user_selected_block_name
       if @dml_link_state.block_name.present?
         # @prior_block_was_link = true
-        @dml_block_state.block = blocks_find_by_block_name(
+        @dml_block_state.block = find_block_by_name(
           @dml_blocks_in_file,
           @dml_link_state.block_name
         )
@@ -5724,7 +5779,7 @@ module MarkdownExec
       Thread.new { @hd.handle_stream(stream: stream, file_type: file_type) }
 
       @hd.wait_for_stream_processing
-      assert_equal ['line 1', 'line 2'],
+      assert_equal ["line 1\n", "line 2\n"],
                    @hd.instance_variable_get(:@run_state)
                       .files.stream_lines(ExecutionStreams::STD_OUT)
     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.8.2'
+  VERSION = '2.8.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.8.3
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-19 00:00:00.000000000 Z
+date: 2025-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -110,7 +110,10 @@ files:
 - bats/block-hide.bats
 - bats/block-type-opts.bats
 - bats/block-type-ux-auto.bats
+- bats/block-type-ux-echo.bats
 - bats/block-type-ux-exec.bats
+- bats/block-type-ux-preconditions.bats
+- bats/block-type-ux-readonly.bats
 - bats/block-type-ux-require.bats
 - bats/block-type-ux-row-format.bats
 - bats/block-type-ux-transform.bats
@@ -123,6 +126,8 @@ files:
 - bats/fail.bats
 - bats/history.bats
 - bats/import.bats
+- bats/indented-multi-line-output.bats
+- bats/line-decor-dynamic.bats
 - bats/line-wrapping.bats
 - bats/markup.bats
 - bats/mde.bats
@@ -147,7 +152,10 @@ files:
 - docs/dev/block-type-opts.md
 - docs/dev/block-type-port.md
 - docs/dev/block-type-ux-auto.md
+- docs/dev/block-type-ux-echo.md
 - docs/dev/block-type-ux-exec.md
+- docs/dev/block-type-ux-preconditions.md
+- docs/dev/block-type-ux-readonly.md
 - docs/dev/block-type-ux-require.md
 - docs/dev/block-type-ux-row-format.md
 - docs/dev/block-type-ux-transform.md
@@ -159,6 +167,8 @@ files:
 - docs/dev/document-shell.md
 - docs/dev/import-missing.md
 - docs/dev/import.md
+- docs/dev/indented-multi-line-output.md
+- docs/dev/line-decor-dynamic.md
 - docs/dev/line-wrapping.md
 - docs/dev/linked-file.md
 - docs/dev/load1.sh