markdown_exec 2.8.4 → 2.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ace0bdaa8d2925a4274a4cfc039fdde5e9aaaf8bfbd761f21e0679417f71062
-  data.tar.gz: 0a9f38be8b322be828fe28cd19441da7a9bb032dd739aaa73ba0526456251503
+  metadata.gz: 718a29bb9eed1123158ffab68a01866fcdbc0126736c5305eae92dd661fb7396
+  data.tar.gz: 05e374bda6ac5603b13d50a33ef36cffd25d8fccdf43733107d63d19395ee9a5
 SHA512:
-  metadata.gz: b0c0c4eea966bad0e29e0957e68049cfee1c61bd730fab880f63ea1501cba153dd1592ef415142a91a9aecd09802cf0bb48eac36607964b97ce372c9b249536f
-  data.tar.gz: d254a22305dd0d57f2048271d40f15d22b6f2473971cc3c398a6479d439fe80255f0dabb7cb94f9df8c21bc6214b2f60b5238c102e3048cbdbd3dd3dd18b693a
+  metadata.gz: 18629932f2c6b095329f56ec594eb1016df88b17278ef544f6954f793f054e55c137b8240692392ebba9165c15e0f58b6c1e3883447fa740c90fa1fccb20f351
+  data.tar.gz: bc1e0a9ea38227dc83136f2884934ed6dfed93a4c1e73c4c1faa8a6188b2bc7a197062d356f2e3ff5665629e04de46d40904191de9d23af9b6ba31c9f26953d5

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [2.8.5] - 2025-04-07
+
+### Added
+
+- Opts blocks can require other Opts blocks.
+- Options to enable the change of shell expansion patterns.
+- Default ID to each FCB.
+- Convert the value of the 'echo' key to a string.
+- All UX blocks are now loaded automatically.
+
+### Changed
+
+- Make 'default' key optional for UX blocks.
+- Use the 'default' option to specify the initial computed value.
+
 ## [2.8.4] - 2025-03-24
 
 ### Added

data/Gemfile.lock

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

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

@@ -0,0 +1,8 @@
+#!/usr/bin/env bats
+
+load 'test_helper'
+
+@test 'Initial values' {
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/block-type-ux-default.md \
+   'v1 = _v2 = 11_v3 = 12_v4 = 21_v5 = markdown_exec__v6 = 31'
+}

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

@@ -18,6 +18,7 @@ name: GENUS
 allowed:
 - Hominidae
 - Antennariidae
+default: ''
 name: FAMILY
 ```
 / automatic block loads default value that is not in allowed list
@@ -40,6 +41,7 @@ name: CLASS
 / executed block presents a menu of the lines in the output of exec
 ```ux :[YEAR_DISCOVERED]
 allowed: :exec
+default: ''
 exec: echo "2017\n2009"
 name: YEAR_DISCOVERED
 ```

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

@@ -6,7 +6,8 @@ name: v1
 / name and default
 / transform and validate options not applied to default
 ```ux
