expressir 2.3.4 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e990830fa008a30ebb6b937e503030069e175b329ff44f3eebe212adaa5066b
-  data.tar.gz: 6f84bc382c6e49c6402298a5e1f6557343ad6864e7dfa5364bc52e4467fc6cf3
+  metadata.gz: 055f0b5a07f8fdbd0f078d9010e4dc4d119058a0301016bf93254d86e96c38af
+  data.tar.gz: 5f340ae55403cb3115536299cacce02fb102661035b875e251975eb8334e06a8
 SHA512:
-  metadata.gz: ae27b6f9b65e7622db436d3658867ce76587884b215b0a6f74954740c0110ae957b8ed35c887a7ebeda0c91ea7db4b30bb23836da21730e5cba296a7b2bfc9dd
-  data.tar.gz: 362a01b5e21d36d050ec1049f626a44bb0e62cd2ced0cd74c5581faee4f9903313fe5aaefff20df5c2c814979df4bc806ef621b23cbdb9af71831128485cbc33
+  metadata.gz: 0e6f194e91f9db5c9fdf5d1f25777a054e040dd015e66a7ba253503d80bdd73f04f872041cb3f7e6b415c0e9ff80660619c7ea7f1751de6ed0469bd73e7b2310
+  data.tar.gz: b49300bb99f04eea589b524affa6a96f4ba2dc37773c583042e047b2682b1e9eab64dbe2e9ce0dfbc37f47ddffb3d83c0240a03b72090654e8ed56d88db8c024

data/.gitignore

@@ -24,3 +24,19 @@
 _site/
 
 Gemfile.lock
+
+# Claude Code
+.claude/
+
+# Development / transient files
+*.ler
+*.pax
+TODO.*.md
+debug_*.rb
+measure_mem.rb
+tmp_*.rb
+mise.toml
+Gemfile.local
+Gemfile.local.lock
+Gemfile.original
+benchmark/

data/.rubocop_todo.yml

@@ -1,20 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-05-11 08:18:39 UTC using RuboCop version 1.86.0.
+# on 2026-05-12 14:41:49 UTC using RuboCop version 1.86.0.
 # 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: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/ArgumentAlignment:
-  Exclude:
-    - 'lib/expressir/express/remark_attacher.rb'
-
-# Offense count: 1082
+# Offense count: 1084
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
@@ -80,7 +72,7 @@ Metrics/BlockNesting:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-# Offense count: 287
+# Offense count: 289
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 167

data/lib/expressir/express/builders/constant_builder.rb

@@ -12,7 +12,9 @@ module Expressir
         def build_constant_body(ast_data)
           id = Builder.build_optional(ast_data[:constant_id])
           type = Builder.build_optional(ast_data[:instantiable_type])
-          expression = Builder.build_optional(ast_data[:expression])
+          expression = if ast_data[:expression]
+                         Builder.build({ expression: ast_data[:expression] })
+                       end
 
           Expressir::Model::Declarations::Constant.new(id: id, type: type,
                                                        expression: expression)

data/lib/expressir/express/builders/derived_attr_builder.rb

@@ -11,7 +11,9 @@ module Expressir
                    Builder.build({ attribute_decl: attr_decl_data })
                  end
           type = Builder.build_optional(ast_data[:parameter_type])
