expressir 2.1.5 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbb7fb563aa44a7d916ef48ccd2b5e865ced0776ce36e5c238fddaf3c2dd61ac
-  data.tar.gz: 487913925a727a1e20fa4651ffc3a3af669f3ba094655bb232c39dde6b92b4e2
+  metadata.gz: a6581a76699cdae03a6f241de18d11d2e203b05217cde67c11b3c8eff2a46471
+  data.tar.gz: eb4f57c1ca685146d1df2c6cc38ef8564399f95bd90b90d42a00a4577b1bc283
 SHA512:
-  metadata.gz: 979411f7682a574f9743ea7129bbf826d9c11657b97c2a9a95e9e9d066d530b99f95ffc228366f09fc8f86db3ec7596d4870bdab33de55aca094ef6ebef3d7ff
-  data.tar.gz: dfd514fdfc7fd31dfddb4886545d2b763b1c53bea7b2eeed9a95b88274953f5996c5f606b180f5a783e5bb32e24a043903101315bc9de0b8d231bf89ac2f38fc
+  metadata.gz: a5ab59cc6adf7a3062cb862641bdbd31e3540892c7ddc07b495edc082a2cba09e2a20701d7699e01971bb49dc333ec9905b74a43ee1e6d8a583b5a3215728cc7
+  data.tar.gz: df94efe4eacc86b5fea8d313737031dcb022552c748aca9b57ee5574305e68e560a4561f32293302afa528cfb7c7e4c52de2e820d375886c77459bc8b917cded

data/lib/expressir/express/express_remarks_decorator.rb

@@ -16,9 +16,6 @@ module Expressir
 
       def call
         result = remark
-        if options["leveloffset"]
-          result = process_remark_offsets(result, options["leveloffset"].to_i)
-        end
         if options["relative_path_prefix"]
           result = update_relative_paths(result,
                                          options["relative_path_prefix"])
@@ -52,25 +49,6 @@ module Expressir
           "#{$1}#{$2}#{full_path}#{$4}"
         end
       end
