perf(core): remove usage of arrays while forming duplicate item errors (

accordproject#804) * refactor: don't use arrays to check uniqueness Signed-off-by: Ertugrul Karademir <ekarademir@gmail.com> * refactor: also refactor unique property name check Signed-off-by: Ertugrul Karademir <ekarademir@gmail.com> * refactor: remove array for decorator uniqueness check Signed-off-by: Ertugrul Karademir <ekarademir@gmail.com> * refactor: remove uniqueness check from scalar declarations as well Signed-off-by: Ertugrul Karademir <ekarademir@gmail.com> --------- Signed-off-by: Ertugrul Karademir <ekarademir@gmail.com>
mttrbrts · Mar 10, 2024 · 5489600 · 5489600
1 parent 475de52
commit 5489600
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 33 deletions.
diff --git a/packages/concerto-core/src/introspect/classdeclaration.js b/packages/concerto-core/src/introspect/classdeclaration.js
@@ -274,24 +274,21 @@ class ClassDeclaration extends Declaration {
         }
         // we also have to check fields defined in super classes
         const properties = this.getProperties();
-        const propertyFieldNames = properties.map(
-            d => d.getName()
-        );
-        const uniquePropertyFieldNames = new Set(propertyFieldNames);
-
-        if (uniquePropertyFieldNames.size !== properties.length) {
-            const duplicateElements = propertyFieldNames
-                .filter(
-                    (item, index) => propertyFieldNames.indexOf(item) !== index
+        const uniquePropertyNames = new Set();
+        properties.forEach(p => {
+            const propertyName = p.getName();
+            if (!uniquePropertyNames.has(propertyName)) {
+                uniquePropertyNames.add(propertyName);
+            } else {
+                const formatter = Globalize('en').messageFormatter(
+                    'classdeclaration-validate-duplicatefieldname'
                 );
-            const formatter = Globalize('en').messageFormatter(
-                'classdeclaration-validate-duplicatefieldname'
-            );
-            throw new IllegalModelException(formatter({
-                'class': this.name,
-                'fieldName': duplicateElements[0]
-            }), this.modelFile, this.ast.location);
-        }
+                throw new IllegalModelException(formatter({
+                    'class': this.name,
+                    'fieldName': propertyName
+                }), this.modelFile, this.ast.location);
+            }
+        });
 
         for (let n = 0; n < properties.length; n++) {
             let field = properties[n];

diff --git a/packages/concerto-core/src/introspect/decorated.js b/packages/concerto-core/src/introspect/decorated.js
@@ -89,23 +89,20 @@ class Decorated extends ModelElement {
             }
 
             // check we don't have this decorator twice
-            const decoratorNames = this.decorators.map(
-                d => d.getName()
-            );
-            const uniqueDecoratorNames = new Set(decoratorNames);
-
-            if (uniqueDecoratorNames.size !== this.decorators.length) {
-                const duplicateElements = decoratorNames
-                    .filter(
-                        (item, index) => decoratorNames.indexOf(item) !== index
+            const uniqueDecoratorNames = new Set();
+            this.decorators.forEach(d => {
+                const decoratorName = d.getName();
+                if(!uniqueDecoratorNames.has(decoratorName)) {
+                    uniqueDecoratorNames.add(decoratorName);
+                } else {
+                    const modelFile = this.getModelFile();
+                    throw new IllegalModelException(
+                        `Duplicate decorator ${decoratorName}`,
+                        modelFile,
+                        this.ast.location,
                     );
-                const modelFile = this.getModelFile();
-                throw new IllegalModelException(
-                    `Duplicate decorator ${duplicateElements[0]}`,
-                    modelFile,
-                    this.ast.location,
-                );
-            }
+                }
+            });
         }
     }
 

diff --git a/packages/concerto-core/test/introspect/modelfile.js b/packages/concerto-core/test/introspect/modelfile.js
@@ -206,6 +206,13 @@ describe('ModelFile', () => {
 
     describe('#validate', () => {
 
+        it('should throw when scalar name is duplicted in a modelfile', () => {
+            let asset = introspectUtils.loadModelFile('test/data/parser/scalardeclaration.dupeboolean.cto');
+            (() => {
+                asset.validate();
+            }).should.throw(/Duplicate class/);
+        });
+
         it('should throw when asset name is duplicted in a modelfile', () => {
             let asset = introspectUtils.loadModelFile('test/data/parser/classdeclaration.dupeassetname.cto');
             (() => {