@bufbuild/protobuf 2.5.2 → 2.6.0

package/dist/cjs/index.d.ts

@@ -13,5 +13,6 @@ export { fromBinary, mergeFromBinary } from "./from-binary.js";
 export type { BinaryReadOptions } from "./from-binary.js";
 export * from "./to-json.js";
 export * from "./from-json.js";
+export * from "./merge.js";
 export { hasExtension, getExtension, setExtension, clearExtension, hasOption, getOption, } from "./extensions.js";
 export * from "./proto-int64.js";

package/dist/cjs/index.js

@@ -43,6 +43,7 @@ Object.defineProperty(exports, "fromBinary", { enumerable: true, get: function (
 Object.defineProperty(exports, "mergeFromBinary", { enumerable: true, get: function () { return from_binary_js_1.mergeFromBinary; } });
 __exportStar(require("./to-json.js"), exports);
 __exportStar(require("./from-json.js"), exports);
+__exportStar(require("./merge.js"), exports);
 var extensions_js_1 = require("./extensions.js");
 Object.defineProperty(exports, "hasExtension", { enumerable: true, get: function () { return extensions_js_1.hasExtension; } });
 Object.defineProperty(exports, "getExtension", { enumerable: true, get: function () { return extensions_js_1.getExtension; } });

package/dist/cjs/merge.d.ts

@@ -0,0 +1,13 @@
+import type { MessageShape } from "./types.js";
+import type { DescMessage } from "./descriptors.js";
+/**
+ * Merge message `source` into message `target`, following Protobuf semantics.
+ *
+ * This is the same as serializing the source message, then deserializing it
+ * into the target message via `mergeFromBinary()`, with one difference:
+ * While serialization will create a copy of all values, `merge()` will copy
+ * the reference for `bytes` and messages.
+ *
+ * Also see https://protobuf.com/docs/language-spec#merging-protobuf-messages
+ */
+export declare function merge<Desc extends DescMessage>(schema: Desc, target: MessageShape<Desc>, source: MessageShape<Desc>): void;

package/dist/cjs/merge.js

@@ -0,0 +1,70 @@
+"use strict";
+// Copyright 2021-2025 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.merge = merge;
+const reflect_js_1 = require("./reflect/reflect.js");
+/**
+ * Merge message `source` into message `target`, following Protobuf semantics.
+ *
+ * This is the same as serializing the source message, then deserializing it
+ * into the target message via `mergeFromBinary()`, with one difference:
+ * While serialization will create a copy of all values, `merge()` will copy
+ * the reference for `bytes` and messages.
+ *
+ * Also see https://protobuf.com/docs/language-spec#merging-protobuf-messages
+ */
+function merge(schema, target, source) {
+    reflectMerge((0, reflect_js_1.reflect)(schema, target), (0, reflect_js_1.reflect)(schema, source));
+}
+function reflectMerge(target, source) {
+    var _a;
+    var _b;
+    const sourceUnknown = source.message.$unknown;
+    if (sourceUnknown !== undefined && sourceUnknown.length > 0) {
+        (_a = (_b = target.message).$unknown) !== null && _a !== void 0 ? _a : (_b.$unknown = []);
+        target.message.$unknown.push(...sourceUnknown);
+    }
+    for (const f of target.fields) {
+        if (!source.isSet(f)) {
+            continue;
+        }
+        switch (f.fieldKind) {
+            case "scalar":
+            case "enum":
+                target.set(f, source.get(f));
+                break;
+            case "message":
+                if (target.isSet(f)) {
+                    reflectMerge(target.get(f), source.get(f));
+                }
+                else {
+                    target.set(f, source.get(f));
+                }
+                break;
+            case "list":
+                const list = target.get(f);
+                for (const e of source.get(f)) {
+                    list.add(e);
+                }
+                break;
+            case "map":
+                const map = target.get(f);
+                for (const [k, v] of source.get(f)) {
+                    map.set(k, v);
+                }
+                break;
+        }
+    }
+}

package/dist/esm/index.d.ts

@@ -13,5 +13,6 @@ export { fromBinary, mergeFromBinary } from "./from-binary.js";
 export type { BinaryReadOptions } from "./from-binary.js";
 export * from "./to-json.js";
 export * from "./from-json.js";
+export * from "./merge.js";
 export { hasExtension, getExtension, setExtension, clearExtension, hasOption, getOption, } from "./extensions.js";
 export * from "./proto-int64.js";

package/dist/esm/index.js

@@ -23,5 +23,6 @@ export { toBinary } from "./to-binary.js";
 export { fromBinary, mergeFromBinary } from "./from-binary.js";
 export * from "./to-json.js";
 export * from "./from-json.js";
+export * from "./merge.js";
 export { hasExtension, getExtension, setExtension, clearExtension, hasOption, getOption, } from "./extensions.js";
 export * from "./proto-int64.js";

package/dist/esm/merge.d.ts

@@ -0,0 +1,13 @@
+import type { MessageShape } from "./types.js";
+import type { DescMessage } from "./descriptors.js";
+/**
+ * Merge message `source` into message `target`, following Protobuf semantics.
+ *
+ * This is the same as serializing the source message, then deserializing it
+ * into the target message via `mergeFromBinary()`, with one difference:
+ * While serialization will create a copy of all values, `merge()` will copy
+ * the reference for `bytes` and messages.
+ *
+ * Also see https://protobuf.com/docs/language-spec#merging-protobuf-messages
+ */
+export declare function merge<Desc extends DescMessage>(schema: Desc, target: MessageShape<Desc>, source: MessageShape<Desc>): void;

package/dist/esm/merge.js

@@ -0,0 +1,67 @@
+// Copyright 2021-2025 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+import { reflect } from "./reflect/reflect.js";
+/**
+ * Merge message `source` into message `target`, following Protobuf semantics.
+ *
+ * This is the same as serializing the source message, then deserializing it
+ * into the target message via `mergeFromBinary()`, with one difference:
+ * While serialization will create a copy of all values, `merge()` will copy
+ * the reference for `bytes` and messages.
+ *
+ * Also see https://protobuf.com/docs/language-spec#merging-protobuf-messages
+ */
+export function merge(schema, target, source) {
+    reflectMerge(reflect(schema, target), reflect(schema, source));
+}
+function reflectMerge(target, source) {
+    var _a;
+    var _b;
+    const sourceUnknown = source.message.$unknown;
+    if (sourceUnknown !== undefined && sourceUnknown.length > 0) {
+        (_a = (_b = target.message).$unknown) !== null && _a !== void 0 ? _a : (_b.$unknown = []);
+        target.message.$unknown.push(...sourceUnknown);
+    }
+    for (const f of target.fields) {
+        if (!source.isSet(f)) {
+            continue;
+        }
+        switch (f.fieldKind) {
+            case "scalar":
+            case "enum":
+                target.set(f, source.get(f));
+                break;
+            case "message":
+                if (target.isSet(f)) {
+                    reflectMerge(target.get(f), source.get(f));
+                }
+                else {
+                    target.set(f, source.get(f));
+                }
+                break;
+            case "list":
+                const list = target.get(f);
+                for (const e of source.get(f)) {
+                    list.add(e);
+                }
+                break;
+            case "map":
+                const map = target.get(f);
+                for (const [k, v] of source.get(f)) {
+                    map.set(k, v);
+                }
+                break;
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bufbuild/protobuf",
-  "version": "2.5.2",
+  "version": "2.6.0",
   "license": "(Apache-2.0 AND BSD-3-Clause)",
   "description": "A complete implementation of Protocol Buffers in TypeScript, suitable for web browsers and Node.js.",
   "keywords": ["protobuf", "schema", "typescript", "ecmascript"],