-
-      def process_remark_offsets(string, offset)
-        string
-          .split("\n")
-          .map do |line|
-            if line.match?(/^=/)
-              set_string_offsets(line, offset)
-            else
-              line
-            end
-          end
-          .join("\n")
-      end
-
-      def set_string_offsets(string, offset)
-        return "#{'=' * offset}#{string}" if offset.positive?
-
-        string.gsub(/^={#{offset * -1}}/, "")
-      end
     end
   end
 end

data/lib/expressir/express/formatter.rb

@@ -873,12 +873,17 @@ module Expressir
       end
 
       def format_expressions_function_call(node)
-        [
-          format(node.function),
-          "(",
-          node.parameters.map { |x| format(x) }.join(", "),
-          ")",
-        ].join("")
+        params = if node.parameters.nil?
+                   []
+                 else
+                   [
+                     "(",
+                     node.parameters.map { |x| format(x) }.join(", "),
+                     ")",
+                   ]
+                 end
+
+        [format(node.function), params].flatten.join("")
       end
 
       def format_expressions_interval(node)

data/lib/expressir/express/parser.rb

@@ -50,7 +50,7 @@ module Expressir
         end
         rule(:abstractSupertype) { (tABSTRACT >> tSUPERTYPE >> op_delim).as(:abstractSupertype) }
         rule(:actualParameterList) do
-          (op_leftparen >> (parameter >> (op_comma >> parameter).repeat).as(:listOf_parameter) >> op_rightparen)
+          (op_leftparen >> (parameter >> (op_comma >> parameter).repeat).as(:listOf_parameter).maybe >> op_rightparen)
             .as(:actualParameterList)
         end
         rule(:addLikeOp) { (op_plus | op_minus | tOR | tXOR).as(:addLikeOp) }
@@ -340,7 +340,7 @@ module Expressir
         rule(:simpleExpression) { (term >> (addLikeOp.as(:operator) >> term).as(:item).repeat.as(:rhs)).as(:simpleExpression) }
         rule(:simpleFactor) do
           (
-            simpleFactorExpression | aggregateInitializer | entityConstructor | interval | queryExpression |
+            simpleFactorExpression | aggregateInitializer | entityConstructor | interval | queryExpression | stringLiteral |
             simpleFactorUnaryExpression | enumerationReference
           ).as(:simpleFactor)
         end
@@ -424,9 +424,15 @@ 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)
+      def self.from_file(file, skip_references: nil, include_source: nil) # rubocop:disable Metrics/AbcSize
         source = File.read file
-        ast = Parser.new.parse source
+
+        begin
+          ast = Parser.new.parse source
+        rescue Parslet::ParseFailed => e
+          puts "Parslet::ParseFailed:"
+          puts e.parse_failure_cause.ascii_tree
+        end
 
         visitor = Expressir::Express::Visitor.new(source, include_source: include_source)
         transformed = visitor.visit_ast ast, :top

data/lib/expressir/express/visitor.rb

@@ -204,6 +204,8 @@ module Expressir
       end
 
       def node_find(node, path)
+        return nil if node.is_a?(String)
+
         if node.is_a?(Enumerable)
           node.find { |item| item.find(path) }
         else
@@ -1062,7 +1064,7 @@ module Expressir
         ctx__actual_parameter_list = ctx.actual_parameter_list
 
         function = visit_if(ctx__built_in_function || ctx__function_ref)
-        parameters = visit_if(ctx__actual_parameter_list, [])
+        parameters = visit_if(ctx__actual_parameter_list, nil)
 
         Model::Expressions::FunctionCall.new(
           function: function,

data/lib/expressir/liquid/declarations/schema_drop.rb

@@ -10,8 +10,8 @@ module Expressir
           @model = model
           @selected_schemas = selected_schemas
           @options = options
-          initialize_identifier(@model, @options)
-          super
+          initialize_identifier(@model)
+          super(model)
         end
 
         def file

data/lib/expressir/liquid/expressions/function_call_drop.rb

@@ -14,7 +14,7 @@ module Expressir
         end
 
         def parameters
-          return [] unless @model.parameters
+          return nil unless @model.parameters
 
           @model.parameters.map do |item|
             drop_klass_by_model(item)

data/lib/expressir/liquid/identifier_drop.rb

@@ -5,9 +5,8 @@ require_relative "declarations/remark_item_drop"
 module Expressir
   module Liquid
     module IdentifierDrop
-      def initialize_identifier(model, options = {})
+      def initialize_identifier(model)
         @model = model
-        @options = options
       end
 
       def id

data/lib/expressir/liquid/model_element_drop.rb

@@ -3,10 +3,8 @@
 module Expressir
   module Liquid
     class ModelElementDrop < ::Liquid::Drop
-      def initialize(model, selected_schemas: nil, options: {}) # rubocop:disable Lint/MissingSuper
+      def initialize(model) # rubocop:disable Lint/MissingSuper
         @model = model
-        @selected_schemas = selected_schemas
-        @options = options
       end
 
       def _class

data/lib/expressir/liquid/repository_drop.rb

@@ -9,7 +9,7 @@ module Expressir
         @model = model
         @selected_schemas = selected_schemas
         @options = options
-        super
+        super(model)
       end
 
       def schemas

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

@@ -12,7 +12,7 @@ module Expressir
         # @option options [Array<Expression>] :parameters
         def initialize(options = {})
           @function = options[:function]
-          @parameters = options[:parameters] || []
+          @parameters = options[:parameters]
 
           super
         end

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "2.1.5".freeze
+  VERSION = "2.1.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.7
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-05 00:00:00.000000000 Z
+date: 2025-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -261,7 +261,7 @@ metadata:
   source_code_uri: https://github.com/lutaml/expressir
   changelog_uri: https://github.com/lutaml/expressir/releases
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -277,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: EXPRESS parser and toolkit for Ruby
 test_files: []