cassproject 5.0.20 → 5.0.23

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);

package/src/index/polyfills.js

@@ -29,11 +29,6 @@ if (!String.prototype.endsWith) {
         return this.substring(this.length - end.length, this.length) == end;
     };
 }
-if (!String.prototype.trim) {
-    String.prototype.trim = function () {
-        return this.replace(/^\s+/, "").replace(/\s+$/, "");
-    };
-}
 if (!String.prototype.matches) {
     String.prototype.matches = function (regexp) {
         return this.match("^" + regexp + "$") != null;
@@ -127,65 +122,56 @@ let Short = Number;
 /* type conversion - approximative as Javascript only has integers and doubles */
 if (!Number.prototype.intValue) {
     Number.prototype.intValue = function () {
-        return parseInt(this);
+        return Number.parseInt(this);
     };
 }
 if (!Number.prototype.shortValue) {
     Number.prototype.shortValue = function () {
-        return parseInt(this);
+        return Number.parseInt(this);
     };
 }
 if (!Number.prototype.longValue) {
     Number.prototype.longValue = function () {
-        return parseInt(this);
+        return Number.parseInt(this);
     };
 }
 if (!Number.prototype.byteValue) {
     Number.prototype.byteValue = function () {
-        return parseInt(this);
+        return Number.parseInt(this);
     };
 }
 
 if (!Number.prototype.floatValue) {
     Number.prototype.floatValue = function () {
-        return parseFloat(this);
+        return Number.parseFloat(this);
     };
 }
 
 if (!Number.prototype.doubleValue) {
     Number.prototype.doubleValue = function () {
-        return parseFloat(this);
+        return Number.parseFloat(this);
     };
 }
 
-if (!Number.parseInt) {
-    Number.parseInt = parseInt;
-}
+// Number.parseInt, Number.parseFloat, Number.isNaN and String.prototype.trim are
+// built in to every engine this library runs on (ES2015+), so they need no polyfill.
 if (!Number.parseShort) {
-    Number.parseShort = parseInt;
+    Number.parseShort = Number.parseInt;
 }
 if (!Number.parseLong) {
-    Number.parseLong = parseInt;
+    Number.parseLong = Number.parseInt;
 }
 if (!Number.parseByte) {
-    Number.parseByte = parseInt;
+    Number.parseByte = Number.parseInt;
 }
 
 if (!Number.parseDouble) {
-    Number.parseDouble = parseFloat;
-}
-
-if (!Number.parseFloat) {
-    Number.parseFloat = parseFloat;
-}
-
-if (!Number.isNaN) {
-    Number.isNaN = isNaN;
+    Number.parseDouble = Number.parseFloat;
 }
 
 if (!Number.prototype.isNaN) {
     Number.prototype.isNaN = function () {
-        return isNaN(this);
+        return Number.isNaN(Number(this));
     };
 }
 if (!Number.prototype.equals) {

package/src/org/angles/schema/angles/VideoStory.js

@@ -9,7 +9,7 @@ module.exports = class VideoStory extends schema.VideoObject {
 	 */
 	constructor() {
 		super();
-		this.context = "http://schema.eduworks.com/angles/0.1/";
+		this.context = "http://schema.eduworks.com/angles/0.1/"; // NOSONAR - JSON-LD identifier, never fetched
 		this.type = "VideoStory";
 	}
 	/**

package/src/org/cass/competency/EcCompetency.js

@@ -18,12 +18,11 @@ require("../../cassproject/general/AuditLogger.js");
 module.exports = class EcCompetency extends Competency {
 	constructor() {
 		super();
-		let me = this;
 		if (EcCompetency.template != null) {
 			let you = EcCompetency.template;
 			for (let key in you) {
 				if (typeof you[key] != "function")
-					me[key.replace("@", "")] = you[key];
+					this[key.replace("@", "")] = you[key];
 			}
 		}
 	}

package/src/org/cass/competency/EcDirectory.js

@@ -13,12 +13,11 @@ const Directory = require("../../cassproject/schema/cass/competency/Directory.js
 module.exports = class EcDirectory extends Directory {
 	constructor() {
 		super();
-		let me = this;
 		if (EcDirectory.template != null) {
 			let you = EcDirectory.template;
 			for (let key in you) {
 				if (typeof you[key] != "function")
-					me[key.replace("@", "")] = you[key];
+					this[key.replace("@", "")] = you[key];
 			}
 		}
 	}

package/src/org/cass/competency/EcFramework.js

@@ -15,12 +15,11 @@ const EcRemoteLinkedData = require("../../cassproject/schema/general/EcRemoteLin
 module.exports = class EcFramework extends Framework {
 	constructor() {
 		super();
-		let me = this;
 		if (EcFramework.template != null) {
 			let you = EcFramework.template;
 			for (let key in you) {
 				if (typeof you[key] != "function")
-					me[key.replace("@", "")] = you[key];
+					this[key.replace("@", "")] = you[key];
 			}
 		}
 	}
@@ -188,7 +187,6 @@ module.exports = class EcFramework extends Framework {
 	 */
 	removeRelationshipsThatInclude(id, i, success, failure, repo, eim) {
 		let shortId = EcRemoteLinkedData.trimVersionFromUrl(id);
-		let me = this;
 		if (i >= this.relation.length && success != null) success("");
 		else
 			return EcAlignment.get(
@@ -200,15 +198,15 @@ module.exports = class EcFramework extends Framework {
 						a.source == id ||
 						a.target == id
 					) {
-						me.relation.splice(i, 1);
-						await me.removeRelationshipsThatInclude(
+						this.relation.splice(i, 1);
+						await this.removeRelationshipsThatInclude(
 							id,
 							i,
 							success,
 							failure
 						);
 					} else
-						await me.removeRelationshipsThatInclude(
+						await this.removeRelationshipsThatInclude(
 							id,
 							i + 1,
 							success,
@@ -216,7 +214,7 @@ module.exports = class EcFramework extends Framework {
 						);
 				},
 				async(s) => {
-					await me.removeRelationshipsThatInclude(
+					await this.removeRelationshipsThatInclude(
 						id,
 						i + 1,
 						success,
@@ -242,22 +240,21 @@ module.exports = class EcFramework extends Framework {
 	 */
 	removeLevelsThatInclude(id, i, success, failure, repo, eim) {
 		let shortId = EcRemoteLinkedData.trimVersionFromUrl(id);
-		let me = this;
 		if (i >= this.level.length && success != null) success("");
 		else
 			return EcLevel.get(
 				this.level[i],
 				async(a) => {
 					if (a.competency == shortId || a.competency == id) {
-						me.level.splice(i, 1);
-						await me.removeLevelsThatInclude(
+						this.level.splice(i, 1);
+						await this.removeLevelsThatInclude(
 							id,
 							i,
 							success,
 							failure
 						);
 					} else
-						await me.removeLevelsThatInclude(
+						await this.removeLevelsThatInclude(
 							id,
 							i + 1,
 							success,
@@ -265,7 +262,7 @@ module.exports = class EcFramework extends Framework {
 						);
 				},
 				async(s) => {
-					await me.removeLevelsThatInclude(
+					await this.removeLevelsThatInclude(
 						id,
 						i + 1,
 						success,

package/src/org/cass/exporter/CSVExport.js

@@ -81,7 +81,8 @@ module.exports = class CSVExport extends Exporter {
 					if (fw.competency == null || fw.competency.length == 0)
 						failure("No Competencies in Framework");
 					for (let competencyUrl of fw.competency) {
-						EcRepository.get(
+						//Results arrive through the callbacks; the promise is not needed.
+						void EcRepository.get(
 							competencyUrl,
 							function (competency) {
 								CSVExport.frameworkCompetencies.push(
@@ -119,7 +120,7 @@ module.exports = class CSVExport extends Exporter {
 							}, repo, eim);
 					}
 					for (let relationUrl of fw.relation) {
-						EcRepository.get(
+						void EcRepository.get(
 							relationUrl,
 							function (relation) {
 								CSVExport.frameworkRelations.push(relation);
@@ -202,17 +203,15 @@ module.exports = class CSVExport extends Exporter {
 							for (let prop3 in props2[prop2]) {
 								display += props2[prop2][prop3] + "|";
 							}
+						} else if (prop === 'ceterms:versionIdentifier') {
+							if (props2[prop2]['ceterms:identifierValueCode'])
+								display += props2[prop2]['ceterms:identifierValueCode'] + "~";
+							if (props2[prop2]['ceterms:identifierTypeName'])
+								display += Object.values(props2[prop2]['ceterms:identifierTypeName'])[0] + "~";
+							if (props2[prop2]['ceterms:identifierType'])
+								display += props2[prop2]['ceterms:identifierType'] + "|";
 						} else {
-							if (prop === 'ceterms:versionIdentifier') {
-								if (props2[prop2]['ceterms:identifierValueCode'])
-									display += props2[prop2]['ceterms:identifierValueCode'] + "~";
-								if (props2[prop2]['ceterms:identifierTypeName'])
-									display += Object.values(props2[prop2]['ceterms:identifierTypeName'])[0] + "~";
-								if (props2[prop2]['ceterms:identifierType'])
-									display += props2[prop2]['ceterms:identifierType'] + "|";
-							} else {
-								display += props2[prop2] + "|";
-							}
+							display += props2[prop2] + "|";
 						}
 					}
 					display = display.substring(0, display.length - 1);
@@ -242,7 +241,7 @@ module.exports = class CSVExport extends Exporter {
 			}
 		}
 		buildExport(objects, piped) {
-			for (let object of objects.filter(x=>x)) {
+			for (let object of objects.filter(Boolean)) {
 				this.addCSVRow(object, piped);
 			}
 		}

package/src/org/cass/importer/ASNImport.js

@@ -258,10 +258,7 @@ module.exports = class ASNImport extends Importer {
 					];
 			comp.id = key;
 			if (comp.id == null) {
-				if (
-					repo == null ||
-					repo.selectedServer.indexOf(serverUrl) != -1
-				)
+				if (repo?.selectedServer.includes(serverUrl) ?? true)
 					comp.generateId(serverUrl);
 				else comp.generateShortId(serverUrl);
 			}
@@ -347,7 +344,7 @@ module.exports = class ASNImport extends Importer {
 				relation.relationType = "narrows";
 				relation.name = "";
 				relation.description = "";
-				if (repo == null || repo.selectedServer.indexOf(serverUrl) != -1)
+				if (repo?.selectedServer.includes(serverUrl) ?? true)
 					relation.generateId(serverUrl);
 				else 
 					relation.generateShortId(serverUrl);
@@ -424,7 +421,7 @@ module.exports = class ASNImport extends Importer {
 			ASNImport.importedFramework.description = ASNImport.jsonFramework["http://purl.org/dc/terms/description"]["0"]["value"];
 		ASNImport.importedFramework.id = ASNImport.frameworkUrl;
 		if (ASNImport.importedFramework.id == null) {
-			if (repo == null || repo.selectedServer.indexOf(serverUrl) != -1)
+			if (repo?.selectedServer.includes(serverUrl) ?? true)
 				ASNImport.importedFramework.generateId(serverUrl);
 			else 
 				ASNImport.importedFramework.generateShortId(serverUrl);

package/src/org/cass/importer/CSVImport.js

@@ -69,7 +69,7 @@ module.exports = class CSVImport {
 		if (
 			oldId == null ||
 			oldId == "" ||
-			oldId.toLowerCase().indexOf("http") == -1
+			!oldId.toLowerCase().includes("http")
 		)
 			newObject.assignId(selectedServer, oldId);
 		else {
@@ -182,7 +182,7 @@ module.exports = class CSVImport {
 							serverUrl,
 							repo
 						);
-					} else if (repo == null || repo.selectedServer.indexOf(serverUrl) != -1)
+					} else if (repo?.selectedServer.includes(serverUrl) ?? true)
 						competency.generateId(serverUrl);
 					else 
 						competency.generateShortId(serverUrl);
@@ -226,7 +226,7 @@ module.exports = class CSVImport {
 							name == null ||
 							name.trim() == "" ||
 							name.startsWith("@") ||
-							name.indexOf(".") != -1 ||
+							name.includes(".") ||
 							tabularData[i][idx].trim() == "" ||
 							idx == nameIndex ||
 							idx == descriptionIndex ||
@@ -384,10 +384,7 @@ module.exports = class CSVImport {
 					else alignment.target = CSVImport.importCsvLookup[destKey];
 					alignment.relationType = relationTypeKey;
 					if (owner != null) alignment.addOwner(owner.ppk.toPk());
-					if (
-						repo == null ||
-						repo.selectedServer.indexOf(serverUrl) != -1
-					)
+					if (repo?.selectedServer.includes(serverUrl) ?? true)
 						alignment.generateId(serverUrl);
 					else alignment.generateShortId(serverUrl);
 					relations.push(alignment);
@@ -489,7 +486,7 @@ module.exports = class CSVImport {
 			if (
 				props[prop] == null ||
 				props[prop] == undefined ||
-				Object.toString.call(props[prop]).indexOf("String") == -1
+				!Object.toString.call(props[prop]).includes("String")
 			) {
 				if (EcObject.isObject(props[prop])) {
 					let nested = props[prop];
@@ -584,7 +581,7 @@ module.exports = class CSVImport {
 							idx == typeIdx
 						) {
 							continue;
-						} else if (name.indexOf(".") != -1) {
+						} else if (name.includes(".")) {
 							let split = name.split(".");
 							if (split.length > 1) {
 								let key = split[0];
@@ -623,14 +620,9 @@ module.exports = class CSVImport {
 							serverUrl,
 							repo
 						);
-					} else {
-						if (
-							repo == null ||
-							repo.selectedServer.indexOf(serverUrl) != -1
-						)
-							data.generateId(serverUrl);
-						else data.generateShortId(serverUrl);
-					}
+					} else if (repo?.selectedServer.includes(serverUrl) ?? true)
+						data.generateId(serverUrl);
+					else data.generateShortId(serverUrl);
 					let shortId;
 					if (
 						idIndex != null &&