@bufbuild/protoc-gen-es 2.3.0 → 2.5.0

package/README.md

@@ -118,3 +118,16 @@ the top of each file to skip type checks: `// @ts-nocheck`.
 
 Generates JSON types for every Protobuf message and enumeration. Calling `toJson()` automatically returns the JSON type
 if available. Learn more about [JSON types](https://github.com/bufbuild/protobuf-es/blob/main/MANUAL.md#json-types).
+
+### `valid_types` (experimental)
+
+Generates a Valid type for every Protobuf message. Possible values:
+
+- `valid_types=legacy_required`: Message fields with the `required` label, or the Edition feature 
+  `features.field_presence=LEGACY_REQUIRED`, are generated as non-optional properties. 
+- `valid_types=protovalidate_required`: Message fields with protovalidate's [`required` rule](https://buf.build/docs/reference/protovalidate/rules/field_rules/#required) 
+  rule are generated as non-optional properties.
+
+You can combine both options with `+`—for example, `valid_types=legacy_required+protovalidate_required`.
+
+Learn more about [Valid types](https://github.com/bufbuild/protobuf-es/blob/main/MANUAL.md#valid-types).

package/dist/cjs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bufbuild/protoc-gen-es",
-    "version": "2.3.0",
+    "version": "2.5.0",
     "license": "Apache-2.0",
     "description": "Protocol Buffers code generator for ECMAScript",
     "keywords": [
@@ -24,17 +24,22 @@
     "scripts": {
         "prebuild": "rm -rf ./dist/cjs/*",
         "build": "../../node_modules/typescript/bin/tsc --project tsconfig.json --outDir ./dist/cjs",
+        "bootstrap": "protoc --es_out=src/gen --es_opt=target=ts,import_extension=js --proto_path proto proto/minimal-validate.proto",
+        "postbootstrap": "license-header src/gen",
         "format": "biome format --write",
         "license-header": "license-header",
         "lint": "biome lint --error-on-warnings"
     },
     "preferUnplugged": true,
     "dependencies": {
-        "@bufbuild/protobuf": "^2.3.0",
-        "@bufbuild/protoplugin": "2.3.0"
+        "@bufbuild/protobuf": "^2.5.0",
+        "@bufbuild/protoplugin": "2.5.0"
+    },
+    "devDependencies": {
+        "upstream-protobuf": "*"
     },
     "peerDependencies": {
-        "@bufbuild/protobuf": "2.3.0"
+        "@bufbuild/protobuf": "2.5.0"
     },
     "peerDependenciesMeta": {
         "@bufbuild/protobuf": {

package/dist/cjs/src/gen/minimal-validate_pb.d.ts

@@ -0,0 +1,137 @@
+import type { GenEnum, GenExtension, GenFile, GenMessage } from "@bufbuild/protobuf/codegenv1";
+import type { FieldOptions, MessageOptions, OneofOptions } from "@bufbuild/protobuf/wkt";
+import type { Message } from "@bufbuild/protobuf";
+/**
+ * Describes the file minimal-validate.proto.
+ */
+export declare const file_minimal_validate: GenFile;
+/**
+ * @generated from message buf.validate.MessageRules
+ */
+export type MessageRules = Message<"buf.validate.MessageRules"> & {
+    /**
+     * @generated from field: optional bool disabled = 1;
+     */
+    disabled: boolean;
+};
+/**
+ * Describes the message buf.validate.MessageRules.
+ * Use `create(MessageRulesSchema)` to create a new message.
+ */
+export declare const MessageRulesSchema: GenMessage<MessageRules>;
+/**
+ * @generated from message buf.validate.OneofRules
+ */
+export type OneofRules = Message<"buf.validate.OneofRules"> & {
+    /**
+     * @generated from field: optional bool required = 1;
+     */
+    required: boolean;
+};
+/**
+ * Describes the message buf.validate.OneofRules.
+ * Use `create(OneofRulesSchema)` to create a new message.
+ */
+export declare const OneofRulesSchema: GenMessage<OneofRules>;
+/**
+ * @generated from message buf.validate.FieldRules
+ */
+export type FieldRules = Message<"buf.validate.FieldRules"> & {
+    /**
+     * @generated from field: optional bool required = 25;
+     */
+    required: boolean;
+    /**
+     * @generated from field: optional buf.validate.Ignore ignore = 27;
+     */
+    ignore: Ignore;
+    /**
+     * @generated from oneof buf.validate.FieldRules.type
+     */
+    type: {
+        /**
+         * @generated from field: buf.validate.RepeatedRules repeated = 18;
+         */
+        value: RepeatedRules;
+        case: "repeated";
+    } | {
+        /**
+         * @generated from field: buf.validate.MapRules map = 19;
+         */
+        value: MapRules;
+        case: "map";
+    } | {
+        case: undefined;
+        value?: undefined;
+    };
+};
+/**
+ * Describes the message buf.validate.FieldRules.
+ * Use `create(FieldRulesSchema)` to create a new message.
+ */
+export declare const FieldRulesSchema: GenMessage<FieldRules>;
+/**
+ * @generated from message buf.validate.RepeatedRules
+ */
+export type RepeatedRules = Message<"buf.validate.RepeatedRules"> & {
+    /**
+     * @generated from field: optional buf.validate.FieldRules items = 4;
+     */
+    items?: FieldRules;
+};
+/**
+ * Describes the message buf.validate.RepeatedRules.
+ * Use `create(RepeatedRulesSchema)` to create a new message.
+ */
+export declare const RepeatedRulesSchema: GenMessage<RepeatedRules>;
+/**
+ * @generated from message buf.validate.MapRules
+ */
+export type MapRules = Message<"buf.validate.MapRules"> & {
+    /**
+     * @generated from field: optional buf.validate.FieldRules values = 5;
+     */
+    values?: FieldRules;
+};
+/**
+ * Describes the message buf.validate.MapRules.
+ * Use `create(MapRulesSchema)` to create a new message.
+ */
+export declare const MapRulesSchema: GenMessage<MapRules>;
+/**
+ * @generated from enum buf.validate.Ignore
+ */
+export declare enum Ignore {
+    /**
+     * @generated from enum value: IGNORE_UNSPECIFIED = 0;
+     */
+    UNSPECIFIED = 0,
+    /**
+     * @generated from enum value: IGNORE_IF_UNPOPULATED = 1;
+     */
+    IF_UNPOPULATED = 1,
+    /**
+     * @generated from enum value: IGNORE_IF_DEFAULT_VALUE = 2;
+     */
+    IF_DEFAULT_VALUE = 2,
+    /**
+     * @generated from enum value: IGNORE_ALWAYS = 3;
+     */
+    ALWAYS = 3
+}
+/**
+ * Describes the enum buf.validate.Ignore.
+ */
+export declare const IgnoreSchema: GenEnum<Ignore>;
+/**
+ * @generated from extension: optional buf.validate.MessageRules message = 1159;
+ */
+export declare const message: GenExtension<MessageOptions, MessageRules>;
+/**
+ * @generated from extension: optional buf.validate.OneofRules oneof = 1159;
+ */
+export declare const oneof: GenExtension<OneofOptions, OneofRules>;
+/**
+ * @generated from extension: optional buf.validate.FieldRules field = 1159;
+ */
+export declare const field: GenExtension<FieldOptions, FieldRules>;

package/dist/cjs/src/gen/minimal-validate_pb.js

@@ -0,0 +1,85 @@
+"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.field = exports.oneof = exports.message = exports.IgnoreSchema = exports.Ignore = exports.MapRulesSchema = exports.RepeatedRulesSchema = exports.FieldRulesSchema = exports.OneofRulesSchema = exports.MessageRulesSchema = exports.file_minimal_validate = void 0;
+const codegenv1_1 = require("@bufbuild/protobuf/codegenv1");
+const wkt_1 = require("@bufbuild/protobuf/wkt");
+/**
+ * Describes the file minimal-validate.proto.
+ */
+exports.file_minimal_validate = (0, codegenv1_1.fileDesc)("ChZtaW5pbWFsLXZhbGlkYXRlLnByb3RvEgxidWYudmFsaWRhdGUiIAoMTWVzc2FnZVJ1bGVzEhAKCGRpc2FibGVkGAEgASgIIh4KCk9uZW9mUnVsZXMSEAoIcmVxdWlyZWQYASABKAgipAEKCkZpZWxkUnVsZXMSEAoIcmVxdWlyZWQYGSABKAgSJAoGaWdub3JlGBsgASgOMhQuYnVmLnZhbGlkYXRlLklnbm9yZRIvCghyZXBlYXRlZBgSIAEoCzIbLmJ1Zi52YWxpZGF0ZS5SZXBlYXRlZFJ1bGVzSAASJQoDbWFwGBMgASgLMhYuYnVmLnZhbGlkYXRlLk1hcFJ1bGVzSABCBgoEdHlwZSI4Cg1SZXBlYXRlZFJ1bGVzEicKBWl0ZW1zGAQgASgLMhguYnVmLnZhbGlkYXRlLkZpZWxkUnVsZXMiNAoITWFwUnVsZXMSKAoGdmFsdWVzGAUgASgLMhguYnVmLnZhbGlkYXRlLkZpZWxkUnVsZXMqawoGSWdub3JlEhYKEklHTk9SRV9VTlNQRUNJRklFRBAAEhkKFUlHTk9SRV9JRl9VTlBPUFVMQVRFRBABEhsKF0lHTk9SRV9JRl9ERUZBVUxUX1ZBTFVFEAISEQoNSUdOT1JFX0FMV0FZUxADOlYKB21lc3NhZ2USHy5nb29nbGUucHJvdG9idWYuTWVzc2FnZU9wdGlvbnMYhwkgASgLMhouYnVmLnZhbGlkYXRlLk1lc3NhZ2VSdWxlc1IHbWVzc2FnZTpOCgVvbmVvZhIdLmdvb2dsZS5wcm90b2J1Zi5PbmVvZk9wdGlvbnMYhwkgASgLMhguYnVmLnZhbGlkYXRlLk9uZW9mUnVsZXNSBW9uZW9mOk4KBWZpZWxkEh0uZ29vZ2xlLnByb3RvYnVmLkZpZWxkT3B0aW9ucxiHCSABKAsyGC5idWYudmFsaWRhdGUuRmllbGRSdWxlc1IFZmllbGQ", [wkt_1.file_google_protobuf_descriptor]);
+/**
+ * Describes the message buf.validate.MessageRules.
+ * Use `create(MessageRulesSchema)` to create a new message.
+ */
+exports.MessageRulesSchema = (0, codegenv1_1.messageDesc)(exports.file_minimal_validate, 0);
+/**
+ * Describes the message buf.validate.OneofRules.
+ * Use `create(OneofRulesSchema)` to create a new message.
+ */
+exports.OneofRulesSchema = (0, codegenv1_1.messageDesc)(exports.file_minimal_validate, 1);
+/**
+ * Describes the message buf.validate.FieldRules.
+ * Use `create(FieldRulesSchema)` to create a new message.
+ */
+exports.FieldRulesSchema = (0, codegenv1_1.messageDesc)(exports.file_minimal_validate, 2);
+/**
+ * Describes the message buf.validate.RepeatedRules.
+ * Use `create(RepeatedRulesSchema)` to create a new message.
+ */
+exports.RepeatedRulesSchema = (0, codegenv1_1.messageDesc)(exports.file_minimal_validate, 3);
+/**
+ * Describes the message buf.validate.MapRules.
+ * Use `create(MapRulesSchema)` to create a new message.
+ */
+exports.MapRulesSchema = (0, codegenv1_1.messageDesc)(exports.file_minimal_validate, 4);
+/**
+ * @generated from enum buf.validate.Ignore
+ */
+var Ignore;
+(function (Ignore) {
+    /**
+     * @generated from enum value: IGNORE_UNSPECIFIED = 0;
+     */
+    Ignore[Ignore["UNSPECIFIED"] = 0] = "UNSPECIFIED";
+    /**
+     * @generated from enum value: IGNORE_IF_UNPOPULATED = 1;
+     */
+    Ignore[Ignore["IF_UNPOPULATED"] = 1] = "IF_UNPOPULATED";
+    /**
+     * @generated from enum value: IGNORE_IF_DEFAULT_VALUE = 2;
+     */
+    Ignore[Ignore["IF_DEFAULT_VALUE"] = 2] = "IF_DEFAULT_VALUE";
+    /**
+     * @generated from enum value: IGNORE_ALWAYS = 3;
+     */
+    Ignore[Ignore["ALWAYS"] = 3] = "ALWAYS";
+})(Ignore || (exports.Ignore = Ignore = {}));
+/**
+ * Describes the enum buf.validate.Ignore.
+ */
+exports.IgnoreSchema = (0, codegenv1_1.enumDesc)(exports.file_minimal_validate, 0);
+/**
+ * @generated from extension: optional buf.validate.MessageRules message = 1159;
+ */
+exports.message = (0, codegenv1_1.extDesc)(exports.file_minimal_validate, 0);
+/**
+ * @generated from extension: optional buf.validate.OneofRules oneof = 1159;
+ */
+exports.oneof = (0, codegenv1_1.extDesc)(exports.file_minimal_validate, 1);
+/**
+ * @generated from extension: optional buf.validate.FieldRules field = 1159;
+ */
+exports.field = (0, codegenv1_1.extDesc)(exports.file_minimal_validate, 2);

package/dist/cjs/src/protoc-gen-es-plugin.js

@@ -15,11 +15,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.protocGenEs = void 0;
 const reflect_1 = require("@bufbuild/protobuf/reflect");
-const codegenv1_1 = require("@bufbuild/protobuf/codegenv1");
+const codegenv2_1 = require("@bufbuild/protobuf/codegenv2");
 const wkt_1 = require("@bufbuild/protobuf/wkt");
 const protoplugin_1 = require("@bufbuild/protoplugin");
-const util_1 = require("./util");
+const util_js_1 = require("./util.js");
 const package_json_1 = require("../package.json");
+const valid_types_js_1 = require("./valid-types.js");
 exports.protocGenEs = (0, protoplugin_1.createEcmaScriptPlugin)({
     name: "protoc-gen-es",
     version: `v${String(package_json_1.version)}`,
@@ -30,6 +31,10 @@ exports.protocGenEs = (0, protoplugin_1.createEcmaScriptPlugin)({
 });
 function parseOptions(options) {
     let jsonTypes = false;
+    let validTypes = {
+        legacyRequired: false,
+        protovalidateRequired: false,
+    };
     for (const { key, value } of options) {
         switch (key) {
             case "json_types":
@@ -38,11 +43,25 @@ function parseOptions(options) {
                 }
                 jsonTypes = ["true", "1"].includes(value);
                 break;
+            case "valid_types":
+                for (const part of value.split("+")) {
+                    switch (part) {
+                        case "protovalidate_required":
+                            validTypes.protovalidateRequired = true;
+                            break;
+                        case "legacy_required":
+                            validTypes.legacyRequired = true;
+                            break;
+                        default:
+                            throw new Error();
+                    }
+                }
+                break;
             default:
                 throw new Error();
         }
     }
-    return { jsonTypes };
+    return { jsonTypes, validTypes };
 }
 // This annotation informs bundlers that the succeeding function call is free of
 // side effects. This means the symbol can be removed from the module during
@@ -67,18 +86,13 @@ function generateTs(schema) {
                     if (schema.options.jsonTypes) {
                         generateMessageJsonShape(f, desc, "ts");
                     }
+                    if (schema.options.validTypes.legacyRequired || schema.options.validTypes.protovalidateRequired) {
+                        generateMessageValidShape(f, desc, schema.options.validTypes, "ts");
+                    }
                     generateDescDoc(f, desc);
                     const name = f.importSchema(desc).name;
-                    const Shape = f.importShape(desc);
-                    const { GenMessage, messageDesc } = f.runtime.codegen;
-                    if (schema.options.jsonTypes) {
-                        const JsonType = f.importJson(desc);
-                        f.print(f.export("const", name), ": ", GenMessage, "<", Shape, ", ", JsonType, ">", " = ", pure);
-                    }
-                    else {
-                        f.print(f.export("const", name), ": ", GenMessage, "<", Shape, ">", " = ", pure);
-                    }
-                    const call = (0, util_1.functionCall)(messageDesc, [fileDesc, ...(0, codegenv1_1.pathInFileDesc)(desc)]);
+                    f.print(f.export("const", name), ": ", (0, util_js_1.messageGenType)(desc, f, schema.options), " = ", pure);
+                    const call = (0, util_js_1.functionCall)(f.runtime.codegen.messageDesc, [fileDesc, ...(0, codegenv2_1.pathInFileDesc)(desc)]);
                     f.print("  ", call, ";");
                     f.print();
                     break;
@@ -99,7 +113,7 @@ function generateTs(schema) {
                     else {
                         f.print(f.export("const", name), ": ", GenEnum, "<", Shape, ">", " = ", pure);
                     }
-                    const call = (0, util_1.functionCall)(enumDesc, [fileDesc, ...(0, codegenv1_1.pathInFileDesc)(desc)]);
+                    const call = (0, util_js_1.functionCall)(enumDesc, [fileDesc, ...(0, codegenv2_1.pathInFileDesc)(desc)]);
                     f.print("  ", call, ";");
                     f.print();
                     break;
@@ -108,8 +122,8 @@ function generateTs(schema) {
                     const { GenExtension, extDesc } = f.runtime.codegen;
                     const name = f.importSchema(desc).name;
                     const E = f.importShape(desc.extendee);
-                    const V = (0, util_1.fieldTypeScriptType)(desc, f.runtime).typing;
-                    const call = (0, util_1.functionCall)(extDesc, [fileDesc, ...(0, codegenv1_1.pathInFileDesc)(desc)]);
+                    const V = (0, util_js_1.fieldTypeScriptType)(desc, f.runtime).typing;
+                    const call = (0, util_js_1.functionCall)(extDesc, [fileDesc, ...(0, codegenv2_1.pathInFileDesc)(desc)]);
                     f.print(f.jsDoc(desc));
                     f.print(f.export("const", name), ": ", GenExtension, "<", E, ", ", V, ">", " = ", pure);
                     f.print("  ", call, ";");
@@ -119,7 +133,7 @@ function generateTs(schema) {
                 case "service": {
                     const { GenService, serviceDesc } = f.runtime.codegen;
                     const name = f.importSchema(desc).name;
-                    const call = (0, util_1.functionCall)(serviceDesc, [fileDesc, ...(0, codegenv1_1.pathInFileDesc)(desc)]);
+                    const call = (0, util_js_1.functionCall)(serviceDesc, [fileDesc, ...(0, codegenv2_1.pathInFileDesc)(desc)]);
                     f.print(f.jsDoc(desc));
                     f.print(f.export("const", name), ": ", GenService, "<", getServiceShapeExpr(f, desc), "> = ", pure);
                     f.print("  ", call, ";");
@@ -146,7 +160,7 @@ function generateJs(schema) {
                     const name = f.importSchema(desc).name;
                     generateDescDoc(f, desc);
                     const { messageDesc } = f.runtime.codegen;
-                    const call = (0, util_1.functionCall)(messageDesc, [fileDesc, ...(0, codegenv1_1.pathInFileDesc)(desc)]);
+                    const call = (0, util_js_1.functionCall)(messageDesc, [fileDesc, ...(0, codegenv2_1.pathInFileDesc)(desc)]);
                     f.print(f.export("const", name), " = ", pure);
                     f.print("  ", call, ";");
                     f.print();
@@ -159,7 +173,7 @@ function generateJs(schema) {
                         const name = f.importSchema(desc).name;
                         f.print(f.export("const", name), " = ", pure);
                         const { enumDesc } = f.runtime.codegen;
-                        const call = (0, util_1.functionCall)(enumDesc, [fileDesc, ...(0, codegenv1_1.pathInFileDesc)(desc)]);
+                        const call = (0, util_js_1.functionCall)(enumDesc, [fileDesc, ...(0, codegenv2_1.pathInFileDesc)(desc)]);
                         f.print("  ", call, ";");
                         f.print();
                     }
@@ -168,7 +182,7 @@ function generateJs(schema) {
                         f.print(f.jsDoc(desc));
                         f.print(f.export("const", f.importShape(desc).name), " = ", pure);
                         const { tsEnum } = f.runtime.codegen;
-                        const call = (0, util_1.functionCall)(tsEnum, [f.importSchema(desc)]);
+                        const call = (0, util_js_1.functionCall)(tsEnum, [f.importSchema(desc)]);
                         f.print("  ", call, ";");
                         f.print();
                     }
@@ -179,7 +193,7 @@ function generateJs(schema) {
                     const name = f.importSchema(desc).name;
                     f.print(f.export("const", name), " = ", pure);
                     const { extDesc } = f.runtime.codegen;
-                    const call = (0, util_1.functionCall)(extDesc, [fileDesc, ...(0, codegenv1_1.pathInFileDesc)(desc)]);
+                    const call = (0, util_js_1.functionCall)(extDesc, [fileDesc, ...(0, codegenv2_1.pathInFileDesc)(desc)]);
                     f.print("  ", call, ";");
                     f.print();
                     break;
@@ -189,7 +203,7 @@ function generateJs(schema) {
                     const name = f.importSchema(desc).name;
                     f.print(f.export("const", name), " = ", pure);
                     const { serviceDesc } = f.runtime.codegen;
-                    const call = (0, util_1.functionCall)(serviceDesc, [fileDesc, ...(0, codegenv1_1.pathInFileDesc)(desc)]);
+                    const call = (0, util_js_1.functionCall)(serviceDesc, [fileDesc, ...(0, codegenv2_1.pathInFileDesc)(desc)]);
                     f.print("  ", call, ";");
                     f.print();
                     break;
@@ -215,17 +229,12 @@ function generateDts(schema) {
                     if (schema.options.jsonTypes) {
                         generateMessageJsonShape(f, desc, "dts");
                     }
+                    if (schema.options.validTypes.legacyRequired || schema.options.validTypes.protovalidateRequired) {
+                        generateMessageValidShape(f, desc, schema.options.validTypes, "dts");
+                    }
                     const name = f.importSchema(desc).name;
-                    const Shape = f.importShape(desc);
-                    const { GenMessage } = f.runtime.codegen;
                     generateDescDoc(f, desc);
-                    if (schema.options.jsonTypes) {
-                        const JsonType = f.importJson(desc);
-                        f.print(f.export("declare const", name), ": ", GenMessage, "<", Shape, ", ", JsonType, ">", ";");
-                    }
-                    else {
-                        f.print(f.export("declare const", name), ": ", GenMessage, "<", Shape, ">", ";");
-                    }
+                    f.print(f.export("declare const", name), ": ", (0, util_js_1.messageGenType)(desc, f, schema.options), ";");
                     f.print();
                     break;
                 }
@@ -252,7 +261,7 @@ function generateDts(schema) {
                     const { GenExtension } = f.runtime.codegen;
                     const name = f.importSchema(desc).name;
                     const E = f.importShape(desc.extendee);
-                    const V = (0, util_1.fieldTypeScriptType)(desc, f.runtime).typing;
+                    const V = (0, util_js_1.fieldTypeScriptType)(desc, f.runtime).typing;
                     f.print(f.jsDoc(desc));
                     f.print(f.export("declare const", name), ": ", GenExtension, "<", E, ", ", V, ">;");
                     f.print();
@@ -302,11 +311,11 @@ function getFileDescCall(f, file, schema) {
     // messages from CodeGeneratorRequest.proto_file instead.
     const sourceFile = file.proto;
     const runtimeFile = schema.proto.protoFile.find(f => f.name == sourceFile.name);
-    const info = (0, codegenv1_1.embedFileDesc)(runtimeFile !== null && runtimeFile !== void 0 ? runtimeFile : sourceFile);
+    const info = (0, codegenv2_1.embedFileDesc)(runtimeFile !== null && runtimeFile !== void 0 ? runtimeFile : sourceFile);
     if (info.bootable && !f.runtime.create.from.startsWith("@bufbuild/protobuf")) {
         // google/protobuf/descriptor.proto is embedded as a plain object when
         // bootstrapping to avoid recursion
-        return (0, util_1.functionCall)(f.runtime.codegen.boot, [JSON.stringify(info.boot())]);
+        return (0, util_js_1.functionCall)(f.runtime.codegen.boot, [JSON.stringify(info.boot())]);
     }
     const { fileDesc } = f.runtime.codegen;
     if (file.dependencies.length > 0) {
@@ -314,12 +323,12 @@ function getFileDescCall(f, file, schema) {
             kind: "es_desc_ref",
             desc: f,
         }));
-        return (0, util_1.functionCall)(fileDesc, [
+        return (0, util_js_1.functionCall)(fileDesc, [
             f.string(info.base64()),
             f.array(deps),
         ]);
     }
-    return (0, util_1.functionCall)(fileDesc, [f.string(info.base64())]);
+    return (0, util_js_1.functionCall)(fileDesc, [f.string(info.base64())]);
 }
 // biome-ignore format: want this to read well
 function getServiceShapeExpr(f, service) {
@@ -375,33 +384,28 @@ function generateMessageShape(f, message, target) {
     f.print(f.jsDoc(message));
     f.print(f.export(declaration, f.importShape(message).name), " = ", Message, "<", f.string(message.typeName), "> & {");
     for (const member of message.members) {
-        switch (member.kind) {
-            case "oneof":
-                f.print(f.jsDoc(member, "  "));
-                f.print("  ", member.localName, ": {");
-                for (const field of member.fields) {
-                    if (member.fields.indexOf(field) > 0) {
-                        f.print(`  } | {`);
-                    }
-                    f.print(f.jsDoc(field, "    "));
-                    const { typing } = (0, util_1.fieldTypeScriptType)(field, f.runtime);
-                    f.print(`    value: `, typing, `;`);
-                    f.print(`    case: "`, field.localName, `";`);
-                }
-                f.print(`  } | { case: undefined; value?: undefined };`);
-                break;
-            default: {
-                f.print(f.jsDoc(member, "  "));
-                const { typing, optional } = (0, util_1.fieldTypeScriptType)(member, f.runtime);
-                if (optional) {
-                    f.print("  ", member.localName, "?: ", typing, ";");
-                }
-                else {
-                    f.print("  ", member.localName, ": ", typing, ";");
-                }
-                break;
-            }
+        generateMessageShapeMember(f, member);
+        if (message.members.indexOf(member) < message.members.length - 1) {
+            f.print();
         }
+    }
+    f.print("};");
+    f.print();
+}
+// biome-ignore format: want this to read well
+function generateMessageValidShape(f, message, validTypes, target) {
+    const declaration = target == "ts" ? "type" : "declare type";
+    const needsCustomValidType = (validTypes.legacyRequired && message.fields.some(valid_types_js_1.isLegacyRequired)) || (validTypes.protovalidateRequired && message.fields.some(valid_types_js_1.isProtovalidateRequired));
+    if (!needsCustomValidType) {
+        f.print(f.export(declaration, f.importValid(message).name), " = ", f.importShape(message), ";");
+        f.print();
+        return;
+    }
+    f.print(f.jsDoc(message));
+    const { Message } = f.runtime;
+    f.print(f.export(declaration, f.importValid(message).name), " = ", Message, "<", f.string(message.typeName), "> & {");
+    for (const member of message.members) {
+        generateMessageShapeMember(f, member, validTypes);
         if (message.members.indexOf(member) < message.members.length - 1) {
             f.print();
         }
@@ -410,6 +414,41 @@ function generateMessageShape(f, message, target) {
     f.print();
 }
 // biome-ignore format: want this to read well
+function generateMessageShapeMember(f, member, validTypes) {
+    switch (member.kind) {
+        case "oneof":
+            f.print(f.jsDoc(member, "  "));
+            f.print("  ", member.localName, ": {");
+            for (const field of member.fields) {
+                if (member.fields.indexOf(field) > 0) {
+                    f.print(`  } | {`);
+                }
+                f.print(f.jsDoc(field, "    "));
+                const { typing } = (0, util_js_1.fieldTypeScriptType)(field, f.runtime, validTypes && !(0, valid_types_js_1.isProtovalidateDisabled)(field));
+                f.print(`    value: `, typing, `;`);
+                f.print(`    case: "`, field.localName, `";`);
+            }
+            f.print(`  } | { case: undefined; value?: undefined };`);
+            break;
+        case "field":
+            f.print(f.jsDoc(member, "  "));
+            let { typing, optional } = (0, util_js_1.fieldTypeScriptType)(member, f.runtime, validTypes && !(0, valid_types_js_1.isProtovalidateDisabled)(member));
+            if (optional && validTypes) {
+                const isRequired = (validTypes.legacyRequired && (0, valid_types_js_1.isLegacyRequired)(member)) || (validTypes.protovalidateRequired && (0, valid_types_js_1.isProtovalidateRequired)(member));
+                if (isRequired) {
+                    optional = false;
+                }
+            }
+            if (optional) {
+                f.print("  ", member.localName, "?: ", typing, ";");
+            }
+            else {
+                f.print("  ", member.localName, ": ", typing, ";");
+            }
+            break;
+    }
+}
+// biome-ignore format: want this to read well
 function generateMessageJsonShape(f, message, target) {
     const exp = f.export(target == "ts" ? "type" : "declare type", f.importJson(message).name);
     f.print(f.jsDoc(message));
@@ -442,7 +481,7 @@ function generateMessageJsonShape(f, message, target) {
             break;
         default:
             if ((0, wkt_1.isWrapperDesc)(message)) {
-                f.print(exp, " = ", (0, util_1.fieldJsonType)(message.fields[0]), ";");
+                f.print(exp, " = ", (0, util_js_1.fieldJsonType)(message.fields[0]), ";");
             }
             else {
                 f.print(exp, " = {");
@@ -456,7 +495,7 @@ function generateMessageJsonShape(f, message, target) {
                         || containsSpecialChar.test(jsonName)) {
                         jsonName = f.string(jsonName);
                     }
-                    f.print("  ", jsonName, "?: ", (0, util_1.fieldJsonType)(field), ";");
+                    f.print("  ", jsonName, "?: ", (0, util_js_1.fieldJsonType)(field), ";");
                     if (message.fields.indexOf(field) < message.fields.length - 1) {
                         f.print();
                     }

package/dist/cjs/src/util.d.ts

@@ -1,6 +1,24 @@
-import { type DescExtension, type DescField } from "@bufbuild/protobuf";
+import { type DescExtension, type DescField, type DescMessage } from "@bufbuild/protobuf";
 import type { GeneratedFile, Printable } from "@bufbuild/protoplugin";
-export declare function fieldTypeScriptType(field: DescField | DescExtension, imports: GeneratedFile["runtime"]): {
+/**
+ * Returns a type expression for `GenMessage` from @bufbuild/protobuf/codegenv2,
+ * with the mandatory `RuntimeShape` parameter, and the optional `OptShapes`
+ * parameter providing a JSON type, and/or a Valid type.
+ *
+ * For example:
+ * - `GenMessage<Example>`
+ * - `GenMessage<Example, {jsonType: ExampleJson}>`
+ * - `GenMessage<Example, {validType: ExampleValid}>`
+ * - `GenMessage<Example, {jsonType: ExampleJson, validType: ExampleValid}>`
+ */
+export declare function messageGenType(desc: DescMessage, f: GeneratedFile, options: {
+    jsonTypes: boolean;
+    validTypes: {
+        legacyRequired: boolean;
+        protovalidateRequired: boolean;
+    };
+}): Printable;
+export declare function fieldTypeScriptType(field: DescField | DescExtension, imports: GeneratedFile["runtime"], validTypes?: boolean): {
     typing: Printable;
     optional: boolean;
 };

package/dist/cjs/src/util.js

@@ -13,22 +13,48 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.messageGenType = messageGenType;
 exports.fieldTypeScriptType = fieldTypeScriptType;
 exports.fieldJsonType = fieldJsonType;
 exports.functionCall = functionCall;
 const protobuf_1 = require("@bufbuild/protobuf");
-const codegenv1_1 = require("@bufbuild/protobuf/codegenv1");
+const codegenv2_1 = require("@bufbuild/protobuf/codegenv2");
 const wkt_1 = require("@bufbuild/protobuf/wkt");
-function fieldTypeScriptType(field, imports) {
+/**
+ * Returns a type expression for `GenMessage` from @bufbuild/protobuf/codegenv2,
+ * with the mandatory `RuntimeShape` parameter, and the optional `OptShapes`
+ * parameter providing a JSON type, and/or a Valid type.
+ *
+ * For example:
+ * - `GenMessage<Example>`
+ * - `GenMessage<Example, {jsonType: ExampleJson}>`
+ * - `GenMessage<Example, {validType: ExampleValid}>`
+ * - `GenMessage<Example, {jsonType: ExampleJson, validType: ExampleValid}>`
+ */
+function messageGenType(desc, f, options) {
+    let p2 = [];
+    if (options.jsonTypes) {
+        p2.push(["jsonType: ", f.importJson(desc)]);
+    }
+    if (options.validTypes.legacyRequired ||
+        options.validTypes.protovalidateRequired) {
+        p2.push(["validType: ", f.importValid(desc)]);
+    }
+    if (p2.length > 0) {
+        p2 = [", {", commaSeparate(p2), "}"];
+    }
+    return [f.runtime.codegen.GenMessage, "<", f.importShape(desc), p2, ">"];
+}
+function fieldTypeScriptType(field, imports, validTypes = false) {
     const typing = [];
     let optional = false;
     switch (field.fieldKind) {
         case "scalar":
-            typing.push((0, codegenv1_1.scalarTypeScriptType)(field.scalar, field.longAsString));
+            typing.push((0, codegenv2_1.scalarTypeScriptType)(field.scalar, field.longAsString));
             optional = field.proto.proto3Optional;
             break;
         case "message": {
-            typing.push(messageFieldTypeScriptType(field, imports));
+            typing.push(messageFieldTypeScriptType(field, imports, validTypes));
             optional = true;
             break;
         }
@@ -49,10 +75,10 @@ function fieldTypeScriptType(field, imports) {
                     }, "[]");
                     break;
                 case "scalar":
-                    typing.push((0, codegenv1_1.scalarTypeScriptType)(field.scalar, field.longAsString), "[]");
+                    typing.push((0, codegenv2_1.scalarTypeScriptType)(field.scalar, field.longAsString), "[]");
                     break;
                 case "message": {
-                    typing.push(messageFieldTypeScriptType(field, imports), "[]");
+                    typing.push(messageFieldTypeScriptType(field, imports, validTypes), "[]");
                     break;
                 }
             }
@@ -74,10 +100,10 @@ function fieldTypeScriptType(field, imports) {
             let valueType;
             switch (field.mapKind) {
                 case "scalar":
-                    valueType = (0, codegenv1_1.scalarTypeScriptType)(field.scalar, false);
+                    valueType = (0, codegenv2_1.scalarTypeScriptType)(field.scalar, false);
                     break;
                 case "message":
-                    valueType = messageFieldTypeScriptType(field, imports);
+                    valueType = messageFieldTypeScriptType(field, imports, validTypes);
                     break;
                 case "enum":
                     valueType = {
@@ -93,18 +119,24 @@ function fieldTypeScriptType(field, imports) {
     }
     return { typing, optional };
 }
-function messageFieldTypeScriptType(field, imports) {
+function messageFieldTypeScriptType(field, imports, validTypes) {
     var _a;
     if ((0, wkt_1.isWrapperDesc)(field.message) &&
         !field.oneof &&
         field.fieldKind == "message") {
         const baseType = field.message.fields[0].scalar;
-        return (0, codegenv1_1.scalarTypeScriptType)(baseType, false);
+        return (0, codegenv2_1.scalarTypeScriptType)(baseType, false);
     }
     if (field.message.typeName == wkt_1.StructSchema.typeName &&
         ((_a = field.parent) === null || _a === void 0 ? void 0 : _a.typeName) != wkt_1.ValueSchema.typeName) {
         return imports.JsonObject;
     }
+    if (validTypes) {
+        return {
+            kind: "es_valid_type_ref",
+            desc: field.message,
+        };
+    }
     return {
         kind: "es_shape_ref",
         desc: field.message,
@@ -113,7 +145,7 @@ function messageFieldTypeScriptType(field, imports) {
 function fieldJsonType(field) {
     switch (field.fieldKind) {
         case "scalar":
-            return (0, codegenv1_1.scalarJsonType)(field.scalar);
+            return (0, codegenv2_1.scalarJsonType)(field.scalar);
         case "message":
             return {
                 kind: "es_json_type_ref",
@@ -135,7 +167,7 @@ function fieldJsonType(field) {
                         "[]",
                     ];
                 case "scalar": {
-                    const t = (0, codegenv1_1.scalarJsonType)(field.scalar);
+                    const t = (0, codegenv2_1.scalarJsonType)(field.scalar);
                     if (t.includes("|")) {
                         return ["(", t, ")[]"];
                     }
@@ -168,7 +200,7 @@ function fieldJsonType(field) {
             let valueType;
             switch (field.mapKind) {
                 case "scalar":
-                    valueType = (0, codegenv1_1.scalarJsonType)(field.scalar);
+                    valueType = (0, codegenv2_1.scalarJsonType)(field.scalar);
                     break;
                 case "message":
                     valueType = {

package/dist/cjs/src/valid-types.d.ts

@@ -0,0 +1,23 @@
+import { type DescField } from "@bufbuild/protobuf";
+/**
+ * Returns true if the field's protovalidate rules are (conditionally) disabled.
+ *
+ * Note that this function only applies to message fields (singular, repeated, map),
+ * and always returns false for other field types.
+ */
+export declare function isProtovalidateDisabled(descField: DescField): boolean;
+/**
+ * Returns true if the field is required by protovalidate.
+ *
+ * Note that this function only applies to message fields (singular, repeated, map),
+ * and always returns false for other field types.
+ */
+export declare function isProtovalidateRequired(descField: DescField): boolean;
+/**
+ * Returns true if the field has the proto2 `required` label, or the Edition
+ * feature field_presence = LEGACY_REQUIRED.
+ *
+ * Note that this function only applies to singular message fields, and always
+ * returns false for other fields.
+ */
+export declare function isLegacyRequired(descField: DescField): boolean;

package/dist/cjs/src/valid-types.js

@@ -0,0 +1,83 @@
+"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.isProtovalidateDisabled = isProtovalidateDisabled;
+exports.isProtovalidateRequired = isProtovalidateRequired;
+exports.isLegacyRequired = isLegacyRequired;
+const protobuf_1 = require("@bufbuild/protobuf");
+const wkt_1 = require("@bufbuild/protobuf/wkt");
+const minimal_validate_pb_js_1 = require("./gen/minimal-validate_pb.js");
+/**
+ * Returns true if the field's protovalidate rules are (conditionally) disabled.
+ *
+ * Note that this function only applies to message fields (singular, repeated, map),
+ * and always returns false for other field types.
+ */
+function isProtovalidateDisabled(descField) {
+    if (descField.message === undefined) {
+        return false;
+    }
+    const messageRules = (0, protobuf_1.getOption)(descField.parent, minimal_validate_pb_js_1.message);
+    if (messageRules.disabled) {
+        return true;
+    }
+    const fieldRules = (0, protobuf_1.getOption)(descField, minimal_validate_pb_js_1.field);
+    if (fieldRules.ignore == minimal_validate_pb_js_1.Ignore.ALWAYS ||
+        (descField.fieldKind == "message" &&
+            fieldRules.ignore == minimal_validate_pb_js_1.Ignore.IF_DEFAULT_VALUE)) {
+        return true;
+    }
+    const childRules = descField.fieldKind == "list" && fieldRules.type.case == "repeated"
+        ? fieldRules.type.value.items
+        : descField.fieldKind == "map" && fieldRules.type.case == "map"
+            ? fieldRules.type.value.values
+            : undefined;
+    if (childRules) {
+        return (childRules.ignore == minimal_validate_pb_js_1.Ignore.ALWAYS ||
+            childRules.ignore == minimal_validate_pb_js_1.Ignore.IF_DEFAULT_VALUE);
+    }
+    return false;
+}
+/**
+ * Returns true if the field is required by protovalidate.
+ *
+ * Note that this function only applies to message fields (singular, repeated, map),
+ * and always returns false for other field types.
+ */
+function isProtovalidateRequired(descField) {
+    if (!(0, protobuf_1.hasOption)(descField, minimal_validate_pb_js_1.field)) {
+        return false;
+    }
+    const messageRules = (0, protobuf_1.getOption)(descField.parent, minimal_validate_pb_js_1.message);
+    if (messageRules.disabled) {
+        return false;
+    }
+    const fieldRules = (0, protobuf_1.getOption)(descField, minimal_validate_pb_js_1.field);
+    if (fieldRules.ignore === minimal_validate_pb_js_1.Ignore.ALWAYS) {
+        return false;
+    }
+    return fieldRules.required;
+}
+/**
+ * Returns true if the field has the proto2 `required` label, or the Edition
+ * feature field_presence = LEGACY_REQUIRED.
+ *
+ * Note that this function only applies to singular message fields, and always
+ * returns false for other fields.
+ */
+function isLegacyRequired(descField) {
+    return (descField.fieldKind == "message" &&
+        descField.presence == wkt_1.FeatureSet_FieldPresence.LEGACY_REQUIRED);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bufbuild/protoc-gen-es",
-  "version": "2.3.0",
+  "version": "2.5.0",
   "license": "Apache-2.0",
   "description": "Protocol Buffers code generator for ECMAScript",
   "keywords": [
@@ -24,17 +24,22 @@
   "scripts": {
     "prebuild": "rm -rf ./dist/cjs/*",
     "build": "../../node_modules/typescript/bin/tsc --project tsconfig.json --outDir ./dist/cjs",
+    "bootstrap": "protoc --es_out=src/gen --es_opt=target=ts,import_extension=js --proto_path proto proto/minimal-validate.proto",
+    "postbootstrap": "license-header src/gen",
     "format": "biome format --write",
     "license-header": "license-header",
     "lint": "biome lint --error-on-warnings"
   },
   "preferUnplugged": true,
   "dependencies": {
-    "@bufbuild/protobuf": "^2.3.0",
-    "@bufbuild/protoplugin": "2.3.0"
+    "@bufbuild/protobuf": "^2.5.0",
+    "@bufbuild/protoplugin": "2.5.0"
+  },
+  "devDependencies": {
+    "upstream-protobuf": "*"
   },
   "peerDependencies": {
-    "@bufbuild/protobuf": "2.3.0"
+    "@bufbuild/protobuf": "2.5.0"
   },
   "peerDependenciesMeta": {
     "@bufbuild/protobuf": {