-          expression = Builder.build_optional(ast_data[:expression])
+          expression = if ast_data[:expression]
+                         Builder.build({ expression: ast_data[:expression] })
+                       end
 
           Expressir::Model::Declarations::DerivedAttribute.new(
             id: attr&.id,

data/lib/expressir/express/builders/domain_rule_builder.rb

@@ -9,7 +9,9 @@ module Expressir
           inner_data = ast_data[:domain_rule] || ast_data
 
           id = Builder.build_optional(inner_data[:rule_label_id])
-          expression = Builder.build_optional(inner_data[:expression])
+          expression = if inner_data[:expression]
+                         Builder.build({ expression: inner_data[:expression] })
+                       end
           Expressir::Model::Declarations::WhereRule.new(id: id,
                                                         expression: expression)
         end

data/lib/expressir/express/builders/expression_builder.rb

@@ -223,13 +223,14 @@ module Expressir
         end
 
         def build_qualifier(ast_data)
-          if ast_data[:attribute_qualifier]
+          data = ast_data[:qualifier] || ast_data
+          if data[:attribute_qualifier]
             Builder.build_node(:attribute_qualifier,
-                               ast_data[:attribute_qualifier])
-          elsif ast_data[:group_qualifier]
-            Builder.build_node(:group_qualifier, ast_data[:group_qualifier])
-          elsif ast_data[:index_qualifier]
-            Builder.build_node(:index_qualifier, ast_data[:index_qualifier])
+                               data[:attribute_qualifier])
+          elsif data[:group_qualifier]
+            Builder.build_node(:group_qualifier, data[:group_qualifier])
+          elsif data[:index_qualifier]
+            Builder.build_node(:index_qualifier, data[:index_qualifier])
           end
         end
 
@@ -304,7 +305,9 @@ module Expressir
         end
 
         def build_parameter(ast_data)
-          Builder.build_optional(ast_data[:expression])
+          if ast_data[:expression]
+            Builder.build({ expression: ast_data[:expression] })
+          end
         end
 
         # Entity constructor
@@ -354,7 +357,9 @@ module Expressir
         end
 
         def build_element(ast_data)
-          expression = Builder.build_optional(ast_data[:expression])
+          expression = if ast_data[:expression]
+                         Builder.build({ expression: ast_data[:expression] })
+                       end
           repetition = Builder.build_optional(ast_data[:repetition])
 
           if repetition

data/lib/expressir/express/builders/helpers.rb

@@ -138,6 +138,12 @@ module Expressir
           when Expressir::Model::References::IndexReference
             Expressir::Model::References::IndexReference.new(ref: ref,
                                                              index1: qualifier.index1, index2: qualifier.index2)
+          when Expressir::Model::References::SimpleReference
+            Expressir::Model::References::AttributeReference.new(ref: ref,
+                                                                 attribute: qualifier)
+          when Hash
+            Expressir::Model::References::IndexReference.new(ref: ref,
+                                                             index1: qualifier[:index1], index2: qualifier[:index2])
           else
             ref
           end

data/lib/expressir/express/builders/statement_builder.rb

@@ -36,7 +36,9 @@ module Expressir
 
         def build_assignment_stmt(ast_data)
           ref = Builder.build_optional(ast_data[:general_ref])
-          expression = Builder.build_optional(ast_data[:expression])
+          expression = if ast_data[:expression]
+                         Builder.build({ expression: ast_data[:expression] })
+                       end
 
           if ast_data[:qualifier]
             Builder.ensure_array(ast_data[:qualifier]).each do |qual|
@@ -93,7 +95,9 @@ module Expressir
         end
 
         def build_selector(ast_data)
-          Builder.build_optional(ast_data[:expression])
+          if ast_data[:expression]
+            Builder.build({ expression: ast_data[:expression] })
+          end
         end
 
         def build_case_action(ast_data)
@@ -107,7 +111,9 @@ module Expressir
         end
 
         def build_case_label(ast_data)
-          Builder.build_optional(ast_data[:expression])
+          if ast_data[:expression]
+            Builder.build({ expression: ast_data[:expression] })
+          end
         end
 
         def build_compound_stmt(ast_data)
@@ -170,7 +176,9 @@ module Expressir
         end
 
         def build_return_stmt(ast_data)
-          expression = Builder.build_optional(ast_data[:expression])
+          expression = if ast_data[:expression]
+                         Builder.build({ expression: ast_data[:expression] })
+                       end
           Expressir::Model::Statements::Return.new(expression: expression)
         end
 

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "2.3.4".freeze
+  VERSION = "2.3.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-11 00:00:00.000000000 Z
+date: 2026-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64