expressir 2.4.19 → 2.4.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5174add01b6b7053e2317d479e746ba330901c6bdc547d5ba7429ea46889ae3
-  data.tar.gz: 66bd27f4a626a956e840f90013bbe5ce7dc6817f127c554bccf5cb413cbd2981
+  metadata.gz: 135dc464431342c0d2cb4e9099aa340900fc3233017279a512dd3c8836cbb2ef
+  data.tar.gz: 16dd1c39605154033d2c531d06ad457087a8c1207b65747d293b69abff15cd09
 SHA512:
-  metadata.gz: 6aa415b0bd88d3cf5bd95d3786b01dff6f66e00e13ca95a3a19755f1e60cc17163800841fd9f7ea21d98acee505c0b67ae1ef6a3e3e032394cfb848395b1295d
-  data.tar.gz: ce39ba436ff04bf239e16744625c2e989b75db1674ffed24314d9fb75ae393e0f3b9ca8f0ab9263a47cd79572807e958f29ebfcedc88c42f00e886c9dd75a14f
+  metadata.gz: '0198679d1aaca04bb6291ebea7eec331d4c63e1b2a04da7d37e47ee68bc438b35162728ac48f8c319bc3ef5e4112cfb5eb491e687d24641b49b46f9ab7273b2f'
+  data.tar.gz: fb9f8447d7cf92dec90d73d486c3118ccbf6d265646a1e03eec9c44e45ab31b48a75169fae9cc8c7908a342053c21f4453ff856f4676f1d0eb4e479cdf9c45f6

data/expressir.gemspec

@@ -31,6 +31,12 @@ Gem::Specification.new do |spec|
     end
   end
 
+  # Build the Rust core extension at install time. extconf.rb fails
+  # soft (dummy Makefile) wherever cargo is unavailable, so installs
+  # without a Rust toolchain fall back to the pure-Ruby parser.
+  spec.extensions = ["ext/expressir_core/extconf.rb"]
+  spec.add_dependency "rb_sys", "~> 0.9.130"
+
   spec.add_dependency "base64"
   spec.add_dependency "benchmark"
   spec.add_dependency "benchmark-ips"

data/ext/expressir_core/extconf.rb

@@ -10,6 +10,16 @@ if RUBY_ENGINE != "ruby" || ENV["EXPRESSIR_CORE"] == "0"
   exit 0
 end
 
+# Windows rubies are mingw-built while rustup defaults to the msvc
+# toolchain; rb-sys cannot bridge the two, so skip there too (windows
+# installs fall back to the pure-Ruby parser).
+if Gem::Platform.local.os == "mingw32"
+  File.write("Makefile", dummy_makefile("").to_s)
+  warn "expressir: skipping the Rust core extension on mingw (msvc " \
+       "toolchain mismatch)"
+  exit 0
+end
+
 # Pure-Ruby fallback when no Rust toolchain is available: the gem must
 # install and keep working without the native core
 # (Expressir::Core::NATIVE_AVAILABLE stays false). Prebuilt platform

data/lib/expressir/mapping/refpath.rb

@@ -15,6 +15,10 @@ module Expressir
     #   link       := "->" | "<-" | "<=" | "=>" | "=" NAME
     #                                            (relation to the previous node)
     #   node       := NAME ["." ATTRIBUTE]
+    #               | LINK                    (<<express:SCHEMA.ITEM,ITEM>>,
+    #                                          #460: a link may stand
+    #                                          wherever a declaration
+    #                                          is referenced)
     #   index      := "[" ("i" | DIGITS) "]"
     #   MARKER     := "{" | "}" | "[" | "]" | "(" | ")" | ":" | "|" | "!"
     #               | "," | "/" | "*"           (grouping/annotation; no
@@ -42,6 +46,8 @@ module Expressir
         attribute :attribute, :string
         attribute :index, :string
         attribute :literal, :string
+        # annotated EXPRESS link form: <<express:SCHEMA.ITEM,ITEM>>
+        attribute :link, :string
 
         key_value do
           map "operator", to: :operator
@@ -49,6 +55,7 @@ module Expressir
           map "attribute", to: :attribute
           map "index", to: :index
           map "literal", to: :literal
+          map "link", to: :link
         end
       end
 
@@ -62,7 +69,10 @@ module Expressir
         end
       end
 
