f

Author: markokajzer

javascript/packages/linter/src/rules/html-disallow-inline-scripts.ts

@@ -1,5 +1,5 @@
 import { ParserRule } from "../types.js"
-import { BaseRuleVisitor, isJavaScriptTag } from "./rule-utils.js"
+import { BaseRuleVisitor, isJavaScriptTagElement } from "./rule-utils.js"
 import { getTagLocalName, getAttributeName } from "@herb-tools/core"
 
 import type { UnboundLintOffense, LintContext, FullRuleConfig } from "../types.js"
@@ -135,7 +135,7 @@ class HTMLDisallowInlineScriptsVisitor extends BaseRuleVisitor {
   }
 
   private checkInlineScript(node: HTMLElementNode): void {
-    if (!isJavaScriptTag(node)) return
+    if (!isJavaScriptTagElement(node)) return
 
     this.addOffense(
       "Avoid inline `<script>` tags. Use `javascript_include_tag` to include external JavaScript files instead.",

javascript/packages/linter/src/rules/html-require-script-nonce.ts

@@ -1,7 +1,7 @@
 import { getTagLocalName, getStaticAttributeValue, hasAttributeValue } from "@herb-tools/core"
 import type { ParseResult, ParserOptions, HTMLElementNode, HTMLAttributeNode } from "@herb-tools/core"
 
-import { BaseRuleVisitor, findElementAttribute, isJavaScriptTag } from "./rule-utils.js"
+import { BaseRuleVisitor, findElementAttribute, isJavaScriptTagElement } from "./rule-utils.js"
 import { ParserRule } from "../types.js"
 import type { UnboundLintOffense, LintContext, FullRuleConfig } from "../types.js"
 
@@ -20,7 +20,7 @@ class RequireScriptNonceVisitor extends BaseRuleVisitor {
   }
 
   private checkScriptNonce(node: HTMLElementNode): void {
-    if (!isJavaScriptTag(node)) return
+    if (!isJavaScriptTagElement(node)) return
 
     const nonceAttribute = findElementAttribute(node, "nonce")
 

javascript/packages/linter/src/rules/rule-utils.ts

@@ -499,32 +499,6 @@ export function isVoidElement(tagName: string): boolean {
   return HTML_VOID_ELEMENTS.has(tagName.toLowerCase())
 }
 
-export function findElementAttribute(node: HTMLElementNode, name: string): HTMLAttributeNode | null {
-  if (isERBOpenTagNode(node.open_tag)) {
-    return findAttributeByName(node.open_tag.children, name)
-  }
-
-  return getAttribute(node, name)
-}
-
-const NON_JS_SCRIPT_TYPES = new Set([
-  "application/json",
-  "application/ld+json",
-  "text/template",
-  "text/html",
-  "text/x-template",
-])
-
-export function isJavaScriptTag(node: HTMLElementNode): boolean {
-  const typeAttribute = findElementAttribute(node, "type")
-  if (!typeAttribute) return true
-
-  const typeValue = getStaticAttributeValue(typeAttribute)
-  if (typeValue === null) return true
-
-  return !NON_JS_SCRIPT_TYPES.has(typeValue.toLowerCase())
-}
-
 /**
  * Attribute visitor that provides granular processing based on both
  * attribute name type (static/dynamic) and value type (static/dynamic)
@@ -1090,3 +1064,29 @@ export function findNodeAtPosition(root: Node, line: number, column: number, pre
 
   return bestMatch
 }
+
+export function findElementAttribute(node: HTMLElementNode, name: string): HTMLAttributeNode | null {
+  if (isERBOpenTagNode(node.open_tag)) {
+    return findAttributeByName(node.open_tag.children, name)
+  }
+
+  return getAttribute(node, name)
+}
+
+const NON_JS_SCRIPT_TYPES = new Set([
+  "application/json",
+  "application/ld+json",
+  "text/template",
+  "text/html",
+  "text/x-template",
+])
+
+export function isJavaScriptTagElement(node: HTMLElementNode): boolean {
+  const typeAttribute = findElementAttribute(node, "type")
+  if (!typeAttribute) return true
+
+  const typeValue = getStaticAttributeValue(typeAttribute)
+  if (typeValue === null) return true
+
+  return !NON_JS_SCRIPT_TYPES.has(typeValue.toLowerCase())
+}