Merge pull request #61 from ChristopheBougere/bugfix/errors-displaying

fix error displaying
ChristopheBougere · Nov 26, 2020 · 5429d5a · 5429d5a
2 parents 40fa990 + b700d3d
commit 5429d5a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "asl-validator",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "Amazon States Language validator",
   "main": "./src/validator.js",
   "bin": {

diff --git a/src/validator.js b/src/validator.js
@@ -13,6 +13,10 @@ const map = require('./schemas/map');
 const checkJsonPath = require('./lib/json-path-errors');
 const missingTransitionTarget = require('./lib/missing-transition-target');
 
+function formatError(e) {
+  return e.Code ? `${e.Code}: ${e.Message}` : e.message;
+}
+
 function validator(definition) {
   const ajv = new Ajv({
     schemas: [
@@ -41,7 +45,15 @@ function validator(definition) {
   return {
     isValid: isJsonSchemaValid && !jsonPathErrors.length && !missingTransitionTargetErrors.length,
     errors: jsonPathErrors.concat(ajv.errors || []).concat(missingTransitionTargetErrors || []),
-    errorsText: (separator = '\n') => `${jsonPathErrors.map((e) => `${e.Code}: ${e.Message}`).join(separator)}${separator}${ajv.errorsText(ajv.errors, { separator })}${separator}${missingTransitionTargetErrors.map((e) => `${e.Code}: ${e.Message}`).join(separator)}`,
+    errorsText: (separator = '\n') => {
+      const errors = [];
+      errors.push(jsonPathErrors.map(formatError).join(separator));
+      if (ajv.errors) {
+        errors.push(ajv.errorsText(ajv.errors, { separator }));
+      }
+      errors.push(missingTransitionTargetErrors.map(formatError).join(separator));
+      return errors.join(separator);
+    },
   };
 }