refactor: use @nodesecure/utils & enhance author management

Author: fraxken

package-lock.json

@@ -76,7 +76,8 @@
     "@nodesecure/flags": "^1.2.0",
     "@nodesecure/i18n": "^1.2.0",
     "@nodesecure/npm-registry-sdk": "^1.3.0",
-    "@nodesecure/scanner": "^2.0.0",
+    "@nodesecure/scanner": "^2.0.1",
+    "@nodesecure/utils": "^1.0.0",
     "@nodesecure/vuln": "^1.4.0",
     "@polka/send-type": "^0.5.2",
     "@slimio/async-cli-spinner": "^0.5.2",

package.json

@@ -553,17 +553,7 @@ document.addEventListener("DOMContentLoaded", async() => {
     }
 
     function handleAuthor(author) {
-        if (typeof author === "undefined" || author === null) {
-            return;
-        }
-        let user = { name: null };
-
-        if (typeof author === "string") {
-            user = utils.parseAuthor(author);
-        }
-        else if (typeof author === "object" && typeof author.name === "string") {
-            user = author;
-        }
+        const user = "name" in author ? author : { name: null };
 
         if (authorsList.has(user.name)) {
             authorsList.get(user.name).count++;

public/js/master.js

@@ -1,7 +1,12 @@
-import * as utils from "./utils.js";
+// Import Third-party Dependencies
+import { locationToString } from "@nodesecure/utils";
 import List from "list.js";
 
-const loadingMessage = "Loading ...";
+// Import Internal Dependencies
+import * as utils from "./utils.js";
+
+// CONSTANTS
+const kLoadingMessage = "Loading ...";
 
 function licenseModal(clone, options) {
     const { licenses, selectedNode } = options;
@@ -21,13 +26,6 @@ function licenseModal(clone, options) {
     }
 }
 
-function locationToString(location) {
-    const start = `${location[0][0]}:${location[0][1]}`;
-    const end = `${location[1][0]}:${location[1][1]}`;
-
-    return `[${start}] - [${end}]`;
-}
-
 function getLineFromFile(code, location) {
     const [[startLine]] = location;
     const lines = code.split('\n');
@@ -45,7 +43,7 @@ async function fetchCodeLine(event, url, location, cache, lineId) {
         return;
     }
 
-    target.innerText = loadingMessage;
+    target.innerText = kLoadingMessage;
     const code = await fetch(url).then((response) => response.text());
 
     target.innerText = code.length ? getLineFromFile(code, location): "Line not found ...";
@@ -55,12 +53,12 @@ async function fetchCodeLine(event, url, location, cache, lineId) {
 
 function handleOutsideTooltipClick({ target }) {
     const tooltip = document.getElementById('tooltip');
-    
+
     if (!tooltip) {
         return;
     }
-    
-    if ((tooltip.innerHTML && tooltip.innerHTML !== loadingMessage) && !tooltip.contains(target) && tooltip.style.visibility === "visible") {
+
+    if ((tooltip.innerHTML && tooltip.innerHTML !== kLoadingMessage) && !tooltip.contains(target) && tooltip.style.visibility === "visible") {
         tooltip.style.visibility = "hidden";
         tooltip.innerHTML = "";
     }

public/js/popup.js

@@ -198,39 +198,6 @@ export async function getJSON(path, customHeaders = Object.create(null)) {
     return raw.json();
 }
 
-export function parseAuthor(str) {
-    if (typeof str !== "string") {
-        throw new TypeError("expected author to be a string");
-    }
-
-    if (!str || !/\w/.test(str)) {
-        return {};
-    }
-
-    const match = /^([^<(]+?)?[ \t]*(?:<([^>(]+?)>)?[ \t]*(?:\(([^)]+?)\)|$)/gm.exec(str);
-    if (!match) {
-        return {};
-    }
-    const author = Object.create(null);
-
-    if (match[1]) {
-        author.name = match[1];
-    }
-
-    for (let id = 2; id < match.length; id++) {
-        const val = match[id] || "";
-
-        if (val.includes("@")) {
-            author.email = val;
-        }
-        else if (val.includes("http")) {
-            author.url = val;
-        }
-    }
-
-    return author;
-}
-
 export function copyToClipboard(str) {
     const el = document.createElement('textarea');  // Create a <textarea> element
     el.value = str;                                 // Set its value to the string that you want copied

public/js/utils.js

@@ -6,9 +6,7 @@ import path from "path";
 import cliui from "cliui";
 import kleur from "kleur";
 import * as i18n from "@nodesecure/i18n";
-
-// Import Internal Dependencies
-import { formatBytes } from "../utils.js";
+import { formatBytes } from "@nodesecure/utils";
 
 // VARS
 const { yellow, gray, white, green, cyan, red } = kleur;

src/commands/summary.js

@@ -1,10 +1,8 @@
 // Import Third-party Dependencies
-import { verify } from "@nodesecure/scanner";
 import cliui from "cliui";
 import kleur from "kleur";
-
-// Import Internal Dependencies
-import { formatBytes, locationToString } from "../utils.js";
+import { verify } from "@nodesecure/scanner";
+import { formatBytes, locationToString } from "@nodesecure/utils";
 
 // VARS
 const { yellow, grey, white, green, cyan, red, magenta } = kleur;