From c2c1cf0168834fdd1db922108e03f340c0444fb4 Mon Sep 17 00:00:00 2001
From: saphid <4596216+saphid@users.noreply.github.com>
Date: Thu, 1 Oct 2026 22:37:43 +1000
Subject: [PATCH] Check every JavaScript script type, and keep the name check
 without acorn

From the review of the parser change: scripts typed text/ecmascript,
application/x-javascript and the other JavaScript MIME types run as classic
scripts too, so they're checked now. And the duplicate-name check (V8 only)
no longer skips with the var check when a Node lacks acorn.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
---
 tests/test_page_scripts.py | 50 ++++++++++++++++++++++++++++----------
 1 file changed, 37 insertions(+), 13 deletions(-)

diff --git a/tests/test_page_scripts.py b/tests/test_page_scripts.py
index da48b13..8ce35bd 100644
--- a/tests/test_page_scripts.py
+++ b/tests/test_page_scripts.py
@@ -15,9 +15,14 @@ ROOT = pathlib.Path(__file__).resolve().parents[1]
 # same name inside different functions stay legal. var is the exception (declaring one twice
 # is allowed), so the page doesn't use var at all: Node's own copy of the acorn parser finds
 # real var declarations, not the word in comments, strings or CSS var().
-CHECK = r'''
+DUPLICATES = r'''
 const vm = require('vm');
 const scripts = JSON.parse(require('fs').readFileSync(0, 'utf8'));
+try { new vm.Script('"use strict"; {\n' + scripts.join('\n;\n') + '\n}'); console.log('ok'); }
+catch (e) { console.log(e.message); }
+'''
+VARS = r'''
+const scripts = JSON.parse(require('fs').readFileSync(0, 'utf8'));
 let acorn, walk;
 try {
   acorn = require('internal/deps/acorn/acorn/dist/acorn');
@@ -32,24 +37,36 @@ for (const code of scripts) {
   } catch (e) { console.log(e.message); process.exit(0); }
   if (found) { console.log('declares with var: ' + found); process.exit(0); }
 }
-try { new vm.Script('"use strict"; {\n' + scripts.join('\n;\n') + '\n}'); console.log('ok'); }
-catch (e) { console.log(e.message); }
+console.log('ok');
 '''
 
 
+def node(script, scripts, *flags):
+    r = subprocess.run(['node', *flags, '-e', script], input=json.dumps(scripts), capture_output=True, text=True)
+    return r.stdout.strip() or r.stderr.strip()
+
+
 def check(scripts):
-    r = subprocess.run(['node', '--expose-internals', '-e', CHECK], input=json.dumps(scripts),
-                       capture_output=True, text=True)
-    out = r.stdout.strip() or r.stderr.strip()
+    """'ok', or V8's message for the first name declared twice."""
+    return node(DUPLICATES, scripts)
+
+
+def check_vars(scripts):
+    """'ok', or the first var declaration. Skips where Node doesn't include acorn."""
+    out = node(VARS, scripts, '--expose-internals')
     if out == 'no parser':
         raise unittest.SkipTest("this Node doesn't include acorn")
     return out
 
 
 class ClassicScripts(html.parser.HTMLParser):
-    """The page's inline classic scripts: no src, and no type other than JavaScript (a module
-    has its own scope, and JSON data isn't code)."""
-    JS = {'', 'text/javascript', 'application/javascript'}
+    """The page's inline classic scripts: no src, and no type other than a JavaScript one (a
+    module has its own scope, and JSON data isn't code). The types a browser runs as script:
+    https://mimesniff.spec.whatwg.org/#javascript-mime-type"""
+    JS = {'', 'application/ecmascript', 'application/javascript', 'application/x-ecmascript',
+          'application/x-javascript', 'text/ecmascript', 'text/javascript', 'text/javascript1.0',
+          'text/javascript1.1', 'text/javascript1.2', 'text/javascript1.3', 'text/javascript1.4',
+          'text/javascript1.5', 'text/jscript', 'text/livescript', 'text/x-ecmascript', 'text/x-javascript'}
 
     def __init__(self):
         super().__init__()
@@ -85,6 +102,10 @@ class PageScripts(unittest.TestCase):
         self.assertGreaterEqual(len(scripts), 2)
         self.assertEqual(check(scripts), 'ok')
 
+    def test_the_page_declares_nothing_with_var(self):
+        scripts = classic_scripts((ROOT / 'ui/index.html').read_text(encoding='utf-8'))
+        self.assertEqual(check_vars(scripts), 'ok')
+
     def test_the_check_finds_what_it_should(self):
         twice = {
             'indented function': ['function loadPanels() {}', '  async function loadPanels() {}'],
@@ -98,19 +119,22 @@ class PageScripts(unittest.TestCase):
                 self.assertIn('already been declared', check(scripts))
         helpers = ['function a() { function help() {} }', 'function b() { const help = 1; }']
         self.assertEqual(check(helpers), 'ok')
+
+    def test_the_var_check_finds_what_it_should(self):
         # var: legal to declare twice, so not allowed at all; however it's written.
         for code in ['var x = 1;', 'var/*c*/x = 1;', 'var {x} = {x: 1};', 'function f() { var y; }']:
             with self.subTest(code):
-                self.assertIn('declares with var', check([code]))
+                self.assertIn('declares with var', check_vars([code]))
         # The word var elsewhere is fine.
         text = ['// var x\nconst a = "var y", b = `var ${a}`, c = "color: var(--blue)", d = {}.var;']
-        self.assertEqual(check(text), 'ok')
+        self.assertEqual(check_vars(text), 'ok')
 
     def test_only_inline_classic_scripts_are_checked(self):
         page = ('<script>let a;</script><script type="module">export const m = 1;</script>'
                 '<script type="application/json">{"b": 1}</script><script src = "x.js"></script>'
-                '<script data-src="y" type="text/javascript">let c;</script>')
-        self.assertEqual(classic_scripts(page), ['let a;', 'let c;'])
+                '<script data-src="y" type="text/javascript">let c;</script>'
+                '<script type="text/ecmascript">let d;</script><script type=" Application/X-JavaScript ">let e;</script>')
+        self.assertEqual(classic_scripts(page), ['let a;', 'let c;', 'let d;', 'let e;'])
 
 
 if __name__ == '__main__':