expressir 2.4.13 → 2.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3cf38ff1a09f95805cc5a6dc8c074832e47eeb8ceb7e62c79f503d521d775ac
-  data.tar.gz: a308605c1d7c97d33f766d08e8262e6e2039104ff7362e36a0fa5bd8e3839ccf
+  metadata.gz: ad3043a3dd1ac401e841249e3e081a7b3b6b3c3da99f6a9dbc136a127619ba49
+  data.tar.gz: '085e25b6e9b97d53fc5207aa651b37b080557626c6971b60029b98749ff4db82'
 SHA512:
-  metadata.gz: 4c97b4d258e50604fba0bdc0365c3f8272d6944dc225755e6408c6b585324b917448134352a4ffb4da445ca21ef910858283931abef43625d0b4138c90ecf694
-  data.tar.gz: d268fd6aef2e11bdafe5f81845931e91742dcd33ff48f3a2f6bb0076a6f9bad440045609a501b81fcc2130fef6dcd565d972ebc6634861d0341f9efa2649b5b5
+  metadata.gz: e92cca737def4e8432f30b98162262f83df7d81c719c7a1dd916173f65ff788c1145843e46131bfe7da5ef97e76c00a155215f7c4893befe7748601711438d93
+  data.tar.gz: 88d3f1008222838323a843a1b9a7117bf1b09465fa453de4bfd21868137b16439a680165e527555099ae67884cb8a77c8a2068e92b113f34408444c314482583

data/lib/expressir/express/checker.rb

@@ -97,6 +97,11 @@ module Expressir
           check_where_rules(schema, t, t.where_rules)
         end
         schema.rules.each { |r| check_where_rules(schema, r, r.where_rules) }
+        schema.entities.each do |entity|
+          check_aggregate_bounds(schema, entity)
+          check_attrib_name_fun(schema, entity)
+        end
+        check_string_references(schema)
         check_unresolved_refs(schema)
       end
 
@@ -342,6 +347,82 @@ module Expressir
         :type if find_type(schema, id)
       end
 
+      # eeng check-agg-type: a two-bound aggregate whose lower bound
+      # exceeds its upper bound is invalid.
+      def check_aggregate_bounds(schema, entity)
+        entity.attributes.to_a.each do |attr|
+          type = attr.type
+          next unless type.respond_to?(:bound1) && type.respond_to?(:bound2)
+
+          lower = integer_bound(type.bound1)
+          upper = integer_bound(type.bound2)
+          next if lower.nil? || upper.nil?
+          next if lower <= upper
+
+          note!(:check_agg_type, :error, schema,
+                "ENTITY #{entity.id}: aggregate '#{attr.id}' bounds " \
+                "[#{lower}:#{upper}] are inverted", attr)
+        end
+      end
+
+      def integer_bound(bound)
+        return nil unless bound.is_a?(Model::Literals::Integer)
+
+        bound.value.to_i
+      rescue StandardError
+        nil
+      end
+
+      # eeng check-attrib-name-fun: an attribute sharing its name with
+      # a function of the same schema can never be referenced cleanly.
+      def check_attrib_name_fun(schema, entity)
+        funs = schema.functions.to_a.map { |f| f.id.safe_downcase }
+        entity.attributes.to_a.each do |attr|
+          next unless attr.id && funs.include?(attr.id.safe_downcase)
+
+          note!(:check_attrib_name_fun, :warning, schema,
+                "ENTITY #{entity.id}: attribute '#{attr.id}' shadows a " \
+                "function of the same name", attr)
+        end
+      end
+
+      # eeng check-string-no-entity: string literals of the shape
+      # 'SCHEMA.ITEM' whose SCHEMA is known in the repository but whose
+      # ITEM is not declared in it (the TYPEOF idiom).
+      def check_string_references(schema)
+        known = @by_name
+        each_string(schema) do |literal, value|
+          match = /\A(\w+)\.(\w+)\z/.match(value)
+          next unless match
+
+          schema_id = match[1].safe_downcase
+          item_id = match[2].safe_downcase
+          target = known[schema_id]&.find { |s| s.id.safe_downcase == schema_id }
+          next unless target
+          next if Expressir::Express::SelfSchemaReference.declared?(target, item_id)
+
+          note!(:check_string_no_entity, :warning, schema,
+                "string '#{value}' references '#{item_id}' which is not " \
+                "declared in schema '#{target.id}'", literal)
+        end
+      end
+
+      def each_string(node, &)
+        case node
+        when Model::Literals::String then yield node, node.value
+        when Model::ModelElement
+          node.class.attributes.each_key do |attr|
+            next if Model::ModelElement::SKIP_ATTRIBUTES.include?(attr) || attr == :parent
+
+            value = node.public_send(attr)
+            case value
+            when Array then value.each { |item| each_string(item, &) }
+            when Model::ModelElement then each_string(value, &)
+            end
+          end
+        end
+      end
+
       def check_where_rules(schema, owner, rules)
         Array(rules).each do |wr|
           next if wr.id.nil? || wr.id.match?(WHERE_LABEL)

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.13".freeze
+    VERSION = "2.4.14".freeze
   end
 end

metadata

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