@bufbuild/protobuf 2.5.2 → 2.6.1

package/dist/cjs/codegenv2/boot.js

@@ -44,11 +44,14 @@ function bootFileDescriptorProto(init) {
         syntax: "",
         edition: 0,
     });
-    return Object.assign(proto, Object.assign(Object.assign({ $typeName: "google.protobuf.FileDescriptorProto", dependency: [], publicDependency: [], weakDependency: [], service: [], extension: [] }, init), { messageType: init.messageType.map(bootDescriptorProto), enumType: init.enumType.map(bootEnumDescriptorProto) }));
+    return Object.assign(proto, Object.assign(Object.assign({ $typeName: "google.protobuf.FileDescriptorProto", dependency: [], publicDependency: [], weakDependency: [], optionDependency: [], service: [], extension: [] }, init), { messageType: init.messageType.map(bootDescriptorProto), enumType: init.enumType.map(bootEnumDescriptorProto) }));
 }
 function bootDescriptorProto(init) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    return {
+    const proto = Object.create({
+        visibility: 0,
+    });
+    return Object.assign(proto, {
         $typeName: "google.protobuf.DescriptorProto",
         name: init.name,
         field: (_b = (_a = init.field) === null || _a === void 0 ? void 0 : _a.map(bootFieldDescriptorProto)) !== null && _b !== void 0 ? _b : [],
@@ -59,7 +62,7 @@ function bootDescriptorProto(init) {
         oneofDecl: [],
         reservedRange: [],
         reservedName: [],
-    };
+    });
 }
 function bootFieldDescriptorProto(init) {
     const proto = Object.create({
@@ -89,11 +92,14 @@ function bootFieldOptions(init) {
     return Object.assign(proto, Object.assign(Object.assign({ $typeName: "google.protobuf.FieldOptions" }, init), { targets: (_a = init.targets) !== null && _a !== void 0 ? _a : [], editionDefaults: (_c = (_b = init.editionDefaults) === null || _b === void 0 ? void 0 : _b.map((e) => (Object.assign({ $typeName: "google.protobuf.FieldOptions.EditionDefault" }, e)))) !== null && _c !== void 0 ? _c : [], uninterpretedOption: [] }));
 }
 function bootEnumDescriptorProto(init) {
-    return {
+    const proto = Object.create({
+        visibility: 0,
+    });
+    return Object.assign(proto, {
         $typeName: "google.protobuf.EnumDescriptorProto",
         name: init.name,
         reservedName: [],
         reservedRange: [],
         value: init.value.map((e) => (Object.assign({ $typeName: "google.protobuf.EnumValueDescriptorProto" }, e))),
-    };
+    });
 }

package/dist/cjs/codegenv2/embed.d.ts

@@ -1,5 +1,5 @@
 import type { DescEnum, DescExtension, DescMessage, DescService } from "../descriptors.js";
-import type { FileDescriptorProto } from "../wkt/gen/google/protobuf/descriptor_pb.js";
+import { type FileDescriptorProto } from "../wkt/gen/google/protobuf/descriptor_pb.js";
 import type { FileDescriptorProtoBoot } from "./boot.js";
 type EmbedUnknown = {
     bootable: false;

package/dist/cjs/codegenv2/embed.js

@@ -122,6 +122,7 @@ function createFileDescriptorProtoBoot(proto) {
     assert(!proto.dependency.length);
     assert(!proto.publicDependency.length);
     assert(!proto.weakDependency.length);
+    assert(!proto.optionDependency.length);
     assert(!proto.service.length);
     assert(!proto.extension.length);
     assert(proto.sourceCodeInfo === undefined);
@@ -139,6 +140,7 @@ function createDescriptorBoot(proto) {
     assert(proto.extension.length == 0);
     assert(!proto.oneofDecl.length);
     assert(!proto.options);
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.DescriptorProtoSchema.field.visibility));
     const b = {
         name: proto.name,
     };
@@ -220,6 +222,7 @@ function createFieldOptionsBoot(proto) {
 }
 function createEnumDescriptorBoot(proto) {
     assert(!proto.options);
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.EnumDescriptorProtoSchema.field.visibility));
     return {
         name: proto.name,
         value: proto.value.map((v) => {

package/dist/cjs/from-binary.js

@@ -90,12 +90,28 @@ function readMessage(message, reader, options, delimited, lengthOrDelimitedField
  * @private
  */
 function readField(message, reader, field, wireType, options) {
+    var _a;
     switch (field.fieldKind) {
         case "scalar":
             message.set(field, readScalar(reader, field.scalar));
             break;
         case "enum":
-            message.set(field, readScalar(reader, descriptors_js_1.ScalarType.INT32));
+            const val = readScalar(reader, descriptors_js_1.ScalarType.INT32);
+            if (field.enum.open) {
+                message.set(field, val);
+            }
+            else {
+                const ok = field.enum.values.some((v) => v.number === val);
+                if (ok) {
+                    message.set(field, val);
+                }
+                else if (options.readUnknownFields) {
+                    const data = new binary_encoding_js_1.BinaryWriter().int32(val).finish();
+                    const unknownFields = (_a = message.getUnknown()) !== null && _a !== void 0 ? _a : [];
+                    unknownFields.push({ no: field.number, wireType, data });
+                    message.setUnknown(unknownFields);
+                }
+            }
             break;
         case "message":
             message.set(field, readMessageField(reader, options, field, message.get(field)));

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/cjs/registry.js

@@ -229,7 +229,7 @@ const DELIMITED = 2;
 const OPEN = 1;
 // biome-ignore format: want this to read well
 // bootstrap-inject defaults: EDITION_PROTO2 to EDITION_2023: export const minimumEdition: SupportedEdition = $minimumEdition, maximumEdition: SupportedEdition = $maximumEdition;
-// generated from protoc v30.0
+// generated from protoc v31.1
 exports.minimumEdition = 998, exports.maximumEdition = 1000;
 const featureDefaults = {
     // EDITION_PROTO2
@@ -241,6 +241,7 @@ const featureDefaults = {
         messageEncoding: 1, // LENGTH_PREFIXED,
         jsonFormat: 2, // LEGACY_BEST_EFFORT,
         enforceNamingStyle: 2, // STYLE_LEGACY,
+        defaultSymbolVisibility: 1, // EXPORT_ALL,
     },
     // EDITION_PROTO3
     999: {
@@ -251,6 +252,7 @@ const featureDefaults = {
         messageEncoding: 1, // LENGTH_PREFIXED,
         jsonFormat: 1, // ALLOW,
         enforceNamingStyle: 2, // STYLE_LEGACY,
+        defaultSymbolVisibility: 1, // EXPORT_ALL,
     },
     // EDITION_2023
     1000: {
@@ -261,6 +263,7 @@ const featureDefaults = {
         messageEncoding: 1, // LENGTH_PREFIXED,
         jsonFormat: 1, // ALLOW,
         enforceNamingStyle: 2, // STYLE_LEGACY,
+        defaultSymbolVisibility: 1, // EXPORT_ALL,
     },
 };
 /**

package/dist/cjs/wkt/gen/google/protobuf/descriptor_pb.d.ts

@@ -72,6 +72,13 @@ export type FileDescriptorProto = Message<"google.protobuf.FileDescriptorProto">
      * @generated from field: repeated int32 weak_dependency = 11;
      */
     weakDependency: number[];
+    /**
+     * Names of files imported by this file purely for the purpose of providing
+     * option extensions. These are excluded from the dependency list above.
+     *
+     * @generated from field: repeated string option_dependency = 15;
+     */
+    optionDependency: string[];
     /**
      * All top-level definitions in this file.
      *
@@ -162,6 +169,13 @@ export type FileDescriptorProtoJson = {
      * @generated from field: repeated int32 weak_dependency = 11;
      */
     weakDependency?: number[];
+    /**
+     * Names of files imported by this file purely for the purpose of providing
+     * option extensions. These are excluded from the dependency list above.
+     *
+     * @generated from field: repeated string option_dependency = 15;
+     */
+    optionDependency?: string[];
     /**
      * All top-level definitions in this file.
      *
@@ -271,6 +285,12 @@ export type DescriptorProto = Message<"google.protobuf.DescriptorProto"> & {
      * @generated from field: repeated string reserved_name = 10;
      */
     reservedName: string[];
+    /**
+     * Support for `export` and `local` keywords on enums.
+     *
+     * @generated from field: optional google.protobuf.SymbolVisibility visibility = 11;
+     */
+    visibility: SymbolVisibility;
 };
 /**
  * Describes a message type.
@@ -321,6 +341,12 @@ export type DescriptorProtoJson = {
      * @generated from field: repeated string reserved_name = 10;
      */
     reservedName?: string[];
+    /**
+     * Support for `export` and `local` keywords on enums.
+     *
+     * @generated from field: optional google.protobuf.SymbolVisibility visibility = 11;
+     */
+    visibility?: SymbolVisibilityJson;
 };
 /**
  * Describes the message google.protobuf.DescriptorProto.
@@ -1028,6 +1054,12 @@ export type EnumDescriptorProto = Message<"google.protobuf.EnumDescriptorProto">
      * @generated from field: repeated string reserved_name = 5;
      */
     reservedName: string[];
+    /**
+     * Support for `export` and `local` keywords on enums.
+     *
+     * @generated from field: optional google.protobuf.SymbolVisibility visibility = 6;
+     */
+    visibility: SymbolVisibility;
 };
 /**
  * Describes an enum type.
@@ -1062,6 +1094,12 @@ export type EnumDescriptorProtoJson = {
      * @generated from field: repeated string reserved_name = 5;
      */
     reservedName?: string[];
+    /**
+     * Support for `export` and `local` keywords on enums.
+     *
+     * @generated from field: optional google.protobuf.SymbolVisibility visibility = 6;
+     */
+    visibility?: SymbolVisibilityJson;
 };
 /**
  * Describes the message google.protobuf.EnumDescriptorProto.
@@ -3052,6 +3090,10 @@ export type FeatureSet = Message<"google.protobuf.FeatureSet"> & {
      * @generated from field: optional google.protobuf.FeatureSet.EnforceNamingStyle enforce_naming_style = 7;
      */
     enforceNamingStyle: FeatureSet_EnforceNamingStyle;
+    /**
+     * @generated from field: optional google.protobuf.FeatureSet.VisibilityFeature.DefaultSymbolVisibility default_symbol_visibility = 8;
+     */
+    defaultSymbolVisibility: FeatureSet_VisibilityFeature_DefaultSymbolVisibility;
 };
 /**
  * TODO Enums in C++ gencode (and potentially other languages) are
@@ -3092,6 +3134,10 @@ export type FeatureSetJson = {
      * @generated from field: optional google.protobuf.FeatureSet.EnforceNamingStyle enforce_naming_style = 7;
      */
     enforceNamingStyle?: FeatureSet_EnforceNamingStyleJson;
+    /**
+     * @generated from field: optional google.protobuf.FeatureSet.VisibilityFeature.DefaultSymbolVisibility default_symbol_visibility = 8;
+     */
+    defaultSymbolVisibility?: FeatureSet_VisibilityFeature_DefaultSymbolVisibilityJson;
 };
 /**
  * Describes the message google.protobuf.FeatureSet.
@@ -3100,6 +3146,64 @@ export type FeatureSetJson = {
 export declare const FeatureSetSchema: GenMessage<FeatureSet, {
     jsonType: FeatureSetJson;
 }>;
+/**
+ * @generated from message google.protobuf.FeatureSet.VisibilityFeature
+ */
+export type FeatureSet_VisibilityFeature = Message<"google.protobuf.FeatureSet.VisibilityFeature"> & {};
+/**
+ * @generated from message google.protobuf.FeatureSet.VisibilityFeature
+ */
+export type FeatureSet_VisibilityFeatureJson = {};
+/**
+ * Describes the message google.protobuf.FeatureSet.VisibilityFeature.
+ * Use `create(FeatureSet_VisibilityFeatureSchema)` to create a new message.
+ */
+export declare const FeatureSet_VisibilityFeatureSchema: GenMessage<FeatureSet_VisibilityFeature, {
+    jsonType: FeatureSet_VisibilityFeatureJson;
+}>;
+/**
+ * @generated from enum google.protobuf.FeatureSet.VisibilityFeature.DefaultSymbolVisibility
+ */
+export declare enum FeatureSet_VisibilityFeature_DefaultSymbolVisibility {
+    /**
+     * @generated from enum value: DEFAULT_SYMBOL_VISIBILITY_UNKNOWN = 0;
+     */
+    DEFAULT_SYMBOL_VISIBILITY_UNKNOWN = 0,
+    /**
+     * Default pre-EDITION_2024, all UNSET visibility are export.
+     *
+     * @generated from enum value: EXPORT_ALL = 1;
+     */
+    EXPORT_ALL = 1,
+    /**
+     * All top-level symbols default to export, nested default to local.
+     *
+     * @generated from enum value: EXPORT_TOP_LEVEL = 2;
+     */
+    EXPORT_TOP_LEVEL = 2,
+    /**
+     * All symbols default to local.
+     *
+     * @generated from enum value: LOCAL_ALL = 3;
+     */
+    LOCAL_ALL = 3,
+    /**
+     * All symbols local by default. Nested types cannot be exported.
+     * With special case caveat for message { enum {} reserved 1 to max; }
+     * This is the recommended setting for new protos.
+     *
+     * @generated from enum value: STRICT = 4;
+     */
+    STRICT = 4
+}
+/**
+ * @generated from enum google.protobuf.FeatureSet.VisibilityFeature.DefaultSymbolVisibility
+ */
+export type FeatureSet_VisibilityFeature_DefaultSymbolVisibilityJson = "DEFAULT_SYMBOL_VISIBILITY_UNKNOWN" | "EXPORT_ALL" | "EXPORT_TOP_LEVEL" | "LOCAL_ALL" | "STRICT";
+/**
+ * Describes the enum google.protobuf.FeatureSet.VisibilityFeature.DefaultSymbolVisibility.
+ */
+export declare const FeatureSet_VisibilityFeature_DefaultSymbolVisibilitySchema: GenEnum<FeatureSet_VisibilityFeature_DefaultSymbolVisibility, FeatureSet_VisibilityFeature_DefaultSymbolVisibilityJson>;
 /**
  * @generated from enum google.protobuf.FeatureSet.FieldPresence
  */
@@ -3976,3 +4080,40 @@ export type EditionJson = "EDITION_UNKNOWN" | "EDITION_LEGACY" | "EDITION_PROTO2
  * Describes the enum google.protobuf.Edition.
  */
 export declare const EditionSchema: GenEnum<Edition, EditionJson>;
+/**
+ * Describes the 'visibility' of a symbol with respect to the proto import
+ * system. Symbols can only be imported when the visibility rules do not prevent
+ * it (ex: local symbols cannot be imported).  Visibility modifiers can only set
+ * on `message` and `enum` as they are the only types available to be referenced
+ * from other files.
+ *
+ * @generated from enum google.protobuf.SymbolVisibility
+ */
+export declare enum SymbolVisibility {
+    /**
+     * @generated from enum value: VISIBILITY_UNSET = 0;
+     */
+    VISIBILITY_UNSET = 0,
+    /**
+     * @generated from enum value: VISIBILITY_LOCAL = 1;
+     */
+    VISIBILITY_LOCAL = 1,
+    /**
+     * @generated from enum value: VISIBILITY_EXPORT = 2;
+     */
+    VISIBILITY_EXPORT = 2
+}
+/**
+ * Describes the 'visibility' of a symbol with respect to the proto import
+ * system. Symbols can only be imported when the visibility rules do not prevent
+ * it (ex: local symbols cannot be imported).  Visibility modifiers can only set
+ * on `message` and `enum` as they are the only types available to be referenced
+ * from other files.
+ *
+ * @generated from enum google.protobuf.SymbolVisibility
+ */
+export type SymbolVisibilityJson = "VISIBILITY_UNSET" | "VISIBILITY_LOCAL" | "VISIBILITY_EXPORT";
+/**
+ * Describes the enum google.protobuf.SymbolVisibility.
+ */
+export declare const SymbolVisibilitySchema: GenEnum<SymbolVisibility, SymbolVisibilityJson>;