markdown_exec 1.8.9 → 2.0.1

data/lib/input_sequencer.rb

@@ -0,0 +1,229 @@
+#!/usr/bin/env bundle exec ruby
+# frozen_string_literal: true
+
+# encoding=utf-8
+
+# require_relative 'dev/instance_method_wrapper' # for ImwUx
+require_relative 'env'
+require_relative 'link_history'
+
+# InputSequencer manages the sequence of menu interactions and block executions based on user input.
+class InputSequencer
+  # extend ImwUx # This makes imw_indent available as a class method
+  # include ImwUx # This makes imw_indent available as a class method
+
+  # self.prepend InstanceMethodWrapper # traps initialize as well
+  attr_reader :document_filename, :current_block, :block_queue
+
+  def initialize(document_filename, initial_blocks = nil)
+    @document_filename = document_filename
+    @current_block = nil
+    @block_queue = initial_blocks
+    @debug = Env::env_bool('INPUT_SEQUENCER_DEBUG', default: false) ### false e
+  end
+
+  # Merges the current menu state with the next, prioritizing the next state's values.
+  def self.merge_link_state(current, next_state)
+    MarkdownExec::LinkState.new(
+      block_name: next_state.block_name,
+      display_menu: next_state.display_menu.nil? ? current.display_menu : next_state.display_menu,
+      document_filename: next_state.document_filename || current.document_filename,
+      inherited_block_names: next_state.inherited_block_names,
+      inherited_dependencies: next_state.inherited_dependencies,
+      inherited_lines: next_state.inherited_lines,
+      prior_block_was_link: next_state.prior_block_was_link.nil? ? current.prior_block_was_link : next_state.prior_block_was_link
+    )
+  rescue
+    binding.irb
+  end
+
+  # Generates the next menu state based on provided attributes.
+
+  def self.next_link_state(block_name: nil, display_menu: nil, document_filename: nil, prior_block_was_link: false)
+    MarkdownExec::LinkState.new(
+      block_name: block_name,
+      display_menu: display_menu,
+      document_filename: document_filename,
+      prior_block_was_link: prior_block_was_link
+    )
+  end
+
+  # Orchestrates the flow of menu states and user interactions.
+  def run_yield(sym, *args, &block)
+    block.call sym, *args
+  end
+
+  def bq_is_empty?
+    !@block_queue || @block_queue.empty?
+  end
+
+  # Orchestrates the flow of menu states and user interactions.
+  def run(&block)
+    now_menu = InputSequencer.next_link_state(
+      display_menu: bq_is_empty?,
+      document_filename: @document_filename,
+      prior_block_was_link: false # true bypass_exit when last block was a link (from cli)
+    )
+    exit_when_bq_empty = !bq_is_empty? # true when running blocks from cli; unless "stay" is used
+    loop do
+      break if run_yield(:parse_document, now_menu.document_filename, &block) == :break
+
+      pp [__LINE__, 'exit_when_bq_empty', exit_when_bq_empty, '@block_queue', @block_queue, 'now_menu', now_menu] if @debug
+      # self.imw_ins now_menu, 'now_menu'
+
+      break if exit_when_bq_empty && bq_is_empty? && !now_menu.prior_block_was_link
+
+      if now_menu.display_menu
+        exit_when_bq_empty = false
+
+        run_yield :display_menu, &block
+
+        choice = run_yield :user_choice, &block
+
+        break if run_yield(:exit?, choice&.downcase, &block) # Exit loop and method to terminate the app
+
+        next_state = run_yield :execute_block, choice, &block
+        # imw_ins next_state, 'next_state'
+        pp [__LINE__, 'next_state', next_state] if @debug
+        return :break if next_state == :break
+
+        next_menu = next_state
+
+      else
+        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
+
+          block_name = @block_queue.shift
+        end
+        # self.imw_ins block_name, 'block_name'
+        pp [__LINE__, 'block_name', block_name] if @debug
+
+        next_menu = if block_name == '.'
+                      exit_when_bq_empty = false
+                      InputSequencer.next_link_state(display_menu: true)
+                    else
+                      state = run_yield :execute_block, block_name, &block
+                      state.display_menu = bq_is_empty?
+                      state
+                    end
+        pp [__LINE__, 'next_menu', next_menu] if @debug
+        next_menu
+        # imw_ins next_menu, 'next_menu'
+      end
+      now_menu = InputSequencer.merge_link_state(now_menu, next_menu)
+    end
+  rescue
+    binding.irb
+  end
+end
+
+return if __FILE__ != $PROGRAM_NAME
+
+$doc1 = {
+  'b1' => 'Content of bash1',
+  'b2' => 'Content of bash2',
+  'b3' => 'Content of bash3',
+  'l1' => { 'block_name' => 'b1', 'document_filename' => 'd1' },
+  'l2' => { 'block_name' => 'b2', 'document_filename' => 'd2' },
+  'l3' => { 'block_name' => 'b3' }
+}.freeze
+$stay = '.' # keep menu open (from command line)
+$texit = 'x'
+
+class MDE
+  # extend ImwUx # This makes imw_indent available as a class method
+  # include ImwUx # This makes imw_indent available as a class method
+
+  def initialize(document_filename, initial_blocks = [])
+    @inpseq = InputSequencer.new(document_filename, initial_blocks)
+  end
+
+  def do_run
+    @inpseq.run do |msg, data|
+      case msg
+      when :parse_document # once for each menu
+        # self.imw_ins data, '@ - parse document'
+        parse_document(data)
+      when :display_menu
+        puts "? - Select a block to execute (or type #{$texit} to exit):"
+        puts "doc: #{@document_filename}"
+        display_menu
+      when :user_choice
+        $stdin.gets.chomp
+      when :execute_block
+        # self.imw_ins data, "! - Executing block"
+        execute_block(data)
+      when :exit?
+        data == $texit
+      when :stay?
+        data == $stay
+      else
+        raise "Invalid message: #{msg}"
+      end
+    end
+  end
+
+  private
+
+  def display_menu
+    @blocks.each_key { |block| puts block }
+    puts $texit
+  end
+
+  def execute_block(block_name)
+    content = @blocks[block_name]
+    if content
+      puts content
+      if block_name.start_with?('l')
+        interpret_link_block(content)
+      else
+        InputSequencer.next_link_state
+      end
+    else
+      puts "! - Block not found: #{block_name}"
+      InputSequencer.next_link_state
+    end
+  end
+
+  def interpret_link_block(content)
+    # Stub: Interpret a "Link" block, extracting directives for the next action
+    # In a real implementation, this would parse the content for next block or document
+    puts "! - Interpreting Link block: #{content}"
+    InputSequencer.next_link_state(
+      block_name: content.fetch('block_name', nil),
+      document_filename: content.fetch('document_filename', nil),
+      prior_block_was_link: true
+    )
+  end
+
+  def load_document(_name)
+    # Stub: Load and return the content of the document
+    # In a real implementation, this would read the file and return its content
+    # "Block 1: Content of block 1\nBlock 2: Content of block 2\nLink: block_name 3, document_filename doc2"
+    $doc1.map { |key, value| "#{key}: #{value}" }.join("\n")
+  end
+
+  def parse_document(data)
+    load_document(data)
+    # Stub: Parse document content into blocks
+    # In a real implementation, this would split the document into named blocks
+    @blocks = $doc1
+  end
+end
+# MDE.singleton_class.prepend(ImwUx)
+# MDE.prepend(ImwUx)
+
+def main
+  if ARGV.empty?
+    puts "Usage: #{__FILE__} document_filename [block_name...]"
+    exit(1)
+  end
+  document_filename = ARGV.shift
+  initial_blocks = ARGV
+  mde = MDE.new(document_filename, initial_blocks)
+  mde.do_run
+end
+
+main

