fix: update dep tree and remove version from dep name (#16)

* fix: update dep tree and remove version from dep name

* feat: fix dep tree 'from'

Author: aryehbeitz

lib/formats/dotnet-cli-parser.js

@@ -17,11 +17,10 @@ function collectFlatList(targetObj) {
 }
 
 function registerDependency(packageTree, resolvedName) {
-  var version = resolvedName.split('@')[1];
   var name = resolvedName.split('@')[0];
-  var dependency = new Dependecy(name, version);
-  packageTree.dependencies[resolvedName] =
-    packageTree.dependencies[resolvedName] || dependency;
+  var version = resolvedName.split('@')[1];
+  packageTree.dependencies[name] =
+    packageTree.dependencies[name] || new Dependecy(name, version);
   debug(resolvedName);
 }
 
@@ -45,19 +44,18 @@ function parse(fileContent, packageTree) {
 
     Object.keys(targetObj).forEach(function (key) {
       var resolvedName = convertFromPathSyntax(key);
-      var dependency = packageTree.dependencies[resolvedName];
+      var depName = resolvedName.split('@')[0];
+      var dependency = packageTree.dependencies[depName];
       var depManifest = targetObj[key];
       Object.keys(depManifest.dependencies || {}).forEach(function (key) {
         try {
           var version = depManifest.dependencies[key];
           var lookup = key + '@' + version;
-          packageTree.dependencies[key] =
-            packageTree.dependencies[key] || new Dependecy(key, version);
           if (lookup.toLowerCase().indexOf('system.') === 0) {
             // skip system packages in tree
             return;
           }
-          dependency.dependencies[key] = packageTree.dependencies[key];
+          dependency.dependencies[key] = new Dependecy(key, version);
         }
         catch (err) {
           console.log(err);
@@ -72,11 +70,13 @@ 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

test/parse-dotnet-cli-2.test.js

@@ -0,0 +1,22 @@
+var test = require('tap').test;
+var plugin = require('../lib/index');
+var projectPath = './test/stubs/dotnet_project/';
+var manifestFile = projectPath + 'obj/project.assets.json';
+var expectedTree = require('./stubs/dotnet_project/expected.json');
+
+test('parse dotnet-cli 2 project and traverse packages', function (t) {
+  plugin.inspect(
+    projectPath,
+    manifestFile)
+    .then(function (result) {
+      t.deepEqual(
+        result,
+        expectedTree,
+        'expects project data to be correct'
+      );
+      t.end();
+    })
+    .catch(function (error) {
+      t.fail('Error was thrown: ' + err);
+    });
+});