feat: add a no-tags option to the type-registry

README.markdown

@@ -398,7 +398,7 @@ Generated code will be placed in the Gradle build directory.
 
 - With `--ts_proto_opt=outputSchema=true`, meta typings will be generated that can later be used in other code generators.
 
-- With `--ts_proto_opt=outputTypeRegistry=true`, the type registry will be generated that can be used to resolve message types by fully-qualified name. Also, each message will get extra `$type` field containing fully-qualified name.
+- With `--ts_proto_opt=outputTypeRegistry=true`, the type registry will be generated that can be used to resolve message types by fully-qualified name. Also, each message will get extra `$type` field containing fully-qualified name.  If you would prefer to avoid the `$type`, you can  `--ts_proto_opt=outputTypeRegistry=no-tags`
 
 - With `--ts_proto_opt=outputServices=grpc-js`, ts-proto will output service definitions and server / client stubs in [grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) format.
 

integration/grpc-js/google/protobuf/struct.ts

@@ -60,8 +60,8 @@ export interface Struct_FieldsEntry {
 /**
  * `Value` represents a dynamically typed value which can be either
  * null, a number, a string, a boolean, a recursive struct value, or a
- * list of values. A producer of value is expected to set one of these
- * variants. Absence of any variant indicates an error.
+ * list of values. A producer of value is expected to set one of that
+ * variants, absence of any variant indicates an error.
  *
  * The JSON representation for `Value` is JSON value.
  */

integration/nice-grpc/google/protobuf/struct.ts

@@ -60,8 +60,8 @@ export interface Struct_FieldsEntry {
 /**
  * `Value` represents a dynamically typed value which can be either
  * null, a number, a string, a boolean, a recursive struct value, or a
- * list of values. A producer of value is expected to set one of these
- * variants. Absence of any variant indicates an error.
+ * list of values. A producer of value is expected to set one of that
+ * variants, absence of any variant indicates an error.
  *
  * The JSON representation for `Value` is JSON value.
  */

integration/oneof-unions-snake/google/protobuf/struct.ts

@@ -60,8 +60,8 @@ export interface Struct_FieldsEntry {
 /**
  * `Value` represents a dynamically typed value which can be either
  * null, a number, a string, a boolean, a recursive struct value, or a
- * list of values. A producer of value is expected to set one of these
- * variants. Absence of any variant indicates an error.
+ * list of values. A producer of value is expected to set one of that
+ * variants, absence of any variant indicates an error.
  *
  * The JSON representation for `Value` is JSON value.
  */

integration/oneof-unions/google/protobuf/struct.ts

@@ -60,8 +60,8 @@ export interface Struct_FieldsEntry {
 /**
  * `Value` represents a dynamically typed value which can be either
  * null, a number, a string, a boolean, a recursive struct value, or a
- * list of values. A producer of value is expected to set one of these
- * variants. Absence of any variant indicates an error.
+ * list of values. A producer of value is expected to set one of that
+ * variants, absence of any variant indicates an error.
  *
  * The JSON representation for `Value` is JSON value.
  */

integration/simple-snake/google/protobuf/struct.ts

@@ -60,8 +60,8 @@ export interface Struct_FieldsEntry {
 /**
  * `Value` represents a dynamically typed value which can be either
  * null, a number, a string, a boolean, a recursive struct value, or a
- * list of values. A producer of value is expected to set one of these
- * variants. Absence of any variant indicates an error.
+ * list of values. A producer of value is expected to set one of that
+ * variants, absence of any variant indicates an error.
  *
  * The JSON representation for `Value` is JSON value.
  */

integration/simple-string-enums/google/protobuf/struct.ts

@@ -70,8 +70,8 @@ export interface Struct_FieldsEntry {
 /**
  * `Value` represents a dynamically typed value which can be either
  * null, a number, a string, a boolean, a recursive struct value, or a
- * list of values. A producer of value is expected to set one of these
- * variants. Absence of any variant indicates an error.
+ * list of values. A producer of value is expected to set one of that
+ * variants, absence of any variant indicates an error.
  *
  * The JSON representation for `Value` is JSON value.
  */

integration/struct/google/protobuf/struct.ts

@@ -60,8 +60,8 @@ export interface Struct_FieldsEntry {
 /**
  * `Value` represents a dynamically typed value which can be either
  * null, a number, a string, a boolean, a recursive struct value, or a
- * list of values. A producer of value is expected to set one of these
- * variants. Absence of any variant indicates an error.
+ * list of values. A producer of value is expected to set one of that
+ * variants, absence of any variant indicates an error.
  *
  * The JSON representation for `Value` is JSON value.
  */

integration/type-registry-no-tags/bar/bar.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+package foo.bar;
+
+import "foo.proto";
+
+message Bar {
+  Foo foo = 1;
+}

integration/type-registry-no-tags/bar/bar.ts

@@ -0,0 +1,76 @@
+/* eslint-disable */
+import * as _m0 from "protobufjs/minimal";
+import { Foo } from "../foo";
+import { messageTypeRegistry } from "../typeRegistry";
+
+export const protobufPackage = "foo.bar";
+
+export interface Bar {
+  foo: Foo | undefined;
+}
+
+function createBaseBar(): Bar {
+  return { foo: undefined };
+}
+
+export const Bar = {
+  $type: "foo.bar.Bar" as const,
+
+  encode(message: Bar, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.foo !== undefined) {
+      Foo.encode(message.foo, writer.uint32(10).fork()).ldelim();
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): Bar {
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseBar();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          message.foo = Foo.decode(reader, reader.uint32());
+          break;
+        default:
+          reader.skipType(tag & 7);
+          break;
+      }
+    }
+    return message;
+  },
+
+  fromJSON(object: any): Bar {
+    return { foo: isSet(object.foo) ? Foo.fromJSON(object.foo) : undefined };
+  },
+
+  toJSON(message: Bar): unknown {
+    const obj: any = {};
+    message.foo !== undefined && (obj.foo = message.foo ? Foo.toJSON(message.foo) : undefined);
+    return obj;
+  },
+
+  fromPartial<I extends Exact<DeepPartial<Bar>, I>>(object: I): Bar {
+    const message = createBaseBar();
+    message.foo = (object.foo !== undefined && object.foo !== null) ? Foo.fromPartial(object.foo) : undefined;
+    return message;
+  },
+};
+
+messageTypeRegistry.set("foo.bar.Bar", Bar);
+
+type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
+
+export type DeepPartial<T> = T extends Builtin ? T
+  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
+  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
+  : Partial<T>;
+
+type KeysOfUnion<T> = T extends T ? keyof T : never;
+export type Exact<P, I extends P> = P extends Builtin ? P
+  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P> | "$type">]: never };
+
+function isSet(value: any): boolean {
+  return value !== null && value !== undefined;
+}

integration/type-registry-no-tags/foo.proto

@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+package foo;
+
+import "google/protobuf/timestamp.proto";
+import "google/protobuf/struct.proto";
+
+message Foo {
+  google.protobuf.Timestamp timestamp = 1;
+}
+
+message Foo2 {
+  google.protobuf.Timestamp timestamp = 1;
+}
+
+message WithStruct {
+  google.protobuf.Struct struct = 1;
+}