expressir 2.1.31 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86dddb255000efd588dcc03ff9becca7ca18c266ca9e6a8bd65d1c2ad3579a74
-  data.tar.gz: 328796caedfd26153efb05991dae70f174462d9a57a8dbcd4501545e7547b8e1
+  metadata.gz: 0cf66e8d02967b85a1d4514eabaf543948bb3631c651b27dcbd74794f65eb56a
+  data.tar.gz: 6d04084c3f3498d716a4e81bff5bb5098dd233756c3c8decac9887214a25e394
 SHA512:
-  metadata.gz: 3333dfed5188687a946318cb8974fa686e5d1ae3bab39f4de5d17812b4087ab136fc4e5e59c71a2f8b9e01f676c7e82ac9f459140515a4c15eef25e22d179635
-  data.tar.gz: 374435ed70320043ec24488bc5d9cbe5e65c7faaba55b75db2382c18a1d8579bdc463a8c769fcbac435b6411c2a2023af3b87aa400f34d64911f0ba4de6ed68f
+  metadata.gz: 995539b97506ccd8547382efd281922b00ae60855e22f433e8568f9149bd14fc444a7890c373c8f984610b2e0d06694a8bc3fc89f7c864c24136bfe629496784
+  data.tar.gz: 2634792ad654c03c71992dc976c3dc44b96d344961c1256f7e5f4a55f30b8345b4ba8b2587d7af058bf0068693637cc7eaec5975ee9aa61344889f22dc7bd00a

data/.github/workflows/docs.yml

@@ -70,12 +70,13 @@ jobs:
   deploy:
     # Only deploy on push to main/master, not on PRs
     if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master')
-    
+
     needs: build
-    
+
     permissions:
       pages: write
       id-token: write
+      contents: write
     
     environment:
       name: github-pages

data/.github/workflows/release.yml

@@ -4,6 +4,7 @@ permissions:
   contents: write
   packages: write
   pull-requests: write
+  id-token: write
 
 on:
   workflow_dispatch:
@@ -20,6 +21,11 @@ on:
 jobs:
   release:
     uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
+    permissions:
+      id-token: write
+      contents: write
+      packages: write
+      pull-requests: write
     with:
       next_version: ${{ github.event.inputs.next_version }}
       release_command: rake release

data/.rubocop_todo.yml

@@ -1,74 +1,46 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-12-11 03:37:20 UTC using RuboCop version 1.81.1.
+# on 2026-03-12 10:28:38 UTC using RuboCop version 1.85.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: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/ArgumentAlignment:
-  Exclude:
-    - 'lib/expressir/commands/validate.rb'
-
 # Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleAlignWith.
-# SupportedStylesAlignWith: either, start_of_block, start_of_line
-Layout/BlockAlignment:
+Gemspec/RequiredRubyVersion:
   Exclude:
-    - 'lib/expressir/commands/validate_ascii.rb'
+    - 'expressir.gemspec'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-Layout/BlockEndNewline:
-  Exclude:
-    - 'lib/expressir/commands/validate_ascii.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Width, AllowedPatterns.
-Layout/IndentationWidth:
+# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
+Layout/ExtraSpacing:
   Exclude:
-    - 'lib/expressir/commands/validate_ascii.rb'
+    - 'lib/expressir/benchmark.rb'
 
-# Offense count: 881
+# Offense count: 990
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
+# Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Enabled: false
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: final_newline, final_blank_line
-Layout/TrailingEmptyLines:
-  Exclude:
-    - 'lib/expressir/commands/validate_load.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
-  Exclude:
-    - 'lib/expressir/commands/validate.rb'
-
-# Offense count: 3
+# Offense count: 8
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches, IgnoreDuplicateElseBranch.
 Lint/DuplicateBranch:
   Exclude:
     - 'lib/expressir/commands/package.rb'
     - 'lib/expressir/coverage.rb'
+    - 'lib/expressir/express/builder.rb'
+    - 'lib/expressir/express/formatters/declarations_formatter.rb'
+    - 'lib/expressir/express/remark_attacher.rb'
     - 'lib/expressir/model/search_engine.rb'
 
-# Offense count: 1
+# Offense count: 2
 Lint/DuplicateCaseCondition:
   Exclude:
     - 'lib/expressir/commands/package.rb'
+    - 'lib/expressir/express/formatter.rb'
 
 # Offense count: 1
 Lint/DuplicateMethods:
@@ -91,38 +63,38 @@ Lint/UnusedMethodArgument:
     - 'lib/expressir/express/cache.rb'
     - 'lib/expressir/express/parser.rb'
 
-# Offense count: 175
+# Offense count: 227
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Enabled: false
 
-# Offense count: 5
+# Offense count: 8
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 46
+  Max: 98
 
-# Offense count: 1
+# Offense count: 14
 # Configuration parameters: CountBlocks, CountModifierForms.
 Metrics/BlockNesting:
-  Max: 4
+  Max: 6
 
-# Offense count: 120
+# Offense count: 189
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-# Offense count: 230
+# Offense count: 276
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 193
+  Max: 170
 
 # Offense count: 6
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
   Max: 8
 
-# Offense count: 97
+# Offense count: 162
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Enabled: false
@@ -134,24 +106,16 @@ Naming/MethodParameterName:
   Exclude:
     - 'lib/expressir/model/repository_validator.rb'
 
-# Offense count: 5
+# Offense count: 3
 # Configuration parameters: Mode, AllowedMethods, AllowedPatterns, AllowBangMethods, WaywardPredicates.
 # AllowedMethods: call
-# WaywardPredicates: nonzero?
+# WaywardPredicates: infinite?, nonzero?
 Naming/PredicateMethod:
   Exclude:
     - 'lib/expressir/model/indexes/reference_index.rb'
     - 'lib/expressir/model/search_engine.rb'
-    - 'scripts/validate_mapping.rb'
-
-# Offense count: 135
-# Configuration parameters: EnforcedStyle, AllowedIdentifiers, AllowedPatterns, ForbiddenIdentifiers, ForbiddenPatterns.
-# SupportedStyles: snake_case, camelCase
-Naming/VariableName:
-  Exclude:
-    - 'lib/expressir/express/visitor.rb'
 
-# Offense count: 5
+# Offense count: 11
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
 # SupportedStyles: snake_case, normalcase, non_integer
 # AllowedIdentifiers: TLS1_1, TLS1_2, capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
@@ -159,11 +123,19 @@ Naming/VariableNumber:
   Exclude:
     - 'lib/expressir/commands/validate_ascii.rb'
     - 'spec/expressir/commands/validate_ascii_spec.rb'
+    - 'spec/expressir/express/pretty_formatter_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: MinSize.
+Performance/CollectionLiteralInLoop:
+  Exclude:
+    - 'lib/expressir/express/streaming_builder.rb'
 
 # Offense count: 5
 Performance/FixedSize:
   Exclude:
-    - 'lib/expressir/express/formatter.rb'
+    - 'lib/expressir/express/formatters/data_types_formatter.rb'
+    - 'lib/expressir/express/formatters/declarations_formatter.rb'
 
 # Offense count: 6
 Performance/MapMethodChain:
@@ -208,7 +180,7 @@ RSpec/DescribeMethod:
     - 'spec/expressir/model/repository_statistics_spec.rb'
     - 'spec/expressir/model/search_engine_advanced_spec.rb'
 
-# Offense count: 431
+# Offense count: 465
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 123
@@ -251,7 +223,7 @@ RSpec/MessageSpies:
     - 'spec/expressir/model/repository_validator_spec.rb'
     - 'spec/expressir/model/search_engine_spec.rb'
 
-# Offense count: 540
+# Offense count: 580
 RSpec/MultipleExpectations:
   Max: 114
 
@@ -265,11 +237,22 @@ RSpec/MultipleMemoizedHelpers:
 RSpec/NestedGroups:
   Max: 4
 
-# Offense count: 3
-RSpec/PendingWithoutReason:
+# Offense count: 35
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/Output:
   Exclude:
-    - 'spec/expressir/model/declarations/rule_spec.rb'
-    - 'spec/expressir/model/declarations/schema_spec.rb'
+    - 'spec/acceptance/version_spec.rb'
+    - 'spec/expressir/express/cache_spec.rb'
+    - 'spec/expressir/express/formatter_spec.rb'
+    - 'spec/expressir/express/parser_spec.rb'
+    - 'spec/expressir/model/model_element_spec.rb'
+    - 'spec/spec_helper.rb'
+
+# Offense count: 28
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/ReceiveMessages:
+  Exclude:
+    - 'spec/expressir/model/search_engine_advanced_spec.rb'
 
 # Offense count: 1
 RSpec/RemoveConst:
