expressir 2.1.13 → 2.1.14

data/lib/expressir/model/statements/if.rb

@@ -3,21 +3,17 @@ module Expressir
     module Statements
       # Specified in ISO 10303-11:2004
       # - section 13.7 If ... Then ... Else statement
-      class If < Statement
-        model_attr_accessor :expression, "Expression"
-        model_attr_accessor :statements, "Array<Statement>"
-        model_attr_accessor :else_statements, "Array<Statement>"
+      class If < ModelElement
+        attribute :expression, ModelElement
+        attribute :statements, ModelElement, collection: true
+        attribute :else_statements, ModelElement, collection: true
+        attribute :_class, :string, default: -> { send(:name) }
 
-        # @param [Hash] options
-        # @option options [Expression] :expression
-        # @option options [Array<Statement>] :statements
-        # @option options [Array<Statement>] :else_statements
-        def initialize(options = {})
-          @expression = options[:expression]
-          @statements = options[:statements] || []
-          @else_statements = options[:else_statements] || []
-
-          super
+        key_value do
+          map "_class", to: :_class, render_default: true
+          map "expression", to: :expression
+          map "statements", to: :statements
+          map "else_statements", to: :else_statements
         end
       end
     end

data/lib/expressir/model/statements/null.rb

@@ -3,7 +3,12 @@ module Expressir
     module Statements
       # Specified in ISO 10303-11:2004
       # - section 13.1 Null (statement)
-      class Null < Statement
+      class Null < ModelElement
+        attribute :_class, :string, default: -> { send(:name) }
+
+        key_value do
+          map "_class", to: :_class, render_default: true
+        end
       end
     end
   end

data/lib/expressir/model/statements/procedure_call.rb

@@ -3,18 +3,15 @@ module Expressir
     module Statements
       # Specified in ISO 10303-11:2004
       # - section 13.8 Procedure call statement
-      class ProcedureCall < Statement
-        model_attr_accessor :procedure, "Reference"
-        model_attr_accessor :parameters, "Array<Expression>"
+      class ProcedureCall < ModelElement
+        attribute :procedure, ModelElement
+        attribute :parameters, ModelElement, collection: true
+        attribute :_class, :string, default: -> { send(:name) }
 
-        # @param [Hash] options
-        # @option options [Reference] :procedure
-        # @option options [Array<Expression>] :parameters
-        def initialize(options = {})
-          @procedure = options[:procedure]
-          @parameters = options[:parameters] || []
-
-          super
+        key_value do
+          map "_class", to: :_class, render_default: true
+          map "procedure", to: :procedure
+          map "parameters", to: :parameters
         end
       end
     end

data/lib/expressir/model/statements/repeat.rb

@@ -3,35 +3,25 @@ module Expressir
     module Statements
       # Specified in ISO 10303-11:2004
       # - section 13.9 Repeat statement
-      class Repeat < Statement
+      class Repeat < ModelElement
         include Identifier
 
-        model_attr_accessor :bound1, "Expression"
-        model_attr_accessor :bound2, "Expression"
-        model_attr_accessor :increment, "Expression"
-        model_attr_accessor :while_expression, "Expression"
-        model_attr_accessor :until_expression, "Expression"
-        model_attr_accessor :statements, "Array<Statement>"
+        attribute :bound1, ModelElement
+        attribute :bound2, ModelElement
+        attribute :increment, ModelElement
+        attribute :while_expression, ModelElement
+        attribute :until_expression, ModelElement
+        attribute :statements, ModelElement, collection: true
+        attribute :_class, :string, default: -> { send(:name) }
 
-        # @param [Hash] options
-        # @option (see Identifier#initialize_identifier)
-        # @option options [Expression] :bound1
-        # @option options [Expression] :bound2
-        # @option options [Expression] :increment
-        # @option options [Expression] :while_expression
-        # @option options [Expression] :until_expression
-        # @option options [Array<Statement>] :statements
-        def initialize(options = {})
-          initialize_identifier(options)
-
-          @bound1 = options[:bound1]
-          @bound2 = options[:bound2]
-          @increment = options[:increment]
-          @while_expression = options[:while_expression]
-          @until_expression = options[:until_expression]
-          @statements = options[:statements] || []
-
-          super
+        key_value do
+          map "_class", to: :_class, render_default: true
+          map "bound1", to: :bound1
+          map "bound2", to: :bound2
+          map "increment", to: :increment
+          map "while_expression", to: :while_expression
+          map "until_expression", to: :until_expression
+          map "statements", to: :statements
         end
 
         # @return [Array<Declaration>]