-      TOKEN = /->|<-|<=|=>|[{}\[\]()=:|!,*\/]|'(?:''|[^'])*'|\w+(?:\.\w+)?/
+      EXPRESS_LINK_PATH = /\A<<express:([^,>]+)(?:,[^>]+)?>>\z/
+      private_constant :EXPRESS_LINK_PATH
+
+      TOKEN = /<<express:[^,>]+(?:,[^>]+)?>>|->|<-|<=|=>|[{}\[\]()=:|!,*\/]|'(?:''|[^'])*'|\w+(?:\.\w+)?/
       MARKERS = ["{", "}", "[", "]", "(", ")", ":", "|", "!", ",", "/",
                  "*", "MAPPING_OF"].freeze
       LINKS = ["->", "<-", "<=", "=>"].freeze
@@ -109,6 +119,10 @@ module Expressir
             end
           when *MARKERS
             steps << Step.new(operator: token)
+          when /\A<<express:/
+            steps << Step.new(operator: pending_link, link: token)
+            pending_link = nil
+            pending_type_assign = false
           else
             name, _, attribute = token.partition(".")
             operator = pending_link || ("=" if pending_type_assign)
@@ -152,8 +166,12 @@ module Expressir
           # markers never break the running link, mirroring parse
           next if MARKERS.include?(step.operator)
 
-          issues.concat(check_step(step, pos, prev, last_qualified, by_name))
-          prev = step if step.name
+          if step.link
+            issues.concat(check_link_step(step, pos, repository))
+          else
+            issues.concat(check_step(step, pos, prev, last_qualified, by_name))
+          end
+          prev = step if step.name || step.link
           last_qualified = step if step.name && step.attribute
         end
         issues
@@ -175,6 +193,28 @@ module Expressir
         index
       end
 
+      # Annotated EXPRESS link node: <<express:SCHEMA.ITEM,ITEM>>
+      # (item part optional) resolves against the repository (#460).
+      def check_link_step(step, pos, repository)
+        parts = step.link.match(EXPRESS_LINK_PATH)
+        return [Issue.new(step: pos, message: "malformed link '#{step.link}'")] unless parts
+
+        schema_id, item_id = parts[1].split(".", 2).compact
+        schema = repository.schemas
+          .find { |s| s.id&.safe_downcase == schema_id&.safe_downcase }
+        unless schema
+          return [Issue.new(step: pos,
+                            message: "unknown schema '#{schema_id}' in #{step.link}")]
+        end
+
+        return [] if item_id.nil?
+        return [] if Expressir::Mapping.item_declared?(schema, item_id)
+
+        [Issue.new(step: pos,
+                   message: "schema '#{schema_id}' does not declare " \
+                            "'#{item_id}' (#{step.link})")]
+      end
+
       def check_step(step, pos, prev, last_qualified, by_name)
         found = by_name[step.name&.safe_downcase]
         return [Issue.new(step: pos, message: "unknown type '#{step.name}'")] unless found

data/lib/expressir/mapping.rb

@@ -136,8 +136,16 @@ module Expressir
     def values(document)
       document.ae.to_a.flat_map do |element|
         [element.entity, element.aimelt] +
-          element.aa.to_a.flat_map { |aa| [aa.attribute, aa.aimelt] }
-      end.compact
+          element.aa.to_a.flat_map do |aa|
+            [aa.attribute, aa.aimelt, aa.assertion_to]
+          end
+      end.compact + subtype_constraint_values(document)
+    end
+
+    # Every declaration reference in the sc entries (#460): the
+    # constraint name and the entity it constrains.
+    def subtype_constraint_values(document)
+      document.sc.to_a.flat_map { |sc| [sc.constraint, sc.entity] }.compact
     end
 
     # Every reference path in the document as [location, content]

data/lib/expressir/version.rb

@@ -3,6 +3,6 @@ module Expressir
   # autoload it (Ruby autoload only works for module/class constants, not
   # for string constants like `Expressir::VERSION`).
   module Version
-    VERSION = "2.4.19".freeze
+    VERSION = "2.4.21".freeze
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.4.19
+  version: 2.4.21
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-09-24 00:00:00.000000000 Z
+date: 2026-09-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rb_sys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.130
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.130
 - !ruby/object:Gem::Dependency
   name: base64
   requirement: !ruby/object:Gem::Requirement
@@ -232,7 +246,8 @@ email:
 - open.source@ribose.com
 executables:
 - expressir
-extensions: []
+extensions:
+- ext/expressir_core/extconf.rb
 extra_rdoc_files: []
 files:
 - ".cargo/config.toml"