expressir 2.1.27 → 2.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79f9083d84c90911c68536e3f07c4a2ebeb7675bca18d445b7af90d9ece6e7ee
-  data.tar.gz: 69e648f694b883906a32fc316219db79dbaa053c2633a4543cd4b62673a9f88d
+  metadata.gz: fbc607242e5dfe5db0276c14d37cdc1d38fc07e4f0014134b20105e443a3b96c
+  data.tar.gz: 32ba2fe11da1f6439b7a97e30215df127aa6826ae6199f205fa4376c7624a4d2
 SHA512:
-  metadata.gz: d9cc037357c9803c739a486089fc69b4799b1ba02f5f9de51216175447765f0e650dc02f8c525d2c4be8a3ea38e2ac953c5ef22e530ce4fea1f42f902eead456
-  data.tar.gz: aca50dfe25f95e07453607f76df4ca532a3c3e97f8d95af08442c5a5ff402434a80e3fa6b2f8147992b72fefbaa1c3b9487f001095960b605abd5a3cfecd2bf1
+  metadata.gz: 06e09081cbb49ef2d4656e8f9104c830edf8fc0427ffbcef0f6fa686884468e561370656d74b3c0f893b1786e0e9d4d4d8f335d297e9e3ddb8211d9bc26bbfd1
+  data.tar.gz: 15350b06e45e272b7b7dbaee29c5030b794e67a30544344bf534ec2b86c89998fcb1123c1352201d4d41f217f8e11c3054f5e0ef3f94fccb96b3daa42aacda82

data/.rubocop_todo.yml

@@ -1,115 +1,56 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-10-12 15:55:59 UTC using RuboCop version 1.81.1.
+# on 2025-10-15 09:12:23 UTC using RuboCop version 1.81.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 9
+# Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: with_first_argument, with_fixed_indentation
 Layout/ArgumentAlignment:
   Exclude:
-    - 'lib/expressir/commands/changes.rb'
-    - 'spec/expressir/changes/schema_change_spec.rb'
-    - 'spec/expressir/commands/changes_import_eengine_spec.rb'
-    - 'spec/expressir/commands/changes_validate_spec.rb'
+    - 'lib/expressir/commands/changes_import_eengine.rb'
 
-# Offense count: 1
+# Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyleAlignWith.
 # SupportedStylesAlignWith: either, start_of_block, start_of_line
 Layout/BlockAlignment:
   Exclude:
-    - 'lib/expressir/changes/schema_change.rb'
+    - 'lib/expressir/commands/changes_import_eengine.rb'
+    - 'spec/expressir/commands/changes_import_eengine_spec.rb'
 
-# Offense count: 1
+# Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
 Layout/BlockEndNewline:
   Exclude:
-    - 'lib/expressir/changes/schema_change.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowForAlignment.
-Layout/CommentIndentation:
-  Exclude:
-    - 'lib/expressir/commands/changes_validate.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Layout/ElseAlignment:
-  Exclude:
-    - 'lib/expressir/commands/changes_validate.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, no_empty_lines
-Layout/EmptyLinesAroundBlockBody:
-  Exclude:
-    - 'bin/validate_all_changes'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleAlignWith, Severity.
-# SupportedStylesAlignWith: keyword, variable, start_of_line
-Layout/EndAlignment:
-  Exclude:
-    - 'lib/expressir/commands/changes_validate.rb'
-
-# Offense count: 12
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/HashAlignment:
-  Exclude:
-    - 'lib/expressir/commands/changes.rb'
-    - 'spec/expressir/changes/schema_change_spec.rb'
-    - 'spec/expressir/commands/changes_validate_spec.rb'
+    - 'lib/expressir/commands/changes_import_eengine.rb'
+    - 'spec/expressir/commands/changes_import_eengine_spec.rb'
 
-# Offense count: 6
+# Offense count: 8
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Width, AllowedPatterns.
 Layout/IndentationWidth:
   Exclude:
-    - 'bin/validate_all_changes'
-    - 'lib/expressir/changes/schema_change.rb'
-    - 'lib/expressir/commands/changes_validate.rb'
+    - 'lib/expressir/commands/changes_import_eengine.rb'
+    - 'spec/expressir/commands/changes_import_eengine_spec.rb'
 
-# Offense count: 574
+# Offense count: 569
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Enabled: false
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Layout/RescueEnsureAlignment:
-  Exclude:
-    - 'bin/validate_all_changes'
-
-# Offense count: 8
+# Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
   Exclude:
-    - 'bin/validate_all_changes'
-    - 'lib/expressir/commands/changes.rb'
-    - 'spec/expressir/changes/schema_change_spec.rb'
-    - 'spec/expressir/commands/changes_import_eengine_spec.rb'
-    - 'spec/expressir/commands/changes_validate_spec.rb'
-
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-Lint/AmbiguousOperatorPrecedence:
-  Exclude:
-    - 'bin/validate_all_changes'
+    - 'lib/expressir/commands/changes_import_eengine.rb'
 
 # Offense count: 1
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches, IgnoreDuplicateElseBranch.
@@ -131,13 +72,13 @@ Lint/UnusedMethodArgument:
 Metrics/AbcSize:
   Enabled: false
 
