Merge pull request #87 from Sebbs128/readystate-serialize

FlorianRappl · web-flow · commit 1a9cd8072758 · 2024-02-29T15:35:02.000+01:00
Serialize DocumentReadyState
diff --git a/src/AngleSharp.Js.Tests/FireEventTests.cs b/src/AngleSharp.Js.Tests/FireEventTests.cs
@@ -4,6 +4,9 @@ namespace AngleSharp.Js.Tests
     using AngleSharp.Dom.Events;
     using AngleSharp.Scripting;
     using NUnit.Framework;
+
+    using System;
+    using System.Linq;
     using System.Threading.Tasks;
 
     [TestFixture]
@@ -256,6 +259,35 @@ public async Task DocumentLoadEventIsFired_Issue42()
             Assert.AreEqual("Success!", div?.TextContent);
         }
 
+        [Test]
+        public async Task DocumentReadyStateIsComplete_Issue86()
+        {
+            var cfg = Configuration.Default.WithJs().WithEventLoop();
+            var html = @"<!doctype html>
+<html>
+<body>
+<script>
+document.onreadystatechange = function() {
+  var element = document.createElement('div');
+  element.textContent = document.readyState;
+  document.body.appendChild(element);
+};
+</script>
+</body>";
+            var context = BrowsingContext.New(cfg);
+            var document = await context.OpenAsync(m => m.Content(html))
+                .WhenStable();
+
+            var divs = document.GetElementsByTagName("div");
+
+            // expected value will vary depending on AngleSharp package version
+            // 1.0.2 and greater, expected value will be { "interactive", "complete"
+            // prior to 1.0.2, expected value will be { "1", "2" }
+            var expected = new[] { DocumentReadyState.Interactive, DocumentReadyState.Complete }
+                .Select(e => e.GetOfficialName() ?? Convert.ToInt32(e).ToString());
+            CollectionAssert.AreEqual(expected, divs.Select(d => d.TextContent));
+        }
+
         [Test]
         public async Task SetTimeoutWithStringAsFunction()
         {
diff --git a/src/AngleSharp.Js/Extensions/EngineExtensions.cs b/src/AngleSharp.Js/Extensions/EngineExtensions.cs
@@ -45,6 +45,16 @@ public static JsValue ToJsValue(this Object obj, EngineInstance engine)
                 }
                 else if (obj is Enum)
                 {
+                    switch (obj)
+                    {
+                        case DocumentReadyState _:
+                            var name = ((Enum)obj).GetOfficialName();
+                            if (name != null)
+                            {
+                                return new JsValue(name);
+                            }
+                            break;
+                    }
                     return new JsValue(Convert.ToInt32(obj));
                 }
 
diff --git a/src/AngleSharp.Js/Extensions/ReflectionExtensions.cs b/src/AngleSharp.Js/Extensions/ReflectionExtensions.cs
@@ -55,8 +55,8 @@ public static MethodInfo PrepareConvert(this Type fromType, Type toType)
         public static String GetOfficialName(this MemberInfo member)
         {
             var names = member.GetCustomAttributes<DomNameAttribute>();
-            var officalNameAttribute = names.FirstOrDefault();
-            return officalNameAttribute?.OfficialName ?? member.Name;
+            var officialNameAttribute = names.FirstOrDefault();
+            return officialNameAttribute?.OfficialName ?? member.Name;
         }
 
         public static String GetOfficialName(this Type currentType, Type baseType)
@@ -87,6 +87,18 @@ public static String GetOfficialName(this Type currentType, Type baseType)
             return name;
         }
 
+        public static String GetOfficialName(this Enum value)
+        {
+            var enumType = value.GetType();
+            var member = enumType.GetMember(value.ToString()).FirstOrDefault();
+
+            // if the enum value does not have a DomNameAttribute, calling member.GetOfficialName() would return the value name
+            // to allow previous behaviour to be preserved, if the DomNameAttribute is not present then null will be returned
+            var names = member.GetCustomAttributes<DomNameAttribute>();
+            var officialNameAttribute = names.FirstOrDefault();
+            return officialNameAttribute?.OfficialName;
+        }
+
         public static PropertyInfo GetInheritedProperty(this Type type, String propertyName, BindingFlags bindingAttr = BindingFlags.Public | BindingFlags.Instance)
         {
             if (type.GetTypeInfo().IsInterface)

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,16 @@ public static JsValue ToJsValue(this Object obj, EngineInstance engine)`
`45`	`45`	`}`
`46`	`46`	`else if (obj is Enum)`
`47`	`47`	`{`
	`48`	`+ switch (obj)`
	`49`	`+ {`
	`50`	`+ case DocumentReadyState _:`
	`51`	`+ var name = ((Enum)obj).GetOfficialName();`
	`52`	`+ if (name != null)`
	`53`	`+ {`
	`54`	`+ return new JsValue(name);`
	`55`	`+ }`
	`56`	`+ break;`
	`57`	`+ }`
`48`	`58`	`return new JsValue(Convert.ToInt32(obj));`
`49`	`59`	`}`
`50`	`60`