expressir 2.1.10 → 2.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 668feb1be4e33b9d1872eeb84487b2f5d62de3ec01039a44c6c874d359b41a63
-  data.tar.gz: 5cded4f528912d34d211cdac18a39cdbf5f0a02e0d89e6a4f0e8af84a21a20d0
+  metadata.gz: '08eba23c40f2aca8a2a7ec50bbed2839b98b9efd7ea1f5ccf5a53c6cee4e9e8c'
+  data.tar.gz: 3ae07a5b872b641df43da241135ea608a584ee52bd7327f528c3e51e2865d73a
 SHA512:
-  metadata.gz: c304c2bbdfb9f6ccc3111057a5fd9a41f86f53dbf94f91cc94091588e26ca9a73a2d869fb74f10cf07261b493444140e0ee1a8bc743decc34aafca221816c0cd
-  data.tar.gz: e01761f2d7109ef0d324fd2032d6e2a2ef21effb0a4ba6aa5ce7e3c46336fcf4165d59d93634d698d3b7bcecff924b35036c83c087a01d3c6038a294e3986b2e
+  metadata.gz: 3d8c5447cab016c9bf42d33d57fb4fc7d0a05e9d47ae285b72622eb73d67dac739d74afd611ce5858bf776ffa64dcfbc748b38b9f1642609ed2eeb3b8080f97b
+  data.tar.gz: fb7540b7c46d0d03830cd74a2961dd69ed552f3b667a163c4b382539935f776031dc867afaeb5b1b724279e060c92544df091fb6ee3f037fd94c82dc32b6c9c3

data/.rubocop_todo.yml

@@ -1,11 +1,65 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-11-26 21:06:12 UTC using RuboCop version 1.68.0.
+# on 2025-01-30 03:38:19 UTC using RuboCop version 1.71.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentOneStep, IndentationWidth.
+# SupportedStyles: case, end
+Layout/CaseIndentation:
+  Exclude:
+    - 'lib/expressir/model/model_element.rb'
+
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+Layout/ElseAlignment:
+  Exclude:
+    - 'lib/expressir/express/formatter.rb'
+
+# Offense count: 111
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleAlignWith, Severity.
+# SupportedStylesAlignWith: keyword, variable, start_of_line
+Layout/EndAlignment:
+  Exclude:
+    - 'lib/expressir/express/formatter.rb'
+    - 'lib/expressir/model/model_element.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_brackets
+Layout/FirstArrayElementIndentation:
+  Exclude:
+    - 'lib/expressir/express/formatter.rb'
+
+# Offense count: 109
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Width, AllowedPatterns.
+Layout/IndentationWidth:
+  Exclude:
+    - 'lib/expressir/express/formatter.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
+# URISchemes: http, https
+Layout/LineLength:
+  Exclude:
+    - 'lib/expressir/express/parser.rb'
+
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: aligned, indented
+Layout/MultilineOperationIndentation:
+  Exclude:
+    - 'lib/expressir/express/formatter.rb'
+
 # Offense count: 1
 # Configuration parameters: AllowedParentClasses.
 Lint/MissingSuper:
@@ -19,7 +73,8 @@ Lint/ShadowingOuterLocalVariable:
 
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AutoCorrect, AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
+# Configuration parameters: AutoCorrect, AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
+# NotImplementedExceptions: NotImplementedError
 Lint/UnusedMethodArgument:
   Exclude:
     - 'lib/expressir/express/parser.rb'
@@ -82,3 +137,11 @@ Performance/FixedSize:
 Style/MissingRespondToMissing:
   Exclude:
     - 'lib/expressir/express/visitor.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiteralsInInterpolation:
+  Exclude:
+    - 'lib/expressir/model/model_element.rb'

data/exe/expressir

@@ -1,22 +1,5 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
-# resolve bin path, ignoring symlinks
-require "pathname"
-bin_file = Pathname.new(__FILE__).realpath
-
-# add self to libpath
-$:.unshift File.expand_path("../../lib", bin_file)
-
-# Fixes https://github.com/rubygems/rubygems/issues/1420
-require "rubygems/specification"
-
-module Gem
-  class Specification
-    def this; self; end
-  end
-end
-
-# start up the CLI
-require "expressir"
+require_relative "../lib/expressir"
 Expressir::Cli.start(ARGV)

data/exe/expressir-format

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 
 require "yaml"