-default: 11
+default: ''
+echo: 11
 name: v2
 ```
 / name and default; auto-load

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

@@ -0,0 +1,42 @@
+/ v2025-02-08
+/ name only
+```ux
+name: v1
+```
+/ name and default
+/ transform and validate options not applied to default
+```ux
+default: 11
+name: v2
+```
+/ name and default; auto-load
+/ prompt option is ignored during auto-load
+```ux :[document_ux_v3]
+echo: 12
+name: v3
+```
+/ name, default, exec; auto-load static
+```ux :[document_ux_v4]
+default: 21
+exec: basename $(pwd)
+name: v4
+```
+/ name, default, exec; auto-load executed `basename $(pwd)`
+/ allowed is ignored by exec
+```ux :[document_ux_v5]
+exec: basename $(pwd)
+name: v5
+```
+/ name, default, allowed; auto-load static default
+```ux :[document_ux_v6]
+allowed:
+- 31
+- 32
+- 33
+name: v6
+```
+@import bats-document-configuration.md
+```opts :(document_opts)
+menu_ux_row_format: '%{name} = ${%{name}}'
+ux_auto_load_force_default: true
+```

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

@@ -10,16 +10,19 @@ readonly: true
 ```
 / This block displays the second variable in the first block.
 ```ux :[DOCUMENTS]
+default: false
 name: DOCUMENTS
 readonly: true
 ```
 / This block displays the third variable in the first block.
 ```ux :[OPERATION]
+default: false
 name: OPERATION
 readonly: true
 ```
 / Multiple UX blocks to set many variables for a specific name.
 ```ux
+default: false
 echo:
   Species: Pongo tapanuliensis
   Genus: Pongo
@@ -34,6 +37,7 @@ menu_format: 'Load %{name}'
 name: Tapanuli Orangutan
 ```
 ```ux
+default: false
 echo:
   Species: Histiophryne psychedelica
   Genus: Histiophryne
@@ -52,6 +56,7 @@ name: Psychedelic Frogfish
 | -| -
 / A read-only variable in a UX block in a table
 ```ux
+default: false
 menu_format: '| %{name}| ${%{name}}'
 name: Species
 readonly: true
@@ -60,6 +65,7 @@ readonly: true
 | Genus| ${Genus}
 / An editable variable in a UX block in a table
 ```ux
+default: false
 menu_format: '| %{name}| ${%{name}}'
 name: Family
 ```

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

@@ -1,6 +1,5 @@
 / This automatic block sets VAR and displays the current value in the menu.
 ```ux :[document_ux_VAR]
-default: :echo
 echo: $(basename `pwd`)
 name: VAR
 ```
@@ -10,11 +9,14 @@ 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)
+default: false
 echo: $(basename `pwd` | wc -c)
+force: false
 name: VAR
 ```
 / This block is visible. Execute to set a new value, displayed by the block above.
 ```ux :[IAB_has_count]
+default: false
 echo: $VAR$VAR
 name: IAB
 ```

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

@@ -1,6 +1,7 @@
 / auto-load block, does not execute command to calculate
 / click block to calculate
 ```ux :[document_ux0]
+default: ''
 exec: basename $(pwd)
 name: ux0
 ```

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

@@ -1,32 +1,23 @@
-/ an automatic UX block requires a shell block and another UX block
+/ This is an hidden shell block that is required by UX blocks.
 ``` :(shell)
 ENTITY='Pongo tapanuliensis,Pongo'
 ```
-```ux :[document_ux_SPECIES] +(shell) +[ux_GENUS]
-default: :exec
-exec: echo "${ENTITY%%,*}"
+```ux +(shell)
+echo: "${ENTITY%%,*}"
 name: SPECIES
-transform: :chomp
 ```
-/ required ux block requires another
-```ux :[ux_GENUS] +[ux_NAME]
-default: :exec
-exec: echo "${ENTITY##*,}"
+```ux +(shell)
+echo: "${ENTITY##*,}"
 name: GENUS
-transform: :chomp
 ```
 / executed in context of prior ux blocks, uses their initial values
-```ux :[ux_NAME]
-default: :exec
-exec: echo "$SPECIES - $GENUS"
+```ux
+echo: "$SPECIES - $GENUS"
 name: NAME
-transform: :chomp
 ```
 / executed after other ux blocks, uses their initial values
-```ux :[document_ux_NAME2]
-default: :exec
-exec: echo "$NAME"
+```ux
+echo: "$NAME"
 name: NAME2