data/lib/link_history.rb

@@ -4,8 +4,9 @@
 # encoding=utf-8
 module MarkdownExec
   class LinkState
-    attr_accessor :block_name, :document_filename,
-                  :inherited_block_names, :inherited_dependencies, :inherited_lines
+    attr_accessor :block_name, :display_menu, :document_filename,
+                  :inherited_block_names, :inherited_dependencies, :inherited_lines,
+                  :prior_block_was_link
 
     # Initialize the LinkState with keyword arguments for each attribute.
     # @param block_name [String, nil] the name of the block.
@@ -13,13 +14,16 @@ module MarkdownExec
     # @param inherited_block_names [Array<String>, nil] the names of the inherited blocks.
     # @param inherited_dependencies [?, nil] the dependecy hierarcy.
     # @param inherited_lines [Array<String>, nil] the inherited lines of code.
-    def initialize(block_name: nil, document_filename: nil,
-                   inherited_block_names: [], inherited_dependencies: nil, inherited_lines: nil)
+    def initialize(block_name: nil, display_menu: nil, document_filename: nil,
+                   inherited_block_names: [], inherited_dependencies: nil, inherited_lines: nil,
+                   prior_block_was_link: nil)
       @block_name = block_name
+      @display_menu = display_menu
       @document_filename = document_filename
       @inherited_block_names = inherited_block_names
       @inherited_dependencies = inherited_dependencies
       @inherited_lines = inherited_lines
