ts-proto 1.159.0 → 1.159.2

package/README.markdown

@@ -325,8 +325,8 @@ Generated code will be placed in the Gradle build directory.
 
   ```typescript
   interface SomeMessage {
-    firstName: string | undefined;
-    lastName: string | undefined;
+    firstName: string;
+    lastName: string;
   }
   // Declared with a typo
   const data = { firstName: "a", lastTypo: "b" };
@@ -334,13 +334,13 @@ Generated code will be placed in the Gradle build directory.
   const message: SomeMessage = { ...data };
   ```
 
-  For a consistent API, if `SomeMessage.lastName` is optional `lastName?`, then readers have to check _two_ empty conditions: a) is `lastName` `undefined` (b/c it was created in-memory and left unset), or b) is `lastName` empty string (b/c we read `SomeMessage` off the wire and correctly set `lastName` to empty string)?
+  For a consistent API, if `SomeMessage.lastName` is optional `lastName?`, then readers have to check _two_ empty conditions: a) is `lastName` `undefined` (b/c it was created in-memory and left unset), or b) is `lastName` empty string (b/c we read `SomeMessage` off the wire and, per the proto3 spec, initialized `lastName` to empty string)?
 
   For ensuring proper initialization, if later `SomeMessage.middleInitial` is added, but it's marked as optional `middleInitial?`, you may have many call sites in production code that _should_ now be passing `middleInitial` to create a valid `SomeMessage`, but are not.
 
   So, between typo-prevention, reader inconsistency, and proper initialization, ts-proto recommends using `useOptionals=none` as the "most safe" option.
 
-  All that said, this approach does require writers/creators to set every field (although `fromPartial` and `create` are meant to address this), so if you still want to have optional fields, you can set `useOptionals=messages` or `useOptionals=all`.
+  All that said, this approach does require writers/creators to set every field (although `fromPartial` and `create` are meant to address this), so if you still want to have optional keys, you can set `useOptionals=messages` or `useOptionals=all`.
 
   (See [this issue](https://github.com/stephenh/ts-proto/issues/120#issuecomment-678375833) and [this issue](https://github.com/stephenh/ts-proto/issues/397#issuecomment-977259118) for discussions on `useOptional`.)
 

package/build/main.js

@@ -424,8 +424,8 @@ function makeDeepPartial(options, longs) {
       ${maybeExport} type DeepPartial<T> =  T extends ${Builtin}
         ? T
         ${maybeLong}
-        : T extends Array<infer U>
-        ? Array<DeepPartial<U>>
+        : T extends globalThis.Array<infer U>
+        ? globalThis.Array<DeepPartial<U>>
         : T extends ReadonlyArray<infer U>
         ? ReadonlyArray<DeepPartial<U>>${oneofCase}
         : T extends {}
@@ -1438,7 +1438,7 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
                 }
                 else {
                     const cstr = (0, case_1.capitalize)((0, types_1.basicTypeName)(ctx, field, { keepValueType: true }).toCodeString([]));
-                    return (0, ts_poet_1.code) `${cstr}(${from})`;
+                    return (0, ts_poet_1.code) `${utils.globalThis}.${cstr}(${from})`;
                 }
             }
             else if ((0, types_1.isObjectId)(field) && options.useMongoObjectId) {
@@ -1870,7 +1870,7 @@ function generateFromPartial(ctx, fullName, messageDesc) {
                         }
                         else {
                             const cstr = (0, case_1.capitalize)(valueType.toCodeString([]));
-                            return (0, ts_poet_1.code) `${cstr}(${from})`;
+                            return (0, ts_poet_1.code) `${utils.globalThis}.${cstr}(${from})`;
                         }
                     }
                     else if ((0, types_1.isAnyValueType)(valueField)) {
@@ -1995,6 +1995,9 @@ function convertFromObjectKey(ctx, messageDesc, field, variableName) {
             return (0, ts_poet_1.code) `${ctx.utils.globalThis}.Number(${variableName})`;
         }
     }
+    else if (keyField.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_BOOL) {
+        return (0, ts_poet_1.code) `${ctx.utils.globalThis}.Boolean(${variableName})`;
+    }
     else {
         return (0, ts_poet_1.code) `${ctx.utils.globalThis}.Number(${variableName})`;
     }
@@ -2015,6 +2018,9 @@ function convertToObjectKey(ctx, messageDesc, field, variableName) {
             return (0, ts_poet_1.code) `${variableName}`;
         }
     }
+    else if (keyField.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_BOOL) {
+        return (0, ts_poet_1.code) `${ctx.utils.globalThis}.String(${variableName})`;
+    }
     else {
         return (0, ts_poet_1.code) `${variableName}`;
     }

package/build/types.js

@@ -642,7 +642,8 @@ function shouldGenerateJSMapType(ctx, message, field) {
     if (!mapType) {
         return false;
     }
-    return isLong(mapType.keyField) && ctx.options.forceLong === options_1.LongOption.LONG;
+    return (mapType.keyField.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_BOOL ||
+        (isLong(mapType.keyField) && ctx.options.forceLong === options_1.LongOption.LONG));
 }
 exports.shouldGenerateJSMapType = shouldGenerateJSMapType;
 function detectMapType(ctx, messageDesc, fieldDesc) {

package/package.json

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