Change clone to create a new array for unknown fields (#760)

bufbuild · Mar 22, 2024 · cde009f · cde009f
1 parent 82fd2e4
commit cde009f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/packages/protobuf-test/src/next/clone.test.ts b/packages/protobuf-test/src/next/clone.test.ts
@@ -147,5 +147,9 @@ describe("clone()", () => {
     expect(copy.singularMessageField?.$unknown).toStrictEqual(
       msg.singularMessageField.$unknown,
     );
+    // Make sure it is copy
+    expect(copy.singularMessageField?.$unknown).not.toBe(
+      msg.singularMessageField.$unknown,
+    );
   });
 });
diff --git a/packages/protobuf/src/next/clone.ts b/packages/protobuf/src/next/clone.ts
@@ -58,7 +58,7 @@ export function clone<T extends Message>(message: T): T {
   }
   const unknown = i.getUnknown();
   if (unknown && unknown.length > 0) {
-    o.setUnknown(unknown);
+    o.setUnknown([...unknown]);
   }
   return o.message as T;
 }

diff --git a/packages/protobuf/src/next/reflect/reflect.ts b/packages/protobuf/src/next/reflect/reflect.ts
@@ -18,7 +18,7 @@ import type {
   DescOneof,
 } from "../../descriptor-set.js";
 import type { ScalarValue, LongType } from "./scalar.js";
-import type { Message } from "../types.js";
+import type { Message, UnknownField } from "../types.js";
 import {
   addListItemPrivate,
   clearFieldPrivate,
@@ -38,7 +38,6 @@ import {
 import { FieldError } from "./error.js";
 import type { MapEntryKey, ReflectMap } from "./reflect-map.js";
 import { reflectMap } from "./reflect-map.js";
-import type { WireType } from "../../binary-encoding.js";
 
 export interface ReflectMessage {
   readonly kind: "reflect_message";
@@ -77,13 +76,9 @@ export interface ReflectMessage {
     value: NewMapEntryValue<Field>,
   ): FieldError | undefined;
 
-  getUnknown():
-    | { no: number; wireType: WireType; data: Uint8Array }[]
-    | undefined;
+  getUnknown(): UnknownField[] | undefined;
 
-  setUnknown(
-    value: { no: number; wireType: WireType; data: Uint8Array }[],
-  ): void;
+  setUnknown(value: UnknownField[]): void;
 }
 
 // prettier-ignore

diff --git a/packages/protobuf/src/next/types.ts b/packages/protobuf/src/next/types.ts
@@ -24,7 +24,7 @@ export type Message<TypeName extends string = string> = {
   readonly $desc: DescMessage;
   readonly $typeName: TypeName;
 
-  $unknown?: { no: number; wireType: WireType; data: Uint8Array }[];
+  $unknown?: UnknownField[];
 };
 
 // TODO docs
@@ -41,6 +41,12 @@ export type MessageInitShape<Desc extends DescMessage> =
 export type EnumShape<Desc extends DescEnum> =
   Desc extends TypedDescEnum<infer RuntimeShape> ? RuntimeShape : number;
 
+export type UnknownField = {
+  readonly no: number;
+  readonly wireType: WireType;
+  readonly data: Uint8Array;
+};
+
 // TODO ServiceShape
 // TODO MethodShape?