+      @prior_block_was_link = prior_block_was_link
     end
 
     # Creates an empty LinkState instance.
@@ -34,10 +38,12 @@ module MarkdownExec
     def ==(other)
       other.class == self.class &&
         other.block_name == block_name &&
+        other.display_menu == display_menu &&
         other.document_filename == document_filename &&
         other.inherited_block_names == inherited_block_names &&
         other.inherited_dependencies == inherited_dependencies &&
-        other.inherited_lines == inherited_lines
+        other.inherited_lines == inherited_lines &&
+        other.prior_block_was_link == prior_block_was_link
     end
   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 = '1.8.9'
+  VERSION = '2.0.1'
 end

data/lib/markdown_exec.rb

@@ -10,6 +10,7 @@ require 'open3'
 require 'optparse'
 require 'shellwords'
 require 'tmpdir'
+# require 'tty-file'
 require 'tty-prompt'
 require 'yaml'
 
@@ -25,6 +26,7 @@ require_relative 'fcb'
 require_relative 'filter'
 require_relative 'fout'
 require_relative 'hash_delegator'
+require_relative 'input_sequencer'
 require_relative 'markdown_exec/version'
 require_relative 'mdoc'
 require_relative 'option_value'
@@ -103,7 +105,6 @@ module MarkdownExec
 
   ##
   #
-  # rubocop:disable Layout/LineLength
   # :reek:DuplicateMethodCall { allow_calls: ['block', 'item', 'lm', 'opts', 'option', '@options', 'required_blocks'] }
   # rubocop:enable Layout/LineLength
   # :reek:MissingSafeMethod { exclude: [ read_configuration_file! ] }
@@ -293,15 +294,12 @@ module MarkdownExec
 
       ## position 1: block name (optional)
       #
-      block_name = rest.shift
-      @options[:block_name] = block_name if block_name.present?
+      @options[:block_name] = nil
       @options[:input_cli_rest] = @rest
     rescue FileMissingError
       warn_format('finalize_cli_argument_processing',
                   "File missing -- #{$!}", { abort: true })
-      # @options[:block_name] = ''
-      # @options[:filename] = ''
-      # exit 1
+      exit 1
     rescue StandardError
       error_handler('finalize_cli_argument_processing')
     end

data/lib/mdoc.rb

@@ -70,10 +70,10 @@ module MarkdownExec
     # @param name [String] The name of the code block to start the retrieval from.
     # @return [Array<Hash>] An array of code blocks required by the specified code block.
     #
-    def collect_block_dependencies(name)
-      name_block = get_block_by_anyname(name)
+    def collect_block_dependencies(anyname:)
+      name_block = get_block_by_anyname(anyname)
       if name_block.nil? || name_block.keys.empty?
-        raise "Named code block `#{name}` not found. (@#{__LINE__})"
+        raise "Named code block `#{anyname}` not found. (@#{__LINE__})"
       end
 
       nickname = name_block[:nickname] || name_block[:oname]
@@ -116,9 +116,9 @@ module MarkdownExec
     # @param name [String] The name of the code block to start the collection from.
     # @return [Array<String>] An array of strings containing the collected code blocks.
     #
