markdown_exec 3.2.0 → 3.4.0

data/lib/markdown_exec/version.rb

@@ -8,5 +8,5 @@ module MarkdownExec
   BIN_NAME = 'mde'
   GEM_NAME = 'markdown_exec'
   TAP_DEBUG = 'MDE_DEBUG'
-  VERSION = '3.2.0'
+  VERSION = '3.4.0'
 end

data/lib/markdown_exec.rb

@@ -1045,6 +1045,8 @@ module MarkdownExec
     def simple_commands(options)
       # !!b
       {
+        # [stage, function]
+        blocks: [2, -> { list_blocks }],
         doc_glob: [1, -> { @fout.fout options[:md_filename_glob] }],
         history: [1, -> { history }],
         list_blocks: [2, -> { list_blocks }],

data/lib/mdoc.rb

@@ -119,22 +119,22 @@ module MarkdownExec
         raise "Named code block `#{anyname}` not found. (@#{__LINE__})"
       end
 
-      # nickname = name_block.pub_name
-      ####
-      nickname = name_block.id
+      nickname = name_block.pub_name
+      ref = name_block.id
+      dependencies = collect_dependencies(pubname: ref)
+      wwt :dependencies, 'dependencies.count:', dependencies.count
 
-      dependencies = collect_dependencies(pubname: nickname)
-      # !!t dependencies.count
       all_dependency_names =
-        collect_unique_names(dependencies).push(nickname).uniq
-      # !!t all_dependency_names.count
+        collect_unique_names(dependencies).push(ref).uniq
+      wwt :dependencies, 'all_dependency_names.count:',
+          all_dependency_names.count
 
       # select blocks in order of appearance in source documents
       #
       blocks = table_not_split.select do |fcb|
         fcb.is_dependency_of?(all_dependency_names)
       end
-      # !!t blocks.count
+      wwt :blocks, 'blocks.count:', blocks.count
 
       ## add cann key to blocks, calc unmet_dependencies
       #
@@ -149,12 +149,16 @@ module MarkdownExec
           []
         end + [fcb]
       end.flatten(1)
-      # !!t unmet_dependencies.count
+      wwt :unmet_dependencies, 'unmet_dependencies.count:',
+          unmet_dependencies.count
+      wwt :dependencies, 'dependencies.keys:', dependencies.keys
 
       { all_dependency_names: all_dependency_names,
         blocks: blocks,
         dependencies: dependencies,
         unmet_dependencies: unmet_dependencies }
+    rescue StandardError
+      wwe $!
     end
 
     # Collects recursively required code blocks and returns them as an array of strings.
@@ -166,8 +170,6 @@ module MarkdownExec
       anyname:, block_source:,
       label_body: true, label_format_above: nil, label_format_below: nil
     )
-      ww 'anyname:', anyname
-      ww 'block_source:', block_source
       block_search = collect_block_dependencies(anyname: anyname)
       if block_search[:blocks]
         blocks = collect_wrapped_blocks(block_search[:blocks])

data/lib/menu.src.yml

@@ -115,6 +115,14 @@
   :default: ": ${%{key}:=%{value}}"
   :procname: val_as_str
 
+- :opt_name: blocks
+  :arg_name: MESSAGE
+  :default:
+  :description: List the blocks displayed
+  :env_var: MDE_BLOCKS_LIST_MESSAGE
+  :long_name: blocks
+  :procname: val_as_str
+
 - :opt_name: clear_screen_for_select_block
   :env_var: MDE_CLEAR_SCREEN_FOR_SELECT_BLOCK
   :description: clear_screen_for_select_block
@@ -147,13 +155,6 @@
   :default: true
   :procname: val_as_bool
 
-- :opt_name: tables_into_columns
-  :env_var: MDE_TABLES_INTO_COLUMNS
-  :description: Format tables as columns
-  :arg_name: BOOL
-  :default: true
-  :procname: val_as_bool
-
 - :long_name: debug
   :short_name: d
   :env_var: MDE_DEBUG
