feat: dont include from arrays in tree

Author: orsagie

lib/dependency.js

@@ -5,7 +5,6 @@ function Dependency(name, version) {
   this.version = version;
   this.dependencies = {};
   this.versionSpec = 'unknown';
-  this.from = [];
 }
 
 Dependency.prototype.cloneShallow = function () {

lib/formats/dotnet-core-parser.js

@@ -1,4 +1,4 @@
-var Dependecy = require('../dependency');
+var Dependency = require('../dependency');
 var debug = require('debug')('snyk');
 
 function convertFromPathSyntax(path) {
@@ -20,7 +20,7 @@ function registerDependency(packageTree, resolvedName) {
   var name = resolvedName.split('@')[0];
   var version = resolvedName.split('@')[1];
   packageTree.dependencies[name] =
-    packageTree.dependencies[name] || new Dependecy(name, version);
+    packageTree.dependencies[name] || new Dependency(name, version);
   debug(resolvedName);
 }
 
@@ -29,7 +29,6 @@ function parse(fileContent, packageTree) {
   var manifest = JSON.parse(fileContent);
   if (manifest.project) {
     packageTree.version = manifest.project.version;
-    packageTree.from[0] = packageTree.name + '@' + packageTree.version;
   }
   var targets = Object
     .keys(manifest.targets)
@@ -63,9 +62,9 @@ function parse(fileContent, packageTree) {
           // even within the subtree
           if (packageTree.dependencies[key]) {
             dependency.dependencies[key] =
-              new Dependecy(key, packageTree.dependencies[key].version);
+              new Dependency(key, packageTree.dependencies[key].version);
           } else {
-            dependency.dependencies[key] = new Dependecy(key, version);
+            dependency.dependencies[key] = new Dependency(key, version);
           }
         }
         catch (err) {
@@ -75,27 +74,10 @@ function parse(fileContent, packageTree) {
     })
   });
 
-  // restructure tree with "from" chains.
-  function buildPath(node, from) {
-
-    node.from = node.from.concat(from);
-    Object.keys(node.dependencies).forEach(function (key) {
-      var depFrom = node.from.concat(node.name + '@' + node.version);
-      buildPath(node.dependencies[key], depFrom);
-    });
-    node.from = node.from.concat(node.name + '@' + node.version);
-  }
-
   // to disconnect the object references inside the tree
   // JSON parse/stringify is used
   var pathedTree = JSON.parse(JSON.stringify(packageTree.dependencies));
-
-  Object.keys(pathedTree).forEach(function (key) {
-    buildPath(pathedTree[key], [packageTree.name + '@' + packageTree.version]);
-  });
-
   packageTree.dependencies = pathedTree;
 }
 
-
 module.exports = parse;

lib/index.js

@@ -1,8 +1,7 @@
 var fs = require('fs');
 var parseXML = require('xml2js').parseString;
 var Promise = require('es6-promise').Promise;
-var Dependecy = require('./dependency');
-var findFolder = require('./find-folder');
+var Dependency = require('./dependency');
 var path = require('path');
 var parseNuspec = require('./nuspec-parser');
 var jsonManifestParser = require('./json-manifest-parser');
@@ -57,7 +56,6 @@ module.exports = {
           name: path.basename(root || projectRootFolder),
           version: '0.0.0',
           packageFormatVersion: 'nuget:0.0.0',
-          from: [path.basename(root || projectRootFolder) + '@0.0.0'],
           dependencies: {},
         },
         plugin: {
@@ -85,7 +83,7 @@ module.exports = {
             for (var name in rawDependencies) {
               // Array<{ "libraryName": "version" }>
               var version = rawDependencies[name];
-              var newDependency = new Dependecy(name, version, null);
+              var newDependency = new Dependency(name, version, null);
               if (newDependency.name.indexOf('System.') !== 0) {
                 installedPackages.push(newDependency);
               }
@@ -108,7 +106,7 @@ module.exports = {
                   if (node.$.id.indexOf('System.') !== 0) {
                     // include only non-system libraries
                     var installedDependency =
-                      Dependecy.from.packgesConfigEntry(node);
+                      Dependency.from.packgesConfigEntry(node);
                     installedPackages.push(installedDependency);
                   }
                 });
@@ -136,7 +134,7 @@ module.exports = {
               return name.slice(0, 7).toLowerCase() !== 'system.';
             })
             .map(function (folderName) {
-              return Dependecy.from.folderName(folderName);
+              return Dependency.from.folderName(folderName);
             })
             .forEach(function (dep) {
               injectPath(dep, packagesFolder);
@@ -192,8 +190,6 @@ module.exports = {
       // now the flat list should be rebuilt as a tree
       debug('Building dependency tree');
       function buildTree(node, requiredChildren, repository) {
-        var resolutionName = node.name + '@' + node.version;
-        node.from = node.from.concat(resolutionName);
         requiredChildren.forEach(function (requiredChild) {
           var transitiveDependency;
           if (flattendPackageList[requiredChild.name]) {
@@ -204,12 +200,11 @@ module.exports = {
               requiredChild.versionSpec || transitiveDependency.versionSpec;
           } else {
             // create as new (uninstalled)
-            transitiveDependency = new Dependecy(
+            transitiveDependency = new Dependency(
               requiredChild.name,
               requiredChild.version);
             transitiveDependency.versionSpec = requiredChild.version;
           }
-          transitiveDependency.from = node.from.concat();
           var transitiveChildren =
             (nuspecResolutions[transitiveDependency.name] &&
              nuspecResolutions[transitiveDependency.name].children) || [];
@@ -231,7 +226,6 @@ module.exports = {
         for (var key in nuspecResolutions) {
           var resolution = nuspecResolutions[key];
           var node = flattendPackageList[resolution.name].cloneShallow();
-          node.from = tree.from.concat();
           buildTree(node, resolution.children, flattendPackageList);
           tree.dependencies[node.name] = node;
         }

test/parse-without-traverse.test.js

@@ -12,7 +12,6 @@ function createEmptyNode(name, version) {
     name + '.' + version);
   return {
     name: name,
-    from: [],
     version: version,
     versionSpec: 'unknown',
     dependencies: {},