uniword 1.2.5 → 1.4.0

data/lib/uniword/docx/reconciler/fix_codes.rb

@@ -7,14 +7,15 @@ module Uniword
       #
       # Every `record_fix` call site references a constant from this module
       # instead of a bare string literal. Adding a new fix category means
-      # adding one constant here, not hunting for the next free letter.
+      # adding one constant here with the next free code.
       #
-      # Wire format is preserved — external validation rules and audit-log
-      # consumers that pattern-match on "R1".."R16" continue to work.
-      #
-      # Known debt: R10 is overloaded for several distinct concerns
-      # (note defs, table structure, style defaults, dangling refs).
-      # Splitting requires consumer coordination.
+      # One code per concern: each constant has a unique, self-describing
+      # wire value. Codes "R1".."R16" are frozen — external validation rules
+      # (lib/uniword/validation/rules) and audit-log consumers pattern-match
+      # on them, so the original concerns keep their historic codes. Codes
+      # "R17" and up were introduced when the overloaded "R10" (and the
+      # remaining shared codes "R4"/"R11"/"R12"/"R13") were split into
+      # per-concern values.
       module FixCodes
         # Settings / package structure
         MC_IGNORABLE = "R1"
@@ -29,17 +30,12 @@ module Uniword
         CONTENT_TYPES_ASSEMBLED = "R7"
         APP_PROPERTIES_ENSURED = "R8"
 
-        # Notes — pair creation
+        # Notes — pair creation and definition integrity
         NOTE_PAIR_CREATED = "R9"
         NOTE_DEFINITION_CREATED = "R10"
         NOTE_INVALID_TYPE_STRIPPED = "R15"
         NOTE_DUPLICATE_ID_REMOVED = "R16"
 
-        # Notes — referential integrity warnings and removals
-        DANGLING_NOTE_REFERENCE_WARNING = "R9"
-        DANGLING_NOTE_REFERENCE_REMOVED = "R10"
-        DANGLING_HYPERLINK_WARNING = "R9"
-
         # Body
         SECTION_PROPERTIES_DEFAULTED = "R11"
         PARAGRAPH_BACKFILL = "R12"
@@ -48,26 +44,37 @@ module Uniword
         FONT_TABLE_CREATED = "R13"
         CORE_PROPERTIES_REBUILT = "R14"
 
-        # Styles (currently shares R10 with other concerns — see debt note above)
-        STYLE_DEFAULTS_ADDED = "R10"
-        SEMI_HIDDEN_ADDED = "R10"
+        # Referential integrity — dangling-reference repairs (split from
+        # the overloaded R10/R4/R11/R12 codes; one code per concern)
+        DANGLING_NUMBERING_REMOVED = "R17"
+        DANGLING_NOTE_REFERENCE_REMOVED = "R18"
+        DANGLING_STYLE_REFERENCE_REMOVED = "R19"
+        DANGLING_BASED_ON_REMOVED = "R20"
+        DANGLING_HYPERLINK_REMOVED = "R21"
+        DANGLING_HEADER_FOOTER_REMOVED = "R22"
+        DANGLING_DRAWING_REMOVED = "R23"
+        DANGLING_RELATIONSHIP_TARGET_REMOVED = "R32"
+
+        # Referential integrity — literal hyperlink targets promoted to
+        # proper External relationships (repairs Builder.hyperlink output)
+        HYPERLINK_RELATIONSHIP_CREATED = "R31"
+
+        # Styles
+        STYLE_DEFAULTS_ADDED = "R24"
+        SEMI_HIDDEN_ADDED = "R25"
 
-        # Tables (currently shares R10)
-        TABLE_STRUCTURE_RECONCILED = "R10"
-        TABLE_CELL_PR_REORDERED = "R10"
-        TABLE_CELL_DEFAULTS = "R12"
-        TABLE_ROW_GRID_AFTER = "R13"
+        # Tables
+        TABLE_STRUCTURE_RECONCILED = "R26"
+        TABLE_CELL_PR_REORDERED = "R27"
+        TABLE_CELL_DEFAULTS = "R28"
+        TABLE_ROW_GRID_AFTER = "R29"
 
-        # Referential integrity (currently shares R10)
-        DANGLING_STYLE_REFERENCE_REMOVED = "R10"
-        DANGLING_BASED_ON_REMOVED = "R10"
-        DANGLING_NUMBERING_REMOVED = "R4"
-        DANGLING_HYPERLINK_REMOVED = "R10"
-        DANGLING_HEADER_FOOTER_REMOVED = "R11"
-        DANGLING_DRAWING_REMOVED = "R12"
+        # Run cleanup
+        EMPTY_RUNS_STRIPPED = "R30"
 
-        # Run cleanup (currently shares R10)
-        EMPTY_RUNS_STRIPPED = "R10"
+        # Tables — gridCol widths defaulted to equal shares of the
+        # section content width (Word's fallback behavior)
+        TABLE_GRID_COL_WIDTHS_DEFAULTED = "R33"
       end
     end
   end

data/lib/uniword/docx/reconciler/helpers.rb

@@ -85,7 +85,7 @@ module Uniword
           walk_body_paragraphs(package.document.body, &block)
 
           (package.document&.header_footer_parts || []).each do |part|
-            (part[:content]&.paragraphs || []).each(&block)
+            (part.content&.paragraphs || []).each(&block)
           end
         end
 
@@ -98,45 +98,24 @@ module Uniword
           end
         end
 
