expressir 0.2.14-arm64-darwin → 0.2.19-arm64-darwin

data/lib/expressir/express_exp/hyperlink_formatter.rb

@@ -1,13 +1,15 @@
-require "expressir/express_exp/formatter"
-
 module Expressir
   module ExpressExp
-    class HyperlinkFormatter < Formatter
+    module HyperlinkFormatter
       def format_expressions_simple_reference(node)
         return node.id if node.parent.is_a? Model::Expressions::AttributeReference
 
         # skip hyperlink if target node can't be found
-        target_node = node.find(node.id)
+        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)
+        end
         return node.id unless target_node
 
         # skip hyperlink for implicit scopes

data/lib/expressir/express_exp/parser.rb

@@ -6,50 +6,58 @@ rescue LoadError
 end
 require 'expressir/express_exp/visitor'
 
-module Expressir
-  module ExpressExp
-    class Parser
-      def self.from_file(file)
-        input = File.read(file)
-
 =begin
-        char_stream = Antlr4::Runtime::CharStreams.from_string(input, 'String')
-        lexer = ::ExpressParser::Lexer.new(char_stream)
-        token_stream = Antlr4::Runtime::CommonTokenStream.new(lexer)
-        parser = ::ExpressParser::Parser.new(token_stream)
+char_stream = Antlr4::Runtime::CharStreams.from_string(input, 'String')
+lexer = ::ExpressParser::Lexer.new(char_stream)
+token_stream = Antlr4::Runtime::CommonTokenStream.new(lexer)
+parser = ::ExpressParser::Parser.new(token_stream)
 
-        # don't attempt to recover from any parsing error
-        parser.instance_variable_set(:@_err_handler, Antlr4::Runtime::BailErrorStrategy.new)
+# don't attempt to recover from any parsing error
+parser.instance_variable_set(:@_err_handler, Antlr4::Runtime::BailErrorStrategy.new)
 
-        parse_tree = parser.syntax()
+parse_tree = parser.syntax()
 
-        visitor = Visitor.new(token_stream)
-        repo = visitor.visit(parse_tree)
+visitor = Visitor.new(token_stream)
+repo = visitor.visit(parse_tree)
 =end
 
+module Expressir
+  module ExpressExp
+    class Parser
+      def self.from_file(file, options = {})
+        input = File.read(file)
+
         parser = ::ExpressParser::Parser.parse(input)
 
         parse_tree = parser.syntax()
 
-        visitor = Visitor.new(parser.tokens)
-        repo = visitor.visit(parse_tree)
+        visitor = Visitor.new(parser.tokens, options)
+        repository = visitor.visit(parse_tree)
 
-        repo.schemas.each{|schema| schema.file = file}
+        repository.schemas.each do |schema|
+          schema.file = file.to_s
+        end
 
-        repo
+        repository
       end
 
-      def self.from_files(files)
-        schemas = files.map{|file| self.from_file(file).schemas}.flatten
+      def self.from_files(files, options = {})
+        schemas = files.each_with_index.map do |file, i|
+          # start = Time.now
+          repository = self.from_file(file, options)
+          # STDERR.puts "#{i+1}/#{files.length} #{file} #{Time.now - start}"
+          repository.schemas
+        end.flatten
 
