alex-c-line 2.10.0 → 2.10.1

package/dist/index.cjs

@@ -325,14 +325,17 @@ async function getLicenseCheck(program) {
 		code: "LICENSE_CHECK_ERROR"
 	});
 	const licenseCheck = parseLicenseCheck(JSON.parse(stdout.trim()));
-	if (Object.keys(licenseCheck).length === 0) return "No licenses found.";
+	const licenseEntries = Object.entries(licenseCheck);
+	if (licenseEntries.length === 0) return "No licenses found.";
 	const licenseCheckSummaryPath = node_path.default.join(await ALEX_C_LINE_PACKAGE_ROOT, "templates", "dependencyAudit", "licenseCheck", "summary");
 	const summaryTableTemplate = await (0, node_fs_promises.readFile)(node_path.default.join(licenseCheckSummaryPath, "table.html"), "utf-8");
 	const summaryTableRowTemplate = await (0, node_fs_promises.readFile)(node_path.default.join(licenseCheckSummaryPath, "tableRow.html"), "utf-8");
-	const summary = summaryTableTemplate.replace("{{tableRows}}", Object.entries(licenseCheck).map(([license, data]) => {
-		return summaryTableRowTemplate.replace("{{license}}", license).replace("{{count}}", data.length.toString());
+	const summary = summaryTableTemplate.replace("{{tableRows}}", licenseEntries.toSorted((0, _alextheman_utility.sortBy)(([_, data]) => {
+		return data.length;
+	}, "desc")).map(([license, data]) => {
+		return summaryTableRowTemplate.replace("{{license}}", (0, _alextheman_utility.escapeHTML)(license)).replace("{{count}}", (0, _alextheman_utility.escapeHTML)(data.length.toString()));
 	}).join("\n"));
-	const invalidLicenses = Object.keys(licenseCheck).filter((license) => {
+	const invalidLicenses = licenseEntries.filter(([license, _]) => {
 		return !ALLOWED_LICENSES.includes(license);
 	});
 	let invalidSummary;
@@ -343,12 +346,10 @@ async function getLicenseCheck(program) {
 		const invalidLicensesTableRowTemplate = await (0, node_fs_promises.readFile)(node_path.default.join(invalidLicensesInvalidPath, "tableRow.html"), "utf-8");
 		const invalidLicensesListTemplate = await (0, node_fs_promises.readFile)(node_path.default.join(invalidLicensesInvalidPath, "list.html"), "utf-8");
 		const invalidLicensesListItemTemplate = await (0, node_fs_promises.readFile)(node_path.default.join(invalidLicensesInvalidPath, "listItem.html"), "utf-8");
-		invalidSummary = invalidLicensesTableTemplate.replace("{{tableRows}}", Object.entries(licenseCheck).filter(([license]) => {
-			return !ALLOWED_LICENSES.includes(license);
-		}).map(([license, data]) => {
-			return invalidLicensesTableRowTemplate.replaceAll("{{license}}", license).replace("{{count}}", data.length.toString()).replace("{{dependencies}}", invalidLicensesListTemplate.replace("{{listItems}}", data.flatMap((item) => {
+		invalidSummary = invalidLicensesTableTemplate.replace("{{tableRows}}", invalidLicenses.map(([license, data]) => {
+			return invalidLicensesTableRowTemplate.replaceAll("{{license}}", (0, _alextheman_utility.escapeHTML)(license)).replace("{{count}}", (0, _alextheman_utility.escapeHTML)(data.length.toString())).replace("{{dependencies}}", invalidLicensesListTemplate.replace("{{listItems}}", data.flatMap((item) => {
 				return item.versions.map((version) => {
-					return invalidLicensesListItemTemplate.replace("{{name}}", item.name).replace("{{version}}", version);
+					return invalidLicensesListItemTemplate.replace("{{name}}", (0, _alextheman_utility.escapeHTML)(item.name)).replace("{{version}}", (0, _alextheman_utility.escapeHTML)(version));
 				});
 			}).join("")));
 		}).join("\n"));
@@ -393,7 +394,7 @@ async function getOutdatedDependencies(program) {
 	const tableTemplate = await (0, node_fs_promises.readFile)(node_path.default.join(outdatedTemplatesPath, "table.html"), "utf-8");
 	const tableRowTemplate = await (0, node_fs_promises.readFile)(node_path.default.join(outdatedTemplatesPath, "tableRow.html"), "utf-8");
 	return tableTemplate.replace("{{tableRows}}", Object.entries(outdatedDependencies).map(([packageName, data]) => {
-		return tableRowTemplate.replace("{{packageName}}", packageName).replace("{{currentVersion}}", data.current.toString()).replace("{{latestVersion}}", data.latest.toString()).replace("{{isDeprecated}}", data.isDeprecated ? "Yes" : "No").replace("{{dependencyGroup}}", data.dependencyType);
+		return tableRowTemplate.replace("{{packageName}}", (0, _alextheman_utility.escapeHTML)(packageName)).replace("{{currentVersion}}", (0, _alextheman_utility.escapeHTML)(data.current.toString())).replace("{{latestVersion}}", (0, _alextheman_utility.escapeHTML)(data.latest.toString())).replace("{{isDeprecated}}", data.isDeprecated ? "Yes" : "No").replace("{{dependencyGroup}}", (0, _alextheman_utility.escapeHTML)(data.dependencyType));
 	}).join("\n"));
 }
 //#endregion
@@ -423,8 +424,8 @@ async function getPeerCheck(program) {
 	if (Object.keys(peerCheck["."].bad).length === 0) return "No peer dependency issues found";
 	return peerCheckTableTemplate.replace("{{tableRows}}", Object.entries(peerCheck["."].bad).flatMap(([packageName, data]) => {
 		return data.map((item) => {
-			return peerCheckTableRowTemplate.replace("{{packageName}}", packageName).replace("{{currentVersion}}", item.foundVersion.toString()).replace("{{wantedRange}}", item.wantedRange).replace("{{parentDependencies}}", item.parents.map((parent) => {
-				return `${parent.name}@${parent.version}`;
+			return peerCheckTableRowTemplate.replace("{{packageName}}", (0, _alextheman_utility.escapeHTML)(packageName)).replace("{{currentVersion}}", (0, _alextheman_utility.escapeHTML)(item.foundVersion.toString())).replace("{{wantedRange}}", (0, _alextheman_utility.escapeHTML)(item.wantedRange)).replace("{{parentDependencies}}", item.parents.map((parent) => {
+				return `${(0, _alextheman_utility.escapeHTML)(parent.name)}@${parent.version}`;
 			}).join(", "));
 		});
 	}).join("\n"));
@@ -478,12 +479,12 @@ async function getSecurityAudit(program) {
 	const auditTable = tableTemplate.replace("{{tableRows}}", Object.entries(securityAudit.advisories).toSorted((0, _alextheman_utility.sortBy)(([_, advisory]) => {
 		return severityOrder[advisory.severity];
 	}, "desc")).map(([id, data]) => {
-		return tableRowTemplate.replace("{{advisoryId}}", id).replace("{{severity}}", data.severity).replace("{{packageName}}", data.module_name).replace("{{title}}", data.title).replace("{{affected}}", data.vulnerable_versions).replace("{{patched}}", data.patched_versions).replace("{{url}}", data.url);
+		return tableRowTemplate.replace("{{advisoryId}}", (0, _alextheman_utility.escapeHTML)(id)).replace("{{severity}}", (0, _alextheman_utility.escapeHTML)(data.severity)).replace("{{packageName}}", (0, _alextheman_utility.escapeHTML)(data.module_name)).replace("{{title}}", (0, _alextheman_utility.escapeHTML)(data.title)).replace("{{affected}}", (0, _alextheman_utility.escapeHTML)(data.vulnerable_versions)).replace("{{patched}}", (0, _alextheman_utility.escapeHTML)(data.patched_versions)).replace("{{url}}", (0, _alextheman_utility.escapeHTML)(data.url));
 	}).join("\n"));
 	return _alextheman_utility.normaliseIndents`
     ### Summary
     
-    ${(await (0, node_fs_promises.readFile)(node_path.default.join(auditTemplatesPath, "summary.html"), "utf-8")).replace("{{info}}", securityAudit.metadata.vulnerabilities.info.toString()).replace("{{low}}", securityAudit.metadata.vulnerabilities.low.toString()).replace("{{moderate}}", securityAudit.metadata.vulnerabilities.moderate.toString()).replace("{{high}}", securityAudit.metadata.vulnerabilities.high.toString()).replace("{{critical}}", securityAudit.metadata.vulnerabilities.critical.toString())}
+    ${(await (0, node_fs_promises.readFile)(node_path.default.join(auditTemplatesPath, "summary.html"), "utf-8")).replace("{{info}}", (0, _alextheman_utility.escapeHTML)(securityAudit.metadata.vulnerabilities.info.toString())).replace("{{low}}", (0, _alextheman_utility.escapeHTML)(securityAudit.metadata.vulnerabilities.low.toString())).replace("{{moderate}}", (0, _alextheman_utility.escapeHTML)(securityAudit.metadata.vulnerabilities.moderate.toString())).replace("{{high}}", (0, _alextheman_utility.escapeHTML)(securityAudit.metadata.vulnerabilities.high.toString())).replace("{{critical}}", (0, _alextheman_utility.escapeHTML)(securityAudit.metadata.vulnerabilities.critical.toString()))}
 
     ### Audit Results
 
@@ -1422,7 +1423,7 @@ function template(program) {
 //#endregion
 //#region package.json
 var name = "alex-c-line";
-var version$1 = "2.10.0";
+var version$1 = "2.10.1";
 var description = "Command-line tool with commands to streamline the developer workflow.";
 //#endregion
 //#region src/utility/updates/checkUpdate.ts

package/dist/index.js

@@ -7,7 +7,7 @@ import boxen from "boxen";
 import figlet from "figlet";
 import envPaths from "env-paths";
 import path from "node:path";
-import { ONE_DAY_IN_MILLISECONDS, VersionNumber, az, fillArray, getStringsAndInterpolations, interpolate, isTemplateStringsArray, kebabToCamel, normaliseIndents, omitProperties, parseBoolean, parseVersionType, removeDuplicates, removeUndefinedFromObject, sortBy, stringifyDotenv } from "@alextheman/utility";
+import { ONE_DAY_IN_MILLISECONDS, VersionNumber, az, escapeHTML, fillArray, getStringsAndInterpolations, interpolate, isTemplateStringsArray, kebabToCamel, normaliseIndents, omitProperties, parseBoolean, parseVersionType, removeDuplicates, removeUndefinedFromObject, sortBy, stringifyDotenv } from "@alextheman/utility";
 import { confirm, input, password, select } from "@inquirer/prompts";
 import { access, mkdir, readFile, readdir, rm, stat, writeFile } from "node:fs/promises";
 import { parse } from "dotenv";
@@ -294,14 +294,17 @@ async function getLicenseCheck(program) {
 		code: "LICENSE_CHECK_ERROR"
 	});
 	const licenseCheck = parseLicenseCheck(JSON.parse(stdout.trim()));
-	if (Object.keys(licenseCheck).length === 0) return "No licenses found.";
+	const licenseEntries = Object.entries(licenseCheck);
+	if (licenseEntries.length === 0) return "No licenses found.";
 	const licenseCheckSummaryPath = path.join(await ALEX_C_LINE_PACKAGE_ROOT, "templates", "dependencyAudit", "licenseCheck", "summary");
 	const summaryTableTemplate = await readFile(path.join(licenseCheckSummaryPath, "table.html"), "utf-8");
 	const summaryTableRowTemplate = await readFile(path.join(licenseCheckSummaryPath, "tableRow.html"), "utf-8");
-	const summary = summaryTableTemplate.replace("{{tableRows}}", Object.entries(licenseCheck).map(([license, data]) => {
-		return summaryTableRowTemplate.replace("{{license}}", license).replace("{{count}}", data.length.toString());
+	const summary = summaryTableTemplate.replace("{{tableRows}}", licenseEntries.toSorted(sortBy(([_, data]) => {
+		return data.length;
+	}, "desc")).map(([license, data]) => {
+		return summaryTableRowTemplate.replace("{{license}}", escapeHTML(license)).replace("{{count}}", escapeHTML(data.length.toString()));
 	}).join("\n"));
-	const invalidLicenses = Object.keys(licenseCheck).filter((license) => {
+	const invalidLicenses = licenseEntries.filter(([license, _]) => {
 		return !ALLOWED_LICENSES.includes(license);
 	});
 	let invalidSummary;
@@ -312,12 +315,10 @@ async function getLicenseCheck(program) {
 		const invalidLicensesTableRowTemplate = await readFile(path.join(invalidLicensesInvalidPath, "tableRow.html"), "utf-8");
 		const invalidLicensesListTemplate = await readFile(path.join(invalidLicensesInvalidPath, "list.html"), "utf-8");
 		const invalidLicensesListItemTemplate = await readFile(path.join(invalidLicensesInvalidPath, "listItem.html"), "utf-8");
-		invalidSummary = invalidLicensesTableTemplate.replace("{{tableRows}}", Object.entries(licenseCheck).filter(([license]) => {
-			return !ALLOWED_LICENSES.includes(license);
-		}).map(([license, data]) => {
-			return invalidLicensesTableRowTemplate.replaceAll("{{license}}", license).replace("{{count}}", data.length.toString()).replace("{{dependencies}}", invalidLicensesListTemplate.replace("{{listItems}}", data.flatMap((item) => {
+		invalidSummary = invalidLicensesTableTemplate.replace("{{tableRows}}", invalidLicenses.map(([license, data]) => {
+			return invalidLicensesTableRowTemplate.replaceAll("{{license}}", escapeHTML(license)).replace("{{count}}", escapeHTML(data.length.toString())).replace("{{dependencies}}", invalidLicensesListTemplate.replace("{{listItems}}", data.flatMap((item) => {
 				return item.versions.map((version) => {
-					return invalidLicensesListItemTemplate.replace("{{name}}", item.name).replace("{{version}}", version);
+					return invalidLicensesListItemTemplate.replace("{{name}}", escapeHTML(item.name)).replace("{{version}}", escapeHTML(version));
 				});
 			}).join("")));
 		}).join("\n"));
@@ -362,7 +363,7 @@ async function getOutdatedDependencies(program) {
 	const tableTemplate = await readFile(path.join(outdatedTemplatesPath, "table.html"), "utf-8");
 	const tableRowTemplate = await readFile(path.join(outdatedTemplatesPath, "tableRow.html"), "utf-8");
 	return tableTemplate.replace("{{tableRows}}", Object.entries(outdatedDependencies).map(([packageName, data]) => {
-		return tableRowTemplate.replace("{{packageName}}", packageName).replace("{{currentVersion}}", data.current.toString()).replace("{{latestVersion}}", data.latest.toString()).replace("{{isDeprecated}}", data.isDeprecated ? "Yes" : "No").replace("{{dependencyGroup}}", data.dependencyType);
+		return tableRowTemplate.replace("{{packageName}}", escapeHTML(packageName)).replace("{{currentVersion}}", escapeHTML(data.current.toString())).replace("{{latestVersion}}", escapeHTML(data.latest.toString())).replace("{{isDeprecated}}", data.isDeprecated ? "Yes" : "No").replace("{{dependencyGroup}}", escapeHTML(data.dependencyType));
 	}).join("\n"));
 }
 //#endregion
@@ -392,8 +393,8 @@ async function getPeerCheck(program) {
 	if (Object.keys(peerCheck["."].bad).length === 0) return "No peer dependency issues found";
 	return peerCheckTableTemplate.replace("{{tableRows}}", Object.entries(peerCheck["."].bad).flatMap(([packageName, data]) => {
 		return data.map((item) => {
-			return peerCheckTableRowTemplate.replace("{{packageName}}", packageName).replace("{{currentVersion}}", item.foundVersion.toString()).replace("{{wantedRange}}", item.wantedRange).replace("{{parentDependencies}}", item.parents.map((parent) => {
-				return `${parent.name}@${parent.version}`;
+			return peerCheckTableRowTemplate.replace("{{packageName}}", escapeHTML(packageName)).replace("{{currentVersion}}", escapeHTML(item.foundVersion.toString())).replace("{{wantedRange}}", escapeHTML(item.wantedRange)).replace("{{parentDependencies}}", item.parents.map((parent) => {
+				return `${escapeHTML(parent.name)}@${parent.version}`;
 			}).join(", "));
 		});
 	}).join("\n"));
@@ -447,12 +448,12 @@ async function getSecurityAudit(program) {
 	const auditTable = tableTemplate.replace("{{tableRows}}", Object.entries(securityAudit.advisories).toSorted(sortBy(([_, advisory]) => {
 		return severityOrder[advisory.severity];
 	}, "desc")).map(([id, data]) => {
-		return tableRowTemplate.replace("{{advisoryId}}", id).replace("{{severity}}", data.severity).replace("{{packageName}}", data.module_name).replace("{{title}}", data.title).replace("{{affected}}", data.vulnerable_versions).replace("{{patched}}", data.patched_versions).replace("{{url}}", data.url);
+		return tableRowTemplate.replace("{{advisoryId}}", escapeHTML(id)).replace("{{severity}}", escapeHTML(data.severity)).replace("{{packageName}}", escapeHTML(data.module_name)).replace("{{title}}", escapeHTML(data.title)).replace("{{affected}}", escapeHTML(data.vulnerable_versions)).replace("{{patched}}", escapeHTML(data.patched_versions)).replace("{{url}}", escapeHTML(data.url));
 	}).join("\n"));
 	return normaliseIndents`
     ### Summary
     
-    ${(await readFile(path.join(auditTemplatesPath, "summary.html"), "utf-8")).replace("{{info}}", securityAudit.metadata.vulnerabilities.info.toString()).replace("{{low}}", securityAudit.metadata.vulnerabilities.low.toString()).replace("{{moderate}}", securityAudit.metadata.vulnerabilities.moderate.toString()).replace("{{high}}", securityAudit.metadata.vulnerabilities.high.toString()).replace("{{critical}}", securityAudit.metadata.vulnerabilities.critical.toString())}
+    ${(await readFile(path.join(auditTemplatesPath, "summary.html"), "utf-8")).replace("{{info}}", escapeHTML(securityAudit.metadata.vulnerabilities.info.toString())).replace("{{low}}", escapeHTML(securityAudit.metadata.vulnerabilities.low.toString())).replace("{{moderate}}", escapeHTML(securityAudit.metadata.vulnerabilities.moderate.toString())).replace("{{high}}", escapeHTML(securityAudit.metadata.vulnerabilities.high.toString())).replace("{{critical}}", escapeHTML(securityAudit.metadata.vulnerabilities.critical.toString()))}
 
     ### Audit Results
 
@@ -1391,7 +1392,7 @@ function template(program) {
 //#endregion
 //#region package.json
 var name = "alex-c-line";
-var version$1 = "2.10.0";
+var version$1 = "2.10.1";
 var description = "Command-line tool with commands to streamline the developer workflow.";
 //#endregion
 //#region src/utility/updates/checkUpdate.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alex-c-line",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "description": "Command-line tool with commands to streamline the developer workflow.",
   "repository": {
     "type": "git",
@@ -34,7 +34,7 @@
     "templates"
   ],
   "dependencies": {
-    "@alextheman/utility": "5.21.0",
+    "@alextheman/utility": "5.22.0",
     "@inquirer/prompts": "8.5.2",
     "axios": "1.17.0",
     "boxen": "8.0.1",