eslint-plugin-greasemonkey 1.10.5 → 1.10.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-greasemonkey",
-  "version": "1.10.5",
+  "version": "1.10.6",
   "description": "ESLint rules for Greasemonkey/Tampermonkey userscripts",
   "keywords": [
     "eslint",
@@ -65,13 +65,13 @@
       "katex": "^0.19.1"
     },
     "eslint": {
-      "minimatch": "^11.0.5"
+      "minimatch": "^11.0.8"
     },
     "eslint-plugin-import-x": {
-      "minimatch": "^11.0.5"
+      "minimatch": "^11.0.8"
     },
     "eslint-plugin-sonarjs": {
-      "minimatch": "^11.0.5"
+      "minimatch": "^11.0.8"
     }
   },
   "dependencies": {
@@ -83,12 +83,12 @@
     "@eslint/json": "^2.1.1",
     "@eslint/markdown": "^8.0.3",
     "@stylistic/eslint-plugin": "^5.10.0",
-    "@typescript-eslint/parser": "^8.72.1",
-    "@typescript-eslint/utils": "^8.72.1",
+    "@typescript-eslint/parser": "^8.72.2",
+    "@typescript-eslint/utils": "^8.72.2",
     "eslint": "^10.14.0",
     "eslint-plugin-constructors": "^1.7.2",
     "eslint-plugin-eslint-plugin": "^7.6.2",
-    "eslint-plugin-import-x": "^4.18.0",
+    "eslint-plugin-import-x": "^4.18.1",
     "eslint-plugin-n": "^18.5.0",
     "eslint-plugin-no-secrets": "^2.3.3",
     "eslint-plugin-no-unsanitized": "^4.1.5",
@@ -97,8 +97,8 @@
     "eslint-plugin-regexp": "^3.3.3",
     "eslint-plugin-security": "^4.2.1",
     "eslint-plugin-sonarjs": "^4.2.2",
-    "eslint-plugin-woodpecker": "^1.1.4",
-    "oxlint": "^1.92.0",
+    "eslint-plugin-woodpecker": "^1.1.6",
+    "oxlint": "^1.93.0",
     "typescript": "npm:@typescript/typescript6@^6.0.2",
     "typescript-latest": "npm:typescript@^7.0.2"
   },

package/src/rules/no-invalid-headers.js

