Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Address Interop having difficulty finding properties in derived types #1969

Merged
merged 4 commits into from
Sep 23, 2024
Merged

Address Interop having difficulty finding properties in derived types #1969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ffb69c
Address Interop having difficulty finding properties in derived types
mspertus Sep 23, 2024
bf896e3
Merge branch 'main' into derivedProperties
mspertus Sep 23, 2024
c3ffe05
Made requested change
mspertus Sep 23, 2024
8ed364e
Merge branch 'derivedProperties' of https://github.com/mspertus/jint …
mspertus Sep 23, 2024
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
41 changes: 41 additions & 0 deletions Jint.Tests/Runtime/InteropTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3624,4 +3624,45 @@ public void StringifyShouldIncludeInheritedFieldsAndProperties()
engine.SetValue("c", new Circle(12.34));
engine.Evaluate("JSON.stringify(c)").ToString().Should().Be("{\"Radius\":12.34,\"Color\":0,\"Id\":123}");
}

public class Animal
{
public virtual string name { get; set; } = "animal";
}

public class Elephant : Animal
{
public override string name { get; set; } = "elephant";
public int earSize = 5;
}

public class Lion : Animal
{
public override string name { get; set; } = "lion";
public int maneLength = 10;
}

public class Zoo
{
public Animal king { get => (new Animal[] { new Lion() })[0]; }
public Animal[] animals { get => new Animal[] { new Lion(), new Elephant() }; }
}

[Fact]
public void CanFindDerivedPropertiesFail() // Fails in 4.01 but success in 2.11
{
var engine = new Engine();
engine.SetValue("zoo", new Zoo());
var kingManeLength = engine.Evaluate("zoo.King.maneLength");
Assert.Equal(10, kingManeLength.AsNumber());
}

[Fact]
public void CanFindDerivedPropertiesSucceed() // Similar case that continues to succeed
{
var engine = new Engine();
engine.SetValue("zoo", new Zoo());
var lionManeLength = engine.Evaluate("zoo.animals[0].maneLength");
Assert.Equal(10, lionManeLength.AsNumber());
}
}
4 changes: 4 additions & 0 deletions Jint/Runtime/Interop/ObjectWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,10 @@ private PropertyDescriptor GetOwnProperty(JsValue property, bool mustBeReadable,
}

var accessor = _engine.Options.Interop.TypeResolver.GetAccessor(_engine, ClrType, member, mustBeReadable, mustBeWritable);
if (accessor == ConstantValueAccessor.NullAccessor && ClrType != Target.GetType())
{
accessor = _engine.Options.Interop.TypeResolver.GetAccessor(_engine, Target.GetType(), member, mustBeReadable, mustBeWritable);
}
var descriptor = accessor.CreatePropertyDescriptor(_engine, Target, member, enumerable: !isDictionary);
if (!isDictionary
&& !ReferenceEquals(descriptor, PropertyDescriptor.Undefined)
Expand Down