-    def collect_recursively_required_code(name, block_source:, label_body: true, label_format_above: nil,
+    def collect_recursively_required_code(anyname:, block_source:, label_body: true, label_format_above: nil,
                                           label_format_below: nil)
-      block_search = collect_block_dependencies(name)
+      block_search = collect_block_dependencies(anyname: anyname)
       if block_search[:blocks]
         blocks = collect_wrapped_blocks(block_search[:blocks])
         # &bc 'blocks.count:',blocks.count
@@ -453,12 +453,12 @@ if $PROGRAM_NAME == __FILE__
 
       ### broken test
       def test_collect_block_dependencies
-        result = @doc.collect_block_dependencies('block3')[:blocks]
+        result = @doc.collect_block_dependencies(anyname: 'block3')[:blocks]
         expected_result = [@table[0], @table[1], @table[2]]
         assert_equal expected_result, result
 
         assert_raises(RuntimeError) do
-          @doc.collect_block_dependencies('missing_block')
+          @doc.collect_block_dependencies(anyname: 'missing_block')
         end
       end
 

data/lib/menu.src.yml

@@ -121,6 +121,22 @@
   :opt_name: dump_blocks_in_file
   :procname: val_as_bool
 
+- :arg_name: BOOL
+  :default: false
+  :description: Dump inherited block_names
+  :env_var: MDE_DUMP_INHERITED_BLOCK_NAMES
+  :long_name: dump-dump-inherited-block_names
+  :opt_name: dump_inherited_block_names
+  :procname: val_as_bool
+
+- :arg_name: BOOL
+  :default: false
+  :description: Dump inherited dependencies
+  :env_var: MDE_DUMP_INHERITED_DEPENDENCIES
+  :long_name: dump-dump-inherited-dependencies
+  :opt_name: dump_inherited_dependencies
+  :procname: val_as_bool
+
 - :arg_name: BOOL
   :default: false
   :description: Dump inherited lines
@@ -203,7 +219,7 @@
             end tell
 
             set winHeight to (screenHeight * 2 / 3)
-            set winWidth to (screenWidth / 2)
+            set winWidth to (screenWidth * 2 / 3)
             set xoff to menubarHeight * %{batch_index}
             set yoff to xoff mod (screenHeight - winHeight)
             
@@ -211,11 +227,11 @@
             tell the first window
                 set bounds to {xoff, yoff, xoff + winWidth, yoff + winHeight}
                 tell the current session
-                    write text "# %{script_filespec}"
-                    write text "# %{output_filespec}"
-                    write text "echo -ne \"\\033]; %{started_at} - %{document_filename} - %{block_name} \\007\""
+                    write text "s=\"%{script_filespec}\""
+                    write text "o=\"%{output_filespec}\""
                     write text "cd \"%{home}\""
-                    write text "\"%{script_filename}\" | tee \"%{output_filespec}\""
+                    write text "echo -ne \"\\033]; %{started_at} - %{document_filename} - %{block_name} \\007\""
+                    write text "\"$s\" | tee -a \"$o\""
                 end tell
             end tell
         end tell'
@@ -591,9 +607,8 @@
   :opt_name: menu_note_format
   :procname: val_as_str
 
-## all non-blank lines are notes
-#
-- :default: "^(?<line>.*?) *$"
+## all lines that do not start with "/ " are notes
+- :default: "^(?<line>(?!/ ).*)?$"
   :description: Pattern for notes in block selection menu
   :env_var: MDE_MENU_NOTE_MATCH
   :opt_name: menu_note_match
@@ -712,21 +727,25 @@
   :env_var: MDE_OUTPUT_ASSIGNMENT_BEGIN
   :opt_name: output_assignment_begin
   :procname: val_as_str
+
 - :default:
   :description: Expression to match to stop collecting lines
   :env_var: MDE_OUTPUT_ASSIGNMENT_END
-  :opt_name: output_assignment_begin
+  :opt_name: output_assignment_end
   :procname: val_as_str
-- :default: "%{line} # !!!"
+
+- :default: "%{line}"
   :description: Format for assignments from output
   :env_var: MDE_OUTPUT_ASSIGNMENT_FORMAT
   :opt_name: output_assignment_format
   :procname: val_as_str
+
 - :default: "^ *(?<line>\\w+=.*?) *$"
   :description: Pattern for assignments from output
   :env_var: MDE_OUTPUT_ASSIGNMENT_MATCH
   :opt_name: output_assignment_match
   :procname: val_as_str
+
 - :arg_name: BOOL
   :default: false
   :description: Display summary for execution
@@ -821,12 +840,24 @@
   :opt_name: prompt_debounce
   :procname: val_as_str
 
+- :default: 'Name? '
+  :description: Prompt to enter a filespec
+  :env_var: MDE_PROMPT_ENTER_FILESPEC
+  :opt_name: prompt_enter_filespec
+  :procname: val_as_str
+
 - :default: Exit
   :description: Prompt to exit app
   :env_var: MDE_PROMPT_EXIT
   :opt_name: prompt_exit
   :procname: val_as_str
 
+- :default: Other
+  :description: Prompt for a custom file name
+  :env_var: MDE_PROMPT_FILESPEC_OTHER
+  :opt_name: prompt_filespec_other
+  :procname: val_as_str
+
 - :default: 'No'
   :description: Prompt for no
   :env_var: MDE_PROMPT_NO
@@ -851,6 +882,12 @@
   :opt_name: prompt_select_block
   :procname: val_as_str
 
+- :default: "\nChoose a file:"
+  :description: Prompt to select a file with inherited lines
+  :env_var: MDE_PROMPT_SELECT_CODE_FILE
+  :opt_name: prompt_select_code_file
+  :procname: val_as_str
+
 - :default: "\nChoose a file:"
   :description: Prompt to select a markdown document
   :env_var: MDE_PROMPT_SELECT_MD
@@ -863,6 +900,12 @@
   :opt_name: prompt_select_output
   :procname: val_as_str
 
+- :default: 'Expr: %{expr}'
+  :description: prompt_show_expr_format
+  :env_var: MDE_PROMPT_SHOW_EXPR_FORMAT
+  :opt_name: prompt_show_expr_format
+  :procname: val_as_str
+
 - :default: Uninterrupted
   :description: Uninterrupted execution
   :env_var: MDE_PROMPT_UNINTERRUPTED
@@ -1047,12 +1090,18 @@
   :opt_name: shell_code_label_format_above
   :procname: val_as_str
 
-- :default: "#  -v-  +%{block_name}  -o-  %{document_filename}  -v-"
+- :default: "#  -v-  +%{block_name}  -o-  %{document_filename}  -o-  %{time_now_date}  -v-"
   :description: shell_code_label_format_below
   :env_var: MDE_SHELL_CODE_LABEL_FORMAT_BELOW
   :opt_name: shell_code_label_format_below
   :procname: val_as_str
 
+- :default: "%FT%TZ"
+  :description: Format for time in code lael
+  :env_var: MDE_SHELL_CODE_LABEL_TIME_FORMAT
+  :opt_name: shell_code_label_time_format
+  :procname: val_as_str
+
 - :description: List tab completions
   :long_name: tab-completions
   :opt_name: tab_completions

data/lib/menu.yml

@@ -1,4 +1,4 @@
-# MDE - Markdown Executor (1.8.9)
+# MDE - Markdown Executor (2.0.1)
 ---
 - :description: Show current configuration values
   :procname: show_config
@@ -102,6 +102,20 @@
   :long_name: dump-blocks-in-file
   :opt_name: dump_blocks_in_file
   :procname: val_as_bool
+- :arg_name: BOOL
+  :default: false
+  :description: Dump inherited block_names
+  :env_var: MDE_DUMP_INHERITED_BLOCK_NAMES
+  :long_name: dump-dump-inherited-block_names
+  :opt_name: dump_inherited_block_names
+  :procname: val_as_bool
+- :arg_name: BOOL
+  :default: false
+  :description: Dump inherited dependencies
+  :env_var: MDE_DUMP_INHERITED_DEPENDENCIES
+  :long_name: dump-dump-inherited-dependencies
+  :opt_name: dump_inherited_dependencies
+  :procname: val_as_bool
 - :arg_name: BOOL
   :default: false
   :description: Dump inherited lines
@@ -169,16 +183,15 @@
     tell\n            tell application process \"Finder\"\n                set {missing
     value, menubarHeight} to the size of menu bar 1\n            end tell\n        end
     tell\n\n        set winHeight to (screenHeight * 2 / 3)\n        set winWidth
