ts-proto 1.106.0 → 1.106.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.106.1](https://github.com/stephenh/ts-proto/compare/v1.106.0...v1.106.1) (2022-02-21)
+
+
+### Bug Fixes
+
+* support json_name containing hyphen on all field types ([#521](https://github.com/stephenh/ts-proto/issues/521)) ([8d9e78e](https://github.com/stephenh/ts-proto/commit/8d9e78eb39c460f6727458f6a2dd149deb983668))
+
 # [1.106.0](https://github.com/stephenh/ts-proto/compare/v1.105.2...v1.106.0) (2022-02-21)
 
 

package/build/main.js

@@ -897,6 +897,7 @@ function generateFromJson(ctx, fullName, messageDesc) {
         const fieldName = case_1.maybeSnakeToCamel(field.name, options);
         const jsonName = utils_1.getFieldJsonName(field, options);
         const jsonProperty = utils_1.getPropertyAccessor('object', jsonName);
+        const jsonPropertyOptional = utils_1.getPropertyAccessor('object', jsonName, true);
         // get code that extracts value from incoming object
         const readSnippet = (from) => {
             if (types_1.isEnum(field)) {
@@ -1025,12 +1026,12 @@ function generateFromJson(ctx, fullName, messageDesc) {
             else {
                 const readValueSnippet = readSnippet('e');
                 if (readValueSnippet.toString() === ts_poet_1.code `e`.toString()) {
-                    chunks.push(ts_poet_1.code `${fieldName}: Array.isArray(object?.${jsonName}) ? [...${jsonProperty}] : [],`);
+                    chunks.push(ts_poet_1.code `${fieldName}: Array.isArray(${jsonPropertyOptional}) ? [...${jsonProperty}] : [],`);
                 }
                 else {
                     // Explicit `any` type required to make TS with noImplicitAny happy. `object` is also `any` here.
                     chunks.push(ts_poet_1.code `
-            ${fieldName}: Array.isArray(object?.${jsonName}) ? ${jsonProperty}.map((e: any) => ${readValueSnippet}): [],
+            ${fieldName}: Array.isArray(${jsonPropertyOptional}) ? ${jsonProperty}.map((e: any) => ${readValueSnippet}): [],
           `);
                 }
             }
@@ -1051,7 +1052,7 @@ function generateFromJson(ctx, fullName, messageDesc) {
             }
         }
         else if (types_1.isAnyValueType(field)) {
-            chunks.push(ts_poet_1.code `${fieldName}: ${ctx.utils.isSet}(object?.${jsonName})
+            chunks.push(ts_poet_1.code `${fieldName}: ${ctx.utils.isSet}(${jsonPropertyOptional})
         ? ${readSnippet(`${jsonProperty}`)}
         : undefined,
       `);
@@ -1185,10 +1186,10 @@ function generateToJson(ctx, fullName, messageDesc) {
         if (types_1.isMapType(ctx, messageDesc, field)) {
             // Maps might need their values transformed, i.e. bytes --> base64
             chunks.push(ts_poet_1.code `
-        obj.${jsonName} = {};
+        ${jsonProperty} = {};
         if (message.${fieldName}) {
           Object.entries(message.${fieldName}).forEach(([k, v]) => {
-            obj.${jsonName}[k] = ${readSnippet('v')};
+            ${jsonProperty}[k] = ${readSnippet('v')};
           });
         }
       `);
@@ -1197,9 +1198,9 @@ function generateToJson(ctx, fullName, messageDesc) {
             // Arrays might need their elements transformed
             chunks.push(ts_poet_1.code `
         if (message.${fieldName}) {
-          obj.${jsonName} = message.${fieldName}.map(e => ${readSnippet('e')});
+          ${jsonProperty} = message.${fieldName}.map(e => ${readSnippet('e')});
         } else {
-          obj.${jsonName} = [];
+          ${jsonProperty} = [];
         }
       `);
         }

package/build/utils.js

@@ -160,12 +160,13 @@ exports.getFieldJsonName = getFieldJsonName;
  * For simplicity, we don't match the ECMA 5/6 rules for valid identifiers exactly, and return array syntax liberally.
  * @param objectName
  * @param propertyName
+ * @param optional
  */
-function getPropertyAccessor(objectName, propertyName) {
+function getPropertyAccessor(objectName, propertyName, optional = false) {
     let validIdentifier = /^[a-zA-Z_$][\w$]*$/;
     return validIdentifier.test(propertyName)
-        ? `${objectName}.${propertyName}`
-        : `${objectName}[${JSON.stringify(propertyName)}]`;
+        ? `${objectName}${optional ? '?' : ''}.${propertyName}`
+        : `${objectName}${optional ? '?.' : ''}[${JSON.stringify(propertyName)}]`;
 }
 exports.getPropertyAccessor = getPropertyAccessor;
 function impProto(options, module, type) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "1.106.0",
+  "version": "1.106.1",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",