ts-proto 1.93.3 → 1.94.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [1.94.0](https://github.com/stephenh/ts-proto/compare/v1.93.3...v1.94.0) (2021-12-14)
+
+
+### Features
+
+* Round numbers in toJSON. ([#444](https://github.com/stephenh/ts-proto/issues/444)) ([bd2df7b](https://github.com/stephenh/ts-proto/commit/bd2df7b7176e961955ed1dcacb3602384e13ee45))
+
 ## [1.93.3](https://github.com/stephenh/ts-proto/compare/v1.93.2...v1.93.3) (2021-12-13)
 
 

package/build/case.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.camelCase = exports.capitalize = exports.camelToSnake = exports.stringToSnakeCase = exports.maybeSnakeToCamel = void 0;
+exports.camelCase = exports.capitalize = exports.camelToSnake = exports.maybeSnakeToCamel = void 0;
 function maybeSnakeToCamel(s, options) {
-    const fromStringSnakeToCamel = typeof options.snakeToCamel === 'string' && options.snakeToCamel.includes('keys');
-    const fromBooleanSnakeToCamel = options.snakeToCamel === true;
-    if ((fromBooleanSnakeToCamel || fromStringSnakeToCamel) && s.includes('_')) {
+    if (options.snakeToCamel.includes('keys') && s.includes('_')) {
         return s
             .split('_')
             .map((word, i) => {
@@ -23,10 +21,6 @@ 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/main.js

@@ -980,6 +980,9 @@ function generateToJson(ctx, fullName, messageDesc) {
                 else if (types_1.isLong(valueType) && options.forceLong === options_1.LongOption.LONG) {
                     return ts_poet_1.code `${from}.toString()`;
                 }
+                else if (types_1.isWholeNumber(valueType) && !(types_1.isLong(valueType) && options.forceLong === options_1.LongOption.STRING)) {
+                    return ts_poet_1.code `Math.round(${from})`;
+                }
                 else if (types_1.isScalar(valueType) || types_1.isValueType(ctx, valueType)) {
                     return ts_poet_1.code `${from}`;
                 }
@@ -1010,6 +1013,9 @@ function generateToJson(ctx, fullName, messageDesc) {
                 const v = types_1.isWithinOneOf(field) ? 'undefined' : types_1.defaultValue(ctx, field);
                 return ts_poet_1.code `(${from} || ${v}).toString()`;
             }
+            else if (types_1.isWholeNumber(field) && !(types_1.isLong(field) && options.forceLong === options_1.LongOption.STRING)) {
+                return ts_poet_1.code `Math.round(${from})`;
+            }
             else {
                 return ts_poet_1.code `${from}`;
             }

package/build/options.js

@@ -34,7 +34,7 @@ var ServiceOption;
 function defaultOptions() {
     return {
         context: false,
-        snakeToCamel: true,
+        snakeToCamel: ['json', 'keys'],
         forceLong: LongOption.NUMBER,
         useOptionals: false,
         useDate: DateOption.DATE,
@@ -100,6 +100,12 @@ function optionsFromParameter(parameter) {
         // Treat useDate=false as TIMESTAMP
         options.useDate = DateOption.TIMESTAMP;
     }
+    if (options.snakeToCamel === false) {
+        options.snakeToCamel = [];
+    }
+    else if (options.snakeToCamel === true) {
+        options.snakeToCamel = ['keys', 'json'];
+    }
     return options;
 }
 exports.optionsFromParameter = optionsFromParameter;

package/build/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.detectBatchMethod = exports.responsePromiseOrObservable = exports.responseObservable = exports.responsePromise = exports.responseType = exports.requestType = exports.rawRequestType = exports.detectMapType = exports.toTypeName = exports.getEnumMethod = exports.messageToTypeName = exports.wrapperTypeName = exports.valueTypeName = exports.isEmptyType = exports.isLongValueType = exports.isStructTypeName = exports.isStructType = exports.isListValueTypeName = exports.isListValueType = exports.isBytesValueType = exports.isAnyValueTypeName = exports.isAnyValueType = exports.isValueType = exports.isTimestamp = exports.isMapType = exports.isLong = exports.isRepeated = exports.isWithinOneOfThatShouldBeUnion = exports.isWithinOneOf = exports.isEnum = exports.isMessage = exports.isBytes = exports.isPrimitive = exports.isScalar = exports.createTypeMap = exports.notDefaultCheck = exports.defaultValue = exports.packedType = exports.toReaderCall = exports.basicTypeName = exports.basicLongWireType = exports.basicWireType = void 0;
+exports.detectBatchMethod = exports.responsePromiseOrObservable = exports.responseObservable = exports.responsePromise = exports.responseType = exports.requestType = exports.rawRequestType = exports.detectMapType = exports.toTypeName = exports.getEnumMethod = exports.messageToTypeName = exports.wrapperTypeName = exports.valueTypeName = exports.isEmptyType = exports.isLongValueType = exports.isStructTypeName = exports.isStructType = exports.isListValueTypeName = exports.isListValueType = exports.isBytesValueType = exports.isAnyValueTypeName = exports.isAnyValueType = exports.isValueType = exports.isTimestamp = exports.isMapType = exports.isWholeNumber = exports.isLong = exports.isRepeated = exports.isWithinOneOfThatShouldBeUnion = exports.isWithinOneOf = exports.isEnum = exports.isMessage = exports.isBytes = exports.isPrimitive = exports.isScalar = exports.createTypeMap = exports.notDefaultCheck = exports.defaultValue = exports.packedType = exports.toReaderCall = exports.basicTypeName = exports.basicLongWireType = exports.basicWireType = void 0;
 const ts_proto_descriptors_1 = require("ts-proto-descriptors");
 const ts_poet_1 = require("ts-poet");
 const options_1 = require("./options");
@@ -347,6 +347,19 @@ function isLong(field) {
     return basicLongWireType(field.type) !== undefined;
 }
 exports.isLong = isLong;
+function isWholeNumber(field) {
+    return (field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_INT32 ||
+        field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_INT64 ||
+        field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_UINT32 ||
+        field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_UINT64 ||
+        field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_SINT32 ||
+        field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_SINT64 ||
+        field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_FIXED32 ||
+        field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_FIXED64 ||
+        field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_SFIXED32 ||
+        field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_SFIXED64);
+}
+exports.isWholeNumber = isWholeNumber;
 function isMapType(ctx, messageDesc, field) {
     return detectMapType(ctx, messageDesc, field) !== undefined;
 }

package/build/utils.js

@@ -145,14 +145,14 @@ class FormattedMethodDescriptor {
 }
 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.
-    const fromStringSnakeToCamel = typeof options.snakeToCamel === 'string' && options.snakeToCamel.includes('json');
-    const fromBooleanSnakeToCamel = options.snakeToCamel === true;
-    if (fromBooleanSnakeToCamel || fromStringSnakeToCamel) {
+    // jsonName will be camelCased by the protocol compiler, plus can be overridden by the user,
+    // so just use that instead of our own maybeSnakeToCamel
+    if (options.snakeToCamel.includes('json')) {
         return field.jsonName;
     }
-    return case_1.stringToSnakeCase(field.name);
+    else {
+        return field.name;
+    }
 }
 exports.determineFieldJsonName = determineFieldJsonName;
 function impProto(options, module, type) {

package/package.json

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