From bb40a5293a504979374aae60dda535ef260839aa Mon Sep 17 00:00:00 2001
From: Ian Gulliver <ian@flamingcow.tv>
Date: Wed, 21 Nov 2018 15:37:17 +0000
Subject: [PATCH] eslint config & cleanups

---
 .eslintrc.js | 28 ++++++++++++++++++++++++++++
 package.json |  8 ++++++++
 passmate.js  | 30 +++++++++++++-----------------
 3 files changed, 49 insertions(+), 17 deletions(-)
 create mode 100644 .eslintrc.js
 create mode 100644 package.json

diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 0000000..c784e79
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,28 @@
+module.exports = {
+    "env": {
+        "browser": true,
+        "es6": true
+    },
+    "extends": "eslint:recommended",
+    "parserOptions": {
+        "ecmaVersion": 2015
+    },
+    "rules": {
+        "indent": [
+            "error",
+            "tab"
+        ],
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "quotes": [
+            "error",
+            "single"
+        ],
+        "semi": [
+            "error",
+            "always"
+        ]
+    }
+};
\ No newline at end of file
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..5fa4b66
--- /dev/null
+++ b/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "passmate",
+  "description": "Generate secure, unique password books to print at home",
+  "devDependencies": {
+    "eslint": "^5.9.0",
+    "eslint-config-google": "^0.11.0"
+  }
+}
diff --git a/passmate.js b/passmate.js
index 3261b4b..b24570d 100644
--- a/passmate.js
+++ b/passmate.js
@@ -88,7 +88,6 @@ class PassMate {
 	}
 
 	addPages(container, numPages) {
-		console.assert(numPages % 4 == 0);
 		let numSheets = numPages / 4;
 		for (let sheetNum = 0; sheetNum < numSheets; ++sheetNum) {
 			let sideNum = sheetNum * 2;
@@ -218,11 +217,9 @@ class PassMate {
 				{name: 'HKDF'},
 				false,
 				['deriveBits'])
-			.then((key) => {
-				this.addDerivedPasswords(key);
-			});
-		} else {
-			console.assert(false, 'Invalid recovery key version:', this.recovery.charAt(0));
+				.then((key) => {
+					this.addDerivedPasswords(key);
+				});
 		}
 	}
 
@@ -242,19 +239,18 @@ class PassMate {
 			},
 			key,
 			this.PASSWORD_LENGTH * this.OVERSAMPLE * 8 /* bits per byte */)
-		.then((bits) => {
-			let password = this.generatePassword(this.PASSWORD_LENGTH, new Uint8Array(bits));
-			if (this.validatePassword(password)) {
-				container.innerText = password;
-			} else {
-				// Keep trying until we get a valid password.
-				this.addDerivedPassword(key, info + 'x', container);
-			}
-		});
+			.then((bits) => {
+				let password = this.generatePassword(this.PASSWORD_LENGTH, new Uint8Array(bits));
+				if (this.validatePassword(password)) {
+					container.innerText = password;
+				} else {
+					// Keep trying until we get a valid password.
+					this.addDerivedPassword(key, info + 'x', container);
+				}
+			});
 	}
 
 	intToSafeChar(i) {
-		console.assert(this.SAFE_ALPHANUM.length < 0x3f);
 		i %= 0x3f;
 		if (i < this.SAFE_ALPHANUM.length) {
 			return [this.SAFE_ALPHANUM[i]];
@@ -285,7 +281,7 @@ function onReady() {
 	new PassMate(document.getElementsByTagName('body')[0]);
 }
 
-if (document.readyState === "loading") {
+if (document.readyState == 'loading') {
 	document.addEventListener('DOMContentLoaded', onReady);
 } else {
 	onReady();