From 260a1a84a3e4a12304acc7311c192c25201deb0f Mon Sep 17 00:00:00 2001 From: walon Date: Tue, 29 Jun 2021 17:23:06 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=94=9F=E6=88=90=E7=9A=84typescript=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=8E=BB=E6=8E=89=E8=A1=8C=E6=9C=AB=E4=B8=8D?= =?UTF-8?q?=E5=BF=85=E8=A6=81=E7=9A=84';'=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Generate/TypeScriptBinCodeRender.cs | 2 +- .../Generate/TypeScriptJsonCodeRender.cs | 2 +- src/Luban.Job.Cfg/Source/JobController.cs | 126 +++++++++--------- .../Source/Generate/TypescriptRender.cs | 20 +-- 4 files changed, 75 insertions(+), 75 deletions(-) diff --git a/src/Luban.Job.Cfg/Source/Generate/TypeScriptBinCodeRender.cs b/src/Luban.Job.Cfg/Source/Generate/TypeScriptBinCodeRender.cs index 4b3c800..2d59914 100644 --- a/src/Luban.Job.Cfg/Source/Generate/TypeScriptBinCodeRender.cs +++ b/src/Luban.Job.Cfg/Source/Generate/TypeScriptBinCodeRender.cs @@ -58,7 +58,7 @@ export {{if x.is_abstract_type}} abstract {{end}} class {{name}} {{if parent_def } {{~ for field in export_fields ~}} - {{field.ts_style_name}}{{if field.is_nullable}}?{{end}}: {{ts_define_type field.ctype}} + readonly {{field.ts_style_name}}{{if field.is_nullable}}?{{end}}: {{ts_define_type field.ctype}} {{~if field.gen_ref~}} {{field.ts_ref_validator_define}} {{~end~}} diff --git a/src/Luban.Job.Cfg/Source/Generate/TypeScriptJsonCodeRender.cs b/src/Luban.Job.Cfg/Source/Generate/TypeScriptJsonCodeRender.cs index 26284f5..bb6ee45 100644 --- a/src/Luban.Job.Cfg/Source/Generate/TypeScriptJsonCodeRender.cs +++ b/src/Luban.Job.Cfg/Source/Generate/TypeScriptJsonCodeRender.cs @@ -60,7 +60,7 @@ export {{if x.is_abstract_type}} abstract {{end}} class {{name}} {{if parent_def } {{~ for field in export_fields ~}} - {{field.ts_style_name}}{{if field.is_nullable}}?{{end}}: {{ts_define_type field.ctype}} + readonly {{field.ts_style_name}}{{if field.is_nullable}}?{{end}}: {{ts_define_type field.ctype}} {{~if field.gen_ref~}} {{field.ts_ref_validator_define}} {{~end~}} diff --git a/src/Luban.Job.Cfg/Source/JobController.cs b/src/Luban.Job.Cfg/Source/JobController.cs index 2fc980d..d33d4ff 100644 --- a/src/Luban.Job.Cfg/Source/JobController.cs +++ b/src/Luban.Job.Cfg/Source/JobController.cs @@ -432,66 +432,66 @@ export namespace {ass.TopModule} {{ @" export class Vector2 { - x: number; - y: number; + x: number + y: number constructor(x: number, y: number) { - this.x = x; - this.y = y; + this.x = x + this.y = y } static from(_json_: any): Vector2 { - let x = _json_['x']; - let y = _json_['y']; + let x = _json_['x'] + let y = _json_['y'] if (x == null || y == null) { - throw new Error(); + throw new Error() } - return new Vector2(x, y); + return new Vector2(x, y) } } export class Vector3 { - x: number; - y: number; - z: number; + x: number + y: number + z: number constructor(x: number, y: number, z: number) { - this.x = x; - this.y = y; - this.z = z; + this.x = x + this.y = y + this.z = z } static from(_json_: any): Vector3 { - let x = _json_['x']; - let y = _json_['y']; - let z = _json_['z']; + let x = _json_['x'] + let y = _json_['y'] + let z = _json_['z'] if (x == null || y == null || z == null) { - throw new Error(); + throw new Error() } - return new Vector3(x, y, z); + return new Vector3(x, y, z) } } export class Vector4 { - x: number; - y: number; - z: number; - w: number; + x: number + y: number + z: number + w: number constructor(x: number, y: number, z: number, w: number) { - this.x = x; - this.y = y; - this.z = z; - this.w = w; + this.x = x + this.y = y + this.z = z + this.w = w } static from(_json_: any): Vector4 { - let x = _json_['x']; - let y = _json_['y']; - let z = _json_['z']; - let w = _json_['w']; + let x = _json_['x'] + let y = _json_['y'] + let z = _json_['z'] + let w = _json_['w'] if (x == null || y == null || z == null || w == null) { - throw new Error(); + throw new Error() } - return new Vector4(x, y, z, w); + return new Vector4(x, y, z, w) } } @@ -554,57 +554,57 @@ export namespace {ass.TopModule} {{ @" export class Vector2 { - x: number; - y: number; + x: number + y: number constructor(x: number, y: number) { - this.x = x; - this.y = y; + this.x = x + this.y = y } static from(_buf_: Bright.Serialization.ByteBuf): Vector2 { - let x = _buf_.ReadFloat(); - let y = _buf_.ReadFloat(); - return new Vector2(x, y); + let x = _buf_.ReadFloat() + let y = _buf_.ReadFloat() + return new Vector2(x, y) } } export class Vector3 { - x: number; - y: number; - z: number; + x: number + y: number + z: number constructor(x: number, y: number, z: number) { - this.x = x; - this.y = y; - this.z = z; + this.x = x + this.y = y + this.z = z } static from(_buf_: Bright.Serialization.ByteBuf): Vector3 { - let x = _buf_.ReadFloat(); - let y = _buf_.ReadFloat(); - let z = _buf_.ReadFloat(); - return new Vector3(x, y, z); + let x = _buf_.ReadFloat() + let y = _buf_.ReadFloat() + let z = _buf_.ReadFloat() + return new Vector3(x, y, z) } } export class Vector4 { - x: number; - y: number; - z: number; - w: number; + x: number + y: number + z: number + w: number constructor(x: number, y: number, z: number, w: number) { - this.x = x; - this.y = y; - this.z = z; - this.w = w; + this.x = x + this.y = y + this.z = z + this.w = w } static from(_buf_: Bright.Serialization.ByteBuf): Vector4 { - let x = _buf_.ReadFloat(); - let y = _buf_.ReadFloat(); - let z = _buf_.ReadFloat(); - let w = _buf_.ReadFloat(); - return new Vector4(x, y, z, w); + let x = _buf_.ReadFloat() + let y = _buf_.ReadFloat() + let z = _buf_.ReadFloat() + let w = _buf_.ReadFloat() + return new Vector4(x, y, z, w) } } diff --git a/src/Luban.Job.Proto/Source/Generate/TypescriptRender.cs b/src/Luban.Job.Proto/Source/Generate/TypescriptRender.cs index 1e6cec0..184a21c 100644 --- a/src/Luban.Job.Proto/Source/Generate/TypescriptRender.cs +++ b/src/Luban.Job.Proto/Source/Generate/TypescriptRender.cs @@ -57,7 +57,7 @@ namespace Luban.Job.Proto.Generate export {{if x.is_abstract_type}} abstract {{end}} class {{name}} extends {{if parent_def_type}}{{x.parent}}{{else}}BeanBase{{end}} { {{~if x.is_abstract_type~}} - static serializeTo(_buf_ : Bright.Serialization.ByteBuf, _bean_ : {{name}}) : void { + static serializeTo(_buf_ : Bright.Serialization.ByteBuf, _bean_ : {{name}}) { if (_bean_ == null) { _buf_.WriteInt(0) return @@ -69,11 +69,11 @@ export {{if x.is_abstract_type}} abstract {{end}} class {{name}} extends {{if pa static deserializeFrom(_buf_ : Bright.Serialization.ByteBuf) : {{name}} { let _bean_ :{{name}} switch (_buf_.ReadInt()) { - case 0 : return null; + case 0 : return null {{~ for child in x.hierarchy_not_abstract_children~}} - case {{child.id}}: _bean_ = new {{child.full_name}}(_buf_); break; + case {{child.id}}: _bean_ = new {{child.full_name}}(_buf_); break {{~end~}} - default: throw new Error(); + default: throw new Error() } _bean_.deserialize(_buf_) return _bean_ @@ -86,12 +86,12 @@ export {{if x.is_abstract_type}} abstract {{end}} class {{name}} extends {{if pa {{~ for field in fields ~}} - {{field.ts_style_name}}{{if field.is_nullable}}?{{end}} : {{ts_define_type field.ctype}}; + {{field.ts_style_name}}{{if field.is_nullable}}?{{end}} : {{ts_define_type field.ctype}} {{~end~}} serialize(_buf_ : Bright.Serialization.ByteBuf) { {{~if parent_def_type~}} - super.serialize(_buf_); + super.serialize(_buf_) {{~end~}} {{~ for field in fields ~}} {{ts_bin_serialize ('this.' + field.ts_style_name) '_buf_' field.ctype}} @@ -100,7 +100,7 @@ export {{if x.is_abstract_type}} abstract {{end}} class {{name}} extends {{if pa deserialize(_buf_ : Bright.Serialization.ByteBuf) { {{~if parent_def_type~}} - super.deserialize(_buf_); + super.deserialize(_buf_) {{~end~}} {{~ for field in fields ~}} {{ts_bin_deserialize ('this.' + field.ts_style_name) '_buf_' field.ctype}} @@ -112,7 +112,7 @@ export {{if x.is_abstract_type}} abstract {{end}} class {{name}} extends {{if pa {{~ for field in hierarchy_fields ~}} + ""{{field.ts_style_name}}:"" + this.{{field.ts_style_name}} + "","" {{~end~}} - + ""}""; + + ""}"" } } {{x.typescript_namespace_end}} @@ -141,7 +141,7 @@ export class {{name}} extends Protocol { {{~ for field in fields ~}} - {{field.ts_style_name}}{{if field.is_nullable}}?{{end}} : {{ts_define_type field.ctype}}; + {{field.ts_style_name}}{{if field.is_nullable}}?{{end}} : {{ts_define_type field.ctype}} {{~end~}} serialize(_buf_ : Bright.Serialization.ByteBuf) { @@ -161,7 +161,7 @@ export class {{name}} extends Protocol { {{~ for field in fields ~}} + ""{{field.ts_style_name}}:"" + this.{{field.ts_style_name}} + "","" {{~end~}} - + ""}""; + + ""}"" } } {{x.typescript_namespace_end}}