change cast of int64 input (map values) from string to Long | string …

…in fromJSON (see discussion here: #405 (comment))
stephenh · Nov 24, 2021 · 511c941 · 511c941
1 parent 787327a
commit 511c941
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/integration/simple-long/simple.ts b/integration/simple-long/simple.ts
@@ -226,7 +226,7 @@ export const SimpleWithMap = {
     message.longLookup = {};
     if (object.longLookup !== undefined && object.longLookup !== null) {
       Object.entries(object.longLookup).forEach(([key, value]) => {
-        message.longLookup[key] = Long.fromValue(value as string);
+        message.longLookup[key] = Long.fromValue(value as Long | string);
       });
     }
     return message;

diff --git a/src/main.ts b/src/main.ts
@@ -1047,7 +1047,7 @@ function generateFromJson(ctx: Context, fullName: string, messageDesc: Descripto
                 return code`${utils.bytesFromBase64}(${from} as string)`;
               }
             } else if (isLong(valueType) && options.forceLong === LongOption.LONG) {
-              return code`Long.fromValue(${from} as string)`;
+              return code`Long.fromValue(${from} as Long | string)`;
             } else if (isEnum(valueType)) {
               return code`${from} as number`;
             } else {