expressir 0.2.18-arm64-darwin → 0.2.26-arm64-darwin

data/lib/expressir/express_exp/resolve_references_model_visitor.rb

@@ -0,0 +1,29 @@
+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
+
+        node.base_path = base_item.path
+      end
+    end
+  end
+end

data/lib/expressir/express_exp/visitor.rb

@@ -107,27 +107,28 @@ module Expressir
         target_node = node.find(path)
         return target_node if target_node
 
-        # check if path should create implicit informal proposal
-        # see https://github.com/lutaml/expressir/issues/50
+        # check if path can create implicit remark item
+        # see https://github.com/lutaml/expressir/issues/78
         rest, _, current_path = path.rpartition(".") # get last path part
         _, _, current_path = current_path.rpartition(":") # ignore prefix
+        parent_node = node.find(rest)
+        if parent_node and parent_node.class.method_defined? :remark_items
+          remark_item = Model::RemarkItem.new({
+            id: current_path
+          })
+          remark_item.parent = parent_node
 
-        # match informal proposition id
-        informal_proposition_id = current_path.match(/^IP\d+$/).to_a[0]
-        return unless informal_proposition_id
-
-        # find informal proposition target
-        target_node = node.find(rest)
-        return unless target_node and target_node.class.method_defined? :informal_propositions
-
-        # create implicit informal proposition
-        informal_proposition = Model::InformalProposition.new({
-          id: informal_proposition_id
-        })
-        target_node.informal_propositions << informal_proposition
-        target_node.reset_children_by_id
-        informal_proposition.parent = target_node
-        informal_proposition
+          # check if path can create implicit informal proposition
+          # see https://github.com/lutaml/expressir/issues/50
+          if parent_node.class.method_defined? :informal_propositions and current_path.match(/^IP\d+$/)
+            parent_node.informal_propositions << remark_item
+          else
+            parent_node.remark_items << remark_item
+          end
+          parent_node.reset_children_by_id
+          
+          remark_item
+        end
       end
 
       def attach_remarks(ctx, node)

data/lib/expressir/model.rb

@@ -1,5 +1,7 @@
 require 'expressir/model/model_element'
 
+require 'expressir/model/cache'
+
 require 'expressir/model/identifier'
 
 require 'expressir/model/attribute'
@@ -7,12 +9,12 @@ require 'expressir/model/constant'
 require 'expressir/model/entity'
 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/remark_item'
 require 'expressir/model/repository'
 require 'expressir/model/rule'
 require 'expressir/model/schema'

data/lib/expressir/model/attribute.rb

@@ -7,15 +7,16 @@ module Expressir
       DERIVED = :DERIVED
       INVERSE = :INVERSE
 
-      attr_accessor :kind
-      attr_accessor :supertype_attribute
-      attr_accessor :optional
-      attr_accessor :type
-      attr_accessor :expression
+      model_attr_accessor :kind
+      model_attr_accessor :supertype_attribute
+      model_attr_accessor :optional
+      model_attr_accessor :type
+      model_attr_accessor :expression
 
       def initialize(options = {})
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
+        @remark_items = options.fetch(:remark_items, [])
         @source = options[:source]
 
         @kind = options[:kind]
@@ -26,6 +27,12 @@ module Expressir
 
         super
       end
+
+      def children
+        [
+          *remark_items
+        ]
+      end
     end
   end
 end

data/lib/expressir/model/cache.rb

@@ -0,0 +1,13 @@
+module Expressir
+  module Model
+    class Cache < ModelElement
+      model_attr_accessor :version
+      model_attr_accessor :content
+
+      def initialize(options = {})
+        @version = options[:version]
+        @content = options[:content]
+      end
+    end
+  end
+end

data/lib/expressir/model/constant.rb

@@ -3,12 +3,13 @@ module Expressir
     class Constant < ModelElement
       include Identifier
 
-      attr_accessor :type
-      attr_accessor :expression
+      model_attr_accessor :type
+      model_attr_accessor :expression
 
       def initialize(options = {})
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
+        @remark_items = options.fetch(:remark_items, [])
         @source = options[:source]
 
         @type = options[:type]
@@ -16,6 +17,12 @@ module Expressir
 
         super
       end
+
+      def children
+        [
+          *remark_items
+        ]
+      end
     end
   end
 end

data/lib/expressir/model/entity.rb

@@ -3,17 +3,18 @@ module Expressir
     class Entity < ModelElement
       include Identifier
 
-      attr_accessor :abstract
-      attr_accessor :supertype_expression
-      attr_accessor :subtype_of
-      attr_accessor :attributes
-      attr_accessor :unique
-      attr_accessor :where
-      attr_accessor :informal_propositions
+      model_attr_accessor :abstract
+      model_attr_accessor :supertype_expression
+      model_attr_accessor :subtype_of
+      model_attr_accessor :attributes
+      model_attr_accessor :unique
+      model_attr_accessor :where
+      model_attr_accessor :informal_propositions
 
       def initialize(options = {})
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
+        @remark_items = options.fetch(:remark_items, [])
         @source = options[:source]
 
         @abstract = options[:abstract]
@@ -32,7 +33,8 @@ module Expressir
           *attributes,
           *unique,
           *where,
-          *informal_propositions
+          *informal_propositions,
+          *remark_items
         ]
       end
     end

data/lib/expressir/model/enumeration_item.rb

@@ -6,10 +6,17 @@ module Expressir
       def initialize(options = {})
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
+        @remark_items = options.fetch(:remark_items, [])
         @source = options[:source]
 
         super
       end