-        # -- Element order --
+        # -- Element order (delegates to Ooxml::ElementOrder) --
 
+        # Idempotent singleton insert in schema position.
         def ensure_element_in_order(model, tag_name, after: nil, before: nil)
-          order = model.element_order
-          return unless order
-
-          return if order.any? { |e| e.name == tag_name }
-
-          entry = Lutaml::Xml::Element.new("Element", tag_name)
-
-          if after
-            idx = order.index { |e| e.name == after }
-            thaw_and_insert(model, order, idx ? idx + 1 : order.size, entry)
-          elsif before
-            idx = order.index { |e| e.name == before }
-            thaw_and_insert(model, order, idx || 0, entry)
-          else
-            thaw_and_append(model, order, entry)
-          end
+          Ooxml::ElementOrder.insert_once(model, tag_name,
+                                          after: after, before: before)
         end
 
+        # Positional insert for repeatable elements.
         def insert_element_order(obj, name, position)
           order = obj.element_order
           return unless order
-
           return if order.any? { |e| e.name == name }
 
-          entry = Lutaml::Xml::Element.new("Element", name, node_type: :element)
-          thaw_and_insert(obj, order, position, entry)
-        end
-
-        # lutaml-model freezes element_order after XML parsing.
-        # Replace the frozen array with a mutable copy when modification is needed.
-        def thaw_and_insert(model, order, position, entry)
-          model.element_order = order.dup.insert(position, entry)
-        end
-
-        def thaw_and_append(model, order, entry)
-          model.element_order = order.dup << entry
+          Ooxml::ElementOrder.insert_at(
+            obj, position, Lutaml::Xml::Element.new("Element", name,
+                                                    node_type: :element)
+          )
         end
 
         # -- Run utilities (delegate to RunUtils) --
@@ -295,6 +274,14 @@ module Uniword
           end
         end
 
+        # Package part path of the notes collection for the note type.
+        def notes_part_for(type)
+          case type
+          when :footnote then "word/footnotes.xml"
+          when :endnote  then "word/endnotes.xml"
+          end
+        end
+
         def note_entries_for(notes, type)
           return [] unless notes
 

data/lib/uniword/docx/reconciler/notes.rb

@@ -38,7 +38,8 @@ module Uniword
               )
             end
             record_fix(FixCodes::NOTE_DEFINITION_CREATED,
-                       "Created missing #{type}note definitions for ids=#{missing.join(', ')}")
+                       "Created missing #{type}note definitions for ids=#{missing.join(', ')}",
+                       part: notes_part_for(type))
           end
         end
 
@@ -70,11 +71,13 @@ module Uniword
                                  create_message:, pr_message:)
           if has_pr && !notes
             notes_setter.call(minimal_notes(type))
-            record_fix(FixCodes::NOTE_PAIR_CREATED, create_message)
+            record_fix(FixCodes::NOTE_PAIR_CREATED, create_message,
+                       part: notes_part_for(type))
           elsif notes && !has_pr
             package.settings ||= Wordprocessingml::Settings.new
             assign_note_pr(package.settings, type)
-            record_fix(FixCodes::NOTE_PAIR_CREATED, pr_message)
+            record_fix(FixCodes::NOTE_PAIR_CREATED, pr_message,
+                       part: "word/settings.xml")
           end
 
           current = notes_collection_for(type)
@@ -92,7 +95,7 @@ module Uniword
           strip_empty_runs_from_notes(entries)
           reorder_notes_by_reference(entries, type)
 
-          unless allocator
+          unless builder_managed?
             prefix = type == :footnote ? "fn" : "en"
 
             entries.each_with_index do |entry, eidx|
@@ -182,7 +185,8 @@ module Uniword
           return if stripped.empty?
 
           record_fix(FixCodes::NOTE_INVALID_TYPE_STRIPPED,
-                     "Stripped invalid w:type from #{type}note ids=#{stripped.join(', ')}")
+                     "Stripped invalid w:type from #{type}note ids=#{stripped.join(', ')}",
+                     part: notes_part_for(type))
         end
 
         def deduplicate_note_ids(entries, type)
@@ -200,7 +204,8 @@ module Uniword
           return if dup_ids.empty?
 
           record_fix(FixCodes::NOTE_DUPLICATE_ID_REMOVED,
-                     "Removed duplicate #{type}note ids=#{dup_ids.join(', ')}")
+                     "Removed duplicate #{type}note ids=#{dup_ids.join(', ')}",
+                     part: notes_part_for(type))
         end
 
         def reorder_notes_by_reference(entries, type)
@@ -227,7 +232,9 @@ module Uniword
           structural.each { |e| entries << e }
           reordered.each { |e| entries << e }
 
-          record_fix(FixCodes::NOTE_PAIR_CREATED, "Reordered #{type}notes by first reference in document body")
+          record_fix(FixCodes::NOTE_PAIR_CREATED,
+                     "Reordered #{type}notes by first reference in document body",
+                     part: notes_part_for(type))
         end
 
         def renumber_notes(entries, type)
@@ -255,7 +262,9 @@ module Uniword
             end
           end
 
-          record_fix(FixCodes::NOTE_PAIR_CREATED, "Renumbered #{type}note IDs sequentially (#{id_map.size} changed)")
+          record_fix(FixCodes::NOTE_PAIR_CREATED,
+                     "Renumbered #{type}note IDs sequentially (#{id_map.size} changed)",
+                     part: notes_part_for(type))
         end
 
         def collect_note_reference_order(body, type)