@@ -250,16 +251,9 @@
   :default: document_configurations/%{document_filename}_*.sh
   :procname: val_as_str
 
-- :opt_name: menu_for_saved_lines
-  :env_var: MDE_MENU_FOR_SAVED_LINES
-  :description: Add menu options for saved lines
-  :arg_name: BOOL
-  :default: true
-  :procname: val_as_bool
-
-- :opt_name: menu_for_history
-  :env_var: MDE_MENU_FOR_HISTORY
-  :description: Add menu options for history
+- :opt_name: document_save_make_directory
+  :env_var: MDE_DOCUMENT_SAVE_MAKE_DIRECTORY
+  :description: Make the directory if it does not exist when saving
   :arg_name: BOOL
   :default: true
   :procname: val_as_bool
@@ -331,7 +325,7 @@
 - :opt_name: exception_color_detail
   :env_var: MDE_EXCEPTION_COLOR_DETAIL
   :description: Color of exception detail
-  :default: fg_rgbh_ff_00_7f
+  :default: fg_rgbh_ff_99_cc  # Light pink - softer error detail color, less harsh than bright magenta
   :procname: val_as_str
 
 - :opt_name: exception_format_detail
@@ -343,7 +337,7 @@
 - :opt_name: exception_color_name
   :env_var: MDE_EXCEPTION_COLOR_NAME
   :description: Color of exception name
-  :default: fg_rgbh_ff_00_00
+  :default: fg_rgbh_ff_6b_6b  # Light red - matches exec color for serious attention
   :procname: val_as_str
 
 - :opt_name: exception_format_name
@@ -421,7 +415,7 @@
 - :opt_name: execution_report_preview_frame_color
   :env_var: MDE_EXECUTION_REPORT_PREVIEW_FRAME_COLOR
   :description: execution_report_preview_frame_color
-  :default: fg_rgbh_7f_ff_00
+  :default: fg_rgbh_90_e0_90  # Light green - consistent with allow/success colors
   :procname: val_as_str
 
 - :opt_name: execution_report_preview_head
@@ -578,10 +572,46 @@
   :default:
   :procname: val_as_str
 
-- :opt_name: import_pattern
+- :opt_name: import_directive_line_pattern
   :env_var: MDE_IMPORT_PATTERN
   :default: >-
