refactor(declarations): move declaration uniqueness check to model fi…

…le (accordproject#794) * refactor(declarations): Move unique name check to model file. Signed-off-by: Ertugrul Karademir <[email protected]> * refactor(test): move validation checks for duplicate class to model file Signed-off-by: Ertugrul Karademir <[email protected]> * test: empty commit to trigger test Signed-off-by: Ertugrul Karademir <[email protected]> --------- Signed-off-by: Ertugrul Karademir <[email protected]>
mttrbrts · Mar 10, 2024 · e3c433c · e3c433c
1 parent 65d6f7c
commit e3c433c
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 15 deletions.
diff --git a/packages/concerto-core/src/introspect/classdeclaration.js b/packages/concerto-core/src/introspect/classdeclaration.js
@@ -201,21 +201,6 @@ class ClassDeclaration extends Declaration {
     validate() {
         super.validate();
 
-        const declarations = this.getModelFile().getAllDeclarations();
-        const declarationNames = declarations.map(
-            d => d.getFullyQualifiedName()
-        );
-        const uniqueNames = new Set(declarationNames);
-
-        if (uniqueNames.size !== declarations.length) {
-            const duplicateElements = declarationNames.filter(
-                (item, index) => declarationNames.indexOf(item) !== index
-            );
-            throw new IllegalModelException(
-                `Duplicate class name ${duplicateElements[0]}`
-            );
-        }
-
         // if we have a super type make sure it exists
         if (this.superType !== null) {
             // and make sure that the class isn't extending itself

diff --git a/packages/concerto-core/src/introspect/modelfile.js b/packages/concerto-core/src/introspect/modelfile.js
@@ -281,6 +281,22 @@ class ModelFile {
         });
 
         // Validate all of the types in this model file.
+        // Check if names of the declarations are unique.
+        const declarationNames = this.declarations.map(
+            d => d.getFullyQualifiedName()
+        );
+        const uniqueNames = new Set(declarationNames);
+
+        if (uniqueNames.size !== this.declarations.length) {
+            const duplicateElements = declarationNames.filter(
+                (item, index) => declarationNames.indexOf(item) !== index
+            );
+            throw new IllegalModelException(
+                `Duplicate class name ${duplicateElements[0]}`
+            );
+        }
+
+        // Run validations on class declarations
         for(let n=0; n < this.declarations.length; n++) {
             let classDeclaration = this.declarations[n];
             classDeclaration.validate();

diff --git a/packages/concerto-core/test/introspect/modelfile.js b/packages/concerto-core/test/introspect/modelfile.js
@@ -44,10 +44,12 @@ describe('ModelFile', () => {
     const carLeaseModel = fs.readFileSync(path.resolve(__dirname, '../data/model/carlease.cto'), 'utf8');
     let modelManager;
     let sandbox;
+    let introspectUtils;
 
     beforeEach(() => {
         modelManager = new ModelManager();
         Util.addComposerModel(modelManager);
+        introspectUtils = new IntrospectUtils(modelManager);
         sandbox = sinon.createSandbox();
     });
 
@@ -204,6 +206,41 @@ describe('ModelFile', () => {
 
     describe('#validate', () => {
 
+        it('should throw when asset name is duplicted in a modelfile', () => {
+            let asset = introspectUtils.loadModelFile('test/data/parser/classdeclaration.dupeassetname.cto');
+            (() => {
+                asset.validate();
+            }).should.throw(/Duplicate class/);
+        });
+
+        it('should throw when transaction name is duplicted in a modelfile', () => {
+            let asset = introspectUtils.loadModelFile('test/data/parser/classdeclaration.dupetransactionname.cto');
+            (() => {
+                asset.validate();
+            }).should.throw(/Duplicate class/);
+        });
+
+        it('should throw when participant name is duplicted in a modelfile', () => {
+            let asset = introspectUtils.loadModelFile('test/data/parser/classdeclaration.dupeparticipantname.cto');
+            (() => {
+                asset.validate();
+            }).should.throw(/Duplicate class/);
+        });
+
+        it('should throw when concept name is duplicted in a modelfile', () => {
+            let asset = introspectUtils.loadModelFile('test/data/parser/classdeclaration.dupeconceptname.cto');
+            (() => {
+                asset.validate();
+            }).should.throw(/Duplicate class/);
+        });
+
+        it('should throw when enum name is duplicted in a modelfile', () => {
+            let asset = introspectUtils.loadModelFile('test/data/parser/classdeclaration.dupeenumname.cto');
+            (() => {
+                asset.validate();
+            }).should.throw(/Duplicate class/);
+        });
+
         it('should throw if an import exists for an invalid namespace', () => {
             const model = `
             namespace [email protected]