feat(vis-network): use scanner extractors

Author: Raulo Erwan

package.json

@@ -99,7 +99,7 @@
     "@nodesecure/ossf-scorecard-sdk": "^3.2.1",
     "@nodesecure/rc": "^5.0.0",
     "@nodesecure/report": "4.1.0",
-    "@nodesecure/scanner": "8.1.0",
+    "@nodesecure/scanner": "8.2.0",
     "@nodesecure/server": "1.0.0",
     "@nodesecure/utils": "^2.2.0",
     "@nodesecure/vulnera": "^2.0.1",

workspaces/vis-network/src/dataset.js

@@ -1,4 +1,5 @@
 // Import Third-party Dependencies
+import { Extractors } from "@nodesecure/scanner/extractors";
 import prettyBytes from "pretty-bytes";
 import { DataSet } from "vis-data";
 
@@ -93,22 +94,33 @@ export default class NodeSecureDataSet extends EventTarget {
         return acc;
       }, { names: new Set(), emails: new Set() });
 
-    const dataEntries = Object.entries(data.dependencies);
-    this.dependenciesCount = dataEntries.length;
+    const dependencies = Object.entries(data.dependencies);
+    this.dependenciesCount = dependencies.length;
 
     this.rawEdgesData = [];
     this.rawNodesData = [];
 
-    const rootDependency = dataEntries.find(([name]) => name === data.rootDependency.name);
+    const rootDependency = dependencies.find(([name]) => name === data.rootDependency.name);
     const rootContributors = [
       rootDependency[1].metadata.author,
       ...rootDependency[1].metadata.maintainers,
       ...rootDependency[1].metadata.publishers
     ];
-    for (const [packageName, descriptor] of dataEntries) {
+
+    const extractor = new Extractors.Payload(data, [
+      // new Extractors.Probes.Licenses(),
+      //   new Extractors.Probes.Extensions()
+    ]);
+
+    // const result = extractor.extractAndMerge();
+
+    // this.extensions = extensions;
+    // this.licenses = licenses;
+
+    for (const [packageName, descriptor] of dependencies) {
       const contributors = [descriptor.metadata.author, ...descriptor.metadata.maintainers, ...descriptor.metadata.publishers];
       for (const [currVersion, opt] of Object.entries(descriptor.versions)) {
-        const { id, usedBy, flags, size, uniqueLicenseIds, author, composition, warnings, links } = opt;
+        const { id, usedBy, flags, size, author, warnings, links } = opt;
         const filteredWarnings = warnings
           .filter((row) => !this.warningsToIgnore.has(row.kind));
         const hasWarnings = filteredWarnings.length > 0;
@@ -118,8 +130,6 @@ export default class NodeSecureDataSet extends EventTarget {
         opt.hidden = false;
         opt.hasWarnings = hasWarnings;
 
-        this.computeExtension(composition.extensions);
-        this.computeLicense(uniqueLicenseIds);
         this.computeAuthor(author, `${packageName}@${currVersion}`, contributors);
 
         if (flags.includes("hasIndirectDependencies")) {
@@ -187,20 +197,6 @@ export default class NodeSecureDataSet extends EventTarget {
     return null;
   }
 
-  computeExtension(extensions) {
-    for (const extName of extensions) {
-      if (extName !== "") {
-        this.extensions[extName] = Reflect.has(this.extensions, extName) ? ++this.extensions[extName] : 1;
-      }
-    }
-  }
-
-  computeLicense(uniqueLicenseIds) {
-    for (const licenseName of uniqueLicenseIds) {
-      this.licenses[licenseName] = Reflect.has(this.licenses, licenseName) ? ++this.licenses[licenseName] : 1;
-    }
-  }
-
   computeAuthor(author, spec, contributors = []) {
     if (author === null) {
       return;

workspaces/vis-network/test/dataset-payload.json

@@ -64,7 +64,7 @@
           },
           "licenses": [],
           "uniqueLicenseIds": [
-            "Unlicense"
+            "MIT"
           ],
           "name": "pkg2",
           "version": "1.0.3"
@@ -87,7 +87,7 @@
           },
           "licenses": [],
           "uniqueLicenseIds": [
-            "Unlicense"
+            "MIT"
           ],
           "name": "pkg2",
           "version": "1.0.4"
@@ -127,7 +127,7 @@
           },
           "licenses": [],
           "uniqueLicenseIds": [
-            "Licence1"
+            "RND"
           ]
         }
       }
@@ -149,7 +149,8 @@
           ],
           "size": 200,
           "author": {
-            "name": "john doe"
+            "name": "john doe",
+            "email": "[email protected]"
           },
           "composition": {
             "extensions": [

workspaces/vis-network/test/dataset.test.js

@@ -38,16 +38,6 @@ test("NodeSecureDataSet.prettySize", () => {
   assert.equal(nsDataSet.prettySize, "1.34 kB", "should convert bytes to human readable string");
 });
 
-test("NodeSecureDataSet.computeExtensions", () => {
-  const nsDataSet = new NodeSecureDataSet();
-  assert.equal(Object.keys(nsDataSet.extensions).length, 0, "should have 0 extensions");
-
-  nsDataSet.computeExtension([".js", ".js", ".json"]);
-
-  assert.equal(Object.keys(nsDataSet.extensions).length, 2, "should have 2 extension (js and json)");
-  assert.equal(nsDataSet.extensions[".js"], 2, "should have 2 '.js' extensions'");
-});
-
 test("NodeSecureDataSet.isHighlighted", async() => {
   const nsDataSet = new NodeSecureDataSet();
   await nsDataSet.init(dataSetPayload);
@@ -63,13 +53,6 @@ test("NodeSecureDataSet.isHighlighted", async() => {
     "email: [email protected] should be hightlighted");
 });
 
-test("NodeSecureDataSet.computeLicenses", () => {
-  const nsDataSet = new NodeSecureDataSet();
-  nsDataSet.computeLicense(["MIT", "MIT", "RND"]);
-  assert.equal(Object.keys(nsDataSet.licenses).length, 3, "should have 3 licenses (MIT, RND & 1 unknown)");
-  assert.equal(nsDataSet.licenses.MIT, 2, "should have 2 MIT licenses");
-});
-
 test("NodeSecureDataSet.computeAuthors", () => {
   const nsDataSet = new NodeSecureDataSet();
   nsDataSet.computeAuthor({ name: "John Doe" }, "[email protected]");