From e9244a30da8f3ab29fdb007ce620eceb39e5a7e0 Mon Sep 17 00:00:00 2001 From: walon Date: Mon, 29 Nov 2021 09:57:12 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B8=80=E4=BA=9B=E8=AF=AD=E8=A8=80=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E7=9A=84=E7=94=9F=E6=88=90=E9=80=89=E9=A1=B9=E5=90=8D=EF=BC=8C?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E4=B8=BA=20--{language}:{option}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Generate/TypescriptCodeRenderBase.cs | 4 +-- src/Luban.Job.Cfg/Source/JobController.cs | 2 +- .../Source/Defs/DefAssemblyBase.cs | 4 +-- src/Luban.Job.Common/Source/GenArgsBase.cs | 36 ++++++++++--------- .../Source/Generate/TypescriptRender.cs | 4 +-- src/Luban.Job.Proto/Source/JobController.cs | 2 +- 6 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/Luban.Job.Cfg/Source/Generate/TypescriptCodeRenderBase.cs b/src/Luban.Job.Cfg/Source/Generate/TypescriptCodeRenderBase.cs index 024e1be..f05a33c 100644 --- a/src/Luban.Job.Cfg/Source/Generate/TypescriptCodeRenderBase.cs +++ b/src/Luban.Job.Cfg/Source/Generate/TypescriptCodeRenderBase.cs @@ -26,7 +26,7 @@ namespace Luban.Job.Cfg.Generate bool isGenBinary = genType.EndsWith("bin"); if (isGenBinary) { - if (args.UsePuertsByteBuf) + if (args.TypescriptUsePuertsByteBuf) { fileContent.Add(TypescriptStringTemplate.PuertsByteBufImports); } @@ -36,7 +36,7 @@ namespace Luban.Job.Cfg.Generate } } - if (args.EmbedBrightTypes) + if (args.TypescriptEmbedBrightTypes) { fileContent.Add(isGenBinary ? StringTemplateUtil.GetTemplateString("config/typescript_bin/vectors") diff --git a/src/Luban.Job.Cfg/Source/JobController.cs b/src/Luban.Job.Cfg/Source/JobController.cs index 1e1ec37..ce664c0 100644 --- a/src/Luban.Job.Cfg/Source/JobController.cs +++ b/src/Luban.Job.Cfg/Source/JobController.cs @@ -147,7 +147,7 @@ namespace Luban.Job.Cfg var excludeTags = args.ExportExcludeTags.Split(',').Select(t => t.Trim().ToLowerInvariant()).Where(t => !string.IsNullOrEmpty(t)).ToList(); var ass = new DefAssembly(args.PatchName, timeZoneInfo, excludeTags, agent) { - UseUnityVectors = args.UseUnityVectors, + CsUseUnityVectors = args.CsUseUnityVectors, OutputCompactJson = args.OutputCompactJson, NamingConventionModule = args.NamingConventionModule, NamingConventionType = args.NamingConventionType, diff --git a/src/Luban.Job.Common/Source/Defs/DefAssemblyBase.cs b/src/Luban.Job.Common/Source/Defs/DefAssemblyBase.cs index 57f1ddb..2739dbc 100644 --- a/src/Luban.Job.Common/Source/Defs/DefAssemblyBase.cs +++ b/src/Luban.Job.Common/Source/Defs/DefAssemblyBase.cs @@ -28,7 +28,7 @@ namespace Luban.Job.Common.Defs } } - public static bool IsUseUnityVectors => LocalAssebmly?.UseUnityVectors == true; + public static bool IsUseUnityVectors => LocalAssebmly?.CsUseUnityVectors == true; public Dictionary Types { get; } = new Dictionary(); @@ -40,7 +40,7 @@ namespace Luban.Job.Common.Defs public bool SupportNullable { get; protected set; } = true; - public bool UseUnityVectors { get; set; } + public bool CsUseUnityVectors { get; set; } public NamingConvention NamingConventionModule { get; set; } = NamingConvention.LanguangeRecommend; diff --git a/src/Luban.Job.Common/Source/GenArgsBase.cs b/src/Luban.Job.Common/Source/GenArgsBase.cs index fb9121f..06d9528 100644 --- a/src/Luban.Job.Common/Source/GenArgsBase.cs +++ b/src/Luban.Job.Common/Source/GenArgsBase.cs @@ -13,21 +13,6 @@ namespace Luban.Job.Common [Option("output_code_monolithic_file", Required = false, HelpText = "output monolithic code file. only effect when lan=rust,python,typescript,lua")] public string OutputCodeMonolithicFile { get; set; } - [Option("typescript_bright_require_path", Required = false, HelpText = "bright require path in typescript")] - public string TypescriptBrightRequirePath { get; set; } - - [Option("typescript_bright_package_name", Required = false, HelpText = "typescript bright package name")] - public string TypescriptBrightPackageName { get; set; } - - [Option("use_puerts_bytebuf", Required = false, HelpText = "use puerts bytebuf class")] - public bool UsePuertsByteBuf { get; set; } - - [Option("embed_bright_types", Required = false, HelpText = "use puerts bytebuf class")] - public bool EmbedBrightTypes { get; set; } - - [Option("use_unity_vector", Required = false, HelpText = "use UnityEngine.Vector{2,3,4}")] - public bool UseUnityVectors { get; set; } - [Option("naming_convention_module", Required = false, HelpText = "naming convention of module. can be language_recommend,none,camelCase,PascalCase,under_scores")] public string NamingConventionModuleStr { get; set; } @@ -51,6 +36,23 @@ namespace Luban.Job.Common [Option("access_bean_member", Required = false, HelpText = "mode of bean field. can be language_recommend,variable,getter_setter,property")] public string AccessConventionBeanMemberStr { get; set; } + // luanguage options + + [Option("typescript:bright_require_path", Required = false, HelpText = "bright require path in typescript")] + public string TypescriptBrightRequirePath { get; set; } + + [Option("typescript:bright_package_name", Required = false, HelpText = "typescript bright package name")] + public string TypescriptBrightPackageName { get; set; } + + [Option("typescript:use_puerts_bytebuf", Required = false, HelpText = "use puerts bytebuf class")] + public bool TypescriptUsePuertsByteBuf { get; set; } + + [Option("typescript:embed_bright_types", Required = false, HelpText = "use puerts bytebuf class")] + public bool TypescriptEmbedBrightTypes { get; set; } + + [Option("cs:use_unity_vector", Required = false, HelpText = "use UnityEngine.Vector{2,3,4}")] + public bool CsUseUnityVectors { get; set; } + public AccessConvention AccessConventionBeanMember { get; set; } public bool ValidateOutouptCodeDir(ref string errMsg) @@ -101,12 +103,12 @@ namespace Luban.Job.Common return false; } bool hasBrightPathOrPacakge = !string.IsNullOrWhiteSpace(this.TypescriptBrightRequirePath) || !string.IsNullOrWhiteSpace(this.TypescriptBrightPackageName); - if (!this.UsePuertsByteBuf && !hasBrightPathOrPacakge) + if (!this.TypescriptUsePuertsByteBuf && !hasBrightPathOrPacakge) { errMsg = "while --use_puerts_bytebuf is false, should provide option --typescript_bright_require_path or --typescript_bright_package_name"; return false; } - if (!this.EmbedBrightTypes && !hasBrightPathOrPacakge) + if (!this.TypescriptEmbedBrightTypes && !hasBrightPathOrPacakge) { errMsg = "while --embed_bright_types is false, should provide option --typescript_bright_require_path or --typescript_bright_package_name"; return false; diff --git a/src/Luban.Job.Proto/Source/Generate/TypescriptRender.cs b/src/Luban.Job.Proto/Source/Generate/TypescriptRender.cs index 954ac13..9e58ab5 100644 --- a/src/Luban.Job.Proto/Source/Generate/TypescriptRender.cs +++ b/src/Luban.Job.Proto/Source/Generate/TypescriptRender.cs @@ -24,7 +24,7 @@ namespace Luban.Job.Proto.Generate var render = ctx.Render; var ass = ctx.Assembly; var fileContent = new List(); - if (args.UsePuertsByteBuf) + if (args.TypescriptUsePuertsByteBuf) { fileContent.Add(TypescriptStringTemplate.PuertsByteBufImports); } @@ -32,7 +32,7 @@ namespace Luban.Job.Proto.Generate { fileContent.Add(TypescriptStringTemplate.GetByteBufImports(brightRequirePath, brightPackageName)); } - if (args.EmbedBrightTypes) + if (args.TypescriptEmbedBrightTypes) { fileContent.Add(StringTemplateUtil.GetTemplateString("config/typescript_bin/vectors")); fileContent.Add(TypescriptStringTemplate.SerializeTypes); diff --git a/src/Luban.Job.Proto/Source/JobController.cs b/src/Luban.Job.Proto/Source/JobController.cs index 0da3e41..9cffb78 100644 --- a/src/Luban.Job.Proto/Source/JobController.cs +++ b/src/Luban.Job.Proto/Source/JobController.cs @@ -89,7 +89,7 @@ namespace Luban.Job.Proto var ass = new DefAssembly() { - UseUnityVectors = args.UseUnityVectors, + CsUseUnityVectors = args.CsUseUnityVectors, NamingConventionModule = args.NamingConventionModule, NamingConventionType = args.NamingConventionType,