Merge pull request #90 from shystruk/dev

Fix error messages spacing
shystruk · Dec 8, 2021 · c0dfb04 · c0dfb04
2 parents 636e66e + 87675b5
commit c0dfb04
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "csv-file-validator",
-	"version": "1.13.0",
+	"version": "1.13.1",
 	"description": "Validation of CSV file against user defined schema (returns back object with data and invalid messages)",
 	"main": "./src/csv-file-validator.js",
 	"types": "./src/csv-file-validator.d.ts",

diff --git a/src/csv-file-validator.js b/src/csv-file-validator.js
@@ -78,11 +78,9 @@
 						if (valueConfig.name !== columnValue) {
 							file.inValidMessages.push(
 								_isFunction(valueConfig.headerError)
-									? valueConfig.headerError(
-										columnValue, valueConfig.name, rowIndex + 1, columnIndex + 1
-									)
-									: `Header name ${columnValue} is not correct or missing in the ${rowIndex + 1} row/
-										${columnIndex + 1} column. The Header name should be ${valueConfig.name}`
+									? valueConfig.headerError(columnValue, valueConfig.name, rowIndex + 1, columnIndex + 1)
+									: 'Header name ' + columnValue + ' is not correct or missing in the ' + (rowIndex + 1) + ' row / '
+										+ (columnIndex + 1) + ' column. The Header name should be ' + valueConfig.name
 							);
 						}
 
@@ -94,23 +92,20 @@
 					file.inValidMessages.push(
 						_isFunction(valueConfig.requiredError)
 							? valueConfig.requiredError(valueConfig.name, rowIndex + 1, columnIndex + 1)
-							: String(`${valueConfig.name} is required in the ${rowIndex + 1} row/
-								${columnIndex + 1} column`)
+							: String(valueConfig.name + ' is required in the ' + (rowIndex + 1) + ' row / ' + (columnIndex + 1) + ' column')
 					);
 				} else if (valueConfig.validate && !valueConfig.validate(columnValue)) {
 					file.inValidMessages.push(
 						_isFunction(valueConfig.validateError)
 							? valueConfig.validateError(valueConfig.name, rowIndex + 1, columnIndex + 1)
-							: String(`${valueConfig.name} is not valid in the ${rowIndex + 1} row/
-								${columnIndex + 1} column`)
+							: String(valueConfig.name + ' is not valid in the ' + (rowIndex + 1) + ' row / ' + (columnIndex + 1) + ' column')
 					);
 				} else if (valueConfig.dependentValidate &&
 					!valueConfig.dependentValidate(columnValue, _getClearRow(row))) {
 					file.inValidMessages.push(
 						_isFunction(valueConfig.validateError)
 							? valueConfig.validateError(valueConfig.name, rowIndex + 1, columnIndex + 1)
-							: String(`${valueConfig.name} not passed dependent validation in the ${rowIndex + 1} row/
-								${columnIndex + 1} column`)
+							: String(valueConfig.name + ' not passed dependent validation in the ' + (rowIndex + 1) + ' row / ' + (columnIndex + 1) + ' column')
 					);
 				}