-    to (screenWidth / 2)\n        set xoff to menubarHeight * %{batch_index}\n        set
-    yoff to xoff mod (screenHeight - winHeight)\n        \n        create window with
-    default profile\n        tell the first window\n            set bounds to {xoff,
-    yoff, xoff + winWidth, yoff + winHeight}\n            tell the current session\n
-    \               write text \"# %{script_filespec}\"\n                write text
-    \"# %{output_filespec}\"\n                write text \"echo -ne \\\"\\\\033];
-    %{started_at} - %{document_filename} - %{block_name} \\\\007\\\"\"\n                write
-    text \"cd \\\"%{home}\\\"\"\n                write text \"\\\"%{script_filename}\\\"
-    | tee \\\"%{output_filespec}\\\"\"\n            end tell\n        end tell\n    end
-    tell'\n"
+    to (screenWidth * 2 / 3)\n        set xoff to menubarHeight * %{batch_index}\n
+    \       set yoff to xoff mod (screenHeight - winHeight)\n        \n        create
+    window with default profile\n        tell the first window\n            set bounds
+    to {xoff, yoff, xoff + winWidth, yoff + winHeight}\n            tell the current
+    session\n                write text \"s=\\\"%{script_filespec}\\\"\"\n                write
+    text \"o=\\\"%{output_filespec}\\\"\"\n                write text \"cd \\\"%{home}\\\"\"\n
+    \               write text \"echo -ne \\\"\\\\033]; %{started_at} - %{document_filename}
+    - %{block_name} \\\\007\\\"\"\n                write text \"\\\"$s\\\" | tee -a
+    \\\"$o\\\"\"\n            end tell\n        end tell\n    end tell'\n"
   :description: execute_command_format
   :env_var: MDE_EXECUTE_COMMAND_FORMAT
   :opt_name: execute_command_format
