expressir 2.1.13 → 2.1.14

data/lib/expressir/express/formatter.rb

@@ -1,5 +1,3 @@
-require_relative "../model"
-
 module Expressir
   module Express
     class Formatter
@@ -57,7 +55,7 @@ module Expressir
       # Formats Express model into an Express code
       # @param [Model::ModelElement] node
       # @return [String]
-      def format(node)
+      def format(node) # rubocop:disable Metrics/MethodLength
         case node
         when Model::Repository
           format_repository(node)
@@ -189,6 +187,18 @@ module Expressir
           format_supertype_expressions_binary_supertype_expression(node)
         when Model::SupertypeExpressions::OneofSupertypeExpression
           format_supertype_expressions_oneof_supertype_expression(node)
+        when Model::Declarations::SchemaVersionItem
+          # not implemented yet
+        when Model::Declarations::InterfacedItem
+          # not implemented yet
+        when Model::Declarations::RemarkItem
+          # not implemented yet
+        when Model::Cache
+          # not implemented yet
+        when Model::ModelElement
+          # not implemented yet
+        when NilClass
+          # not implemented yet
         else
           warn "#{node.class.name} format not implemented"
           ""
@@ -198,7 +208,7 @@ module Expressir
       private
 
       def format_repository(node)
-        node.schemas.map { |x| format(x) }.join("\n\n")
+        node.schemas&.map { |x| format(x) }&.join("\n\n")
       end
 
       def format_declarations_attribute(node)
@@ -265,9 +275,15 @@ module Expressir
       end
 
       def format_declarations_entity(node)
-        explicit_attributes = node.attributes.select { |x| x.kind == Model::Declarations::Attribute::EXPLICIT }
-        derived_attributes = node.attributes.select { |x| x.kind == Model::Declarations::Attribute::DERIVED }
-        inverse_attributes = node.attributes.select { |x| x.kind == Model::Declarations::Attribute::INVERSE }
+        if node.attributes.nil?
+          explicit_attributes = []
+          derived_attributes = []
+          inverse_attributes = []
+        else
+          explicit_attributes = node.attributes.select { |x| x.kind == Model::Declarations::Attribute::EXPLICIT }
+          derived_attributes = node.attributes.select { |x| x.kind == Model::Declarations::Attribute::DERIVED }
+          inverse_attributes = node.attributes.select { |x| x.kind == Model::Declarations::Attribute::INVERSE }
+        end
 
         [
           [
@@ -314,7 +330,7 @@ module Expressir
                  ].join("")),
                ].join("")
              end,
