From d5ed22759f4549f47eaebb8f20c6bc68f1f01f73 Mon Sep 17 00:00:00 2001
From: alexandercerutti <cerutti.alexander@gmail.com>
Date: Wed, 10 Oct 2018 11:42:21 +0200
Subject: [PATCH] Fixed comments and links; Moved pass lower-level definition
 to index.js

---
 fields.js | 11 ++++-------
 index.js  | 24 +++++++++++++-----------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/fields.js b/fields.js
index 4b3749b..cfb06ac 100644
--- a/fields.js
+++ b/fields.js
@@ -1,8 +1,8 @@
 const schema = require("./schema");
 
 /**
- * Pass fields area to be used as pass lower level keys
- * @see https://apple.co/2wkUBd
+ * Class to represent lower-level keys pass fields
+ * @see https://apple.co/2wkUBdh
  */
 
 class FieldsContainer {
@@ -17,7 +17,7 @@ class FieldsContainer {
 	 *
 	 * @method push
 	 * @params {Object[]} fields - the fields to be checked and pushed
-	 * @params {schema.constants.field} fields[].* - each key must be compliant with schema.constants.field structure
+	 * @params {schema.field} fields[].* - each key must be compliant with schema.field structure
 	 * @returns {Number} - the amount of pushed elements (for checks)
 	 */
 
@@ -68,7 +68,4 @@ class FieldsContainer {
 	}
 }
 
-module.exports = {
-	areas: ["primaryFields", "secondaryFields", "auxiliaryFields", "backFields", "headerFields"],
-	FieldsContainer
-};
+module.exports = FieldsContainer;
diff --git a/index.js b/index.js
index b316d42..b71b09e 100644
--- a/index.js
+++ b/index.js
@@ -9,8 +9,8 @@ const barcodeDebug = require("debug")("passkit:barcode");
 const genericDebug = require("debug")("passkit:generic");
 
 const schema = require("./schema");
-const { areas: fieldsName, FieldsContainer } = require("./fields");
 const errors = require("./messages");
+const FieldsContainer = require("./fields");
 
 const readdir = util.promisify(fs.readdir);
 const readFile = util.promisify(fs.readFile);
@@ -24,7 +24,9 @@ class Pass {
 		this._props = {};
 		this.shouldOverwrite = !(this.options.hasOwnProperty("shouldOverwrite") && !this.options.shouldOverwrite);
 
-		fieldsName.forEach(a => this[a] = new FieldsContainer());
+		this._fields = ["primaryFields", "secondaryFields", "auxiliaryFields", "backFields", "headerFields"];
+
+		this._fields.forEach(a => this[a] = new FieldsContainer());
 		this._transitType = "";
 	}
 
@@ -43,7 +45,7 @@ class Pass {
 			.catch((err) => {
 				// May have not used this catch but ENOENT error is not enough self-explanatory in the case of external usage
 				if (err.code && err.code === "ENOENT") {
-					throw new Error(errors.MODEL_NOT_FOUND.replace("%s", (this.model ? this.model+" " : "")));
+					throw new Error(errors.MODEL_NOT_FOUND.replace("%s", (this.model ? this.model + " " : "")));
 				}
 
 				throw new Error(err);
@@ -227,12 +229,12 @@ class Pass {
 			}, this);
 		}
 
-		if (type === "beacons" || type === "locations") {
+		if (type === "beacons" || type === "locations") {
 			if (!(data instanceof Array)) {
 				data = [data];
 			}
 
-			let valid = data.filter(d => schema.isValid(d, type+"Dict"));
+			let valid = data.filter(d => schema.isValid(d, type + "Dict"));
 
 			this._props[type] = valid.length ? valid : undefined;
 
@@ -281,8 +283,8 @@ class Pass {
 		if (!data) {
 			return Object.assign({
 				length: 0,
-				autocomplete: () => {},
-				backward: () => {}
+				autocomplete: () => { },
+				backward: () => { }
 			}, this);
 		}
 
@@ -294,7 +296,7 @@ class Pass {
 
 			return Object.assign({
 				length: 4,
-				autocomplete: () => {},
+				autocomplete: () => { },
 				backward: this.__barcodeChooseBackward.bind(this)
 			}, this);
 		}
@@ -553,7 +555,7 @@ class Pass {
 			}
 		}
 
-		fieldsName.forEach(area => {
+		this._fields.forEach(area => {
 			if (this[area].fields.length) {
 				if (this.shouldOverwrite) {
 					passFile[this.type][area] = this[area].fields;
@@ -652,7 +654,7 @@ class Pass {
 function parsePEM(element, passphrase) {
 	if (element.includes("PRIVATE KEY") && passphrase) {
 		return forge.pki.decryptRsaPrivateKey(element, String(passphrase));
-	} else if (element.includes("CERTIFICATE")) {
+	} else if (element.includes("CERTIFICATE")) {
 		return forge.pki.certificateFromPem(element);
 	} else {
 		return null;
@@ -678,7 +680,7 @@ function isValidRGB(value) {
 		return false;
 	}
 
-	return rgb.slice(1,4).every(v => Math.abs(Number(v)) <= 255);
+	return rgb.slice(1, 4).every(v => Math.abs(Number(v)) <= 255);
 }
 
 /**