expressir 0.2.24 → 0.2.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce50a374ee7552fa79d80e286765681ed1cb808bea2a6833c53e0ddf626ab5bc
-  data.tar.gz: 6856209fcb72eb146ac4408e8f58d4aa45f74ccf54adbe4d7c6fd5653bcacc7b
+  metadata.gz: a32b6c4d99c4dd5082bf3bf9d2e7f6a93f86eae043a9dda49e8ffe37e1082479
+  data.tar.gz: 0eef9e070668c5ec37daff443516ea9c8afa1b01ed63d85833bdff0e1b5755cc
 SHA512:
-  metadata.gz: 3a4a7554be0d0348f65ca086a3238104bdd36f13c33e719f0cfb01d28724b3487f764ebd0ebf49b2f59b49112180cce512a05e36442ec90c62828f82cf805a0a
-  data.tar.gz: e871ff00c28957c32823c7b4ff0f3222270d1a7471426dfb335d6077a1c4fbcbb078b3924a2029502c671a54d9fb97740187be85f1cdc64993f3ed2bcacf8d4d
+  metadata.gz: 89180457dad6e288d406ebb565cf13bc11366205d4bcd9b99a3b5d994fba26c3db6b599cf1da4c084e5ccc2323eedc9df871b1c79f126048da52aa9e38be8a25
+  data.tar.gz: 343ee264593bde6ba7f459eb2170cc37db44a2fdc322814cedcd1b59a009b642d8ca9814cc21db2d6d733db127e7ad3484f46a62c7967a475be21c9869485bd6

data/lib/expressir/express_exp/formatter.rb

@@ -1502,7 +1502,7 @@ module Expressir
             [
               '(*',
               '"',
-              node.path,
+              node.path || node.id,
               '"',
             ].join(''),
             remark,
@@ -1512,7 +1512,7 @@ module Expressir
           [
             '--',
             '"',
-            node.path,
+            node.path || node.id,
             '"',
             ' ',
             remark

data/lib/expressir/express_exp/hyperlink_formatter.rb

@@ -2,25 +2,20 @@ module Expressir
   module ExpressExp
     module HyperlinkFormatter
       def format_expressions_simple_reference(node)
-        return node.id if node.parent.is_a? Model::Expressions::AttributeReference
+        return node.id unless node.base_path
 
-        # skip hyperlink if target node can't be found
-        target_node = if node.parent.is_a? Model::InterfaceItem
-          node.find("#{node.parent.parent.schema.id}.#{node.parent.ref.id}")
-        else
-          node.find(node.id)
+        # find closest node with path
+        current_node = node
+        while !current_node.path
+          current_node = current_node.parent
         end
-        return node.id unless target_node
 
-        # skip hyperlink for implicit scopes
-        return node.id if target_node.is_a? Model::Statements::Alias or target_node.is_a? Model::Statements::Repeat or target_node.is_a? Model::Expressions::QueryExpression
+        # skip if this reference and target node are in the same node with path
+        node_base_path_parts = node.base_path.split(".")
+        current_node_path_parts = current_node.path.split(".")
+        return node.id if node_base_path_parts[0..1] == current_node_path_parts[0..1]
 
-        # skip hyperlink if this node and target node are in the same main item
-        node_path_parts = node.path.split(".")
-        target_node_path_parts = target_node.path.split(".")
-        return node.id if node_path_parts[0..1] == target_node_path_parts[0..1]
-
-        "{{{<<express:#{target_node.path},#{node.id}>>}}}"
+        "{{{<<express:#{node.base_path},#{node.id}>>}}}"
       end
     end
   end

data/lib/expressir/express_exp/model_visitor.rb

@@ -0,0 +1,23 @@
+require "expressir/model"
+
+module Expressir
+  module ExpressExp
+    class ModelVisitor
+      def visit(node)
+        node.class.model_attrs.each do |variable|
+          value = node.send(variable)
+
+          if value.is_a? Array
+            value.each do |value|
+              if value.is_a? Model::ModelElement
+                visit(value)
+              end
+            end
+          elsif value.is_a? Model::ModelElement
+            visit(value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/expressir/express_exp/parser.rb

@@ -5,6 +5,7 @@ rescue LoadError
   require_relative "express_parser"
 end
 require 'expressir/express_exp/visitor'
+require 'expressir/express_exp/resolve_references_model_visitor'
 
 =begin
 char_stream = Antlr4::Runtime::CharStreams.from_string(input, 'String')
@@ -25,6 +26,8 @@ module Expressir
   module ExpressExp
     class Parser
       def self.from_file(file, options = {})
+        skip_references = options[:skip_references]
+
         input = File.read(file)
 
         parser = ::ExpressParser::Parser.parse(input)
@@ -38,13 +41,20 @@ module Expressir
           schema.file = file.to_s
         end
 
+        unless skip_references
+          resolve_references_model_visitor = ResolveReferencesModelVisitor.new
+          resolve_references_model_visitor.visit(repository)
+        end
+
         repository
       end
 
       def self.from_files(files, options = {})
+        skip_references = options[:skip_references]
+
         schemas = files.each_with_index.map do |file, i|
           # start = Time.now
-          repository = self.from_file(file, options)
+          repository = self.from_file(file, options.merge(skip_references: true))
           # STDERR.puts "#{i+1}/#{files.length} #{file} #{Time.now - start}"
           repository.schemas
         end.flatten
@@ -53,8 +63,9 @@ module Expressir
           schemas: schemas
         })
 
