@bufbuild/protoc-gen-es 2.6.3 → 2.8.0

package/dist/cjs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bufbuild/protoc-gen-es",
-    "version": "2.6.3",
+    "version": "2.8.0",
     "license": "Apache-2.0",
     "description": "Protocol Buffers code generator for ECMAScript",
     "keywords": [
@@ -19,7 +19,7 @@
         "protoc-gen-es": "bin/protoc-gen-es"
     },
     "engines": {
-        "node": ">=14"
+        "node": ">=20"
     },
     "scripts": {
         "prebuild": "rm -rf ./dist/cjs/*",
@@ -32,14 +32,14 @@
     },
     "preferUnplugged": true,
     "dependencies": {
-        "@bufbuild/protobuf": "2.6.3",
-        "@bufbuild/protoplugin": "2.6.3"
+        "@bufbuild/protobuf": "2.8.0",
+        "@bufbuild/protoplugin": "2.8.0"
     },
     "devDependencies": {
         "upstream-protobuf": "*"
     },
     "peerDependencies": {
-        "@bufbuild/protobuf": "2.6.3"
+        "@bufbuild/protobuf": "2.8.0"
     },
     "peerDependenciesMeta": {
         "@bufbuild/protobuf": {

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

@@ -395,8 +395,7 @@ function generateMessageShape(f, message, target) {
 // 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) {
+    if (!(0, valid_types_js_1.messageNeedsCustomValidType)(message, validTypes)) {
         f.print(f.export(declaration, f.importValid(message).name), " = ", f.importShape(message), ";");
         f.print();
         return;

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

@@ -1,4 +1,16 @@
-import { type DescField } from "@bufbuild/protobuf";
+import { type DescField, type DescMessage } from "@bufbuild/protobuf";
+/**
+ * Returns true if the given message needs a ValidType. A message needs a ValidType
+ * if one or more of the following conditions are true:
+ * - A proto2 field has the `required` label
+ * - A edition field has the feature `field_presence = LEGACY_REQUIRED`
+ * - A field has the protovalidate `required` rule and not `ignore = IGNORE_ALWAYS`
+ * - A message field (repeated, singular, or map value) needs a ValidType
+ */
+export declare function messageNeedsCustomValidType(message: DescMessage, options: {
+    legacyRequired: boolean;
+    protovalidateRequired: boolean;
+}): boolean;
 /**
  * Returns true if the field's protovalidate rules are (conditionally) disabled.
  *

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

@@ -13,12 +13,56 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.messageNeedsCustomValidType = messageNeedsCustomValidType;
 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 given message needs a ValidType. A message needs a ValidType
+ * if one or more of the following conditions are true:
+ * - A proto2 field has the `required` label
+ * - A edition field has the feature `field_presence = LEGACY_REQUIRED`
+ * - A field has the protovalidate `required` rule and not `ignore = IGNORE_ALWAYS`
+ * - A message field (repeated, singular, or map value) needs a ValidType
+ */
+function messageNeedsCustomValidType(message, options) {
+    function usesProtovalidateRequired(message, seen = new Set()) {
+        seen.add(message.typeName);
+        for (const field of message.fields) {
+            if (isProtovalidateDisabled(field)) {
+                continue;
+            }
+            if (isProtovalidateRequired(field)) {
+                return true;
+            }
+            if (field.message && !seen.has(field.message.typeName)) {
+                if (usesProtovalidateRequired(field.message, seen)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    function usesLegacyRequired(message, seen = new Set()) {
+        seen.add(message.typeName);
+        for (const field of message.fields) {
+            if (isLegacyRequired(field)) {
+                return true;
+            }
+            if (field.message && !seen.has(field.message.typeName)) {
+                if (usesLegacyRequired(field.message, seen)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    return ((options.protovalidateRequired && usesProtovalidateRequired(message)) ||
+        (options.legacyRequired && usesLegacyRequired(message)));
+}
 /**
  * Returns true if the field's protovalidate rules are (conditionally) disabled.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bufbuild/protoc-gen-es",
-  "version": "2.6.3",
+  "version": "2.8.0",
   "license": "Apache-2.0",
   "description": "Protocol Buffers code generator for ECMAScript",
   "keywords": [
@@ -19,7 +19,7 @@
     "protoc-gen-es": "bin/protoc-gen-es"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=20"
   },
   "scripts": {
     "prebuild": "rm -rf ./dist/cjs/*",
@@ -32,14 +32,14 @@
   },
   "preferUnplugged": true,
   "dependencies": {
-    "@bufbuild/protobuf": "2.6.3",
-    "@bufbuild/protoplugin": "2.6.3"
+    "@bufbuild/protobuf": "2.8.0",
+    "@bufbuild/protoplugin": "2.8.0"
   },
   "devDependencies": {
     "upstream-protobuf": "*"
   },
   "peerDependencies": {
-    "@bufbuild/protobuf": "2.6.3"
+    "@bufbuild/protobuf": "2.8.0"
   },
   "peerDependenciesMeta": {
     "@bufbuild/protobuf": {