coradoc-adoc 2.0.22 → 2.0.24

data/lib/coradoc/asciidoc/transformer/misc_rules.rb

@@ -12,16 +12,25 @@ module Coradoc
                    comment_text: simple(:comment_text),
                    line_break: simple(:line_break)
                  }) do
-              Model::CommentLine.new(text: comment_text, line_break: line_break)
+              Model::CommentLine.new(
+                text: comment_text,
+                line_break: line_break,
+                source_line: SourceLineExtractor.extract(comment_text)
+              )
             end
 
             rule(comment_block: { comment_text: simple(:comment_text) }) do
-              Model::CommentBlock.new(text: comment_text)
+              Model::CommentBlock.new(
+                text: comment_text,
+                source_line: SourceLineExtractor.extract(comment_text)
+              )
             end
 
             # Page break
             rule(page_break: simple(:page_break)) do
-              Model::Break::PageBreak.new
+              Model::Break::PageBreak.new(
+                source_line: SourceLineExtractor.extract(page_break)
+              )
             end
 
             # Tag
@@ -30,7 +39,8 @@ module Coradoc
                 name: tag[:name],
                 attrs: tag[:attribute_list],
                 line_break: tag[:line_break],
-                prefix: tag[:prefix]
+                prefix: tag[:prefix],
+                source_line: SourceLineExtractor.extract(tag)
               )
             end
 
@@ -45,7 +55,7 @@ module Coradoc
             end
 
             rule(positional: simple(:positional)) do
-              positional.to_s
+              positional
             end
 
             rule(attribute_array: nil) do
@@ -53,11 +63,16 @@ module Coradoc
             end
 
             rule(attribute_array: sequence(:attributes)) do
-              attr_list = Model::AttributeList.new
+              attr_list = Model::AttributeList.new(
+                source_line: SourceLineExtractor.extract(attributes)
+              )
               attributes.each do |a|
-                if a.is_a?(String)
+                case a
+                when Parslet::Slice
+                  attr_list.add_positional(a.to_s)
+                when String
                   attr_list.add_positional(a)
-                elsif a.is_a?(Model::Attribute)
+                when Model::Attribute
                   attr_list.add_named(a.key, a.value)
                 end
               end
@@ -104,7 +119,8 @@ module Coradoc
               Model::Include.new(
                 path: path.to_s,
                 attributes: attribute_list,
-                line_break: line_break
+                line_break: line_break,
+                source_line: SourceLineExtractor.extract(path)
               )
             end
 
@@ -119,7 +135,8 @@ module Coradoc
               Model::Audio.new(
                 src: path.to_s,
                 attributes: attribute_list,
-                line_break: line_break
+                line_break: line_break,
+                source_line: SourceLineExtractor.extract(path)
               )
             end
 
@@ -134,7 +151,8 @@ module Coradoc
               Model::Video.new(
                 src: path.to_s,
                 attributes: attribute_list,
-                line_break: line_break
+                line_break: line_break,
+                source_line: SourceLineExtractor.extract(path)
               )
             end
 
@@ -162,7 +180,8 @@ module Coradoc
                 date: attrs[:date],
                 from: attrs[:from],
                 to: attrs[:to],
-                content: Transformer.lines_to_text_elements(lines)
+                content: Transformer.lines_to_text_elements(lines),
+                source_line: SourceLineExtractor.extract(reviewer_note)
               )
             end
           end