-require "expressir"
-require "expressir/express/formatter"
-require "expressir/express/schema_head_formatter"
-require "expressir/express/hyperlink_formatter"
+require_relative "../lib/expressir"
+require_relative "../lib/expressir/express/formatter"
+require_relative "../lib/expressir/express/schema_head_formatter"
+require_relative "../lib/expressir/express/hyperlink_formatter"
 
 exp_files = ARGV
 

data/exe/expressir-format-test

@@ -2,11 +2,11 @@
 
 require "yaml"
 require "tempfile"
-require "expressir/express/parser"
-require "expressir/express/formatter"
-require "expressir/express/schema_head_formatter"
-require "expressir/express/hyperlink_formatter"
-require "expressir/express/cache"
+require_relative "../lib/expressir/express/parser"
+require_relative "../lib/expressir/express/formatter"
+require_relative "../lib/expressir/express/schema_head_formatter"
+require_relative "../lib/expressir/express/hyperlink_formatter"
+require_relative "../lib/expressir/express/cache"
 
 exp_files = [
   # basic test

data/lib/expressir/express/cache.rb

@@ -1,6 +1,5 @@
-require "yaml"
 require "zlib"
-require "expressir/model"
+require_relative "../model"
 
 module Expressir
   module Express

data/lib/expressir/express/formatter.rb

@@ -1,4 +1,4 @@
-require "expressir/model"
+require_relative "../model"
 
 module Expressir
   module Express
@@ -40,6 +40,12 @@ module Expressir
       private_constant :OPERATOR_PRECEDENCE
       private_constant :SUPERTYPE_OPERATOR_PRECEDENCE
 
+      attr_accessor :no_remarks
+
+      def initialize(no_remarks: false)
+        @no_remarks = no_remarks
+      end
+
       # Formats Express model into an Express code
       # @param [Model::ModelElement] node
       # @return [String]
@@ -1604,7 +1610,7 @@ module Expressir
       end
 
       def format_remarks(node)
-        if node.class.method_defined? :remarks
+        if node.class.method_defined?(:remarks) && !@no_remarks
           node.remarks.map do |remark|
             format_remark(node, remark)
           end

data/lib/expressir/express/model_visitor.rb

@@ -1,4 +1,4 @@
-require "expressir/model"
+require_relative "../model"
 
 module Expressir
   module Express

data/lib/expressir/express/parser.rb

@@ -1,6 +1,6 @@
-require "expressir/express/resolve_references_model_visitor"
 require "parslet"
-require "expressir/model"
+require_relative "resolve_references_model_visitor"
+require_relative "../model"
 
 module Expressir
   module Express
@@ -68,7 +68,7 @@ module Expressir
         end
         rule(:aliasStmt) do
           (tALIAS >> variableId >> tFOR >> generalRef >> qualifier.repeat.as(:qualifier) >>
-            op_delim >> stmt.repeat(1).as(:stmt) >> tEND_ALIAS >> (op_delim.as(:op_delim2))).as(:aliasStmt)
+           op_delim >> stmt.repeat(1).as(:stmt) >> tEND_ALIAS >> (op_delim.as(:op_delim2))).as(:aliasStmt)
         end
         rule(:anyKeyword) { KEYWORDS.map { |kw| send("t#{kw}") }.inject(:|) }
         rule(:arrayType) do
@@ -89,11 +89,9 @@ module Expressir
         rule(:boundSpec) { (op_leftbracket >> bound1 >> op_colon >> bound2 >> op_rightbracket).as(:boundSpec) }
         rule(:builtInConstant) { (tCONST_E | tPI | tSELF | op_question_mark).as(:builtInConstant) }
         rule(:builtInFunction) do
-          (
-            tABS | tACOS | tASIN | tATAN | tBLENGTH | tCOS | tEXISTS | tEXP | tFORMAT | tHIBOUND | tHIINDEX | tLENGTH |
-            tLOBOUND | tLOINDEX | tLOG2 | tLOG10 | tLOG | tNVL | tODD | tROLESOF | tSIN | tSIZEOF | tSQRT | tTAN |
-            tTYPEOF | tUSEDIN | tVALUE_IN | tVALUE_UNIQUE | tVALUE
-          ).as(:builtInFunction)
+          (tABS | tACOS | tASIN | tATAN | tBLENGTH | tCOS | tEXISTS | tEXP | tFORMAT | tHIBOUND | tHIINDEX | tLENGTH |
+           tLOBOUND | tLOINDEX | tLOG2 | tLOG10 | tLOG | tNVL | tODD | tROLESOF | tSIN | tSIZEOF | tSQRT | tTAN |
+           tTYPEOF | tUSEDIN | tVALUE_IN | tVALUE_UNIQUE | tVALUE).as(:builtInFunction)
         end
         rule(:builtInProcedure) { (tINSERT | tREMOVE).as(:builtInProcedure) }
         rule(:caseAction) { ((caseLabel >> (op_comma >> caseLabel).repeat).as(:listOf_caseLabel) >> op_colon >> stmt).as(:caseAction) }
