Integrated navigator service

Author: FlorianRappl

AngleSharp.Scripting.JavaScript/AngleSharp.Scripting.JavaScript.csproj

@@ -69,7 +69,8 @@
     <Compile Include="Extensions.cs" />
     <Compile Include="JavaScriptEngine.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ScriptingService.cs" />
+    <Compile Include="Services\ScriptingService.cs" />
+    <Compile Include="Services\NavigatorService.cs" />
     <Compile Include="SystemTypeConverter.cs" />
     <Compile Include="UnresolvedConverter.cs" />
   </ItemGroup>

AngleSharp.Scripting.JavaScript/ConfigurationExtensions.cs

@@ -1,6 +1,7 @@
 namespace AngleSharp
 {
-    using AngleSharp.Scripting.JavaScript;
+    using AngleSharp.Scripting.JavaScript.Services;
+    using AngleSharp.Services;
     using System.Linq;
 
     /// <summary>
@@ -10,7 +11,8 @@ public static class ConfigurationExtensions
     {
         /// <summary>
         /// Sets scripting to true, registers the JavaScript engine and returns
-        /// a new configuration with the scripting service.
+        /// a new configuration with the scripting service and possible
+        /// auxiliary services, if not yet registered.
         /// </summary>
         /// <param name="configuration">The configuration to use.</param>
         /// <returns>The new configuration.</returns>
@@ -19,6 +21,13 @@ public static IConfiguration WithJavaScript(this IConfiguration configuration)
             if (!configuration.Services.OfType<ScriptingService>().Any())
             {
                 var service = new ScriptingService();
+
+                if (!configuration.Services.OfType<INavigatorService>().Any())
+                {
+                    var navigator = new NavigatorService();
+                    configuration = configuration.With(navigator);
+                }
+
                 return configuration.With(service);
             }
 

AngleSharp.Scripting.JavaScript/Services/NavigatorService.cs

@@ -0,0 +1,23 @@
+namespace AngleSharp.Scripting.JavaScript.Services
+{
+    using AngleSharp.Dom;
+    using AngleSharp.Dom.Navigator;
+    using AngleSharp.Scripting.JavaScript.Dom;
+    using AngleSharp.Services;
+
+    /// <summary>
+    /// Represents the service for a navigator.
+    /// </summary>
+    public class NavigatorService : INavigatorService
+    {
+        /// <summary>
+        /// Creates an INavigator object for the provided window.
+        /// </summary>
+        /// <param name="window">The window that needs an INavigator.</param>
+        /// <returns>The INavigator instance for the window.</returns>
+        public virtual INavigator Create(IWindow window)
+        {
+            return new Navigator();
+        }
+    }
+}

AngleSharp.Scripting.JavaScript/ScriptingService.cs renamed to AngleSharp.Scripting.JavaScript/Services/ScriptingService.cs

@@ -1,4 +1,4 @@
-namespace AngleSharp.Scripting.JavaScript
+namespace AngleSharp.Scripting.JavaScript.Services
 {
     using AngleSharp.Network;
     using AngleSharp.Services;
@@ -8,7 +8,7 @@
     /// <summary>
     /// Represents the service for the JavaScript engine.
     /// </summary>
-    public sealed class ScriptingService : IScriptingService
+    public class ScriptingService : IScriptingService
     {
         readonly JavaScriptEngine _engine;
 
@@ -33,7 +33,7 @@ public JavaScriptEngine Engine
         /// </summary>
         /// <param name="mimeType">The mime-type.</param>
         /// <returns>The contained engine.</returns>
-        public IScriptEngine GetEngine(String mimeType)
+        public virtual IScriptEngine GetEngine(String mimeType)
         {
             if (MimeTypes.IsJavaScript(mimeType))
                 return _engine;