Skip to content

Extract common run npm command logic in NodeModulesNode #886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 27, 2016
Merged

Extract common run npm command logic in NodeModulesNode #886

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7a26c7
Extract duplicate NodeModulesNode run npm command logic.
mjbvz Apr 25, 2016
516401a
Remove some async usage
mjbvz Apr 25, 2016
ab31365
Merge branch 'master' into extract-common-RunNpmCommand
mjbvz Jul 20, 2016
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
107 changes: 39 additions & 68 deletions Nodejs/Product/Nodejs/Project/NodeModulesNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,11 +521,11 @@ private bool CheckValidCommandTarget(DependencyNode node) {
return true;
}

public async System.Threading.Tasks.Task InstallMissingModules() {
private async System.Threading.Tasks.Task RunNpmCommand(Func<INpmCommander, System.Threading.Tasks.Task> impl) {
DoPreCommandActions();
try {
using (var commander = NpmController.CreateNpmCommander()) {
await commander.Install();
await impl(commander);
}
} catch (NpmNotFoundException nnfe) {
ErrorHelper.ReportNpmNotInstalled(null, nnfe);
Expand All @@ -534,6 +534,10 @@ public async System.Threading.Tasks.Task InstallMissingModules() {
}
}

public System.Threading.Tasks.Task InstallMissingModules() {
return RunNpmCommand(commander => commander.Install());
}

public async System.Threading.Tasks.Task InstallMissingModule(DependencyNode node) {
if (!CheckValidCommandTarget(node)) {
return;
Expand All @@ -552,41 +556,27 @@ public async System.Threading.Tasks.Task InstallMissingModule(DependencyNode nod
var package = node.Package;
var dep = root.PackageJson.AllDependencies[package.Name];

DoPreCommandActions();
try {
using (var commander = NpmController.CreateNpmCommander()) {
await commander.InstallPackageByVersionAsync(
package.Name,
null == dep ? "*" : dep.VersionRangeText,
DependencyType.Standard,
false);
}
} catch (NpmNotFoundException nnfe) {
ErrorHelper.ReportNpmNotInstalled(null, nnfe);
} finally {
AllowCommands();
}
}

internal async System.Threading.Tasks.Task UpdateModules(IList<HierarchyNode> nodes) {
DoPreCommandActions();
try {
using (var commander = NpmController.CreateNpmCommander()) {
if (nodes.Count == 1 && nodes[0] == this) {
await commander.UpdatePackagesAsync();
} else {
var valid = nodes.OfType<DependencyNode>().Where(CheckValidCommandTarget).ToList();
var list = valid.Select(node => node.Package).ToList();
if (list.Count > 0) {
await commander.UpdatePackagesAsync(list);
}
await RunNpmCommand(async commander => {
await commander.InstallPackageByVersionAsync(
package.Name,
null == dep ? "*" : dep.VersionRangeText,
DependencyType.Standard,
false);
});
}

internal System.Threading.Tasks.Task UpdateModules(IList<HierarchyNode> nodes) {
return RunNpmCommand(async commander => {
if (nodes.Count == 1 && nodes[0] == this) {
await commander.UpdatePackagesAsync();
} else {
var valid = nodes.OfType<DependencyNode>().Where(CheckValidCommandTarget).ToList();
var list = valid.Select(node => node.Package).ToList();
if (list.Count > 0) {
await commander.UpdatePackagesAsync(list);
}
}
} catch (NpmNotFoundException nnfe) {
ErrorHelper.ReportNpmNotInstalled(null, nnfe);
} finally {
AllowCommands();
}
});
}

public void UpdateModules() {
Expand All @@ -597,48 +587,29 @@ public async System.Threading.Tasks.Task UpdateModule(DependencyNode node) {
if (!CheckValidCommandTarget(node)) {
return;
}
DoPreCommandActions();
try {
using (var commander = NpmController.CreateNpmCommander()) {
await commander.UpdatePackagesAsync(new[] { node.Package });
}
} catch (NpmNotFoundException nnfe) {
ErrorHelper.ReportNpmNotInstalled(null, nnfe);
} finally {
AllowCommands();
}
await RunNpmCommand(async commander => {
await commander.UpdatePackagesAsync(new[] { node.Package });
});
}

public async System.Threading.Tasks.Task UninstallModules() {
DoPreCommandActions();
try {
var selected = _projectNode.GetSelectedNodes();
using (var commander = NpmController.CreateNpmCommander()) {
foreach (var node in selected.OfType<DependencyNode>().Where(CheckValidCommandTarget)) {
await commander.UninstallPackageAsync(node.Package.Name);
}

public System.Threading.Tasks.Task UninstallModules() {
var selected = _projectNode.GetSelectedNodes();
return RunNpmCommand(async commander => {
foreach (var node in selected.OfType<DependencyNode>().Where(CheckValidCommandTarget)) {
await commander.UninstallPackageAsync(node.Package.Name);
}
} catch (NpmNotFoundException nnfe) {
ErrorHelper.ReportNpmNotInstalled(null, nnfe);
} finally {
AllowCommands();
}
});
}

public async System.Threading.Tasks.Task UninstallModule(DependencyNode node) {
if (!CheckValidCommandTarget(node)) {
return;
}
DoPreCommandActions();
try {
using (var commander = NpmController.CreateNpmCommander()) {
await commander.UninstallPackageAsync(node.Package.Name);
}
} catch (NpmNotFoundException nnfe) {
ErrorHelper.ReportNpmNotInstalled(null, nnfe);
} finally {
AllowCommands();
}

await RunNpmCommand(async commander => {
await commander.UninstallPackageAsync(node.Package.Name);
});
}

#endregion
Expand Down