@@ -491,7 +504,7 @@
   :env_var: MDE_MENU_NOTE_FORMAT
   :opt_name: menu_note_format
   :procname: val_as_str
-- :default: "^(?<line>.*?) *$"
+- :default: "^(?<line>(?!/ ).*)?$"
   :description: Pattern for notes in block selection menu
   :env_var: MDE_MENU_NOTE_MATCH
   :opt_name: menu_note_match
@@ -595,9 +608,9 @@
 - :default:
   :description: Expression to match to stop collecting lines
   :env_var: MDE_OUTPUT_ASSIGNMENT_END
-  :opt_name: output_assignment_begin
+  :opt_name: output_assignment_end
   :procname: val_as_str
-- :default: "%{line} # !!!"
+- :default: "%{line}"
   :description: Format for assignments from output
   :env_var: MDE_OUTPUT_ASSIGNMENT_FORMAT
   :opt_name: output_assignment_format
@@ -693,11 +706,21 @@
   :env_var: MDE_PROMPT_DEBOUNCE
   :opt_name: prompt_debounce
   :procname: val_as_str
+- :default: 'Name? '
+  :description: Prompt to enter a filespec
+  :env_var: MDE_PROMPT_ENTER_FILESPEC
+  :opt_name: prompt_enter_filespec
+  :procname: val_as_str
 - :default: Exit
   :description: Prompt to exit app
   :env_var: MDE_PROMPT_EXIT
   :opt_name: prompt_exit
   :procname: val_as_str
+- :default: Other
+  :description: Prompt for a custom file name
+  :env_var: MDE_PROMPT_FILESPEC_OTHER
+  :opt_name: prompt_filespec_other
+  :procname: val_as_str
 - :default: 'No'
   :description: Prompt for no
   :env_var: MDE_PROMPT_NO
@@ -722,6 +745,13 @@
   :procname: val_as_str
 - :default: |2-
 
+    Choose a file:
+  :description: Prompt to select a file with inherited lines
+  :env_var: MDE_PROMPT_SELECT_CODE_FILE
+  :opt_name: prompt_select_code_file
+  :procname: val_as_str
+- :default: |2-
+
     Choose a file:
   :description: Prompt to select a markdown document
   :env_var: MDE_PROMPT_SELECT_MD
@@ -734,6 +764,11 @@
   :env_var: MDE_PROMPT_SELECT_OUTPUT
   :opt_name: prompt_select_output
   :procname: val_as_str
+- :default: 'Expr: %{expr}'
+  :description: prompt_show_expr_format
+  :env_var: MDE_PROMPT_SHOW_EXPR_FORMAT
+  :opt_name: prompt_show_expr_format
+  :procname: val_as_str
 - :default: Uninterrupted
   :description: Uninterrupted execution
   :env_var: MDE_PROMPT_UNINTERRUPTED
@@ -894,11 +929,17 @@
   :env_var: MDE_SHELL_CODE_LABEL_FORMAT_ABOVE
   :opt_name: shell_code_label_format_above
   :procname: val_as_str
-- :default: "#  -v-  +%{block_name}  -o-  %{document_filename}  -v-"
+- :default: "#  -v-  +%{block_name}  -o-  %{document_filename}  -o-  %{time_now_date}
+    \ -v-"
   :description: shell_code_label_format_below
   :env_var: MDE_SHELL_CODE_LABEL_FORMAT_BELOW
   :opt_name: shell_code_label_format_below
   :procname: val_as_str
+- :default: "%FT%TZ"
+  :description: Format for time in code lael
+  :env_var: MDE_SHELL_CODE_LABEL_TIME_FORMAT
+  :opt_name: shell_code_label_time_format
+  :procname: val_as_str
 - :description: List tab completions
   :long_name: tab-completions
   :opt_name: tab_completions