@@ -285,8 +268,9 @@ RSpec/RepeatedExample:
     - 'spec/expressir/model/indexes/type_index_spec.rb'
     - 'spec/expressir/model/interface_validator_spec.rb'
 
-# Offense count: 6
-# Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata.
+# Offense count: 7
+# Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata, InflectorPath, EnforcedInflector.
+# SupportedInflectors: default, active_support
 RSpec/SpecFilePathFormat:
   Exclude:
     - '**/spec/routing/**/*'
@@ -294,20 +278,17 @@ RSpec/SpecFilePathFormat:
     - 'spec/expressir/commands/package_fixtures_spec.rb'
     - 'spec/expressir/commands/package_nil_guards_spec.rb'
     - 'spec/expressir/commands/package_nil_scenarios_spec.rb'
+    - 'spec/expressir/express/visitor/remark_attacher_spec.rb'
     - 'spec/expressir/model/repository_statistics_spec.rb'
     - 'spec/expressir/model/search_engine_advanced_spec.rb'
 
-# Offense count: 171
+# Offense count: 48
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
     - 'spec/expressir/commands/package_nil_guards_spec.rb'
     - 'spec/expressir/commands/package_nil_scenarios_spec.rb'
-    - 'spec/expressir/model/indexes/entity_index_spec.rb'
-    - 'spec/expressir/model/indexes/reference_index_spec.rb'
-    - 'spec/expressir/model/indexes/type_index_spec.rb'
-    - 'spec/expressir/model/repository_statistics_spec.rb'
-    - 'spec/expressir/model/repository_validator_spec.rb'
+    - 'spec/expressir/express/pretty_formatter_spec.rb'
     - 'spec/expressir/model/search_engine_advanced_spec.rb'
 
 # Offense count: 4
@@ -315,17 +296,6 @@ Security/MarshalLoad:
   Exclude:
     - 'lib/expressir/package/reader.rb'
 
-# Offense count: 1
-# 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
-# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
-# FunctionalMethods: let, let!, subject, watch
-# AllowedMethods: lambda, proc, it
-Style/BlockDelimiters:
-  Exclude:
-    - 'lib/expressir/commands/validate_ascii.rb'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, AllowComments.
@@ -342,11 +312,55 @@ Style/FormatStringToken:
   EnforcedStyle: unannotated
 
 # Offense count: 1
-Style/MissingRespondToMissing:
+# Configuration parameters: MinBranchesCount.
+Style/HashLikeCase:
+  Exclude:
+    - 'lib/expressir/express/remark_attacher.rb'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/PartitionInsteadOfDoubleSelect:
+  Exclude:
+    - 'lib/expressir/express/transformer/remark_handling.rb'
+    - 'spec/expressir/model/search_engine_advanced_spec.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantParentheses:
+  Exclude:
+    - 'lib/expressir/express/parser.rb'
+
+# Offense count: 33
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/SelectByKind:
+  Exclude:
+    - 'lib/expressir/express/builders/function_decl_builder.rb'
+    - 'lib/expressir/express/builders/procedure_decl_builder.rb'
+    - 'lib/expressir/express/builders/rule_decl_builder.rb'
+    - 'lib/expressir/express/builders/schema_decl_builder.rb'
+    - 'lib/expressir/model/search_engine.rb'
+    - 'spec/expressir/coverage_spec.rb'
+    - 'spec/expressir/model/declarations/schema_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowModifier.
+Style/SoleNestedConditional:
   Exclude:
-    - 'lib/expressir/express/visitor.rb'
+    - 'lib/expressir/model/search_engine.rb'
 
 # Offense count: 1
-Style/OpenStructUse:
+# This cop supports safe autocorrection (--autocorrect).
+Style/SuperArguments:
   Exclude:
-    - 'spec/expressir/commands/package_tree_spec.rb'
+    - 'lib/expressir/errors.rb'
+
+# Offense count: 18
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleForMultiline.
+# SupportedStylesForMultiline: comma, consistent_comma, diff_comma, no_comma
+Style/TrailingCommaInArguments:
+  Exclude:
+    - 'lib/expressir/commands/format.rb'
+    - 'lib/expressir/commands/package.rb'
+    - 'lib/expressir/commands/validate_load.rb'

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 
 gem "canon"
 gem "lutaml-model", github: "lutaml/lutaml-model", branch: "main"
-gem "openssl"
+gem "openssl", "~> 3.0"
 gem "rake"
 gem "rspec"
 gem "rubocop"