data/lib/expressir/model/statements/return.rb

@@ -3,15 +3,13 @@ module Expressir
     module Statements
       # Specified in ISO 10303-11:2004
       # - section 13.10 Return statement
-      class Return < Statement
-        model_attr_accessor :expression, "Expression"
+      class Return < ModelElement
+        attribute :expression, ModelElement
+        attribute :_class, :string, default: -> { send(:name) }
 
-        # @param [Hash] options
-        # @option options [Expression] :expression
-        def initialize(options = {})
-          @expression = options[:expression]
-
-          super
+        key_value do
+          map "_class", to: :_class, render_default: true
+          map "expression", to: :expression
         end
       end
     end

data/lib/expressir/model/statements/skip.rb

@@ -3,7 +3,12 @@ module Expressir
     module Statements
       # Specified in ISO 10303-11:2004
       # - section 13.11 Skip statement
-      class Skip < Statement
+      class Skip < ModelElement
+        attribute :_class, :string, default: -> { send(:name) }
+
+        key_value do
+          map "_class", to: :_class, render_default: true
+        end
       end
     end
   end

data/lib/expressir/model/supertype_expressions/binary_supertype_expression.rb

@@ -4,24 +4,20 @@ module Expressir
       # Specified in ISO 10303-11:2004
       # - section 9.2.5.3 ANDOR
       # - section 9.2.5.4 AND
-      class BinarySupertypeExpression < SupertypeExpression
-        AND = :AND
-        ANDOR = :ANDOR
+      class BinarySupertypeExpression < ModelElement
+        AND = "AND".freeze
+        ANDOR = "ANDOR".freeze
 
-        model_attr_accessor :operator, ":AND, :ANDOR"
-        model_attr_accessor :operand1, "SupertypeExpression"
-        model_attr_accessor :operand2, "SupertypeExpression"
+        attribute :operator, :string, values: %w[AND ANDOR]
+        attribute :operand1, ModelElement
+        attribute :operand2, ModelElement
+        attribute :_class, :string, default: -> { send(:name) }
 
-        # @param [Hash] options
-        # @option options [:AND, :ANDOR] :operator
-        # @option options [SupertypeExpression] :operand1
-        # @option options [SupertypeExpression] :operand2
-        def initialize(options = {})
-          @operator = options[:operator]
-          @operand1 = options[:operand1]
-          @operand2 = options[:operand2]
-
-          super
+        key_value do
+          map "_class", to: :_class, render_default: true
+          map "operator", to: :operator
+          map "operand1", to: :operand1
+          map "operand2", to: :operand2
         end
       end
     end

data/lib/expressir/model/supertype_expressions/oneof_supertype_expression.rb

@@ -3,15 +3,13 @@ module Expressir
     module SupertypeExpressions
       # Specified in ISO 10303-11:2004
       # - section 9.2.5.2 ONEOF
-      class OneofSupertypeExpression < SupertypeExpression
-        model_attr_accessor :operands, "Array<SupertypeExpression>"
+      class OneofSupertypeExpression < ModelElement
+        attribute :operands, ModelElement, collection: true
+        attribute :_class, :string, default: -> { send(:name) }
 
-        # @param [Hash] options
-        # @option options [Array<SupertypeExpression>] :operands
-        def initialize(options = {})
-          @operands = options[:operands]
-
-          super
+        key_value do
+          map "_class", to: :_class, render_default: true
+          map "operands", to: :operands
         end
       end
     end

data/lib/expressir/model.rb

@@ -1,15 +1,8 @@
 require_relative "model/model_element"
-
 require_relative "model/cache"
-require_relative "model/data_type"
-require_relative "model/declaration"
-require_relative "model/expression"
 require_relative "model/identifier"
-require_relative "model/literal"
-require_relative "model/reference"
 require_relative "model/repository"
