Fixed: Namespace#lookup should also check in nested namespaces (wtf)

protobufjs · Apr 13, 2017 · 056ecc3 · 056ecc3
1 parent 2a30df8
commit 056ecc3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/namespace.js b/src/namespace.js
@@ -323,7 +323,11 @@ Namespace.prototype.lookup = function lookup(path, filterTypes, parentAlreadyChe
                 return found;
         } else if (found instanceof Namespace && (found = found.lookup(path.slice(1), filterTypes, true)))
             return found;
-    }
+    // Otherwise try each nested namespace
+    } else
+        for (var i = 0; i < this.nestedArray.length; ++i)
+            if (this._nestedArray[i] instanceof Namespace && (found = this._nestedArray[i].lookup(path, filterTypes, true)))
+                return found;
     // If there hasn't been a match, try again at the parent
     if (this.parent === null || parentAlreadyChecked)
         return null;

diff --git a/tests/api_root-deferred.js b/tests/api_root-deferred.js
@@ -28,7 +28,8 @@ tape.test("extension fields", function(test) {
     extensionField = extendedType.get(declaringField.fullName);
     test.equal(extensionField, declaringField.extensionField, "should become instantly available if their extended type is knwon");
 
-    root.add(type = new Type("Test"));
+    ns.remove(extendedType);
+    type.remove(declaringField);
     type.add(declaringField);
     test.throws(function() {
         root.resolveAll();