ts-proto 1.175.0 → 1.175.1

package/build/schema.js

@@ -188,13 +188,30 @@ function encodedOptionsToOptions(ctx, extendee, encodedOptions) {
     for (const key in encodedOptions) {
         const value = encodedOptions[key];
         const extension = extensionCache[extendee][parseInt(key, 10) >>> 3];
-        resultOptions.push(getExtensionValue(ctx, extension, value));
+        if (shouldAddOptionDefinition(ctx, extension)) {
+            // todo: we should be able to create an option definition ALWAYS, however,
+            // we currently cannot do that because the if the extension is a sub-message
+            // (and thus, not just a straightforward value), we don't have an JSON object
+            // representation of the option - just it's encoded value. Our approach in
+            // getExtensionValue is to decode the encoded value into a message, but this
+            // Message.decode(...) method is not always included in the generated code.
+            // We should fix this so that we can always create an option definition by
+            // somehow premptively decoding the encoded value and then inserting it into
+            // the option defintion.
+            // please refer to inteegration/options-types-only to see this in action
+            resultOptions.push(getExtensionValue(ctx, extension, value));
+        }
     }
     if (resultOptions.length == 0) {
         return undefined;
     }
     return (0, ts_poet_1.code) `{${(0, ts_poet_1.joinCode)(resultOptions, { on: "," })}}`;
 }
+function shouldAddOptionDefinition(ctx, extension) {
+    return (extension.type !== ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_MESSAGE ||
+        ctx.options.outputEncodeMethods === true ||
+        ctx.options.outputEncodeMethods == "decode-only");
+}
 function resolveMessageOptions(ctx, message) {
     const fieldsOptions = [];
     message.field.forEach((field) => {

package/package.json

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