@@ -141,10 +139,8 @@ module Expressir
         rule(:enumerationType) { (tEXTENSIBLE.maybe >> tENUMERATION >> (tOF >> enumerationItems | enumerationExtension).maybe).as(:enumerationType) }
         rule(:escapeStmt) { (tESCAPE >> op_delim).as(:escapeStmt) }
         rule(:explicitAttr) do
-          (
-            (attributeDecl >> (op_comma >> attributeDecl).repeat).as(:listOf_attributeDecl) >> op_colon >>
-              tOPTIONAL.maybe >> parameterType >> op_delim
-          ).as(:explicitAttr)
+          ((attributeDecl >> (op_comma >> attributeDecl).repeat).as(:listOf_attributeDecl) >> op_colon >>
+           tOPTIONAL.maybe >> parameterType >> op_delim).as(:explicitAttr)
         end
         rule(:expression) { (simpleExpression >> (relOpExtended >> simpleExpression.as(:rhs)).maybe).as(:expression) }
         rule(:factor) { (simpleFactor >> (op_double_asterisk >> simpleFactor.as(:rhs)).maybe).as(:factor) }
@@ -153,9 +149,8 @@ module Expressir
         rule(:functionDecl) { (functionHead >> algorithmHead >> stmt.repeat(1).as(:stmt) >> tEND_FUNCTION >> op_delim).as(:functionDecl) }
         rule(:functionHead) do
           (tFUNCTION >> functionId >>
-            (op_leftparen >> (formalParameter >> (op_delim >> formalParameter).repeat).as(:listOf_formalParameter) >> op_rightparen).maybe >>
-            op_colon >> parameterType >> (op_delim.as(:op_delim2))
-          ).as(:functionHead)
+           (op_leftparen >> (formalParameter >> (op_delim >> formalParameter).repeat).as(:listOf_formalParameter) >> op_rightparen).maybe >>
+           op_colon >> parameterType >> (op_delim.as(:op_delim2))).as(:functionHead)
         end
         rule(:functionId) { simpleId.as(:functionId) }
         rule(:functionRef) { functionId.as(:functionRef) }
@@ -188,8 +183,7 @@ module Expressir
         rule(:intervalLow) { simpleExpression.as(:intervalLow) }
         rule(:interval) do
           (op_left_curly_brace >> intervalLow >> intervalOp >> intervalItem >> (intervalOp.as(:intervalOp2)) >>
-            intervalHigh >> op_right_curly_brace
-          ).as(:interval)
+           intervalHigh >> op_right_curly_brace).as(:interval)
         end
         rule(:intervalOp) { (op_less_equal | op_less_than).as(:intervalOp) }
         rule(:inverseAttr) do
@@ -203,9 +197,8 @@ module Expressir
         rule(:localDecl) { (tLOCAL >> localVariable.repeat(1).as(:localVariable) >> tEND_LOCAL >> op_delim).as(:localDecl) }
         rule(:localVariable) do
           ((variableId >> (op_comma >> variableId).repeat).as(:listOf_variableId) >>
-            op_colon >> parameterType >>
-            (op_decl >> expression).maybe >> op_delim
-          ).as(:localVariable)
+           op_colon >> parameterType >>
+           (op_decl >> expression).maybe >> op_delim).as(:localVariable)
         end
         rule(:logicalExpression) { expression.as(:logicalExpression) }
         rule(:logicalLiteral) { (tFALSE | tTRUE | tUNKNOWN).as(:logicalLiteral) }
@@ -218,10 +211,8 @@ module Expressir
         rule(:numericExpression) { simpleExpression.as(:numericExpression) }
         rule(:octet) { hexDigit >> hexDigit }
         rule(:oneOf) do
-          (
-            tONEOF >> op_leftparen >> (supertypeExpression >>
-            (op_comma >> supertypeExpression).repeat).as(:listOf_supertypeExpression) >> op_rightparen
-          ).as(:oneOf)
+          (tONEOF >> op_leftparen >> (supertypeExpression >>
+                                      (op_comma >> supertypeExpression).repeat).as(:listOf_supertypeExpression) >> op_rightparen).as(:oneOf)
         end
         rule(:op_asterisk) { cstr("*").as(:op_asterisk) }
         rule(:op_colon) { cstr(":").as(:op_colon) }
