expressir 2.4.19 → 2.4.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5174add01b6b7053e2317d479e746ba330901c6bdc547d5ba7429ea46889ae3
-  data.tar.gz: 66bd27f4a626a956e840f90013bbe5ce7dc6817f127c554bccf5cb413cbd2981
+  metadata.gz: e6cda48af3f6a3d844c896622b39a79c31631c9b164f5f727d2841d85decb1ec
+  data.tar.gz: 375c96471483ed06f43272785520d5f6c763687a03f104dd1d5049636c010948
 SHA512:
-  metadata.gz: 6aa415b0bd88d3cf5bd95d3786b01dff6f66e00e13ca95a3a19755f1e60cc17163800841fd9f7ea21d98acee505c0b67ae1ef6a3e3e032394cfb848395b1295d
-  data.tar.gz: ce39ba436ff04bf239e16744625c2e989b75db1674ffed24314d9fb75ae393e0f3b9ca8f0ab9263a47cd79572807e958f29ebfcedc88c42f00e886c9dd75a14f
+  metadata.gz: f64857ddcef1a8bd7896ee1c5c8ed6050ba263e2ab8aa2df2bc8a02e98f3e55c8cf2e6b186760dbda9a37e513882292fe3569eb5ded9eee471978e3ef4580a9e
+  data.tar.gz: 8e6f94bc7c441f0fd1394c7cff8d512e20247c5f07291b2d969bdfcdef1af5cadf6230b4b2512cc273ca08d9de3ef906e4762fad6cbbcaa273f3667429355dea

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.20".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.4.19
+  version: 2.4.20
 platform: ruby
 authors:
 - Ribose Inc.