Merge pull request #60 from shystruk/dev

check config, webpack source map
shystruk · May 28, 2021 · 41460c9 · 41460c9
2 parents ef14e74 + 741a17d
commit 41460c9
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 19 deletions.
diff --git a/demo/dist/bundle.js b/demo/dist/bundle.js
diff --git a/demo/dist/bundle.js.map b/demo/dist/bundle.js.map
diff --git a/demo/index.js b/demo/index.js
@@ -20,7 +20,7 @@ const isPasswordValid = function (password) {
 const CSVConfig = {
 	headers: [
 		{ name: 'First Name', inputName: 'firstName', required: true, requiredError },
-		{ name: 'Last Name', inputName: 'lastName', required: true, requiredError },
+		{ name: 'Last Name', inputName: 'lastName', required: true, requiredError, optional: true },
 		{ name: 'Email', inputName: 'email', required: true, requiredError, unique: true, uniqueError, validate: isEmailValid, validateError },
 		{ name: 'Password', inputName: 'password', required: true, requiredError, validate: isPasswordValid, validateError },
 		{ name: 'Roles', inputName: 'roles', required: true, requiredError, isArray: true }

diff --git a/demo/webpack.config.js b/demo/webpack.config.js
@@ -1,9 +1,10 @@
 const path = require('path');
 
 module.exports = {
-    entry: './index.js',
-    output: {
-        filename: 'bundle.js',
-        path: path.resolve(__dirname, 'dist')
-    }
+	entry: './index.js',
+	devtool: 'source-map',
+	output: {
+		filename: 'bundle.js',
+		path: path.resolve(__dirname, 'dist')
+	}
 };
diff --git a/src/csv-file-validator.js b/src/csv-file-validator.js
@@ -18,6 +18,13 @@
 	 */
 	function CSVFileValidator(csvFile, config) {
 		return new Promise(function (resolve, reject) {
+			if (!config || (config && !config.headers)) {
+				return resolve({
+					inValidMessages: ['config headers are required'],
+					data: []
+				});
+			}
+
 			Papa.parse(csvFile, {
 				skipEmptyLines: true,
 				complete: function (results) {
@@ -36,23 +43,22 @@
 	 * @private
 	 */
 	function _prepareDataAndValidateFile(csvData, config) {
+		const headers = [];
 		const file = {
 			inValidMessages: [],
 			data: []
 		};
 
+		for (let i = 0; i < config.headers.length; i++) {
+			if (!config.headers[i].optional) {
+				headers.push(config.headers[i]);
+			}
+		}
+
 		csvData.forEach(function (row, rowIndex) {
 			const columnData = {};
-			const headers = [];
-
-			for (let i = 0; i < config.headers.length; i++) {
-				const data = config.headers[i];
-
-				if (!data.optional) {
-					headers.push(data);
-				}
-			}
 
+			// Skip the row if not enough columns or .csv formatting is wrong
 			if (row.length < headers.length) {
 				return;
 			}

diff --git a/test.js b/test.js
@@ -58,8 +58,16 @@ test('module should be a function', t => {
 	t.is(typeof CSVFileValidator, 'function');
 });
 
-test('should return an object with empty inValidMessages/data keys', async t => {
-	const csvData = await CSVFileValidator('', {});
+test('should return the message "config headers are required"', async t => {
+	const csvData = await CSVFileValidator('');
+
+	t.is(typeof csvData, 'object');
+	t.deepEqual(csvData.inValidMessages, ['config headers are required']);
+	t.deepEqual(csvData.data, []);
+});
+
+test('should return no data if the file is empty', async t => {
+	const csvData = await CSVFileValidator('', CSVConfig);
 
 	t.is(typeof csvData, 'object');
 	t.deepEqual(csvData.inValidMessages, []);
@@ -73,7 +81,7 @@ test('should return invalid messages with data', async t => {
 	t.is(csvData.data.length, 2);
 });
 
-test('should return data, file is valid', async t => {
+test('should return data, the file is valid', async t => {
 	const csvData = await CSVFileValidator(CSVValidFile, CSVConfig);
 
 	t.is(csvData.inValidMessages.length, 0);