ts-proto 1.93.2 → 1.93.3

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.93.3](https://github.com/stephenh/ts-proto/compare/v1.93.2...v1.93.3) (2021-12-13)
+
+
+### Bug Fixes
+
+* support mutliple options in snakeToCamel flag  ([#429](https://github.com/stephenh/ts-proto/issues/429)) ([cff6674](https://github.com/stephenh/ts-proto/commit/cff667406cba21676546fd91b04cf2cbc571ed7d)), closes [#423](https://github.com/stephenh/ts-proto/issues/423)
+
 ## [1.93.2](https://github.com/stephenh/ts-proto/compare/v1.93.1...v1.93.2) (2021-12-09)
 
 

package/README.markdown

@@ -289,9 +289,7 @@ Generated code will be placed in the Gradle build directory.
 
 - With `--ts_proto_opt=lowerCaseServiceMethods=true`, the method names of service methods will be lowered/camel-case, i.e. `service.findFoo` instead of `service.FindFoo`.
 
-- With `--ts_proto_opt=snakeToCamel=false`, fields will be kept snake case.
-
-  Defaults to `true`.
+- With `--ts_proto_opt=snakeToCamel=false`, fields will be kept snake case. `snakeToCamel` can also be set as string with `--ts_proto_opt=snakeToCamel=keys,json`. `keys` will keep field names as camelCase and `json` will keep json field names as camelCase. Empty string will keep field names as snake_case.
 
 - With `--ts_proto_opt=outputEncodeMethods=false`, the `Message.encode` and `Message.decode` methods for working with protobuf-encoded/binary data will not be output.
 

package/build/case.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.camelCase = exports.capitalize = exports.camelToSnake = exports.maybeSnakeToCamel = void 0;
+exports.camelCase = exports.capitalize = exports.camelToSnake = exports.stringToSnakeCase = exports.maybeSnakeToCamel = void 0;
 function maybeSnakeToCamel(s, options) {
-    if (options.snakeToCamel && s.includes('_')) {
+    const fromStringSnakeToCamel = typeof options.snakeToCamel === 'string' && options.snakeToCamel.includes('keys');
+    const fromBooleanSnakeToCamel = options.snakeToCamel === true;
+    if ((fromBooleanSnakeToCamel || fromStringSnakeToCamel) && s.includes('_')) {
         return s
             .split('_')
             .map((word, i) => {
@@ -21,6 +23,10 @@ function maybeSnakeToCamel(s, options) {
     }
 }
 exports.maybeSnakeToCamel = maybeSnakeToCamel;
+function stringToSnakeCase(s) {
+    return s.replace(/([a-z])([A-Z])/g, '$1_$2').toLowerCase();
+}
+exports.stringToSnakeCase = stringToSnakeCase;
 function camelToSnake(s) {
     return s
         .replace(/[\w]([A-Z])/g, function (m) {

package/build/utils.js

@@ -147,10 +147,12 @@ exports.FormattedMethodDescriptor = FormattedMethodDescriptor;
 function determineFieldJsonName(field, options) {
     // By default jsonName is camelCased by the protocol compilier unless the user has
     // set a "json_name" option on this field.
-    if (field.jsonName.length > 0) {
+    const fromStringSnakeToCamel = typeof options.snakeToCamel === 'string' && options.snakeToCamel.includes('json');
+    const fromBooleanSnakeToCamel = options.snakeToCamel === true;
+    if (fromBooleanSnakeToCamel || fromStringSnakeToCamel) {
         return field.jsonName;
     }
-    return case_1.maybeSnakeToCamel(field.name, options);
+    return case_1.stringToSnakeCase(field.name);
 }
 exports.determineFieldJsonName = determineFieldJsonName;
 function impProto(options, module, type) {

package/package.json

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