Skip to content

Commit c0dfb04

Browse files
authored
Merge pull request #90 from shystruk/dev
Fix error messages spacing
2 parents 636e66e + 87675b5 commit c0dfb04

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "csv-file-validator",
3-
"version": "1.13.0",
3+
"version": "1.13.1",
44
"description": "Validation of CSV file against user defined schema (returns back object with data and invalid messages)",
55
"main": "./src/csv-file-validator.js",
66
"types": "./src/csv-file-validator.d.ts",

src/csv-file-validator.js

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,9 @@
7878
if (valueConfig.name !== columnValue) {
7979
file.inValidMessages.push(
8080
_isFunction(valueConfig.headerError)
81-
? valueConfig.headerError(
82-
columnValue, valueConfig.name, rowIndex + 1, columnIndex + 1
83-
)
84-
: `Header name ${columnValue} is not correct or missing in the ${rowIndex + 1} row/
85-
${columnIndex + 1} column. The Header name should be ${valueConfig.name}`
81+
? valueConfig.headerError(columnValue, valueConfig.name, rowIndex + 1, columnIndex + 1)
82+
: 'Header name ' + columnValue + ' is not correct or missing in the ' + (rowIndex + 1) + ' row / '
83+
+ (columnIndex + 1) + ' column. The Header name should be ' + valueConfig.name
8684
);
8785
}
8886

@@ -94,23 +92,20 @@
9492
file.inValidMessages.push(
9593
_isFunction(valueConfig.requiredError)
9694
? valueConfig.requiredError(valueConfig.name, rowIndex + 1, columnIndex + 1)
97-
: String(`${valueConfig.name} is required in the ${rowIndex + 1} row/
98-
${columnIndex + 1} column`)
95+
: String(valueConfig.name + ' is required in the ' + (rowIndex + 1) + ' row / ' + (columnIndex + 1) + ' column')
9996
);
10097
} else if (valueConfig.validate && !valueConfig.validate(columnValue)) {
10198
file.inValidMessages.push(
10299
_isFunction(valueConfig.validateError)
103100
? valueConfig.validateError(valueConfig.name, rowIndex + 1, columnIndex + 1)
104-
: String(`${valueConfig.name} is not valid in the ${rowIndex + 1} row/
105-
${columnIndex + 1} column`)
101+
: String(valueConfig.name + ' is not valid in the ' + (rowIndex + 1) + ' row / ' + (columnIndex + 1) + ' column')
106102
);
107103
} else if (valueConfig.dependentValidate &&
108104
!valueConfig.dependentValidate(columnValue, _getClearRow(row))) {
109105
file.inValidMessages.push(
110106
_isFunction(valueConfig.validateError)
111107
? valueConfig.validateError(valueConfig.name, rowIndex + 1, columnIndex + 1)
112-
: String(`${valueConfig.name} not passed dependent validation in the ${rowIndex + 1} row/
113-
${columnIndex + 1} column`)
108+
: String(valueConfig.name + ' not passed dependent validation in the ' + (rowIndex + 1) + ' row / ' + (columnIndex + 1) + ' column')
114109
);
115110
}
116111

0 commit comments

Comments
 (0)