diff --git a/__tests__/index.js b/__tests__/index.js index 4d1d913..e2d5e6d 100644 --- a/__tests__/index.js +++ b/__tests__/index.js @@ -1,18 +1,22 @@ import test from 'ava'; -import dnic, {dnicWithDateValidation} from '../src'; +import dnic, {validate, validateDate} from '../src'; const VALID_DNI = '001-280592-0025N'; const INVALID_DATE = '001-310292-0000N'; +test('should pass a valid dni (default)', t => { + t.true(dnic.isValid(VALID_DNI)); +}); + test('should pass a valid dni', t => { - t.true(dnic(VALID_DNI)); + t.true(validate(VALID_DNI)); }); test('valid dni (date)', t => { - t.true(dnicWithDateValidation(VALID_DNI)); + t.true(validateDate(VALID_DNI)); }); test('valid a wrong date', t => { - t.false(dnicWithDateValidation(INVALID_DATE)); + t.false(validateDate(INVALID_DATE)); }); diff --git a/src/index.js b/src/index.js index 4e3622c..0270bb4 100644 --- a/src/index.js +++ b/src/index.js @@ -1,7 +1,12 @@ import {municipalities} from './municipalities'; -import {validateDate} from './utils'; +import {isValidDate} from './utils'; -const dnic = dni => { +/** + * Basic Dni Validation + * + * @param {*} dni + */ +export const validate = dni => { if (!dni) { return false; } @@ -11,14 +16,12 @@ const dnic = dni => { return regex.test(dni); }; -export {dnic as default}; - /** - * + * Dni Validation with date validation * @param {*} dni */ -export const dnicWithDateValidation = dni => { - if (!dnic(dni)) { +export const validateDate = dni => { + if (!validate(dni)) { return false; } @@ -27,15 +30,16 @@ export const dnicWithDateValidation = dni => { const month = date.slice(2, 4); const year = date.slice(4, 6); - return validateDate(day, month, year); + return isValidDate(day, month, year); }; /** * Get the regions from dni + * * @param {*} dni */ -export const getRegionFromDni = dni => { - if (!dnic(dni)) { +export const getMunicipalities = dni => { + if (!validate(dni)) { return false; } @@ -44,3 +48,14 @@ export const getRegionFromDni = dni => { return foundRegion[region]; }; + +/** + * Export default. + */ + +const exportDefault = { + isValid: dni => validate(dni), + isValidDate: dni => validateDate(dni) +}; + +export {exportDefault as default}; diff --git a/src/utils.js b/src/utils.js index 8c8a35c..bc08398 100644 --- a/src/utils.js +++ b/src/utils.js @@ -1,4 +1,4 @@ -export const validateDate = (day, month, year) => { +export const isValidDate = (day, month, year) => { const pDay = parseInt(day, 10); const pMonth = parseInt(month, 10); const pYear = parseInt(year, 10);