Add type=module to addScriptTag (#372)

Author: Meir017

lib/PuppeteerSharp.TestServer/wwwroot/es6/.eslintrc

@@ -0,0 +1,5 @@
+{
+    "parserOptions": {
+        "sourceType": "module"
+    }
+}

lib/PuppeteerSharp.TestServer/wwwroot/es6/es6import.js

@@ -0,0 +1,2 @@
+import num from './es6module.js';
+window.__es6injected = num;

lib/PuppeteerSharp.TestServer/wwwroot/es6/es6module.js

@@ -0,0 +1 @@
+export default 42;

lib/PuppeteerSharp.TestServer/wwwroot/es6/es6pathimport.js

@@ -0,0 +1,2 @@
+import num from './es6/es6module.js';
+window.__es6injected = num;

lib/PuppeteerSharp.Tests/Assets/es6/es6import.js

@@ -0,0 +1,2 @@
+import num from './es6module.js';
+window.__es6injected = num;

lib/PuppeteerSharp.Tests/Assets/es6/es6module.js

@@ -0,0 +1 @@
+export default 42;

lib/PuppeteerSharp.Tests/Assets/es6/es6pathimport.js

@@ -0,0 +1,2 @@
+import num from './es6/es6module.js';
+window.__es6injected = num;

lib/PuppeteerSharp.Tests/PageTests/AddScriptTagTests.cs

@@ -30,6 +30,40 @@ public async Task ShouldWorkWithAUrl()
             Assert.Equal(42, await Page.EvaluateExpressionAsync<int>("__injected"));
         }
 
+        [Fact]
+        public async Task ShouldWorkWithAUrlAndTypeModule()
+        {
+            await Page.GoToAsync(TestConstants.EmptyPage);
+            await Page.AddScriptTagAsync(new AddTagOptions { Url = "/es6/es6import.js", Type = "module" });
+            Assert.Equal(42, await Page.EvaluateExpressionAsync<int>("__es6injected"));
+        }
+
+        [Fact]
+        public async Task ShouldWorkWithAPathAndTypeModule()
+        {
+            await Page.GoToAsync(TestConstants.EmptyPage);
+            await Page.AddScriptTagAsync(new AddTagOptions
+            {
+                Path = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine("assets", "es6", "es6pathimport.js")),
+                Type = "module"
+            });
+            await Page.WaitForFunctionAsync("() => window.__es6injected");
+            Assert.Equal(42, await Page.EvaluateExpressionAsync<int>("__es6injected"));
+        }
+
+        [Fact]
+        public async Task ShouldWorkWithAContentAndTypeModule()
+        {
+            await Page.GoToAsync(TestConstants.EmptyPage);
+            await Page.AddScriptTagAsync(new AddTagOptions
+            {
+                Content = "import num from '/es6/es6module.js'; window.__es6injected = num;",
+                Type = "module"
+            });
+            await Page.WaitForFunctionAsync("() => window.__es6injected");
+            Assert.Equal(42, await Page.EvaluateExpressionAsync<int>("__es6injected"));
+        }
+
         [Fact]
         public async Task ShouldThrowAnErrorIfLoadingFromUrlFail()
         {
@@ -72,4 +106,4 @@ public async Task ShouldWorkWithContent()
             Assert.Equal(35, await Page.EvaluateExpressionAsync<int>("__injected"));
         }
     }
-}
+}

lib/PuppeteerSharp/AddTagOptions.cs

@@ -19,5 +19,11 @@ public class AddTagOptions
         /// Raw JavaScript content to be injected into frame
         /// </summary>
         public string Content { get; set; }
+
+        /// <summary>
+        /// Script type. Use <c>module</c> in order to load a Javascript ES6 module
+        /// </summary>
+        /// <seealso href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script"/>
+        public string Type { get; set; }
     }
 }

lib/PuppeteerSharp/Frame.cs

@@ -252,7 +252,7 @@ public Task<ElementHandle> WaitForSelectorAsync(string selector, WaitForSelector
         /// <seealso cref="Page.WaitForXPathAsync(string, WaitForSelectorOptions)"/>
         public Task<ElementHandle> WaitForXPathAsync(string xpath, WaitForSelectorOptions options = null)
             => WaitForSelectorOrXPathAsync(xpath, true, options);
-        
+
         /// <summary>
         /// Waits for a timeout
         /// </summary>
@@ -406,31 +406,40 @@ public async Task<ElementHandle> AddStyleTag(AddTagOptions options)
         /// <seealso cref="Page.AddScriptTagAsync(string)"/>
         public async Task<ElementHandle> AddScriptTag(AddTagOptions options)
         {
-            const string addScriptUrl = @"async function addScriptUrl(url) {
+            const string addScriptUrl = @"async function addScriptUrl(url, type) {
               const script = document.createElement('script');
               script.src = url;
+              if(type)
+                script.type = type;
               document.head.appendChild(script);
               await new Promise((res, rej) => {
                 script.onload = res;
                 script.onerror = rej;
               });
               return script;
             }";
-            const string addScriptContent = @"function addScriptContent(content) {
+            const string addScriptContent = @"function addScriptContent(content, type = 'text/javascript') {
               const script = document.createElement('script');
-              script.type = 'text/javascript';
+              script.type = type;
               script.text = content;
               document.head.appendChild(script);
               return script;
             }";
 
+            async Task<ElementHandle> AddScriptTagPrivate(string script, string urlOrContent, string type)
+            {
+                var context = await GetExecutionContextAsync();
+                return (string.IsNullOrEmpty(type)
+                        ? await context.EvaluateFunctionHandleAsync(script, urlOrContent)
+                        : await context.EvaluateFunctionHandleAsync(script, urlOrContent, type)) as ElementHandle;
+            }
+
             if (!string.IsNullOrEmpty(options.Url))
             {
                 var url = options.Url;
                 try
                 {
-                    var context = await GetExecutionContextAsync();
-                    return (await context.EvaluateFunctionHandleAsync(addScriptUrl, url)) as ElementHandle;
+                    return await AddScriptTagPrivate(addScriptUrl, url, options.Type);
                 }
                 catch (PuppeteerException)
                 {
@@ -442,14 +451,12 @@ public async Task<ElementHandle> AddScriptTag(AddTagOptions options)
             {
                 var contents = File.ReadAllText(options.Path, Encoding.UTF8);
                 contents += "//# sourceURL=" + options.Path.Replace("\n", string.Empty);
-                var context = await GetExecutionContextAsync();
-                return (await context.EvaluateFunctionHandleAsync(addScriptContent, contents)) as ElementHandle;
+                return await AddScriptTagPrivate(addScriptContent, contents, options.Type);
             }
 
             if (!string.IsNullOrEmpty(options.Content))
             {
-                var context = await GetExecutionContextAsync();
-                return (await context.EvaluateFunctionHandleAsync(addScriptContent, options.Content)) as ElementHandle;
+                return await AddScriptTagPrivate(addScriptContent, options.Content, options.Type);
             }
 
             throw new ArgumentException("Provide options with a `Url`, `Path` or `Content` property");