-require_relative "model/statement"
-require_relative "model/supertype_expression"
+
 require_relative "model/data_types/aggregate"
 require_relative "model/data_types/array"
 require_relative "model/data_types/bag"

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "2.1.13".freeze
+  VERSION = "2.1.14".freeze
 end

data/lib/expressir.rb

@@ -1,14 +1,15 @@
+require "zeitwerk"
 require_relative "expressir/version"
-
 require_relative "expressir/cli"
 require_relative "expressir/config"
+require "lutaml/model"
+require "liquid" # To enable Lutaml::Model::Liquefiable
 
 # ..........................................................
 # https://bugs.ruby-lang.org/issues/19319
 # The issue is that this bug is fixed for 3.1 and above,
 # but not for 3.0 or 2.7, so we need a "safe" function
 # ..........................................................
-
 if RUBY_VERSION < "3.1"
   class String
     def safe_downcase
@@ -35,8 +36,11 @@ module Expressir
   end
 end
 
+loader = Zeitwerk::Loader.for_gem
+loader.setup
+
 Dir[File.join(__dir__, "expressir", "express", "*.rb")].sort.each do |fea|
   require fea
 end
 
-require_relative "expressir/liquid"
+require_relative "expressir/model"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.1.13
+  version: 2.1.14
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-18 00:00:00.000000000 Z
+date: 2025-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: lutaml-model
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 description: Expressir (“EXPRESS in Ruby”) is a Ruby parser for EXPRESS and a set
   of tools for accessing EXPRESS data models.
 email:
@@ -96,87 +124,8 @@ files:
 - lib/expressir/express/schema_head_formatter.rb
 - lib/expressir/express/visitor.rb
 - lib/expressir/liquid.rb
