ts-proto 1.100.0 → 1.102.1

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## [1.102.1](https://github.com/stephenh/ts-proto/compare/v1.102.0...v1.102.1) (2022-01-19)
+
+
+### Bug Fixes
+
+* Pin ts-proto-descriptors to 1.3.1. ([#481](https://github.com/stephenh/ts-proto/issues/481)) ([6f362bf](https://github.com/stephenh/ts-proto/commit/6f362bfd3517a6bcb440d65e7ac63cd2b0bcc293)), closes [#480](https://github.com/stephenh/ts-proto/issues/480)
+
+# [1.102.0](https://github.com/stephenh/ts-proto/compare/v1.101.0...v1.102.0) (2022-01-18)
+
+
+### Features
+
+* enable unknown fields for descriptor protos ([#479](https://github.com/stephenh/ts-proto/issues/479)) ([824c996](https://github.com/stephenh/ts-proto/commit/824c9962cd98dc0f9093e8909e3028d900094c54))
+
+# [1.101.0](https://github.com/stephenh/ts-proto/compare/v1.100.1...v1.101.0) (2022-01-15)
+
+
+### Features
+
+* add support for unknown fields ([#473](https://github.com/stephenh/ts-proto/issues/473)) ([3bb9472](https://github.com/stephenh/ts-proto/commit/3bb9472943cf2e698b013487c7370a76576b68b6))
+
+## [1.100.1](https://github.com/stephenh/ts-proto/compare/v1.100.0...v1.100.1) (2022-01-10)
+
+
+### Bug Fixes
+
+* respect generateClientImpl=false in grpc-js ([#471](https://github.com/stephenh/ts-proto/issues/471)) ([#472](https://github.com/stephenh/ts-proto/issues/472)) ([2f389f2](https://github.com/stephenh/ts-proto/commit/2f389f243ef11d8d58c32ce37c371aba2cdf294e))
+
 # [1.100.0](https://github.com/stephenh/ts-proto/compare/v1.99.0...v1.100.0) (2022-01-09)
 
 

package/README.markdown

@@ -374,6 +374,8 @@ Generated code will be placed in the Gradle build directory.
   
   The default behavior is `useExactTypes=true`, which makes `fromPartial` use Exact type for its argument to make TypeScript reject any unknown properties.
 
+- With `--ts_proto_opt=unknownFields=true`, all unknown fields will be parsed and output as arrays of buffers.
+
 ### Only Types
 
 If you're looking for `ts-proto` to generate only types for your Protobuf types then passing all three of `outputEncodeMethods`, `outputJsonMethods`, and `outputClientImpl` as `false` is probably what you want, i.e.:

package/build/generate-grpc-js.js

@@ -27,11 +27,14 @@ const ServiceError = ts_poet_1.imp('ServiceError@@grpc/grpc-js');
  * `@grpc/grpc-js` library.
  */
 function generateGrpcJsService(ctx, fileDesc, sourceInfo, serviceDesc) {
+    const { options } = ctx;
     const chunks = [];
     chunks.push(generateServiceDefinition(ctx, fileDesc, sourceInfo, serviceDesc));
     chunks.push(generateServerStub(ctx, sourceInfo, serviceDesc));
-    chunks.push(generateClientStub(ctx, sourceInfo, serviceDesc));
-    chunks.push(generateClientConstructor(fileDesc, serviceDesc));
+    if (options.outputClientImpl) {
+        chunks.push(generateClientStub(ctx, sourceInfo, serviceDesc));
+        chunks.push(generateClientConstructor(fileDesc, serviceDesc));
+    }
     return ts_poet_1.joinCode(chunks, { on: '\n\n' });
 }
 exports.generateGrpcJsService = generateGrpcJsService;

package/build/main.js

@@ -547,6 +547,9 @@ function generateDecode(ctx, fullName, messageDesc) {
       let end = length === undefined ? reader.len : reader.pos + length;
       const message = createBase${fullName}();
   `);
+    if (options.unknownFields) {
+        chunks.push(ts_poet_1.code `(message as any)._unknownFields = {}`);
+    }
     // start the tag loop
     chunks.push(ts_poet_1.code `
     while (reader.pos < end) {
@@ -651,11 +654,22 @@ function generateDecode(ctx, fullName, messageDesc) {
         }
         chunks.push(ts_poet_1.code `break;`);
     });
-    chunks.push(ts_poet_1.code `
-    default:
-      reader.skipType(tag & 7);
-      break;
-  `);
+    if (options.unknownFields) {
+        chunks.push(ts_poet_1.code `
+      default:
+        const startPos = reader.pos;
+        reader.skipType(tag & 7);
+        (message as any)._unknownFields[tag] = [...((message as any)._unknownFields[tag] || []), reader.buf.slice(startPos, reader.pos)];
+        break;
+    `);
+    }
+    else {
+        chunks.push(ts_poet_1.code `
+      default:
+        reader.skipType(tag & 7);
+        break;
+    `);
+    }
     // and then wrap up the switch/while/return
     chunks.push(ts_poet_1.code `}`);
     chunks.push(ts_poet_1.code `}`);
@@ -672,7 +686,7 @@ function generateEncode(ctx, fullName, messageDesc) {
     // create the basic function declaration
     chunks.push(ts_poet_1.code `
     encode(
-      ${messageDesc.field.length > 0 ? 'message' : '_'}: ${fullName},
+      ${messageDesc.field.length > 0 || options.unknownFields ? 'message' : '_'}: ${fullName},
       writer: ${Writer} = ${Writer}.create(),
     ): ${Writer} {
   `);
@@ -837,6 +851,21 @@ function generateEncode(ctx, fullName, messageDesc) {
             chunks.push(ts_poet_1.code `${writeSnippet(`message.${fieldName}`)};`);
         }
     });
+    if (options.unknownFields) {
+        chunks.push(ts_poet_1.code `if ('_unknownFields' in message) {
+      for (const key of Object.keys(message['_unknownFields'])) {
+        const values = message['_unknownFields'][key] as Uint8Array[];
+        for (const value of values) {
+          writer.uint32(parseInt(key, 10));
+          (writer as any)['_push'](
+            (val: Uint8Array, buf: Buffer, pos: number) => buf.set(val, pos),
+            value.length,
+            value
+          );
+        }
+      }
+    }`);
+    }
     chunks.push(ts_poet_1.code `return writer;`);
     chunks.push(ts_poet_1.code `}`);
     return ts_poet_1.joinCode(chunks, { on: '\n' });

package/build/options.js

@@ -63,6 +63,7 @@ function defaultOptions() {
         onlyTypes: false,
         emitImportedFiles: true,
         useExactTypes: true,
+        unknownFields: false,
     };
 }
 exports.defaultOptions = defaultOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "1.100.0",
+  "version": "1.102.1",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",
@@ -64,6 +64,6 @@
     "object-hash": "^1.3.1",
     "protobufjs": "^6.8.8",
     "ts-poet": "^4.5.0",
-    "ts-proto-descriptors": "^1.2.1"
+    "ts-proto-descriptors": "1.3.1"
   }
 }