Add New Semantic Validation Rules and Conformance Tests

runner.config.ts

@@ -0,0 +1,8 @@
+import { Parser } from '@accordproject/concerto-cto';
+import { ModelFile, ModelManager } from '@accordproject/concerto-core';
+
+export default {
+  parser: Parser,
+  modelFile: ModelFile,
+  modelManager: new ModelManager({ enableMapType: true }),
+};

semantic/features/concepts.feature

@@ -114,6 +114,34 @@ Feature: Semantic Validation for CTO Class Declarations
     When I validate the models
     Then no error should be thrown
 
+  Scenario: Unique property names across inheritance
+    Given I load the following models:
+      | model_file                                                                 | alias       |
+      | concepts/models/CLASS_DECLARATION_009/class_declaration_009_circular_inheritance.cto | main        |
+    When I validate the models
+    Then an error should be thrown with message "Maximum call stack size exceeded"
+
+  Scenario: Unique property names across inheritance
+    Given I load the following models:
+      | model_file                                                                 | alias       |
+      | concepts/models/CLASS_DECLARATION_009/class_declaration_009_valid_inheritance.cto | main        |
+    When I validate the models
+    Then no error should be thrown
+
+  Scenario: Unique property names across inheritance
+    Given I load the following models:
+      | model_file                                                                 | alias       |
+      | concepts/models/CLASS_DECLARATION_010/class_declaration_010_duplicate_property_from_super.cto | main        |
+    When I validate the models
+    Then an error should be thrown with message "has more than one field"
+
+  Scenario: Unique property names across inheritance
+    Given I load the following models:
+      | model_file                                                                 | alias       |
+      | concepts/models/CLASS_DECLARATION_010/class_declaration_010_unique_property_from_super.cto | main        |
+    When I validate the models
+    Then no error should be thrown
+
   Scenario: Duplicate declarations should throw
     Given I load the following models:
       | model_file                                                                                          | alias |

semantic/features/namespaces.feature

@@ -3,16 +3,30 @@ Feature: Semantic Validation of CTO Namespace Imports
   @skip
   Scenario: Invalid duplicate namespace imports should throw an error
     Given I load the following models:
-      | model_file                                             | alias |
-      | namespaces/models/MODEL_FILE_002/importedTypes.cto                                      | imported                      |
-      | namespaces/models/MODEL_FILE_002/model_file_002_duplicate_namespace_imports.cto         | main                          |
+      | model_file                                               | alias    |
+      | namespaces/models/MODEL_FILE_002/importedTypes.cto       | imported |
+      | namespaces/models/MODEL_FILE_002/model_file_002_duplicate_namespace_imports.cto | main |
     When I validate the models
     Then an error should be thrown with message "Namespace org.external.types is already defined"
 
   Scenario: Valid unique namespace imports should pass
     Given I load the following models:
-      | model_file                                             | alias |
-      | namespaces/models/MODEL_FILE_002/importedTypes.cto                                      | imported |
-      | namespaces/models/MODEL_FILE_002/model_file_002_unique_namespace_imports.cto            | main     |
+      | model_file                                               | alias    |
+      | namespaces/models/MODEL_FILE_002/importedTypes.cto       | imported |
+      | namespaces/models/MODEL_FILE_002/model_file_002_unique_namespace_imports.cto | main |
     When I validate the models
-    Then no error should be thrown
+    Then no error should be thrown
+
+  Scenario: Invalid self-import should throw MODEL_FILE_004 error
+    Given I load the following models:
+      | model_file                                               | alias    |
+      | namespaces/models/MODEL_FILE_003/model_file_003_self_import.cto | main |
+    When I validate the models
+    Then an error should be thrown with message "Namespace is not defined for type"
+
+  Scenario: Valid model without self-import should pass
+    Given I load the following models:
+      | model_file                                               | alias    |
+      | namespaces/models/MODEL_FILE_003/model_file_003_valid_import.cto | main |
+    When I validate the models
+    Then no error should be thrown

semantic/features/scalars.feature

@@ -24,6 +24,19 @@ Feature: Semantic Validation of CTO Scalars specification
       |  scalars/models/NUMBER_VALIDATOR_002/number_validator_002_lower_greater_than_upper.cto          |main|
     Then an error should be thrown with message "/Lower bound must be less than or equal to upper bound/"
 