+
+      def children
+        [
+          *remark_items
+        ]
+      end
     end
   end
 end

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

@@ -2,7 +2,7 @@ module Expressir
   module Model
     module Expressions
       class AggregateInitializer < ModelElement
-        attr_accessor :items
+        model_attr_accessor :items
 
         def initialize(options = {})
           @items = options.fetch(:items, [])

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

@@ -2,8 +2,8 @@ module Expressir
   module Model
     module Expressions
       class AggregateItem < ModelElement
-        attr_accessor :expression
-        attr_accessor :repetition
+        model_attr_accessor :expression
+        model_attr_accessor :repetition
 
         def initialize(options = {})
           @expression = options[:expression]

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

@@ -2,8 +2,8 @@ module Expressir
   module Model
     module Expressions
       class AttributeReference < ModelElement
-        attr_accessor :ref
-        attr_accessor :attribute
+        model_attr_accessor :ref
+        model_attr_accessor :attribute
 
         def initialize(options = {})
           @ref = options[:ref]

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

@@ -25,9 +25,9 @@ module Expressir
         SUBTRACTION = :SUBTRACTION
         XOR = :XOR
 
-        attr_accessor :operator
-        attr_accessor :operand1
-        attr_accessor :operand2
+        model_attr_accessor :operator
+        model_attr_accessor :operand1
+        model_attr_accessor :operand2
 
         def initialize(options = {})
           @operator = options[:operator]

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

@@ -2,8 +2,8 @@ module Expressir
   module Model
     module Expressions
       class Call < ModelElement
-        attr_accessor :ref
-        attr_accessor :parameters
+        model_attr_accessor :ref
+        model_attr_accessor :parameters
 
         def initialize(options = {})
           @ref = options[:ref]

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

@@ -2,8 +2,8 @@ module Expressir
   module Model
     module Expressions
       class EntityConstructor < ModelElement
-        attr_accessor :entity
-        attr_accessor :parameters
+        model_attr_accessor :entity
+        model_attr_accessor :parameters
 
         def initialize(options = {})
           @entity = options[:entity]

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

@@ -2,8 +2,8 @@ module Expressir
   module Model
     module Expressions
       class GroupReference < ModelElement
-        attr_accessor :ref
-        attr_accessor :entity
+        model_attr_accessor :ref
+        model_attr_accessor :entity
 
         def initialize(options = {})
           @ref = options[:ref]

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

@@ -2,9 +2,9 @@ module Expressir
   module Model
     module Expressions
       class IndexReference < ModelElement
-        attr_accessor :ref
-        attr_accessor :index1
-        attr_accessor :index2
+        model_attr_accessor :ref
+        model_attr_accessor :index1
+        model_attr_accessor :index2
 
         def initialize(options = {})
           @ref = options[:ref]

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

@@ -2,11 +2,11 @@ module Expressir
   module Model
     module Expressions
       class Interval < ModelElement
-        attr_accessor :low
-        attr_accessor :operator1
-        attr_accessor :item
-        attr_accessor :operator2
-        attr_accessor :high
+        model_attr_accessor :low
+        model_attr_accessor :operator1
+        model_attr_accessor :item
+        model_attr_accessor :operator2
+        model_attr_accessor :high
 
         def initialize(options = {})
           @low = options[:low]

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

@@ -4,12 +4,13 @@ module Expressir
       class QueryExpression < ModelElement
         include Identifier
 
-        attr_accessor :aggregate_source
-        attr_accessor :expression
+        model_attr_accessor :aggregate_source
+        model_attr_accessor :expression
 
         def initialize(options = {})
           @id = options[:id]
           @remarks = options.fetch(:remarks, [])
+          @remark_items = options.fetch(:remark_items, [])
           @source = options[:source]
 
           @aggregate_source = options[:aggregate_source]
@@ -20,7 +21,8 @@ module Expressir
 
         def children
           [
-            self
+            self,
+            *remark_items
           ]
         end
       end

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

@@ -2,11 +2,15 @@ module Expressir
   module Model
     module Expressions
       class SimpleReference < ModelElement
-        attr_accessor :id
+        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/expressions/unary_expression.rb

@@ -6,8 +6,8 @@ module Expressir
         NOT = :NOT
         PLUS = :PLUS
 
-        attr_accessor :operator
-        attr_accessor :operand
+        model_attr_accessor :operator
+        model_attr_accessor :operand
 
         def initialize(options = {})
           @operator = options[:operator]

data/lib/expressir/model/function.rb

@@ -3,20 +3,21 @@ module Expressir
     class Function < ModelElement
       include Identifier
 
-      attr_accessor :parameters
-      attr_accessor :return_type
-      attr_accessor :types
-      attr_accessor :entities
-      attr_accessor :subtype_constraints
-      attr_accessor :functions
-      attr_accessor :procedures
-      attr_accessor :constants
-      attr_accessor :variables
-      attr_accessor :statements
+      model_attr_accessor :parameters
+      model_attr_accessor :return_type
+      model_attr_accessor :types
+      model_attr_accessor :entities
+      model_attr_accessor :subtype_constraints
+      model_attr_accessor :functions
+      model_attr_accessor :procedures
+      model_attr_accessor :constants
+      model_attr_accessor :variables
+      model_attr_accessor :statements
 
       def initialize(options = {})
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
+        @remark_items = options.fetch(:remark_items, [])
         @source = options[:source]
 
         @parameters = options.fetch(:parameters, [])
@@ -47,7 +48,8 @@ module Expressir
           *functions,
           *procedures,
           *constants,
-          *variables
+          *variables,
+          *remark_items
         ]
       end
     end