Validation no fatal errors (#406)

* Empty properties are not fatal errors anymore * fix test
freon4dsl · Nov 19, 2024 · 9ae5c2b · 9ae5c2b
1 parent 7b2ad26
commit 9ae5c2b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/packages/meta/src/validatordef/generator/templates/NonOptionalsCheckerTemplate.ts b/packages/meta/src/validatordef/generator/templates/NonOptionalsCheckerTemplate.ts
@@ -84,7 +84,6 @@ export class NonOptionalsCheckerTemplate {
                 }
 
                 result += `if (modelelement.${prop.name} === null || modelelement.${prop.name} === undefined ${additionalStringCheck}) {
-                    hasFatalError = true;
                     this.errorList.push(new ${Names.FreError}("Property '${prop.name}' must have a value", modelelement, ${locationdescription}, '${prop.name}', ${Names.FreErrorSeverity}.Error));
                 }
                 `;
@@ -95,9 +94,8 @@ export class NonOptionalsCheckerTemplate {
             this.done.push(concept);
             return `${commentBefore}
                 public execBefore${Names.classifier(concept)}(modelelement: ${Names.classifier(concept)}): boolean {
-                    let hasFatalError: boolean = false;
                     ${result}
-                    return hasFatalError;
+                    return false;
                 }`;
         } else {
             return ``;

diff --git a/packages/meta/src/validatordef/generator/templates/ReferenceCheckerTemplate.ts b/packages/meta/src/validatordef/generator/templates/ReferenceCheckerTemplate.ts
@@ -78,13 +78,11 @@ export class ReferenceCheckerTemplate {
                     result += `for (const referredElem of modelelement.${prop.name} ) {
                         if (referredElem.referred === null) {
                             this.makeErrorMessage(modelelement, referredElem, "${prop.name}", \`\${${locationdescription}}\`);
-                            hasFatalError = true;
                         }
                     }`;
                 } else {
                     result += `if (!!modelelement.${prop.name} && modelelement.${prop.name}.referred === null) {
                             this.makeErrorMessage(modelelement, modelelement.${prop.name}, "${prop.name}", \`\${${locationdescription}}\`);
-                            hasFatalError = true;
                     }`;
                 }
             }
@@ -102,9 +100,8 @@ export class ReferenceCheckerTemplate {
              * @param modelelement
              */
             public execBefore${Names.classifier(concept)}(modelelement: ${Names.classifier(concept)}): boolean {
-                let hasFatalError: boolean = false;
                 ${result}
-                return hasFatalError;
+                return false;
             }`;
         } else {
             return ``;

diff --git a/packages/test/src/demo/__tests__/checkValidator.test.ts b/packages/test/src/demo/__tests__/checkValidator.test.ts
@@ -1,4 +1,4 @@
-import { FreNodeReference, FreError, AST } from "@freon4dsl/core";
+import { FreNodeReference, FreError, AST, FreNode, isNullOrUndefined } from "@freon4dsl/core";
 import { DemoEnvironment } from "../config/gen/DemoEnvironment.js";
 import {
     DemoModel,
@@ -216,10 +216,20 @@ describe("Testing Validator", () => {
         //     console.log(DemoEnvironment.getInstance().writer.writeToString(mm))
         // );
         errors = validator.validate(model, true);
-        // errors.forEach(e =>
-        //     console.log(e.message + " => " + e.locationdescription + " of severity " + e.severity)
-        // );
+        errors.forEach(e =>
+            console.log(e.message + " => " + e.locationdescription + " prop: " + e.propertyName + " node: " + p(e.reportedOn) + " of severity " + e.severity)
+        );
         // TODO check every one of the messages
-        expect(errors.length).toBe(23);
+        expect(errors.length).toBe(24);
     });
 });
+
+function p(n: FreNode | FreNode[]): string {
+    if (isNullOrUndefined(n)) {
+        return "null-undefined"
+    } else if (Array.isArray(p)) {
+        return(n as FreNode[]).map(f => f.freId()).join(", ")
+    } else  {
+        return (n as FreNode).freId()
+    }
+}