Skip to content

Fixed extends #1202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/root.js
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ var exposeRe = /^[A-Z]/;
function tryHandleExtension(root, field) {
var extendedType = field.parent.lookup(field.extend);
if (extendedType) {
var sisterField = new Field(field.fullName, field.id, field.type, field.rule, undefined, field.options);
var sisterField = new Field(field.name, field.id, field.type, field.rule, undefined, field.options);
sisterField.declaringField = field;
field.extensionField = sisterField;
extendedType.add(sisterField);
Expand Down
6 changes: 3 additions & 3 deletions tests/api_root-deferred.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ tape.test("extension fields", function(test) {

var extendedType = new Type("ExtendedType");
ns.add(extendedType);
var extensionField = extendedType.get(declaringField.fullName);
var extensionField = extendedType.get(declaringField.name);
test.equal(extensionField, declaringField.extensionField, "should become available once their extended type is known");

type.remove(declaringField);
extensionField = extendedType.get(declaringField.fullName);
extensionField = extendedType.get(declaringField.name);
test.equal(extensionField, null, "should become unavailable when their declaring field is removed");

type.add(declaringField);
extensionField = extendedType.get(declaringField.fullName);
extensionField = extendedType.get(declaringField.name);
test.equal(extensionField, declaringField.extensionField, "should become instantly available if their extended type is knwon");

ns.remove(extendedType);
Expand Down
22 changes: 18 additions & 4 deletions tests/comp_extend.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,28 @@ message A {\
message Two {\
extend B.One {\
C.Two two = 1000;\
string extended = 1001;\
}\
}\
}\
}";

tape.test("extensions", function(test) {
var root = protobuf.parse(proto).root;
root.resolveAll();
test.pass("should parse and resolve without errors");
test.end();

test.test(" - parsing", function(test) {
var root = protobuf.parse(proto).root;
root.resolveAll();
test.pass("should parse and resolve without errors");
test.end();
});

test.test(" - encoding", function(test) {
var root = protobuf.parse(proto).root;
root.resolveAll();
var one = root.lookupType("A.B.One");
var original = {extended: "test"};
var cycled = one.decode(one.encode(original).finish());
test.deepEqual(cycled, original, "should write and read back");
test.end();
});
});