@@ -264,14 +255,9 @@ module Expressir
         rule(:procedureDecl) { (procedureHead >> algorithmHead >> stmt.repeat.as(:stmt) >> tEND_PROCEDURE >> op_delim).as(:procedureDecl) }
         rule(:procedureHeadParameter) { (tVAR.maybe >> formalParameter).as(:procedureHeadParameter) }
         rule(:procedureHead) do
-          (
-            tPROCEDURE >> procedureId >>
-            (
-              op_leftparen >> (
-                procedureHeadParameter >>
-                (op_delim >> procedureHeadParameter).repeat
-              ).as(:listOf_procedureHeadParameter) >> op_rightparen
-            ).maybe >> (op_delim.as(:op_delim2))).as(:procedureHead)
+          (tPROCEDURE >> procedureId >>
+           (op_leftparen >> (procedureHeadParameter >>
+                             (op_delim >> procedureHeadParameter).repeat).as(:listOf_procedureHeadParameter) >> op_rightparen).maybe >> (op_delim.as(:op_delim2))).as(:procedureHead)
         end
         rule(:procedureId) { simpleId.as(:procedureId) }
         rule(:procedureRef) { procedureId.as(:procedureRef) }
@@ -285,20 +271,14 @@ module Expressir
         rule(:realType) { (tREAL >> (op_leftparen >> precisionSpec >> op_rightparen).maybe).as(:realType) }
         rule(:redeclaredAttribute) { (qualifiedAttribute >> (tRENAMED >> attributeId).maybe).as(:redeclaredAttribute) }
         rule(:referenceClause) do
-          (
-            tREFERENCE >> tFROM >> schemaRef >>
-            (op_leftparen >> (resourceOrRename >> (
-              op_comma >> resourceOrRename
-            ).repeat).as(:listOf_resourceOrRename) >> op_rightparen).maybe >> op_delim
-          ).as(:referenceClause)
+          (tREFERENCE >> tFROM >> schemaRef >>
+           (op_leftparen >> (resourceOrRename >> (op_comma >> resourceOrRename).repeat).as(:listOf_resourceOrRename) >> op_rightparen).maybe >> op_delim).as(:referenceClause)
         end
         rule(:referencedAttribute) { (attributeRef | qualifiedAttribute).as(:referencedAttribute) }
         rule(:relOpExtended) { (relOp | tIN | tLIKE).as(:relOpExtended) }
         rule(:relOp) do
-          (
-            op_less_equal | op_greater_equal | op_less_greater | op_less_than | op_greater_than | op_equals |
-            op_colon_less_greater_colon | op_colon_equals_colon
-          ).as(:relOp)
+          (op_less_equal | op_greater_equal | op_less_greater | op_less_than | op_greater_than | op_equals |
+           op_colon_less_greater_colon | op_colon_equals_colon).as(:relOp)
         end
         rule(:renameId) { (constantId | entityId | functionId | procedureId | typeId).as(:renameId) }
         rule(:repeatControl) { (incrementControl.maybe >> whileControl.maybe >> untilControl.maybe).as(:repeatControl) }
@@ -309,10 +289,8 @@ module Expressir
         rule(:returnStmt) { (tRETURN >> (op_leftparen >> expression >> op_rightparen).maybe >> op_delim).as(:returnStmt) }
         rule(:ruleDecl) { (ruleHead >> algorithmHead >> stmt.repeat.as(:stmt) >> whereClause >> tEND_RULE >> op_delim).as(:ruleDecl) }
         rule(:ruleHead) do
-          (
-            tRULE >> ruleId >> tFOR >> op_leftparen >>
-            (entityRef >> (op_comma >> entityRef).repeat).as(:listOf_entityRef) >> op_rightparen >> op_delim
-          ).as(:ruleHead)
+          (tRULE >> ruleId >> tFOR >> op_leftparen >>
+           (entityRef >> (op_comma >> entityRef).repeat).as(:listOf_entityRef) >> op_rightparen >> op_delim).as(:ruleHead)
         end
         rule(:ruleId) { simpleId.as(:ruleId) }
         rule(:ruleLabelId) { simpleId.as(:ruleLabelId) }