-- lib/expressir/liquid/cache_drop.rb
-- lib/expressir/liquid/data_type_drop.rb
-- lib/expressir/liquid/data_types/aggregate_drop.rb
-- lib/expressir/liquid/data_types/array_drop.rb
-- lib/expressir/liquid/data_types/bag_drop.rb
-- lib/expressir/liquid/data_types/binary_drop.rb
-- lib/expressir/liquid/data_types/boolean_drop.rb
-- lib/expressir/liquid/data_types/enumeration_drop.rb
-- lib/expressir/liquid/data_types/enumeration_item_drop.rb
-- lib/expressir/liquid/data_types/generic_drop.rb
-- lib/expressir/liquid/data_types/generic_entity_drop.rb
-- lib/expressir/liquid/data_types/integer_drop.rb
-- lib/expressir/liquid/data_types/list_drop.rb
-- lib/expressir/liquid/data_types/logical_drop.rb
-- lib/expressir/liquid/data_types/number_drop.rb
-- lib/expressir/liquid/data_types/real_drop.rb
-- lib/expressir/liquid/data_types/select_drop.rb
-- lib/expressir/liquid/data_types/set_drop.rb
-- lib/expressir/liquid/data_types/string_drop.rb
-- lib/expressir/liquid/declaration_drop.rb
-- lib/expressir/liquid/declarations/attribute_drop.rb
-- lib/expressir/liquid/declarations/constant_drop.rb
-- lib/expressir/liquid/declarations/entity_drop.rb
-- lib/expressir/liquid/declarations/function_drop.rb
-- lib/expressir/liquid/declarations/interface_drop.rb
-- lib/expressir/liquid/declarations/interface_item_drop.rb
-- lib/expressir/liquid/declarations/interfaced_item_drop.rb
-- lib/expressir/liquid/declarations/parameter_drop.rb
-- lib/expressir/liquid/declarations/procedure_drop.rb
-- lib/expressir/liquid/declarations/remark_item_drop.rb
-- lib/expressir/liquid/declarations/rule_drop.rb
-- lib/expressir/liquid/declarations/schema_drop.rb
-- lib/expressir/liquid/declarations/schema_version_drop.rb
-- lib/expressir/liquid/declarations/schema_version_item_drop.rb
-- lib/expressir/liquid/declarations/subtype_constraint_drop.rb
-- lib/expressir/liquid/declarations/type_drop.rb
-- lib/expressir/liquid/declarations/unique_rule_drop.rb
-- lib/expressir/liquid/declarations/variable_drop.rb
-- lib/expressir/liquid/declarations/where_rule_drop.rb
-- lib/expressir/liquid/expression_drop.rb
-- lib/expressir/liquid/expressions/aggregate_initializer_drop.rb
-- lib/expressir/liquid/expressions/aggregate_initializer_item_drop.rb
-- lib/expressir/liquid/expressions/binary_expression_drop.rb
-- lib/expressir/liquid/expressions/entity_constructor_drop.rb
-- lib/expressir/liquid/expressions/function_call_drop.rb
-- lib/expressir/liquid/expressions/interval_drop.rb
-- lib/expressir/liquid/expressions/query_expression_drop.rb
-- lib/expressir/liquid/expressions/unary_expression_drop.rb
-- lib/expressir/liquid/identifier_drop.rb
-- lib/expressir/liquid/literal_drop.rb
-- lib/expressir/liquid/literals/binary_drop.rb
-- lib/expressir/liquid/literals/integer_drop.rb
-- lib/expressir/liquid/literals/logical_drop.rb
-- lib/expressir/liquid/literals/real_drop.rb
-- lib/expressir/liquid/literals/string_drop.rb
-- lib/expressir/liquid/model_element_drop.rb
-- lib/expressir/liquid/reference_drop.rb
-- lib/expressir/liquid/references/attribute_reference_drop.rb
-- lib/expressir/liquid/references/group_reference_drop.rb
-- lib/expressir/liquid/references/index_reference_drop.rb
-- lib/expressir/liquid/references/simple_reference_drop.rb
-- lib/expressir/liquid/repository_drop.rb
-- lib/expressir/liquid/statement_drop.rb
-- lib/expressir/liquid/statements/alias_drop.rb
-- lib/expressir/liquid/statements/assignment_drop.rb
-- lib/expressir/liquid/statements/case_action_drop.rb
-- lib/expressir/liquid/statements/case_drop.rb
-- lib/expressir/liquid/statements/compound_drop.rb
-- lib/expressir/liquid/statements/escape_drop.rb
-- lib/expressir/liquid/statements/if_drop.rb
-- lib/expressir/liquid/statements/null_drop.rb
-- lib/expressir/liquid/statements/procedure_call_drop.rb
-- lib/expressir/liquid/statements/repeat_drop.rb
-- lib/expressir/liquid/statements/return_drop.rb
-- lib/expressir/liquid/statements/skip_drop.rb
-- lib/expressir/liquid/supertype_expression_drop.rb
-- lib/expressir/liquid/supertype_expressions/binary_supertype_expression_drop.rb
-- lib/expressir/liquid/supertype_expressions/oneof_supertype_expression_drop.rb
 - lib/expressir/model.rb
 - lib/expressir/model/cache.rb
-- lib/expressir/model/data_type.rb
 - lib/expressir/model/data_types/aggregate.rb
 - lib/expressir/model/data_types/array.rb
 - lib/expressir/model/data_types/bag.rb
@@ -194,7 +143,6 @@ files:
 - lib/expressir/model/data_types/select.rb
 - lib/expressir/model/data_types/set.rb
 - lib/expressir/model/data_types/string.rb
-- lib/expressir/model/declaration.rb
 - lib/expressir/model/declarations/attribute.rb
 - lib/expressir/model/declarations/constant.rb
 - lib/expressir/model/declarations/entity.rb
@@ -214,7 +162,6 @@ files:
 - lib/expressir/model/declarations/unique_rule.rb
 - lib/expressir/model/declarations/variable.rb
 - lib/expressir/model/declarations/where_rule.rb
-- lib/expressir/model/expression.rb
 - lib/expressir/model/expressions/aggregate_initializer.rb
 - lib/expressir/model/expressions/aggregate_initializer_item.rb
 - lib/expressir/model/expressions/binary_expression.rb
@@ -224,20 +171,17 @@ files:
 - lib/expressir/model/expressions/query_expression.rb
 - lib/expressir/model/expressions/unary_expression.rb
 - lib/expressir/model/identifier.rb
