fix: extensions broke oneof (#1789)

protobufjs · Aug 11, 2022 · d7f501c · d7f501c
1 parent 6f0806d
commit d7f501c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/namespace.js b/src/namespace.js
@@ -6,7 +6,8 @@ var ReflectionObject = require("./object");
 ((Namespace.prototype = Object.create(ReflectionObject.prototype)).constructor = Namespace).className = "Namespace";
 
 var Field    = require("./field"),
-    util     = require("./util");
+    util     = require("./util"),
+    OneOf    = require("./oneof");
 
 var Type,    // cyclic
     Service,
@@ -217,7 +218,7 @@ Namespace.prototype.getEnum = function getEnum(name) {
  */
 Namespace.prototype.add = function add(object) {
 
-    if (!(object instanceof Field && object.extend !== undefined || object instanceof Type || object instanceof Enum || object instanceof Service || object instanceof Namespace))
+    if (!(object instanceof Field && object.extend !== undefined || object instanceof Type  || object instanceof OneOf || object instanceof Enum || object instanceof Service || object instanceof Namespace))
         throw TypeError("object must be a valid nested object");
 
     if (!this.nested)

diff --git a/tests/api_oneof.js b/tests/api_oneof.js
@@ -8,6 +8,9 @@ var def = {
 };
 
 var proto = "syntax = \"proto3\";\
+import \"google/protobuf/descriptor.proto\";\
+extend google.protobuf.FileOptions { optional int32 ecs_component_id = 50000;}\
+option (ecs_component_id) = 1020;\
 message Test {\
     oneof kind {\
         uint32 a = 1;\