ts-proto 1.87.0 → 1.87.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.87.1](https://github.com/stephenh/ts-proto/compare/v1.87.0...v1.87.1) (2021-11-21)
+
+
+### Bug Fixes
+
+* code generation for int64 map values in fromPartial and fromJson ([#395](https://github.com/stephenh/ts-proto/issues/395)) ([d3ea8eb](https://github.com/stephenh/ts-proto/commit/d3ea8eb69e19a5e45fcc1766c4af1194b17e48fc))
+
 # [1.87.0](https://github.com/stephenh/ts-proto/compare/v1.86.0...v1.87.0) (2021-11-16)
 
 

package/README.markdown

@@ -70,7 +70,7 @@ It will also generate client implementations of `PingService`; currently [Twirp]
 - `npm install ts-proto`
 - `protoc --plugin=./node_modules/.bin/protoc-gen-ts_proto --ts_proto_out=. ./simple.proto`
   - (Note that the output parameter name, `ts_proto_out`, is named based on the suffix of the plugin's name, i.e. "ts_proto" suffix in the `--plugin=./node_modules/.bin/protoc-gen-ts_proto` parameter becomes the `_out` prefix, per `protoc`'s CLI conventions.)
-  - On Windows, use `protoc --plugin=protoc-gen-ts_proto=.\node_modules\.bin\protoc-gen-ts_proto.cmd --ts_proto_out=. ./simple.proto`
+  - On Windows, use `protoc --plugin=protoc-gen-ts_proto=.\node_modules\.bin\protoc-gen-ts_proto.cmd --ts_proto_out=. ./simple.proto` (see [#93](https://github.com/stephenh/ts-proto/issues/93))
   - Ensure you're using a modern `protoc`, i.e. the original `protoc` `3.0.0` doesn't support the `_opt` flag
 
 This will generate `*.ts` source files for the given `*.proto` types.

package/build/main.js

@@ -285,13 +285,15 @@ function makeDeepPartial(options, longs) {
     `;
     }
     const maybeExport = options.exportCommonSymbols ? 'export' : '';
-    const maybeLong = options.forceLong === options_1.LongOption.LONG ? ts_poet_1.code ` | ${longs.Long}` : '';
+    // Allow passing longs as numbers or strings, nad we'll convert them
+    const maybeLong = options.forceLong === options_1.LongOption.LONG ? ts_poet_1.code ` : T extends ${longs.Long} ? string | number | Long ` : '';
     const keys = options.outputTypeRegistry ? ts_poet_1.code `Exclude<keyof T, '$type'>` : ts_poet_1.code `keyof T`;
     // Based on the type from ts-essentials
     const DeepPartial = ts_poet_1.conditionalOutput('DeepPartial', ts_poet_1.code `
-      type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined${maybeLong};
-      ${maybeExport} type DeepPartial<T> = T extends Builtin
+      type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
+      ${maybeExport} type DeepPartial<T> =  T extends Builtin
         ? T
+        ${maybeLong}
         : T extends Array<infer U>
         ? Array<DeepPartial<U>>
         : T extends ReadonlyArray<infer U>
@@ -798,6 +800,9 @@ function generateFromJson(ctx, fullName, messageDesc) {
                                 return ts_poet_1.code `${utils.bytesFromBase64}(${from} as string)`;
                             }
                         }
+                        else if (types_1.isLong(valueType) && options.forceLong === options_1.LongOption.LONG) {
+                            return ts_poet_1.code `Long.fromString(${from} as string)`;
+                        }
                         else if (types_1.isEnum(valueType)) {
                             return ts_poet_1.code `${from} as number`;
                         }
@@ -919,6 +924,9 @@ function generateToJson(ctx, fullName, messageDesc) {
                 else if (types_1.isTimestamp(valueType) && options.useDate === options_1.DateOption.TIMESTAMP) {
                     return ts_poet_1.code `${utils.fromTimestamp}(${from}).toISOString()`;
                 }
+                else if (types_1.isLong(valueType) && options.forceLong === options_1.LongOption.LONG) {
+                    return ts_poet_1.code `${from}.toString()`;
+                }
                 else if (types_1.isScalar(valueType) || types_1.isValueType(ctx, valueType)) {
                     return ts_poet_1.code `${from}`;
                 }
@@ -996,7 +1004,10 @@ function generateFromPartial(ctx, fullName, messageDesc) {
     messageDesc.field.forEach((field) => {
         const fieldName = case_1.maybeSnakeToCamel(field.name, options);
         const readSnippet = (from) => {
-            if (types_1.isPrimitive(field) ||
+            if ((types_1.isLong(field) || types_1.isLongValueType(field)) && options.forceLong === options_1.LongOption.LONG) {
+                return ts_poet_1.code `Long.fromValue(${from})`;
+            }
+            else if (types_1.isPrimitive(field) ||
                 (types_1.isTimestamp(field) && (options.useDate === options_1.DateOption.DATE || options.useDate === options_1.DateOption.STRING)) ||
                 types_1.isValueType(ctx, field)) {
                 return ts_poet_1.code `${from}`;
@@ -1011,6 +1022,9 @@ function generateFromPartial(ctx, fullName, messageDesc) {
                         else if (types_1.isEnum(valueType)) {
                             return ts_poet_1.code `${from} as number`;
                         }
+                        else if (types_1.isLong(valueType) && options.forceLong === options_1.LongOption.LONG) {
+                            return ts_poet_1.code `Long.fromValue(${from})`;
+                        }
                         else {
                             const cstr = case_1.capitalize(types_1.basicTypeName(ctx, valueType).toCodeString());
                             return ts_poet_1.code `${cstr}(${from})`;
@@ -1071,16 +1085,6 @@ function generateFromPartial(ctx, fullName, messageDesc) {
         }  
       `);
         }
-        else if ((types_1.isLong(field) || types_1.isLongValueType(field)) && options.forceLong === options_1.LongOption.LONG) {
-            const v = readSnippet(`object.${fieldName}`);
-            const type = types_1.basicTypeName(ctx, field);
-            chunks.push(ts_poet_1.code `if (object.${fieldName} !== undefined && object.${fieldName} !== null) {`);
-            chunks.push(ts_poet_1.code `message.${fieldName} = ${v} as ${type};`);
-            chunks.push(ts_poet_1.code `} else {`);
-            const fallback = types_1.isWithinOneOf(field) ? 'undefined' : types_1.defaultValue(ctx, field);
-            chunks.push(ts_poet_1.code `message.${fieldName} = ${fallback}`);
-            chunks.push(ts_poet_1.code `}`);
-        }
         else if (readSnippet(`x`).toCodeString() == 'x') {
             // An optimized case of the else below that works when `readSnippet` returns the plain input
             const fallback = types_1.isWithinOneOf(field) ? 'undefined' : types_1.defaultValue(ctx, field);

package/package.json

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