-        repository.schemas.each do |schema|
-          schema.parent = repository
+        unless skip_references
+          resolve_references_model_visitor = ResolveReferencesModelVisitor.new
+          resolve_references_model_visitor.visit(repository)
         end
 
         repository

data/lib/expressir/express_exp/resolve_references_model_visitor.rb

@@ -0,0 +1,33 @@
+require "expressir/express_exp/model_visitor"
+require "expressir/model"
+
+module Expressir
+  module ExpressExp
+    class ResolveReferencesModelVisitor < ModelVisitor
+      def visit(node)
+        if node.is_a? Model::Expressions::SimpleReference
+          visit_expressions_simple_reference(node)
+        end
+
+        super
+      end
+
+      def visit_expressions_simple_reference(node)
+        return if node.parent.is_a? Model::Expressions::AttributeReference
+
+        if node.parent.is_a? Model::InterfaceItem
+          base_item = node.find("#{node.parent.parent.schema.id}.#{node.parent.ref.id}")
+        else
+          base_item = node.find(node.id)
+        end
+        return unless base_item
+
+        if base_item.is_a? Model::InterfacedItem
+          base_item = base_item.base_item
+        end
+
+        node.base_path = base_item.path
+      end
+    end
+  end
+end

data/lib/expressir/model/expressions/simple_reference.rb

@@ -4,9 +4,13 @@ module Expressir
       class SimpleReference < ModelElement
         model_attr_accessor :id
 
+        model_attr_accessor :base_path
+
         def initialize(options = {})
           @id = options[:id]
 
+          @base_path = options[:base_path]
+
           super
         end
       end

data/lib/expressir/model/interfaced_item.rb

@@ -17,10 +17,6 @@ module Expressir
         super
       end
 
