types' basetype properties removed

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

@@ -12,11 +12,13 @@ using Volo.Abp.Cli.ProjectBuilding.Building;
 using Volo.Abp.DependencyInjection;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 
 namespace Volo.Abp.Cli.Commands
 {
     public class GenerateProxyCommand : IConsoleCommand, ITransientDependency
     {
+        public static Dictionary<string, Dictionary<string, string>> propertyList = new Dictionary<string, Dictionary<string, string>>();
         public ILogger<GenerateProxyCommand> Logger { get; set; }
 
         protected TemplateProjectBuilder TemplateProjectBuilder { get; }
@@ -30,13 +32,34 @@ namespace Volo.Abp.Cli.Commands
 
         public async Task ExecuteAsync(CommandLineArgs commandLineArgs)
         {
+            var angularPath = $"angular.json";
+            if (!File.Exists(angularPath))
+            {
+                throw new CliUsageException(
+                           "angular.json file not found. You must run this command in angular folder." +
+                           Environment.NewLine + Environment.NewLine +
+                           GetUsageInfo()
+                       );
+            }
+
+            var module = commandLineArgs.Options.GetOrNull(Options.Module.Short, Options.Module.Long);
+            module = module == null ? "app" : module.ToLower();
+
             var apiUrl = commandLineArgs.Options.GetOrNull(Options.ApiUrl.Short, Options.ApiUrl.Long);
+            if (string.IsNullOrWhiteSpace(apiUrl))
+            {
+                var environmentJson = File.ReadAllText("src/environments/environment.ts").Split("export const environment = ")[1].Replace(";", " ");
+                var environment = JObject.Parse(environmentJson);
+                apiUrl = environment["apis"]["default"]["url"].ToString();
+            }
+            apiUrl += "/api/abp/api-definition?IncludeTypes=true";
+
             var uiFramework = GetUiFramework(commandLineArgs);
 
-            //WebClient client = new WebClient();
+            WebClient client = new WebClient();
-            //string json = client.DownloadString(apiUrl);
+            string json = client.DownloadString(apiUrl);
-            var sr = File.OpenText("api-definition.json");
+            //var sr = File.OpenText("api-definition.json");
-            var json = sr.ReadToEnd();
+            //var json = sr.ReadToEnd();
 
             Logger.LogInformation("Downloading api definition...");
             Logger.LogInformation("Api Url: " + apiUrl);
@@ -44,15 +67,24 @@ namespace Volo.Abp.Cli.Commands
             var data = JObject.Parse(json);
 
             Logger.LogInformation("Modules are combining");
-            var moduleList = GetCombinedModules(data);
+            var moduleList = GetCombinedModules(data, module);
+
+            if (moduleList.Count < 1)
+            {
+                throw new CliUsageException(
+                        "Module can not find!" +
+                        Environment.NewLine + Environment.NewLine +
+                        GetUsageInfo()
+                    );
+            }
 
             Logger.LogInformation("Modules and types are creating");
 
-            foreach (var module in moduleList)
+            foreach (var moduleItem in moduleList)
             {
-                var moduleValue = JObject.Parse(module.Value);
+                var moduleValue = JObject.Parse(moduleItem.Value);
 
-                var rootPath = module.Key;
+                var rootPath = moduleItem.Key;
 
                 Logger.LogInformation($"{rootPath} directory is creating");
 
@@ -111,7 +143,6 @@ namespace Volo.Abp.Cli.Commands
                             var isOptional = (bool)parameter["isOptional"];
                             var defaultValue = (string)parameter["defaultValue"];
 
-
                             var modelIndex = CreateType(data, (string)parameter["type"], rootPath, modelIndexList);
 
                             if (!string.IsNullOrWhiteSpace(modelIndex))
@@ -311,25 +342,31 @@ namespace Volo.Abp.Cli.Commands
             }
         }
 
-        private Dictionary<string, string> GetCombinedModules(JToken data)
+        private Dictionary<string, string> GetCombinedModules(JToken data, string module)
         {
             var moduleList = new Dictionary<string, string>();
-            foreach (var module in data["modules"])
+
+            foreach (var moduleItem in data["modules"])
             {
-                var rootPath = ((string)module.First["rootPath"]).ToLower();
+                var rootPath = ((string)moduleItem.First["rootPath"]).ToLower();
 
                 if (moduleList.Any(p => p.Key == rootPath))
                 {
                     var value = moduleList[rootPath];
 
-                    moduleList[rootPath] = value.TrimEnd('}') + "," + module.First["controllers"].ToString().TrimStart('{');
+                    moduleList[rootPath] = value.TrimEnd('}') + "," + moduleItem.First["controllers"].ToString().TrimStart('{');
                 }
                 else
                 {
-                    moduleList.Add(rootPath, module.First["controllers"].ToString());
+                    moduleList.Add(rootPath, moduleItem.First["controllers"].ToString());
                 }
             }
 
+            if (module != "all")
+            {
+                moduleList = moduleList.Where(p => p.Key.ToLower() == module).ToDictionary(p => p.Key, s => s.Value);
+            }
+
             return moduleList;
         }
 
@@ -360,23 +397,22 @@ namespace Volo.Abp.Cli.Commands
             var typeModelName = typeName.Replace("<", "").Replace(">", "").PascalToKebabCase() + ".ts"; 
 
             var path = $"src/app/{rootPath}/shared/models/{typeModelName}"; 
-            if (File.Exists(path))
-            {
-                return null;
-            }
 
             var modelFileText = new StringBuilder();
 
             var baseType = (string)type["baseType"];
             var extends = "";
             var customBaseTypeName = "";
+            var baseTypeName = "";
 
-            if (!string.IsNullOrWhiteSpace(baseType) && baseType != "System.Enum")
+            if (!string.IsNullOrWhiteSpace(baseType))
             {
                 var baseTypeSplit = baseType.Split(".");
-                var baseTypeName = baseTypeSplit[baseTypeSplit.Length - 1].Replace("<", "").Replace(">", "");
+                baseTypeName = baseTypeSplit[baseTypeSplit.Length - 1].Replace("<", "").Replace(">", "");
                 var baseTypeKebabCase = "./" + baseTypeName.PascalToKebabCase();
 
+                if (baseType != "System.Enum")
+                {
                     if (baseType.Contains("Volo.Abp.Application.Dtos"))
                     {
                         baseTypeKebabCase = "@abp/ng.core";
@@ -399,6 +435,7 @@ namespace Volo.Abp.Cli.Commands
                         modelIndexList.Add(modelIndex);
                     } 
                 }
+            }
 
             if (baseType == "System.Enum" && (bool)type["isEnum"])
             {
@@ -422,22 +459,15 @@ namespace Volo.Abp.Cli.Commands
                 foreach (var property in type["properties"])
                 {
                     var propertyName = (string)property["name"];
-                    propertyName = (char.ToLower(propertyName[0]) + propertyName.Substring(1));
+                    if (propertyName == "RoleNames")
-
-                    var modelIndex = CreateType(data, (string)property["type"], rootPath, modelIndexList);
-
-                    if (!string.IsNullOrWhiteSpace(modelIndex))
                     {
-                        var propertyTypeSplit = ((string)property["type"]).Split(".");
-                        var propertyType = propertyTypeSplit[propertyTypeSplit.Length - 1];
-                        modelFileText.Insert(0,"");
-                        modelFileText.Insert(0, $"import {{ {propertyType} }} from '../models';");
-                        modelFileText.Insert(0, "");
-                        modelIndexList.Add(modelIndex);
-                    }
 
+                    }
+                    propertyName = (char.ToLower(propertyName[0]) + propertyName.Substring(1));
                     var typeSimple = (string)property["typeSimple"]; 
 
+                    var modelIndex = CreateType(data, (string)property["type"], rootPath, modelIndexList);
+
                     if (typeSimple.IndexOf("[") > -1 && typeSimple.IndexOf("]") > -1)
                     {
                         typeSimple = typeSimple.Replace("[", "").Replace("]", "") + "[]";
@@ -471,6 +501,32 @@ namespace Volo.Abp.Cli.Commands
                         typeSimple = "any" + (typeSimple.Contains("[]") ? "[]" : "");
                     }
 
+                    if (propertyList.Any(p => p.Key == baseTypeName && p.Value.Any(q => q.Key == propertyName && q.Value == typeSimple)))
+                    {
+                        continue;
+                    }
+
+                    if (!string.IsNullOrWhiteSpace(modelIndex))
+                    {
+                        var propertyTypeSplit = ((string)property["type"]).Split(".");
+                        var propertyType = propertyTypeSplit[propertyTypeSplit.Length - 1];
+                        modelFileText.Insert(0, "");
+                        modelFileText.Insert(0, $"import {{ {propertyType} }} from '../models';");
+                        modelFileText.Insert(0, "");
+                        modelIndexList.Add(modelIndex);
+                    }
+
+                    if (propertyList.Any(p => p.Key == typeName && !p.Value.Any(q => q.Key == propertyName)))
+                    {
+                        propertyList[typeName].Add(propertyName, typeSimple);
+                    }
+                    else if (!propertyList.Any(p => p.Key == typeName))
+                    {
+                        var newProperty = new Dictionary<string, string>();
+                        newProperty.Add(propertyName, typeSimple);
+                        propertyList.Add(typeName, newProperty);
+                    }
+
                     modelFileText.AppendLine($"  {propertyName}: {typeSimple};");
                 }
 
@@ -554,10 +610,11 @@ namespace Volo.Abp.Cli.Commands
             sb.AppendLine("Options:");
             sb.AppendLine("");
             sb.AppendLine("-u|--ui <ui-framework>               (default: angular)");
+            sb.AppendLine("-m|--module <module>               (default: app)");
             sb.AppendLine("");
             sb.AppendLine("Examples:");
             sb.AppendLine("");
-            sb.AppendLine("  abp new --apiUrl https://www.abp.io/api/abp/api-definition?types=true");
+            sb.AppendLine("  abp new --apiUrl https://www.abp.io");
             sb.AppendLine("");
             sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");
 
@@ -587,6 +644,12 @@ namespace Volo.Abp.Cli.Commands
 
         public static class Options
         {
+            public static class Module
+            {
+                public const string Short = "m";
+                public const string Long = "module";
+            }
+
             public static class ApiUrl
             {
                 public const string Short = "au";

framework/src/Volo.Abp.Cli/Properties/launchSettings.json

@@ -2,8 +2,7 @@
   "profiles": {
     "Volo.Abp.Cli": {
       "commandName": "Project",
-      "commandLineArgs": "generate-proxy --apiUrl https://www.abp.io/api/abp/api-definition?types=true -u angular" 
+      "commandLineArgs": "generate-proxy -u angular -m all"
-      "commandName": "Project" 
     }
   }
 }

framework/src/Volo.Abp.Core/System/AbpTypeExtensions.cs

@@ -6,6 +6,11 @@ namespace System
 {
     public static class AbpTypeExtensions
     {
+        public static string GetFullNameWithAssemblyName(this Type type)
+        {
+            return type.FullName + ", " + type.Assembly.GetName().Name;
+        }
+
         /// <summary>
         /// Determines whether an instance of this type can be assigned to
         /// an instance of the <typeparamref name="TTarget"></typeparamref>.

framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/MethodParameterApiDescriptionModel.cs

@@ -8,6 +8,8 @@ namespace Volo.Abp.Http.Modeling
     {
         public string Name { get; set; }
 
+        public string TypeAsString { get; set; }
+
         public string Type { get; set; }
 
         public string TypeSimple { get; set; }
@@ -26,8 +28,9 @@ namespace Volo.Abp.Http.Modeling
             return new MethodParameterApiDescriptionModel
             {
                 Name = parameterInfo.Name,
-                Type = ModelingTypeHelper.GetFullNameHandlingNullableAndGenerics(parameterInfo.ParameterType),
+                TypeAsString = parameterInfo.ParameterType.GetFullNameWithAssemblyName(),
-                TypeSimple = ModelingTypeHelper.GetSimplifiedName(parameterInfo.ParameterType),
+                Type = parameterInfo.ParameterType != null ? ModelingTypeHelper.GetFullNameHandlingNullableAndGenerics(parameterInfo.ParameterType) : null,
+                TypeSimple = parameterInfo.ParameterType != null ? ModelingTypeHelper.GetSimplifiedName(parameterInfo.ParameterType) : null,
                 IsOptional = parameterInfo.IsOptional,
                 DefaultValue = parameterInfo.HasDefaultValue ? parameterInfo.DefaultValue : null
             };