Refactored the API

Author: FlorianRappl

src/AngleSharp.Scripting.JavaScript/ApiExtensions.cs

@@ -11,21 +11,20 @@
     public static class ApiExtensions
     {
         /// <summary>
-        /// Executes the given script code in the context of the provided node.
+        /// Executes the given script code in the context of the document.
         /// </summary>
-        /// <param name="node">The node acting as context.</param>
+        /// <param name="document">The document as context.</param>
         /// <param name="scriptCode">The script to run.</param>
         /// <returns>The result of running the script, if any.</returns>
-        public static Object Execute(this INode node, String scriptCode)
+        public static Object ExecuteScript(this IDocument document, String scriptCode)
         {
-            if (node == null)
-                throw new ArgumentNullException(nameof(node));
-
-            var document = node.Owner;
+            if (document == null)
+                throw new ArgumentNullException(nameof(document));
+            
             var options = document?.Context.Configuration;
             var providers = options?.Services.OfType<JavaScriptProvider>();
             var engine = providers?.FirstOrDefault()?.Engine;
-            return engine?.EvaluateScript(node, scriptCode);
+            return engine?.EvaluateScript(document, scriptCode);
         }
     }
 }

src/AngleSharp.Scripting.JavaScript/JavaScriptEngine.cs

@@ -80,28 +80,22 @@ public async Task EvaluateScriptAsync(IResponse response, ScriptOptions options,
             using (var reader = new StreamReader(response.Content, options.Encoding ?? Encoding.UTF8, true))
             {
                 var content = await reader.ReadToEndAsync().ConfigureAwait(false);
-                GetOrCreateInstance(options.Document).RunScript(content);
+                EvaluateScript(options.Document, content);
             }
         }
 
         /// <summary>
-        /// Evaluates the given script source in the provided context.
+        /// Evaluates the given script source in the engine of the document.
         /// </summary>
-        /// <param name="context">The context of the evaluation.</param>
+        /// <param name="document">The context of the evaluation.</param>
         /// <param name="source">The source of the script.</param>
         /// <returns>The result of the evaluation.</returns>
-        public Object EvaluateScript(INode context, String source)
+        public Object EvaluateScript(IDocument document, String source)
         {
-            if (context == null)
-                throw new ArgumentNullException(nameof(context));
-
-            var document = context.Owner;
-
             if (document == null)
-                throw new ArgumentException("The context has to be attached to a document.");
-
-            var instance = GetOrCreateInstance(document);
-            return instance.RunScript(source, context);
+                throw new ArgumentNullException(nameof(document));
+            
+            return GetOrCreateInstance(document).RunScript(source);
         }
 
         #endregion