Added remove-proxy command.

docs/en/CLI.md

@@ -32,6 +32,7 @@ Here, the list of all available commands before explaining their details:
 * **`add-package`**: Adds an ABP package to a project.
 * **`add-module`**: Adds a [multi-package application module](https://docs.abp.io/en/abp/latest/Modules/Index) to a solution.
 * **`generate-proxy`**: Generates client side proxies to use HTTP API endpoints.
+* **`remove-proxy`**: Removes previously generated client side proxies.
 * **`switch-to-preview`**: Switches to the latest preview version of the ABP Framework.
 * **`switch-to-nightly`**: Switches to the latest [nightly builds](Nightly-Builds.md) of the ABP related packages on a solution.
 * **`switch-to-stable`**: Switches to the latest stable versions of the ABP related packages on a solution.
@@ -179,7 +180,7 @@ abp add-module Volo.Blogging
 
 ### generate-proxy
 
-Generates Angular service proxies for your HTTP APIs to make easy to consume your services from the client side. Before running `generate-proxy` command, your host must be up and running.
+Generates Angular service proxies for your HTTP APIs to make easy to consume your services from the client side. Your host (server) application must be up and running before running this command.
 
 Usage:
 
@@ -196,6 +197,26 @@ abp generate-proxy
 
 > See the [Angular Service Proxies document](UI/Angular/Service-Proxies.md) for more.
 
+### remove-proxy
+
+Removes previously generated proxy code from the Angular application. Your host (server) application must be up and running before running this command.
+
+This can be especially useful when you generate proxies for multiple modules before and need to remove one of them later.
+
+Usage:
+
+````bash
+abp remove-proxy
+````
+
+#### Options
+
+* `--module` or `-m`: Specifies the name of the backend module you wish to remove proxies for. Default value: `app`.
+* `--source` or `-s`: Specifies the Angular project name to resolve the root namespace & API definition URL from. Default value: `defaultProject`.
+* `--target` or `-t`: Specifies the Angular project name to place generated code in. Default value: `defaultProject`.
+* `--prompt` or `-p`: Asks the options from the command line prompt (for the unspecified options).
+
+> See the [Angular Service Proxies document](UI/Angular/Service-Proxies.md) for more.
 
 ### switch-to-preview
 

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs

@@ -20,6 +20,7 @@ namespace Volo.Abp.Cli
 
             Configure<AbpCliOptions>(options =>
             {
+                //TODO: Define constants like done for GenerateProxyCommand.Name.
                 options.Commands["help"] = typeof(HelpCommand);
                 options.Commands["new"] = typeof(NewCommand);
                 options.Commands["get-source"] = typeof(GetSourceCommand);
@@ -28,7 +29,8 @@ namespace Volo.Abp.Cli
                 options.Commands["add-module"] = typeof(AddModuleCommand);
                 options.Commands["login"] = typeof(LoginCommand);
                 options.Commands["logout"] = typeof(LogoutCommand);
-                options.Commands["generate-proxy"] = typeof(GenerateProxyCommand);
+                options.Commands[GenerateProxyCommand.Name] = typeof(GenerateProxyCommand);
+                options.Commands[RemoveProxyCommand.Name] = typeof(RemoveProxyCommand);
                 options.Commands["suite"] = typeof(SuiteCommand);
                 options.Commands["switch-to-preview"] = typeof(SwitchToPreviewCommand);
                 options.Commands["switch-to-stable"] = typeof(SwitchToStableCommand);

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GenerateProxyCommand.cs

@@ -1,140 +1,11 @@
-using System;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
-using Volo.Abp.Cli.Args;
-using Volo.Abp.Cli.Utils;
-using Volo.Abp.DependencyInjection;
-
 namespace Volo.Abp.Cli.Commands
 {
-    public class GenerateProxyCommand : IConsoleCommand, ITransientDependency
+    public class GenerateProxyCommand : ProxyCommandBase
     {
-        public Task ExecuteAsync(CommandLineArgs commandLineArgs)
-        {
-            CheckAngularJsonFile();
-            CheckNgSchematics();
-
-            var prompt = commandLineArgs.Options.ContainsKey("p") || commandLineArgs.Options.ContainsKey("prompt");
-            var defaultValue = prompt ? null : "__default";
-
-            var module = commandLineArgs.Options.GetOrNull(Options.Module.Short, Options.Module.Long) ?? defaultValue;
-            var source = commandLineArgs.Options.GetOrNull(Options.Source.Short, Options.Source.Long) ?? defaultValue;
-            var target = commandLineArgs.Options.GetOrNull(Options.Target.Short, Options.Target.Long) ?? defaultValue;
-
-            var commandBuilder = new StringBuilder("npx ng g @abp/ng.schematics:proxy");
-
-            if (module != null)
-            {
-                commandBuilder.Append($" --module {module}");
-            }
-
-            if (source != null)
-            {
-                commandBuilder.Append($" --source {source}");
-            }
-
-            if (target != null)
-            {
-                commandBuilder.Append($" --target {target}");
-            }
-
-            CmdHelper.RunCmd(commandBuilder.ToString());
-
-            return Task.CompletedTask;
-        }
-
-        private void CheckNgSchematics()
-        {
-            var packageJsonPath = $"package.json";
-
-            if (!File.Exists(packageJsonPath))
-            {
-                throw new CliUsageException(
-                    "package.json file not found" +
-                    Environment.NewLine +
-                    GetUsageInfo()
-                );
-            }
-
-            var schematicsPackageNode =
-                (string) JObject.Parse(File.ReadAllText(packageJsonPath))["devDependencies"]?["@abp/ng.schematics"];
-
-            if (schematicsPackageNode == null)
-            {
-                throw new CliUsageException(
-                    "\"@abp/ng.schematics\" NPM package should be installed to the devDependencies before running this command!" +
-                    Environment.NewLine +
-                    GetUsageInfo()
-                );
-            }
-        }
-
-        private void CheckAngularJsonFile()
-        {
-            var angularPath = $"angular.json";
-            if (!File.Exists(angularPath))
-            {
-                throw new CliUsageException(
-                    "angular.json file not found. You must run this command in the angular folder." +
-                    Environment.NewLine + Environment.NewLine +
-                    GetUsageInfo()
-                );
-            }
-        }
-
-        public string GetUsageInfo()
-        {
-            var sb = new StringBuilder();
-
-            sb.AppendLine("");
-            sb.AppendLine("Usage:");
-            sb.AppendLine("");
-            sb.AppendLine("  abp generate-proxy");
-            sb.AppendLine("");
-            sb.AppendLine("Options:");
-            sb.AppendLine("");
-            sb.AppendLine("-m|--module <module-name>          (default: 'app') The name of the backend module you wish to generate proxies for.");
-            sb.AppendLine("-s|--source <source-name>          (default: 'defaultProject') Angular project name to resolve the root namespace & API definition URL from.");
-            sb.AppendLine("-t|--target <target-name>          (default: 'defaultProject') Angular project name to place generated code in.");
-            sb.AppendLine("-p|--prompt                        Asks the options from the command line prompt (for the missing options)");
-            sb.AppendLine("");
-            sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
-
-            return sb.ToString();
-        }
-
-        public string GetShortDescription()
-        {
-            return "Generates Angular service proxies and DTOs to consume HTTP APIs.";
-        }
-
-        public static class Options
-        {
-            public static class Module
-            {
-                public const string Short = "m";
-                public const string Long = "module";
-            }
-
-            public static class Source
-            {
-                public const string Short = "s";
-                public const string Long = "source";
-            }
+        public const string Name = "generate-proxy";
 
-            public static class Target
-            {
-                public const string Short = "t";
-                public const string Long = "target";
-            }
+        protected override string CommandName => Name;
 
-            public static class Prompt
-            {
-                public const string Short = "p";
-                public const string Long = "prompt";
-            }
-        }
+        protected override string SchematicsCommandName => "proxy-add";
     }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProxyCommandBase.cs

@@ -0,0 +1,144 @@
+using System;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using Volo.Abp.Cli.Args;
+using Volo.Abp.Cli.Utils;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Cli.Commands
+{
+    public abstract class ProxyCommandBase : IConsoleCommand, ITransientDependency
+    {
+        protected abstract string CommandName { get; }
+
+        protected abstract string SchematicsCommandName { get; }
+
+        public Task ExecuteAsync(CommandLineArgs commandLineArgs)
+        {
+            CheckAngularJsonFile();
+            CheckNgSchematics();
+
+            var prompt = commandLineArgs.Options.ContainsKey("p") || commandLineArgs.Options.ContainsKey("prompt");
+            var defaultValue = prompt ? null : "__default";
+
+            var module = commandLineArgs.Options.GetOrNull(Options.Module.Short, Options.Module.Long) ?? defaultValue;
+            var source = commandLineArgs.Options.GetOrNull(Options.Source.Short, Options.Source.Long) ?? defaultValue;
+            var target = commandLineArgs.Options.GetOrNull(Options.Target.Short, Options.Target.Long) ?? defaultValue;
+
+            var commandBuilder = new StringBuilder("npx ng g @abp/ng.schematics:" + SchematicsCommandName);
+
+            if (module != null)
+            {
+                commandBuilder.Append($" --module {module}");
+            }
+
+            if (source != null)
+            {
+                commandBuilder.Append($" --source {source}");
+            }
+
+            if (target != null)
+            {
+                commandBuilder.Append($" --target {target}");
+            }
+
+            CmdHelper.RunCmd(commandBuilder.ToString());
+
+            return Task.CompletedTask;
+        }
+
+        private void CheckNgSchematics()
+        {
+            var packageJsonPath = $"package.json";
+
+            if (!File.Exists(packageJsonPath))
+            {
+                throw new CliUsageException(
+                    "package.json file not found" +
+                    Environment.NewLine +
+                    GetUsageInfo()
+                );
+            }
+
+            var schematicsPackageNode =
+                (string) JObject.Parse(File.ReadAllText(packageJsonPath))["devDependencies"]?["@abp/ng.schematics"];
+
+            if (schematicsPackageNode == null)
+            {
+                throw new CliUsageException(
+                    "\"@abp/ng.schematics\" NPM package should be installed to the devDependencies before running this command!" +
+                    Environment.NewLine +
+                    GetUsageInfo()
+                );
+            }
+        }
+
+        private void CheckAngularJsonFile()
+        {
+            var angularPath = $"angular.json";
+            if (!File.Exists(angularPath))
+            {
+                throw new CliUsageException(
+                    "angular.json file not found. You must run this command in the angular folder." +
+                    Environment.NewLine + Environment.NewLine +
+                    GetUsageInfo()
+                );
+            }
+        }
+
+        public string GetUsageInfo()
+        {
+            var sb = new StringBuilder();
+
+            sb.AppendLine("");
+            sb.AppendLine("Usage:");
+            sb.AppendLine("");
+            sb.AppendLine($"  abp {CommandName}");
+            sb.AppendLine("");
+            sb.AppendLine("Options:");
+            sb.AppendLine("");
+            sb.AppendLine("-m|--module <module-name>          (default: 'app') The name of the backend module you wish to generate proxies for.");
+            sb.AppendLine("-s|--source <source-name>          (default: 'defaultProject') Angular project name to resolve the root namespace & API definition URL from.");
+            sb.AppendLine("-t|--target <target-name>          (default: 'defaultProject') Angular project name to place generated code in.");
+            sb.AppendLine("-p|--prompt                        Asks the options from the command line prompt (for the missing options)");
+            sb.AppendLine("");
+            sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
+
+            return sb.ToString();
+        }
+
+        public string GetShortDescription()
+        {
+            return "Generates Angular service proxies and DTOs to consume HTTP APIs.";
+        }
+
+        public static class Options
+        {
+            public static class Module
+            {
+                public const string Short = "m";
+                public const string Long = "module";
+            }
+
+            public static class Source
+            {
+                public const string Short = "s";
+                public const string Long = "source";
+            }
+
+            public static class Target
+            {
+                public const string Short = "t";
+                public const string Long = "target";
+            }
+
+            public static class Prompt
+            {
+                public const string Short = "p";
+                public const string Long = "prompt";
+            }
+        }
+    }
+}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/RemoveProxyCommand.cs

@@ -0,0 +1,11 @@
+namespace Volo.Abp.Cli.Commands
+{
+    public class RemoveProxyCommand : ProxyCommandBase
+    {
+        public const string Name = "remove-proxy";
+
+        protected override string CommandName => Name;
+
+        protected override string SchematicsCommandName => "proxy-remove";
+    }
+}