-# Offense count: 2
+# Offense count: 1
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 72
+  Max: 46
 
-# Offense count: 59
+# Offense count: 61
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Exclude:
@@ -155,12 +96,12 @@ Metrics/CyclomaticComplexity:
     - 'lib/expressir/model/model_element.rb'
     - 'spec/support/model_element_helper.rb'
 
-# Offense count: 109
+# Offense count: 113
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 106
 
-# Offense count: 47
+# Offense count: 48
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Exclude:
@@ -194,7 +135,7 @@ Performance/MapMethodChain:
     - 'spec/expressir/commands/coverage_ignore_files_spec.rb'
     - 'spec/expressir/coverage_spec.rb'
 
-# Offense count: 122
+# Offense count: 126
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 123
@@ -210,13 +151,7 @@ RSpec/IndexedLet:
     - 'spec/expressir/model/data_types/set_spec.rb'
     - 'spec/expressir/model/data_types/string_spec.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/IteratedExpectation:
-  Exclude:
-    - 'spec/expressir/schema_manifest_spec.rb'
-
-# Offense count: 254
+# Offense count: 257
 RSpec/MultipleExpectations:
   Max: 114
 
@@ -237,13 +172,7 @@ RSpec/RepeatedExample:
   Exclude:
     - 'spec/expressir/model/data_types/logical_spec.rb'
 
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Security/YAMLLoad:
-  Exclude:
-    - 'bin/validate_all_changes'
-
-# Offense count: 1
+# Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, AllowedMethods, AllowedPatterns, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
 # SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
@@ -252,7 +181,8 @@ Security/YAMLLoad:
 # AllowedMethods: lambda, proc, it
 Style/BlockDelimiters:
   Exclude:
-    - 'lib/expressir/changes/schema_change.rb'
+    - 'lib/expressir/commands/changes_import_eengine.rb'
+    - 'spec/expressir/commands/changes_import_eengine_spec.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -266,60 +196,3 @@ Style/EmptyElse:
 Style/MissingRespondToMissing:
   Exclude:
     - 'lib/expressir/express/visitor.rb'
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
-# SupportedStyles: predicate, comparison
-Style/NumericPredicate:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/expressir/commands/changes_import_eengine.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantBegin:
-  Exclude:
-    - 'bin/validate_all_changes'
-
-# Offense count: 4
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Mode.
-Style/StringConcatenation:
-  Exclude:
-    - 'bin/validate_all_changes'
-
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiteralsInInterpolation:
-  Exclude:
-    - 'bin/validate_all_changes'
-
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, diff_comma, no_comma
-Style/TrailingCommaInArguments:
-  Exclude:
-    - 'lib/expressir/changes/schema_change.rb'
-    - 'lib/expressir/commands/changes_import_eengine.rb'
-
-# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, diff_comma, no_comma
-Style/TrailingCommaInArrayLiteral:
-  Exclude:
-    - 'spec/expressir/changes/schema_change_spec.rb'
-
-# Offense count: 10
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, diff_comma, no_comma
-Style/TrailingCommaInHashLiteral:
-  Exclude:
-    - 'bin/validate_all_changes'
-    - 'lib/expressir/commands/changes_import_eengine.rb'
-    - 'spec/expressir/changes/schema_change_spec.rb'

data/README.adoc

@@ -724,13 +724,40 @@ This is useful for:
 * **Catching errors early**: Validates before committing changes
 * **Cleaning up files**: Removes inconsistencies in formatting
 
-==== Importing from eengine XML
+==== Importing from Express Engine comparison report XML
 
-The `changes import-eengine` command converts eengine comparison XML files to
-EXPRESS Changes YAML format.
+The `changes import-eengine` command converts Express Engine (eengine) comparison
+XML files to EXPRESS Changes YAML format.
+
+The eengine compare XML format is created through
+`exp-engine-engine/kernel/compare.lisp` in the Express Engine code. Expressir is
+compatible with v5.2.7 of eengine output.
+
+The import command:
+
+. Parses the eengine XML comparison file
+. Automatically detects the XML mode (Schema/ARM/MIM)
+. Extracts additions, modifications, and deletions
+. Converts modified objects to EXPRESS Changes item format
+. Preserves interface change information (`interfaced.items`)
+. Creates or updates an EXPRESS Changes YAML file
+. Supports appending new versions to existing files
+
+When the output file already exists:
+
+* **Same version**: Replaces the existing edition with that version
+* **New version**: Adds a new edition to the file
+
+This allows you to build up a complete change history incrementally across
+multiple schema versions.
+
+Syntax:
 
 [source, sh]
 ----
+# Basic syntax
+expressir changes import-eengine INPUT_XML SCHEMA_NAME VERSION [options]
+
 # Import and output to stdout
 expressir changes import-eengine comparison.xml schema_name "2"
 
