ts-proto 1.121.3 → 1.121.6

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [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)
+
+
+### Bug Fixes
+
+* remove Record word conflict ([#638](https://github.com/stephenh/ts-proto/issues/638)) ([5664d09](https://github.com/stephenh/ts-proto/commit/5664d097ac33da423b0f4e79f962fd71912358a0))
+* resolve import collisions for services ([#651](https://github.com/stephenh/ts-proto/issues/651)) ([ee0296f](https://github.com/stephenh/ts-proto/commit/ee0296ffe087665b54bac714e964e7243010fb22))
+
+## [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)
 
 

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/generate-services.js

@@ -24,7 +24,7 @@ function generateService(ctx, fileDesc, sourceInfo, serviceDesc) {
     const chunks = [];
     (0, utils_1.maybeAddComment)(sourceInfo, chunks, (_a = serviceDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated);
     const maybeTypeVar = options.context ? `<${main_1.contextTypeVar}>` : '';
-    chunks.push((0, ts_poet_1.code) `export interface ${serviceDesc.name}${maybeTypeVar} {`);
+    chunks.push((0, ts_poet_1.code) `export interface ${(0, ts_poet_1.def)(serviceDesc.name)}${maybeTypeVar} {`);
     serviceDesc.method.forEach((methodDesc, index) => {
         var _a;
         (0, utils_1.assertInstanceOf)(methodDesc, utils_1.FormattedMethodDescriptor);
@@ -144,7 +144,7 @@ function generateServiceClientImpl(ctx, fileDesc, serviceDesc) {
     const { name } = serviceDesc;
     const i = options.context ? `${name}<Context>` : name;
     const t = options.context ? `<${main_1.contextTypeVar}>` : '';
-    chunks.push((0, ts_poet_1.code) `export class ${name}ClientImpl${t} implements ${i} {`);
+    chunks.push((0, ts_poet_1.code) `export class ${name}ClientImpl${t} implements ${(0, ts_poet_1.def)(i)} {`);
     // Create the constructor(rpc: Rpc)
     const rpcType = options.context ? 'Rpc<Context>' : 'Rpc';
     chunks.push((0, ts_poet_1.code) `private readonly rpc: ${rpcType};`);

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 };
@@ -331,7 +337,7 @@ function makeDeepPartial(options, longs) {
       ${maybeExport} type Exact<P, I extends P> = P extends ${Builtin}
         ? P
         : P &
-        { [K in keyof P]: Exact<P[K], I[K]> } & Record<Exclude<keyof I, KeysOfUnion<P> ${maybeExcludeType}>, never>;
+        { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P> ${maybeExcludeType}>]: never };
     `);
     // Based on the type from ts-essentials
     const keys = options.outputTypeRegistry ? (0, ts_poet_1.code) `Exclude<keyof T, '$type'>` : (0, ts_poet_1.code) `keyof T`;

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.3",
+  "version": "1.121.6",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",