-transform: :chomp
 ```
 @import bats-document-configuration.md

data/lib/fcb.rb

@@ -48,6 +48,7 @@ module MarkdownExec
         call: nil,
         dname: nil,
         headings: [],
+        id: object_id,
         indent: '',
         name: nil,
         nickname: nil,
@@ -62,6 +63,15 @@ module MarkdownExec
       }.merge(options)
     end
 
+    def pub_name(**kwargs)
+      self.class.pub_name(@attrs, **kwargs)
+    end
+
+    def self.pub_name(attrs, **kwargs)
+      full = attrs.fetch(:nickname, nil) || attrs.fetch(:oname, nil)
+      full&.to_s&.pub_name(**kwargs)
+    end
+
     def code_name_included?(*names)
       names.include?(@attrs[:oname])
     end
@@ -331,13 +341,15 @@ if $PROGRAM_NAME == __FILE__
     end
 
     def test_to_h_method
-      assert_equal_hash @fcb_data.merge({ random: @fcb.random }), @fcb.to_h
+      assert_equal_hash @fcb_data.merge(
+        { id: @fcb.id, random: @fcb.random }
+      ), @fcb.to_h
     end
 
     def test_to_yaml_method
-      assert_equal_hash YAML.load(@fcb_data.merge({ random: @fcb.random })
-                                           .to_yaml),
-                        YAML.load(@fcb.to_yaml)
+      assert_equal_hash YAML.load(@fcb_data.merge(
+        { id: @fcb.id, random: @fcb.random }
+      ).to_yaml), YAML.load(@fcb.to_yaml)
     end
 
     def test_method_missing_getter

data/lib/hash_delegator.rb

@@ -1002,6 +1002,37 @@ module MarkdownExec
       output.split("\n")
     end
 
+    def code_from_automatic_ux_blocks(
+      all_blocks,
+      mdoc
+    )
+      unless @ux_most_recent_filename != @delegate_object[:filename]
+        return
+      end
+
+      blocks = select_automatic_ux_blocks(all_blocks)
+      if blocks.empty?
+        blocks = select_automatic_ux_blocks(all_blocks)
+      end
+      return if blocks.empty?
+
+      @ux_most_recent_filename = @delegate_object[:filename]
+
+      (blocks.each.with_object([]) do |block, merged_options|
+        code = code_from_ux_block_to_set_environment_variables(
+          block,
+          mdoc,
+          force: @delegate_object[:ux_auto_load_force_default],
+          only_default: true
+        )
+        if code == :ux_exec_prohibited
+          merged_options
+        else
+          merged_options.push(code)
+        end
+      end).to_a
+    end
+
     # parse YAML body defining the UX for a single variable
     # set ENV value for the variable and return code lines for the same
     def code_from_ux_block_to_set_environment_variables(
@@ -1300,7 +1331,7 @@ module MarkdownExec
     )
       # Initialize a counter for named group occurrences
       occurrence_count = Hash.new(0)
-      return occurrence_count if pattern == //
+      return occurrence_count if pattern.nil? || pattern == //
 
       blocks.each do |block|
         # Skip processing for shell-type blocks
@@ -1318,7 +1349,7 @@ module MarkdownExec
 
     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")
+      ([block.oname || ''] + (block.body || [''])).join("\n")
     end
 
     ##
@@ -1366,9 +1397,9 @@ module MarkdownExec
       # split text with newlines, from variable expansion
       if line_cap[:text].include?("\n")
         lines = line_cap[:text].split("\n")
-        line_caps = (lines.map do |line|
-                          line_cap.dup.merge(text: line)
-                        end.to_a)
+        line_caps = lines.map do |line|
+          line_cap.dup.merge(text: line)
+        end.to_a
       end
 
       # wrap text on multiple lines to screen width, replacing line_caps
@@ -1376,7 +1407,7 @@ module MarkdownExec
         line_caps = line_caps.flat_map do |line_cap|
           text = line_cap[:text]
           wrapper = StringWrapper.new(width: screen_width_for_wrapping - line_cap[:indent].length)
-        
+
           if text.length > screen_width_for_wrapping
             # Wrap this text and create line_cap objects for each part
             wrapper.wrap(text).map do |wrapped_text|
@@ -1486,7 +1517,9 @@ module MarkdownExec
           yield if block_given?
 
           # parse multiline to capture output of variable expansion
-          mbody = fcb.body[0].match Regexp.new(@delegate_object[criteria[:match]], Regexp::MULTILINE)
+          mbody = fcb.body[0].match Regexp.new(
+            @delegate_object[criteria[:match]], Regexp::MULTILINE
+          )
         end
 
         create_and_add_chrome_block(
@@ -2406,14 +2439,16 @@ module MarkdownExec
       expand_variable_references!(
         blocks: [fcb],
         initial_code_required: false,
-        link_state: link_state
+        key_format: @delegate_object[:variable_expression_format],
+        link_state: link_state,
+        pattern: options_variable_expression_regexp
       )
       expand_variable_references!(
         blocks: [fcb],
         echo_format: '%s',
         group_name: :command,
         initial_code_required: false,
-        key_format: '$(%s)',
+        key_format: @delegate_object[:command_substitution_format],
         link_state: link_state,
         pattern: options_command_substitution_regexp
       )
@@ -2424,13 +2459,10 @@ module MarkdownExec
       echo_format: 'echo "$%s"',
       group_name: :variable,
       initial_code_required: false,
-      key_format: '${%s}',
+      key_format:,
       link_state:,
-      pattern: nil
+      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? || variable_counts == {}
@@ -2467,8 +2499,8 @@ module MarkdownExec
                               force:)
       exportable = true
       case export.echo
-      when String
-        value = export_echo_with_code_single(export.echo, inherited_code,
+      when String, Integer, Float, TrueClass, FalseClass
+        value = export_echo_with_code_single(export.echo.to_s, inherited_code,
                                              code_lines, required)
       when Hash
         # each item in the hash is a variable name and value
@@ -2952,69 +2984,45 @@ module MarkdownExec
       @fout.fout_list(list)
     end
 
-    # Loads auto blocks based on delegate object settings and updates
-    #  if new filename is detected.
-    # 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.
+    # Loads and updates auto options for document blocks if the current filename has changed.
+    #
+    # This method checks if the delegate object specifies a document load options block name and if the filename
+    # has been updated. It then selects the appropriate blocks, collects their dependencies, processes their
+    # options, and updates the menu base with the merged options.
+    #
+    # @param all_blocks [Array] An array of all block elements.
+    # @param mdoc [Object] The document object managing dependencies and options.
+    # @return [Boolean, nil] Returns true if options were updated; nil otherwise.
     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]
-        return
-      end
+      opts_block_name = @delegate_object[:document_load_opts_block_name]
+      current_filename = @delegate_object[:filename]
 
-      blocks = HashDelegator.block_select(all_blocks, :oname, block_name)
-      return if blocks.empty?
+      return unless opts_block_name.present? &&
+                    @opts_most_recent_filename != current_filename
+
+      selected_blocks = HashDelegator.block_select(all_blocks, :oname,
+                                                   opts_block_name)
+      return if selected_blocks.empty?
+
+      dependency_map = {}
+      selected_blocks.each do |block|
+        mdoc.collect_dependencies(memo: dependency_map, block: block)
+      end
 
-      update_menu_base(
-        blocks.each.with_object({}) do |block, merged_options|
+      collected_options =
+        dependency_map.each.with_object({}) do |(block_id, _), merged_options|
+          matching_block = HashDelegator.block_find(all_blocks, :id, block_id)
           options_state = read_show_options_and_trigger_reuse(
-            mdoc: mdoc,
-            selected: block
+            mdoc: mdoc, selected: matching_block
           )
           merged_options.merge!(options_state.options)
         end
-      )
 
-      @opts_most_recent_filename = @delegate_object[:filename]
+      update_menu_base(collected_options)
+      @opts_most_recent_filename = current_filename
       true
     end
 
-    def load_auto_ux_block(
-      all_blocks,
-      mdoc,
-      block_name: @delegate_object[:document_load_ux_block_name]
-    )
-      unless block_name.present? &&
-             @ux_most_recent_filename != @delegate_object[:filename]
-        return
-      end
-
-      blocks = HashDelegator.block_select(all_blocks, :oname, block_name)
-      if blocks.empty?
-        blocks = HashDelegator.block_match(all_blocks, :nickname,
-                                           Regexp.new(block_name))
-      end
-      return if blocks.empty?
-
-      @ux_most_recent_filename = @delegate_object[:filename]
-
-      (blocks.each.with_object([]) do |block, merged_options|
-        code = code_from_ux_block_to_set_environment_variables(
-          block,
-          mdoc,
-          force: @delegate_object[:ux_auto_load_force_default],
-          only_default: true
-        )
-        if code == :ux_exec_prohibited
-          merged_options
-        else
-          merged_options.push(code)
-        end
-      end).to_a
-    end
-
     def load_auto_vars_block(
       all_blocks,
       block_name: @delegate_object[:document_load_vars_block_name]
@@ -3175,7 +3183,7 @@ module MarkdownExec
 
       # load document ux block
       #
-      if (code_lines = load_auto_ux_block(all_blocks, mdoc))
+      if (code_lines = code_from_automatic_ux_blocks(all_blocks, mdoc))
         new_code = HashDelegator.code_merge(link_state.inherited_lines,
                                             code_lines)
         next_state_set_code(nil, link_state, new_code)
@@ -3491,6 +3499,11 @@ module MarkdownExec
       fout_execution_report if @delegate_object[:output_execution_report]
     end
 
+    # all UX blocks are automatic for the document
+    def select_automatic_ux_blocks(blocks)
+      blocks.select { |item| item.type == 'ux' }
+    end
+
     # Filter blocks per block_name_include_match, block_name_wrapper_match.
     #
     # @param all_blocks [Array<Hash>] The list of blocks from the file.
@@ -4481,56 +4494,75 @@ module MarkdownExec
     def ux_block_export_automatic(export, inherited_code, code_lines, required)
       transformable = true
       exportable = true
-      [case export.default
-       when :allowed
-         raise unless export.allowed.present?
 
-         if export.allowed == :echo
-           output, exportable = export_echo_with_code(
-             export, inherited_code, code_lines, required, force: false
-           )
-           return :ux_exec_prohibited if output == :invalidated
+      if export.default == false
+        exportable = false
+        transformable = false
+        value = nil
+      else
+        if export.default.nil?
+          if export.echo.present?
+            export.default = :echo
+          elsif export.exec.present?
+            export.default = :exec
+          elsif export.allowed.present?
+            export.default = export.allowed.first
+          end
+        end
 
-           exportable && output.split("\n").first
+        value = case export.default
+                when :allowed
+                  raise unless export.allowed.present?
 
-         elsif export.allowed == :exec
-           output = process_allowed_exec(export, inherited_code,
-                                         code_lines, required)
-           return :ux_exec_prohibited if output == :ux_exec_prohibited
+                  if export.allowed == :echo
+                    output, exportable = export_echo_with_code(
+                      export, inherited_code, code_lines, required, force: false
+                    )
+                    return :ux_exec_prohibited if output == :invalidated
 
-           output.first
+                    exportable && output.split("\n").first
 
-         else
-           export.allowed.first
-         end
+                  elsif export.allowed == :exec
+                    output = process_allowed_exec(export, inherited_code,
+                                                  code_lines, required)
+                    return :ux_exec_prohibited if output == :ux_exec_prohibited
 
-       # echo > default
-       when :echo
-         raise unless export.echo.present?
+                    output.first
 
-         output, exportable = export_echo_with_code(
-           export, inherited_code, code_lines, required, force: false
-         )
-         return :ux_exec_prohibited if output == :invalidated
+                  else
+                    export.allowed.first
+                  end
 
-         output
+                # echo > default
+                when :echo
+                  raise unless export.echo.present?
 
-       # exec > default
-       when :exec
-         raise unless export.exec.present?
+                  output, exportable = export_echo_with_code(
+                    export, inherited_code, code_lines, required, force: false
+                  )
+                  return :ux_exec_prohibited if output == :invalidated
 
-         output = export_exec_with_code(
-           export, inherited_code, code_lines, required
-         )
-         return :ux_exec_prohibited if output == :invalidated
+                  output
 
-         output
+                # exec > default
+                when :exec
+                  raise unless export.exec.present?
 
-       # default
-       else
-         transformable = false
-         export.default.to_s
-       end,
+                  output = export_exec_with_code(
+                    export, inherited_code, code_lines, required
+                  )
+                  return :ux_exec_prohibited if output == :invalidated
+
+                  output
+
+                # default
+                else
+                  transformable = false
+                  export.default.to_s
+                end
+      end
+
+      [value,
        exportable,
        transformable]
     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.4'
+  VERSION = '2.8.5'
 end

data/lib/mdoc.rb

@@ -83,7 +83,7 @@ module MarkdownExec
 
       nickname = name_block.pub_name
 
-      dependencies = collect_dependencies(nickname)
+      dependencies = collect_dependencies(source: nickname)
       # !!t dependencies.count
       all_dependency_names =
         collect_unique_names(dependencies).push(nickname).uniq
@@ -405,21 +405,23 @@ module MarkdownExec
     # @param source [String] The name of the initial source block.
     # @param memo [Hash] A memoization hash to store resolved dependencies.
     # @return [Hash] A hash mapping sources to their respective dependencies.
-    def collect_dependencies(source, memo = {})
-      return memo unless source
+    def collect_dependencies(block: nil, memo: {}, source: nil)
+      if block.nil?
+        return memo unless source
 
-      block = get_block_by_anyname(source)
-      if block.nil? || block.instance_of?(Hash)
-        raise "Named code block `#{source}` not found. (@#{__LINE__})"
+        block = get_block_by_anyname(source)
+        if block.nil? || block.instance_of?(Hash)
+          raise "Named code block `#{source}` not found. (@#{__LINE__})"
+        end
       end