+
+  Scenario: Invalid floating point range on Integer property should throw an error
+    Given I load the following models:
+      | model_file                                                                 | alias |
+      | scalars/models/NUMBER_VALIDATOR_003/number_validator_003_invalid_range_type.cto | main  |
+    Then an error should be thrown with message 'Expected ","'
+
+  Scenario: Valid integer range on Integer property should pass validation
+    Given I load the following models:
+      | model_file                                                                 | alias |
+      | scalars/models/NUMBER_VALIDATOR_003/number_validator_003_valid_range_type.cto   | main  |
+    Then no error should be thrown
+
   Scenario: should pass for valid string length bounds
     Given I load the following models:
       |  model_file                     |alias|

semantic/features/support/C#/Semantic.Support.CSharp/obj/Debug/net6.0/Semantic.Support.CSharp.AssemblyInfo.cs

@@ -13,7 +13,7 @@
 [assembly: System.Reflection.AssemblyCompanyAttribute("Semantic.Support.CSharp")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ab1c0b591c54f581969d654d8f4aed6e3c76c4c5")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+63a012d9040a0114719eb56b8d735e07fff7bb4a")]
 [assembly: System.Reflection.AssemblyProductAttribute("Semantic.Support.CSharp")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Semantic.Support.CSharp")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

semantic/features/support/C#/Semantic.Support.CSharp/obj/Debug/net6.0/Semantic.Support.CSharp.AssemblyInfoInputs.cache

@@ -1 +1 @@
-e78ef0e113f61fa9a797fd34e6fd0045449697fdb637ea1b17d1870a1d3f0d10
+ac751e616cdb4178e8e1b0c3c1233dc4b2b6a691fe113800adc728d7d8146b29

semantic/features/support/Javascript/steps.ts

@@ -19,6 +19,7 @@ Given('I load the following models:', function (dataTable) {
   }
 });
 