-            *if node.subtype_of.length.positive?
+            *if node.subtype_of&.length&.positive?
                [
                  "\n",
                  indent([
@@ -345,13 +361,13 @@ module Expressir
                indent(inverse_attributes.map { |x| format(x) }.join("\n")),
              ]
            end,
-          *if node.unique_rules.length.positive?
+          *if node.unique_rules&.length&.positive?
              [
                "UNIQUE",
                indent(node.unique_rules.map { |x| format(x) }.join("\n")),
              ]
            end,
-          *if node.where_rules.length.positive?
+          *if node.where_rules&.length&.positive?
              [
                "WHERE",
                indent(node.where_rules.map { |x| format(x) }.join("\n")),
@@ -370,7 +386,7 @@ module Expressir
             "FUNCTION",
             " ",
             node.id,
-            *if node.parameters.length.positive?
+            *if node.parameters&.length&.positive?
                parameter_indent = INDENT_CHAR * "FUNCTION #{node.id}(".length
                [
                  "(",
@@ -384,22 +400,22 @@ module Expressir
             format(node.return_type),
             ";",
           ].join(""),
-          *if node.types.length.positive?
+          *if node.types&.length&.positive?
              indent(node.types.map { |x| format(x) }.join("\n"))
            end,
-          *if node.entities.length.positive?
+          *if node.entities&.length&.positive?
              indent(node.entities.map { |x| format(x) }.join("\n"))
            end,
-          *if node.subtype_constraints.length.positive?
+          *if node.subtype_constraints&.length&.positive?
              indent(node.subtype_constraints.map { |x| format(x) }.join("\n"))
            end,
-          *if node.functions.length.positive?
+          *if node.functions&.length&.positive?
              indent(node.functions.map { |x| format(x) }.join("\n"))
            end,
-          *if node.procedures.length.positive?
+          *if node.procedures&.length&.positive?
              indent(node.procedures.map { |x| format(x) }.join("\n"))
            end,
-          *if node.constants.length.positive?
+          *if node.constants&.length&.positive?
              indent([
                "CONSTANT",
                indent(node.constants.map { |x| format(x) }.join("\n")),
@@ -409,7 +425,7 @@ module Expressir
                ].join(""),
              ].join("\n"))
            end,
-          *if node.variables.length.positive?
+          *if node.variables&.length&.positive?
              indent([
                "LOCAL",
                indent(node.variables.map { |x| format(x) }.join("\n")),
@@ -419,7 +435,7 @@ module Expressir
                ].join(""),
              ].join("\n"))
            end,
-          *if node.statements.length.positive?
+          *if node.statements&.length&.positive?
              indent(node.statements.map { |x| format(x) }.join("\n"))
            end,
           [
@@ -439,7 +455,7 @@ module Expressir
           "FROM",
           " ",
           format(node.schema),
-          *if node.items.length.positive?
+          *if node.items&.length&.positive?
              item_indent = INDENT_CHAR * "(".length
              [
                "\n",
@@ -490,7 +506,7 @@ module Expressir
             "PROCEDURE",
             " ",
             node.id,
-            *if node.parameters.length.positive?
+            *if node.parameters&.length&.positive?
                parameter_indent = INDENT_CHAR * "PROCEDURE #{node.id}(".length
                [
                  "(",
@@ -500,22 +516,22 @@ module Expressir
              end,
             ";",
           ].join(""),
-          *if node.types.length.positive?
+          *if node.types&.length&.positive?
              indent(node.types.map { |x| format(x) }.join("\n"))
            end,
-          *if node.entities.length.positive?
+          *if node.entities&.length&.positive?
              indent(node.entities.map { |x| format(x) }.join("\n"))
            end,
-          *if node.subtype_constraints.length.positive?
+          *if node.subtype_constraints&.length&.positive?
              indent(node.subtype_constraints.map { |x| format(x) }.join("\n"))
            end,
-          *if node.functions.length.positive?
+          *if node.functions&.length&.positive?
              indent(node.functions.map { |x| format(x) }.join("\n"))
            end,
-          *if node.procedures.length.positive?
+          *if node.procedures&.length&.positive?
              indent(node.procedures.map { |x| format(x) }.join("\n"))
            end,
-          *if node.constants.length.positive?
+          *if node.constants&.length&.positive?
              indent([
                "CONSTANT",
                indent(node.constants.map { |x| format(x) }.join("\n")),
@@ -525,7 +541,7 @@ module Expressir
                ].join(""),
              ].join("\n"))
            end,
-          *if node.variables.length.positive?
+          *if node.variables&.length&.positive?
              indent([
                "LOCAL",
                indent(node.variables.map { |x| format(x) }.join("\n")),
@@ -535,7 +551,7 @@ module Expressir
                ].join(""),
              ].join("\n"))
            end,
-          *if node.statements.length.positive?
+          *if node.statements&.length&.positive?
              indent(node.statements.map { |x| format(x) }.join("\n"))
            end,
           [
@@ -546,6 +562,7 @@ module Expressir
       end
 
       def format_declarations_rule(node)
+        node.applies_to ||= []
         [
           [
             "RULE",
@@ -559,22 +576,22 @@ module Expressir
             ")",
             ";",
           ].join(""),
-          *if node.types.length.positive?
+          *if node.types&.length&.positive?
              indent(node.types.map { |x| format(x) }.join("\n"))
            end,
-          *if node.entities.length.positive?
+          *if node.entities&.length&.positive?
              indent(node.entities.map { |x| format(x) }.join("\n"))
            end,
-          *if node.subtype_constraints.length.positive?
+          *if node.subtype_constraints&.length&.positive?
              indent(node.subtype_constraints.map { |x| format(x) }.join("\n"))
            end,
-          *if node.functions.length.positive?
+          *if node.functions&.length&.positive?
              indent(node.functions.map { |x| format(x) }.join("\n"))
            end,
-          *if node.procedures.length.positive?
+          *if node.procedures&.length&.positive?
              indent(node.procedures.map { |x| format(x) }.join("\n"))
            end,
-          *if node.constants.length.positive?
+          *if node.constants&.length&.positive?
              indent([
                "CONSTANT",
                indent(node.constants.map { |x| format(x) }.join("\n")),
@@ -584,7 +601,7 @@ module Expressir
                ].join(""),
              ].join("\n"))
            end,
-          *if node.variables.length.positive?
+          *if node.variables&.length&.positive?
              indent([
                "LOCAL",
                indent(node.variables.map { |x| format(x) }.join("\n")),
@@ -594,10 +611,10 @@ module Expressir
                ].join(""),
              ].join("\n"))
            end,
-          *if node.statements.length.positive?
+          *if node.statements&.length&.positive?
              indent(node.statements.map { |x| format(x) }.join("\n"))
            end,
-          *if node.where_rules.length.positive?
+          *if node.where_rules&.length&.positive?
              [
                "WHERE",
                indent(node.where_rules.map { |x| format(x) }.join("\n")),
@@ -624,7 +641,7 @@ module Expressir
              end,
             ";",
           ].join(""),
-          *if node.interfaces.length.positive?
+          *if node.interfaces&.length&.positive?
              [
                "",
                node.interfaces.map { |x| format(x) }.join("\n"),
@@ -635,7 +652,7 @@ module Expressir
 
       def format_declarations_schema(node)
         schema_declarations = [
-          *if node.constants.length.positive?
+          *if node.constants&.length&.positive?
              [
                "CONSTANT",
                indent(node.constants.map { |x| format(x) }.join("\n")),
@@ -645,19 +662,19 @@ module Expressir
                ].join(""),
              ].join("\n")
            end,
-          *if node.types.length.positive?
+          *if node.types&.length&.positive?
              node.types.map { |x| format(x) }
            end,
-          *if node.entities.length.positive?
+          *if node.entities&.length&.positive?
              node.entities.map { |x| format(x) }
            end,
-          *if node.subtype_constraints.length.positive?
+          *if node.subtype_constraints&.length&.positive?
              node.subtype_constraints.map { |x| format(x) }
            end,
-          *if node.functions.length.positive?
+          *if node.functions&.length&.positive?
              node.functions.map { |x| format(x) }
            end,
-          *if node.rules.length.positive?
+          *if node.rules&.length&.positive?
              node.rules.map { |x| format(x) }
            end,
           *if node.procedures&.length&.positive?
@@ -667,7 +684,7 @@ module Expressir
 
         [
           format_declarations_schema_head(node),
-          *if schema_declarations.length.positive?
+          *if schema_declarations&.length&.positive?
              [
                "",
                schema_declarations.join("\n\n"),
@@ -710,7 +727,7 @@ module Expressir
                ";",
              ].join(""))
            end,
-          *if node.total_over.length.positive?
+          *if node.total_over&.length&.positive?
              indent([
                "TOTAL_OVER",
                "(",
@@ -744,7 +761,7 @@ module Expressir
             format(node.underlying_type),
             ";",
           ].join(""),
-          *if node.where_rules.length.positive?
+          *if node.where_rules&.length&.positive?
              [
                "WHERE",
                indent(node.where_rules.map { |x| format(x) }.join("\n")),
@@ -758,6 +775,7 @@ module Expressir
       end
 
       def format_declarations_unique_rule(node)
+        node.attributes ||= []
         [
           *if node.id
              [
@@ -805,6 +823,7 @@ module Expressir
       end
 
       def format_expressions_aggregate_initializer(node)
+        node.items ||= []
         [
           "[",
           node.items.map { |x| format(x) }.join(", "),
@@ -870,6 +889,7 @@ module Expressir
       end
 
       def format_expressions_entity_constructor(node)
+        node.parameters ||= []
         [
           format(node.entity),
           "(",
@@ -927,7 +947,7 @@ module Expressir
           "|",
           " ",
           format(node.expression),
-          *format_remarks(node).instance_eval { |x| x.length.positive? ? ["\n", *x, "\n"] : x },
+          *format_remarks(node).instance_eval { |x| x&.length&.positive? ? ["\n", *x, "\n"] : x },
           ")",
         ].join("")
       end
@@ -1038,7 +1058,7 @@ module Expressir
             format(node.expression),
             ";",
           ].join(""),
-          *if node.statements.length.positive?
+          *if node.statements&.length&.positive?
              indent(node.statements.map { |x| format(x) }.join("\n"))
            end,
           *format_remarks(node),
@@ -1063,7 +1083,7 @@ module Expressir
       def format_statements_procedure_call(node)
         [
           format(node.procedure),
-          *if node.parameters.length.positive?
+          *if node.parameters&.length&.positive?
              [
                "(",
                node.parameters.map { |x| format(x) }.join(", "),
@@ -1083,7 +1103,7 @@ module Expressir
             " ",
             "OF",
           ].join(""),
-          *if node.actions.length.positive?
+          *if node.actions&.length&.positive?
              node.actions.map { |x| format(x) }
            end,
           *if node.otherwise_statement
@@ -1104,6 +1124,7 @@ module Expressir
       end
 
       def format_statements_case_action(node)
+        node.labels ||= []
         [
           [
             node.labels.map { |x| format(x) }.join(", "),
@@ -1115,9 +1136,10 @@ module Expressir
       end
 
       def format_statements_compound(node)
+        node.statements ||= []
         [
           "BEGIN",
-          *if node.statements.length.positive?
+          *if node.statements&.length&.positive?
              indent(node.statements.map { |x| format(x) }.join("\n"))
            end,
           [
@@ -1143,10 +1165,10 @@ module Expressir
             " ",
             "THEN",
           ].join(""),
-          *if node.statements.length.positive?
+          *if node.statements&.length&.positive?
              indent(node.statements.map { |x| format(x) }.join("\n"))
            end,
-          *if node.else_statements.length.positive?
+          *if node.else_statements&.length&.positive?
              [
                "ELSE",
                indent(node.else_statements.map { |x| format(x) }.join("\n")),
@@ -1164,6 +1186,7 @@ module Expressir
       end
 
       def format_statements_repeat(node)
+        node.statements ||= []
         [
           [
             "REPEAT",
@@ -1207,7 +1230,7 @@ module Expressir
              end,
             ";",
           ].join(""),
-          *if node.statements.length.positive?
+          *if node.statements&.length&.positive?
              indent(node.statements.map { |x| format(x) }.join("\n"))
            end,
           *format_remarks(node),
@@ -1271,6 +1294,7 @@ module Expressir
       end
 
       def format_supertype_expressions_oneof_supertype_expression(node)
+        node.operands ||= []
         [
           "ONEOF",
           "(",
@@ -1374,7 +1398,7 @@ module Expressir
                "BASED_ON",
                " ",
                format(node.based_on),
-               *if node.items.length.positive?
+               *if node.items&.length&.positive?
                   item_indent = INDENT_CHAR * "(".length
                   [
                     " ",
@@ -1390,7 +1414,7 @@ module Expressir
              ].join("")
            else
              [
-               *if node.items.length.positive?
+               *if node.items&.length&.positive?
                   item_indent = INDENT_CHAR * "(".length
                   [
                     " ",
@@ -1489,6 +1513,7 @@ module Expressir
       end
 
       def format_data_types_select(node)
+        node.items ||= []
         [
           *if node.extensible
              [
@@ -1509,7 +1534,7 @@ module Expressir
                "BASED_ON",
                " ",
                format(node.based_on),
-               *if node.items.length.positive?
+               *if node.items&.length&.positive?
                   item_indent = INDENT_CHAR * "(".length
                   [
                     " ",
@@ -1525,7 +1550,7 @@ module Expressir
              ].join("")
            else
              [
-               *if node.items.length.positive?
+               *if node.items&.length&.positive?
                   item_indent = INDENT_CHAR * "(".length
                   [
                     "\n",
@@ -1582,6 +1607,8 @@ module Expressir
       end
 
       def indent(str)
+        return if str.nil?
+
         str.split("\n").map { |x| "#{INDENT}#{x}" }.join("\n")
       end
 
@@ -1610,7 +1637,9 @@ module Expressir
       end
 
       def format_remarks(node)
-        if node.class.method_defined?(:remarks) && !@no_remarks
+        if node.class.method_defined?(:remarks) && !@no_remarks &&
+            !node.remarks.nil?
+
           node.remarks.map do |remark|
             format_remark(node, remark)
           end
@@ -1622,9 +1651,9 @@ module Expressir
       def format_scope_remarks(node)
         [
           *format_remarks(node),
-          *node.children.select do |x|
+          *node&.children&.select do |x|
             !x.is_a? Model::DataTypes::EnumerationItem or node.is_a? Model::Declarations::Type
-          end.flat_map { |x| format_scope_remarks(x) },
+          end&.flat_map { |x| format_scope_remarks(x) },
         ]
       end
     end

data/lib/expressir/express/model_visitor.rb

@@ -1,20 +1,21 @@
-require_relative "../model"
-
 module Expressir
   module Express
     # @abstract
     class ModelVisitor
       def visit(node)
-        node.class.model_attrs.each do |variable|
-          value = node.send(variable)
+        node.class.attributes.each_key do |symbol|
+          next if ::Expressir::Model::ModelElement::SKIP_ATTRIBUTES.include?(symbol)
+
+          value = node.send(symbol)
 
-          if value.is_a? Array
-            value.each do |value|
-              if value.is_a? Model::ModelElement
-                visit(value)
+          case value
+          when Array
+            value.each do |val|
+              if val.is_a? Model::ModelElement
+                visit(val)
               end
             end
-          elsif value.is_a? Model::ModelElement
+          when Model::ModelElement
             visit(value)
           end
         end

data/lib/expressir/express/parser.rb

@@ -1,6 +1,4 @@
 require "parslet"
-require_relative "resolve_references_model_visitor"
-require_relative "../model"
 
 module Expressir
   module Express
@@ -388,9 +386,12 @@ module Expressir
       # @param [Boolean] skip_references skip resolving references
       # @param [Boolean] include_source attach original source code to model elements
       # @return [Model::Repository]
-      def self.from_file(file, skip_references: nil, include_source: nil) # rubocop:disable Metrics/AbcSize
+      def self.from_file(file, skip_references: nil, include_source: nil, root_path: nil) # rubocop:disable Metrics/AbcSize
         source = File.read file
 
+        # remove root path from file path
+        schema_file = root_path ? Pathname.new(file.to_s).relative_path_from(root_path).to_s : file.to_s
+
         begin
           ast = Parser.new.parse source
         rescue Parslet::ParseFailed => e
@@ -399,11 +400,12 @@ module Expressir
         end
 
         visitor = Expressir::Express::Visitor.new(source, include_source: include_source)
-        transformed = visitor.visit_ast ast, :top
-        @repository = transformed
+        @repository = visitor.visit_ast ast, :top
 
         @repository.schemas.each do |schema|
-          schema.file = file.to_s
+          schema.file = schema_file
+          schema.file_basename = File.basename(schema_file, ".exp")
+          schema.formatted = schema.to_s(no_remarks: true)
         end
 
         unless skip_references
@@ -419,10 +421,10 @@ module Expressir
       # @param [Boolean] skip_references skip resolving references
       # @param [Boolean] include_source attach original source code to model elements
       # @return [Model::Repository]
-      def self.from_files(files, skip_references: nil, include_source: nil)
+      def self.from_files(files, skip_references: nil, include_source: nil, root_path: nil)
         schemas = files.each_with_index.map do |file, _i|
           # start = Time.now
-          repository = from_file(file, skip_references: true)
+          repository = from_file(file, skip_references: true, root_path: root_path)
           # STDERR.puts "#{i+1}/#{files.length} #{file} #{Time.now - start}"
           repository.schemas
         end.flatten

data/lib/expressir/express/resolve_references_model_visitor.rb

@@ -1,6 +1,3 @@
-require_relative "model_visitor"
-require_relative "../model"
-
 module Expressir
   module Express
     class ResolveReferencesModelVisitor < ModelVisitor

data/lib/expressir/express/visitor.rb

@@ -1,4 +1,3 @@
-require_relative "../model"
 require "set"
 
 # reference type is not recognized
@@ -232,8 +231,10 @@ module Expressir
           # check if path can create implicit informal proposition
           # see https://github.com/lutaml/expressir/issues/50
           if parent_node.class.method_defined?(:informal_propositions) && current_path.match(/^IP\d+$/)
+            parent_node.informal_propositions ||= []
             parent_node.informal_propositions << remark_item
           else
+            parent_node.remark_items ||= []
             parent_node.remark_items << remark_item
           end
           parent_node.reset_children_by_id

data/lib/expressir/liquid.rb

@@ -1,18 +1 @@
 require "liquid"
-
-require_relative "liquid/model_element_drop"
-
-require_relative "liquid/cache_drop"
-require_relative "liquid/data_type_drop"
-require_relative "liquid/declaration_drop"
-require_relative "liquid/expression_drop"
-require_relative "liquid/literal_drop"
-require_relative "liquid/reference_drop"
-require_relative "liquid/statement_drop"
-require_relative "liquid/supertype_expression_drop"
-require_relative "liquid/identifier_drop"
-require_relative "liquid/repository_drop"
-
-Dir[File.join(__dir__, "liquid", "**", "*.rb")].sort.each do |f|
-  require f
-end

data/lib/expressir/model/cache.rb

@@ -2,15 +2,16 @@ module Expressir
   module Model
     # Cache content object with Expressir version
     class Cache < ModelElement
-      model_attr_accessor :version, "String"
-      model_attr_accessor :content, "ModelElement"
+      attribute :version, :string
+      attribute :root_path, :string
+      attribute :content, ModelElement
+      attribute :_class, :string, default: -> { send(:name) }
 
-      # @param [Hash] options
-      # @option options [String] :version
-      # @option options [ModelElement] :content
-      def initialize(options = {})
-        @version = options[:version]
-        @content = options[:content]
+      key_value do
+        map "_class", to: :_class, render_default: true
+        map "version", to: :version
+        map "root_path", to: :root_path
+        map "content", to: :content
       end
     end
   end