-
       return memo unless block.reqs
 
-      memo[source] = block.reqs
+      memo[block.id] = block.reqs
 
       block.reqs.each do |req|
-        collect_dependencies(req, memo) unless memo.key?(req)
+        collect_dependencies(source: req, memo: memo) unless memo.key?(req)
       end
+
       memo
     end
 
@@ -463,24 +465,24 @@ if $PROGRAM_NAME == __FILE__
       end
 
       def test_collect_dependencies_with_no_source
-        assert_empty @mdoc.collect_dependencies(nil)
+        assert_empty @mdoc.collect_dependencies
       end
 
       ### must raise error
       def test_collect_dependencies_with_nonexistent_source
         assert_raises(RuntimeError) do
-          @mdoc.collect_dependencies('nonexistent')
+          @mdoc.collect_dependencies(source: 'nonexistent')
         end
       end if false
 
       def test_collect_dependencies_with_valid_source
         @mdoc.stubs(:get_block_by_anyname)
-             .with('source1').returns(OpenStruct.new(reqs: ['source2']))
+             .with('source1').returns(OpenStruct.new(id: 'source1', reqs: ['source2']))
         @mdoc.stubs(:get_block_by_anyname)
-             .with('source2').returns(OpenStruct.new(reqs: []))
+             .with('source2').returns(OpenStruct.new(id: 'source2', reqs: []))
 
         expected = { 'source1' => ['source2'], 'source2' => [] }