@@ -320,10 +298,8 @@ module Expressir
         rule(:ruleRef) { ruleId.as(:ruleRef) }
         rule(:schemaBodyDeclaration) { (declaration | ruleDecl).as(:schemaBodyDeclaration) }
         rule(:schemaBody) do
-          (
-            interfaceSpecification.repeat.as(:interfaceSpecification) >> constantDecl.maybe >>
-            schemaBodyDeclaration.repeat.as(:schemaBodyDeclaration)
-          ).as(:schemaBody)
+          (interfaceSpecification.repeat.as(:interfaceSpecification) >> constantDecl.maybe >>
+           schemaBodyDeclaration.repeat.as(:schemaBodyDeclaration)).as(:schemaBody)
         end
         rule(:schemaDecl) do
           (tSCHEMA >> schemaId >> schemaVersionId.maybe >> op_delim >> schemaBody >> tEND_SCHEMA >> (op_delim.as(:op_delim2))).as(:schemaDecl)
@@ -339,10 +315,8 @@ module Expressir
         rule(:sign) { match["+-"] }
         rule(:simpleExpression) { (term >> (addLikeOp.as(:operator) >> term).as(:item).repeat.as(:rhs)).as(:simpleExpression) }
         rule(:simpleFactor) do
-          (
-            simpleFactorExpression | aggregateInitializer | entityConstructor | interval | queryExpression | stringLiteral |
-            simpleFactorUnaryExpression | enumerationReference
-          ).as(:simpleFactor)
+          (simpleFactorExpression | aggregateInitializer | entityConstructor | interval | queryExpression | stringLiteral |
+           simpleFactorUnaryExpression | enumerationReference).as(:simpleFactor)
         end
         rule(:simpleFactorExpression) { (op_leftparen >> expression >> op_rightparen | primary).as(:simpleFactorExpression) }
         rule(:simpleFactorUnaryExpression) { (unaryOp >> simpleFactorExpression).as(:simpleFactorUnaryExpression) }
@@ -353,10 +327,8 @@ module Expressir
         rule(:space) { match[" \r\n\t\f"] | embeddedRemark | tailRemark }
         rule(:spaces) { space.repeat.as(:spaces) }
         rule(:stmt) do
-          (
-            aliasStmt | assignmentStmt | caseStmt | compoundStmt | escapeStmt | ifStmt |
-            nullStmt | procedureCallStmt | repeatStmt | returnStmt | skipStmt
-          ).as(:stmt)
+          (aliasStmt | assignmentStmt | caseStmt | compoundStmt | escapeStmt | ifStmt |
+           nullStmt | procedureCallStmt | repeatStmt | returnStmt | skipStmt).as(:stmt)
         end
         rule(:stringLiteral) { (simpleStringLiteral | encodedStringLiteral).as(:stringLiteral) }
         rule(:stringType) { (tSTRING >> widthSpec.maybe).as(:stringType) }
@@ -399,17 +371,9 @@ module Expressir
         end
         rule(:untilControl) { (tUNTIL >> logicalExpression).as(:untilControl) }
         rule(:useClause) do
-          (
-            tUSE >> tFROM >> schemaRef >>
-            (
-              op_leftparen >> (
-                namedTypeOrRename >> (
-                  op_comma >>
-                  namedTypeOrRename
-                ).repeat
-              ).as(:listOf_namedTypeOrRename) >> op_rightparen
-            ).maybe >> op_delim
-          ).as(:useClause)
+          (tUSE >> tFROM >> schemaRef >>
+           (op_leftparen >> (namedTypeOrRename >> (op_comma >>
+                                                   namedTypeOrRename).repeat).as(:listOf_namedTypeOrRename) >> op_rightparen).maybe >> op_delim).as(:useClause)
         end
         rule(:variableId) { simpleId.as(:variableId) }
         rule(:variableRef) { variableId.as(:variableRef) }

data/lib/expressir/express/resolve_references_model_visitor.rb

@@ -1,5 +1,5 @@
-require "expressir/express/model_visitor"
-require "expressir/model"
+require_relative "model_visitor"
+require_relative "../model"
 
 module Expressir
   module Express

data/lib/expressir/express/visitor.rb

@@ -1,4 +1,4 @@
-require "expressir/model"
+require_relative "../model"
 require "set"
 
 # reference type is not recognized
@@ -248,7 +248,6 @@ module Expressir
           ctx.values.map { |item| get_remarks(item, "#{indent}  ") }.inject([], :+)
         when Array
           ctx.map { |item| get_remarks(item, "#{indent}  ") }.inject([], :+)