data/lib/coradoc/asciidoc/transformer/source_line_extractor.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'parslet'
+
+module Coradoc
+  module AsciiDoc
+    class Transformer < Parslet::Transform
+      # Walks a Parslet AST subtree (Hash/Array/Slice/String/Model) and
+      # returns the 1-indexed source line of the first +Parslet::Slice+
+      # or Model::Base#source_line it finds.
+      #
+      # Parslet preserves byte offsets on every matched slice
+      # (+slice.line_and_column+ returns +[line, column]+); the
+      # transformer receives these slices in the AST but most rules
+      # discard the position when building Model objects. This helper
+      # recovers the start line of any subtree so transformer rules
+      # can populate +Model::Base#source_line+ without changing the
+      # parser.
+      #
+      # Handles two distinct shapes:
+      #   * Pre-transform AST (Hash/Array of Parslet::Slice) — used by
+      #     rules that bind raw slices via +simple(:x)+.
+      #   * Post-transform Model tree (Model::Base instances whose
+      #     +source_line+ was populated by an earlier rule) — used by
+      #     rules that bind via +subtree(:x)+ and receive already-
+      #     transformed content.
+      #
+      # Returns nil when no position is found (programmatic input,
+      # already-stripped ASTs, etc.) — callers should treat nil as
+      # "source position unavailable".
+      module SourceLineExtractor
+        module_function
+
+        def extract(node)
+          case node
+          when Parslet::Slice then line_of(node)
+          when Coradoc::AsciiDoc::Model::Base then node.source_line
+          when Hash then extract_from_hash(node)
+          when Array then extract_from_array(node)
+          else nil
+          end
+        end
+
+        def line_of(slice)
+          line, _column = slice.line_and_column
+          line
+        end
+
+        def extract_from_hash(hash)
+          hash.each_value do |value|
+            line = extract(value)
+            return line if line
+          end
+          nil
+        end
+
+        def extract_from_array(array)
+          array.each do |value|
+            line = extract(value)
+            return line if line
+          end
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/coradoc/asciidoc/transformer/structural_rules.rb

@@ -72,6 +72,7 @@ module Coradoc
               opts = { rows: Transformer.regroup_table_rows(rows, attrs), attrs: attrs }
               opts[:id] = id if id
               opts[:title] = title unless title.nil? || title.empty?
+              opts[:source_line] = SourceLineExtractor.extract(table)
               Model::Table.new(**opts)
             end
 
@@ -84,7 +85,8 @@ module Coradoc
               Model::Title.new(
                 content: text,
                 level_int: level.size - 1,
-                line_break: line_break
+                line_break: line_break,
+                source_line: SourceLineExtractor.extract(level)
               )
             end
 
@@ -98,7 +100,8 @@ module Coradoc
                 content: text,
                 level_int: level.size - 1,
                 line_break: line_break,
-                id: name
+                id: name,
+                source_line: SourceLineExtractor.extract(name)
               )
             end
 
@@ -117,7 +120,8 @@ module Coradoc
                 id: id,
                 attribute_list: attribute_list,
                 contents: contents,
-                sections: sections
+                sections: sections,
+                source_line: SourceLineExtractor.extract(section)
               )
             end
 

data/lib/coradoc/asciidoc/transformer/text_rules.rb

@@ -9,7 +9,10 @@ module Coradoc
           transformer_class.class_eval do
             # Text Model
             rule(text: simple(:text)) do
-              Model::TextElement.new(content: text.to_s)
+              Model::TextElement.new(
+                content: text.to_s,
+                source_line: Transformer::SourceLineExtractor.extract(text)
+              )
             end
 
             rule(text_string: subtree(:text_string)) do
@@ -17,19 +20,34 @@ module Coradoc
             end
 
             rule(text: simple(:text), line_break: simple(:line_break)) do
-              Model::TextElement.new(content: text.to_s, line_break: line_break)
+              Model::TextElement.new(
+                content: text.to_s,
+                line_break: line_break,
+                source_line: Transformer::SourceLineExtractor.extract(text)
+              )
             end
 
             rule(text: sequence(:text), line_break: simple(:line_break)) do
-              Model::TextElement.new(content: text, line_break: line_break)
+              Model::TextElement.new(
+                content: text,
+                line_break: line_break,
+                source_line: Transformer::SourceLineExtractor.extract(text)
+              )
             end
 
             rule(id: simple(:id), text: simple(:text)) do