@@ -744,26 +771,62 @@ expressir changes import-eengine comparison.xml schema_name "2" -o output.yaml -
 expressir changes import-eengine comparison.xml schema_name "3" -o existing.yaml
 ----
 
-[options="header"]
-|===
-| Option | Description
-| `-o, --output PATH` | Output YAML file path (stdout if not specified)
-| `--verbose` | Show verbose output
-|===
+Where:
 
-The import command:
+`INPUT_XML`:: Path to the eengine comparison XML file
+`SCHEMA_NAME`:: Name of the schema being tracked (e.g., `aic_csg`, `action_schema`)
+`VERSION`:: Version number for this set of changes (e.g., `"2"`, `"3"`)
 
-. Parses the eengine XML comparison file
-. Extracts additions, modifications, and removals
-. Creates or updates an EXPRESS Changes YAML file
-. Supports appending new versions to existing files
+Options:
 
-When the output file already exists:
+`-o, --output PATH`:: Output YAML file path (stdout if not specified)
+`--verbose`:: Show verbose output including parsed items
 
-* **Same version**: Replaces the existing edition with that version
-* **New version**: Adds a new edition to the file
+The command automatically detects and handles all three eengine XML comparison
+formats:
+
+Schema mode:: `<schema.changes>` root element with `<schema.additions>`,
+`<schema.modifications>`, and `<schema.deletions>` sections. See API docs for
+details.
+
+Example workflow for importing changes from multiple versions:
+
+.Importing multiple versions incrementally
+[example]
+[source, sh]
+----
+# Import version 2 changes
+expressir changes import-eengine v2_comparison.xml action_schema "2" \
+  -o action_schema.changes.yaml
 
-This allows you to build up a complete change history incrementally.
+# Import version 3 changes (appends to existing file)
+expressir changes import-eengine v3_comparison.xml action_schema "3" \
+  -o action_schema.changes.yaml
+
+# Import version 4 changes (appends to existing file)
+expressir changes import-eengine v4_comparison.xml action_schema "4" \
+  -o action_schema.changes.yaml
+
+# Verify the result
+cat action_schema.changes.yaml
+----
+
+This creates a single YAML file tracking changes across all three versions:
+
+[source,yaml]
+----
+schema: action_schema
+editions:
+- version: '2'
+  description: Changes from eengine comparison
+  additions: [...]
+- version: '3'
+  description: Changes from eengine comparison
+  additions: [...]
+- version: '4'
+  description: Changes from eengine comparison
+  additions: [...]
+----
 
 
 == Usage: Ruby
@@ -1167,15 +1230,214 @@ expressir coverage schemas.yml --format json --exclude=TYPE:SELECT
 
 Expressir provides the `Changes` module for managing and tracking changes to
 EXPRESS schemas across versions. This module implements the EXPRESS Changes YAML
-format defined by ELF (Express Language Foundation).
+format defined by ELF (Express Language Foundation) (ELF 5005).
 
 The Changes module enables:
 
 * Loading and saving schema change records from/to YAML files
 * Programmatic creation and manipulation of change records
 * Smart edition handling (replace same version, add new version)
-* Support for all change types: additions, modifications, removals, deletions
+* Support for all change types: additions, modifications, deletions
 * Support for mapping changes in ARM/MIM schemas