-
         else
           if %i[tailRemark embeddedRemark].include?(ctx.name)
             [get_source_pos(ctx)]
@@ -886,9 +885,9 @@ module Expressir
 
         id = visit_if(ctx__entity_head__entity_id)
         abstract = (ctx__entity_head__subsuper__supertype_constraint__abstract_entity_declaration ||
-          ctx__entity_head__subsuper__supertype_constraint__abstract_supertype_declaration) && true
+                    ctx__entity_head__subsuper__supertype_constraint__abstract_supertype_declaration) && true
         supertype_expression = visit_if(ctx__entity_head__subsuper__supertype_constraint__abstract_supertype_declaration ||
-          ctx__entity_head__subsuper__supertype_constraint__supertype_rule)
+                                        ctx__entity_head__subsuper__supertype_constraint__supertype_rule)
         subtype_of = visit_if(ctx__entity_head__subsuper__subtype_declaration, [])
         attributes = [
           *visit_if_map_flatten(ctx__entity_body__explicit_attr),

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

@@ -6,9 +6,9 @@ module Expressir
       class SchemaDrop < ::Expressir::Liquid::DeclarationDrop
         include ::Expressir::Liquid::IdentifierDrop
 
-        def initialize(model, selected_schemas: nil, options: {}) # rubocop:disable Lint/MissingSuper
+        def initialize(model, options: {}) # rubocop:disable Lint/MissingSuper
           @model = model
-          @selected_schemas = selected_schemas
+          @selected_schemas = options&.delete("selected_schemas")
           @options = options
           initialize_identifier(@model)
           super(model)

data/lib/expressir/liquid/identifier_drop.rb

@@ -21,7 +21,7 @@ module Expressir
         return [] unless @model.remark_items
 
         @model.remark_items.map do |item|
-          ::Expressir::Liquid::RemarkItemDrop.new(item)
+          ::Expressir::Liquid::Declarations::RemarkItemDrop.new(item)
         end
       end
 

data/lib/expressir/liquid/repository_drop.rb

@@ -5,9 +5,8 @@ require_relative "declarations/schema_drop"
 module Expressir
   module Liquid
     class RepositoryDrop < ::Expressir::Liquid::ModelElementDrop
-      def initialize(model, selected_schemas: nil, options: {}) # rubocop:disable Lint/MissingSuper
+      def initialize(model, options: {}) # rubocop:disable Lint/MissingSuper
         @model = model
-        @selected_schemas = selected_schemas
         @options = options
         super(model)
       end
@@ -17,9 +16,7 @@ module Expressir
 
         @model.schemas.map do |item|
           ::Expressir::Liquid::Declarations::SchemaDrop.new(
-            item,
-            selected_schemas: @selected_schemas,
-            options: @options,
+            item, options: @options
           )
         end
       end

data/lib/expressir/liquid.rb

@@ -1,17 +1,17 @@
 require "liquid"
 
-require "expressir/liquid/model_element_drop"
+require_relative "liquid/model_element_drop"
 
-require "expressir/liquid/cache_drop"
-require "expressir/liquid/data_type_drop"
-require "expressir/liquid/declaration_drop"
-require "expressir/liquid/expression_drop"
-require "expressir/liquid/literal_drop"
-require "expressir/liquid/reference_drop"
-require "expressir/liquid/statement_drop"
-require "expressir/liquid/supertype_expression_drop"
-require "expressir/liquid/identifier_drop"
-require "expressir/liquid/repository_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

data/lib/expressir/model/model_element.rb

@@ -151,19 +151,16 @@ module Expressir
       end
 
       # @return [Liquid::Drop]
-      def to_liquid(selected_schemas: nil, options: nil)
+      def to_liquid(options: nil)
         klass_name = "#{self.class.name.gsub('::Model::', '::Liquid::')}Drop"
         klass = Object.const_get(klass_name)
-        klass.new(self, selected_schemas: selected_schemas, options: options)
+        klass.new(self, options: options)
       end
 
       def to_s(no_remarks: false, formatter: nil)
-        formatter ||= Class.new(Expressir::Express::Formatter) do
-          if no_remarks
-            def format_remarks(_node); []; end
-          end
-        end
-        formatter.format(self)
+        f = formatter || Express::Formatter.new(no_remarks: no_remarks)
+        f.no_remarks = no_remarks
+        f.format(self)
       end
 
       # @param [Hash] hash