feat: take name

snyk · Sep 13, 2018 · 6ccbebb · 6ccbebb
1 parent 88c70ec
commit 6ccbebb
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 5 deletions.
diff --git a/lib/parsers/index.ts b/lib/parsers/index.ts
@@ -60,10 +60,20 @@ export async function getDependencyTreeFromPackageReference(manifestFile, includ
   const packageList = _.get(manifestFile, 'Project.ItemGroup', [])
     .find((itemGroup) => _.has(itemGroup, 'PackageReference'));
 
+  const nameProperty = _.get(manifestFile, 'Project.PropertyGroup', [])
+    .find((propertyGroup) => {
+      return _.has(propertyGroup, 'PackageId')
+      || _.has(propertyGroup, 'AssemblyName');
+    }) || {};
+
+  const name = (nameProperty.PackageId && nameProperty.PackageId[0])
+    || (nameProperty.AssemblyName && nameProperty.AssemblyName[0])
+    || '';
+
   const depTree: PkgTree = {
     dependencies: {},
     hasDevDependencies: false,
-    name: '',
+    name,
     version: '',
   };
 

diff --git a/test/fixtures/dotnet-core-simple-project/expected-tree.json b/test/fixtures/dotnet-core-simple-project/expected-tree.json
@@ -1,5 +1,5 @@
 {
-  "name": "",
+  "name": "Simple-Project-Name",
   "version": "",
   "hasDevDependencies": false,
   "dependencies": {

diff --git a/test/fixtures/dotnet-core-simple-project/simple-project.csproj b/test/fixtures/dotnet-core-simple-project/simple-project.csproj
@@ -3,6 +3,7 @@
     <TargetFramework>netcoreapp1.1</TargetFramework>
     <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
     <UserSecretsId>aspnet-simple_project-2905A172-2378-4427-901F-971E0933141A</UserSecretsId>
+    <AssemblyName>Simple-Project-Name</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <None Update="app.db" CopyToOutputDirectory="PreserveNewest" />
@@ -28,4 +29,4 @@
     <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="1.0.1" />
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.3" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/test/fixtures/dotnet-simple-project-with-devDeps/expected-tree-from-csproj-without-dev.json b/test/fixtures/dotnet-simple-project-with-devDeps/expected-tree-from-csproj-without-dev.json
@@ -0,0 +1,13 @@
+{
+  "name": "simple-project-with-dev",
+  "version": "",
+  "hasDevDependencies": true,
+  "dependencies": {
+    "NLog": {
+      "name": "NLog",
+      "version": "4.3.10",
+      "depType": "prod",
+      "dependencies": {}
+    }
+  }
+}
diff --git a/test/fixtures/dotnet-simple-project-with-devDeps/expected-tree-from-csproj.json b/test/fixtures/dotnet-simple-project-with-devDeps/expected-tree-from-csproj.json
@@ -0,0 +1,19 @@
+{
+  "name": "simple-project-with-dev",
+  "version": "",
+  "hasDevDependencies": true,
+  "dependencies": {
+    "jQuery": {
+      "name": "jQuery",
+      "version": "3.1.1",
+      "depType": "dev",
+      "dependencies": {}
+    },
+    "NLog": {
+      "name": "NLog",
+      "version": "4.3.10",
+      "depType": "prod",
+      "dependencies": {}
+    }
+  }
+}
diff --git a/test/fixtures/dotnet-simple-project-with-devDeps/simple-project-with-dev.csproj b/test/fixtures/dotnet-simple-project-with-devDeps/simple-project-with-dev.csproj
@@ -1,4 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
+  <PropertyGroup>
+    <PackageId>simple-project-with-dev</PackageId>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="jQuery" Version="3.1.1" developmentDependency="true" />
     <PackageReference Include="NLog" Version="4.3.10" />

diff --git a/test/lib/index.ts b/test/lib/index.ts
@@ -130,7 +130,7 @@ test('.Net dotnet-simple-project-with-devDeps tree generated as expected', async
     `${__dirname}/../fixtures/dotnet-simple-project-with-devDeps`,
     'simple-project-with-dev.csproj',
     includeDev);
-  const expectedTree = load('dotnet-simple-project-with-devDeps/expected-tree-without-dev.json');
+  const expectedTree = load('dotnet-simple-project-with-devDeps/expected-tree-from-csproj-without-dev.json');
   t.deepEqual(tree, expectedTree, 'trees are equal');
 });
 
@@ -140,6 +140,6 @@ test('.Net dotnet-simple-project-with-devDeps tree generated as expected', async
     `${__dirname}/../fixtures/dotnet-simple-project-with-devDeps`,
     'simple-project-with-dev.csproj',
     includeDev);
-  const expectedTree = load('dotnet-simple-project-with-devDeps/expected-tree.json');
+  const expectedTree = load('dotnet-simple-project-with-devDeps/expected-tree-from-csproj.json');
   t.deepEqual(tree, expectedTree, 'trees are equal');
 });