cassproject 5.0.22 → 5.0.23

package/src/com/eduworks/ec/graph/EcFrameworkGraph.js

@@ -198,6 +198,22 @@ module.exports = class EcFrameworkGraph extends EcDirectedGraph {
 		if (success != null)
 			success();
 	}
+	/**
+	 *  Adds assertions to the competency's meta state array named by key. When propagating (visited has more than
+	 *  one entry), assertions whose registration is already present in either meta state array are skipped.
+	 *  @private
+	 */
+	addAssertionsToMetaState(competency, assertions, visited, key) {
+		let msc = this.getMetaStateCompetency(competency);
+		let alreadyAsserted = (assertion) =>
+			msc?.positiveAssertion?.some(a => a.registration == assertion.registration) ||
+			msc?.negativeAssertion?.some(a => a.registration == assertion.registration);
+		for (let assertion of assertions) {
+			if (visited.length > 1 && assertion.registration && alreadyAsserted(assertion))
+				continue;
+			this.addToMetaStateArray(msc, key, assertion);
+		}
+	}
 	async processAssertionsBooleanPerAssertion(
 		assertions,
 		negative,
@@ -209,18 +225,7 @@ module.exports = class EcFrameworkGraph extends EcDirectedGraph {
 		}
 		visited.push(competency);
 		if (negative) {
-			let msc = this.getMetaStateCompetency(competency);
-			for (let assertion of assertions) {
-				if (visited.length > 1 && assertion.registration && msc?.positiveAssertion?.some(a => a.registration == assertion.registration))
-					continue;
-				if (visited.length > 1 && assertion.registration && msc?.negativeAssertion?.some(a => a.registration == assertion.registration))
-					continue;
-				this.addToMetaStateArray(
-					msc,
-					"negativeAssertion",
-					assertion
-				);
-			}
+			this.addAssertionsToMetaState(competency, assertions, visited, "negativeAssertion");
 			await Promise.all(
 				this.getOutEdges(competency).map(async (alignment) =>
 					await this.getCompetency(alignment.target).then(async (t) =>
@@ -249,18 +254,7 @@ module.exports = class EcFrameworkGraph extends EcDirectedGraph {
 				)
 			);
 		} else {
-			let msc = this.getMetaStateCompetency(competency);
-			for (let assertion of assertions) {
-				if (visited.length > 1 && assertion.registration && msc?.positiveAssertion?.some(a => a.registration == assertion.registration))
-					continue;
-				if (visited.length > 1 && assertion.registration && msc?.negativeAssertion?.some(a => a.registration == assertion.registration))
-					continue;
-				this.addToMetaStateArray(
-					msc,
-					"positiveAssertion",
-					assertion
-				);
-			}
+			this.addAssertionsToMetaState(competency, assertions, visited, "positiveAssertion");
 			await Promise.all(
 				this.getInEdges(competency).map(async (alignment) =>
 					await this.getCompetency(alignment.source).then(async (t) =>

package/src/com/eduworks/ec/promises/helpers.js

@@ -10,9 +10,7 @@ module.exports = {
         return p;
     },
     cassReturnNullAsPromise: function (success, failure, error) {
-        let p = new Promise((resolve, reject) => {
-            resolve(null);
-        });
+        let p = Promise.resolve(null);
         if (success !== undefined && success != null && failure !== undefined && failure != null)
             p = p.then(success, failure);
         else if (success !== undefined && success != null)

package/src/com/eduworks/ec/remote/EcRemote.js

@@ -5,7 +5,7 @@ let DEBUG = false;
 let isNode = false;    
 if (typeof process === 'object') {
   if (typeof process.versions === 'object') {
-    if (typeof process.versions.node !== 'undefined') {
+    if (process.versions.node !== undefined) {
       isNode = true;
     }
   }
@@ -191,7 +191,7 @@ module.exports = class EcRemote {
 			
  			const contentType = response.headers.get("content-type");
 			let result = null;
-			if (contentType && contentType.indexOf("application/json") !== -1) {
+			if (contentType?.includes("application/json")) {
 				result = await response.json();
 			} else {
 				result = await response.text();
@@ -210,7 +210,7 @@ module.exports = class EcRemote {
 			}
 			return result;
 		}).catch((err) => {
-			if (isNode && typeof dns !== 'undefined') {
+			if (isNode && dns !== undefined) {
 				dns.lookup(new URL(url).hostname, ((error, address) => {
 					if (error) {
 						global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.ERROR, "DNSLookup", url, error);
@@ -266,7 +266,7 @@ module.exports = class EcRemote {
 			
 			const contentType = response.headers.get("content-type");
 			let result = null;
-			if (contentType && contentType.indexOf("application/json") !== -1) {
+			if (contentType?.includes("application/json")) {
 				result = await response.json();
 			} else {
 				result = await response.text();
@@ -283,7 +283,7 @@ module.exports = class EcRemote {
 				else
 					throw new Error(response.statusText);
 			}
-			if (isNode && typeof dns !== 'undefined') {
+			if (isNode && dns !== undefined) {
 				dns.lookup(new URL(url).hostname, ((error, address) => {
 					if (error) {
 						global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.ERROR, "DNSLookup", url, error);
@@ -297,7 +297,7 @@ module.exports = class EcRemote {
 			}
 			return result;
 	   }).catch((err) => {
-			if (isNode && typeof dns !== 'undefined') {
+			if (isNode && dns !== undefined) {
 				dns.lookup(new URL(url).hostname, ((error, address) => {
 					if (error) {
 						global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.ERROR, "DNSLookup", url, error);
@@ -351,7 +351,7 @@ module.exports = class EcRemote {
 			}
 			const contentType = response.headers.get("content-type");
 			let result = null;
-			if (contentType && contentType.indexOf("application/json") !== -1) {
+			if (contentType?.includes("application/json")) {
 				result = await response.json();
 			} else {
 				result = await response.text();
@@ -364,7 +364,7 @@ module.exports = class EcRemote {
 			}		
 			return result;
 		}).catch((err) => {
-			if (isNode && typeof dns !== 'undefined') {
+			if (isNode && dns !== undefined) {
 				dns.lookup(new URL(url).hostname, ((error, address) => {
 					if (error) {
 						global.auditLogger.report(global.auditLogger.LogCategory.NETWORK, global.auditLogger.Severity.ERROR, "DNSLookup", url, signatureSheet, error);
@@ -383,7 +383,7 @@ module.exports = class EcRemote {
 	static upgradeHttpToHttps(url) {
 		if (typeof window !== "undefined")
 			if (window?.location != null) {
-				if (url.indexOf(window.location.protocol) == -1) {
+				if (!url.includes(window.location.protocol)) {
 					if (window.location.protocol.startsWith("https")) {
 						if (!url.startsWith("https:")) {
 							url = url.replace("http:", "https:");

package/src/com/eduworks/ec/task/EcAsyncTask.js

@@ -90,38 +90,23 @@ module.exports = class EcAsyncTask {
 		return ret;
 	}
 	invoke0 = function() {
-		let that = this;
-		let ret = this.job.call(this, function() { //NOSONAR -- Not taking that chance.
-			that.setComplete();
-		});
+		let ret = this.job(() => this.setComplete());
 		return ret;
 	};
 	invoke1 = function(arg1) {
-		let that = this;
-		let ret = this.job.call(this, arg1, function () { //NOSONAR -- Not taking that chance.
-			that.setComplete();
-		});
+		let ret = this.job(arg1, () => this.setComplete());
 		return ret;
 	};
 	invoke2 = function(arg1, arg2) {
-		let that = this;
-		let ret = this.job.call(this, arg1, arg2, function () { //NOSONAR -- Not taking that chance.
-			that.setComplete();
-		});
+		let ret = this.job(arg1, arg2, () => this.setComplete());
 		return ret;
 	};
 	invoke3 = function(arg1, arg2, arg3) {
-		let that = this;
-		let ret = this.job.call(this, arg1, arg2, arg3, function () { //NOSONAR -- Not taking that chance.
-			that.setComplete();
-		});
+		let ret = this.job(arg1, arg2, arg3, () => this.setComplete());
 		return ret;
 	};
 	invoke4 = function(arg1, arg2, arg3, arg4) {
-		let that = this;
-		let ret = this.job.call(this, arg1, arg2, arg3, arg4, function() { //NOSONAR -- Not taking that chance.
-			that.setComplete();
-		});
+		let ret = this.job(arg1, arg2, arg3, arg4, () => this.setComplete());
 		return ret;
 	};
 };

package/src/com/eduworks/ec/task/EcAsyncTaskManager.js

@@ -6,9 +6,8 @@ module.exports = class EcAsyncTaskManager {
 		for (let i = 0; i < workerCount; i++) {
 			this.workerList.push(new EcAsyncTaskWorker());
 		}
-		let that = this;
-		setInterval(function() {
-			that.cleanupTasks();
+		setInterval(() => {
+			this.cleanupTasks();
 		}, this.taskCleanupInterval);
 	}
 
@@ -48,7 +47,7 @@ module.exports = class EcAsyncTaskManager {
 				let timeoutSec = task.getTimeout();
 				if (
 					task.getStart().getTime() <
-					new Date().getTime() - timeoutSec * 1000
+					Date.now() - timeoutSec * 1000
 				) {
 					task.setComplete();
 				}

package/src/com/eduworks/ec/task/EcAsyncTaskWorker.js

@@ -1,9 +1,8 @@
 module.exports = class EcAsyncTaskWorker {
 	constructor() {
 		this.assignedList = [];
-		let that = this;
-		this.intervalHandler = setInterval(function() {
-			that.run();
+		this.intervalHandler = setInterval(() => {
+			this.run();
 		}, this.checkWorkInterval);
 	}
 	checkWorkInterval = 100;
@@ -42,19 +41,18 @@ module.exports = class EcAsyncTaskWorker {
 		}
 	}
 	run() {
-		let that = this;
-		this.taskHandler = Task.immediate(function() {
+		this.taskHandler = Task.immediate(() => {
 			if (
-				that.currentTask != undefined &&
-				that.currentTask != null &&
-				!that.currentTask.getIsStarted()
+				this.currentTask != undefined &&
+				this.currentTask != null &&
+				!this.currentTask.getIsStarted()
 			) {
-				that.invoke();
+				this.invoke();
 			}
 			if (
-				that.currentTask?.getIsComplete()
+				this.currentTask?.getIsComplete()
 			) {
-				that.currentTask = that.assignedList.shift();
+				this.currentTask = this.assignedList.shift();
 			}
 		});
 	}

package/src/com/eduworks/schema/cfd/competency/CfdFramework.js

@@ -86,53 +86,52 @@ module.exports = class CfdFramework extends EcFramework {
 		CfdFramework.toRemove[this.shortId()] = remove;
 		if (CfdFramework.removed == null) CfdFramework.removed = {};
 		CfdFramework.removed[this.shortId()] = 0;
-		let that = this;
-		let onAllRemove = function () {
-			EcRepository.DELETE(that, success, failure, repo, eim);
+		let onAllRemove = () => {
+			EcRepository.DELETE(this, success, failure, repo, eim);
 		};
 		if (remove == 0) onAllRemove();
 		if (this.competency != null && this.competency.length > 0) {
 			for (let comp of this.competency) {
 				CfdCompetency.get(
 					comp,
-					function (comp) {
+					(comp) => {
 						comp._delete(
-							function (p1) {
-								CfdFramework.removed[that.shortId()] =
-									CfdFramework.removed[that.shortId()] + 1;
+							(p1) => {
+								CfdFramework.removed[this.shortId()] =
+									CfdFramework.removed[this.shortId()] + 1;
 								if (
-									CfdFramework.removed[that.shortId()] ==
-									CfdFramework.toRemove[that.shortId()]
+									CfdFramework.removed[this.shortId()] ==
+									CfdFramework.toRemove[this.shortId()]
 								)
 									onAllRemove();
 							},
-							function (err) {
+							(err) => {
 								let error =
 									"Error deleting competency (" +
 									comp.id +
 									"): " +
 									err;
 								failure(error);
-								CfdFramework.removed[that.shortId()] =
-									CfdFramework.removed[that.shortId()] + 1;
+								CfdFramework.removed[this.shortId()] =
+									CfdFramework.removed[this.shortId()] + 1;
 								if (
-									CfdFramework.removed[that.shortId()] ==
-									CfdFramework.toRemove[that.shortId()]
+									CfdFramework.removed[this.shortId()] ==
+									CfdFramework.toRemove[this.shortId()]
 								)
 									onAllRemove();
 							},
 							repo, eim
 						);
 					},
-					function (err) {
+					(err) => {
 						let error =
 							"Error retrieving competency to delete: " + err;
 						failure(error);
-						CfdFramework.removed[that.shortId()] =
-							CfdFramework.removed[that.shortId()] + 1;
+						CfdFramework.removed[this.shortId()] =
+							CfdFramework.removed[this.shortId()] + 1;
 						if (
-							CfdFramework.removed[that.shortId()] ==
-							CfdFramework.toRemove[that.shortId()]
+							CfdFramework.removed[this.shortId()] ==
+							CfdFramework.toRemove[this.shortId()]
 						)
 							onAllRemove();
 					}, repo, eim
@@ -143,43 +142,43 @@ module.exports = class CfdFramework extends EcFramework {
 			for (let rel of this.relation) {
 				EcAlignment.get(
 					rel,
-					function (rel) {
+					(rel) => {
 						rel._delete(
-							function (p1) {
-								CfdFramework.removed[that.shortId()] =
-									CfdFramework.removed[that.shortId()] + 1;
+							(p1) => {
+								CfdFramework.removed[this.shortId()] =
+									CfdFramework.removed[this.shortId()] + 1;
 								if (
-									CfdFramework.removed[that.shortId()] ==
-									CfdFramework.toRemove[that.shortId()]
+									CfdFramework.removed[this.shortId()] ==
+									CfdFramework.toRemove[this.shortId()]
 								)
 									onAllRemove();
 							},
-							function (err) {
+							(err) => {
 								let error =
 									"Error deleting relation (" +
 									rel.id +
 									"): " +
 									err;
 								failure(error);
-								CfdFramework.removed[that.shortId()] =
-									CfdFramework.removed[that.shortId()] + 1;
+								CfdFramework.removed[this.shortId()] =
+									CfdFramework.removed[this.shortId()] + 1;
 								if (
-									CfdFramework.removed[that.shortId()] ==
-									CfdFramework.toRemove[that.shortId()]
+									CfdFramework.removed[this.shortId()] ==
+									CfdFramework.toRemove[this.shortId()]
 								)
 									onAllRemove();
 							}, repo, eim
 						);
 					},
-					function (err) {
+					(err) => {
 						let error =
 							"Error retrieving relationship to delete: " + err;
 						failure(error);
-						CfdFramework.removed[that.shortId()] =
-							CfdFramework.removed[that.shortId()] + 1;
+						CfdFramework.removed[this.shortId()] =
+							CfdFramework.removed[this.shortId()] + 1;
 						if (
-							CfdFramework.removed[that.shortId()] ==
-							CfdFramework.toRemove[that.shortId()]
+							CfdFramework.removed[this.shortId()] ==
+							CfdFramework.toRemove[this.shortId()]
 						)
 							onAllRemove();
 					}
@@ -187,8 +186,8 @@ module.exports = class CfdFramework extends EcFramework {
 			}
 		}
 		if (
-			CfdFramework.removed[that.shortId()] ==
-			CfdFramework.toRemove[that.shortId()]
+			CfdFramework.removed[this.shortId()] ==
+			CfdFramework.toRemove[this.shortId()]
 		)
 			onAllRemove();
 	};

package/src/com/eduworks/schema/ebac/EbacContact.js

@@ -60,9 +60,8 @@ module.exports = class EbacContact extends EcLinkedData {
 	upgrade() {
 		super.upgrade();
 		if (EbacContact.TYPE_0_1 == (this.type)) {
-			let me = this;
-			if (me["@context"] == null && me["@schema"] != null)
-				me["@context"] = me["@schema"];
+			if (this["@context"] == null && this["@schema"] != null)
+				this["@context"] = this["@schema"];
 			this.setContextAndType(Ebac.context_0_2, EbacContact.TYPE_0_2);
 		}
 		if (EbacContact.TYPE_0_2 == (this.getFullType())) {
@@ -73,11 +72,6 @@ module.exports = class EbacContact extends EcLinkedData {
 		}
 	}
 	getTypes() {
-		let a = [];
-		a.push(EbacContact.TYPE_0_4);
-		a.push(EbacContact.TYPE_0_3);
-		a.push(EbacContact.TYPE_0_2);
-		a.push(EbacContact.TYPE_0_1);
-		return a;
+		return [EbacContact.TYPE_0_4, EbacContact.TYPE_0_3, EbacContact.TYPE_0_2, EbacContact.TYPE_0_1];
 	}
 };

package/src/com/eduworks/schema/ebac/EbacContactGrant.js

@@ -55,9 +55,8 @@ module.exports = class EbacContactGrant extends EcRemoteLinkedData {
 	upgrade() {
 		super.upgrade();
 		if (EbacContactGrant.TYPE_0_1 == (this.type)) {
-			let me = this;
-			if (me["@context"] == null && me["@schema"] != null)
-				me["@context"] = me["@schema"];
+			if (this["@context"] == null && this["@schema"] != null)
+				this["@context"] = this["@schema"];
 			this.setContextAndType(Ebac.context_0_2, EbacContactGrant.TYPE_0_2);
 		}
 		if (EbacContactGrant.TYPE_0_2 == (this.getFullType())) {
@@ -68,11 +67,6 @@ module.exports = class EbacContactGrant extends EcRemoteLinkedData {
 		}
 	}
 	getTypes() {
-		let a = [];
-		a.push(EbacContactGrant.TYPE_0_4);
-		a.push(EbacContactGrant.TYPE_0_3);
-		a.push(EbacContactGrant.TYPE_0_2);
-		a.push(EbacContactGrant.TYPE_0_1);
-		return a;
+		return [EbacContactGrant.TYPE_0_4, EbacContactGrant.TYPE_0_3, EbacContactGrant.TYPE_0_2, EbacContactGrant.TYPE_0_1];
 	}
 };

package/src/com/eduworks/schema/ebac/EbacCredential.js

@@ -49,9 +49,8 @@ module.exports = class EbacCredential extends EcLinkedData {
 	upgrade() {
 		super.upgrade();
 		if (EbacCredential.TYPE_0_1 == (this.type)) {
-			let me = this;
-			if (me["@context"] == null && me["@schema"] != null)
-				me["@context"] = me["@schema"];
+			if (this["@context"] == null && this["@schema"] != null)
+				this["@context"] = this["@schema"];
 			this.setContextAndType(Ebac.context_0_2, EbacCredential.TYPE_0_2);
 		}
 		if (EbacCredential.TYPE_0_2 == (this.getFullType())) {
@@ -62,11 +61,6 @@ module.exports = class EbacCredential extends EcLinkedData {
 		}
 	}
 	getTypes() {
-		let a = [];
-		a.push(EbacCredential.TYPE_0_4);
-		a.push(EbacCredential.TYPE_0_3);
-		a.push(EbacCredential.TYPE_0_2);
-		a.push(EbacCredential.TYPE_0_1);
-		return a;
+		return [EbacCredential.TYPE_0_4, EbacCredential.TYPE_0_3, EbacCredential.TYPE_0_2, EbacCredential.TYPE_0_1];
 	}
 };

package/src/com/eduworks/schema/ebac/EbacCredentialCommit.js

@@ -50,9 +50,8 @@ module.exports = class EbacCredentialCommit extends EcLinkedData {
 	upgrade() {
 		super.upgrade();
 		if (EbacCredentialCommit.TYPE_0_1 == (this.type)) {
-			let me = this;
-			if (me["@context"] == null && me["@schema"] != null)
-				me["@context"] = me["@schema"];
+			if (this["@context"] == null && this["@schema"] != null)
+				this["@context"] = this["@schema"];
 			this.setContextAndType(
 				Ebac.context_0_2,
 				EbacCredentialCommit.TYPE_0_2
@@ -72,11 +71,6 @@ module.exports = class EbacCredentialCommit extends EcLinkedData {
 		}
 	}
 	getTypes() {
-		let a = [];
-		a.push(EbacCredentialCommit.TYPE_0_4);
-		a.push(EbacCredentialCommit.TYPE_0_3);
-		a.push(EbacCredentialCommit.TYPE_0_2);
-		a.push(EbacCredentialCommit.TYPE_0_1);
-		return a;
+		return [EbacCredentialCommit.TYPE_0_4, EbacCredentialCommit.TYPE_0_3, EbacCredentialCommit.TYPE_0_2, EbacCredentialCommit.TYPE_0_1];
 	}
 };

package/src/com/eduworks/schema/ebac/EbacCredentialRequest.js

@@ -35,9 +35,8 @@ module.exports = class EbacCredentialRequest extends EcLinkedData {
 	upgrade() {
 		super.upgrade();
 		if (EbacCredentialRequest.TYPE_0_1 == this.type) {
-			let me = this;
-			if (me["@context"] == null && me["@schema"] != null)
-				me["@context"] = me["@schema"];
+			if (this["@context"] == null && this["@schema"] != null)
+				this["@context"] = this["@schema"];
 			this.setContextAndType(
 				Ebac.context_0_2,
 				EbacCredentialRequest.TYPE_0_2
@@ -57,11 +56,6 @@ module.exports = class EbacCredentialRequest extends EcLinkedData {
 		}
 	}
 	getTypes() {
-		let a = [];
-		a.push(EbacCredentialRequest.TYPE_0_4);
-		a.push(EbacCredentialRequest.TYPE_0_3);
-		a.push(EbacCredentialRequest.TYPE_0_2);
-		a.push(EbacCredentialRequest.TYPE_0_1);
-		return a;
+		return [EbacCredentialRequest.TYPE_0_4, EbacCredentialRequest.TYPE_0_3, EbacCredentialRequest.TYPE_0_2, EbacCredentialRequest.TYPE_0_1];
 	}
 };

package/src/com/eduworks/schema/ebac/EbacCredentials.js

@@ -48,9 +48,8 @@ module.exports = class EbacCredentials extends EcLinkedData {
 	upgrade() {
 		super.upgrade();
 		if (EbacCredentials.TYPE_0_1 == (this.type)) {
-			let me = this;
-			if (me["@context"] == null && me["@schema"] != null)
-				me["@context"] = me["@schema"];
+			if (this["@context"] == null && this["@schema"] != null)
+				this["@context"] = this["@schema"];
 			this.setContextAndType(Ebac.context_0_2, EbacCredentials.TYPE_0_2);
 		}
 		if (EbacCredentials.TYPE_0_2 == (this.getFullType())) {
@@ -61,11 +60,6 @@ module.exports = class EbacCredentials extends EcLinkedData {
 		}
 	}
 	getTypes() {
-		let a = [];
-		a.push(EbacCredentials.TYPE_0_4);
-		a.push(EbacCredentials.TYPE_0_3);
-		a.push(EbacCredentials.TYPE_0_2);
-		a.push(EbacCredentials.TYPE_0_1);
-		return a;
+		return [EbacCredentials.TYPE_0_4, EbacCredentials.TYPE_0_3, EbacCredentials.TYPE_0_2, EbacCredentials.TYPE_0_1];
 	}
 };

package/src/com/eduworks/schema/ebac/EbacEncryptedSecret.js

@@ -87,9 +87,8 @@ module.exports = class EbacEncryptedSecret extends EcLinkedData {
 	upgrade() {
 		super.upgrade();
 		if (EbacEncryptedSecret.TYPE_0_1 == this.type) {
-			let me = this;
-			if (me["@context"] == null && me["@schema"] != null)
-				me["@context"] = me["@schema"];
+			if (this["@context"] == null && this["@schema"] != null)
+				this["@context"] = this["@schema"];
 			this.setContextAndType(
 				Ebac.context_0_2,
 				EbacEncryptedSecret.TYPE_0_2
@@ -109,11 +108,6 @@ module.exports = class EbacEncryptedSecret extends EcLinkedData {
 		}
 	}
 	getTypes() {
-		let a = [];
-		a.push(EbacEncryptedSecret.TYPE_0_4);
-		a.push(EbacEncryptedSecret.TYPE_0_3);
-		a.push(EbacEncryptedSecret.TYPE_0_2);
-		a.push(EbacEncryptedSecret.TYPE_0_1);
-		return a;
+		return [EbacEncryptedSecret.TYPE_0_4, EbacEncryptedSecret.TYPE_0_3, EbacEncryptedSecret.TYPE_0_2, EbacEncryptedSecret.TYPE_0_1];
 	}
 };

package/src/com/eduworks/schema/ebac/EbacEncryptedValue.js

@@ -65,11 +65,10 @@ module.exports = class EbacEncryptedValue extends EcRemoteLinkedData {
 	 */
 	iv = null;
 	copyFrom(that) {
-		let me = this;
-		for (let key in me) delete me[key];
+		for (let key in this) delete this[key];
 		let you = that;
 		for (let key in you) {
-			if (me[key] == null) me[key.replace("@", "")] = you[key];
+			if (this[key] == null) this[key.replace("@", "")] = you[key];
 		}
 		if (!this.isAny(this.getTypes()))
 			throw new Error("Incompatible type: " + this.getFullType());
@@ -77,9 +76,8 @@ module.exports = class EbacEncryptedValue extends EcRemoteLinkedData {
 	upgrade() {
 		super.upgrade();
 		if (EbacEncryptedValue.TYPE_0_1 == this.type) {
-			let me = this;
-			if (me["@context"] == null && me["@schema"] != null)
-				me["@context"] = me["@schema"];
+			if (this["@context"] == null && this["@schema"] != null)
+				this["@context"] = this["@schema"];
 			this.setContextAndType(
 				Ebac.context_0_2,
 				EbacEncryptedValue.TYPE_0_2
@@ -99,11 +97,6 @@ module.exports = class EbacEncryptedValue extends EcRemoteLinkedData {
 		}
 	}
 	getTypes() {
-		let a = [];
-		a.push(EbacEncryptedValue.TYPE_0_4);
-		a.push(EbacEncryptedValue.TYPE_0_3);
-		a.push(EbacEncryptedValue.TYPE_0_2);
-		a.push(EbacEncryptedValue.TYPE_0_1);
-		return a;
+		return [EbacEncryptedValue.TYPE_0_4, EbacEncryptedValue.TYPE_0_3, EbacEncryptedValue.TYPE_0_2, EbacEncryptedValue.TYPE_0_1];
 	}
 };

package/src/com/eduworks/schema/ebac/EbacSignature.js

@@ -57,11 +57,6 @@ module.exports = class EbacSignature extends EcLinkedData {
 		super.upgrade();
 	}
 	getTypes() {
-		let a = [];
-		a.push(EbacSignature.TYPE_0_4);
-		a.push(EbacSignature.TYPE_0_3);
-		a.push(EbacSignature.TYPE_0_2);
-		a.push(EbacSignature.TYPE_0_1);
-		return a;
+		return [EbacSignature.TYPE_0_4, EbacSignature.TYPE_0_3, EbacSignature.TYPE_0_2, EbacSignature.TYPE_0_1];
 	}
 };

package/src/index/env.js

@@ -6,13 +6,16 @@ if (typeof window !== "undefined" && window) {
 global.generateUUID = function () {
     var d = new Date().getTime(); //Timestamp
     var d2 = ((typeof performance !== 'undefined') && performance.now && (performance.now() * 1000)) || 0;//Time in microseconds since page-load or 0 if unsupported
+    var random = new Uint8Array(32);//One random byte per hex digit
+    global.crypto.getRandomValues(random);//Set below; the browser's own crypto in a page
+    var i = 0;
     return 'xxxxxxxx-c455-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-        var r = Math.random() * 16;//random number between 0 and 16
+        var r = random[i++] % 16;//random number between 0 and 15
         if (d > 0) {//Use timestamp until depleted
-            r = (d + r) % 16 | 0;
+            r = Math.trunc((d + r) % 16);
             d = Math.floor(d / 16);
         } else {//Use microseconds since page-load if supported
-            r = (d2 + r) % 16 | 0;
+            r = Math.trunc((d2 + r) % 16);
             d2 = Math.floor(d2 / 16);
         }
         return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16);