@@ -52,7 +52,7 @@ export default {
                 allowedExact = new Set(),
                 allowedRegexes = [],
                 validSet = targets.includes('all') ? headers.valid.get('all')
-                         : new Set(targets.flatMap(target => [...headers.valid.get(target)]))
+                         : new Set(targets.flatMap(mgr => [...headers.valid.get(mgr)]))
         for (const entry of allowedList) {
             if (entry instanceof RegExp) allowedRegexes.push(entry)
             else if (typeof entry == 'string') {
@@ -65,10 +65,11 @@ export default {
             Program() {
                 const metaEntries = metadata.extract(context.sourceCode)
                 for (const entry of metaEntries) {
-                    if (allowedExact.has(entry.key)) continue
-                    if (allowedRegexes.some(re => re.test(entry.key))) continue
-                    if (headers.localized.includes(entry.key.split(':')[0])) continue
-                    if (validSet.has(entry.key)) continue
+                    if (allowedExact.has(entry.key)
+                        || allowedRegexes.some(re => re.test(entry.key))
+                        || headers.localized.includes(entry.key.split(':')[0])
+                        || validSet.has(entry.key)
+                    ) continue
                     const supporting = headers.manager.get(entry.key)
                     if (supporting)
                         context.report({ node: entry.comment, messageId: 'unsupportedHeader',

package/src/rules/valid-field-values.js

@@ -2,11 +2,11 @@ import metadata from '../utils/metadata.js'
 import regex from '../data/regex.js'
 
 const defaultOptions = { versionType: 'semver', allowedGrants: [], allowFutureDate: false },
-      urlKeys = ['homepage', 'icon', 'icon64', 'require', 'source', 'website']
-const re = { // oxlint-disable security/detect-unsafe-regex
-    semVer: /^\d+\.\d+\.\d+(?:-[\da-z.-]+)?(?:\+[\da-z.-]+)?$/i,
-    dateVer: /^\d{4}\.(?:0?[1-9]|1[0-2])\.(?:0?[1-9]|[12]\d|3[01])(?:\.\d+)?$/
-} // oxlint-enable security/detect-unsafe-regex
+      urlKeys = new Set(['homepage', 'icon', 'icon64', 'require', 'source', 'website']),
+      re = { // oxlint-disable security/detect-unsafe-regex
+          semVer: /^\d+\.\d+\.\d+(?:-[\da-z.-]+)?(?:\+[\da-z.-]+)?$/i,
+          dateVer: /^\d{4}\.(?:0?[1-9]|1[0-2])\.(?:0?[1-9]|[12]\d|3[01])(?:\.\d+)?$/
+      } // oxlint-enable security/detect-unsafe-regex
 
 export default {
     meta: {
@@ -68,12 +68,12 @@ export default {
                         context.report({ node: entry.comment, messageId: 'invalidGrant', data: { grant: entry.value }})
                     else if (entry.key == 'resource') {
                         const url = entry.value.trim().split(regex.whitespace.all)[1]
-                        if (url) try { new URL(url) }
+                        if (url) try { new URL(url) } // oxlint-disable-line no-new -- validates URL via throw
                         catch {
                             context.report({ node: entry.comment, messageId: 'invalidURL', data: { field: entry.key }})
                         }
-                    } else if (urlKeys.includes(entry.key) || entry.key.toLowerCase().endsWith('url'))
-                        try { new URL(entry.value) }
+                    } else if (urlKeys.has(entry.key) || entry.key.toLowerCase().endsWith('url'))
+                        try { new URL(entry.value) } // oxlint-disable-line no-new -- validates URL via throw
                         catch {
                             context.report({ node: entry.comment, messageId: 'invalidURL', data: { field: entry.key }})
                         }

package/src/rules/valid-icon-headers.js

@@ -30,10 +30,10 @@ export default {
         function validate(value, header, line, col) {
             const loc = { start: { line, column: col }, end: { line, column: col + value.length }}
             const schemeMatch = value.match(re.scheme)
-            if (!schemeMatch) return // relative path — accepted
+            if (!schemeMatch) return // rel path — accepted
             const scheme = schemeMatch[1].toLowerCase()
             if (scheme == 'http' || scheme == 'https') {
-                try { new URL(value) }
+                try { new URL(value) } // oxlint-disable-line no-new -- validates URL via throw
                 catch { return context.report({ loc, messageId: 'malformedURL', data: { header }}) }
                 return
             }

package/src/rules/valid-url-headers.js

@@ -84,7 +84,7 @@ export default {
                 context.report({ node, messageId: 'allURLs', data: { field, value }})
         }
         function validateURL(url, field, node) {
-            try { new URL(url) }
+            try { new URL(url) } // oxlint-disable-line no-new -- validates URL via throw
             catch { context.report({ node, messageId: 'invalidURL', data: { field, value: url }}) }
         }
         return {

package/src/rules/valid-version-header.js

@@ -1,11 +1,11 @@
 import metadata from '../utils/metadata.js'
 
 const defaultOptions = { versionType: 'semver', allowFutureDate: false, timezone: '' },
-      examples = { date: 'YYYY.M.D or YYYY.M.D.N', semver: '1.2.3' }
-const re = { // oxlint-disable security/detect-unsafe-regex
-    date: /^\d{4}\.(?:0?[1-9]|1[0-2])\.(?:0?[1-9]|[12]\d|3[01])(?:\.\d+)?$/,
-    semver: /^\d+\.\d+\.\d+(?:-[\da-z.-]+)?(?:\+[\da-z.-]+)?$/i
-} // oxlint-enable security/detect-unsafe-regex
+      examples = { date: 'YYYY.M.D or YYYY.M.D.N', semver: '1.2.3' },
+      re = { // oxlint-disable security/detect-unsafe-regex
+          date: /^\d{4}\.(?:0?[1-9]|1[0-2])\.(?:0?[1-9]|[12]\d|3[01])(?:\.\d+)?$/,
+          semver: /^\d+\.\d+\.\d+(?:-[\da-z.-]+)?(?:\+[\da-z.-]+)?$/i
+      } // oxlint-enable security/detect-unsafe-regex
 
 export default {
     meta: {

package/src/utils/deprecations.js

@@ -26,8 +26,9 @@ export default {
             },
             create(context) {
                 const opts = context.options[0],
-                      isObj = opts?.constructor === Object
-                return Object.assign({}, ...Object.entries(routes).map(([targetName, mapping]) => {
+                      isObj = opts?.constructor === Object,
+                      result = {}
+                for (const [targetName, mapping] of Object.entries(routes)) {
                     let newOpts = opts, deprecation
                     if (mapping) {
                         const entries = Object.entries(mapping),
@@ -60,7 +61,7 @@ export default {
                     const aliasContext = Object.create(context)
                     Object.defineProperty(aliasContext, 'options',
                         { value: [newOpts], writable: true, configurable: true, enumerable: true })
-                    const visitors = { ...originals[targetName].create(aliasContext) }
+                    const visitors = originals[targetName].create(aliasContext)
                     if (deprecation) {
                         const ruleProgram = visitors.Program
                         visitors.Program = function(node) {
@@ -68,8 +69,9 @@ export default {
                             if (ruleProgram) ruleProgram.call(this, node)
                         }
                     }
-                    return visitors
-                }))
+                    Object.assign(result, visitors)
+                }
+                return result
             }
         }
     } // oxlint-enable security/detect-object-injection

package/src/utils/license.js

@@ -12,7 +12,7 @@ const re = { spdxTag: /SPDX-License-Identifier:\s*([\w.-]+)/i },
       spdxIDs = new Set(require('spdx-license-ids')),
       spdxNames = Object.entries(require('spdx-license-list'))
           .map(([id, { name }]) => ({ id, name }))
-          .sort((a, b) => b.name.length - a.name.length)
+          .sort((a, b) => b.name.length - a.name.length) // oxlint-disable-line unicorn/no-array-sort
 
 function tryReaddir(dir) { try { return fs.readdirSync(dir, { withFileTypes: true }) } catch { return null }}
 
@@ -24,7 +24,7 @@ export default {
             if (!entries) continue
             for (const entry of entries) {
                 if (entry.name.startsWith('.') || skipDirs.has(entry.name)) continue
-                if (entry.isFile() &&  regex.filename.license.test(entry.name)) return path.join(dir, entry.name)
+                if (entry.isFile() && regex.filename.license.test(entry.name)) return path.join(dir, entry.name)
                 if (entry.isDirectory()) queue.push(path.join(dir, entry.name))
             }
         }

package/src/utils/template.js

@@ -1,21 +1,18 @@
-export default {
-    resolve(node) {
-        function walk(n) {
-            if (n.type == 'ConditionalExpression') {
-                const branches = [n.consequent, n.alternate].map(walk)
-                return branches.every(Boolean) ? branches.flat() : null
-            } else if (n.type == 'Literal' && ['number', 'string'].includes(typeof n.value))
-                return [String(n.value)]
-            else if (n.type == 'TemplateLiteral')
-                return n.quasis.reduce((combos, quasi, idx) => {
-                    if (!combos) return null
-                    const withQuasi = combos.map(combo => combo + quasi.value.raw)
-                    if (idx >= n.expressions.length) return withQuasi
-                    const vals = walk(n.expressions[idx]) // oxlint-disable-line security/detect-object-injection
-                    return vals ? withQuasi.flatMap(combo => vals.map(val => combo + val)) : null
-                }, [''])
-            else return null
-        }
-        return walk(node)
-    }
+function walk(node) {
+    if (node.type == 'ConditionalExpression') {
+        const branches = [node.consequent, node.alternate].map(walk)
+        return branches.every(Boolean) ? branches.flat() : null
+    } else if (node.type == 'Literal' && ['number', 'string'].includes(typeof node.value))
+        return [String(node.value)]
+    else if (node.type == 'TemplateLiteral')
+        return node.quasis.reduce((combos, quasi, idx) => {
+            if (!combos) return null
+            const withQuasi = combos.map(combo => combo + quasi.value.raw)
+            if (idx >= node.expressions.length) return withQuasi
+            const vals = walk(node.expressions[idx]) // oxlint-disable-line security/detect-object-injection
+            return vals ? withQuasi.flatMap(combo => vals.map(val => combo + val)) : null
+        }, [''])
+    else return null
 }
+
+export default { resolve(node) { return walk(node) }}