expressir 0.2.27-arm64-darwin → 1.0.0-arm64-darwin

data/spec/expressir/{express_exp → express}/parser_spec.rb

@@ -1,15 +1,15 @@
 require "yaml"
 require "spec_helper"
-require "expressir/express_exp/parser"
+require "expressir/express/parser"
 
-RSpec.describe Expressir::ExpressExp::Parser do
+RSpec.describe Expressir::Express::Parser do
   describe ".from_file" do
     it "parses a file (single.exp)" do
-      exp_file = Expressir.root_path.join("original", "examples", "syntax", "single.exp")
-      yaml_file = Expressir.root_path.join("original", "examples", "syntax", "single.yaml")
+      exp_file = Expressir.root_path.join("spec", "syntax", "single.exp")
+      yaml_file = Expressir.root_path.join("spec", "syntax", "single.yaml")
 
-      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
-      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, skip_empty: true))
+      repo = Expressir::Express::Parser.from_file(exp_file)
+      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path))
       # File.write(yaml_file, result)
       expected_result = File.read(yaml_file)
       
@@ -17,11 +17,11 @@ RSpec.describe Expressir::ExpressExp::Parser do
     end
 
     it "parses a file (multiple.exp)" do
-      exp_file = Expressir.root_path.join("original", "examples", "syntax", "multiple.exp")
-      yaml_file = Expressir.root_path.join("original", "examples", "syntax", "multiple.yaml")
+      exp_file = Expressir.root_path.join("spec", "syntax", "multiple.exp")
+      yaml_file = Expressir.root_path.join("spec", "syntax", "multiple.yaml")
 
-      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
-      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, skip_empty: true))
+      repo = Expressir::Express::Parser.from_file(exp_file)
+      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path))
       # File.write(yaml_file, result)
       expected_result = File.read(yaml_file)
       
@@ -29,11 +29,11 @@ RSpec.describe Expressir::ExpressExp::Parser do
     end
 
     it "parses a file (syntax.exp)" do
-      exp_file = Expressir.root_path.join("original", "examples", "syntax", "syntax.exp")
-      yaml_file = Expressir.root_path.join("original", "examples", "syntax", "syntax.yaml")
+      exp_file = Expressir.root_path.join("spec", "syntax", "syntax.exp")
+      yaml_file = Expressir.root_path.join("spec", "syntax", "syntax.yaml")
 
-      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
-      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, skip_empty: true))
+      repo = Expressir::Express::Parser.from_file(exp_file)
+      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path))
       # File.write(yaml_file, result)
       expected_result = File.read(yaml_file)
       
@@ -41,11 +41,11 @@ RSpec.describe Expressir::ExpressExp::Parser do
     end
 
     it "parses a file (remark.exp)" do
-      exp_file = Expressir.root_path.join("original", "examples", "syntax", "remark.exp")
-      yaml_file = Expressir.root_path.join("original", "examples", "syntax", "remark.yaml")
+      exp_file = Expressir.root_path.join("spec", "syntax", "remark.exp")
+      yaml_file = Expressir.root_path.join("spec", "syntax", "remark.yaml")
 
-      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
-      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, skip_empty: true))
+      repo = Expressir::Express::Parser.from_file(exp_file)
+      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path))
       # File.write(yaml_file, result)
       expected_result = File.read(yaml_file)
       
@@ -53,10 +53,10 @@ RSpec.describe Expressir::ExpressExp::Parser do
     end
 
     it "parses a file including original source (multiple.exp)" do
-      exp_file = Expressir.root_path.join("original", "examples", "syntax", "multiple.exp")
+      exp_file = Expressir.root_path.join("spec", "syntax", "multiple.exp")
 
       input = File.read(exp_file)
-      repo = Expressir::ExpressExp::Parser.from_file(exp_file, include_source: true)
+      repo = Expressir::Express::Parser.from_file(exp_file, include_source: true)
 
       schema = repo.schemas.first
       start_index = input.index("SCHEMA")
@@ -75,11 +75,11 @@ RSpec.describe Expressir::ExpressExp::Parser do
   describe ".from_files" do
     it "parses multiple files (single.exp, multiple.exp)" do
       exp_files = [
-        Expressir.root_path.join("original", "examples", "syntax", "single.exp"),
-        Expressir.root_path.join("original", "examples", "syntax", "multiple.exp")
+        Expressir.root_path.join("spec", "syntax", "single.exp"),
+        Expressir.root_path.join("spec", "syntax", "multiple.exp")
       ]
 
