fix async document.currentScript

QwikDev · Oct 5, 2021 · b6cbeb1 · b6cbeb1 · vercel · Oct 5, 2021
1 parent 9f63513
commit b6cbeb1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/src/lib/web-worker/worker-document.ts b/src/lib/web-worker/worker-document.ts
@@ -48,7 +48,7 @@ export class HTMLDocument extends HTMLElement {
   }
 
   get currentScript() {
-    if (webWorkerCtx.$currentScriptId$) {
+    if (webWorkerCtx.$currentScriptId$ > 0) {
       return constructInstance(
         InterfaceType.Element,
         webWorkerCtx.$currentScriptId$,

diff --git a/src/lib/web-worker/worker-image.ts b/src/lib/web-worker/worker-image.ts
@@ -19,7 +19,7 @@ export class HTMLImageElement {
   }
   set src(src: string) {
     if (debug && webWorkerCtx.$config$.logImageRequests) {
-      logWorker(`Image() src request: ${resolveUrl(src)}`);
+      logWorker(`Image() request: ${resolveUrl(src)}`);
     }
     fetch(resolveUrl(src) + '', {
       mode: 'no-cors',

diff --git a/tests/platform/document/document.spec.ts b/tests/platform/document/document.spec.ts
@@ -52,6 +52,10 @@ test('document', async ({ page }) => {
   await expect(testCurrentScriptSrc).toHaveText('src');
   await expect(testCurrentScriptSrcLocation).toHaveText('/platform/document/current-script-src.js');
 
+  await page.waitForSelector('.testCurrentScriptNullAsync');
+  const testCurrentScriptNullAsync = page.locator('#testCurrentScriptNullAsync');
+  await expect(testCurrentScriptNullAsync).toHaveText('null');
+
   const testHeadParentNode = page.locator('#testHeadParentNode');
   await expect(testHeadParentNode).toHaveText('HTML HTML');
 

diff --git a/tests/platform/document/index.html b/tests/platform/document/index.html
@@ -248,6 +248,18 @@ <h1 class="title">Document</h1>
         ></script>
       </li>
 
+      <li>
+        <strong>currentScript, null async</strong>
+        <code id="testCurrentScriptNullAsync"></code>
+        <script type="text/partytown">
+          setTimeout(() => {
+            const elm = document.getElementById('testCurrentScriptNullAsync');
+            elm.textContent = String(document.currentScript);
+            elm.className = 'testCurrentScriptNullAsync';
+          });
+        </script>
+      </li>
+
       <li>
         <strong>head.parentNode/Element</strong>
         <code id="testHeadParentNode"></code>