+mustBeEqual

Author: Dmitry Ovsyanko

index.js

@@ -18,7 +18,7 @@ module.exports = {
 	isINN10     : str     => new INN_10 ().verify (str),
 	randomINN10 : ()      => new INN_10 ().random (),
 
-	isKPP       : str     => new KPP ().process (str),
+	isKPP       : str     => new KPP ().verify (str),
 	randomKPP   : ()      => new KPP ().randomValue (),
 
 	isINN12: str => {

lib/Check.js

@@ -24,21 +24,15 @@ module.exports = class {
 
 	}
 
-	process (str, checkAllDigits) {
+	process (str) {
 
-		if (typeof str !== 'string') this.raise ('Arg 1 must be string', {code: 'type', type: typeof str})
-
-		const length = checkAllDigits ? this.totalLength : this.valueLength
-
-		if (length !== str.length) this.raise ('Invalid length', {code: 'length', tobe: length, asis: str.length})
-	
-		for (let i = 0; i < length; i ++) {
+		const {valueLength} = this; for (let i = 0; i < valueLength; i ++) {
 
 			let dec = str.charCodeAt (i); if ((dec & 16) !== 16) this.raise ('Not a digit', {code: 'char', pos: i, value: str.charAt (i)})
 
 			dec &= 15; if (dec > 9) this.raise ('Not a digit', {code: 'char', pos: i, value: str.charAt (i)})
 
-			if (i < this.valueLength) this.processDigit (i, dec)
+			this.processDigit (i, dec)
 
 		}
 
@@ -54,11 +48,11 @@ module.exports = class {
 
 	}	
 
-	checkSum (str, checkAllDigits = false) {
+	checkSum (str) {
 
 		this.sum = 0
 
-		this.process (str, checkAllDigits)
+		this.process (str)
 
 		const {sum} = this; delete this.sum
 
@@ -68,13 +62,23 @@ module.exports = class {
 
 	}
 
+	mustBeEqual (asis, tobe, code) {
+
+		if (tobe === asis) return
+
+		this.raise ('Invalid ' + code, {code, tobe, asis})
+
+	}
+
 	verify (str) {
 
-		const tobe = this.checkSum (str, true), asis = str.slice (this.valueLength)
+		this.mustBeEqual (typeof str, 'string', 'type')
 
-		if (tobe === asis) return
+		this.mustBeEqual (str.length, this.totalLength, 'length')
+
+		const checkSum = this.checkSum (str); if (this.checkSumLength === 0) return
 
-		this.raise ('Wrong checksum', {code: 'checksum', tobe, asis})
+		this.mustBeEqual (str.slice (this.valueLength), checkSum, 'checksum')
 
 	}
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "ru-codes",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "ИНН, КПП и т. п.",
   "main": "index.js",
   "files": ["/lib", "/badges"],