+
 When('I validate the models', function () {
   try {
     this.modelManager.validateModelFiles();

semantic/specifications/concepts/models/CLASS_DECLARATION_001/class_declaration_001_system_property_name.cto

@@ -1,4 +1,4 @@
-namespace org.example.invalid
+namespace org.concerto.concepts.cd001.invalid@1.0.0
 
 concept SampleConcept {
   o String name

semantic/specifications/concepts/models/CLASS_DECLARATION_001/class_declaration_001_valid_property_name.cto

@@ -1,4 +1,4 @@
-namespace org.example.valid
+namespace org.concerto.concepts.cd001.valid@1.0.0
 
 concept SampleConcept {
   o String name

semantic/specifications/concepts/models/CLASS_DECLARATION_002/class_declaration_002_invalid_$class_type.cto

@@ -1,4 +1,4 @@
-namespace org.example.invalid
+namespace org.concerto.concepts.cd002.invalid@1.0.0
 
 concept SampleConcept {
   o Integer $class  

semantic/specifications/concepts/models/CLASS_DECLARATION_002/class_declaration_002_valid_$class_type.cto

@@ -1,4 +1,4 @@
-namespace org.example.valid
+namespace org.concerto.concepts.cd002.valid@1.0.0
 
 concept SampleConcept {
   o String name

semantic/specifications/concepts/models/CLASS_DECLARATION_003/class_declaration_003_duplicate_class_name.cto

@@ -1,10 +1,10 @@
-namespace org.example.invalid
+namespace org.concerto.concepts.cd003.invalid@1.0.0
 
-concept SampleConcept {
+concept SampleConceptA {
   o String name
 }
 
-concept SampleConcept {
+concept SampleConceptA {
   o String description
 }
 

semantic/specifications/concepts/models/CLASS_DECLARATION_003/class_declaration_003_unique_class_name.cto

@@ -1,4 +1,4 @@
-namespace org.example.valid
+namespace org.concerto.concepts.cd003.valid@1.0.0
 
 concept SampleConceptA {
   o String name

semantic/specifications/concepts/models/CLASS_DECLARATION_004/class_declaration_004_supertype_exist.cto

@@ -1,4 +1,4 @@
-namespace org.example.valid
+namespace org.concerto.concepts.cd004.valid@1.0.0
 
 concept BaseConcept {
   o String baseProperty

semantic/specifications/concepts/models/CLASS_DECLARATION_004/class_declaration_004_supertype_not_exist.cto

@@ -1,4 +1,4 @@
-namespace org.example.invalid
+namespace org.[email protected]
 
 concept DerivedConcept extends NonExistentConcept {
   o String detail

semantic/specifications/concepts/models/CLASS_DECLARATION_005/class_declaration_005_invalid_identifier_type.cto

@@ -1,4 +1,4 @@
-namespace org.example.invalid
+namespace org.concerto.concepts.cd005.invalid@1.0.0
 
 concept Entity identified by id {
   o Integer id 

semantic/specifications/concepts/models/CLASS_DECLARATION_005/class_declaration_005_valid_identifier_type_scalar.cto

@@ -1,4 +1,4 @@
-namespace org.example.scalarid
+namespace org.[email protected]
 
 scalar CustomString extends String
 

semantic/specifications/concepts/models/CLASS_DECLARATION_005/class_declaration_005_valid_identifier_type_string.cto

@@ -1,4 +1,4 @@
-namespace org.example.valid
+namespace org.concerto.concepts.cd005.valid@1.0.0
 
 concept Entity identified by id {
   o String id

semantic/specifications/concepts/models/CLASS_DECLARATION_006/class_declaration_006_optional_identifier.cto

@@ -1,4 +1,4 @@
-namespace org.example.invalid
+namespace org.concerto.concepts.cd006.invalid@1.0.0
 
 concept Product identified by productId {
   o String productId optional 

semantic/specifications/concepts/models/CLASS_DECLARATION_006/class_declaration_006_required_identifier.cto

@@ -1,4 +1,4 @@
-namespace org.example.valid
+namespace org.concerto.concepts.cd006.valid@1.0.0
 
 concept Product identified by productId {
   o String productId  

semantic/specifications/concepts/models/CLASS_DECLARATION_007/class_declaration_007_supertype_not_system_identified.cto

@@ -1,4 +1,4 @@
-namespace org.example.invalid
+namespace org.concerto.concepts.cd007.invalid@1.0.0
 
 concept BaseConcept {
   o String id

semantic/specifications/concepts/models/CLASS_DECLARATION_007/class_declaration_007_supertype_system_identified.cto

@@ -1,4 +1,4 @@
-namespace org.example.valid
+namespace org.concerto.concepts.cd007.valid@1.0.0
 
 concept BaseConcept identified by id {
   o String id

semantic/specifications/concepts/models/CLASS_DECLARATION_008/class_declaration_008_duplicate_property_from_super.cto

@@ -1,4 +1,4 @@
-namespace org.example.invalid
+namespace org.concerto.concepts.cd008.invalid@1.0.0
 
 concept BaseConcept {
   o String name

semantic/specifications/concepts/models/CLASS_DECLARATION_008/class_declaration_008_unique_property_from_super.cto

@@ -1,4 +1,4 @@
-namespace org.example.valid
+namespace org.concerto.concepts.cd008.valid@1.0.0
 
 concept BaseConcept {
   o String name

semantic/specifications/concepts/models/CLASS_DECLARATION_009/class_declaration_009_circular_inheritance.cto

@@ -0,0 +1,13 @@
+namespace org.invalid.circular
+
+concept A extends C {
+  o String name
+}
+
+concept B extends A {
+  o String description
+}
+
+concept C extends B {
+  o String detail
+}

semantic/specifications/concepts/models/CLASS_DECLARATION_009/class_declaration_009_valid_inheritance.cto

@@ -0,0 +1,13 @@
+namespace org.valid.circular
+
+concept A {
+  o String name
+}
+
+concept B extends A {
+  o String description
+}
+
+concept C extends B {
+  o String detail
+}

semantic/specifications/concepts/models/CLASS_DECLARATION_010/class_declaration_010_duplicate_property_from_super.cto

@@ -0,0 +1,9 @@
+namespace org.inherited.duplicate
+
+concept Parent {
+  o String name
+}
+
+concept Child extends Parent {
+  o String name
+}

semantic/specifications/concepts/models/CLASS_DECLARATION_010/class_declaration_010_unique_property_from_super.cto

@@ -0,0 +1,9 @@
+namespace org.inherited.valid
+
+concept Parent {
+  o String name
+}
+
+concept Child extends Parent {
+  o String description
+}

semantic/specifications/concepts/models/DECLARATION_001/declaration_001_duplicate_within_model.cto

@@ -1,4 +1,4 @@
-namespace org.example.invalid.declaration001
+namespace org.example.declaration001.invalid@1.0.0
 
 concept User identified by id {
   o String id

semantic/specifications/concepts/models/DECLARATION_001/declaration_001_unique_within_model.cto

@@ -1,4 +1,4 @@
-namespace org.example.valid.declaration001
+namespace org.example.declaration001.valid@1.0.0
 
 concept User identified by id {
   o String id

semantic/specifications/concepts/models/DECORATED_001/decorated_001_duplicate_decorator.cto

@@ -1,4 +1,4 @@
-namespace org.example.invalid.decorated001
+namespace org.example.decorated001.invalid@1.0.0
 
 concept Product identified by productId {
   @custom

semantic/specifications/concepts/models/DECORATED_001/decorated_001_unique_decorator.cto

@@ -1,4 +1,4 @@
-namespace org.example.valid.decorated001
+namespace org.example.decorated001.valid@1.0.0
 
 concept Product identified by productId {
   @custom

semantic/specifications/concepts/models/MODEL_ELEMENT_002/model_element_002_invalid_identifier_name.cto

@@ -1,4 +1,4 @@
-namespace org.example.invalid.modelelement002
+namespace org.example.modelelement002.invalid@1.0.0
 
 concept Invalid-Name {
   o String something 

semantic/specifications/concepts/models/MODEL_ELEMENT_002/model_element_002_valid_identifier_name.cto

@@ -1,4 +1,4 @@
-namespace org.example.valid.modelelement002
+namespace org.example.modelelement002.valid@1.0.0
 
 concept ValidName {
   o String something

semantic/specifications/concepts/models/PROPERTY_002/property_002_type_does_not_exist.cto

@@ -1,4 +1,4 @@
-namespace org.example.invalid.property002
+namespace org.example.property002.invalid@1.0.0
 
 concept User identified by id {
   o String id

semantic/specifications/concepts/models/PROPERTY_002/property_002_type_exist.cto

@@ -1,4 +1,4 @@
-namespace org.example.valid.property002
+namespace org.example.property002.valid@1.0.0
 
 concept User identified by id {
   o String id

semantic/specifications/concepts/models/PROPERTY_003/property_003_meta_type_invalid.cto

@@ -1,4 +1,4 @@
-namespace org.example.invalid.property003
+namespace org.example.property003.invalid@1.0.0
 
 concept Device identified by serial {
   x String serial 

semantic/specifications/concepts/models/PROPERTY_003/property_003_meta_type_valid.cto

@@ -1,4 +1,4 @@
-namespace org.example.valid.property003
+namespace org.example.property003.valid@1.0.0
 
 concept Device identified by serial {
   o String serial

semantic/specifications/concepts/models/RELATIONSHIP_001/relationship_001_non-primitive_type_relationship.cto

@@ -1,4 +1,4 @@
-namespace org.example.invalid.relationship001
+namespace org.example.relationship001.invalid@1.0.0
 
 concept Person identified by id {
   o String id

semantic/specifications/concepts/models/RELATIONSHIP_001/relationship_001_primitive_type_relationship.cto

@@ -1,4 +1,4 @@
-namespace org.example.valid.relationship001
+namespace org.example.relationship001.valid@1.0.0
 
 concept Person identified by id {
   o String id

semantic/specifications/concepts/models/RELATIONSHIP_002/relationship_002_existing_type.cto

@@ -1,4 +1,4 @@
-namespace org.example.valid.relationship002
+namespace org.example.relationship002.valid@1.0.0
 
 concept Student identified by id {
   o String id

semantic/specifications/concepts/models/RELATIONSHIP_002/relationship_002_type_not_exist.cto

@@ -1,4 +1,4 @@
-namespace org.example.invalid.relationship002
+namespace org.example.relationship002[email protected]
 
 concept Student identified by id {
   o String id

semantic/specifications/concepts/models/RELATIONSHIP_003/relationship_003_identified_type.cto

@@ -1,4 +1,4 @@
-namespace org.example.valid.relationship003
+namespace org.example.relationship003.valid@1.0.0
 
 concept Employee identified by id {
   o String id

semantic/specifications/concepts/models/RELATIONSHIP_003/relationship_003_not_identified_type.cto

@@ -1,4 +1,4 @@
-namespace org.example.invalid.relationship003
+namespace org.example.relationship003.invalid@1.0.0
 
 concept Employee identified by id {
   o String id

semantic/specifications/enums/models/DECLARATION_001/declaration_001_duplicate_enum_names.cto

@@ -1,4 +1,4 @@
-namespace org.example.enums.invalid
+namespace org.example.enums.declaration001.invalid@1.0.0
 
 enum Status {
   o ACTIVE

semantic/specifications/enums/models/DECLARATION_001/declaration_001_unique_enum_names.cto

@@ -1,4 +1,4 @@
-namespace org.example.enums.valid
+namespace org.example.enums.[email protected]
 
 enum Status {
   o ACTIVE

semantic/specifications/enums/models/DECLARATION_002/declaration_002_name_conflict_with_import.cto

@@ -1,4 +1,4 @@
-namespace org.example.invalid
+namespace org.example.enums.declaration002.invalid@1.0.0
 
 import org.external.imported.ConflictEnum