Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions Nodejs/Product/Npm/IBugs.cs

This file was deleted.

3 changes: 0 additions & 3 deletions Nodejs/Product/Npm/IPackageJson.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,10 @@ namespace Microsoft.NodejsTools.Npm {
public interface IPackageJson {
string Name { get; }
SemverVersion Version { get; }
IScripts Scripts { get; }
IPerson Author { get; }
string Description { get; }
IKeywords Keywords { get; }
IHomepages Homepages { get; }
IBugs Bugs { get; }
ILicenses Licenses { get; }
IFiles Files { get; }
IMan Man { get; }
IDependencies Dependencies { get; }
Expand Down
22 changes: 0 additions & 22 deletions Nodejs/Product/Npm/IScript.cs

This file was deleted.

22 changes: 0 additions & 22 deletions Nodejs/Product/Npm/IScripts.cs

This file was deleted.

10 changes: 1 addition & 9 deletions Nodejs/Product/Npm/Npm.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Choose>
<When Condition=" '$(VisualStudioVersion)'=='15.0' Or '$(TargetVisualStudioVersion)'=='VS150' ">
Expand Down Expand Up @@ -114,7 +114,6 @@
<Compile Include="DependencyUrlType.cs" />
<Compile Include="DirectoryPackageJsonSource.cs" />
<Compile Include="FilePackageJsonSource.cs" />
<Compile Include="IBugs.cs" />
<Compile Include="IBundledDependencies.cs" />
<Compile Include="IDependencies.cs" />
<Compile Include="IDependency.cs" />
Expand All @@ -137,8 +136,6 @@
<Compile Include="IPerson.cs" />
<Compile Include="IPkgStringArray.cs" />
<Compile Include="IRootPackage.cs" />
<Compile Include="IScript.cs" />
<Compile Include="IScripts.cs" />
<Compile Include="..\Nodejs\Nodejs.cs">
<Link>Nodejs.cs</Link>
</Compile>
Expand Down Expand Up @@ -173,15 +170,12 @@
<Compile Include="SemverVersion.cs" />
<Compile Include="SemverVersionFormatException.cs" />
<Compile Include="SPI\AbstractNodeModules.cs" />
<Compile Include="SPI\Bugs.cs" />
<Compile Include="SPI\BundledDependencies.cs" />
<Compile Include="SPI\Dependencies.cs" />
<Compile Include="SPI\Dependency.cs" />
<Compile Include="SPI\DependencyUrl.cs" />
<Compile Include="SPI\GlobalPackages.cs" />
<Compile Include="SPI\Keywords.cs" />
<Compile Include="SPI\License.cs" />
<Compile Include="SPI\Licenses.cs" />
<Compile Include="SPI\Man.cs" />
<Compile Include="SPI\NodeModules.cs" />
<Compile Include="SPI\NodeModulesProxy.cs" />
Expand All @@ -200,8 +194,6 @@
<Compile Include="SPI\PkgStringArray.cs" />
<Compile Include="SPI\PkgFiles.cs" />
<Compile Include="SPI\RootPackage.cs" />
<Compile Include="SPI\Script.cs" />
<Compile Include="SPI\Scripts.cs" />
<Compile Include="SQLite\CatalogTables.cs" />
<Compile Include="SQLite\SQLite.cs" />
<Compile Include="SQLite\SQLiteAsync.cs" />
Expand Down
64 changes: 0 additions & 64 deletions Nodejs/Product/Npm/SPI/Bugs.cs

This file was deleted.

36 changes: 14 additions & 22 deletions Nodejs/Product/Npm/SPI/Dependencies.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,31 +21,24 @@

namespace Microsoft.NodejsTools.Npm.SPI {
internal class Dependencies : IDependencies {
private JObject _package;
private string[] _dependencyPropertyNames;
private IList<Dependency> _dependencyProperties;

public Dependencies(JObject package, params string[] dependencyPropertyNames) {
_package = package;
_dependencyPropertyNames = dependencyPropertyNames;
}

private IEnumerable<JObject> GetDependenciesProperties() {
foreach (var propertyName in _dependencyPropertyNames) {
var property = _package[propertyName] as JObject;
if (null != property) {
yield return property;
_dependencyProperties = new List<Dependency>();
foreach (var propertyName in dependencyPropertyNames) {
var dependencies = package[propertyName] as JObject;
if (dependencies != null) {
foreach (var property in dependencies.Properties()) {
if (property.Value.Type == JTokenType.String) {
_dependencyProperties.Add(new Dependency(property.Name, property.Value.Value<string>()));
}
}
}
}
}

public IEnumerator<IDependency> GetEnumerator() {
var dependencyProps = GetDependenciesProperties();
foreach (var dependencies in dependencyProps) {
var properties = null == dependencies ? new List<JProperty>() : dependencies.Properties();
foreach (var property in properties) {
yield return new Dependency(property.Name, property.Value.Value<string>());
}
}
return _dependencyProperties.GetEnumerator();
}

IEnumerator IEnumerable.GetEnumerator() {
Expand All @@ -58,10 +51,9 @@ public int Count {

public IDependency this[string name] {
get {
foreach (var dependencies in GetDependenciesProperties()) {
var property = dependencies[name];
if (null != property) {
return new Dependency(name, property.Value<string>());
foreach (var dependeny in _dependencyProperties) {
if (dependeny.Name == name) {
return dependeny;
}
}
return null;
Expand Down
31 changes: 0 additions & 31 deletions Nodejs/Product/Npm/SPI/License.cs

This file was deleted.

64 changes: 0 additions & 64 deletions Nodejs/Product/Npm/SPI/Licenses.cs

This file was deleted.

Loading