-    ^(?<indention> *)@import +(?<name>\S+)(?<params>(?: +[A-Za-z_]\w*=(?:"[^"]*"|'[^']*'|\S+))*) *$
+    ^(?<indention> *)@import +(?<name>\S+)(?<params>(?: +\w+(?::c=|:e=|:q=|:v=|=)(?:"[^"]*"|'[^']*'|\S+))*) *\\?$
+  :procname: val_as_str
+
+- :opt_name: import_directive_parameter_scan
+  :env_var: MDE_IMPORT_PATTERN_SCAN
+  :default: >-
+    (\w+)(:c=|:e=|:q=|:v=|=)(?:"([^"]*)"|'([^']*)'|(\S+))
+  :procname: val_as_str
+
+- :opt_name: import_parameter_variable_assignment
+  :env_var: MDE_IMPORT_PARAMETER_VARIABLE_ASSIGNMENT
+  :default: "%{key}=%{value}"
+  :procname: val_as_str
+
+- :opt_name: import_symbol_command_substitution
+  :env_var: MDE_IMPORT_SYMBOL_COMMAND_SUBSTITUTION
+  :default: ':c='
+  :procname: val_as_str
+
+- :opt_name: import_symbol_evaluated_expression
+  :env_var: MDE_IMPORT_SYMBOL_EVALUATED_EXPRESSION
+  :default: ':e='
+  :procname: val_as_str
+
+- :opt_name: import_symbol_raw_literal
+  :env_var: MDE_IMPORT_SYMBOL_RAW_LITERAL
+  :default: '='
+  :procname: val_as_str
+
+- :opt_name: import_symbol_force_quoted_literal
+  :env_var: MDE_IMPORT_SYMBOL_FORCE_QUOTED_LITERAL
+  :default: ':q='
+  :procname: val_as_str
+
+- :opt_name: import_symbol_variable_reference
+  :env_var: MDE_IMPORT_SYMBOL_VARIABLE_REFERENCE
+  :default: ':v='
   :procname: val_as_str
 
 - :opt_name: line_decor_main
@@ -691,7 +721,7 @@
 - :opt_name: local_name_pattern
   :env_var: MDE_LOCAL_NAME_PATTERN
   :description: Pattern for variables not exported in a series of evaluations
-  :default: '^.{1,3}$'
+  :default: '^_\S{0,12}$'
   :procname: val_as_str
 
 - :opt_name: logged_stdout_filename_prefix
@@ -727,7 +757,7 @@
 - :opt_name: menu_bash_color
   :env_var: MDE_MENU_BASH_COLOR
   :description: Color of menu bash
-  :default: fg_rgbh_00_c0_c0
+  :default: fg_rgbh_87_ce_eb  # Sky blue - matches echo color for informational bash blocks
   :procname: val_as_str
 
 - :opt_name: menu_blocks_with_docname
@@ -747,7 +777,7 @@
 - :opt_name: menu_chrome_color
   :env_var: MDE_MENU_CHROME_COLOR
   :description: Color of menu chrome
-  :default: fg_rgbh_40_c0_c0
+  :default: fg_rgbh_b0_b0_b0  # Medium gray - neutral, non-distracting UI chrome
   :procname: val_as_str
 
 - :opt_name: menu_chrome_format
@@ -771,7 +801,7 @@
 - :opt_name: menu_divider_color
   :env_var: MDE_MENU_DIVIDER_COLOR
   :description: Color of menu divider
-  :default: fg_rgbh_80_d0_c0
+  :default: fg_rgbh_d0_d0_d0  # Light gray - subtle, neutral separators
   :procname: val_as_str
 
 - :opt_name: menu_divider_format
@@ -789,7 +819,7 @@
 - :opt_name: menu_edit_color
   :env_var: MDE_MENU_EDIT_COLOR
   :description: Color of Edit link
-  :default: fg_rgbh_e0_e0_20
+  :default: fg_rgbh_ff_b3_66  # Light orange - matches edit UX color for consistency
   :procname: val_as_str
 
 - :opt_name: menu_exit_at_top
@@ -805,10 +835,24 @@
   :default:
     :line: "~~~"
 
+- :opt_name: menu_for_history
+  :env_var: MDE_MENU_FOR_HISTORY
+  :description: Add menu options for history
+  :arg_name: BOOL
+  :default: true
+  :procname: val_as_bool
+
+- :opt_name: menu_for_saved_lines
+  :env_var: MDE_MENU_FOR_SAVED_LINES
+  :description: Add menu options for saved lines
+  :arg_name: BOOL
+  :default: true
+  :procname: val_as_bool
+
 - :opt_name: menu_heading1_color
   :env_var: MDE_MENU_HEADING1_COLOR
   :description: Color for heading 1 in menu
-  :default: fg_bg_rgbh_80_80_c0_10_10_20
+  :default: fg_bg_rgbh_70_70_b0_f8_f8_fa  # Medium blue on light background for better readability
   :procname: val_as_str
 
 - :opt_name: menu_heading1_format
@@ -820,7 +864,7 @@
 - :opt_name: menu_heading2_color
   :env_var: MDE_MENU_HEADING2_COLOR
   :description: Color for heading 2 in menu
-  :default: fg_bg_rgbh_60_60_c0_10_10_20
+  :default: fg_bg_rgbh_60_60_a0_f5_f5_f8  # Lighter blue on light background for hierarchy
   :procname: val_as_str
 
 - :opt_name: menu_heading2_format
@@ -832,7 +876,7 @@
 - :opt_name: menu_heading3_color
   :env_var: MDE_MENU_HEADING3_COLOR
   :description: Color for heading 3 in menu
-  :default: fg_bg_rgbh_40_40_c0_10_10_20
+  :default: fg_bg_rgbh_50_50_90_f2_f2_f5  # Lightest blue on light background for sub-hierarchy
   :procname: val_as_str
 
 - :opt_name: menu_heading3_format
@@ -844,7 +888,7 @@
 - :opt_name: menu_history_color
   :env_var: MDE_MENU_HISTORY_COLOR
   :description: Color of History link
-  :default: fg_rgbh_e0_e0_20
+  :default: fg_rgbh_87_ce_eb  # Sky blue - informational like echo, for browsing history
   :procname: val_as_str
 
 - :opt_name: menu_import_level_match
@@ -864,7 +908,7 @@
   :env_var: MDE_MENU_INCLUDE_IMPORTED_NOTES
   :description: Whether imported blocks should be included in the menu
   :arg_name: BOOL
-  :default: false
+  :default: true
   :procname: val_as_bool
 
 - :opt_name: menu_inherited_lines_at_top
@@ -877,7 +921,7 @@
 - :opt_name: menu_inherited_lines_color
   :env_var: MDE_MENU_INHERITED_LINES_COLOR
   :description: Color of inherited lines in menu
-  :default: fg_rgbh_94_00_D3
+  :default: fg_rgbh_b3_9a_d8  # Light purple - softer than bright purple for inherited content
   :procname: val_as_str
 
 - :opt_name: menu_inherited_lines_edit_always
@@ -902,7 +946,7 @@
 - :opt_name: menu_link_color
   :env_var: MDE_MENU_LINK_COLOR
   :description: Color of menu link
-  :default: fg_rgbh_e0_e0_20
+  :default: fg_rgbh_90_e0_90  # Light green - indicates safe/allowed navigation
   :procname: val_as_str
 
 - :opt_name: menu_link_format
@@ -921,7 +965,7 @@
 - :opt_name: menu_load_color
   :env_var: MDE_MENU_LOAD_COLOR
   :description: Color of Load link
-  :default: fg_rgbh_e0_e0_20
+  :default: fg_rgbh_87_ce_eb  # Sky blue - informational action for loading content
   :procname: val_as_str
 
 - :opt_name: menu_note_color
@@ -996,13 +1040,13 @@
 - :opt_name: menu_opts_color
   :env_var: MDE_MENU_OPTS_COLOR
   :description: Color of menu opts
-  :default: fg_rgbh_ff_00_ff
+  :default: fg_rgbh_d8_b3_ff  # Light lavender - matches vars color family for options
   :procname: val_as_str
 
 - :opt_name: menu_opts_set_color
   :env_var: MDE_MENU_OPTS_SET_COLOR
   :description: Color of menu opts
-  :default: fg_rgbh_7f_00_ff
+  :default: fg_rgbh_c0_9a_ff  # Medium lavender - darker than opts color for set values
   :procname: val_as_str
 
 - :opt_name: menu_opts_set_format
@@ -1027,20 +1071,13 @@
 - :opt_name: menu_save_color
   :env_var: MDE_MENU_SAVE_COLOR
   :description: Color of Save link
-  :default: fg_rgbh_ff_ff_20
-  # :default: fg_rgbh_e0_e0_20
-  :procname: val_as_str
-
-- :opt_name: menu_table_rows_match
-  :env_var: MDE_MENU_TABLE_ROWS_MATCH
-  :description: Pattern for table rows
-  :default: '^(?<indent>[ \t]*)(?<line>(?<text>\|.*?)(?<trailing>[ \t]*))$'
+  :default: fg_rgbh_90_e0_90  # Light green - indicates safe/allowed save operation
   :procname: val_as_str
 
 - :opt_name: menu_task_color
   :env_var: MDE_MENU_TASK_COLOR
   :description: Color of menu task
-  :default: fg_rgbh_ff_ff_ff
+  :default: fg_rgbh_40_40_40  # Dark gray - better contrast than white for readability
   :procname: val_as_str
 
 - :opt_name: menu_task_format
@@ -1063,8 +1100,38 @@
 
 - :opt_name: menu_ux_color
   :env_var: MDE_MENU_UX_COLOR
-  :description: Color of menu ux
-  :default: fg_rgbh_df_c0_df
+  :description: Default color of menu ux
+  :default: fg_rgbh_df_c0_df # light purple/lavender
+  :procname: val_as_str
+
+- :opt_name: menu_ux_color_allow
+  :env_var: MDE_MENU_UX_COLOR_ALLOW
+  :description: Color of menu ux when it is allow
+  :default: fg_rgbh_90_e0_90  # Light green - universally indicates safe/permitted actions
+  :procname: val_as_str
+
+- :opt_name: menu_ux_color_echo
+  :env_var: MDE_MENU_UX_COLOR_ECHO
+  :description: Color of menu ux when it is echo
+  :default: fg_rgbh_87_ce_eb  # Sky blue - calm, informational, non-destructive display
+  :procname: val_as_str
+
+- :opt_name: menu_ux_color_edit
+  :env_var: MDE_MENU_UX_COLOR_EDIT
+  :description: Color of menu ux when it is edit
+  :default: fg_rgbh_ff_b3_66  # Light orange - caution color for modification operations
+  :procname: val_as_str
+
+- :opt_name: menu_ux_color_exec
+  :env_var: MDE_MENU_UX_COLOR_EXEC
+  :description: Color of menu ux when it is exec
+  :default: fg_rgbh_ff_6b_6b  # Light red - attention-demanding color for execution commands
+  :procname: val_as_str
+
+- :opt_name: menu_ux_color_readonly
+  :env_var: MDE_MENU_UX_COLOR_READONLY
+  :description: Color of menu ux when it is read-only
+  :default: fg_rgbh_c0_c0_c0  # Light gray - standard disabled/inactive UI element color
   :procname: val_as_str
 
 - :opt_name: menu_ux_row_format
@@ -1076,13 +1143,13 @@
 - :opt_name: menu_vars_color
   :env_var: MDE_MENU_VARS_COLOR
   :description: Color of menu vars
-  :default: fg_rgbh_ff_a0_ff
+  :default: fg_rgbh_d8_b3_ff  # Light lavender - complements default purple, softer than bright magenta
   :procname: val_as_str
 
 - :opt_name: menu_vars_set_color
   :env_var: MDE_MENU_VARS_SET_COLOR
   :description: Color of menu vars
-  :default: fg_rgbh_00_ff_ff
+  :default: fg_rgbh_a0_e6_e6  # Light teal - calmer than bright cyan, distinct from sky blue
   :procname: val_as_str
 
 - :opt_name: menu_vars_set_format
@@ -1189,13 +1256,13 @@
 - :opt_name: output_execution_label_name_color
   :env_var: MDE_OUTPUT_EXECUTION_LABEL_NAME_COLOR
   :description: Color of output_execution_label_name
-  :default: fg_rgbh_00_ff_00
+  :default: fg_rgbh_70_c0_70  # Medium green - softer than bright green for labels
   :procname: val_as_str
 
 - :opt_name: output_execution_label_value_color
   :env_var: MDE_OUTPUT_EXECUTION_LABEL_VALUE_COLOR
   :description: Color of output_execution_label_value
-  :default: fg_rgbh_00_ff_00
+  :default: fg_rgbh_90_e0_90  # Light green - consistent with success/allow colors
   :procname: val_as_str
 
 - :opt_name: output_execution_report
@@ -1281,7 +1348,7 @@
 - :opt_name: prompt_color_after_script_execution
   :env_var: MDE_PROMPT_COLOR_AFTER_SCRIPT_EXECUTION
   :description: Color of prompt after script execution
-  :default: fg_rgbh_00_ff_00
+  :default: fg_rgbh_70_c0_70  # Medium green - indicates successful completion
   :procname: val_as_str
 
 - :opt_name: prompt_debounce
@@ -1368,12 +1435,6 @@
   :default: "\nChoose a file:"
   :procname: val_as_str
 
-- :opt_name: prompt_select_output
-  :env_var: MDE_PROMPT_SELECT_OUTPUT
-  :default: "\nChoose a file:"
-  :description: Prompt to select a saved file
-  :procname: val_as_str
-
 - :opt_name: prompt_ux_enter_a_value
   :env_var: MDE_PROMPT_UX_ENTER_A_VALUE
   :description: Prompt to enter a value for UX blocks
@@ -1434,6 +1495,12 @@
   :long_name: pwd
   :description: Print the gem's home directory
 
+- :opt_name: required_lines_with_source_comments
+  :env_var: MDE_REQUIRED_LINES_WITH_SOURCE_COMMENTS
+  :description: Add comments about source to blocks of required lines
+  :default: false
+  :procname: val_as_bool
+
 - :opt_name: run_last_script
   :long_name: run-last-script
   :description: Run most recently saved script
@@ -1537,10 +1604,16 @@
   :default: 0
   :procname: val_as_int
 
+- :opt_name: script_comment_block_name_format
+  :env_var: MDE_SCRIPT_COMMENT_BLOCK_NAME_FORMAT
+  :description: format for block name in script comments
+  :default: "%{block} %{time}"
+  :procname: val_as_str
+
 - :opt_name: script_execution_frame_color
   :env_var: MDE_SCRIPT_EXECUTION_FRAME_COLOR
   :description: script_execution_frame_color
-  :default: fg_rgbh_00_ff_7f
+  :default: fg_rgbh_80_d0_a0  # Sage green - calmer frame color for execution context
   :procname: val_as_str
 
 - :opt_name: script_execution_head
@@ -1559,7 +1632,7 @@
 - :opt_name: script_preview_frame_color
   :env_var: MDE_OUTPUT_DIVIDER_COLOR
   :description: Color of output divider
-  :default: fg_rgbh_7f_ff_00
+  :default: fg_rgbh_a0_d0_80  # Light sage - preview frame for non-executed content
   :procname: val_as_str
 
 - :opt_name: script_preview_head
@@ -1687,11 +1760,42 @@
   - fg_bg_rgbh_cf_cf_cf_14_18_1c
   - fg_bg_rgbh_df_df_df_24_24_24
 
+- :opt_name: table_row_multi_line_delimiter
+  :env_var: MDE_TABLE_ROW_MULTI_LINE_DELIMITER
+  :description: Multi-line-table delimiter
+  :default: '|'
+  :procname: val_as_str
+
+- :opt_name: table_row_multi_line_match
+  :env_var: MDE_TABLE_ROW_MULTI_LINE_MATCH
+  :description: Pattern for multi-line-table rows
+  :default: '^(?<indent>[ \t]*)(?<line>(?<text>\|.*?)(?<trailing>[ \t]*))$'
+  :procname: val_as_str
+
+- :opt_name: table_row_single_line_delimiter
+  :env_var: MDE_TABLE_ROW_SINGLE_LINE_DELIMITER
+  :description: Single-line-table delimiter
+  :default: '!'
+  :procname: val_as_str
+
+- :opt_name: table_row_single_line_match
+  :env_var: MDE_TABLE_ROW_SINGLE_LINE_MATCH
+  :description: Pattern for single-line-table rows
+  :default: '^(?<indent>[ \t]*)(?<line>(?<text>!.*?)(?<trailing>[ \t]*))$'
+  :procname: val_as_str
+
 - :opt_name: table_separator_line_color
   :env_var: MDE_TABLE_SEPARATOR_LINE_COLOR
   :description: Color for table separator line
   :default: fg_bg_rgbh_df_df_00_14_18_1c
 
+- :opt_name: tables_into_columns
+  :env_var: MDE_TABLES_INTO_COLUMNS
+  :description: Format tables as columns
+  :arg_name: BOOL
+  :default: true
+  :procname: val_as_bool
+
 - :opt_name: user_must_approve
   :long_name: user-must-approve
   :short_name: q
@@ -1741,7 +1845,7 @@
 - :opt_name: warning_color
   :env_var: MDE_WARNING_COLOR
   :description: Color of warning message
-  :default: fg_rgbh_ff_7f_00
+  :default: fg_rgbh_ff_b3_66  # Light orange - matches edit/caution color for warnings
   :procname: val_as_str
 
 - :opt_name: warning_format