-      repo = Expressir::ExpressExp::Parser.from_files(exp_files)
+      repo = Expressir::Express::Parser.from_files(exp_files)
 
       schemas = repo.schemas
       expect(schemas.count).to eq(5)

data/spec/expressir/model/model_element_spec.rb

@@ -1,18 +1,18 @@
 
 require "yaml"
 require "spec_helper"
-require "expressir/express_exp/parser"
-require "expressir/express_exp/formatter"
+require "expressir/express/parser"
+require "expressir/express/formatter"
 
 RSpec.describe Expressir::Model::ModelElement do
   describe ".to_hash" do
     it "exports an object with a formatter (single.exp)" do
-      exp_file = Expressir.root_path.join("original", "examples", "syntax", "single.exp")
-      yaml_file = Expressir.root_path.join("original", "examples", "syntax", "single_formatted.yaml")
+      exp_file = Expressir.root_path.join("spec", "syntax", "single.exp")
+      yaml_file = Expressir.root_path.join("spec", "syntax", "single_formatted.yaml")
 
-      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+      repo = Expressir::Express::Parser.from_file(exp_file)
 
-      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, formatter: Expressir::ExpressExp::Formatter, skip_empty: true))
+      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, formatter: Expressir::Express::Formatter))
       # File.write(yaml_file, result)
       expected_result = File.read(yaml_file)
       
@@ -22,48 +22,48 @@ RSpec.describe Expressir::Model::ModelElement do
 
   describe ".from_hash" do
     it "parses an object (single.yaml)" do
-      yaml_file = Expressir.root_path.join("original", "examples", "syntax", "single.yaml")
+      yaml_file = Expressir.root_path.join("spec", "syntax", "single.yaml")
 
       input = YAML.load(File.read(yaml_file))
       repo = Expressir::Model::ModelElement.from_hash(input, root_path: Expressir.root_path)
 
-      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, skip_empty: true))
+      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path))
       expected_result = File.read(yaml_file)
 
       expect(result).to eq(expected_result)
     end
 
     it "parses an object (multiple.yaml)" do
-      yaml_file = Expressir.root_path.join("original", "examples", "syntax", "multiple.yaml")
+      yaml_file = Expressir.root_path.join("spec", "syntax", "multiple.yaml")
 
       input = YAML.load(File.read(yaml_file))
       repo = Expressir::Model::ModelElement.from_hash(input, root_path: Expressir.root_path)
 
-      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, skip_empty: true))
+      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path))
       expected_result = File.read(yaml_file)
 
       expect(result).to eq(expected_result)
     end
 
     it "parses an object (syntax.yaml)" do
-      yaml_file = Expressir.root_path.join("original", "examples", "syntax", "syntax.yaml")
+      yaml_file = Expressir.root_path.join("spec", "syntax", "syntax.yaml")
 
       input = YAML.load(File.read(yaml_file))
       repo = Expressir::Model::ModelElement.from_hash(input, root_path: Expressir.root_path)
 
-      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, skip_empty: true))
+      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path))
       expected_result = File.read(yaml_file)
 
       expect(result).to eq(expected_result)
     end
 
     it "parses an object (remark.yaml)" do
-      yaml_file = Expressir.root_path.join("original", "examples", "syntax", "remark.yaml")
+      yaml_file = Expressir.root_path.join("spec", "syntax", "remark.yaml")
 
       input = YAML.load(File.read(yaml_file))
       repo = Expressir::Model::ModelElement.from_hash(input, root_path: Expressir.root_path)
 
-      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path, skip_empty: true))
+      result = YAML.dump(repo.to_hash(root_path: Expressir.root_path))
       expected_result = File.read(yaml_file)
 
       expect(result).to eq(expected_result)
@@ -72,9 +72,9 @@ RSpec.describe Expressir::Model::ModelElement do
 
   describe ".find" do
     it "finds an object (single.exp)" do
-      exp_file = Expressir.root_path.join("original", "examples", "syntax", "single.exp")
+      exp_file = Expressir.root_path.join("spec", "syntax", "single.exp")
 
-      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+      repo = Expressir::Express::Parser.from_file(exp_file)
 
       # universal scope
       expect(repo.find('single_schema')).to be_instance_of(Expressir::Model::Schema)