-- lib/expressir/model/literal.rb
 - lib/expressir/model/literals/binary.rb
 - lib/expressir/model/literals/integer.rb
 - lib/expressir/model/literals/logical.rb
 - lib/expressir/model/literals/real.rb
 - lib/expressir/model/literals/string.rb
 - lib/expressir/model/model_element.rb
-- lib/expressir/model/reference.rb
 - lib/expressir/model/references/attribute_reference.rb
 - lib/expressir/model/references/group_reference.rb
 - lib/expressir/model/references/index_reference.rb
 - lib/expressir/model/references/simple_reference.rb
 - lib/expressir/model/repository.rb
-- lib/expressir/model/statement.rb
 - lib/expressir/model/statements/alias.rb
 - lib/expressir/model/statements/assignment.rb
 - lib/expressir/model/statements/case.rb
@@ -250,7 +194,6 @@ files:
 - lib/expressir/model/statements/repeat.rb
 - lib/expressir/model/statements/return.rb
 - lib/expressir/model/statements/skip.rb
-- lib/expressir/model/supertype_expression.rb
 - lib/expressir/model/supertype_expressions/binary_supertype_expression.rb
 - lib/expressir/model/supertype_expressions/oneof_supertype_expression.rb
 - lib/expressir/version.rb
@@ -270,14 +213,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: EXPRESS parser and toolkit for Ruby

data/lib/expressir/liquid/cache_drop.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Expressir
-  module Liquid
-    class CacheDrop < ::Expressir::Liquid::ModelElementDrop
-      def initialize(model)
-        @model = model
-        super
-      end
-
-      def version
-        @model.version
-      end
-
-      def content
-        ::Expressir::Liquid::ModelElementDrop.new(@model.content)
-      end
-    end
-  end
-end

data/lib/expressir/liquid/data_type_drop.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module Expressir
-  module Liquid
-    class DataTypeDrop < ::Expressir::Liquid::ModelElementDrop
-    end
-  end
-end

data/lib/expressir/liquid/data_types/aggregate_drop.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Expressir
-  module Liquid
-    module DataTypes
-      class AggregateDrop < ::Expressir::Liquid::DataTypeDrop
-        include ::Expressir::Liquid::IdentifierDrop
-
-        def initialize(model)
-          @model = model
-          initialize_identifier(@model)
-          super
-        end
-
-        def base_type
-          drop_klass_by_model(@model.base_type)
-        end
-      end
-    end
-  end
-end

data/lib/expressir/liquid/data_types/array_drop.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Expressir
-  module Liquid
-    module DataTypes
-      class ArrayDrop < ::Expressir::Liquid::DataTypeDrop
-        def initialize(model)
-          @model = model
-          super
-        end
-
-        def bound1
-          drop_klass_by_model(@model.bound1)
-        end
-
-        def bound2
-          drop_klass_by_model(@model.bound2)
-        end
-
-        def optional
-          @model.optional
-        end
-
-        def unique
-          @model.unique
-        end
-
-        def base_type
-          drop_klass_by_model(@model.base_type)
-        end
-      end
-    end
-  end
-end

data/lib/expressir/liquid/data_types/bag_drop.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Expressir
-  module Liquid
-    module DataTypes
-      class BagDrop < ::Expressir::Liquid::DataTypeDrop
-        def initialize(model)
-          @model = model
-          super
-        end
-
-        def bound1
-          drop_klass_by_model(@model.bound1)
-        end
-
-        def bound2
-          drop_klass_by_model(@model.bound2)
-        end
-
-        def base_type
-          drop_klass_by_model(@model.base_type)
-        end
-      end
-    end
-  end
-end

data/lib/expressir/liquid/data_types/binary_drop.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Expressir
-  module Liquid
-    module DataTypes
-      class BinaryDrop < ::Expressir::Liquid::DataTypeDrop
-        def initialize(model)
-          @model = model
-          super
-        end
-
-        def width
-          drop_klass_by_model(@model.width)
-        end
-
-        def fixed
-          @model.fixed
-        end
-      end
-    end
-  end
-end

data/lib/expressir/liquid/data_types/boolean_drop.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Expressir
-  module Liquid
-    module DataTypes
-      class BooleanDrop < ::Expressir::Liquid::DataTypeDrop
-      end
-    end
-  end
-end