ts-proto 1.121.1 → 1.121.4

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [1.121.4](https://github.com/stephenh/ts-proto/compare/v1.121.3...v1.121.4) (2022-08-07)
+
+
+### Performance Improvements
+
+* Faster base64FromBytes & bytesFromBase64 on Node.JS ([#649](https://github.com/stephenh/ts-proto/issues/649)) ([82ab341](https://github.com/stephenh/ts-proto/commit/82ab341557fba1a4933c4613d5c20dbf897905fa))
+
+## [1.121.3](https://github.com/stephenh/ts-proto/compare/v1.121.2...v1.121.3) (2022-08-06)
+
+
+### Bug Fixes
+
+* Use underscore separator in snakeToCamel. ([#648](https://github.com/stephenh/ts-proto/issues/648)) ([b374910](https://github.com/stephenh/ts-proto/commit/b374910a8fb1d0efe6c5c5322f8788cc3cc1ca6c))
+
+## [1.121.2](https://github.com/stephenh/ts-proto/compare/v1.121.1...v1.121.2) (2022-08-06)
+
+
+### Bug Fixes
+
+* Fix push_to_buf_registry check. ([22ac914](https://github.com/stephenh/ts-proto/commit/22ac914cd8626258ceb35fd435b899a819518988))
+
 ## [1.121.1](https://github.com/stephenh/ts-proto/compare/v1.121.0...v1.121.1) (2022-07-28)
 
 

package/README.markdown

@@ -339,7 +339,15 @@ 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. `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=snakeToCamel=false`, fields will be kept snake case in both the message keys and the `toJSON` / `fromJSON` methods.
+
+  `snakeToCamel` can also be set as a `_`-delimited list of strings (comma is reserved as the flag delimited), i.e. `--ts_proto_opt=snakeToCamel=keys_json`, where including `keys` will make message keys be camel case and including `json` will make JSON keys be camel case.
+
+   Empty string, i.e. `snakeToCamel=`, will keep both messages keys and `JSON` keys as snake case (it is the same as `snakeToCamel=false`).
+
+   Note that to use the `json_name` attribute, you'll have to use the `json`.
+
+   The default behavior is `keys_json`, i.e. both will be camel cased, and `json_name` will be used if set.
 
 - With `--ts_proto_opt=outputEncodeMethods=false`, the `Message.encode` and `Message.decode` methods for working with protobuf-encoded/binary data will not be output.
 
@@ -435,7 +443,7 @@ Generated code will be placed in the Gradle build directory.
   Requires `onlyTypes=true`. Implies `useDate=string` and `stringEnums=true`. This option is to generate types that can be directly used with marshalling/unmarshalling Protobuf messages serialized as JSON.  
   You may also want to set `useOptionals=all`, as gRPC gateways are not required to send default value for scalar values.
 
-- With '--ts_proto_opt=useNumericEnumForJson=true`, the JSON converter (`toJSON`) will encode enum values as int, rather than a string literal.
+- With `--ts_proto_opt=useNumericEnumForJson=true`, the JSON converter (`toJSON`) will encode enum values as int, rather than a string literal.
 
 ### NestJS Support
 

package/build/main.js

@@ -290,24 +290,30 @@ function makeByteUtils() {
       })();
     `);
     const bytesFromBase64 = (0, ts_poet_1.conditionalOutput)('bytesFromBase64', (0, ts_poet_1.code) `
-      const atob: (b64: string) => string = ${globalThis}.atob || ((b64) => ${globalThis}.Buffer.from(b64, 'base64').toString('binary'));
       function bytesFromBase64(b64: string): Uint8Array {
-        const bin = atob(b64);
-        const arr = new Uint8Array(bin.length);
-        for (let i = 0; i < bin.length; ++i) {
-            arr[i] = bin.charCodeAt(i);
+        if (${globalThis}.Buffer) {
+          return Uint8Array.from(${globalThis}.Buffer.from(b64, 'base64'));
+        } else {
+          const bin = ${globalThis}.atob(b64);
+          const arr = new Uint8Array(bin.length);
+          for (let i = 0; i < bin.length; ++i) {
+              arr[i] = bin.charCodeAt(i);
+          }
+          return arr;
         }
-        return arr;
       }
     `);
     const base64FromBytes = (0, ts_poet_1.conditionalOutput)('base64FromBytes', (0, ts_poet_1.code) `
-      const btoa : (bin: string) => string = ${globalThis}.btoa || ((bin) => ${globalThis}.Buffer.from(bin, 'binary').toString('base64'));
       function base64FromBytes(arr: Uint8Array): string {
-        const bin: string[] = [];
-        arr.forEach((byte) => {
-          bin.push(String.fromCharCode(byte));
-        });
-        return btoa(bin.join(''));
+        if (${globalThis}.Buffer) {
+          return ${globalThis}.Buffer.from(arr).toString('base64')
+        } else {
+          const bin: string[] = [];
+          arr.forEach((byte) => {
+            bin.push(String.fromCharCode(byte));
+          });
+          return ${globalThis}.btoa(bin.join(''));
+        }
       }
     `);
     return { globalThis, bytesFromBase64, base64FromBytes };

package/build/options.js

@@ -134,7 +134,7 @@ function optionsFromParameter(parameter) {
         options.snakeToCamel = ['keys', 'json'];
     }
     else if (typeof options.snakeToCamel === 'string') {
-        options.snakeToCamel = [options.snakeToCamel];
+        options.snakeToCamel = options.snakeToCamel.split('_');
     }
     if (options.useJsonWireFormat) {
         if (!options.onlyTypes) {

package/package.json

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