coradoc 2.0.5 → 2.0.6

data/coradoc-html/lib/coradoc/html/theme/modern/javascript_generator.rb

@@ -6,6 +6,8 @@ module Coradoc
       class ModernRenderer
         # Generate Vue.js application code
         module JavascriptGenerator
+          autoload :VueTemplates, "#{__dir__}/vue_template_generator"
+
           class << self
             # Generate Vue application
             #
@@ -17,7 +19,6 @@ module Coradoc
               templates = load_templates
 
               # Get enhanced document template
-              require_relative 'components/ui_components'
               document_template = UIComponents.enhanced_document_template(config)
 
               <<~JS
@@ -293,7 +294,6 @@ module Coradoc
             #
             # @return [Hash] Hash of templates
             def load_templates
-              require_relative 'vue_template_generator'
               {
                 paragraph: VueTemplates.template_for('paragraph'),
                 admonition: VueTemplates.template_for('admonition'),

data/coradoc-html/lib/coradoc/html/theme/modern/serializers/document_serializer.rb

@@ -128,17 +128,13 @@ module Coradoc
               # @param block [Coradoc::CoreModel::Block] Block to serialize
               # @return [Hash] Serialized block
               def serialize_core_model_block(block)
-                block_type = case block.element_type
-                             when 'paragraph' then 'paragraph'
-                             when 'block'
-                               case block.delimiter_type
-                               when '----' then 'source'
-                               when '____' then 'quote'
-                               when '====' then 'example'
-                               else 'block'
-                               end
-                             else
-                               'block'
+                semantic = block.block_semantic_type&.to_sym
+                block_type = case semantic
+                             when :paragraph then 'paragraph'
+                             when :source_code then 'source'
+                             when :quote, :verse then 'quote'
+                             when :example then 'example'
+                             else 'block'
                              end
 
                 {

data/coradoc-html/lib/coradoc/html/theme/modern_renderer.rb

@@ -13,6 +13,12 @@ module Coradoc
       # @example Generate modern HTML output
       #   html = Coradoc::Output::Html.convert_to_html5(document, theme: :modern)
       class ModernRenderer < Base
+        autoload :Serializers, "#{__dir__}/modern/serializers/document_serializer"
+        autoload :JavascriptGenerator, "#{__dir__}/modern/javascript_generator"
+        autoload :TailwindConfigBuilder, "#{__dir__}/modern/tailwind_config_builder"
+        autoload :CSSGenerator, "#{__dir__}/modern/css_generator"
+        autoload :UIComponents, "#{__dir__}/modern/components/ui_components"
+
         # Register this theme
         Registry.register(:modern, self)
 
@@ -111,7 +117,6 @@ module Coradoc
         #
         # @return [Hash] Serialized document data
         def serialize_document
-          require_relative 'modern/serializers/document_serializer'
           Serializers::DocumentSerializer.serialize(@document)
         end
 
@@ -121,7 +126,6 @@ module Coradoc
         # @param config [Hash] Theme configuration
         # @return [String] Vue application JavaScript
         def generate_vue_app(document_data, config)
-          require_relative 'modern/javascript_generator'
           JavascriptGenerator.generate(document_data, config)
         end
 
@@ -130,7 +134,6 @@ module Coradoc
         # @param config [Hash] Theme configuration
         # @return [String] Tailwind configuration script
         def generate_tailwind_config(config)
-          require_relative 'modern/tailwind_config_builder'
           TailwindConfigBuilder.build(config)
         end
 
@@ -139,10 +142,6 @@ module Coradoc
         # @param config [Hash] Theme configuration
         # @return [String] Custom CSS
         def generate_custom_css(config)
-          require_relative 'modern/css_generator'
-          require_relative 'modern/components/ui_components'
-
-          # Use enhanced CSS from UIComponents module
           UIComponents.enhanced_css(config)
         end
 

data/coradoc-html/lib/coradoc/html.rb

@@ -7,21 +7,6 @@ require 'coradoc/html/output'
 
 module Coradoc
   module Html
-    # Register HTML format with coradoc when loaded
-    def self.register_with_coradoc
-      return if @registered
-
-      # Register with the main coradoc registry
-      Coradoc.register_format(:html, self,
-                              aliases: %w[html htm],
-                              extensions: %w[.html .htm])
-
-      @registered = true
-    end
-
-    # Call registration when this module is included/required
-    register_with_coradoc
-
     module Converters
       # Autoload HTML converters - they will be loaded when accessed
       autoload :Base, 'coradoc/html/converters/base'
@@ -263,3 +248,8 @@ module Coradoc
     end
   end
 end
+
+# Register after all module methods are defined
+Coradoc.register_format(:html, Coradoc::Html,
+                        aliases: %w[html htm],
+                        extensions: %w[.html .htm])

data/coradoc-html/spec/input/converters/converters_spec.rb

@@ -123,7 +123,7 @@ RSpec.describe Coradoc::Input::Html::Converters do
         result = converter.to_coradoc(node, {})
 
         expect(result).to be_a(Coradoc::CoreModel::Block)
-        expect(result.delimiter_type).to eq('paragraph')
+        expect(result.block_semantic_type).to eq('paragraph')
       end
 
       it 'preserves id attribute' do

data/coradoc-markdown/lib/coradoc/markdown/model/attribute_list.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-require_relative '../parser_util'
-
 module Coradoc
   module Markdown
     # Represents an Inline Attribute List (IAL) or Attribute List Definition (ALD)

data/coradoc-markdown/lib/coradoc/markdown/model/definition_list.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'definition_term'
-require_relative 'definition_item'
-
 module Coradoc
   module Markdown
     # DefinitionList model representing a Kramdown definition list.

data/coradoc-markdown/lib/coradoc/markdown/model/extension.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module Coradoc
   module Markdown
     # Represents a kramdown extension

data/coradoc-markdown/lib/coradoc/markdown/model/highlight.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base'
 
 module Coradoc
   module Markdown

data/coradoc-markdown/lib/coradoc/markdown/model/math.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base'
 
 module Coradoc
   module Markdown

data/coradoc-markdown/lib/coradoc/markdown/model/strikethrough.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'base'
 
 module Coradoc
   module Markdown

data/coradoc-markdown/lib/coradoc/markdown/parser/ast_processor.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative 'inline_parser'
-
 module Coradoc
   module Markdown
     module Parser
+      autoload :InlineParser, "#{__dir__}/inline_parser"
+
       # Post-processes the AST produced by BlockParser.
       #
       # This processor handles:

data/coradoc-markdown/lib/coradoc/markdown/parser/block_parser.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative 'parslet_extras'
-
 module Coradoc
   module Markdown
     module Parser
+      autoload :ParsletExtras, "#{__dir__}/parslet_extras"
+
       class BlockParser < Parslet::Parser
         using ParsletExtras
 

data/coradoc-markdown/lib/coradoc/markdown/parser/inline_parser.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative 'parslet_extras'
-require_relative 'html_entities'
-
 module Coradoc
   module Markdown
     module Parser
+      autoload :ParsletExtras, "#{__dir__}/parslet_extras"
+      autoload :HtmlEntities, "#{__dir__}/html_entities"
+
       class InlineParser < Parslet::Parser
         using ParsletExtras
 

data/coradoc-markdown/lib/coradoc/markdown/parser.rb

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
-require_relative 'block_parser'
-require_relative 'inline_parser'
-require_relative 'ast_processor'
+module Coradoc
+  module Markdown
+    module Parser
+      autoload :BlockParser, "#{__dir__}/block_parser"
+      autoload :InlineParser, "#{__dir__}/inline_parser"
+      autoload :AstProcessor, "#{__dir__}/ast_processor"
+    end
+  end
+end

data/coradoc-markdown/lib/coradoc/markdown/toc_generator.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
-require_relative 'model/base'
-require_relative 'model/heading'
-require_relative 'model/document'
-
 module Coradoc
   module Markdown
+    module Model
+      autoload :Base, "#{__dir__}/model/base"
+      autoload :Heading, "#{__dir__}/model/heading"
+      autoload :Document, "#{__dir__}/model/document"
+    end
+
     # Table of Contents Generator
     #
     # Generates a table of contents from document headings.

data/coradoc-markdown/lib/coradoc/markdown/transform/from_core_model.rb

@@ -127,22 +127,43 @@ module Coradoc
           end
 
           def transform_delimited_block(block)
-            delimiter = block.delimiter_type
+            semantic = resolve_markdown_semantic(block)
 
-            case delimiter
-            when '```', '~'
+            case semantic
+            when :source_code, :listing
               transform_code_block(block)
-            when '>'
+            when :quote, :verse
               transform_blockquote(block)
-            when '---', '***', '___'
+            when :horizontal_rule
               transform_horizontal_rule(block)
-            when '++++'
+            when :pass
               Coradoc::Markdown::Extension.nomarkdown(block.content.to_s)
+            when :literal
+              transform_code_block(block)
             else
               transform_paragraph(block)
             end
           end
 
+          def resolve_markdown_semantic(block)
+            # Polymorphic dispatch: typed classes override semantic_type
+            semantic = block.resolve_semantic_type
+            return semantic if semantic
+
+            # Backward compat: derive from delimiter_type
+            markdown_delimiter_to_semantic(block.delimiter_type)
+          end
+
+          def markdown_delimiter_to_semantic(delimiter)
+            case delimiter
+            when '```', '~' then :source_code
+            when '>' then :quote
+            when '---', '***', '___' then :horizontal_rule
+            when '++++' then :pass
+            else nil
+            end
+          end
+
           def transform_code_block(block)
             Coradoc::Markdown::CodeBlock.new(
               code: block.content.to_s,

data/coradoc-markdown/lib/coradoc/markdown/transform/to_core_model.rb

@@ -103,18 +103,16 @@ module Coradoc
           end
 
           def transform_code_block(block)
-            Coradoc::CoreModel::Block.new(
+            Coradoc::CoreModel::SourceBlock.new(
               element_type: 'block',
-              delimiter_type: '```',
               content: block.code.to_s,
               language: block.language
             )
           end
 
           def transform_blockquote(blockquote)
-            Coradoc::CoreModel::Block.new(
+            Coradoc::CoreModel::QuoteBlock.new(
               element_type: 'block',
-              delimiter_type: '>',
               content: blockquote.content.to_s
             )
           end
@@ -184,7 +182,7 @@ module Coradoc
           def transform_horizontal_rule(_rule)
             Coradoc::CoreModel::Block.new(
               element_type: 'block',
-              delimiter_type: '---'
+              block_semantic_type: :horizontal_rule
             )
           end
 
@@ -228,9 +226,8 @@ module Coradoc
                 content: math.content.to_s
               )
             else
-              Coradoc::CoreModel::Block.new(
+              Coradoc::CoreModel::PassBlock.new(
                 element_type: 'block',
-                delimiter_type: '++++',
                 content: math.content.to_s,
                 language: 'latexmath'
               )
@@ -247,9 +244,8 @@ module Coradoc
                 content: ext.content.to_s
               )
             when :nomarkdown
-              Coradoc::CoreModel::Block.new(
+              Coradoc::CoreModel::PassBlock.new(
                 element_type: 'block',
-                delimiter_type: '++++',
                 content: ext.content.to_s
               )
             else

data/coradoc-markdown/lib/coradoc/markdown/transformer.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 require 'parslet'
-require_relative 'parser_util'
 
 module Coradoc
   module Markdown
+    autoload :ParserUtil, "#{__dir__}/parser_util"
+
     # Transformer converts Parslet AST into Markdown Document Model objects.
     #
     # This transformer takes the raw output from the BlockParser/InlineParser

data/coradoc-markdown/spec/transform/to_core_model_spec.rb

@@ -71,9 +71,8 @@ RSpec.describe Coradoc::Markdown::Transform::ToCoreModel do
         )
       end
 
-      it 'transforms to CoreModel::Block with code delimiter' do
-        expect(transform).to be_a(Coradoc::CoreModel::Block)
-        expect(transform.delimiter_type).to eq('```')
+      it 'transforms to CoreModel::SourceBlock with code content' do
+        expect(transform).to be_a(Coradoc::CoreModel::SourceBlock)
         expect(transform.content).to eq("def hello\n  puts 'world'\nend")
         expect(transform.language).to eq('ruby')
       end
@@ -84,9 +83,8 @@ RSpec.describe Coradoc::Markdown::Transform::ToCoreModel do
         Coradoc::Markdown::Blockquote.new(content: 'Quoted text')
       end
 
-      it 'transforms to CoreModel::Block with blockquote delimiter' do
-        expect(transform).to be_a(Coradoc::CoreModel::Block)
-        expect(transform.delimiter_type).to eq('>')
+      it 'transforms to CoreModel::QuoteBlock with blockquote content' do
+        expect(transform).to be_a(Coradoc::CoreModel::QuoteBlock)
         expect(transform.content).to eq('Quoted text')
       end
     end
@@ -222,9 +220,9 @@ RSpec.describe Coradoc::Markdown::Transform::ToCoreModel do
         Coradoc::Markdown::HorizontalRule.new
       end
 
-      it 'transforms to CoreModel::Block with hr delimiter' do
+      it 'transforms to CoreModel::Block with horizontal rule semantic type' do
         expect(transform).to be_a(Coradoc::CoreModel::Block)
-        expect(transform.delimiter_type).to eq('---')
+        expect(transform.block_semantic_type).to eq('horizontal_rule')
       end
     end
 

data/exe/coradoc

@@ -21,6 +21,7 @@ require 'coradoc'
 require 'coradoc/cli'
 
 # Load available format gems
+require 'coradoc/asciidoc'
 require 'coradoc/html'
 require 'coradoc/markdown'
 

data/lib/coradoc/coradoc.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'lutaml/model'
-require_relative 'errors'
 
 # Coradoc - A hub-and-spoke document transformation library
 #
@@ -442,6 +441,7 @@ module Coradoc
     end
   end
 
+  autoload :Error, "#{__dir__}/errors"
   autoload :Version, "#{__dir__}/version"
   autoload :Logger, "#{__dir__}/logger"
   autoload :Hooks, "#{__dir__}/hooks"
@@ -449,14 +449,13 @@ module Coradoc
   autoload :Validation, "#{__dir__}/validation"
   autoload :Configurable, "#{__dir__}/configurable"
   autoload :FormatModule, "#{__dir__}/format_module"
+  autoload :CoreModel, "#{__dir__}/core_model"
+  autoload :Registry, "#{__dir__}/registry"
+  autoload :Transform, "#{__dir__}/transform"
+  autoload :Input, "#{__dir__}/input"
+  autoload :Output, "#{__dir__}/output"
 end
 
-require_relative 'core_model'
-require_relative 'registry'
-require_relative 'transform'
-require_relative 'input'
-require_relative 'output'
-
 # Format gems self-register via Coradoc.register_format when they are required.
 # No hardcoded registration needed here — each gem's entry file handles its own
 # registration (e.g., coradoc-adoc/lib/coradoc/asciidoc.rb calls

data/lib/coradoc/core_model/annotation_block.rb

@@ -19,7 +19,6 @@ module Coradoc
     # @example Creating a NOTE annotation
     #   note = CoreModel::AnnotationBlock.new(
     #     annotation_type: "note",
-    #     delimiter_type: "****",
     #     content: "This is important information."
     #   )
     #
@@ -27,7 +26,6 @@ module Coradoc
     #   reviewer = CoreModel::AnnotationBlock.new(
     #     annotation_type: "reviewer",
     #     annotation_label: "john.doe",
-    #     delimiter_type: "////",
     #     content: "Please review this section."
     #   )
     class AnnotationBlock < Block

data/lib/coradoc/core_model/block.rb

@@ -2,39 +2,53 @@
 
 module Coradoc
   module CoreModel
-    # Generic delimited block model
+    # Semantic block type constants
     #
-    # Represents all standard AsciiDoc delimited blocks including:
-    # - Example blocks (====)
-    # - Literal blocks (````)
-    # - Listing blocks (----)
-    # - Open blocks (--)
-    # - Pass blocks (++++/++++)
-    # - Quote blocks (____)
-    # - Sidebar blocks (****)
-    # - Source blocks (----)
-    # - Paragraphs (element_type: 'paragraph')
-    #
-    # This is a schema-agnostic representation that captures the semantic
-    # structure without schema-specific interpretation.
+    # Format gems own the mapping between their syntax and these
+    # canonical semantic types. The core model never stores raw
+    # delimiter strings.
+    module BlockSemanticType
+      SOURCE_CODE = :source_code
+      LISTING = :listing
+      EXAMPLE = :example
+      QUOTE = :quote
+      SIDEBAR = :sidebar
+      LITERAL = :literal
+      OPEN = :open
+      PASS = :pass
+      VERSE = :verse
+      HORIZONTAL_RULE = :horizontal_rule
+      COMMENT = :comment
+      PARAGRAPH = :paragraph
+      VIDEO = :video
+      AUDIO = :audio
+      ANNOTATION = :annotation
+      REVIEWER = :reviewer
+
+      def self.all
+          [SOURCE_CODE, LISTING, EXAMPLE, QUOTE, SIDEBAR, LITERAL, OPEN, PASS,
+           VERSE, HORIZONTAL_RULE, COMMENT, PARAGRAPH, VIDEO, AUDIO,
+           ANNOTATION, REVIEWER].freeze
+        end
+    end
+
+    # Generic block model
     #
-    # @example Creating a generic block
-    #   block = CoreModel::Block.new(
-    #     delimiter_type: "====",
-    #     delimiter_length: 4,
-    #     content: "Example content here"
-    #   )
+    # Represents all block-level elements in a format-neutral way.
+    # Each block has a `block_semantic_type` symbol (e.g., :source_code,
+    # :quote, :example) that captures its semantic meaning without
+    # tying it to any specific format's syntax.
     #
-    # @example Creating a source block
+    # @example Creating a source code block
     #   block = CoreModel::Block.new(
-    #     delimiter_type: "----",
+    #     block_semantic_type: :source_code,
     #     content: "puts 'Hello, World!'",
-    #     attributes: [{ role: "source", language: "ruby" }]
+    #     language: "ruby"
     #   )
     #
     # @example Creating a paragraph with inline formatting
     #   block = CoreModel::Block.new(
-    #     element_type: "paragraph",
+    #     block_semantic_type: :paragraph,
     #     children: [
     #       "Text with ",
     #       CoreModel::InlineElement.new(format_type: "bold", content: "bold"),
@@ -44,14 +58,38 @@ module Coradoc
     class Block < Base
       include ChildrenContent
 
-      # @!attribute element_type
+      class << self
+        # Class-level semantic type — overridden by each typed subclass.
+        # Returns nil for the generic Block base class.
+        def semantic_type
+          nil
+        end
+      end
+
+      # Resolve the semantic type from this block instance.
+      # Checks class-level semantic_type first (typed subclasses),
+      # then the block_semantic_type attribute, then element_type,
+      # then delimiter_type fallback.
+      def resolve_semantic_type
+        self.class.semantic_type ||
+          (block_semantic_type&.to_sym) ||
+          resolve_semantic_from_element_type ||
+          resolve_semantic_from_delimiter
+      end
+
+      # @!attribute block_semantic_type
       #   @return [String, nil] the semantic type of the block
+      #     (e.g., 'source_code', 'quote', 'example', 'paragraph')
+      attribute :block_semantic_type, :string
+
+      # @!attribute element_type
+      #   @return [String, nil] the structural role of the block
       #     (e.g., 'paragraph', 'block')
       attribute :element_type, :string
 
       # @!attribute delimiter_type
-      #   @return [String, nil] the delimiter character(s) used
-      #     (e.g., '****', '====', '----')
+      #   @return [String, nil] DEPRECATED — use block_semantic_type.
+      #     Retained for backward compatibility during migration.
       attribute :delimiter_type, :string
 
       # @!attribute delimiter_length
@@ -76,15 +114,37 @@ module Coradoc
 
       private
 
+      def resolve_semantic_from_element_type
+        case element_type
+        when 'paragraph' then :paragraph
+        when 'comment' then :comment
+        else nil
+        end
+      end
+
+      def resolve_semantic_from_delimiter
+        delim = delimiter_type
+        return nil unless delim && delim.length >= 4
+
+        char = delim[0]
+        DELIMITER_CHAR_TO_SEMANTIC[char] || nil
+      end
+
+      # Map delimiter first character to semantic type (backward compat)
+      DELIMITER_CHAR_TO_SEMANTIC = {
+        '-' => :source_code,
+        '=' => :example,
+        '_' => :quote,
+        '*' => :sidebar,
+        '.' => :literal,
+        '+' => :pass
+      }.freeze
+
       # Attributes to compare for semantic equivalence
       #
-      # Blocks are semantically equivalent if they have the same
-      # delimiter type and content, regardless of delimiter length
-      # or line structure.
-      #
       # @return [Array<Symbol>] list of comparable attributes
       def comparable_attributes
-        super + %i[delimiter_type content]
+        super + %i[block_semantic_type content]
       end
     end
   end