expressir 2.4.36-x86_64-linux → 2.4.37-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 562234e66991852131024e0be0ba5b648391aa42c2600bf30a2b87cdcee87ed7
-  data.tar.gz: 49c531fb45fe7cb41444a377a44c8e4c86c549dd32bd8daaf3fe2852425f7941
+  metadata.gz: b7aa98d223c3f4823fa7f1b79ef313aebc361a9f588091d269d5af0c6a18c350
+  data.tar.gz: 296f5b2d8c2ed8b208c8da5197fdd1200ca2bf60d5c76e6b8cfaf15c86d4e2f6
 SHA512:
-  metadata.gz: 0d9c63f577f8997f4107e644ddd0d3c3a1900fd7ef8a1285dcb1403fd356d161d12506c58480a747f68c8cf27d567d2a23983eae083b8be4794c14ffedda1fa0
-  data.tar.gz: f49f9d19130b52a44ac5486c4f0e29ad5a6549a61c3344d78681b5cf830c6af84b5d75a98acdfe16564b4b0fe5c89d8bda666a981cb7fed0052bc433ef7d0e9a
+  metadata.gz: 13d757f8c90ea30c5f9a6eb7c4e2c5ae42412fe18e9b885edd63eb721013ea06df86d0a4b4e2909e19cba004371d08f487a05c857659f563f881ebec78386493
+  data.tar.gz: b154d88d35bf0a80c635d9000d7490d1a597d9175b41ad55a6d7c4ce5270ef427eafd947ddef5b6bb787b5c37498ba1d601821e21747219bec112adf425b17ae

data/lib/expressir/mapping/refpath.rb

@@ -24,10 +24,16 @@ module Expressir
     #                                          is referenced)
     #   index      := "[" ("i" | DIGITS) "]"
     #   constraint := ["!"] "{" NAME [NAME "."] "=" STRING "}"
+    #   supertype  := "||" NAME "||"          (§5 supertype entity marker)
+    #   tree       := "*" NAME "*"            (§5 relationship tree marker)
     #   MARKER     := "{" | "}" | "[" | "]" | "(" | ")" | ":" | "|" | "!"
     #               | "," | "/" | "*" | "<" | ">" (grouping/annotation;
     #                                               never breaks a
-    #                                               pending link)
+    #                                               pending link; the §5
+    #                                               required-path marker
+    #                                               "<path>" is transparent
+    #                                               — its contents validate
+    #                                               in the running context)
     #
     # Validation (ELF 5006 §8): a running path context tracks the
     # entity a path is "at"; each step must connect to it, attribute
@@ -104,7 +110,7 @@ module Expressir
       EXPRESS_LINK_PATH = /\A<<express:([^,>]+)(?:,[^>]+)?>>\z/
       private_constant :EXPRESS_LINK_PATH
 
-      TOKEN = /<<express:[^,>]+(?:,[^>]+)?>>|->|<-|<=|=>|\*>|<\*|!?\{|[{}\[\]()=:|!,*\/<>]|'(?:''|[^'])*'|\w+(?:\.\w+)?/
+      TOKEN = /<<express:[^,>]+(?:,[^>]+)?>>|->|<-|<=|=>|\*>|<\*|\|\||!?\{|[{}\[\]()=:|!,*\/<>]|'(?:''|[^'])*'|\w+(?:\.\w+)?/
       MARKERS = ["{", "}", "[", "]", "(", ")", ":", "|", "!", ",", "/",
                  "*", "<", ">", "MAPPING_OF", "!{"].freeze
       LINKS = ["->", "<-", "<=", "=>", "*>", "<*"].freeze
@@ -140,13 +146,19 @@ module Expressir
         errors = []
         pending_link = nil
         pending_type_assign = false
-        false
         i = 0
         while i < tokens.length
           token = tokens[i]
           case token
+          when "||"
+            name_token = tokens[i + 1]
+            if name_token&.match?(/\A\w+\z/) && tokens[i + 2] == "||"
+              steps << Step.new(operator: "||", name: name_token)
+              i += 2
+            else
+              errors << "supertype marker '||' without an entity name"
+            end
           when "!{"
-            true
             step, consumed = parse_constraint(tokens[i..], negated: true)
             steps << step
             i += consumed
@@ -182,6 +194,14 @@ module Expressir
             else
               steps << Step.new(operator: "[")
             end
+          when "*"
+            name_token = tokens[i + 1]
+            if name_token&.match?(/\A\w+\z/) && tokens[i + 2] == "*"
+              steps << Step.new(operator: "*", name: name_token)
+              i += 2
+            else
+              steps << Step.new(operator: token)
+            end
           when *MARKERS
             steps << Step.new(operator: token)
           when /\A<<express:/
@@ -302,6 +322,14 @@ module Expressir
           when "*>", "<*"
             issues.concat(select_extension_issues(step, pos, ctx, by_name))
             ctx = step.name&.safe_downcase
+          when "||"
+            issues.concat(supertype_marker_issues(step, pos, ctx, by_name))
+            if step.name
+              seen[step.name.safe_downcase] = true
+              ctx = step.name.safe_downcase
+            end
+          when "*"
+            issues.concat(tree_marker_issues(step, pos, by_name))
           else
             issues.concat(check_step(step, pos, ctx, last_qualified, by_name))
             if step.name
@@ -495,6 +523,39 @@ module Expressir
         end
       end
 
+      # ELF 5006 §5 supertype entity marker: `||supertype||` names an
+      # entity that must exist and, when the path has a running
+      # context, be a supertype of (or equal to) that context entity.
+      def supertype_marker_issues(step, pos, ctx, by_name)
+        issues = []
+        entity = step.name
+        check_exists(issues, pos, entity, by_name)
+        return issues if entity.nil?
+
+        decl = by_name[entity.safe_downcase]&.last
+        return issues unless decl.is_a?(Model::Declarations::Entity)
+
+        context_decl = ctx && by_name[ctx]&.last
+        if context_decl.is_a?(Model::Declarations::Entity) &&
+            !entity_reaches?(context_decl, entity.safe_downcase, by_name,
+                             {}.compare_by_identity)
+          issues << Issue.new(step: pos,
+                              message: "'#{entity}' is not a supertype of " \
+                                       "'#{ctx}'")
+        end
+        issues
+      end
+
+      # ELF 5006 §5 relationship tree marker: `*relationship*` names an
+      # entity whose instances may assemble into a tree; the path
+      # between it and the related entities is implied, so only the
+      # entity's existence is checkable.
+      def tree_marker_issues(step, pos, by_name)
+        issues = []
+        check_exists(issues, pos, step.name, by_name)
+        issues
+      end
+
       # ELF 5006 §8 navigation validation with a running context: the
       # attribute must exist on the context entity, and its type must
       # be able to reference the step's target entity.

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.36".freeze
+    VERSION = "2.4.37".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.4.36
+  version: 2.4.37
 platform: x86_64-linux
 authors:
 - Ribose Inc.