-        assert_equal expected, @mdoc.collect_dependencies('source1')
+        assert_equal expected, @mdoc.collect_dependencies(source: 'source1')
       end
     end
 

data/lib/menu.src.yml

@@ -103,6 +103,12 @@
   :default: true
   :procname: val_as_bool
 
+- :opt_name: command_substitution_format
+  :env_var: MDE_COMMAND_SUBSTITUTION_FORMAT
+  :description: command_substitution_format
+  :default: '$(%s)'
+  :procname: val_as_str
+
 - :opt_name: command_substitution_regexp
   :env_var: MDE_COMMAND_SUBSTITUTION_REGEXP
   :description: command_substitution_regexp
@@ -207,12 +213,6 @@
   :default: "(document_shell)"
   :procname: val_as_str
 
-- :opt_name: document_load_ux_block_name
-  :env_var: MDE_DOCUMENT_LOAD_UX_BLOCK_NAME
-  :description: Name of UX block to load with the document
-  :default: "\\[.*document_ux.*\\]"
-  :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
@@ -1663,6 +1663,12 @@
   :default: true
   :procname: val_as_bool
 
+- :opt_name: variable_expression_format
+  :env_var: MDE_VARIABLE_EXPRESSION_FORMAT
+  :description: variable_expression_format
+  :default: '${%s}'
+  :procname: val_as_str
+
 - :opt_name: variable_expression_regexp
   :env_var: MDE_VARIABLE_EXPRESSION_REGEXP
   :description: variable_expression_regexp

