ts-proto 1.121.5 → 1.121.6

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.121.6](https://github.com/stephenh/ts-proto/compare/v1.121.5...v1.121.6) (2022-08-14)
+
+
+### Bug Fixes
+
+* Use jsonName even with snakeToCamel=false. ([#653](https://github.com/stephenh/ts-proto/issues/653)) ([1144886](https://github.com/stephenh/ts-proto/commit/1144886ef43eaf97b780c7aafb2c123fd49b3fe5)), closes [#635](https://github.com/stephenh/ts-proto/issues/635)
+
 ## [1.121.5](https://github.com/stephenh/ts-proto/compare/v1.121.4...v1.121.5) (2022-08-08)
 
 

package/build/case.js

@@ -1,29 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.camelCase = exports.capitalize = exports.camelToSnake = exports.maybeSnakeToCamel = void 0;
-function maybeSnakeToCamel(s, options) {
-    if (options.snakeToCamel.includes('keys') && s.includes('_')) {
-        const hasLowerCase = !!s.match(/[a-z]/);
-        return s
-            .split('_')
-            .map((word, i) => {
-            // If the word is already mixed case, leave the exist case as-is
-            word = hasLowerCase ? word : word.toLowerCase();
-            return i === 0 ? word : capitalize(word);
-        })
-            .join('');
+exports.camelCase = exports.capitalize = exports.camelToSnake = exports.snakeToCamel = exports.maybeSnakeToCamel = void 0;
+/** Converts `key` to TS/JS camel-case idiom, unless overridden not to. */
+function maybeSnakeToCamel(key, options) {
+    if (options.snakeToCamel.includes('keys') && key.includes('_')) {
+        return snakeToCamel(key);
     }
     else {
-        return s;
+        return key;
     }
 }
 exports.maybeSnakeToCamel = maybeSnakeToCamel;
-function camelToSnake(s) {
+function snakeToCamel(s) {
+    const hasLowerCase = !!s.match(/[a-z]/);
     return s
-        .replace(/[\w]([A-Z])/g, function (m) {
-        return m[0] + '_' + m[1];
+        .split('_')
+        .map((word, i) => {
+        // If the word is already mixed case, leave the existing case as-is
+        word = hasLowerCase ? word : word.toLowerCase();
+        return i === 0 ? word : capitalize(word);
     })
-        .toUpperCase();
+        .join('');
+}
+exports.snakeToCamel = snakeToCamel;
+function camelToSnake(s) {
+    return s.replace(/\w([A-Z])/g, (m) => m[0] + '_' + m[1]).toUpperCase();
 }
 exports.camelToSnake = camelToSnake;
 function capitalize(s) {

package/build/utils.js

@@ -151,7 +151,11 @@ function getFieldJsonName(field, options) {
         return field.jsonName;
     }
     else {
-        return field.name;
+        // The user wants to keep snake case in the JSON, but we still want to see if the jsonName
+        // attribute is set as an explicit override.
+        const probableJsonName = (0, case_1.snakeToCamel)(field.name);
+        const isJsonNameSet = probableJsonName !== field.jsonName;
+        return isJsonNameSet ? field.jsonName : field.name;
     }
 }
 exports.getFieldJsonName = getFieldJsonName;

package/package.json

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