+* Programmatic import from Express Engine comparison XML files
+
+
+=== Importing from Express Engine XML programmatically
+
+==== General
+
+Expressir provides programmatic API access for parsing Express Engine comparison XML
+and converting it to EXPRESS Changes format.
+
+Parse Eengine XML into a structured object model:
+
+[source,ruby]
+----
+require "expressir/eengine/compare_report"
+
+# Parse from XML string
+xml_content = File.read("comparison.xml")
+report = Expressir::Eengine::CompareReport.from_xml(xml_content)
+
+# Or parse from file
+report = Expressir::Eengine::CompareReport.from_file("comparison.xml")
+----
+
+Convert Eengine XML directly to EXPRESS Changes format:
+
+[source,ruby]
+----
+require "expressir/commands/changes_import_eengine"
+
+# Parse XML and convert to SchemaChange in one step
+xml_content = File.read("comparison.xml")
+change_schema = Expressir::Commands::ChangesImportEengine.from_xml(
+  xml_content,
+  "aic_csg",      # schema name
+  "1.0"           # version
+)
+
+# Use the SchemaChange object
+change_schema.editions.first.additions.each do |item|
+  puts "#{item.type}: #{item.name}"
+  puts "  interfaced_items: #{item.interfaced_items}" if item.interfaced_items
+end
+
+# Save to file
+change_schema.to_file("output.changes.yaml")
+----
+
+==== Compare modes
+
+===== General
+
+Expressir automatically detects and parses all three Eengine XML modes.
+
+[source,ruby]
+----
+# All modes are handled automatically
+arm_report = Expressir::Eengine::CompareReport.from_file("arm_comparison.xml")
+mim_report = Expressir::Eengine::CompareReport.from_file("mim_comparison.xml")
+schema_report = Expressir::Eengine::CompareReport.from_file("schema_comparison.xml")
+
+puts arm_report.mode     # => "arm"
+puts mim_report.mode     # => "mim"
+puts schema_report.mode  # => "schema"
+----
+
+===== Schema mode
+
+`<schema.changes>` with `<schema.additions>`, `<schema.modifications>`, `<schema.deletions>`
+
+[example]
+====
+[source,xml]
+----
+<schema.changes schema_name="aic_csg">
+  <schema.additions>
+    <modified.object type="ENTITY" name="new_entity" />
+  </schema.additions>
+  <schema.modifications>
+    <modified.object type="TYPE" name="modified_type" />
+  </schema.modifications>
+  <schema.deletions>
+    <modified.object type="FUNCTION" name="removed_function" />
+  </schema.deletions>
+</schema.changes>
+----
+====
+
+===== ARM mode
+
+`<arm.changes>` root element with `<arm.additions>`,
+`<arm.modifications>`, and `<arm.deletions>` sections
+
+[example]
+====
+[source,xml]
+----
+<arm.changes schema_name="example_arm">
+  <arm.additions>
+    <modified.object type="ENTITY" name="new_arm_entity" />
+  </arm.additions>
+</arm.changes>
+----
+====
+
+
+===== MIM mode
+
+`<mim.changes>` root element with `<mim.additions>`,
+`<mim.modifications>`, and `<mim.deletions>` sections
+
+[example]
+====
+[source,xml]
+----
+<mim.changes schema_name="example_mim">
+  <mim.additions>
+    <modified.object type="ENTITY" name="new_mim_entity" />
+  </mim.additions>
+</mim.changes>
+----
+====
+
+==== Interface changes
+
+The eengine XML format tracks interface changes (USE_FROM, REFERENCE_FROM) with
+the `interfaced.items` attribute. This attribute lists the specific items being
+imported or referenced from another schema.
+
+.Example XML with interface changes
+[example]
+====
+[source,xml]
+----
+<schema.changes schema_name="aic_csg">
+  <schema.additions>
+    <modified.object type="USE_FROM" name="geometric_model_schema"
+      interfaced.items="convex_hexahedron" />
+
+    <modified.object type="USE_FROM" name="geometric_model_schema"
+      interfaced.items="cyclide_segment_solid" />
+
+    <modified.object type="REFERENCE_FROM" name="measure_schema"
+      interfaced.items="length_measure" />
+  </schema.additions>
+</schema.changes>
+----
+
+This will be converted to EXPRESS Changes YAML as:
+
+[source,yaml]
+----
+schema: aic_csg
+editions:
+- version: '2'
+  description: Changes from eengine comparison
+  additions:
+  - type: USE_FROM
+    name: geometric_model_schema
+    interfaced_items: convex_hexahedron
+  - type: USE_FROM
+    name: geometric_model_schema
+    interfaced_items: cyclide_segment_solid
+  - type: REFERENCE_FROM
+    name: measure_schema
+    interfaced_items: length_measure
+----
+====
+
+Eengine XML files track interface changes (USE_FROM, REFERENCE_FROM) with the
+`interfaced.items` attribute:
+
+[source,ruby]
+----
+report = Expressir::Eengine::CompareReport.from_file("comparison.xml")
+
+# Find interface changes
+report.additions&.modified_objects&.each do |obj|
+  if obj.type == "USE_FROM" || obj.type == "REFERENCE_FROM"
+    puts "#{obj.type} #{obj.name}"
+    puts "  Items: #{obj.interfaced_items}" if obj.interfaced_items
+  end
+end
+----
+
+
+==== Supported change types
+
+The import command recognizes all standard EXPRESS construct types:
+
+* `ENTITY` - Entity definitions
+* `TYPE` - Type definitions
+* `FUNCTION` - Function definitions
+* `PROCEDURE` - Procedure definitions
+* `RULE` - Rule definitions
+* `CONSTANT` - Constant definitions
+* `USE_FROM` - Interface imports (preserves `interfaced.items`)
+* `REFERENCE_FROM` - Interface references (preserves `interfaced.items`)
+
 
 === Reading change files
 
