+isntCadNum

Author: Dmitry Ovsyanko

__tests__/isCadNum.js

@@ -1,26 +1,36 @@
-const {isCadNum, randomCadNum} = require ('..')
+const {isCadNum, isntCadNum, randomCadNum} = require ('..')
 
 const RE = /^\d{2}:\d{2}:\d{6,7}:\d{1,}$/
 
 test ('basic', () => {
 
 	expect (() => isCadNum ()).toThrow ()
-	expect (() => isCadNum (123)).toThrow ()
 
-	expect (() => isCadNum ('47:14:120300:')).toThrow ()
-	expect (() => isCadNum ('47:14:12030:814')).toThrow ()
-	expect (() => isCadNum ('47:14:12030011:814')).toThrow ()
+	for (const v of [
+		'47:14:120300:',
+		'47:14:12030:814',
+		'47:14:12030011:814',
+		'47-14-120300-814',
+		'47!14:120300:814',
+		'47:14-1203001:814',
+		'47:14:12030O:814',
+		'47:14:1203001:81A',
+	]) {
 
-	expect (() => isCadNum ('47-14-120300-814')).toThrow ()
-		
-	expect (() => isCadNum ('47!14:120300:814')).toThrow ()
-	expect (() => isCadNum ('47:14-1203001:814')).toThrow ()
+		expect (isntCadNum (v)).toBeTruthy ()
+		expect (() => isCadNum (v)).toThrow ()
 
-	expect (() => isCadNum ('47:14:12030O:814')).toThrow ()
-	expect (() => isCadNum ('47:14:1203001:81A')).toThrow ()
+	}
 
-	expect (isCadNum ('47:14:120300:814')).toBeUndefined ()
-	expect (isCadNum ('47:14:1203001:814')).toBeUndefined ()
+	for (const v of [
+		'47:14:120300:814',
+		'47:14:1203001:814',
+	]) {
+		
+		expect (isntCadNum (v)).toBeFalsy ()
+		expect (isCadNum (v)).toBeUndefined ()
+
+	}
 
 	for (const pre of [undefined, '', '47', '47:', '47:14', '47:14', '47:14:120300', '47:14:1203001', '47:14:120300:', '47:14:1203001:']) {
 

index.js

@@ -8,6 +8,14 @@ const CadNum = require ('./lib/CadNum'), cadNum = new CadNum ()
 const {OKPO_8, OKPO_10} = require ('./lib/OKPO')
 class KPP extends Check {constructor () {super (9)}}
 
+const raise = (a) => {
+	if (!a) return
+	const [message, o] = a
+	const err = new Error (message)
+	for (const k in o) err [k] = o [k]
+	throw err
+}
+
 module.exports = {
 
 	isSNILS     : str     => new SNILS ().verify (str),
@@ -43,7 +51,8 @@ module.exports = {
 	isBankCard     : str        => new BankCard ().verify (str),
 	randomBankCard : opt        => new BankCard ().random (opt),
 
-	isCadNum       : str        => cadNum.verify (str),
+	isntCadNum     : str        => cadNum.verify (str),
+	isCadNum       : str        => raise (cadNum.verify (str)),
 	randomCadNum   : opt        => cadNum.random (opt),
 
 }

lib/CadNum.js

@@ -4,35 +4,25 @@ const CH_9     = '9'.charCodeAt (0)
 
 module.exports = class {
 
-	raise (s, o) {
-
-		const err = Error (s)
-
-		for (const k in o) err [k] = o [k]
-		
-		throw err
-	
-	}	
-
 	verify (str) {
 
-		const type = typeof str; if (type !== 'string') this.raise (`CadNum must be of type string`, {str, type, code: 'type'})
+		const type = typeof str; if (type !== 'string') return [`CadNum must be of type string`, {str, type, code: 'type'}]
 
-		const {length} = str; if (length < 14) this.raise (`CadNum must be at least 14 charaters long`, {str, asis: length, code: 'length'})
+		const {length} = str; if (length < 14) return [`CadNum must be at least 14 charaters long`, {str, asis: length, code: 'length'}]
 
 		const lastColonIndex = str.lastIndexOf (':')
 
 		switch (lastColonIndex) {
 
 			case -1:
-				this.raise (`Invalid CadNum "${str}": colon not found`, {str, pos: lastColonIndex, code: 'format'})
+				return [`Invalid CadNum "${str}": colon not found`, {str, pos: lastColonIndex, code: 'format'}]
 
 			case 12:
 			case 13:
 				break
 
 			default:
-				this.raise (`Invalid CadNum "${str}": the last colon found at position ${lastColonIndex}`, {str, pos: lastColonIndex, code: 'format'})
+				return [`Invalid CadNum "${str}": the last colon found at position ${lastColonIndex}`, {str, pos: lastColonIndex, code: 'format'}]
 
 		}
 
@@ -44,11 +34,11 @@ module.exports = class {
 
 				case 2:
 				case 5:
-					if (c !== CH_COLON) this.raise (`Invalid CadNum "${str}": not a colon at position ${pos}`, {str, pos, code: 'char'})
+					if (c !== CH_COLON) return [`Invalid CadNum "${str}": not a colon at position ${pos}`, {str, pos, code: 'char'}]
 					break
 
 				default:
-					if (c < CH_0 || c > CH_9) this.raise (`Invalid CadNum "${str}": not a digit at position ${pos}`, {str, pos, code: 'char'})
+					if (c < CH_0 || c > CH_9) return [`Invalid CadNum "${str}": not a digit at position ${pos}`, {str, pos, code: 'char'}]
 
 			}
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "ru-codes",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Проверка и генерация ИНН, КПП и т. п.",
   "main": "index.js",
   "files": ["/lib", "/badges"],