@@ -86,9 +86,9 @@ RSpec.describe Expressir::Model::ModelElement do
     end
 
     it "finds an object (multiple.exp)" do
-      exp_file = Expressir.root_path.join("original", "examples", "syntax", "multiple.exp")
+      exp_file = Expressir.root_path.join("spec", "syntax", "multiple.exp")
 
-      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+      repo = Expressir::Express::Parser.from_file(exp_file)
 
       # universal scope
       expect(repo.find('multiple_schema')).to be_instance_of(Expressir::Model::Schema)
@@ -108,9 +108,9 @@ RSpec.describe Expressir::Model::ModelElement do
     end
 
     it "finds an object (syntax.exp)" do
-      exp_file = Expressir.root_path.join("original", "examples", "syntax", "syntax.exp")
+      exp_file = Expressir.root_path.join("spec", "syntax", "syntax.exp")
 
-      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+      repo = Expressir::Express::Parser.from_file(exp_file)
 
       # universal scope
       expect(repo.find('syntax_schema')).to be_instance_of(Expressir::Model::Schema)
@@ -122,16 +122,16 @@ RSpec.describe Expressir::Model::ModelElement do
     end
 
     it "finds an object (remark.exp)" do
-      exp_file = Expressir.root_path.join("original", "examples", "syntax", "remark.exp")
+      exp_file = Expressir.root_path.join("spec", "syntax", "remark.exp")
 
-      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+      repo = Expressir::Express::Parser.from_file(exp_file)
 
       # universal scope
       expect(repo.find('remark_schema')).to be_instance_of(Expressir::Model::Schema)
       expect(repo.find('remark_schema.remark_constant')).to be_instance_of(Expressir::Model::Constant)
       expect(repo.find('remark_schema.remark_type')).to be_instance_of(Expressir::Model::Type)