-              Model::TextElement.new(content: text.to_s, id: id.to_s)
+              Model::TextElement.new(
+                content: text.to_s,
+                id: id.to_s,
+                source_line: Transformer::SourceLineExtractor.extract(id)
+              )
             end
 
             rule(text: sequence(:text)) do
-              Model::TextElement.new(content: text)
+              Model::TextElement.new(
+                content: text,
+                source_line: Transformer::SourceLineExtractor.extract(text)
+              )
             end
 
             rule(
@@ -40,7 +58,8 @@ module Coradoc
               Model::TextElement.new(
                 content: text.to_s,
                 id: id.to_s,
-                line_break: line_break
+                line_break: line_break,
+                source_line: Transformer::SourceLineExtractor.extract(id)
               )
             end
 
@@ -52,13 +71,17 @@ module Coradoc
               Model::TextElement.new(
                 content: text,
                 id: id.to_s,
-                line_break: line_break
+                line_break: line_break,
+                source_line: Transformer::SourceLineExtractor.extract(id)
               )
             end
 
             # Line break
             rule(line_break: simple(:line_break)) do
-              Model::LineBreak.new(line_break:)
+              Model::LineBreak.new(
+                line_break:,
+                source_line: Transformer::SourceLineExtractor.extract(line_break)
+              )
             end
 
             # Unparsed text
@@ -72,7 +95,8 @@ module Coradoc
                 content: Transformer.lines_to_text_elements(paragraph[:lines]),
                 id: paragraph[:id],
                 attributes: paragraph[:attribute_list],
-                title: paragraph[:title]
+                title: paragraph[:title],
+                source_line: Transformer::SourceLineExtractor.extract(paragraph)
               )
             end
           end

data/lib/coradoc/asciidoc/transformer.rb

@@ -33,6 +33,7 @@ module Coradoc
       autoload :BlockTypeClassifier, "#{__dir__}/transformer/block_type_classifier"
       autoload :TableLayout, "#{__dir__}/transformer/table_layout"
       autoload :TableCellBuilder, "#{__dir__}/transformer/table_cell_builder"
+      autoload :SourceLineExtractor, "#{__dir__}/transformer/source_line_extractor"
 
       # Apply all rule modules (triggers autoload)
       HeaderRules.apply(self)
@@ -139,7 +140,11 @@ module Coradoc
                           text_content
                         end
 
-          Model::TextElement.new(content: transformed, line_break: line[:line_break])
+          Model::TextElement.new(
+            content: transformed,
+            line_break: line[:line_break],
+            source_line: SourceLineExtractor.extract(line)
+          )
         end
       end
 

data/lib/coradoc/asciidoc/version.rb

@@ -2,6 +2,6 @@
 
 module Coradoc
   module AsciiDoc
-    VERSION = '2.0.22'
+    VERSION = '2.0.24'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coradoc-adoc
 version: !ruby/object:Gem::Version
-  version: 2.0.22
+  version: 2.0.24
 platform: ruby
 authors:
 - Ribose Inc.
@@ -146,6 +146,7 @@ files:
 - lib/coradoc/asciidoc/model/header.rb
 - lib/coradoc/asciidoc/model/highlight.rb
 - lib/coradoc/asciidoc/model/image.rb
+- lib/coradoc/asciidoc/model/image/attribute_extractor.rb
 - lib/coradoc/asciidoc/model/image/block_image.rb
 - lib/coradoc/asciidoc/model/image/block_image/attribute_list.rb
 - lib/coradoc/asciidoc/model/image/core.rb
@@ -342,6 +343,7 @@ files:
 - lib/coradoc/asciidoc/transformer/inline_rules.rb
 - lib/coradoc/asciidoc/transformer/list_rules.rb
 - lib/coradoc/asciidoc/transformer/misc_rules.rb
+- lib/coradoc/asciidoc/transformer/source_line_extractor.rb
 - lib/coradoc/asciidoc/transformer/structural_rules.rb
 - lib/coradoc/asciidoc/transformer/table_cell_builder.rb
 - lib/coradoc/asciidoc/transformer/table_layout.rb