-        Model::Repository.new({
+        repository = Model::Repository.new({
           schemas: schemas
         })
-      end
 
-      # deprecated
-      def self.from_exp(file)
-        self.from_file(file)
+        repository.schemas.each do |schema|
+          schema.parent = repository
+        end
+
+        repository
       end
     end
   end

data/lib/expressir/express_exp/schema_head_formatter.rb

@@ -1,13 +1,8 @@
-require "expressir/express_exp/formatter"
-
 module Expressir
   module ExpressExp
-    class SchemaHeadFormatter < Formatter
+    module SchemaHeadFormatter
       def format_schema(node)
-        [
-          "SCHEMA #{node.id}#{node.version ? " #{format(node.version)}" : ""};",
-          *node.interfaces.map{|x| format(x)}
-        ].join("\n")
+        format_schema_head(node)
       end
     end
   end

data/lib/expressir/express_exp/visitor.rb

@@ -36,8 +36,10 @@ module Expressir
     class Visitor < ::ExpressParser::Visitor
       REMARK_CHANNEL = 2
 
-      def initialize(tokens)
+      def initialize(tokens, options = {})
         @tokens = tokens
+        @include_source = options[:include_source]
+
         @attached_remark_tokens = ::Set.new
 
         super()
@@ -45,7 +47,9 @@ module Expressir
 
       def visit(ctx)
         node = super(ctx)
-        attach_source(ctx, node)
+        if @include_source
+          attach_source(ctx, node)
+        end
         attach_remarks(ctx, node)
         node
       end
@@ -92,35 +96,11 @@ module Expressir
         @tokens[start_index..stop_index]
       end
 
-      def get_head_tokens(ctx)
-        start_index, stop_index = if ctx.is_a? ::ExpressParser::SchemaDeclContext
-          start_index = ctx.start.token_index
-          stop_index = if ctx.schema_body.interface_specification.length > 0
-            ctx.schema_body.interface_specification.last.stop.token_index
-          elsif ctx.schema_version_id
-            ctx.schema_version_id.stop.token_index + 1
-          else
-            ctx.schema_id.stop.token_index + 1
-          end
-
-          [start_index, stop_index]
-        end
-
-        if start_index and stop_index
-          @tokens[start_index..stop_index]
-        end
-      end
-
       def attach_source(ctx, node)
         if node.class.method_defined? :source
           tokens = get_tokens(ctx)
           node.source = get_tokens_source(tokens)
         end
-
-        if node.class.method_defined? :head_source
-          tokens = get_head_tokens(ctx)
-          node.head_source = get_tokens_source(tokens)
-        end
       end
 
       def find_remark_target(node, path)
@@ -145,6 +125,7 @@ module Expressir
           id: informal_proposition_id
         })
         target_node.informal_propositions << informal_proposition
+        target_node.reset_children_by_id
         informal_proposition.parent = target_node
         informal_proposition
       end
@@ -691,9 +672,9 @@ module Expressir
         expression = visit_if(ctx__expression)
 
         Model::Attribute.new({
-          id: attribute.id,
+          id: attribute.id, # reuse
           kind: Model::Attribute::DERIVED,
-          supertype_attribute: attribute.supertype_attribute,
+          supertype_attribute: attribute.supertype_attribute, # reuse
           type: type,
           expression: expression
         })
@@ -879,9 +860,9 @@ module Expressir
 
         attributes.map do |attribute|
           Model::Attribute.new({
-            id: attribute.id,
+            id: attribute.id, # reuse
             kind: Model::Attribute::EXPLICIT,
-            supertype_attribute: attribute.supertype_attribute,
+            supertype_attribute: attribute.supertype_attribute, # reuse
             optional: optional,
             type: type
           })
@@ -1306,9 +1287,9 @@ module Expressir
         end
 
         Model::Attribute.new({
-          id: attribute.id,
+          id: attribute.id, # reuse
           kind: Model::Attribute::INVERSE,
-          supertype_attribute: attribute.supertype_attribute,
+          supertype_attribute: attribute.supertype_attribute, # reuse
           type: type,
           expression: expression
         })
@@ -1490,14 +1471,10 @@ module Expressir
         ref = visit_if(ctx__named_types)
         id = visit_if(ctx__entity_id || ctx__type_id)
 
-        if id
-          Model::RenamedRef.new({
-            ref: ref,
-            id: id
-          })
-        else
-          ref
-        end
+        Model::InterfaceItem.new({
+          ref: ref,
+          id: id
+        })
       end
 
       def visit_null_stmt(ctx)
@@ -1674,9 +1651,9 @@ module Expressir
             ref: Model::Expressions::SimpleReference.new({
               id: id
             }),
-            entity: group_reference.entity
+            entity: group_reference.entity # reuse
           }),
-          attribute: attribute_reference.attribute
+          attribute: attribute_reference.attribute # reuse
         })
       end
 
@@ -1844,14 +1821,10 @@ module Expressir
         ref = visit_if(ctx__resource_ref)
         id = visit_if(ctx__rename_id)
 
-        if id
-          Model::RenamedRef.new({
-            ref: ref,
-            id: id
-          })
-        else
-          ref
-        end
+        Model::InterfaceItem.new({
+          ref: ref,
+          id: id
+        })
       end
 
       def visit_resource_ref(ctx)
@@ -1957,8 +1930,8 @@ module Expressir
         entities = declarations.select{|x| x.is_a? Model::Entity}
         subtype_constraints = declarations.select{|x| x.is_a? Model::SubtypeConstraint}
         functions = declarations.select{|x| x.is_a? Model::Function}