-      def path
-        base_item.path
-      end
-
       def children
         [
           *remark_items

data/lib/expressir/model/model_element.rb

@@ -14,12 +14,13 @@ module Expressir
       end
 
       def path
-        return id if is_a? Statements::Alias or is_a? Statements::Repeat or is_a? Expressions::QueryExpression
+        # this creates an implicit scope
+        return if is_a? Statements::Alias or is_a? Statements::Repeat or is_a? Expressions::QueryExpression
 
         current_node = self
         path_parts = []
         loop do
-          if current_node.class.method_defined? :id
+          if current_node.class.method_defined? :id and !(current_node.is_a? Expressions::SimpleReference)
             path_parts << current_node.id
           end
 
@@ -27,6 +28,8 @@ module Expressir
           break unless current_node
         end
 
+        return if path_parts.empty?
+
         path_parts.reverse.join(".")
       end
 

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "0.2.24".freeze
+  VERSION = "0.2.25".freeze
 end

data/original/examples/syntax/multiple.yaml

@@ -10,26 +10,31 @@ schemas:
     schema:
       _class: Expressir::Model::Expressions::SimpleReference
       id: multiple_schema2
+      base_path: multiple_schema2
   - _class: Expressir::Model::Interface
     kind: :REFERENCE
     schema:
       _class: Expressir::Model::Expressions::SimpleReference
       id: multiple_schema3
+      base_path: multiple_schema3
     items:
     - _class: Expressir::Model::InterfaceItem
       ref:
         _class: Expressir::Model::Expressions::SimpleReference
         id: attribute_entity3
+        base_path: multiple_schema3.attribute_entity3
   - _class: Expressir::Model::Interface
     kind: :REFERENCE
     schema:
       _class: Expressir::Model::Expressions::SimpleReference
       id: multiple_schema4
+      base_path: multiple_schema4
     items:
     - _class: Expressir::Model::InterfaceItem
       ref:
         _class: Expressir::Model::Expressions::SimpleReference
         id: attribute_entity
+        base_path: multiple_schema4.attribute_entity
       id: attribute_entity4
   entities:
   - _class: Expressir::Model::Entity
@@ -49,11 +54,13 @@ schemas:
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: multiple_schema1.empty_entity
   - _class: Expressir::Model::Entity
     id: subtype_attribute_entity
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity
+      base_path: multiple_schema1.attribute_entity
     attributes:
     - _class: Expressir::Model::Attribute
       kind: :EXPLICIT
@@ -67,6 +74,7 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity
+            base_path: multiple_schema1.attribute_entity
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test
@@ -77,6 +85,7 @@ schemas:
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity2
+      base_path: multiple_schema2.attribute_entity2
     attributes:
     - _class: Expressir::Model::Attribute
       kind: :EXPLICIT
@@ -90,6 +99,7 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity2
+            base_path: multiple_schema2.attribute_entity2
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test
@@ -100,6 +110,7 @@ schemas:
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity3
+      base_path: multiple_schema3.attribute_entity3
     attributes:
     - _class: Expressir::Model::Attribute
       kind: :EXPLICIT
@@ -113,6 +124,7 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity3
+            base_path: multiple_schema3.attribute_entity3
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test
@@ -123,6 +135,7 @@ schemas:
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity4
+      base_path: multiple_schema4.attribute_entity
     attributes:
     - _class: Expressir::Model::Attribute
       kind: :EXPLICIT
@@ -136,6 +149,7 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity4
+            base_path: multiple_schema4.attribute_entity
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test

data/original/examples/syntax/remark.yaml

@@ -107,9 +107,11 @@ schemas:
       type:
         _class: Expressir::Model::Expressions::SimpleReference
         id: remark_entity
+        base_path: remark_schema.remark_entity
       expression:
         _class: Expressir::Model::Expressions::SimpleReference
         id: remark_attribute
+        base_path: remark_schema.remark_entity.remark_attribute
     unique:
     - _class: Expressir::Model::Unique
       id: UR1
@@ -120,6 +122,7 @@ schemas:
       attributes:
       - _class: Expressir::Model::Expressions::SimpleReference
         id: remark_attribute
+        base_path: remark_schema.remark_entity.remark_attribute
     where:
     - _class: Expressir::Model::Where
       id: WR1
@@ -152,6 +155,7 @@ schemas:
     applies_to:
       _class: Expressir::Model::Expressions::SimpleReference
       id: remark_entity
+      base_path: remark_schema.remark_entity
   functions:
   - _class: Expressir::Model::Function
     id: remark_function
@@ -218,6 +222,7 @@ schemas:
       expression:
         _class: Expressir::Model::Expressions::SimpleReference
         id: remark_variable
+        base_path: remark_schema.remark_function.remark_variable
       statements:
       - _class: Expressir::Model::Statements::Null
     - _class: Expressir::Model::Statements::Repeat
@@ -236,6 +241,7 @@ schemas:
       ref:
         _class: Expressir::Model::Expressions::SimpleReference
         id: remark_variable
+        base_path: remark_schema.remark_function.remark_variable
       expression:
         _class: Expressir::Model::Expressions::QueryExpression
         id: remark_query
@@ -244,6 +250,7 @@ schemas:
         aggregate_source:
           _class: Expressir::Model::Expressions::SimpleReference
           id: remark_variable
+          base_path: remark_schema.remark_function.remark_variable
         expression:
           _class: Expressir::Model::Literals::Logical
           value: :TRUE
@@ -256,6 +263,7 @@ schemas:
     applies_to:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: remark_entity
+      base_path: remark_schema.remark_entity
     types:
     - _class: Expressir::Model::Type
       id: remark_type
@@ -304,6 +312,7 @@ schemas:
       expression:
         _class: Expressir::Model::Expressions::SimpleReference
         id: remark_variable
+        base_path: remark_schema.remark_rule.remark_variable
       statements:
       - _class: Expressir::Model::Statements::Null
     - _class: Expressir::Model::Statements::Repeat
@@ -322,6 +331,7 @@ schemas:
       ref:
         _class: Expressir::Model::Expressions::SimpleReference
         id: remark_variable
+        base_path: remark_schema.remark_rule.remark_variable
       expression:
         _class: Expressir::Model::Expressions::QueryExpression
         id: remark_query
@@ -330,6 +340,7 @@ schemas:
         aggregate_source:
           _class: Expressir::Model::Expressions::SimpleReference
           id: remark_variable
+          base_path: remark_schema.remark_rule.remark_variable
         expression:
           _class: Expressir::Model::Literals::Logical
           value: :TRUE
@@ -421,6 +432,7 @@ schemas:
       expression:
         _class: Expressir::Model::Expressions::SimpleReference
         id: remark_variable
+        base_path: remark_schema.remark_procedure.remark_variable
       statements:
       - _class: Expressir::Model::Statements::Null
     - _class: Expressir::Model::Statements::Repeat
@@ -439,6 +451,7 @@ schemas:
       ref:
         _class: Expressir::Model::Expressions::SimpleReference
         id: remark_variable
+        base_path: remark_schema.remark_procedure.remark_variable
       expression:
         _class: Expressir::Model::Expressions::QueryExpression
         id: remark_query
@@ -447,6 +460,7 @@ schemas:
         aggregate_source:
           _class: Expressir::Model::Expressions::SimpleReference
           id: remark_variable
+          base_path: remark_schema.remark_procedure.remark_variable
         expression:
           _class: Expressir::Model::Literals::Logical
           value: :TRUE

data/original/examples/syntax/single.exp

@@ -1,3 +1,4 @@
 SCHEMA single_schema;
 ENTITY empty_entity; END_ENTITY;
+ENTITY subtype_empty_entity SUBTYPE OF (empty_entity); END_ENTITY;
 END_SCHEMA;

data/original/examples/syntax/single.yaml

@@ -7,3 +7,9 @@ schemas:
   entities:
   - _class: Expressir::Model::Entity
     id: empty_entity
+  - _class: Expressir::Model::Entity
+    id: subtype_empty_entity
+    subtype_of:
+    - _class: Expressir::Model::Expressions::SimpleReference
+      id: empty_entity
+      base_path: single_schema.empty_entity