data/lib/menu.yml

@@ -84,6 +84,11 @@
   :arg_name: BOOL
   :default: true
   :procname: val_as_bool
+- :opt_name: command_substitution_format
+  :env_var: MDE_COMMAND_SUBSTITUTION_FORMAT
+  :description: command_substitution_format
+  :default: "$(%s)"
+  :procname: val_as_str
 - :opt_name: command_substitution_regexp
   :env_var: MDE_COMMAND_SUBSTITUTION_REGEXP
   :description: command_substitution_regexp
@@ -172,11 +177,6 @@
   :description: Name of shell block to load with the document
   :default: "(document_shell)"
   :procname: val_as_str
-- :opt_name: document_load_ux_block_name
-  :env_var: MDE_DOCUMENT_LOAD_UX_BLOCK_NAME
-  :description: Name of UX block to load with the document
-  :default: "\\[.*document_ux.*\\]"
-  :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
@@ -1419,6 +1419,11 @@
   :arg_name: BOOL
   :default: true
   :procname: val_as_bool
+- :opt_name: variable_expression_format
+  :env_var: MDE_VARIABLE_EXPRESSION_FORMAT
+  :description: variable_expression_format
+  :default: "${%s}"
+  :procname: val_as_str
 - :opt_name: variable_expression_regexp
   :env_var: MDE_VARIABLE_EXPRESSION_REGEXP
   :description: variable_expression_regexp