@@ -1192,14 +1454,13 @@ change_schema = Expressir::Changes::SchemaChange.from_file("schema.changes.yaml"
 puts "Schema: #{change_schema.schema}"
 
 # Iterate through change editions
-change_schema.edition_change.each do |edition|
+change_schema.editions.each do |edition|
   puts "Version #{edition.version}: #{edition.description}"
 
   # Access changes by type
   puts "  Additions: #{edition.additions.size}" if edition.additions
   puts "  Modifications: #{edition.modifications.size}" if edition.modifications
   puts "  Deletions: #{edition.deletions.size}" if edition.deletions
-  puts "  Removals: #{edition.removals.size}" if edition.removals
 end
 ----
 
@@ -1210,7 +1471,7 @@ Create a new change schema programmatically:
 [source,ruby]
 ----
 # Create a new empty change schema
-change_schema = Expressir::Changes::SchemaChange.create_new("my_schema")
+change_schema = Expressir::Changes::SchemaChange.new(schema: "my_schema")
 
 # Create change items
 new_entity = Expressir::Changes::ItemChange.new(
@@ -1228,7 +1489,7 @@ modified_function = Expressir::Changes::ItemChange.new(
 changes = {
   additions: [new_entity],
   modifications: [modified_function],
-  removals: []
+  deletions: []
 }
 
 change_schema.add_or_update_edition(
@@ -1292,9 +1553,8 @@ Change editions support categorizing changes into:
 
 `additions`:: New elements added to the schema
 `modifications`:: Existing elements that were modified
-`removals`:: Elements removed from the schema
-`deletions`:: Alternative term for removals (both supported)
-`mapping`:: Mapping-related changes (for ARM/MIM modules)
+`deletions`:: Elements removed from the schema
+`mappings`:: Mapping-related changes (for ARM/MIM modules)
 `changes`:: General changes (alternative to mapping)
 
 [source,ruby]
@@ -1305,7 +1565,7 @@ edition = Expressir::Changes::EditionChange.new(
   additions: [item1, item2],
   modifications: [item3],
   deletions: [item4],
-  mapping: [mapping_change]
+  mappings: [mapping_change]
 )
 ----
 
@@ -1326,7 +1586,7 @@ mapping_change = Expressir::Changes::MappingChange.new(
 ----
 ---
 schema: support_resource_schema
-edition_change:
+editions:
 - version: '2'
   description: |-
     The definitions of the following EXPRESS entity data types were modified:

data/expressir.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "csv"
   spec.add_dependency "liquid"
   spec.add_dependency "lutaml-model"
+  spec.add_dependency "moxml"
   spec.add_dependency "parslet", "~> 2.0"
   spec.add_dependency "ruby-progressbar", "~> 1.11"
   spec.add_dependency "table_tennis"

data/lib/expressir/changes/edition_change.rb

@@ -12,9 +12,8 @@ module Expressir
       attribute :description, :string
       attribute :additions, ItemChange, collection: true
       attribute :modifications, ItemChange, collection: true
-      attribute :removals, ItemChange, collection: true
       attribute :deletions, ItemChange, collection: true
-      attribute :mapping, MappingChange, collection: true
+      attribute :mappings, MappingChange, collection: true
       attribute :changes, MappingChange, collection: true
 
       yaml do
@@ -22,9 +21,8 @@ module Expressir
         map "description", to: :description
         map "additions", to: :additions
         map "modifications", to: :modifications
-        map "removals", to: :removals
         map "deletions", to: :deletions
-        map "mapping", to: :mapping
+        map "mappings", to: :mappings
         map "changes", to: :changes
       end
     end

data/lib/expressir/changes/item_change.rb

@@ -8,7 +8,7 @@ module Expressir
     class ItemChange < Lutaml::Model::Serializable
       attribute :type, :string
       attribute :name, :string
-      attribute :description, :string
+      attribute :description, :string, collection: true
       attribute :interfaced_items, :string
 
       yaml do

data/lib/expressir/changes/mapping_change.rb

@@ -6,11 +6,11 @@ module Expressir
   module Changes
     # Represents a mapping change entry
     class MappingChange < Lutaml::Model::Serializable
-      attribute :change, :string
+      attribute :name, :string
       attribute :description, :string
 
       yaml do
-        map "change", to: :change
+        map "name", to: :name
         map "description", to: :description
       end
     end

data/lib/expressir/changes/schema_change.rb

@@ -8,11 +8,11 @@ module Expressir
     # Represents changes to an EXPRESS schema across multiple versions
     class SchemaChange < Lutaml::Model::Serializable
       attribute :schema, :string
-      attribute :edition_change, EditionChange, collection: true
+      attribute :editions, EditionChange, collection: true
 
       yaml do
         map "schema", to: :schema
-        map "edition_change", to: :edition_change
+        map "editions", to: :editions
       end
 
       class << self
@@ -23,31 +23,26 @@ module Expressir
         def from_file(path)
           content = File.read(path)
           # Handle empty or minimal YAML files
-          return new(schema: "", edition_change: []) if content.strip == "---"
+          return new if content.strip == "---" || content.strip.empty?
 
           from_yaml(content)
         end
-
-        # Create a new empty SchemaChange
-        #
-        # @param schema_name [String] Name of the schema
-        # @return [SchemaChange] New instance with empty change editions
-        def create_new(schema_name)
-          new(schema: schema_name, edition_change: [])
-        end
       end
 
       # Add or update a change edition in this schema
       #
       # @param version [String] Version number
       # @param description [String] Description of changes
-      # @param changes [Hash] Hash with :additions, :modifications, :removals
+      # @param changes [Hash] Hash with :additions, :modifications, :deletions
       # @return [EditionChange] The added or updated edition
       def add_or_update_edition(version, description, changes)
         version_str = version.to_s
 
+        # Initialize editions array if nil
+        self.editions ||= []
+
         # Find existing edition with this version
-        existing_index = edition_change.find_index do |ed|
+        existing_index = editions.find_index do |ed|
           ed.version == version_str
         end
 
@@ -57,16 +52,15 @@ module Expressir
           description: description,
           additions: changes[:additions] || [],
           modifications: changes[:modifications] || [],
-          removals: changes[:removals] || [],
           deletions: changes[:deletions] || [],
         )
 
         if existing_index
           # Replace existing edition with same version
-          edition_change[existing_index] = edition
+          editions[existing_index] = edition
         else
           # Add new edition
-          edition_change << edition
+          editions << edition
         end
 
         edition

data/lib/expressir/changes.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "changes/schema_change"
-require_relative "changes/edition_change"
-require_relative "changes/item_change"
-require_relative "changes/mapping_change"
-
 module Expressir
   # Module for EXPRESS schema change tracking and management
   module Changes
   end
 end
+
+require_relative "changes/schema_change"
+require_relative "changes/mapping_change"

data/lib/expressir/commands/changes_import_eengine.rb

@@ -1,37 +1,44 @@
 # frozen_string_literal: true
 
 require_relative "base"
-require "nokogiri"
+require_relative "../eengine/compare_report"
 
 module Expressir
   module Commands
     # Command to import eengine comparison XML to EXPRESS Changes YAML
     class ChangesImportEengine < Base
-      def self.call(input_file, output_file, schema_name, version, **options)
-        new.call(input_file, output_file, schema_name, version, **options)
+      # Parse XML string and convert to SchemaChange
+      #
+      # @param xml_content [String] Eengine XML content
+      # @param schema_name [String] Schema name
+      # @param version [String] Version identifier
+      # @param options [Hash] Additional options
+      # @return [Expressir::Changes::SchemaChange]
+      def self.from_xml(xml_content, schema_name, version, **options)
+        require "expressir/changes"
+
+        # Parse into CompareReport using Lutaml::Model
+        compare_report = Expressir::Eengine::CompareReport.from_xml(xml_content)
+
+        # Convert to SchemaChange
+        convert_to_schema_change(compare_report, schema_name, version,
+                                 xml_content: xml_content, **options)
       end
 
-      def call(input_file, output_file, schema_name, version, **options)
+      # File-based workflow (backward compatible)
+      def self.call(input_file, output_file, schema_name, version, **options)
         require "expressir/changes"
 
-        # Parse the eengine XML
-        xml_doc = File.open(input_file) { |f| Nokogiri::XML(f) }
-
-        # Extract changes from XML
-        changes = extract_changes(xml_doc)
-        description = generate_description(xml_doc)
+        xml_content = File.read(input_file)
 
-        # Load or create change schema
-        change_schema = if output_file && File.exist?(output_file) && File.size(output_file).positive?
-                          Expressir::Changes::SchemaChange.from_file(output_file)
-                        else
-                          Expressir::Changes::SchemaChange.create_new(schema_name)
-                        end
+        # Load existing schema if output file exists
+        existing_schema = if output_file && File.exist?(output_file) && File.size(output_file).positive?
+                            Expressir::Changes::SchemaChange.from_file(output_file)
+                          end
 
-        # Add or update edition
-        change_schema.add_or_update_edition(version, description, changes)
+        change_schema = from_xml(xml_content, schema_name, version,
+                                 existing_schema: existing_schema, **options)
 
-        # Save to file
         if output_file
           change_schema.to_file(output_file)
           puts "Change YAML file written to: #{output_file}" if options[:verbose]
@@ -42,65 +49,126 @@ module Expressir
         change_schema
       end
 
-      private
+      class << self
+        private
 
-      def extract_changes(xml_doc)
-        {
-          additions: extract_added_objects(xml_doc),
-          modifications: extract_modified_objects(xml_doc),
-          removals: extract_removed_objects(xml_doc),
-        }
-      end
+        def convert_to_schema_change(compare_report, schema_name, version,
+**options)
+          require "expressir/changes"
+
+          # Extract changes from CompareReport
+          changes = {
+            additions: extract_items(compare_report.additions,
+                                     options[:xml_content]),
+            modifications: extract_items(compare_report.modifications,
+                                         options[:xml_content]),
+            deletions: extract_items(compare_report.deletions,
+                                     options[:xml_content]),
+          }
+
+          # Use existing schema or create new one
+          change_schema = options[:existing_schema] ||
+            Expressir::Changes::SchemaChange.new(schema: schema_name)
 
-      def extract_modified_objects(xml_doc)
-        xml_doc.xpath("//schema.modifications/modified.object").map do |node|
-          Expressir::Changes::ItemChange.new(
-            type: node["type"],
-            name: node["name"],
-          )
+          # No edition-level description from eengine (only item-level)
+          change_schema.add_or_update_edition(version, nil, changes)
+
+          change_schema
         end
-      end
 
-      def extract_added_objects(xml_doc)
-        xml_doc.xpath("//schema.additions/added.object").map do |node|
-          Expressir::Changes::ItemChange.new(
-            type: node["type"],
-            name: node["name"],
-          )
+        def extract_items(changes_section, xml_content)
+          return [] unless changes_section&.modified_objects
+
+          # Extract descriptions from XML as arrays
+          descriptions = extract_descriptions_from_xml(xml_content)
+
+          changes_section.modified_objects.map do |obj|
+            Expressir::Changes::ItemChange.new(
+              type: obj.type,
+              name: obj.name,
+              interfaced_items: obj.interfaced_items,
+              description: descriptions[obj.name],
+            )
+          end
         end
-      end
 
-      def extract_removed_objects(xml_doc)
-        xml_doc.xpath("//schema.removals/removed.object").map do |node|
-          Expressir::Changes::ItemChange.new(
-            type: node["type"],
-            name: node["name"],
-          )
+        def extract_descriptions_from_xml(xml_content)
+          return {} unless xml_content
+
+          require "nokogiri"
+          doc = Nokogiri::XML(xml_content)
+
+          doc.xpath("//modified.object").each_with_object({}) do |node, result|
+            name = node["name"]
+            desc_node = node.at_xpath("description")
+            next unless desc_node
+
+            html = desc_node.inner_html.strip
+            next if html.empty?
+
+            # Extract <li> elements or use text content
+            li_elements = Nokogiri::HTML.fragment(html).css("li")
+            result[name] = if li_elements.any?
+                             li_elements.map do |li|
+                               li.text.strip
+                             end.reject(&:empty?)
+                           else
+                             [Nokogiri::HTML.fragment(html).text.strip]
+                           end
+          end
         end
-      end
 
-      def generate_description(xml_doc)
-        parts = []
+        def extract_description(compare_report)
+          parts = []
 
-        # Get descriptions from modifications
-        xml_doc.xpath("//schema.modifications/modified.object/description").each do |desc|
-          text = desc.text.strip
-          parts << text unless text.empty?
-        end
+          [compare_report.modifications, compare_report.additions,
+           compare_report.deletions].each do |section|
+            next unless section&.modified_objects
 
-        # Get descriptions from additions
-        xml_doc.xpath("//schema.additions/added.object/description").each do |desc|
-          text = desc.text.strip
-          parts << text unless text.empty?
+            section.modified_objects.each do |obj|
+              next unless obj.description
+
+              description_text = normalize_description(obj.description)
+              next if description_text.strip.empty?
+
+              parts << convert_html_to_asciidoc(description_text.strip)
+            end
+          end
+
+          parts.empty? ? nil : parts.join("\n\n")
         end
 
-        # Get descriptions from removals
-        xml_doc.xpath("//schema.removals/removed.object/description").each do |desc|
-          text = desc.text.strip
-          parts << text unless text.empty?
+        def normalize_description(description)
+          # Handle both String and Array (when XML has nested elements)
+          case description
+          when String
+            description
+          when Array
+            # Join array elements, handling nested structures
+            description.map { |elem| normalize_description(elem) }.join("\n")
+          when Hash
+            # Handle hash elements (from XML parsing)
+            if description.key?("__text__")
+              description["__text__"]
+            else
+              description.values.map { |v| normalize_description(v) }.join("\n")
+            end
+          else
+            description.to_s
+          end
         end
 
-        parts.join("\n\n")
+        def convert_html_to_asciidoc(text)
+          # Convert <ul><li>...</li></ul> to AsciiDoc list format
+          text = text.gsub(%r{<ul>\s*}i, "")
+          text = text.gsub(%r{\s*</ul>}i, "")
+          text = text.gsub(%r{<li>(.*?)</li>}im) do
+            "* #{Regexp.last_match(1).strip}"
+          end
+
+          # Clean up any extra whitespace
+          text.strip
+        end
       end
     end
   end

data/lib/expressir/commands/changes_validate.rb

@@ -31,7 +31,7 @@ module Expressir
 
           say "✓ File is valid" if options[:verbose]
           say "  Schema: #{schema_change.schema}" if options[:verbose]
-          say "  Editions: #{schema_change.edition_change.length}" if options[:verbose]
+          say "  Editions: #{schema_change.editions.length}" if options[:verbose]
 
           # Normalize if requested
           if options[:normalize]

data/lib/expressir/eengine/arm_compare_report.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+require_relative "changes_section"
+require_relative "modified_object"
+
+module Expressir
+  module Eengine
+    # Represents an Eengine ARM comparison XML report
+    class ArmCompareReport < Lutaml::Model::Serializable
+      attribute :modifications, ChangesSection
+      attribute :additions, ChangesSection
+      attribute :deletions, ChangesSection
+
+      xml do
+        root "arm.changes"
+        map_element "arm.modifications", to: :modifications
+        map_element "arm.additions", to: :additions
+        map_element "arm.deletions", to: :deletions
+      end
+
+      def mode
+        "arm"
+      end
+    end
+  end
+end

data/lib/expressir/eengine/changes_section.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+require_relative "modified_object"
+
+module Expressir
+  module Eengine
+    # Represents a section of changes (modifications, additions, or deletions)
+    # in an Eengine comparison report
+    class ChangesSection < Lutaml::Model::Serializable
+      attribute :modified_objects, ModifiedObject, collection: true
+
+      xml do
+        root "changes.section"
+        map_element "modified.object", to: :modified_objects
+      end
+    end
+  end
+end

data/lib/expressir/eengine/compare_report.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+Lutaml::Model::Config.configure do |config|
+  require "lutaml/model/xml_adapter/nokogiri_adapter"
+  config.xml_adapter = Lutaml::Model::XmlAdapter::NokogiriAdapter
+end
+
+require_relative "changes_section"
+require_relative "modified_object"
+require_relative "arm_compare_report"
+require_relative "mim_compare_report"
+
+module Expressir
+  module Eengine
+    # Represents an Eengine comparison XML report
+    # Supports three modes: ARM, MIM, and Schema
+    class CompareReport < Lutaml::Model::Serializable
+      attribute :modifications, ChangesSection
+      attribute :additions, ChangesSection
+      attribute :deletions, ChangesSection
+
+      xml do
+        root "schema.changes"
+        map_element "schema.modifications", to: :modifications
+        map_element "schema.additions", to: :additions
+        map_element "schema.deletions", to: :deletions
+      end
+
+      class << self
+        # Parse XML and return appropriate report class based on mode
+        #
+        # @param xml_content [String] XML content
+        # @return [CompareReport, ArmCompareReport, MimCompareReport]
+        def from_xml(xml_content)
+          mode = detect_mode(xml_content)
+
+          case mode
+          when "arm"
+            ArmCompareReport.from_xml(xml_content)
+          when "mim"
+            MimCompareReport.from_xml(xml_content)
+          else
+            super
+          end
+        end
+
+        # Load a CompareReport from an XML file
+        #
+        # @param path [String] Path to the XML file
+        # @return [CompareReport] The loaded comparison report
+        def from_file(path)
+          from_xml(File.read(path))
+        end
+
+        private
+
+        # Detect XML mode from content
+        #
+        # @param xml_content [String] XML content
+        # @return [String] "arm", "mim", or "schema"
+        def detect_mode(xml_content)
+          if xml_content.include?("<arm.changes")
+            "arm"
+          elsif xml_content.include?("<mim.changes")
+            "mim"
+          else
+            "schema"
+          end
+        end
+      end
+
+      # Detect XML mode from the report
+      # @return [String] "arm", "mim", or "schema"
+      def mode
+        "schema"
+      end
+    end
+  end
+end

data/lib/expressir/eengine/mim_compare_report.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+require_relative "changes_section"
+require_relative "modified_object"
+
+module Expressir
+  module Eengine
+    # Represents an Eengine MIM comparison XML report
+    class MimCompareReport < Lutaml::Model::Serializable
+      attribute :modifications, ChangesSection
+      attribute :additions, ChangesSection
+      attribute :deletions, ChangesSection
+
+      xml do
+        root "mim.changes"
+        map_element "mim.modifications", to: :modifications
+        map_element "mim.additions", to: :additions
+        map_element "mim.deletions", to: :deletions
+      end
+
+      def mode
+        "mim"
+      end
+    end
+  end
+end

data/lib/expressir/eengine/modified_object.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Expressir
+  module Eengine
+    # Represents a modified EXPRESS object in an Eengine comparison report
+    class ModifiedObject < Lutaml::Model::Serializable
+      attribute :type, :string
+      attribute :name, :string
+      attribute :interfaced_items, :string
+      attribute :description, :string
+
+      xml do
+        root "modified.object"
+        map_attribute "type", to: :type
+        map_attribute "name", to: :name
+        map_attribute "interfaced.items", to: :interfaced_items
+        map_element "description", to: :description
+      end
+    end
+  end
+end

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "2.1.27".freeze
+  VERSION = "2.1.29".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.1.27
+  version: 2.1.29
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-12 00:00:00.000000000 Z
+date: 2025-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: moxml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +202,11 @@ files:
 - lib/expressir/commands/version.rb
 - lib/expressir/config.rb
 - lib/expressir/coverage.rb
+- lib/expressir/eengine/arm_compare_report.rb
+- lib/expressir/eengine/changes_section.rb
+- lib/expressir/eengine/compare_report.rb
+- lib/expressir/eengine/mim_compare_report.rb
+- lib/expressir/eengine/modified_object.rb
 - lib/expressir/express/cache.rb
 - lib/expressir/express/error.rb
 - lib/expressir/express/formatter.rb