expressir 2.4.18 → 2.4.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71c43838ba6c2853f84bfa1faca26760abe4919d35b98895ef224866bd49da62
-  data.tar.gz: 715a55be95f4ead656b98e0df59ccf06c2036eb532d6990a8ea036ee5f0f78c4
+  metadata.gz: a5174add01b6b7053e2317d479e746ba330901c6bdc547d5ba7429ea46889ae3
+  data.tar.gz: 66bd27f4a626a956e840f90013bbe5ce7dc6817f127c554bccf5cb413cbd2981
 SHA512:
-  metadata.gz: dac93ad5688fc8e2d3814fd6933b352ea35d78b89f157e99f30114ddafb07b53aaeb80aaa45fd63540a9ee400ac1aacc3724800446f868472499d9d4cf501629
-  data.tar.gz: 12cd7ef87afa0510215d0c1315e68ba5bbaed5a910255ebfa40e18b328b25f87ef3a24f93ce1073a798ce0e748e6344861f05900f863377ed801d9f1f66e7bab
+  metadata.gz: 6aa415b0bd88d3cf5bd95d3786b01dff6f66e00e13ca95a3a19755f1e60cc17163800841fd9f7ea21d98acee505c0b67ae1ef6a3e3e032394cfb848395b1295d
+  data.tar.gz: ce39ba436ff04bf239e16744625c2e989b75db1674ffed24314d9fb75ae393e0f3b9ca8f0ab9263a47cd79572807e958f29ebfcedc88c42f00e886c9dd75a14f

data/lib/expressir/mapping/refpath.rb

@@ -64,7 +64,7 @@ module Expressir
 
       TOKEN = /->|<-|<=|=>|[{}\[\]()=:|!,*\/]|'(?:''|[^'])*'|\w+(?:\.\w+)?/
       MARKERS = ["{", "}", "[", "]", "(", ")", ":", "|", "!", ",", "/",
-                 "*"].freeze
+                 "*", "MAPPING_OF"].freeze
       LINKS = ["->", "<-", "<=", "=>"].freeze
       DECLARATION_COLLECTIONS = %i[types entities].freeze
       private_constant :TOKEN, :MARKERS, :LINKS, :DECLARATION_COLLECTIONS
@@ -111,17 +111,11 @@ module Expressir
             steps << Step.new(operator: token)
           else
             name, _, attribute = token.partition(".")
-            if name.casecmp("MAPPING_OF").zero? && tokens[i + 1] == "("
-              # notation wrapper: /MAPPING_OF(X)/ refers to X; the
-              # wrapper itself carries no node semantics
-              steps << Step.new(operator: token)
-            else
-              operator = pending_link || ("=" if pending_type_assign)
-              steps << Step.new(operator: operator, name: name,
-                                attribute: attribute.empty? ? nil : attribute)
-              pending_link = nil
-              pending_type_assign = false
-            end
+            operator = pending_link || ("=" if pending_type_assign)
+            steps << Step.new(operator: operator, name: name,
+                              attribute: attribute.empty? ? nil : attribute)
+            pending_link = nil
+            pending_type_assign = false
           end
           i += 1
         end
@@ -153,34 +147,40 @@ module Expressir
         by_name = name_index(repository)
         issues = []
         prev = nil
+        last_qualified = nil
         path.steps.each_with_index do |step, pos|
-          if MARKERS.include?(step.operator)
-            prev = nil
-            next
-          end
+          # markers never break the running link, mirroring parse
+          next if MARKERS.include?(step.operator)
 
-          issues.concat(check_step(step, pos, prev, by_name))
+          issues.concat(check_step(step, pos, prev, last_qualified, by_name))
           prev = step if step.name
+          last_qualified = step if step.name && step.attribute
         end
         issues
       end
 
+      EXPRESS_BUILTINS = %w[NUMBER INTEGER REAL STRING BOOLEAN LOGICAL
+                            BINARY].freeze
+      private_constant :EXPRESS_BUILTINS
+
       def name_index(repository)
+        index = EXPRESS_BUILTINS.to_h { |b| [b.downcase, [nil, nil]] }
         repository.schemas.flat_map do |schema|
           DECLARATION_COLLECTIONS.flat_map do |coll|
             Array(schema.public_send(coll))
               .select { |d| d.respond_to?(:id) && d.id }
               .map { |d| [d.id.safe_downcase, [schema, d]] }
           end
-        end.to_h
+        end.each { |pair| index[pair[0]] = pair[1] }
+        index
       end
 
-      def check_step(step, pos, prev, by_name)
+      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
 
         issues = attribute_issues(step, pos, found[1], by_name)
-        issues.concat(link_issues(step, pos, prev, by_name))
+        issues.concat(link_issues(step, pos, prev, last_qualified, by_name))
         issues
       end
 
@@ -239,7 +239,7 @@ module Expressir
                             "aggregate but carries [#{step.index}]")]
       end
 
-      def link_issues(step, pos, prev, by_name)
+      def link_issues(step, pos, prev, last_qualified, by_name)
         return [] unless LINKS.include?(step.operator)
         unless prev && step.name
           return [Issue.new(step: pos,
@@ -247,20 +247,39 @@ module Expressir
         end
 
         case step.operator
-        when "->", "<-" then attribute_link_issues(step, pos, prev)
+        when "->", "<-"
+          attribute_link_issues(step, pos, prev, last_qualified)
         when "<=" then subtype_link_issues(step, pos, prev, by_name)
         when "=>" then supertype_link_issues(step, pos, prev, by_name)
         end
       end
 
-      def attribute_link_issues(_step, pos, prev)
-        unless prev.attribute
-          return [Issue.new(step: pos,
-                            message: "'->' requires an attribute-qualified " \
-                                     "node before it, got '#{prev.name}'")]
+      # `->`: the attribute-qualified node precedes the operator;
+      # `<-`: it follows (the entity before <- is referenced BY the
+      # attribute after it). An aggregate dereference `[i]` keeps the
+      # running attribute owner qualified for the next link
+      # (`attr -> list_type[i] -> element_type`).
+      def attribute_link_issues(step, pos, prev, last_qualified)
+        if step.operator == "->"
+          qualified = if prev&.attribute
+                        prev
+                      else
+                        (prev&.index ? last_qualified : nil)
+                      end
+          unless qualified&.attribute
+            return [Issue.new(step: pos,
+                              message: "'->' requires an attribute-qualified " \
+                                       "node before it, got '#{prev&.name}'")]
+          end
+
+          return []
         end
 
-        []
+        return [] if step.attribute
+
+        [Issue.new(step: pos,
+                   message: "'<-' requires an attribute-qualified node " \
+                            "after it, got '#{step.name}'")]
       end
 
       # `a <= b`: a is a subtype of b.

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.18".freeze
+    VERSION = "2.4.19".freeze
   end
 end

metadata

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