-        procedures = declarations.select{|x| x.is_a? Model::Procedure}
         rules = declarations.select{|x| x.is_a? Model::Rule}
+        procedures = declarations.select{|x| x.is_a? Model::Procedure}
 
         Model::Schema.new({
           id: id,
@@ -1969,8 +1942,8 @@ module Expressir
           entities: entities,
           subtype_constraints: subtype_constraints,
           functions: functions,
-          procedures: procedures,
-          rules: rules
+          rules: rules,
+          procedures: procedures
         })
       end
 
@@ -2181,7 +2154,7 @@ module Expressir
         id = visit_if(ctx__subtype_constraint_head__subtype_constraint_id)
         applies_to = visit_if(ctx__subtype_constraint_head__entity_ref)
         abstract = ctx__subtype_constraint_body__abstract_supertype && true
-        total_over = visit_if(ctx__subtype_constraint_body__total_over)
+        total_over = visit_if(ctx__subtype_constraint_body__total_over, [])
         supertype_expression = visit_if(ctx__subtype_constraint_body__supertype_expression)
 
         Model::SubtypeConstraint.new({

data/lib/expressir/model.rb

@@ -9,9 +9,10 @@ require 'expressir/model/enumeration_item'
 require 'expressir/model/function'
 require 'expressir/model/informal_proposition'
 require 'expressir/model/interface'
+require 'expressir/model/interface_item'
+require 'expressir/model/interfaced_item'
 require 'expressir/model/parameter'
 require 'expressir/model/procedure'
-require 'expressir/model/renamed_ref'
 require 'expressir/model/repository'
 require 'expressir/model/rule'
 require 'expressir/model/schema'

data/lib/expressir/model/entity.rb

@@ -28,12 +28,12 @@ module Expressir
       end
 
       def children
-        items = []
-        items.push(*@attributes)
-        items.push(*@unique)
-        items.push(*@where)
-        items.push(*@informal_propositions)
-        items
+        [
+          *attributes,
+          *unique,
+          *where,
+          *informal_propositions
+        ]
       end
     end
   end

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

@@ -19,9 +19,9 @@ module Expressir
         end
 
         def children
-          items = []
-          items.push(self)
-          items
+          [
+            self
+          ]
         end
       end
     end

data/lib/expressir/model/function.rb

@@ -33,18 +33,22 @@ module Expressir
         super
       end
 
+      def enumeration_items
+        types.flat_map{|x| x.enumeration_items}
+      end
+
       def children
-        items = []
-        items.push(*@parameters)
-        items.push(*@types)
-        items.push(*@types.flat_map{|x| x.type.is_a?(Expressir::Model::Types::Enumeration) ? x.type.items : []})
-        items.push(*@entities)
-        items.push(*@subtype_constraints)
-        items.push(*@functions)
-        items.push(*@procedures)
-        items.push(*@constants)
-        items.push(*@variables)
-        items
+        [
+          *parameters,
+          *types,
+          *enumeration_items,
+          *entities,
+          *subtype_constraints,
+          *functions,
+          *procedures,
+          *constants,
+          *variables
+        ]
       end
     end
   end

data/lib/expressir/model/informal_proposition.rb

@@ -3,10 +3,13 @@ module Expressir
     class InformalProposition < ModelElement
       include Identifier
 
+      undef :source
+      undef :source=
+
       def initialize(options = {})
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
-        @source = options[:source]
+        # @source = options[:source]
 
         super
       end

data/lib/expressir/model/{renamed_ref.rb → interface_item.rb}

@@ -1,11 +1,11 @@
 module Expressir
   module Model
-    class RenamedRef < ModelElement
+    class InterfaceItem < ModelElement
       attr_accessor :ref
       attr_accessor :id
 
       def initialize(options = {})
-        @ref = options[:ref]
+        @ref = options[:ref] 
         @id = options[:id]
 
         super

data/lib/expressir/model/interfaced_item.rb

@@ -0,0 +1,26 @@
+module Expressir
+  module Model
+    class InterfacedItem < ModelElement
+      include Identifier
+
+      undef :source
+      undef :source=
+
+      attr_accessor :base_item
+
+      def initialize(options = {})
+        @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        # @source = options[:source]
+
+        @base_item = options[:base_item]
+
+        super
+      end
+
+      def path
+        base_item.path
+      end
+    end
+  end
+end

data/lib/expressir/model/model_element.rb

@@ -1,7 +1,12 @@
+require 'pathname'
+
 module Expressir
   module Model
     class ModelElement
       CLASS_KEY = '_class'
+      FILE_KEY = 'file'
+      PARENT_KEY = 'parent'
+      CHILDREN_BY_ID_KEY = 'children_by_id'
       SOURCE_KEY = 'source'
 
       attr_accessor :parent
@@ -10,6 +15,11 @@ module Expressir
         attach_parent_to_children
       end
 
+      def model_instance_variables
+        skip_variables = [FILE_KEY, PARENT_KEY, CHILDREN_BY_ID_KEY].map{|x| "@#{x}".to_sym}
+        instance_variables.select{|x| !skip_variables.include?(x)}
+      end
+
       def path
         return id if is_a? Statements::Alias or is_a? Statements::Repeat or is_a? Expressions::QueryExpression
 
@@ -28,7 +38,7 @@ module Expressir
       end
 
       def attach_parent_to_children
-        instance_variables.select{|x| x != :@parent}.each do |variable|
+        model_instance_variables.each do |variable|
           value = instance_variable_get(variable)
 
           if value.is_a? Array
@@ -57,7 +67,7 @@ module Expressir
           # find in current scope
           current_node = current_scope
           path_parts.each do |current_path|
-            current_node = current_node.children.find{|x| x.id and x.id.downcase == current_path}
+            current_node = current_node.children_by_id[current_path]
             break unless current_node
           end
           target_node = current_node
@@ -75,20 +85,33 @@ module Expressir
         []
       end
 
+      def children_by_id
+        @children_by_id ||= children.select{|x| x.id}.map{|x| [x.id.downcase, x]}.to_h
+      end
+
+      def reset_children_by_id
+        @children_by_id = nil
+      end
+
       def to_hash(options = {})
-        skip_empty = options[:skip_empty]
+        root_path = options[:root_path]
         formatter = options[:formatter]
+        include_empty = options[:include_empty] || !options[:skip_empty] # TODO: remove skip_empty
 
         hash = {}
         hash[CLASS_KEY] = self.class.name
+        if self.is_a? Schema and file
+          hash[FILE_KEY] = root_path ? Pathname.new(file).relative_path_from(root_path).to_s : file
+        end
 
-        instance_variables.select{|x| x != :@parent}.each_with_object(hash) do |variable, result|
+        model_instance_variables.each do |variable|
           key = variable.to_s.sub(/^@/, '')
           value = instance_variable_get(variable)
+          empty = value.nil? || (value.is_a?(Array) && value.count == 0)
 
-          # skip empty values (nil, empty array)
-          if !skip_empty or !(value.nil? or (value.is_a? Array and value.count == 0))
-            result[key] = if value.is_a? Array
+          # skip empty values
+          if !empty or include_empty
+            hash[key] = if value.is_a? Array
               value.map do |value|
                 if value.is_a? ModelElement
                   value.to_hash(options)
@@ -104,28 +127,35 @@ module Expressir
           end
         end
 
-        if formatter
+        if self.class.method_defined? :source and formatter
           hash[SOURCE_KEY] = formatter.format(self)
         end
 
         hash
       end
 
-      def self.from_hash(hash)
+      def self.from_hash(hash, options = {})
+        root_path = options[:root_path]
+
         node_class = hash[CLASS_KEY]
-        node_options = hash.select{|x| x != CLASS_KEY}.each_with_object({}) do |(variable, value), result|
+        node_options = {}
+        if node_class == 'Expressir::Model::Schema' and hash[FILE_KEY]
+          node_options[FILE_KEY.to_sym] = root_path ? File.expand_path("#{root_path}/#{hash[FILE_KEY]}") : hash[FILE_KEY]
+        end
+
+        hash.select{|x| x != CLASS_KEY && x != FILE_KEY}.each do |variable, value|
           key = variable.to_sym
 
-          result[key] = if value.is_a? Array
+          node_options[key] = if value.is_a? Array
             value.map do |value|
               if value.is_a? Hash
-                self.from_hash(value)
+                self.from_hash(value, options)
               else
                 value
               end
             end
           elsif value.is_a? Hash
-            self.from_hash(value)
+            self.from_hash(value, options)
           else
             value
           end