data/lib/namer.rb

@@ -9,9 +9,7 @@ class Hash
   # block name in commands and documents
   def pub_name(**kwargs)
     full = fetch(:nickname, nil) || fetch(:oname, nil)
-    full&.to_s&.pub_name(**kwargs).tap do |ret|
-      pp [__LINE__, 'Hash.pub_name() ->', ret] if $pd
-    end
+    full&.to_s&.pub_name(**kwargs)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_exec
 version: !ruby/object:Gem::Version
-  version: 2.8.4
+  version: 2.8.5
 platform: ruby
 authors:
 - Fareed Stevenson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-24 00:00:00.000000000 Z
+date: 2025-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -115,6 +115,7 @@ files:
 - bats/block-type-ux-allowed.bats
 - bats/block-type-ux-auto.bats
 - bats/block-type-ux-chained.bats
+- bats/block-type-ux-default.bats
 - bats/block-type-ux-echo-hash.bats
 - bats/block-type-ux-echo.bats
 - bats/block-type-ux-exec.bats
@@ -163,6 +164,7 @@ files:
 - docs/dev/block-type-ux-allowed.md
 - docs/dev/block-type-ux-auto.md
 - docs/dev/block-type-ux-chained.md
+- docs/dev/block-type-ux-default.md
 - docs/dev/block-type-ux-echo-hash.md
 - docs/dev/block-type-ux-echo.md
 - docs/dev/block-type-ux-exec.md