From 59bc9ed84b2997759e9217c9517522c043c86842 Mon Sep 17 00:00:00 2001 From: Crevil Date: Thu, 5 Apr 2018 22:20:52 +0200 Subject: [PATCH 1/3] Handle reserved keywords as protoc javascript generator --- src/lib/Utility.ts | 71 ++++++++++++++++++++++ src/lib/format/partial/MessageFormatter.ts | 7 ++- 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/src/lib/Utility.ts b/src/lib/Utility.ts index f518d86..c75b0b5 100644 --- a/src/lib/Utility.ts +++ b/src/lib/Utility.ts @@ -73,4 +73,75 @@ export namespace Utility { }); } + export function isReserved(name: string): boolean { + for (const keyword of reservedKeywords) { + if (name === keyword) { + return true; + } + } + return false; + } + + // reserved Javascript keywords used by the Javascript generator + // src: https://github.com/google/protobuf/blob/ed4321d1cb33199984118d801956822842771e7e/src/google/protobuf/compiler/js/js_generator.cc#L60-L119 + const reservedKeywords = [ + "abstract", + "boolean", + "break", + "byte", + "case", + "catch", + "char", + "class", + "const", + "continue", + "debugger", + "default", + "delete", + "do", + "double", + "else", + "enum", + "export", + "extends", + "false", + "final", + "finally", + "float", + "for", + "function", + "goto", + "if", + "implements", + "import", + "in", + "instanceof", + "int", + "interface", + "long", + "native", + "new", + "null", + "package", + "private", + "protected", + "public", + "return", + "short", + "static", + "super", + "switch", + "synchronized", + "this", + "throw", + "throws", + "transient", + "try", + "typeof", + "var", + "void", + "volatile", + "while", + "with", + ]; } diff --git a/src/lib/format/partial/MessageFormatter.ts b/src/lib/format/partial/MessageFormatter.ts index 96ad7bf..f20fc01 100644 --- a/src/lib/format/partial/MessageFormatter.ts +++ b/src/lib/format/partial/MessageFormatter.ts @@ -128,6 +128,11 @@ export namespace MessageFormatter { fieldData.snakeCaseName = field.getName().toLowerCase(); fieldData.camelCaseName = Utility.snakeToCamel(fieldData.snakeCaseName); fieldData.camelUpperName = Utility.uppercaseFirst(fieldData.camelCaseName); + // handle reserved keywords in field names like Javascript generator + // see: https://github.com/google/protobuf/blob/ed4321d1cb33199984118d801956822842771e7e/src/google/protobuf/compiler/js/js_generator.cc#L508-L510 + if (Utility.isReserved(fieldData.camelCaseName)) { + fieldData.camelCaseName = `pb_${fieldData.camelCaseName}` + } fieldData.type = field.getType(); fieldData.isMapField = false; fieldData.canBeUndefined = false; @@ -255,4 +260,4 @@ export namespace MessageFormatter { }); } -} \ No newline at end of file +} From 422ab91b18300564a498efce5fe3d15c22c4c286 Mon Sep 17 00:00:00 2001 From: Crevil Date: Thu, 5 Apr 2018 22:23:14 +0200 Subject: [PATCH 2/3] Build source --- build/index.js.map | 2 +- build/lib/ExportMap.js.map | 2 +- build/lib/TplEngine.js.map | 2 +- build/lib/Utility.js | 71 +++++++++++++++++++ build/lib/Utility.js.map | 2 +- build/lib/format/ProtoMsgTsdFormatter.js.map | 2 +- build/lib/format/ProtoSvcTsdFormatter.js.map | 2 +- build/lib/format/partial/EnumFormatter.js.map | 2 +- .../format/partial/ExtensionFormatter.js.map | 2 +- .../format/partial/FieldTypesFormatter.js.map | 2 +- build/lib/format/partial/MessageFormatter.js | 5 ++ .../format/partial/MessageFormatter.js.map | 2 +- .../lib/format/partial/OneofFormatter.js.map | 2 +- 13 files changed, 87 insertions(+), 11 deletions(-) diff --git a/build/index.js.map b/build/index.js.map index 34e75bb..88114f4 100644 --- a/build/index.js.map +++ b/build/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,+CAA0C;AAC1C,2CAAsC;AACtC,kFAA+G;AAG/G,4EAAuE;AACvE,4EAAuE;AAEvE,iBAAO,CAAC,YAAY,CAAC,CAAC,SAAiB;IAEnC,IAAI,CAAC;QACD,IAAI,cAAc,GAAG,IAAI,UAAU,CAAE,SAAiB,CAAC,MAAM,CAAC,CAAC;QAC/D,sCAAsC;QACtC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAE9B,IAAI,cAAc,GAAG,gCAAoB,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QAC5E,IAAI,eAAe,GAAG,IAAI,iCAAqB,EAAE,CAAC;QAClD,IAAI,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;QAChC,IAAI,oBAAoB,GAA2C,EAAE,CAAC;QAEtE,cAAc,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC,mBAAmB;YACzD,oBAAoB,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC,GAAG,mBAAmB,CAAC;YAC1E,SAAS,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QAEH,cAAc,CAAC,qBAAqB,EAAE,CAAC,OAAO,CAAC,QAAQ;YACnD,eAAe;YACf,IAAI,WAAW,GAAG,iBAAO,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC;YAChE,IAAI,UAAU,GAAG,IAAI,iCAAqB,CAAC,IAAI,EAAE,CAAC;YAClD,UAAU,CAAC,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,CAAC;YAC1C,UAAU,CAAC,UAAU,CAAC,2CAAoB,CAAC,MAAM,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;YAC9F,eAAe,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAEpC,eAAe;YACf,IAAI,oBAAoB,GAAG,2CAAoB,CAAC,MAAM,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,CAAC;YAClG,EAAE,CAAC,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,CAAC;gBAC7B,IAAI,WAAW,GAAG,iBAAO,CAAC,8BAA8B,CAAC,QAAQ,CAAC,CAAC;gBACnE,IAAI,UAAU,GAAG,IAAI,iCAAqB,CAAC,IAAI,EAAE,CAAC;gBAClD,UAAU,CAAC,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,CAAC;gBAC1C,UAAU,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;gBAC5C,eAAe,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACxC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,eAAe,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IACxE,CAAC;IAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,uBAAuB,GAAG,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;QAC1D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;AAEL,CAAC,CAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,+CAA0C;AAC1C,2CAAsC;AACtC,kFAA+G;AAG/G,4EAAuE;AACvE,4EAAuE;AAEvE,iBAAO,CAAC,YAAY,CAAC,CAAC,SAAiB,EAAE,EAAE;IAEvC,IAAI;QACA,IAAI,cAAc,GAAG,IAAI,UAAU,CAAE,SAAiB,CAAC,MAAM,CAAC,CAAC;QAC/D,sCAAsC;QACtC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAE9B,IAAI,cAAc,GAAG,gCAAoB,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QAC5E,IAAI,eAAe,GAAG,IAAI,iCAAqB,EAAE,CAAC;QAClD,IAAI,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;QAChC,IAAI,oBAAoB,GAA2C,EAAE,CAAC;QAEtE,cAAc,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE;YAC5D,oBAAoB,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC,GAAG,mBAAmB,CAAC;YAC1E,SAAS,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QAEH,cAAc,CAAC,qBAAqB,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACtD,eAAe;YACf,IAAI,WAAW,GAAG,iBAAO,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC;YAChE,IAAI,UAAU,GAAG,IAAI,iCAAqB,CAAC,IAAI,EAAE,CAAC;YAClD,UAAU,CAAC,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,CAAC;YAC1C,UAAU,CAAC,UAAU,CAAC,2CAAoB,CAAC,MAAM,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;YAC9F,eAAe,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAEpC,eAAe;YACf,IAAI,oBAAoB,GAAG,2CAAoB,CAAC,MAAM,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,CAAC;YAClG,IAAI,oBAAoB,IAAI,EAAE,EAAE;gBAC5B,IAAI,WAAW,GAAG,iBAAO,CAAC,8BAA8B,CAAC,QAAQ,CAAC,CAAC;gBACnE,IAAI,UAAU,GAAG,IAAI,iCAAqB,CAAC,IAAI,EAAE,CAAC;gBAClD,UAAU,CAAC,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,CAAC;gBAC1C,UAAU,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;gBAC5C,eAAe,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;aACvC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,eAAe,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;KACvE;IAAC,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,uBAAuB,GAAG,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;QAC1D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACnB;AAEL,CAAC,CAAC,CAAC"} \ No newline at end of file diff --git a/build/lib/ExportMap.js.map b/build/lib/ExportMap.js.map index 51b7b7e..c6c8c8e 100644 --- a/build/lib/ExportMap.js.map +++ b/build/lib/ExportMap.js.map @@ -1 +1 @@ -{"version":3,"file":"ExportMap.js","sourceRoot":"","sources":["../../src/lib/ExportMap.ts"],"names":[],"mappings":";;AA0BA;IAAA;QACI,eAAU,GAA0C,EAAE,CAAC;QACvD,YAAO,GAAuC,EAAE,CAAC;IAoDrD,CAAC;IAlDG,YAAY,CAAC,KAAa,EAAE,cAAmC,EAAE,OAAwB;QACrF,MAAM,YAAY,GAAuB;YACrC,GAAG,EAAE,cAAc,CAAC,UAAU,EAAE;YAChC,QAAQ,EAAE,cAAc,CAAC,OAAO,EAAE;YAClC,cAAc,EAAE,OAAO,CAAC,UAAU,EAAE;YACpC,eAAe,EAAE,OAAO,CAAC,UAAU,EAAE,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,WAAW,EAAE,GAAG;gBAC1E,GAAG,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC5F,KAAK,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aACjG,GAAG,SAAS;SAChB,CAAC;QAEF,MAAM,SAAS,GAAG,GAAG,KAAK,GAAG,KAAK,GAAG,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;QACpE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,YAAY,CAAC;QAE1C,OAAO,CAAC,iBAAiB,EAAE,CAAC,OAAO,CAAC,MAAM;YACtC,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,GAAG,GAAG,OAAO,CAAC,OAAO,EAAE,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;QAC/E,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,QAAQ;YACtC,MAAM,UAAU,GAAG,KAAK,GAAG,GAAG,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC;YAC9E,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;gBACvB,GAAG,EAAE,cAAc,CAAC,UAAU,EAAE;gBAChC,QAAQ,EAAE,cAAc,CAAC,OAAO,EAAE;gBAClC,WAAW,EAAE,QAAQ,CAAC,UAAU,EAAE;aACrC,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,iBAAiB,CAAC,cAAmC;QACjD,MAAM,KAAK,GAAG,cAAc,CAAC,UAAU,EAAE,CAAC;QAC1C,cAAc,CAAC,kBAAkB,EAAE,CAAC,OAAO,CAAC,WAAW;YACnD,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QAEH,cAAc,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,QAAQ;YAC7C,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,GAAG,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG;gBAC7C,GAAG,EAAE,cAAc,CAAC,UAAU,EAAE;gBAChC,QAAQ,EAAE,cAAc,CAAC,OAAO,EAAE;gBAClC,WAAW,EAAE,QAAQ,CAAC,UAAU,EAAE;aACrC,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,UAAU,CAAC,GAAW;QAClB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,CAAC,GAAW;QACf,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;CACJ;AAtDD,8BAsDC"} \ No newline at end of file +{"version":3,"file":"ExportMap.js","sourceRoot":"","sources":["../../src/lib/ExportMap.ts"],"names":[],"mappings":";;AA0BA;IAAA;QACI,eAAU,GAA0C,EAAE,CAAC;QACvD,YAAO,GAAuC,EAAE,CAAC;IAoDrD,CAAC;IAlDG,YAAY,CAAC,KAAa,EAAE,cAAmC,EAAE,OAAwB;QACrF,MAAM,YAAY,GAAuB;YACrC,GAAG,EAAE,cAAc,CAAC,UAAU,EAAE;YAChC,QAAQ,EAAE,cAAc,CAAC,OAAO,EAAE;YAClC,cAAc,EAAE,OAAO,CAAC,UAAU,EAAE;YACpC,eAAe,EAAE,OAAO,CAAC,UAAU,EAAE,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;gBAC1E,GAAG,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC5F,KAAK,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aACjG,CAAC,CAAC,CAAC,SAAS;SAChB,CAAC;QAEF,MAAM,SAAS,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;QACpE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,YAAY,CAAC;QAE1C,OAAO,CAAC,iBAAiB,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACzC,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,GAAG,GAAG,OAAO,CAAC,OAAO,EAAE,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;QAC/E,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACzC,MAAM,UAAU,GAAG,KAAK,GAAG,GAAG,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC;YAC9E,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;gBACvB,GAAG,EAAE,cAAc,CAAC,UAAU,EAAE;gBAChC,QAAQ,EAAE,cAAc,CAAC,OAAO,EAAE;gBAClC,WAAW,EAAE,QAAQ,CAAC,UAAU,EAAE;aACrC,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,iBAAiB,CAAC,cAAmC;QACjD,MAAM,KAAK,GAAG,cAAc,CAAC,UAAU,EAAE,CAAC;QAC1C,cAAc,CAAC,kBAAkB,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YACtD,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QAEH,cAAc,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAChD,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,GAAG,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG;gBAC7C,GAAG,EAAE,cAAc,CAAC,UAAU,EAAE;gBAChC,QAAQ,EAAE,cAAc,CAAC,OAAO,EAAE;gBAClC,WAAW,EAAE,QAAQ,CAAC,UAAU,EAAE;aACrC,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,UAAU,CAAC,GAAW;QAClB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,CAAC,GAAW;QACf,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;CACJ;AAtDD,8BAsDC"} \ No newline at end of file diff --git a/build/lib/TplEngine.js.map b/build/lib/TplEngine.js.map index c2ea451..7909216 100644 --- a/build/lib/TplEngine.js.map +++ b/build/lib/TplEngine.js.map @@ -1 +1 @@ -{"version":3,"file":"TplEngine.js","sourceRoot":"","sources":["../../src/lib/TplEngine.ts"],"names":[],"mappings":";;AAAA,4BAA4B;AAC5B,gCAAgC;AAChC,yCAAyC;AACzC,8CAA8C;AAE9C,OAAO,CAAC,EAAC,UAAU,EAAE,UAAU,EAAC,CAAC,CAAC;AAClC,UAAU,CAAC,cAAc,CAAC,WAAW,EAAE;IACnC,MAAM,CAAC,GAAG,CAAC;AACf,CAAC,CAAC,CAAC;AACH,UAAU,CAAC,cAAc,CAAC,YAAY,EAAE;IACpC,MAAM,CAAC,GAAG,CAAC;AACf,CAAC,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;AAE1D,IAAiB,SAAS,CAgBzB;AAhBD,WAAiB,SAAS;IAEtB,wBAA+B,IAAY,EAAE,EAAY,EAAE,OAAiB;QACxE,UAAU,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAFe,wBAAc,iBAE7B,CAAA;IAED,gBAAuB,YAAoB,EAAE,MAA8B;QACvE,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAFe,gBAAM,SAErB,CAAA;IAED,iBAAwB,YAAoB;QACxC,MAAM,CAAC,UAAU,CAAC,OAAO,CACrB,KAAK,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CACpF,CAAC;IACN,CAAC;IAJe,iBAAO,UAItB,CAAA;AAEL,CAAC,EAhBgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAgBzB"} \ No newline at end of file +{"version":3,"file":"TplEngine.js","sourceRoot":"","sources":["../../src/lib/TplEngine.ts"],"names":[],"mappings":";;AAAA,4BAA4B;AAC5B,gCAAgC;AAChC,yCAAyC;AACzC,8CAA8C;AAE9C,OAAO,CAAC,EAAC,UAAU,EAAE,UAAU,EAAC,CAAC,CAAC;AAClC,UAAU,CAAC,cAAc,CAAC,WAAW,EAAE;IACnC,OAAO,GAAG,CAAC;AACf,CAAC,CAAC,CAAC;AACH,UAAU,CAAC,cAAc,CAAC,YAAY,EAAE;IACpC,OAAO,GAAG,CAAC;AACf,CAAC,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;AAE1D,IAAiB,SAAS,CAgBzB;AAhBD,WAAiB,SAAS;IAEtB,wBAA+B,IAAY,EAAE,EAAY,EAAE,OAAiB;QACxE,UAAU,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAFe,wBAAc,iBAE7B,CAAA;IAED,gBAAuB,YAAoB,EAAE,MAA8B;QACvE,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAFe,gBAAM,SAErB,CAAA;IAED,iBAAwB,YAAoB;QACxC,OAAO,UAAU,CAAC,OAAO,CACrB,KAAK,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CACpF,CAAC;IACN,CAAC;IAJe,iBAAO,UAItB,CAAA;AAEL,CAAC,EAhBgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAgBzB"} \ No newline at end of file diff --git a/build/lib/Utility.js b/build/lib/Utility.js index e0e0a07..a0abaec 100644 --- a/build/lib/Utility.js +++ b/build/lib/Utility.js @@ -69,5 +69,76 @@ var Utility; }); } Utility.withAllStdIn = withAllStdIn; + function isReserved(name) { + for (const keyword of reservedKeywords) { + if (name === keyword) { + return true; + } + } + return false; + } + Utility.isReserved = isReserved; + // reserved Javascript keywords used by the Javascript generator + // src: https://github.com/google/protobuf/blob/ed4321d1cb33199984118d801956822842771e7e/src/google/protobuf/compiler/js/js_generator.cc#L60-L119 + const reservedKeywords = [ + "abstract", + "boolean", + "break", + "byte", + "case", + "catch", + "char", + "class", + "const", + "continue", + "debugger", + "default", + "delete", + "do", + "double", + "else", + "enum", + "export", + "extends", + "false", + "final", + "finally", + "float", + "for", + "function", + "goto", + "if", + "implements", + "import", + "in", + "instanceof", + "int", + "interface", + "long", + "native", + "new", + "null", + "package", + "private", + "protected", + "public", + "return", + "short", + "static", + "super", + "switch", + "synchronized", + "this", + "throw", + "throws", + "transient", + "try", + "typeof", + "var", + "void", + "volatile", + "while", + "with", + ]; })(Utility = exports.Utility || (exports.Utility = {})); //# sourceMappingURL=Utility.js.map \ No newline at end of file diff --git a/build/lib/Utility.js.map b/build/lib/Utility.js.map index f7a777e..3e348fa 100644 --- a/build/lib/Utility.js.map +++ b/build/lib/Utility.js.map @@ -1 +1 @@ -{"version":3,"file":"Utility.js","sourceRoot":"","sources":["../../src/lib/Utility.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Utility.js","sourceRoot":"","sources":["../../src/lib/Utility.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/build/lib/format/ProtoMsgTsdFormatter.js.map b/build/lib/format/ProtoMsgTsdFormatter.js.map index 7fcbed3..479b6bb 100644 --- a/build/lib/format/ProtoMsgTsdFormatter.js.map +++ b/build/lib/format/ProtoMsgTsdFormatter.js.map @@ -1 +1 @@ -{"version":3,"file":"ProtoMsgTsdFormatter.js","sourceRoot":"","sources":["../../../src/lib/format/ProtoMsgTsdFormatter.ts"],"names":[],"mappings":";;AAEA,wCAAmC;AACnC,4CAA+C;AAC/C,4CAAuC;AACvC,iEAA4D;AAC5D,qEAAgE;AAChE,2DAAsD;AACtD,0DAAqD;AAErD,IAAiB,oBAAoB,CA+CpC;AA/CD,WAAiB,oBAAoB;IAEjC,gBAAuB,UAA+B,EAAE,SAAoB;QACxE,IAAI,QAAQ,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;QACpC,IAAI,WAAW,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;QAE1C,IAAI,OAAO,GAAkB,EAAE,CAAC;QAChC,IAAI,QAAQ,GAAkB,EAAE,CAAC;QACjC,IAAI,UAAU,GAAkB,EAAE,CAAC;QACnC,IAAI,KAAK,GAAkB,EAAE,CAAC;QAE9B,IAAI,QAAQ,GAAG,iBAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAE/C,OAAO,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;QACzD,UAAU,CAAC,iBAAiB,EAAE,CAAC,OAAO,CAAC,CAAC,UAAkB;YACtD,EAAE,CAAC,CAAC,mCAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC9C,MAAM,CAAC,CAAC,WAAW;YACvB,CAAC;YACD,IAAI,eAAe,GAAG,iBAAO,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;YACpE,EAAE,CAAC,CAAC,UAAU,IAAI,6BAAiB,CAAC,CAAC,CAAC;gBAClC,OAAO,CAAC,IAAI,CAAC,eAAe,eAAe,UAAU,6BAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAC5F,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,IAAI,QAAQ,GAAG,iBAAO,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAC;gBAC/D,OAAO,CAAC,IAAI,CAAC,eAAe,eAAe,UAAU,QAAQ,GAAG,QAAQ,IAAI,CAAC,CAAC;YAClF,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,UAAU,CAAC,kBAAkB,EAAE,CAAC,OAAO,CAAC,QAAQ;YAC5C,QAAQ,CAAC,IAAI,CAAC,mCAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;QACzF,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC,SAAS;YAC3C,UAAU,CAAC,IAAI,CAAC,uCAAkB,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;QAClF,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,QAAQ;YACzC,KAAK,CAAC,IAAI,CAAC,6BAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,qBAAS,CAAC,MAAM,CAAC,SAAS,EAAE;YAC/B,WAAW,EAAE,WAAW;YACxB,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,OAAO;YAChB,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,UAAU;YACtB,KAAK,EAAE,KAAK;SACf,CAAC,CAAC;IACP,CAAC;IA3Ce,2BAAM,SA2CrB,CAAA;AAEL,CAAC,EA/CgB,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QA+CpC"} \ No newline at end of file +{"version":3,"file":"ProtoMsgTsdFormatter.js","sourceRoot":"","sources":["../../../src/lib/format/ProtoMsgTsdFormatter.ts"],"names":[],"mappings":";;AAEA,wCAAmC;AACnC,4CAA+C;AAC/C,4CAAuC;AACvC,iEAA4D;AAC5D,qEAAgE;AAChE,2DAAsD;AACtD,0DAAqD;AAErD,IAAiB,oBAAoB,CA+CpC;AA/CD,WAAiB,oBAAoB;IAEjC,gBAAuB,UAA+B,EAAE,SAAoB;QACxE,IAAI,QAAQ,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;QACpC,IAAI,WAAW,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;QAE1C,IAAI,OAAO,GAAkB,EAAE,CAAC;QAChC,IAAI,QAAQ,GAAkB,EAAE,CAAC;QACjC,IAAI,UAAU,GAAkB,EAAE,CAAC;QACnC,IAAI,KAAK,GAAkB,EAAE,CAAC;QAE9B,IAAI,QAAQ,GAAG,iBAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAE/C,OAAO,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;QACzD,UAAU,CAAC,iBAAiB,EAAE,CAAC,OAAO,CAAC,CAAC,UAAkB,EAAE,EAAE;YAC1D,IAAI,mCAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE;gBAC7C,OAAO,CAAC,WAAW;aACtB;YACD,IAAI,eAAe,GAAG,iBAAO,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;YACpE,IAAI,UAAU,IAAI,6BAAiB,EAAE;gBACjC,OAAO,CAAC,IAAI,CAAC,eAAe,eAAe,UAAU,6BAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;aAC3F;iBAAM;gBACH,IAAI,QAAQ,GAAG,iBAAO,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAC;gBAC/D,OAAO,CAAC,IAAI,CAAC,eAAe,eAAe,UAAU,QAAQ,GAAG,QAAQ,IAAI,CAAC,CAAC;aACjF;QACL,CAAC,CAAC,CAAC;QAEH,UAAU,CAAC,kBAAkB,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC/C,QAAQ,CAAC,IAAI,CAAC,mCAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;QACzF,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC9C,UAAU,CAAC,IAAI,CAAC,uCAAkB,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;QAClF,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC5C,KAAK,CAAC,IAAI,CAAC,6BAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,OAAO,qBAAS,CAAC,MAAM,CAAC,SAAS,EAAE;YAC/B,WAAW,EAAE,WAAW;YACxB,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,OAAO;YAChB,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,UAAU;YACtB,KAAK,EAAE,KAAK;SACf,CAAC,CAAC;IACP,CAAC;IA3Ce,2BAAM,SA2CrB,CAAA;AAEL,CAAC,EA/CgB,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QA+CpC"} \ No newline at end of file diff --git a/build/lib/format/ProtoSvcTsdFormatter.js.map b/build/lib/format/ProtoSvcTsdFormatter.js.map index 1a3f851..d5c6ffe 100644 --- a/build/lib/format/ProtoSvcTsdFormatter.js.map +++ b/build/lib/format/ProtoSvcTsdFormatter.js.map @@ -1 +1 @@ -{"version":3,"file":"ProtoSvcTsdFormatter.js","sourceRoot":"","sources":["../../../src/lib/format/ProtoSvcTsdFormatter.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ProtoSvcTsdFormatter.js","sourceRoot":"","sources":["../../../src/lib/format/ProtoSvcTsdFormatter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/build/lib/format/partial/EnumFormatter.js.map b/build/lib/format/partial/EnumFormatter.js.map index 0f2590a..bf2a947 100644 --- a/build/lib/format/partial/EnumFormatter.js.map +++ b/build/lib/format/partial/EnumFormatter.js.map @@ -1 +1 @@ -{"version":3,"file":"EnumFormatter.js","sourceRoot":"","sources":["../../../../src/lib/format/partial/EnumFormatter.ts"],"names":[],"mappings":";;AACA,+CAA0C;AAC1C,2CAAsC;AAEtC,IAAiB,aAAa,CAgB7B;AAhBD,WAAiB,aAAa;IAE1B,gBAAuB,cAAmC,EAAE,WAAmB;QAC3E,IAAI,QAAQ,GAAG,cAAc,CAAC,OAAO,EAAE,CAAC;QACxC,IAAI,MAAM,GAA8B,EAAE,CAAC;QAC3C,cAAc,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC,KAAK;YACvC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,qBAAS,CAAC,MAAM,CAAC,cAAc,EAAE;YACpC,MAAM,EAAE,iBAAO,CAAC,cAAc,CAAC,WAAW,CAAC;YAC3C,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,MAAM;SACjB,CAAC,CAAC;IACP,CAAC;IAZe,oBAAM,SAYrB,CAAA;AAEL,CAAC,EAhBgB,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAgB7B"} \ No newline at end of file +{"version":3,"file":"EnumFormatter.js","sourceRoot":"","sources":["../../../../src/lib/format/partial/EnumFormatter.ts"],"names":[],"mappings":";;AACA,+CAA0C;AAC1C,2CAAsC;AAEtC,IAAiB,aAAa,CAgB7B;AAhBD,WAAiB,aAAa;IAE1B,gBAAuB,cAAmC,EAAE,WAAmB;QAC3E,IAAI,QAAQ,GAAG,cAAc,CAAC,OAAO,EAAE,CAAC;QACxC,IAAI,MAAM,GAA8B,EAAE,CAAC;QAC3C,cAAc,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC1C,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,OAAO,qBAAS,CAAC,MAAM,CAAC,cAAc,EAAE;YACpC,MAAM,EAAE,iBAAO,CAAC,cAAc,CAAC,WAAW,CAAC;YAC3C,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,MAAM;SACjB,CAAC,CAAC;IACP,CAAC;IAZe,oBAAM,SAYrB,CAAA;AAEL,CAAC,EAhBgB,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAgB7B"} \ No newline at end of file diff --git a/build/lib/format/partial/ExtensionFormatter.js.map b/build/lib/format/partial/ExtensionFormatter.js.map index 6e3ca5e..a7391f0 100644 --- a/build/lib/format/partial/ExtensionFormatter.js.map +++ b/build/lib/format/partial/ExtensionFormatter.js.map @@ -1 +1 @@ -{"version":3,"file":"ExtensionFormatter.js","sourceRoot":"","sources":["../../../../src/lib/format/partial/ExtensionFormatter.ts"],"names":[],"mappings":";;AACA,+CAA0C;AAC1C,2CAAsC;AAEtC,+DAA0D;AAE1D,IAAiB,kBAAkB,CAmBlC;AAnBD,WAAiB,kBAAkB;IAE/B,gBAAuB,QAAgB,EAChB,SAAoB,EACpB,SAA+B,EAC/B,WAAmB;QAEtC,IAAI,aAAa,GAAG,iBAAO,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9D,IAAI,SAAS,GAAG,yCAAmB,CAAC,YAAY,CAC5C,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,CAC7E,CAAC;QAEF,MAAM,CAAC,qBAAS,CAAC,MAAM,CAAC,mBAAmB,EAAE;YACzC,MAAM,EAAE,iBAAO,CAAC,cAAc,CAAC,WAAW,CAAC;YAC3C,aAAa,EAAE,aAAa;YAC5B,SAAS,EAAE,SAAS;SACvB,CAAC,CAAC;IACP,CAAC;IAfe,yBAAM,SAerB,CAAA;AAEL,CAAC,EAnBgB,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAmBlC"} \ No newline at end of file +{"version":3,"file":"ExtensionFormatter.js","sourceRoot":"","sources":["../../../../src/lib/format/partial/ExtensionFormatter.ts"],"names":[],"mappings":";;AACA,+CAA0C;AAC1C,2CAAsC;AAEtC,+DAA0D;AAE1D,IAAiB,kBAAkB,CAmBlC;AAnBD,WAAiB,kBAAkB;IAE/B,gBAAuB,QAAgB,EAChB,SAAoB,EACpB,SAA+B,EAC/B,WAAmB;QAEtC,IAAI,aAAa,GAAG,iBAAO,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9D,IAAI,SAAS,GAAG,yCAAmB,CAAC,YAAY,CAC5C,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,CAC7E,CAAC;QAEF,OAAO,qBAAS,CAAC,MAAM,CAAC,mBAAmB,EAAE;YACzC,MAAM,EAAE,iBAAO,CAAC,cAAc,CAAC,WAAW,CAAC;YAC3C,aAAa,EAAE,aAAa;YAC5B,SAAS,EAAE,SAAS;SACvB,CAAC,CAAC;IACP,CAAC;IAfe,yBAAM,SAerB,CAAA;AAEL,CAAC,EAnBgB,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAmBlC"} \ No newline at end of file diff --git a/build/lib/format/partial/FieldTypesFormatter.js.map b/build/lib/format/partial/FieldTypesFormatter.js.map index 889c6ec..9e0fe02 100644 --- a/build/lib/format/partial/FieldTypesFormatter.js.map +++ b/build/lib/format/partial/FieldTypesFormatter.js.map @@ -1 +1 @@ -{"version":3,"file":"FieldTypesFormatter.js","sourceRoot":"","sources":["../../../../src/lib/format/partial/FieldTypesFormatter.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"FieldTypesFormatter.js","sourceRoot":"","sources":["../../../../src/lib/format/partial/FieldTypesFormatter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/build/lib/format/partial/MessageFormatter.js b/build/lib/format/partial/MessageFormatter.js index f5c36a4..8087b9b 100644 --- a/build/lib/format/partial/MessageFormatter.js +++ b/build/lib/format/partial/MessageFormatter.js @@ -71,6 +71,11 @@ var MessageFormatter; fieldData.snakeCaseName = field.getName().toLowerCase(); fieldData.camelCaseName = Utility_1.Utility.snakeToCamel(fieldData.snakeCaseName); fieldData.camelUpperName = Utility_1.Utility.uppercaseFirst(fieldData.camelCaseName); + // handle reserved keywords in field names like Javascript generator + // see: https://github.com/google/protobuf/blob/ed4321d1cb33199984118d801956822842771e7e/src/google/protobuf/compiler/js/js_generator.cc#L508-L510 + if (Utility_1.Utility.isReserved(fieldData.camelCaseName)) { + fieldData.camelCaseName = `pb_${fieldData.camelCaseName}`; + } fieldData.type = field.getType(); fieldData.isMapField = false; fieldData.canBeUndefined = false; diff --git a/build/lib/format/partial/MessageFormatter.js.map b/build/lib/format/partial/MessageFormatter.js.map index faf4c17..7056b32 100644 --- a/build/lib/format/partial/MessageFormatter.js.map +++ b/build/lib/format/partial/MessageFormatter.js.map @@ -1 +1 @@ -{"version":3,"file":"MessageFormatter.js","sourceRoot":"","sources":["../../../../src/lib/format/partial/MessageFormatter.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"MessageFormatter.js","sourceRoot":"","sources":["../../../../src/lib/format/partial/MessageFormatter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/build/lib/format/partial/OneofFormatter.js.map b/build/lib/format/partial/OneofFormatter.js.map index 1698b55..25a08a3 100644 --- a/build/lib/format/partial/OneofFormatter.js.map +++ b/build/lib/format/partial/OneofFormatter.js.map @@ -1 +1 @@ -{"version":3,"file":"OneofFormatter.js","sourceRoot":"","sources":["../../../../src/lib/format/partial/OneofFormatter.ts"],"names":[],"mappings":";;AACA,+CAA0C;AAC1C,2CAAsC;AAEtC,IAAiB,cAAc,CAuB9B;AAvBD,WAAiB,cAAc;IAE3B,gBAAuB,SAA+B,EAC/B,WAAwC,EACxC,WAAmB;QAEtC,IAAI,SAAS,GAAG,iBAAO,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;QACvD,IAAI,cAAc,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;QAC7C,IAAI,MAAM,GAA8B,EAAE,CAAC;QAE3C,WAAW,CAAC,OAAO,CAAC,KAAK;YACrB,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE,CAAC,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,qBAAS,CAAC,MAAM,CAAC,eAAe,EAAE;YACrC,MAAM,EAAE,iBAAO,CAAC,cAAc,CAAC,WAAW,CAAC;YAC3C,SAAS,EAAE,SAAS;YACpB,cAAc,EAAE,cAAc;YAC9B,MAAM,EAAE,MAAM;SACjB,CAAC,CAAC;IAEP,CAAC;IAnBe,qBAAM,SAmBrB,CAAA;AAEL,CAAC,EAvBgB,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAuB9B"} \ No newline at end of file +{"version":3,"file":"OneofFormatter.js","sourceRoot":"","sources":["../../../../src/lib/format/partial/OneofFormatter.ts"],"names":[],"mappings":";;AACA,+CAA0C;AAC1C,2CAAsC;AAEtC,IAAiB,cAAc,CAuB9B;AAvBD,WAAiB,cAAc;IAE3B,gBAAuB,SAA+B,EAC/B,WAAwC,EACxC,WAAmB;QAEtC,IAAI,SAAS,GAAG,iBAAO,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;QACvD,IAAI,cAAc,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;QAC7C,IAAI,MAAM,GAA8B,EAAE,CAAC;QAE3C,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE,CAAC,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,OAAO,qBAAS,CAAC,MAAM,CAAC,eAAe,EAAE;YACrC,MAAM,EAAE,iBAAO,CAAC,cAAc,CAAC,WAAW,CAAC;YAC3C,SAAS,EAAE,SAAS;YACpB,cAAc,EAAE,cAAc;YAC9B,MAAM,EAAE,MAAM;SACjB,CAAC,CAAC;IAEP,CAAC;IAnBe,qBAAM,SAmBrB,CAAA;AAEL,CAAC,EAvBgB,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAuB9B"} \ No newline at end of file From 56d880ba8b5f3903c5f39cc832232b66670f4bc1 Mon Sep 17 00:00:00 2001 From: Crevil Date: Thu, 5 Apr 2018 22:23:51 +0200 Subject: [PATCH 3/3] Add SpecialCases message in example and generate examples --- examples/build/client.js.map | 2 +- examples/build/proto/book_pb.d.ts | 33 +++++ examples/build/proto/book_pb.js | 224 ++++++++++++++++++++++++++++++ examples/build/server.js.map | 2 +- examples/proto/book.proto | 12 +- examples/src/proto/book_pb.d.ts | 33 +++++ examples/src/proto/book_pb.js | 224 ++++++++++++++++++++++++++++++ 7 files changed, 527 insertions(+), 3 deletions(-) diff --git a/examples/build/client.js.map b/examples/build/client.js.map index 11e516c..834d0d0 100644 --- a/examples/build/client.js.map +++ b/examples/build/client.js.map @@ -1 +1 @@ -{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/examples/build/proto/book_pb.d.ts b/examples/build/proto/book_pb.d.ts index 7a5c293..17b1198 100644 --- a/examples/build/proto/book_pb.d.ts +++ b/examples/build/proto/book_pb.d.ts @@ -103,6 +103,39 @@ export namespace BookStore { } } +export class SpecialCases extends jspb.Message { + getNormal(): string; + setNormal(value: string): void; + + getDefault(): string; + setDefault(value: string): void; + + getFunction(): string; + setFunction(value: string): void; + + getVar(): string; + setVar(value: string): void; + + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): SpecialCases.AsObject; + static toObject(includeInstance: boolean, msg: SpecialCases): SpecialCases.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: SpecialCases, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): SpecialCases; + static deserializeBinaryFromReader(message: SpecialCases, reader: jspb.BinaryReader): SpecialCases; +} + +export namespace SpecialCases { + export type AsObject = { + normal: string, + pb_default: string, + pb_function: string, + pb_var: string, + } +} + export enum EnumSample { UNKNOWN = 0, STARTED = 1, diff --git a/examples/build/proto/book_pb.js b/examples/build/proto/book_pb.js index 5328726..741fb15 100644 --- a/examples/build/proto/book_pb.js +++ b/examples/build/proto/book_pb.js @@ -16,6 +16,7 @@ goog.exportSymbol('proto.com.book.BookStore', null, global); goog.exportSymbol('proto.com.book.EnumSample', null, global); goog.exportSymbol('proto.com.book.GetBookRequest', null, global); goog.exportSymbol('proto.com.book.GetBookViaAuthor', null, global); +goog.exportSymbol('proto.com.book.SpecialCases', null, global); /** * Generated by JsPbCodeGenerator. @@ -667,6 +668,229 @@ proto.com.book.BookStore.prototype.clearBooksMap = function() { }; + +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.com.book.SpecialCases = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.com.book.SpecialCases, jspb.Message); +if (goog.DEBUG && !COMPILED) { + proto.com.book.SpecialCases.displayName = 'proto.com.book.SpecialCases'; +} + + +if (jspb.Message.GENERATE_TO_OBJECT) { +/** + * Creates an object representation of this proto suitable for use in Soy templates. + * Field names that are reserved in JavaScript and will be renamed to pb_name. + * To access a reserved field use, foo.pb_, eg, foo.pb_default. + * For the list of reserved names please see: + * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. + * @param {boolean=} opt_includeInstance Whether to include the JSPB instance + * for transitional soy proto support: http://goto/soy-param-migration + * @return {!Object} + */ +proto.com.book.SpecialCases.prototype.toObject = function(opt_includeInstance) { + return proto.com.book.SpecialCases.toObject(opt_includeInstance, this); +}; + + +/** + * Static version of the {@see toObject} method. + * @param {boolean|undefined} includeInstance Whether to include the JSPB + * instance for transitional soy proto support: + * http://goto/soy-param-migration + * @param {!proto.com.book.SpecialCases} msg The msg instance to transform. + * @return {!Object} + * @suppress {unusedLocalVariables} f is only used for nested messages + */ +proto.com.book.SpecialCases.toObject = function(includeInstance, msg) { + var f, obj = { + normal: jspb.Message.getFieldWithDefault(msg, 1, ""), + pb_default: jspb.Message.getFieldWithDefault(msg, 2, ""), + pb_function: jspb.Message.getFieldWithDefault(msg, 3, ""), + pb_var: jspb.Message.getFieldWithDefault(msg, 4, "") + }; + + if (includeInstance) { + obj.$jspbMessageInstance = msg; + } + return obj; +}; +} + + +/** + * Deserializes binary data (in protobuf wire format). + * @param {jspb.ByteSource} bytes The bytes to deserialize. + * @return {!proto.com.book.SpecialCases} + */ +proto.com.book.SpecialCases.deserializeBinary = function(bytes) { + var reader = new jspb.BinaryReader(bytes); + var msg = new proto.com.book.SpecialCases; + return proto.com.book.SpecialCases.deserializeBinaryFromReader(msg, reader); +}; + + +/** + * Deserializes binary data (in protobuf wire format) from the + * given reader into the given message object. + * @param {!proto.com.book.SpecialCases} msg The message object to deserialize into. + * @param {!jspb.BinaryReader} reader The BinaryReader to use. + * @return {!proto.com.book.SpecialCases} + */ +proto.com.book.SpecialCases.deserializeBinaryFromReader = function(msg, reader) { + while (reader.nextField()) { + if (reader.isEndGroup()) { + break; + } + var field = reader.getFieldNumber(); + switch (field) { + case 1: + var value = /** @type {string} */ (reader.readString()); + msg.setNormal(value); + break; + case 2: + var value = /** @type {string} */ (reader.readString()); + msg.setDefault(value); + break; + case 3: + var value = /** @type {string} */ (reader.readString()); + msg.setFunction(value); + break; + case 4: + var value = /** @type {string} */ (reader.readString()); + msg.setVar(value); + break; + default: + reader.skipField(); + break; + } + } + return msg; +}; + + +/** + * Serializes the message to binary data (in protobuf wire format). + * @return {!Uint8Array} + */ +proto.com.book.SpecialCases.prototype.serializeBinary = function() { + var writer = new jspb.BinaryWriter(); + proto.com.book.SpecialCases.serializeBinaryToWriter(this, writer); + return writer.getResultBuffer(); +}; + + +/** + * Serializes the given message to binary data (in protobuf wire + * format), writing to the given BinaryWriter. + * @param {!proto.com.book.SpecialCases} message + * @param {!jspb.BinaryWriter} writer + * @suppress {unusedLocalVariables} f is only used for nested messages + */ +proto.com.book.SpecialCases.serializeBinaryToWriter = function(message, writer) { + var f = undefined; + f = message.getNormal(); + if (f.length > 0) { + writer.writeString( + 1, + f + ); + } + f = message.getDefault(); + if (f.length > 0) { + writer.writeString( + 2, + f + ); + } + f = message.getFunction(); + if (f.length > 0) { + writer.writeString( + 3, + f + ); + } + f = message.getVar(); + if (f.length > 0) { + writer.writeString( + 4, + f + ); + } +}; + + +/** + * optional string normal = 1; + * @return {string} + */ +proto.com.book.SpecialCases.prototype.getNormal = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, "")); +}; + + +/** @param {string} value */ +proto.com.book.SpecialCases.prototype.setNormal = function(value) { + jspb.Message.setField(this, 1, value); +}; + + +/** + * optional string default = 2; + * @return {string} + */ +proto.com.book.SpecialCases.prototype.getDefault = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, "")); +}; + + +/** @param {string} value */ +proto.com.book.SpecialCases.prototype.setDefault = function(value) { + jspb.Message.setField(this, 2, value); +}; + + +/** + * optional string function = 3; + * @return {string} + */ +proto.com.book.SpecialCases.prototype.getFunction = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, "")); +}; + + +/** @param {string} value */ +proto.com.book.SpecialCases.prototype.setFunction = function(value) { + jspb.Message.setField(this, 3, value); +}; + + +/** + * optional string var = 4; + * @return {string} + */ +proto.com.book.SpecialCases.prototype.getVar = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, "")); +}; + + +/** @param {string} value */ +proto.com.book.SpecialCases.prototype.setVar = function(value) { + jspb.Message.setField(this, 4, value); +}; + + /** * @enum {number} */ diff --git a/examples/build/server.js.map b/examples/build/server.js.map index 747ae0f..1560131 100644 --- a/examples/build/server.js.map +++ b/examples/build/server.js.map @@ -1 +1 @@ -{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/examples/proto/book.proto b/examples/proto/book.proto index d7543d4..202e08e 100644 --- a/examples/proto/book.proto +++ b/examples/proto/book.proto @@ -33,4 +33,14 @@ enum EnumSample { UNKNOWN = 0; STARTED = 1; RUNNING = 1; -} \ No newline at end of file +} + +// Message with reserved keywords +// see: https://github.com/google/protobuf/blob/cc3fa2ec80d196e045ae05797799f079188106f3/js/compatibility_tests/v3.0.0/test.proto#L66-L72 +message SpecialCases { + string normal = 1; + // Examples of Js reserved names that are converted to pb_. + string default = 2; + string function = 3; + string var = 4; +} diff --git a/examples/src/proto/book_pb.d.ts b/examples/src/proto/book_pb.d.ts index 7a5c293..17b1198 100644 --- a/examples/src/proto/book_pb.d.ts +++ b/examples/src/proto/book_pb.d.ts @@ -103,6 +103,39 @@ export namespace BookStore { } } +export class SpecialCases extends jspb.Message { + getNormal(): string; + setNormal(value: string): void; + + getDefault(): string; + setDefault(value: string): void; + + getFunction(): string; + setFunction(value: string): void; + + getVar(): string; + setVar(value: string): void; + + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): SpecialCases.AsObject; + static toObject(includeInstance: boolean, msg: SpecialCases): SpecialCases.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: SpecialCases, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): SpecialCases; + static deserializeBinaryFromReader(message: SpecialCases, reader: jspb.BinaryReader): SpecialCases; +} + +export namespace SpecialCases { + export type AsObject = { + normal: string, + pb_default: string, + pb_function: string, + pb_var: string, + } +} + export enum EnumSample { UNKNOWN = 0, STARTED = 1, diff --git a/examples/src/proto/book_pb.js b/examples/src/proto/book_pb.js index 5328726..741fb15 100644 --- a/examples/src/proto/book_pb.js +++ b/examples/src/proto/book_pb.js @@ -16,6 +16,7 @@ goog.exportSymbol('proto.com.book.BookStore', null, global); goog.exportSymbol('proto.com.book.EnumSample', null, global); goog.exportSymbol('proto.com.book.GetBookRequest', null, global); goog.exportSymbol('proto.com.book.GetBookViaAuthor', null, global); +goog.exportSymbol('proto.com.book.SpecialCases', null, global); /** * Generated by JsPbCodeGenerator. @@ -667,6 +668,229 @@ proto.com.book.BookStore.prototype.clearBooksMap = function() { }; + +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.com.book.SpecialCases = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.com.book.SpecialCases, jspb.Message); +if (goog.DEBUG && !COMPILED) { + proto.com.book.SpecialCases.displayName = 'proto.com.book.SpecialCases'; +} + + +if (jspb.Message.GENERATE_TO_OBJECT) { +/** + * Creates an object representation of this proto suitable for use in Soy templates. + * Field names that are reserved in JavaScript and will be renamed to pb_name. + * To access a reserved field use, foo.pb_, eg, foo.pb_default. + * For the list of reserved names please see: + * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS. + * @param {boolean=} opt_includeInstance Whether to include the JSPB instance + * for transitional soy proto support: http://goto/soy-param-migration + * @return {!Object} + */ +proto.com.book.SpecialCases.prototype.toObject = function(opt_includeInstance) { + return proto.com.book.SpecialCases.toObject(opt_includeInstance, this); +}; + + +/** + * Static version of the {@see toObject} method. + * @param {boolean|undefined} includeInstance Whether to include the JSPB + * instance for transitional soy proto support: + * http://goto/soy-param-migration + * @param {!proto.com.book.SpecialCases} msg The msg instance to transform. + * @return {!Object} + * @suppress {unusedLocalVariables} f is only used for nested messages + */ +proto.com.book.SpecialCases.toObject = function(includeInstance, msg) { + var f, obj = { + normal: jspb.Message.getFieldWithDefault(msg, 1, ""), + pb_default: jspb.Message.getFieldWithDefault(msg, 2, ""), + pb_function: jspb.Message.getFieldWithDefault(msg, 3, ""), + pb_var: jspb.Message.getFieldWithDefault(msg, 4, "") + }; + + if (includeInstance) { + obj.$jspbMessageInstance = msg; + } + return obj; +}; +} + + +/** + * Deserializes binary data (in protobuf wire format). + * @param {jspb.ByteSource} bytes The bytes to deserialize. + * @return {!proto.com.book.SpecialCases} + */ +proto.com.book.SpecialCases.deserializeBinary = function(bytes) { + var reader = new jspb.BinaryReader(bytes); + var msg = new proto.com.book.SpecialCases; + return proto.com.book.SpecialCases.deserializeBinaryFromReader(msg, reader); +}; + + +/** + * Deserializes binary data (in protobuf wire format) from the + * given reader into the given message object. + * @param {!proto.com.book.SpecialCases} msg The message object to deserialize into. + * @param {!jspb.BinaryReader} reader The BinaryReader to use. + * @return {!proto.com.book.SpecialCases} + */ +proto.com.book.SpecialCases.deserializeBinaryFromReader = function(msg, reader) { + while (reader.nextField()) { + if (reader.isEndGroup()) { + break; + } + var field = reader.getFieldNumber(); + switch (field) { + case 1: + var value = /** @type {string} */ (reader.readString()); + msg.setNormal(value); + break; + case 2: + var value = /** @type {string} */ (reader.readString()); + msg.setDefault(value); + break; + case 3: + var value = /** @type {string} */ (reader.readString()); + msg.setFunction(value); + break; + case 4: + var value = /** @type {string} */ (reader.readString()); + msg.setVar(value); + break; + default: + reader.skipField(); + break; + } + } + return msg; +}; + + +/** + * Serializes the message to binary data (in protobuf wire format). + * @return {!Uint8Array} + */ +proto.com.book.SpecialCases.prototype.serializeBinary = function() { + var writer = new jspb.BinaryWriter(); + proto.com.book.SpecialCases.serializeBinaryToWriter(this, writer); + return writer.getResultBuffer(); +}; + + +/** + * Serializes the given message to binary data (in protobuf wire + * format), writing to the given BinaryWriter. + * @param {!proto.com.book.SpecialCases} message + * @param {!jspb.BinaryWriter} writer + * @suppress {unusedLocalVariables} f is only used for nested messages + */ +proto.com.book.SpecialCases.serializeBinaryToWriter = function(message, writer) { + var f = undefined; + f = message.getNormal(); + if (f.length > 0) { + writer.writeString( + 1, + f + ); + } + f = message.getDefault(); + if (f.length > 0) { + writer.writeString( + 2, + f + ); + } + f = message.getFunction(); + if (f.length > 0) { + writer.writeString( + 3, + f + ); + } + f = message.getVar(); + if (f.length > 0) { + writer.writeString( + 4, + f + ); + } +}; + + +/** + * optional string normal = 1; + * @return {string} + */ +proto.com.book.SpecialCases.prototype.getNormal = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, "")); +}; + + +/** @param {string} value */ +proto.com.book.SpecialCases.prototype.setNormal = function(value) { + jspb.Message.setField(this, 1, value); +}; + + +/** + * optional string default = 2; + * @return {string} + */ +proto.com.book.SpecialCases.prototype.getDefault = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, "")); +}; + + +/** @param {string} value */ +proto.com.book.SpecialCases.prototype.setDefault = function(value) { + jspb.Message.setField(this, 2, value); +}; + + +/** + * optional string function = 3; + * @return {string} + */ +proto.com.book.SpecialCases.prototype.getFunction = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, "")); +}; + + +/** @param {string} value */ +proto.com.book.SpecialCases.prototype.setFunction = function(value) { + jspb.Message.setField(this, 3, value); +}; + + +/** + * optional string var = 4; + * @return {string} + */ +proto.com.book.SpecialCases.prototype.getVar = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, "")); +}; + + +/** @param {string} value */ +proto.com.book.SpecialCases.prototype.setVar = function(value) { + jspb.Message.setField(this, 4, value); +}; + + /** * @enum {number} */