diff --git a/src/Luban.Job.Cfg/Source/DataSources/Excel/SheetLoadUtil.cs b/src/Luban.Job.Cfg/Source/DataSources/Excel/SheetLoadUtil.cs index 3066b33..4f9b3da 100644 --- a/src/Luban.Job.Cfg/Source/DataSources/Excel/SheetLoadUtil.cs +++ b/src/Luban.Job.Cfg/Source/DataSources/Excel/SheetLoadUtil.cs @@ -300,12 +300,7 @@ namespace Luban.Job.Cfg.DataSources.Excel private static bool IsTypeRow(List row) { - if (row.Count == 0) - { - return false; - } - var s = row[0].Value?.ToString()?.Trim(); - return s == "##type"; + return IsRowTagEqual(row, "##type"); } private static bool IsHeaderRow(List row) @@ -318,6 +313,16 @@ namespace Luban.Job.Cfg.DataSources.Excel return !string.IsNullOrEmpty(s) && s.StartsWith("##"); } + private static bool IsRowTagEqual(List row, string tag) + { + if (row.Count == 0) + { + return false; + } + var s = row[0].Value?.ToString()?.Trim(); + return s == tag; + } + private static List> ParseRawSheetContent(IExcelDataReader reader, bool orientRow, bool headerOnly) { // TODO 优化性能 @@ -413,7 +418,17 @@ namespace Luban.Job.Cfg.DataSources.Excel throw new Exception($"缺失type行。请用'##type'标识type行"); } List typeRow = cells[typeRowIndex]; - List descRow = cells.Count > typeRowIndex + 1 ? cells[typeRowIndex + 1] : null; + + // 先找 ##desc 行,再找##comment行,最后找 ##type的下一行 + List descRow = cells.Find(row => IsRowTagEqual(row, "##desc")); + if (descRow == null) + { + descRow = cells.Find(row => IsRowTagEqual(row, "##comment")); + } + if (descRow == null) + { + descRow = cells.Count > 1 ? cells.Skip(1).FirstOrDefault(row => IsRowTagEqual(row, "##")) : null; + } var fields = new Dictionary(); foreach (var subTitle in title.SubTitleList) diff --git a/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs b/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs index 59335ee..aded09d 100644 --- a/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs +++ b/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs @@ -292,7 +292,7 @@ namespace Luban.Job.Cfg.Defs var stream = new MemoryStream(await this.Agent.GetFromCacheOrReadAllBytesAsync(file.ActualFile, file.MD5)); var tableDefInfo = source.LoadTableDefInfo(file.OriginFile, file.SheetName, stream); - var cb = new CfgBean() { Namespace = table.Namespace, Name = table.ValueType, }; + var cb = new CfgBean() { Namespace = table.Namespace, Name = table.ValueType, Comment = "" }; #if !LUBAN_LITE foreach (var (name, f) in tableDefInfo.FieldInfos) { diff --git a/src/Luban.Job.Common/Source/Defs/DefEnum.cs b/src/Luban.Job.Common/Source/Defs/DefEnum.cs index c6a6378..d47895d 100644 --- a/src/Luban.Job.Common/Source/Defs/DefEnum.cs +++ b/src/Luban.Job.Common/Source/Defs/DefEnum.cs @@ -24,6 +24,8 @@ namespace Luban.Job.Common.Defs public string Comment { get; set; } + public string EscapeComment => DefUtil.EscapeCommentByCurrentLanguage(Comment); + public Dictionary Tags { get; set; } public bool HasTag(string attrName) diff --git a/src/Luban.Job.Common/Source/Defs/DefFieldBase.cs b/src/Luban.Job.Common/Source/Defs/DefFieldBase.cs index 08bd540..7253c64 100644 --- a/src/Luban.Job.Common/Source/Defs/DefFieldBase.cs +++ b/src/Luban.Job.Common/Source/Defs/DefFieldBase.cs @@ -71,6 +71,8 @@ namespace Luban.Job.Common.Defs public string Comment { get; } + public string EscapeComment => DefUtil.EscapeCommentByCurrentLanguage(Comment); + public Dictionary Tags { get; } public bool IgnoreNameValidation { get; set; } diff --git a/src/Luban.Job.Common/Source/Defs/DefTypeBase.cs b/src/Luban.Job.Common/Source/Defs/DefTypeBase.cs index 51d7bcf..fe12e47 100644 --- a/src/Luban.Job.Common/Source/Defs/DefTypeBase.cs +++ b/src/Luban.Job.Common/Source/Defs/DefTypeBase.cs @@ -1,4 +1,5 @@ using Luban.Common.Utils; +using Luban.Job.Common.Utils; using Luban.Server.Common; using System.Collections.Generic; @@ -48,6 +49,8 @@ namespace Luban.Job.Common.Defs public string Comment { get; protected set; } + public string EscapeComment => DefUtil.EscapeCommentByCurrentLanguage(Comment); + public Dictionary Tags { get; protected set; } public bool HasTag(string attrName) diff --git a/src/Luban.Job.Common/Source/Utils/DefUtil.cs b/src/Luban.Job.Common/Source/Utils/DefUtil.cs index 956df66..78068f7 100644 --- a/src/Luban.Job.Common/Source/Utils/DefUtil.cs +++ b/src/Luban.Job.Common/Source/Utils/DefUtil.cs @@ -1,6 +1,8 @@ using Bright.Collections; +using Luban.Job.Common.Defs; using System; using System.Collections.Generic; +using System.Net; namespace Luban.Job.Common.Utils { @@ -154,5 +156,25 @@ namespace Luban.Job.Common.Utils return tags1; } } + + public static string EscapeCommentByCurrentLanguage(string comment) + { + //comment = comment.Replace('\n', ' ').Replace('\r', ' '); + var curLan = DefAssemblyBase.LocalAssebmly.CurrentLanguage; + switch (curLan) + { + case ELanguage.INVALID: throw new Exception($"not set current language. can't get recommend naming convention name"); + case ELanguage.CS: + case ELanguage.JAVA: + case ELanguage.GO: + case ELanguage.CPP: + case ELanguage.LUA: + case ELanguage.JS: + case ELanguage.TYPESCRIPT: + case ELanguage.PYTHON: + case ELanguage.RUST: return WebUtility.HtmlDecode(comment).Replace("\n", "
"); + default: throw new Exception($"unknown language:{curLan}"); + } + } } } diff --git a/src/Luban.Server/Templates/common/cpp/enum.tpl b/src/Luban.Server/Templates/common/cpp/enum.tpl index cc73c35..570432f 100644 --- a/src/Luban.Server/Templates/common/cpp/enum.tpl +++ b/src/Luban.Server/Templates/common/cpp/enum.tpl @@ -1,7 +1,7 @@ {{cpp_namespace_begin}} {{~if comment != '' ~}} /** - * {{comment}} + * {{comment | html.escape}} */ {{~end~}} enum class {{name}} @@ -9,7 +9,7 @@ enum class {{name}} {{~ for item in items ~}} {{~if item.comment != '' ~}} /** - * {{item.comment}} + * {{item.escape_comment}} */ {{~end~}} {{item.name}} = {{item.value}}, diff --git a/src/Luban.Server/Templates/common/cs/enum.tpl b/src/Luban.Server/Templates/common/cs/enum.tpl index 99e8735..44d6073 100644 --- a/src/Luban.Server/Templates/common/cs/enum.tpl +++ b/src/Luban.Server/Templates/common/cs/enum.tpl @@ -3,7 +3,7 @@ namespace {{namespace_with_top_module}} { {{~if comment != '' ~}} /// - /// {{comment}} + /// {{comment | html.escape}} /// {{~end~}} {{~if is_flags~}} @@ -14,7 +14,7 @@ namespace {{namespace_with_top_module}} {{~ for item in items ~}} {{~if item.comment != '' ~}} /// - /// {{item.comment}} + /// {{item.escape_comment}} /// {{~end~}} {{item.name}} = {{item.value}}, diff --git a/src/Luban.Server/Templates/common/java/enum.tpl b/src/Luban.Server/Templates/common/java/enum.tpl index 6c9d014..683cf14 100644 --- a/src/Luban.Server/Templates/common/java/enum.tpl +++ b/src/Luban.Server/Templates/common/java/enum.tpl @@ -1,14 +1,14 @@ package {{namespace_with_top_module}}; {{~if comment != '' ~}} /** - * {{comment}} + * {{comment | html.escape}} */ {{~end~}} public enum {{name}} { {{~ for item in items ~}} {{~if item.comment != '' ~}} /** - * {{item.comment}} + * {{item.escape_comment}} */ {{~end~}} {{item.name}}({{item.int_value}}), diff --git a/src/Luban.Server/Templates/common/python/enum.tpl b/src/Luban.Server/Templates/common/python/enum.tpl index 9b425bc..fecf260 100644 --- a/src/Luban.Server/Templates/common/python/enum.tpl +++ b/src/Luban.Server/Templates/common/python/enum.tpl @@ -1,13 +1,13 @@ {{~if comment != '' ~}} ''' -{{comment}} +{{comment | html.escape}} ''' {{~end~}} class {{py_full_name}}(Enum): {{~ for item in items ~}} {{~if item.comment != '' ~}} ''' - {{item.comment}} + {{item.escape_comment}} ''' {{~end~}} {{item.name}} = {{item.value}} diff --git a/src/Luban.Server/Templates/common/rust/enum.tpl b/src/Luban.Server/Templates/common/rust/enum.tpl index 2c700f2..a270220 100644 --- a/src/Luban.Server/Templates/common/rust/enum.tpl +++ b/src/Luban.Server/Templates/common/rust/enum.tpl @@ -1,6 +1,6 @@ {{~if comment != '' ~}} /** - * {{comment}} + * {{comment | html.escape}} */ {{~end~}} #[allow(dead_code)] @@ -9,7 +9,7 @@ pub enum {{rust_full_name}} { {{~for item in items ~}} {{~if item.comment != '' ~}} /** - * {{item.comment}} + * {{item.escape_comment}} */ {{~end~}} {{item.name}} = {{item.int_value}}, diff --git a/src/Luban.Server/Templates/common/typescript/enum.tpl b/src/Luban.Server/Templates/common/typescript/enum.tpl index faf0672..0e33cf5 100644 --- a/src/Luban.Server/Templates/common/typescript/enum.tpl +++ b/src/Luban.Server/Templates/common/typescript/enum.tpl @@ -1,14 +1,14 @@ {{typescript_namespace_begin}} {{~if comment != '' ~}} /** - * {{comment}} + * {{comment | html.escape}} */ {{~end~}} export enum {{name}} { {{~for item in items ~}} {{~if item.comment != '' ~}} /** - * {{item.comment}} + * {{item.escape_comment}} */ {{~end~}} {{item.name}} = {{item.value}}, diff --git a/src/Luban.Server/Templates/config/cpp_bin/bean.tpl b/src/Luban.Server/Templates/config/cpp_bin/bean.tpl index 271d80f..51c4255 100644 --- a/src/Luban.Server/Templates/config/cpp_bin/bean.tpl +++ b/src/Luban.Server/Templates/config/cpp_bin/bean.tpl @@ -9,7 +9,7 @@ {{~if x.comment != '' ~}} /** - * {{x.comment}} + * {{x.escape_comment}} */ {{~end~}} class {{name}} : public {{if parent_def_type}} {{parent_def_type.cpp_full_name}} {{else}} bright::CfgBean {{end}} @@ -42,7 +42,7 @@ class {{name}} : public {{if parent_def_type}} {{parent_def_type.cpp_full_name}} {{~ for field in export_fields ~}} {{~if field.comment != '' ~}} /** - * {{field.comment}} + * {{field.escape_comment}} */ {{~end~}} {{cpp_define_type field.ctype}} {{field.convention_name}}; diff --git a/src/Luban.Server/Templates/config/cpp_bin/table.tpl b/src/Luban.Server/Templates/config/cpp_bin/table.tpl index 3e46038..5bd62e0 100644 --- a/src/Luban.Server/Templates/config/cpp_bin/table.tpl +++ b/src/Luban.Server/Templates/config/cpp_bin/table.tpl @@ -10,7 +10,7 @@ {{~if x.comment != '' ~}} /** - * {{x.comment}} + * {{x.escape_comment}} */ {{~end~}} class {{name}} @@ -82,7 +82,7 @@ class {{name}} {{~ for field in value_type.bean.hierarchy_export_fields ~}} {{~if field.comment != '' ~}} /** - * {{field.comment}} + * {{field.escape_comment}} */ {{~end~}} {{cpp_define_type field.ctype}}& {{field.convention_getter_name}}() const { return _data->{{field.convention_name}}; } diff --git a/src/Luban.Server/Templates/config/cpp_bin/tables.tpl b/src/Luban.Server/Templates/config/cpp_bin/tables.tpl index 98e7f0d..3ee19c4 100644 --- a/src/Luban.Server/Templates/config/cpp_bin/tables.tpl +++ b/src/Luban.Server/Templates/config/cpp_bin/tables.tpl @@ -4,7 +4,7 @@ class {{name}} {{~for table in tables ~}} {{~if table.comment != '' ~}} /** - * {{table.comment}} + * {{table.escape_comment}} */ {{~end~}} {{table.cpp_full_name}} {{table.name}}; diff --git a/src/Luban.Server/Templates/config/cs_bin/bean.tpl b/src/Luban.Server/Templates/config/cs_bin/bean.tpl index d742698..8c69a04 100644 --- a/src/Luban.Server/Templates/config/cs_bin/bean.tpl +++ b/src/Luban.Server/Templates/config/cs_bin/bean.tpl @@ -13,7 +13,7 @@ namespace {{x.namespace_with_top_module}} {{~if x.comment != '' ~}} /// -/// {{x.comment}} +/// {{x.escape_comment}} /// {{~end~}} public {{x.cs_class_modifier}} partial class {{name}} : {{if parent_def_type}} {{x.parent}} {{else}} Bright.Config.BeanBase {{end}} @@ -49,7 +49,7 @@ public {{x.cs_class_modifier}} partial class {{name}} : {{if parent_def_type}} { {{~ for field in export_fields ~}} {{~if field.comment != '' ~}} /// - /// {{field.comment}} + /// {{field.escape_comment}} /// {{~end~}} public {{cs_define_type field.ctype}} {{field.convention_name}} { get; private set; } diff --git a/src/Luban.Server/Templates/config/cs_bin/table.tpl b/src/Luban.Server/Templates/config/cs_bin/table.tpl index 6b8adde..cfdd263 100644 --- a/src/Luban.Server/Templates/config/cs_bin/table.tpl +++ b/src/Luban.Server/Templates/config/cs_bin/table.tpl @@ -12,7 +12,7 @@ namespace {{x.namespace_with_top_module}} }} {{~if x.comment != '' ~}} /// -/// {{x.comment}} +/// {{x.escape_comment}} /// {{~end~}} public sealed class {{name}} @@ -77,7 +77,7 @@ public sealed class {{name}} {{~ for field in value_type.bean.hierarchy_export_fields ~}} {{~if field.comment != '' ~}} /// - /// {{field.comment}} + /// {{field.escape_comment}} /// {{~end~}} public {{cs_define_type field.ctype}} {{field.convention_name}} => _data.{{field.convention_name}}; diff --git a/src/Luban.Server/Templates/config/cs_bin/tables.tpl b/src/Luban.Server/Templates/config/cs_bin/tables.tpl index 69b5639..0c318cf 100644 --- a/src/Luban.Server/Templates/config/cs_bin/tables.tpl +++ b/src/Luban.Server/Templates/config/cs_bin/tables.tpl @@ -14,7 +14,7 @@ public sealed class {{name}} {{~for table in tables ~}} {{~if table.comment != '' ~}} /// - /// {{table.comment}} + /// {{table.escape_comment}} /// {{~end~}} public {{table.full_name}} {{table.name}} {get; } diff --git a/src/Luban.Server/Templates/config/cs_json/bean.tpl b/src/Luban.Server/Templates/config/cs_json/bean.tpl index 0290dff..cea933f 100644 --- a/src/Luban.Server/Templates/config/cs_json/bean.tpl +++ b/src/Luban.Server/Templates/config/cs_json/bean.tpl @@ -15,7 +15,7 @@ namespace {{x.namespace_with_top_module}} {{~if x.comment != '' ~}} /// -/// {{x.comment}} +/// {{x.escape_comment}} /// {{~end~}} public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{parent}} {{else}} Bright.Config.BeanBase {{end}} @@ -58,7 +58,7 @@ public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{parent} {{~ for field in export_fields ~}} {{~if field.comment != '' ~}} /// - /// {{field.comment}} + /// {{field.escape_comment}} /// {{~end~}} public {{cs_define_type field.ctype}} {{field.convention_name}} { get; private set; } diff --git a/src/Luban.Server/Templates/config/cs_json/table.tpl b/src/Luban.Server/Templates/config/cs_json/table.tpl index 9d2a391..d364360 100644 --- a/src/Luban.Server/Templates/config/cs_json/table.tpl +++ b/src/Luban.Server/Templates/config/cs_json/table.tpl @@ -15,7 +15,7 @@ namespace {{x.namespace_with_top_module}} {{~if x.comment != '' ~}} /// -/// {{x.comment}} +/// {{x.escape_comment}} /// {{~end~}} public sealed class {{name}} @@ -78,7 +78,7 @@ public sealed class {{name}} {{~ for field in value_type.bean.hierarchy_export_fields ~}} {{~if field.comment != '' ~}} /// - /// {{field.comment}} + /// {{field.escape_comment}} /// {{~end~}} public {{cs_define_type field.ctype}} {{field.convention_name}} => _data.{{field.convention_name}}; diff --git a/src/Luban.Server/Templates/config/cs_json/tables.tpl b/src/Luban.Server/Templates/config/cs_json/tables.tpl index 43636bf..2050c00 100644 --- a/src/Luban.Server/Templates/config/cs_json/tables.tpl +++ b/src/Luban.Server/Templates/config/cs_json/tables.tpl @@ -13,7 +13,7 @@ public sealed partial class {{name}} {{~for table in tables ~}} {{~if table.comment != '' ~}} /// - /// {{table.comment}} + /// {{table.escape_comment}} /// {{~end~}} public {{table.full_name}} {{table.name}} {get; } diff --git a/src/Luban.Server/Templates/config/cs_unity_json/bean.tpl b/src/Luban.Server/Templates/config/cs_unity_json/bean.tpl index 213f784..e6053e1 100644 --- a/src/Luban.Server/Templates/config/cs_unity_json/bean.tpl +++ b/src/Luban.Server/Templates/config/cs_unity_json/bean.tpl @@ -15,7 +15,7 @@ namespace {{x.namespace_with_top_module}} {{~if x.comment != '' ~}} /// -/// {{x.comment}} +/// {{x.escape_comment}} /// {{~end~}} public {{x.cs_class_modifier}} partial class {{name}} : {{if parent_def_type}} {{parent}} {{else}} Bright.Config.BeanBase {{end}} @@ -59,7 +59,7 @@ public {{x.cs_class_modifier}} partial class {{name}} : {{if parent_def_type}} { {{~ for field in export_fields ~}} {{~if field.comment != '' ~}} /// - /// {{field.comment}} + /// {{field.escape_comment}} /// {{~end~}} public {{cs_define_type field.ctype}} {{field.convention_name}} { get; private set; } diff --git a/src/Luban.Server/Templates/config/cs_unity_json/table.tpl b/src/Luban.Server/Templates/config/cs_unity_json/table.tpl index 8421b1f..5d3e8b7 100644 --- a/src/Luban.Server/Templates/config/cs_unity_json/table.tpl +++ b/src/Luban.Server/Templates/config/cs_unity_json/table.tpl @@ -15,7 +15,7 @@ namespace {{x.namespace_with_top_module}} {{~if x.comment != '' ~}} /// -/// {{x.comment}} +/// {{x.escape_comment}} /// {{~end~}} public sealed class {{name}} @@ -81,7 +81,7 @@ public sealed class {{name}} {{~ for field in value_type.bean.hierarchy_export_fields ~}} {{~if field.comment != '' ~}} /// - /// {{field.comment}} + /// {{field.escape_comment}} /// {{~end~}} public {{cs_define_type field.ctype}} {{field.convention_name}} => _data.{{field.convention_name}}; diff --git a/src/Luban.Server/Templates/config/cs_unity_json/tables.tpl b/src/Luban.Server/Templates/config/cs_unity_json/tables.tpl index 5b3b35d..2dd60fd 100644 --- a/src/Luban.Server/Templates/config/cs_unity_json/tables.tpl +++ b/src/Luban.Server/Templates/config/cs_unity_json/tables.tpl @@ -13,7 +13,7 @@ public sealed partial class {{name}} {{~for table in tables ~}} {{~if table.comment != '' ~}} /// - /// {{table.comment}} + /// {{table.escape_comment}} /// {{~end~}} public {{table.full_name}} {{table.name}} {get; } diff --git a/src/Luban.Server/Templates/config/java_bin/bean.tpl b/src/Luban.Server/Templates/config/java_bin/bean.tpl index 86b2e3a..9b8efe3 100644 --- a/src/Luban.Server/Templates/config/java_bin/bean.tpl +++ b/src/Luban.Server/Templates/config/java_bin/bean.tpl @@ -11,7 +11,7 @@ import bright.serialization.*; {{~if x.comment != '' ~}} /** - * {{x.comment}} + * {{x.escape_comment}} */ {{~end~}} public {{x.java_class_modifier}} class {{name}}{{if parent_def_type}} extends {{x.parent_def_type.full_name_with_top_module}}{{end}} { @@ -57,7 +57,7 @@ public {{x.java_class_modifier}} class {{name}}{{if parent_def_type}} extends {{ {{~ for field in export_fields ~}} {{~if field.comment != '' ~}} /** - * {{field.comment}} + * {{field.escape_comment}} */ {{~end~}} public final {{java_define_type field.ctype}} {{field.convention_name}}; diff --git a/src/Luban.Server/Templates/config/java_bin/table.tpl b/src/Luban.Server/Templates/config/java_bin/table.tpl index 7f551fd..d609042 100644 --- a/src/Luban.Server/Templates/config/java_bin/table.tpl +++ b/src/Luban.Server/Templates/config/java_bin/table.tpl @@ -12,7 +12,7 @@ import bright.serialization.*; {{~if x.comment != '' ~}} /** - * {{x.comment}} + * {{x.escape_comment}} */ {{~end~}} public final class {{name}} { @@ -62,7 +62,7 @@ public final class {{name}} { {{~ for field in value_type.bean.hierarchy_export_fields ~}} {{~if field.comment != '' ~}} /** - * {{field.comment}} + * {{field.escape_comment}} */ {{~end~}} public {{java_define_type field.ctype}} {{field.convention_getter_name}}() { return _data.{{field.convention_name}}; } diff --git a/src/Luban.Server/Templates/config/java_bin/tables.tpl b/src/Luban.Server/Templates/config/java_bin/tables.tpl index 8aae727..5a13612 100644 --- a/src/Luban.Server/Templates/config/java_bin/tables.tpl +++ b/src/Luban.Server/Templates/config/java_bin/tables.tpl @@ -11,7 +11,7 @@ public final class {{name}} {{~for table in tables ~}} {{~if table.comment != '' ~}} /** - * {{table.comment}} + * {{table.escape_comment}} */ {{~end~}} private final {{table.full_name_with_top_module}} {{table.inner_name}}; diff --git a/src/Luban.Server/Templates/config/java_json/bean.tpl b/src/Luban.Server/Templates/config/java_json/bean.tpl index 1d6843b..bb8ad91 100644 --- a/src/Luban.Server/Templates/config/java_json/bean.tpl +++ b/src/Luban.Server/Templates/config/java_json/bean.tpl @@ -12,7 +12,7 @@ import com.google.gson.JsonObject; {{~if x.comment != '' ~}} /** - * {{x.comment}} + * {{x.escape_comment}} */ {{~end~}} public {{x.java_class_modifier}} class {{name}}{{if parent_def_type}} extends {{x.parent_def_type.full_name_with_top_module}}{{end}} { @@ -60,7 +60,7 @@ public {{x.java_class_modifier}} class {{name}}{{if parent_def_type}} extends {{ {{~ for field in export_fields ~}} {{~if field.comment != '' ~}} /** - * {{field.comment}} + * {{field.escape_comment}} */ {{~end~}} public final {{java_define_type field.ctype}} {{field.convention_name}}; diff --git a/src/Luban.Server/Templates/config/java_json/table.tpl b/src/Luban.Server/Templates/config/java_json/table.tpl index 180f415..2b02415 100644 --- a/src/Luban.Server/Templates/config/java_json/table.tpl +++ b/src/Luban.Server/Templates/config/java_json/table.tpl @@ -12,7 +12,7 @@ import com.google.gson.JsonElement; {{~if x.comment != '' ~}} /** - * {{x.comment}} + * {{x.escape_comment}} */ {{~end~}} public final class {{name}} { @@ -62,7 +62,7 @@ public final class {{name}} { {{~ for field in value_type.bean.hierarchy_export_fields ~}} {{~if field.comment != '' ~}} /** - * {{field.comment}} + * {{field.escape_comment}} */ {{~end~}} public {{java_define_type field.ctype}} {{field.convention_getter_name}}() { return _data.{{field.convention_name}}; } diff --git a/src/Luban.Server/Templates/config/java_json/tables.tpl b/src/Luban.Server/Templates/config/java_json/tables.tpl index 6b79c47..abe7c71 100644 --- a/src/Luban.Server/Templates/config/java_json/tables.tpl +++ b/src/Luban.Server/Templates/config/java_json/tables.tpl @@ -11,7 +11,7 @@ public final class {{name}} {{~for table in tables ~}} {{~if table.comment != '' ~}} /** - * {{table.comment}} + * {{table.escape_comment}} */ {{~end~}} private final {{table.full_name_with_top_module}} {{table.inner_name}}; diff --git a/src/Luban.Server/Templates/config/python_json/table.tpl b/src/Luban.Server/Templates/config/python_json/table.tpl index bb8e6e3..8732943 100644 --- a/src/Luban.Server/Templates/config/python_json/table.tpl +++ b/src/Luban.Server/Templates/config/python_json/table.tpl @@ -34,7 +34,7 @@ class {{name}}: {{~ for field in value_type.bean.hierarchy_export_fields ~}} {{~if field.comment != '' ~}} ''' - {{field.comment}} + {{field.escape_comment}} ''' {{~end~}} def {{field.convention_name}}(self) : return self._data.{{field.convention_name}} diff --git a/src/Luban.Server/Templates/config/rust_json/bean.tpl b/src/Luban.Server/Templates/config/rust_json/bean.tpl index 20ded90..48ffc59 100644 --- a/src/Luban.Server/Templates/config/rust_json/bean.tpl +++ b/src/Luban.Server/Templates/config/rust_json/bean.tpl @@ -8,7 +8,7 @@ {{~if x.comment != '' ~}} /** - * {{x.comment}} + * {{x.escape_comment}} */ {{~end~}} {{~if !x.is_abstract_type~}} diff --git a/src/Luban.Server/Templates/config/rust_json/table.tpl b/src/Luban.Server/Templates/config/rust_json/table.tpl index 3fc3e70..a7b260c 100644 --- a/src/Luban.Server/Templates/config/rust_json/table.tpl +++ b/src/Luban.Server/Templates/config/rust_json/table.tpl @@ -5,7 +5,7 @@ }} {{~if x.comment != '' ~}} /** - * {{x.comment}} + * {{x.escape_comment}} */ {{~end~}} #[allow(non_camel_case_types)] diff --git a/src/Luban.Server/Templates/config/rust_json/tables.tpl b/src/Luban.Server/Templates/config/rust_json/tables.tpl index 530d08c..6332fae 100644 --- a/src/Luban.Server/Templates/config/rust_json/tables.tpl +++ b/src/Luban.Server/Templates/config/rust_json/tables.tpl @@ -12,7 +12,7 @@ pub struct {{name}} { {{~if table.comment != '' ~}} /** - * {{table.comment}} + * {{table.escape_comment}} */ {{~end~}} pub {{string.downcase table.name}}: {{table.rust_full_name}}, diff --git a/src/Luban.Server/Templates/config/typescript_bin/bean.tpl b/src/Luban.Server/Templates/config/typescript_bin/bean.tpl index f0c584d..9aa33c3 100644 --- a/src/Luban.Server/Templates/config/typescript_bin/bean.tpl +++ b/src/Luban.Server/Templates/config/typescript_bin/bean.tpl @@ -9,7 +9,7 @@ {{x.typescript_namespace_begin}} {{~if x.comment != '' ~}} /** - * {{x.comment}} + * {{x.escape_comment}} */ {{~end~}} export {{if x.is_abstract_type}} abstract {{end}} class {{name}} {{if parent_def_type}} extends {{x.parent}}{{end}} { @@ -36,7 +36,7 @@ export {{if x.is_abstract_type}} abstract {{end}} class {{name}} {{if parent_def {{~ for field in export_fields ~}} {{~if field.comment != '' ~}} /** - * {{field.comment}} + * {{field.escape_comment}} */ {{~end~}} readonly {{field.convention_name}}: {{ts_define_type field.ctype}} diff --git a/src/Luban.Server/Templates/config/typescript_bin/table.tpl b/src/Luban.Server/Templates/config/typescript_bin/table.tpl index 2969fd6..546c6c9 100644 --- a/src/Luban.Server/Templates/config/typescript_bin/table.tpl +++ b/src/Luban.Server/Templates/config/typescript_bin/table.tpl @@ -8,7 +8,7 @@ {{x.typescript_namespace_begin}} {{~if x.comment != '' ~}} /** - * {{x.comment}} + * {{x.escape_comment}} */ {{~end~}} export class {{name}} { @@ -53,7 +53,7 @@ export class {{name}} { {{~ for field in value_type.bean.hierarchy_export_fields ~}} {{~if field.comment != '' ~}} /** - * {{field.comment}} + * {{field.escape_comment}} */ {{~end~}} get {{field.convention_name}}(): {{ts_define_type field.ctype}} { return this._data.{{field.convention_name}} } diff --git a/src/Luban.Server/Templates/config/typescript_bin/tables.tpl b/src/Luban.Server/Templates/config/typescript_bin/tables.tpl index 4917601..1e3a539 100644 --- a/src/Luban.Server/Templates/config/typescript_bin/tables.tpl +++ b/src/Luban.Server/Templates/config/typescript_bin/tables.tpl @@ -12,7 +12,7 @@ export class {{name}} { private _{{table.name}}: {{table.full_name}} {{~if table.comment != '' ~}} /** - * {{table.comment}} + * {{table.escape_comment}} */ {{~end~}} get {{table.name}}(): {{table.full_name}} { return this._{{table.name}}} diff --git a/src/Luban.Server/Templates/config/typescript_json/bean.tpl b/src/Luban.Server/Templates/config/typescript_json/bean.tpl index 9bda0d2..7439e42 100644 --- a/src/Luban.Server/Templates/config/typescript_json/bean.tpl +++ b/src/Luban.Server/Templates/config/typescript_json/bean.tpl @@ -9,7 +9,7 @@ {{x.typescript_namespace_begin}} {{~if x.comment != '' ~}} /** - * {{x.comment}} + * {{x.escape_comment}} */ {{~end~}} export {{if x.is_abstract_type}}abstract {{end}}class {{name}}{{if parent_def_type}} extends {{x.parent}}{{end}} { @@ -39,7 +39,7 @@ export {{if x.is_abstract_type}}abstract {{end}}class {{name}}{{if parent_def_ty {{~ for field in export_fields ~}} {{~if field.comment != '' ~}} /** - * {{field.comment}} + * {{field.escape_comment}} */ {{~end~}} readonly {{field.convention_name}}: {{ts_define_type field.ctype}} diff --git a/src/Luban.Server/Templates/config/typescript_json/table.tpl b/src/Luban.Server/Templates/config/typescript_json/table.tpl index cba1a08..1dcd809 100644 --- a/src/Luban.Server/Templates/config/typescript_json/table.tpl +++ b/src/Luban.Server/Templates/config/typescript_json/table.tpl @@ -8,7 +8,7 @@ {{x.typescript_namespace_begin}} {{~if x.comment != '' ~}} /** - * {{x.comment}} + * {{x.escape_comment}} */ {{~end~}} export class {{name}}{ @@ -50,7 +50,7 @@ export class {{name}}{ {{~ for field in value_type.bean.hierarchy_export_fields ~}} {{~if field.comment != '' ~}} /** - * {{field.comment}} + * {{field.escape_comment}} */ {{~end~}} get {{field.convention_name}}(): {{ts_define_type field.ctype}} { return this._data.{{field.convention_name}}; } diff --git a/src/Luban.Server/Templates/config/typescript_json/tables.tpl b/src/Luban.Server/Templates/config/typescript_json/tables.tpl index cb1a409..8e2723c 100644 --- a/src/Luban.Server/Templates/config/typescript_json/tables.tpl +++ b/src/Luban.Server/Templates/config/typescript_json/tables.tpl @@ -12,7 +12,7 @@ export class {{name}} { private _{{table.name}}: {{table.full_name}} {{~if table.comment != '' ~}} /** - * {{table.comment}} + * {{table.escape_comment}} */ {{~end~}} get {{table.name}}(): {{table.full_name}} { return this._{{table.name}};} diff --git a/src/Luban.Server/Templates/db/cs_async/bean.tpl b/src/Luban.Server/Templates/db/cs_async/bean.tpl index e7db776..f77b3a6 100644 --- a/src/Luban.Server/Templates/db/cs_async/bean.tpl +++ b/src/Luban.Server/Templates/db/cs_async/bean.tpl @@ -14,7 +14,7 @@ namespace {{x.namespace_with_top_module}} {{~if x.comment != '' ~}} /// -/// {{x.comment}} +/// {{x.escape_comment}} /// {{~end~}} public interface {{readonly_name}} {{if parent_def_type}}: IReadOnly{{x.parent_def_type.name}} {{end}} @@ -26,7 +26,7 @@ public interface {{readonly_name}} {{if parent_def_type}}: IReadOnly{{x.parent_d {{~if x.comment != '' ~}} /// -/// {{x.comment}} +/// {{x.escape_comment}} /// {{~end~}} public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.parent}} {{else}} Bright.Transaction.TxnBeanBase {{end}}, {{readonly_name}} @@ -65,7 +65,7 @@ public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.paren {{~if field.comment != '' ~}} /// - /// {{field.comment}} + /// {{field.escape_comment}} /// {{~end~}} public {{db_cs_define_type ctype}} {{field.convention_name}} @@ -106,7 +106,7 @@ public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.paren {{~else~}} {{~if field.comment != '' ~}} /// - /// {{field.comment}} + /// {{field.escape_comment}} /// {{~end~}} public {{db_cs_define_type ctype}} {{field.convention_name}} => {{field.internal_name}}; @@ -115,14 +115,14 @@ public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.paren {{~if ctype.bean || ctype.element_type ~}} {{~if field.comment != '' ~}} /// - /// {{field.comment}} + /// {{field.escape_comment}} /// {{~end~}} {{db_cs_readonly_define_type ctype}} {{readonly_name}}.{{field.convention_name}} => {{field.internal_name}}; {{~else if ctype.is_map~}} {{~if field.comment != '' ~}} /// - /// {{field.comment}} + /// {{field.escape_comment}} /// {{~end~}} {{db_cs_readonly_define_type ctype}} {{readonly_name}}.{{field.convention_name}} => new Bright.Transaction.Collections.PReadOnlyMap<{{db_cs_readonly_define_type ctype.key_type}}, {{db_cs_readonly_define_type ctype.value_type}}, {{db_cs_define_type ctype.value_type}}>({{field.internal_name}}); diff --git a/src/Luban.Server/Templates/db/cs_async/table.tpl b/src/Luban.Server/Templates/db/cs_async/table.tpl index 6c10f34..e25fc36 100644 --- a/src/Luban.Server/Templates/db/cs_async/table.tpl +++ b/src/Luban.Server/Templates/db/cs_async/table.tpl @@ -13,7 +13,7 @@ namespace {{x.namespace_with_top_module}} {{~if x.comment != '' ~}} /// -/// {{x.comment}} +/// {{x.escape_comment}} /// {{~end~}} public sealed class {{name}} diff --git a/src/Luban.Server/Templates/db/cs_sync/bean.tpl b/src/Luban.Server/Templates/db/cs_sync/bean.tpl index e7db776..f77b3a6 100644 --- a/src/Luban.Server/Templates/db/cs_sync/bean.tpl +++ b/src/Luban.Server/Templates/db/cs_sync/bean.tpl @@ -14,7 +14,7 @@ namespace {{x.namespace_with_top_module}} {{~if x.comment != '' ~}} /// -/// {{x.comment}} +/// {{x.escape_comment}} /// {{~end~}} public interface {{readonly_name}} {{if parent_def_type}}: IReadOnly{{x.parent_def_type.name}} {{end}} @@ -26,7 +26,7 @@ public interface {{readonly_name}} {{if parent_def_type}}: IReadOnly{{x.parent_d {{~if x.comment != '' ~}} /// -/// {{x.comment}} +/// {{x.escape_comment}} /// {{~end~}} public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.parent}} {{else}} Bright.Transaction.TxnBeanBase {{end}}, {{readonly_name}} @@ -65,7 +65,7 @@ public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.paren {{~if field.comment != '' ~}} /// - /// {{field.comment}} + /// {{field.escape_comment}} /// {{~end~}} public {{db_cs_define_type ctype}} {{field.convention_name}} @@ -106,7 +106,7 @@ public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.paren {{~else~}} {{~if field.comment != '' ~}} /// - /// {{field.comment}} + /// {{field.escape_comment}} /// {{~end~}} public {{db_cs_define_type ctype}} {{field.convention_name}} => {{field.internal_name}}; @@ -115,14 +115,14 @@ public {{x.cs_class_modifier}} class {{name}} : {{if parent_def_type}} {{x.paren {{~if ctype.bean || ctype.element_type ~}} {{~if field.comment != '' ~}} /// - /// {{field.comment}} + /// {{field.escape_comment}} /// {{~end~}} {{db_cs_readonly_define_type ctype}} {{readonly_name}}.{{field.convention_name}} => {{field.internal_name}}; {{~else if ctype.is_map~}} {{~if field.comment != '' ~}} /// - /// {{field.comment}} + /// {{field.escape_comment}} /// {{~end~}} {{db_cs_readonly_define_type ctype}} {{readonly_name}}.{{field.convention_name}} => new Bright.Transaction.Collections.PReadOnlyMap<{{db_cs_readonly_define_type ctype.key_type}}, {{db_cs_readonly_define_type ctype.value_type}}, {{db_cs_define_type ctype.value_type}}>({{field.internal_name}}); diff --git a/src/Luban.Server/Templates/db/cs_sync/table.tpl b/src/Luban.Server/Templates/db/cs_sync/table.tpl index 5c5f655..7f94712 100644 --- a/src/Luban.Server/Templates/db/cs_sync/table.tpl +++ b/src/Luban.Server/Templates/db/cs_sync/table.tpl @@ -13,7 +13,7 @@ namespace {{x.namespace_with_top_module}} {{~if x.comment != '' ~}} /// -/// {{x.comment}} +/// {{x.escape_comment}} /// {{~end~}} public sealed class {{name}} diff --git a/src/Luban.Server/Templates/db/typescript/bean.tpl b/src/Luban.Server/Templates/db/typescript/bean.tpl index 63e812f..25df1a1 100644 --- a/src/Luban.Server/Templates/db/typescript/bean.tpl +++ b/src/Luban.Server/Templates/db/typescript/bean.tpl @@ -11,14 +11,14 @@ {{x.typescript_namespace_begin}} {{~if x.comment != '' ~}} /** - * {{x.comment}} + * {{x.escape_comment}} */ {{~end~}} export {{x.ts_class_modifier}} class {{name}} extends {{if parent_def_type}} {{x.parent}} {{else}} TxnBeanBase {{end}}{ {{~ for field in fields~}} {{~if field.comment != '' ~}} /** - * {{field.comment}} + * {{field.escape_comment}} */ {{~end~}} {{if is_abstract_type}}protected{{else}}private{{end}} {{field.internal_name}}: {{db_ts_define_type field.ctype}} @@ -50,7 +50,7 @@ export {{x.ts_class_modifier}} class {{name}} extends {{if parent_def_type}} {{x {{~if field.comment != '' ~}} /** - * {{field.comment}} + * {{field.escape_comment}} */ {{~end~}} get {{field.convention_name}}(): {{db_ts_define_type ctype}} { @@ -66,7 +66,7 @@ export {{x.ts_class_modifier}} class {{name}} extends {{if parent_def_type}} {{x {{~if field.comment != '' ~}} /** - * {{field.comment}} + * {{field.escape_comment}} */ {{~end~}} set {{field.convention_name}}(value: {{db_ts_define_type ctype}}) { @@ -87,7 +87,7 @@ export {{x.ts_class_modifier}} class {{name}} extends {{if parent_def_type}} {{x {{~else~}} {{~if field.comment != '' ~}} /** - * {{field.comment}} + * {{field.escape_comment}} */ {{~end~}} get {{field.convention_name}}(): {{db_ts_define_type ctype}} { return {{field.internal_name_with_this}} } diff --git a/src/Luban.Server/Templates/db/typescript/table.tpl b/src/Luban.Server/Templates/db/typescript/table.tpl index 2437ec7..08362b9 100644 --- a/src/Luban.Server/Templates/db/typescript/table.tpl +++ b/src/Luban.Server/Templates/db/typescript/table.tpl @@ -36,7 +36,7 @@ {{~if x.comment != '' ~}} /** - * {{x.comment}} + * {{x.escape_comment}} */ {{~end~}} export class {{name}} { diff --git a/src/Luban.Server/Templates/proto/cs/bean.tpl b/src/Luban.Server/Templates/proto/cs/bean.tpl index fa223c7..aff9547 100644 --- a/src/Luban.Server/Templates/proto/cs/bean.tpl +++ b/src/Luban.Server/Templates/proto/cs/bean.tpl @@ -15,7 +15,7 @@ namespace {{x.namespace_with_top_module}} {{~if x.comment != '' ~}} /// - /// {{x.comment}} + /// {{x.escape_comment}} /// {{~end~}} public {{if is_value_type}}struct{{else}}{{x.cs_class_modifier}} class{{end}} {{name}} : {{if parent_def_type}} {{parent}} {{else}} Bright.Serialization.BeanBase {{end}} @@ -77,7 +77,7 @@ namespace {{x.namespace_with_top_module}} {{~ for field in fields ~}} {{~if field.comment != '' ~}} /// - /// {{field.comment}} + /// {{field.escape_comment}} /// {{~end~}} public {{cs_define_type field.ctype}} {{field.convention_name}}; diff --git a/src/Luban.Server/Templates/proto/cs/proto.tpl b/src/Luban.Server/Templates/proto/cs/proto.tpl index 0fbfddb..2b962ec 100644 --- a/src/Luban.Server/Templates/proto/cs/proto.tpl +++ b/src/Luban.Server/Templates/proto/cs/proto.tpl @@ -10,7 +10,7 @@ namespace {{x.namespace_with_top_module}} { {{~if x.comment != '' ~}} /// - /// {{x.comment}} + /// {{x.escape_comment}} /// {{~end~}} public sealed class {{name}} : Bright.Net.Codecs.Protocol @@ -18,7 +18,7 @@ namespace {{x.namespace_with_top_module}} {{~ for field in fields ~}} {{~if field.comment != '' ~}} /// - /// {{field.comment}} + /// {{field.escape_comment}} /// {{~end~}} public {{cs_define_type field.ctype}} {{field.convention_name}}; diff --git a/src/Luban.Server/Templates/proto/cs/rpc.tpl b/src/Luban.Server/Templates/proto/cs/rpc.tpl index 5310aab..cad83e2 100644 --- a/src/Luban.Server/Templates/proto/cs/rpc.tpl +++ b/src/Luban.Server/Templates/proto/cs/rpc.tpl @@ -13,7 +13,7 @@ namespace {{x.namespace_with_top_module}} {{~if x.comment != '' ~}} /// - /// {{x.comment}} + /// {{x.escape_comment}} /// {{~end~}} public sealed class {{name}} : Bright.Net.Codecs.Rpc<{{cs_define_type targ_type}}, {{cs_define_type tres_type}}> diff --git a/src/Luban.Server/Templates/proto/typescript/bean.tpl b/src/Luban.Server/Templates/proto/typescript/bean.tpl index 16a8936..5e9da01 100644 --- a/src/Luban.Server/Templates/proto/typescript/bean.tpl +++ b/src/Luban.Server/Templates/proto/typescript/bean.tpl @@ -14,7 +14,7 @@ {{~if x.comment != '' ~}} /** - * {{x.comment}} + * {{x.escape_comment}} */ {{~end~}} export {{if x.is_abstract_type}} abstract {{end}} class {{name}} extends {{if parent_def_type}}{{x.parent}}{{else}}BeanBase{{end}} { @@ -45,7 +45,7 @@ export {{if x.is_abstract_type}} abstract {{end}} class {{name}} extends {{if pa {{~ for field in fields ~}} {{~if field.comment != '' ~}} /** - * {{field.comment}} + * {{field.escape_comment}} */ {{~end~}} {{field.convention_name}}{{if field.is_nullable}}?{{end}} : {{ts_define_type field.ctype}} diff --git a/src/Luban.Server/Templates/proto/typescript/proto.tpl b/src/Luban.Server/Templates/proto/typescript/proto.tpl index a515501..0734804 100644 --- a/src/Luban.Server/Templates/proto/typescript/proto.tpl +++ b/src/Luban.Server/Templates/proto/typescript/proto.tpl @@ -8,7 +8,7 @@ {{~if x.comment != '' ~}} /** - * {{x.comment}} + * {{x.escape_comment}} */ {{~end~}} export class {{name}} extends Protocol { @@ -19,7 +19,7 @@ export class {{name}} extends Protocol { {{~ for field in fields ~}} {{~if field.comment != '' ~}} /** - * {{field.comment}} + * {{field.escape_comment}} */ {{~end~}} {{field.convention_name}}{{if field.is_nullable}}?{{end}} : {{ts_define_type field.ctype}}