-      expect(repo.find('remark_schema.remark_type.WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(repo.find('remark_schema.remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(repo.find('remark_schema.remark_type.WR1')).to be_instance_of(Expressir::Model::WhereRule)
+      expect(repo.find('remark_schema.remark_type.wr:WR1')).to be_instance_of(Expressir::Model::WhereRule)
       expect(repo.find('remark_schema.remark_type.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(repo.find('remark_schema.remark_type.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(repo.find('remark_schema.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
@@ -139,9 +139,9 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(repo.find('remark_schema.remark_entity.remark_attribute')).to be_instance_of(Expressir::Model::Attribute)
       expect(repo.find('remark_schema.remark_entity.remark_derived_attribute')).to be_instance_of(Expressir::Model::Attribute)
       expect(repo.find('remark_schema.remark_entity.remark_inverse_attribute')).to be_instance_of(Expressir::Model::Attribute)
-      expect(repo.find('remark_schema.remark_entity.UR1')).to be_instance_of(Expressir::Model::Unique)
-      expect(repo.find('remark_schema.remark_entity.WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(repo.find('remark_schema.remark_entity.wr:WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(repo.find('remark_schema.remark_entity.UR1')).to be_instance_of(Expressir::Model::UniqueRule)
+      expect(repo.find('remark_schema.remark_entity.WR1')).to be_instance_of(Expressir::Model::WhereRule)
+      expect(repo.find('remark_schema.remark_entity.wr:WR1')).to be_instance_of(Expressir::Model::WhereRule)
       expect(repo.find('remark_schema.remark_entity.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(repo.find('remark_schema.remark_entity.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(repo.find('remark_schema.remark_subtype_constraint')).to be_instance_of(Expressir::Model::SubtypeConstraint)
@@ -162,8 +162,8 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(repo.find('remark_schema.remark_rule.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
       expect(repo.find('remark_schema.remark_rule.remark_constant')).to be_instance_of(Expressir::Model::Constant)
       expect(repo.find('remark_schema.remark_rule.remark_variable')).to be_instance_of(Expressir::Model::Variable)
-      expect(repo.find('remark_schema.remark_rule.WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(repo.find('remark_schema.remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(repo.find('remark_schema.remark_rule.WR1')).to be_instance_of(Expressir::Model::WhereRule)
+      expect(repo.find('remark_schema.remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::WhereRule)
       expect(repo.find('remark_schema.remark_rule.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(repo.find('remark_schema.remark_rule.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(repo.find('remark_schema.remark_item')).to be_instance_of(Expressir::Model::RemarkItem)
@@ -172,8 +172,8 @@ RSpec.describe Expressir::Model::ModelElement do
       schema = repo.schemas.first
       expect(schema.find('remark_constant')).to be_instance_of(Expressir::Model::Constant)
       expect(schema.find('remark_type')).to be_instance_of(Expressir::Model::Type)
-      expect(schema.find('remark_type.WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(schema.find('remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(schema.find('remark_type.WR1')).to be_instance_of(Expressir::Model::WhereRule)
+      expect(schema.find('remark_type.wr:WR1')).to be_instance_of(Expressir::Model::WhereRule)
       expect(schema.find('remark_type.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(schema.find('remark_type.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(schema.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
@@ -181,9 +181,9 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(schema.find('remark_entity.remark_attribute')).to be_instance_of(Expressir::Model::Attribute)
       expect(schema.find('remark_entity.remark_derived_attribute')).to be_instance_of(Expressir::Model::Attribute)
       expect(schema.find('remark_entity.remark_inverse_attribute')).to be_instance_of(Expressir::Model::Attribute)
-      expect(schema.find('remark_entity.UR1')).to be_instance_of(Expressir::Model::Unique)
-      expect(schema.find('remark_entity.WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(schema.find('remark_entity.wr:WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(schema.find('remark_entity.UR1')).to be_instance_of(Expressir::Model::UniqueRule)
+      expect(schema.find('remark_entity.WR1')).to be_instance_of(Expressir::Model::WhereRule)
+      expect(schema.find('remark_entity.wr:WR1')).to be_instance_of(Expressir::Model::WhereRule)
       expect(schema.find('remark_entity.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(schema.find('remark_entity.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(schema.find('remark_subtype_constraint')).to be_instance_of(Expressir::Model::SubtypeConstraint)
@@ -204,16 +204,16 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(schema.find('remark_rule.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
       expect(schema.find('remark_rule.remark_constant')).to be_instance_of(Expressir::Model::Constant)
       expect(schema.find('remark_rule.remark_variable')).to be_instance_of(Expressir::Model::Variable)
-      expect(schema.find('remark_rule.WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(schema.find('remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(schema.find('remark_rule.WR1')).to be_instance_of(Expressir::Model::WhereRule)
+      expect(schema.find('remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::WhereRule)
       expect(schema.find('remark_rule.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(schema.find('remark_rule.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(schema.find('remark_item')).to be_instance_of(Expressir::Model::RemarkItem)
 
       # type scope
       type = schema.types.first
-      expect(type.find('WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(type.find('wr:WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(type.find('WR1')).to be_instance_of(Expressir::Model::WhereRule)
+      expect(type.find('wr:WR1')).to be_instance_of(Expressir::Model::WhereRule)
       expect(type.find('IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(type.find('ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
 
@@ -222,9 +222,9 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(entity.find('remark_attribute')).to be_instance_of(Expressir::Model::Attribute)
       expect(entity.find('remark_derived_attribute')).to be_instance_of(Expressir::Model::Attribute)
       expect(entity.find('remark_inverse_attribute')).to be_instance_of(Expressir::Model::Attribute)
-      expect(entity.find('UR1')).to be_instance_of(Expressir::Model::Unique)
-      expect(entity.find('WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(entity.find('wr:WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(entity.find('UR1')).to be_instance_of(Expressir::Model::UniqueRule)
+      expect(entity.find('WR1')).to be_instance_of(Expressir::Model::WhereRule)
+      expect(entity.find('wr:WR1')).to be_instance_of(Expressir::Model::WhereRule)
       expect(entity.find('IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(entity.find('ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
 
@@ -250,15 +250,15 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(rule.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
       expect(rule.find('remark_constant')).to be_instance_of(Expressir::Model::Constant)
       expect(rule.find('remark_variable')).to be_instance_of(Expressir::Model::Variable)
-      expect(rule.find('WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(rule.find('wr:WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(rule.find('WR1')).to be_instance_of(Expressir::Model::WhereRule)
+      expect(rule.find('wr:WR1')).to be_instance_of(Expressir::Model::WhereRule)
       expect(rule.find('IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(rule.find('ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
 
       # retry search in parent scope
       expect(entity.find('remark_type')).to be_instance_of(Expressir::Model::Type)
-      expect(entity.find('remark_type.WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(entity.find('remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Where)
+      expect(entity.find('remark_type.WR1')).to be_instance_of(Expressir::Model::WhereRule)
+      expect(entity.find('remark_type.wr:WR1')).to be_instance_of(Expressir::Model::WhereRule)
       expect(entity.find('remark_type.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(entity.find('remark_type.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
     end

data/{original/examples → spec}/syntax/multiple.yaml

@@ -2,7 +2,7 @@
 _class: Expressir::Model::Repository
 schemas:
 - _class: Expressir::Model::Schema
-  file: original/examples/syntax/multiple.exp
+  file: spec/syntax/multiple.exp
   id: multiple_schema
   interfaces:
   - _class: Expressir::Model::Interface
@@ -161,7 +161,7 @@ schemas:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: missing_entity
 - _class: Expressir::Model::Schema
-  file: original/examples/syntax/multiple.exp
+  file: spec/syntax/multiple.exp
   id: multiple_schema2
   entities:
   - _class: Expressir::Model::Entity
@@ -173,7 +173,7 @@ schemas:
       type:
         _class: Expressir::Model::Types::Boolean
 - _class: Expressir::Model::Schema
-  file: original/examples/syntax/multiple.exp
+  file: spec/syntax/multiple.exp
   id: multiple_schema3
   entities:
   - _class: Expressir::Model::Entity
@@ -185,7 +185,7 @@ schemas:
       type:
         _class: Expressir::Model::Types::Boolean
 - _class: Expressir::Model::Schema
-  file: original/examples/syntax/multiple.exp
+  file: spec/syntax/multiple.exp
   id: multiple_schema4
   entities:
   - _class: Expressir::Model::Entity

data/{original/examples → spec}/syntax/remark.yaml

@@ -2,7 +2,7 @@
 _class: Expressir::Model::Repository
 schemas:
 - _class: Expressir::Model::Schema
-  file: original/examples/syntax/remark.exp
+  file: spec/syntax/remark.exp
   id: remark_schema
   remarks:
   - |-
@@ -36,7 +36,7 @@ schemas:
     remarks:
     - schema scope - type
     - universal scope - type
-    type:
+    underlying_type:
       _class: Expressir::Model::Types::Enumeration
       items:
       - _class: Expressir::Model::EnumerationItem
@@ -46,8 +46,8 @@ schemas:
         - schema scope - enumeration item, on the same level as the type
         - universal scope - enumeration item
         - universal scope - enumeration item, on the same level as the type
-    where:
-    - _class: Expressir::Model::Where
+    where_rules:
+    - _class: Expressir::Model::WhereRule
       id: WR1
       remarks:
       - type scope - type where
@@ -112,8 +112,8 @@ schemas:
         _class: Expressir::Model::Expressions::SimpleReference
         id: remark_attribute
         base_path: remark_schema.remark_entity.remark_attribute
-    unique:
-    - _class: Expressir::Model::Unique
+    unique_rules:
+    - _class: Expressir::Model::UniqueRule
       id: UR1
       remarks:
       - entity scope - entity unique
@@ -123,8 +123,8 @@ schemas:
       - _class: Expressir::Model::Expressions::SimpleReference
         id: remark_attribute
         base_path: remark_schema.remark_entity.remark_attribute
-    where:
-    - _class: Expressir::Model::Where
+    where_rules:
+    - _class: Expressir::Model::WhereRule
       id: WR1
       remarks:
       - entity scope - entity where
@@ -180,7 +180,7 @@ schemas:
       - function scope - function type
       - schema scope - function type
       - universal scope - function type
-      type:
+      underlying_type:
         _class: Expressir::Model::Types::Enumeration
         items:
         - _class: Expressir::Model::EnumerationItem
@@ -271,7 +271,7 @@ schemas:
       - rule scope - rule type
       - schema scope - rule type
       - universal scope - rule type
-      type:
+      underlying_type:
         _class: Expressir::Model::Types::Enumeration
         items:
         - _class: Expressir::Model::EnumerationItem
@@ -344,8 +344,8 @@ schemas:
         expression:
           _class: Expressir::Model::Literals::Logical
           value: :TRUE
-    where:
-    - _class: Expressir::Model::Where
+    where_rules:
+    - _class: Expressir::Model::WhereRule
       id: WR1
       remarks:
       - rule scope - rule where
@@ -389,7 +389,7 @@ schemas:
       - procedure scope - procedure type
       - schema scope - procedure type
       - universal scope - procedure type
-      type:
+      underlying_type:
         _class: Expressir::Model::Types::Enumeration
         items:
         - _class: Expressir::Model::EnumerationItem