eslint-plugin-greasemonkey 1.8.4 → 1.10.0

package/docs/LICENSE.md

@@ -1,4 +1,4 @@
-# 🏛️ MIT License
+# MIT License
 
 **Copyright © 2026 [Adam Lui](https://codeberg.org/adamlui) & contributors.**
 

package/package.json

@@ -1,22 +1,26 @@
 {
   "name": "eslint-plugin-greasemonkey",
-  "version": "1.8.4",
+  "version": "1.10.0",
   "description": "ESLint rules for Greasemonkey/Tampermonkey userscripts",
-  "type": "module",
-  "engines": {
-    "node": ">=18.18.0"
-  },
-  "author": {
-    "name": "Adam Lui",
-    "email": "adam@kudoai.org",
-    "url": "https://codeberg.org/adamlui"
-  },
+  "keywords": [
+    "eslint",
+    "eslint-plugin",
+    "eslintplugin",
+    "greasemonkey",
+    "metadata",
+    "security",
+    "tampermonkey",
+    "userscript"
+  ],
   "homepage": "https://codeberg.org/adamlui/eslint-plugin-greasemonkey/#readme",
   "bugs": {
     "url": "https://codeberg.org/adamlui/eslint-plugin-greasemonkey/issues",
     "email": "support@adamlui.com"
   },
-  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://codeberg.org/adamlui/eslint-plugin-greasemonkey.git"
+  },
   "funding": [
     {
       "type": "ko-fi",
@@ -27,57 +31,63 @@
       "url": "https://paypal.me/adamlui"
     }
   ],
-  "main": "src/index.js",
+  "license": "MIT",
+  "author": {
+    "name": "Adam Lui",
+    "email": "adam@kudoai.org",
+    "url": "https://codeberg.org/adamlui"
+  },
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./src/index.d.ts",
+      "default": "./src/index.js"
+    }
+  },
+  "main": "./src/index.js",
+  "types": "./src/index.d.ts",
   "files": [
     "docs/",
     "src/"
   ],
-  "types": "src/index.d.ts",
   "scripts": {
-    "lint": "eslint . --cache && yamllint .",
-    "lint:all": "eslint . && yamllint .",
-    "lint:fix": "eslint . --fix --cache && yamllint .",
-    "lint:fix-all": "eslint . --fix && yamllint .",
-    "test": "node tests/run.js",
-    "demo": "node demo/run.js",
-    "bump:patch": "bash utils/bump.sh patch",
-    "bump:minor": "bash utils/bump.sh minor",
     "bump:feat": "npm run bump:minor",
-    "bump:major": "bash utils/bump.sh major"
+    "bump:major": "bash utils/bump.sh major",
+    "bump:minor": "bash utils/bump.sh minor",
+    "bump:patch": "bash utils/bump.sh patch",
+    "demo": "eslint demo",
+    "lint": "pre-commit run",
+    "lint:all": "pre-commit run --all-files",
+    "test": "node tests/run"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://codeberg.org/adamlui/eslint-plugin-greasemonkey.git"
-  },
-  "keywords": [
-    "eslint",
-    "eslint-plugin",
-    "eslintplugin",
-    "greasemonkey",
-    "metadata",
-    "tampermonkey",
-    "userscript"
-  ],
-  "peerDependencies": {
-    "eslint": ">=9.0.0"
+  "dependencies": {
+    "spdx-license-ids": "^3.0.24",
+    "spdx-license-list": "^6.12.0"
   },
   "devDependencies": {
     "@e18e/eslint-plugin": "^0.8.1",
-    "@eslint/js": "^10.0.1",
     "@eslint/json": "^2.1.1",
     "@eslint/markdown": "^7.5.1",
     "@stylistic/eslint-plugin": "^5.10.0",
-    "eslint": "^10.12.0",
-    "eslint-plugin-constructors": "^1.4.2",
+    "eslint": "^10.13.0",
+    "eslint-plugin-constructors": "^1.5.0",
     "eslint-plugin-eslint-plugin": "^7.6.2",
     "eslint-plugin-import-x": "^4.17.1",
-    "eslint-plugin-n": "^18.4.1",
+    "eslint-plugin-n": "^18.5.0",
     "eslint-plugin-no-secrets": "^2.3.3",
     "eslint-plugin-no-unsanitized": "^4.1.5",
+    "eslint-plugin-package-json": "^1.10.1",
     "eslint-plugin-promise": "^7.3.0",
     "eslint-plugin-regexp": "^3.3.1",
     "eslint-plugin-security": "^4.2.0",
-    "globals": "^17.13.0",
-    "yamllint-js": "^0.2.4"
+    "eslint-plugin-sonarjs": "^4.2.2",
+    "eslint-plugin-woodpecker": "^1.1.0",
+    "oxlint": "^1.89.0"
+  },
+  "peerDependencies": {
+    "eslint": ">=9.0.0"
+  },
+  "engines": {
+    "node": ">=18.18.0"
   }
 }

package/src/data/apis.js

@@ -1,54 +1,57 @@
-export const gmLegacyAPIs = new Set([ /* eslint-disable no-secrets/no-secrets */
-    'GM_addElement', 'GM_addStyle', 'GM_addValueChangeListener', 'GM_deleteValue', 'GM_download',
-    'GM_getResourceText', 'GM_getResourceURL', 'GM_getTab', 'GM_getTabs', 'GM_getValue', 'GM_getValues',
-    'GM_info', 'GM_listValues', 'GM_log', 'GM_notification', 'GM_openInTab', 'GM_registerMenuCommand',
-    'GM_removeValueChangeListener', 'GM_saveTab', 'GM_setClipboard', 'GM_setValue', 'GM_setValues',
-    'GM_unregisterMenuCommand', 'GM_webRequest', 'GM_xmlhttpRequest'
-]) /* eslint-enable no-secrets/no-secrets */
-
-export const gmModernAPIs = new Set([
-    'GM.addElement', 'GM.addStyle', 'GM.addValueChangeListener', 'GM.deleteValue', 'GM.download',
-    'GM.getResourceText', 'GM.getResourceUrl', 'GM.getTab', 'GM.getTabs', 'GM.getValue', 'GM.getValues',
-    'GM.info', 'GM.listValues', 'GM.log', 'GM.notification', 'GM.openInTab', 'GM.registerMenuCommand',
-    'GM.removeValueChangeListener', 'GM.saveTab', 'GM.setClipboard', 'GM.setValue', 'GM.setValues',
-    'GM.unregisterMenuCommand', 'GM.webRequest', 'GM.xmlHttpRequest'
-])
-
-export const scAPIs = new Set([
-    'CAT.agent.conversation', 'CAT.agent.dom', 'CAT.agent.mcp', 'CAT.agent.model',
-    'CAT.agent.opfs', 'CAT.agent.skills', 'CAT.agent.task',
-    'CAT_fileStorage', 'CAT_scriptLoaded', 'CAT_userConfig'
-])
-
-const tmAPIs = new Set([
-    'GM_getTab', 'GM_getTabs', 'GM_saveTab', 'GM_webRequest',
-    'GM.getTab', 'GM.getTabs', 'GM.saveTab', 'GM.webRequest'
-])
-
-const agAPIs = new Set([
-    'GM_info', 'GM.info',
-    'GM_setValue', 'GM.setValue',
-    'GM_getValue', 'GM.getValue',
-    'GM_listValues', 'GM.listValues',
-    'GM_deleteValue', 'GM.deleteValue',
-    'GM_getResourceURL', 'GM.getResourceUrl',
-    'GM_setClipboard', 'GM.setClipboard',
-    'GM_xmlhttpRequest', 'GM.xmlHttpRequest',
-    'GM_openInTab', 'GM.openInTab',
-    'GM_notification',
-    'unsafeWindow',
-    'GM_getResourceText',
-    'GM_addStyle',
-    'GM_log',
-    'GM_addElement', 'GM.addElement'
-])
-
-export const allAPIs = new Set([...gmLegacyAPIs, ...gmModernAPIs, ...scAPIs])
-
-export function supportsAPI({ manager, api }) {
-    return !allAPIs.has(api) ? false
-         : api.startsWith('CAT') ? manager == 'scriptcat'
-         : tmAPIs.has(api) ? manager == 'tampermonkey'
-         : manager == 'adguard' ? agAPIs.has(api)
-         : true
+const apis = {
+    ag: new Set([
+        'GM_info', 'GM.info', 'GM_setValue', 'GM.setValue', 'GM_getValue', 'GM.getValue',
+        'GM_listValues', 'GM.listValues', 'GM_deleteValue', 'GM.deleteValue',
+        'GM_getResourceURL', 'GM.getResourceUrl', 'GM_setClipboard', 'GM.setClipboard',
+        'GM_xmlhttpRequest', 'GM.xmlHttpRequest', 'GM_openInTab', 'GM.openInTab',
+        'GM_notification', 'unsafeWindow', 'GM_getResourceText', 'GM_addStyle', 'GM_log',
+        'GM_addElement', 'GM.addElement'
+    ]),
+    gm: {
+        legacy: new Set([
+            'GM_addElement', 'GM_addStyle', 'GM_addValueChangeListener', 'GM_deleteValue', 'GM_download',
+            'GM_getResourceText', 'GM_getResourceURL', 'GM_getTab', 'GM_getTabs', 'GM_getValue', 'GM_getValues',
+            'GM_info', 'GM_listValues', 'GM_log', 'GM_notification', 'GM_openInTab', 'GM_registerMenuCommand',
+            'GM_removeValueChangeListener', // oxlint-disable-line no-secrets/no-secrets
+            'GM_saveTab', 'GM_setClipboard', 'GM_setValue', 'GM_setValues', 'GM_unregisterMenuCommand', 'GM_webRequest',
+            'GM_xmlhttpRequest'
+        ]),
+        modern: new Set([
+            'GM.addElement', 'GM.addStyle', 'GM.addValueChangeListener', 'GM.deleteValue', 'GM.download',
+            'GM.getResourceText', 'GM.getResourceUrl', 'GM.getTab', 'GM.getTabs', 'GM.getValue', 'GM.getValues',
+            'GM.info', 'GM.listValues', 'GM.log', 'GM.notification', 'GM.openInTab', 'GM.registerMenuCommand',
+            'GM.removeValueChangeListener', 'GM.saveTab', 'GM.setClipboard', 'GM.setValue', 'GM.setValues',
+            'GM.unregisterMenuCommand', 'GM.webRequest', 'GM.xmlHttpRequest'
+        ])
+    },
+    sc: new Set([
+        'CAT.agent.conversation', 'CAT.agent.dom', 'CAT.agent.mcp', 'CAT.agent.model', 'CAT.agent.opfs',
+        'CAT.agent.skills', 'CAT.agent.task', 'CAT_fileStorage', 'CAT_scriptLoaded', 'CAT_userConfig'
+    ]),
+    tm: new Set([
+        'GM_getTab', 'GM_getTabs', 'GM_saveTab', 'GM_webRequest',
+        'GM.getTab', 'GM.getTabs', 'GM.saveTab', 'GM.webRequest'
+    ]),
+    sensitive: new Set([
+        'GM_xmlhttpRequest', 'GM.xmlHttpRequest', 'GM_download', 'GM.download',
+        'GM_openInTab', 'GM.openInTab', 'GM_setClipboard', 'GM.setClipboard',
+        'GM_notification', 'GM.notification', 'GM_addValueChangeListener', 'GM.addValueChangeListener',
+        'GM_getResourceURL', 'GM.getResourceUrl', 'unsafeWindow'
+    ]),
+    managerSensitive: new Map([
+        ['tampermonkey', new Set([
+            'GM_webRequest', 'GM.webRequest', 'GM_getTab', 'GM.getTab', 'GM_getTabs', 'GM.getTabs',
+            'GM_saveTab', 'GM.saveTab'
+        ])],
+        ['violentmonkey', new Set([])],
+        ['greasemonkey', new Set([])],
+        ['scriptcat', new Set([
+            'CAT.agent.conversation', 'CAT.agent.dom', 'CAT.agent.mcp', 'CAT.agent.model', 'CAT.agent.opfs',
+            'CAT.agent.skills', 'CAT.agent.task', 'CAT_fileStorage', 'CAT_userConfig'
+        ])],
+        ['adguard', new Set([])]
+    ])
 }
+apis.all = new Set([...apis.gm.legacy, ...apis.gm.modern, ...apis.sc])
+
+export default apis

package/src/data/headers.js

@@ -1,36 +1,70 @@
-export const universalHeaders = new Set([
-    'antifeature', 'author', 'compatible', 'connect', 'contributionAmount', 'contributionURL', 'copyright',
-    'defaulticon', 'description', 'downloadURL', 'exclude', 'exclude-match', 'grant', 'homepage', 'homepageURL',
-    'icon', 'icon64', 'include', 'license', 'match', 'name', 'namespace', 'noframes', 'require', 'resource',
-    'run-at', 'source', 'supportURL', 'updateURL', 'version', 'website'
-])
+// oxlint-disable sonarjs/no-clear-text-protocols
 
-export const managerHeaders = new Map([
-    ['unwrap',          ['tampermonkey', 'violentmonkey', 'greasemonkey', 'scriptcat']],
-    ['run-in',          ['tampermonkey', 'scriptcat']],
-    ['nocompat',        ['tampermonkey']],
-    ['sandbox',         ['tampermonkey']],
-    ['user-agent',      ['tampermonkey']],
-    ['webRequest',      ['tampermonkey']],
-    ['inject-into',     ['violentmonkey', 'scriptcat']],
-    ['top-level-await', ['violentmonkey']],
-    ['background',      ['scriptcat']],
-    ['crontab',         ['scriptcat']],
-    ['definition',      ['scriptcat']],
-    ['early-start',     ['scriptcat']],
-    ['require-css',     ['scriptcat']],
-    ['storageName',     ['scriptcat']]
-])
-
-export const localizedHeaders = ['name', 'description', 'antifeature']
-export const managers = ['tampermonkey', 'violentmonkey', 'greasemonkey', 'scriptcat', 'adguard']
-export const validHeaders = new Map()
+const headers = {
+    broadConnect: new Set([
+        '*',
+        '*.com', '*.org', '*.net', '*.io', '*.dev', '*.app', '*.co',
+        'http://*', 'https://*',
+        'http://*/*', 'https://*/*',
+        'http://*/', 'https://*/',
+        'http:*', 'https:*'
+    ]),
+    localized: ['name', 'description', 'antifeature'],
+    manager: new Map([
+        ['unwrap',          ['tampermonkey', 'violentmonkey', 'greasemonkey', 'scriptcat']],
+        ['run-in',          ['tampermonkey', 'scriptcat']],
+        ['nocompat',        ['tampermonkey']],
+        ['sandbox',         ['tampermonkey']],
+        ['user-agent',      ['tampermonkey']],
+        ['webRequest',      ['tampermonkey']],
+        ['inject-into',     ['violentmonkey', 'scriptcat']],
+        ['top-level-await', ['violentmonkey']],
+        ['background',      ['scriptcat']],
+        ['crontab',         ['scriptcat']],
+        ['definition',      ['scriptcat']],
+        ['early-start',     ['scriptcat']],
+        ['require-css',     ['scriptcat']],
+        ['storageName',     ['scriptcat']]
+    ]),
+    managers: ['tampermonkey', 'violentmonkey', 'greasemonkey', 'scriptcat', 'adguard'],
+    universal: new Set([
+        'antifeature', 'author', 'compatible', 'connect', 'contributionAmount', 'contributionURL', 'copyright',
+        'defaulticon', 'description', 'downloadURL', 'exclude', 'exclude-match', 'grant', 'homepage', 'homepageURL',
+        'icon', 'icon64', 'include', 'license', 'match', 'name', 'namespace', 'noframes', 'require', 'resource',
+        'run-at', 'source', 'supportURL', 'updateURL', 'version', 'website'
+    ])
+}
 
-validHeaders.set('all', new Set([...universalHeaders, ...managerHeaders.keys()]))
+const knownHeaders = new Set([...headers.universal, ...headers.manager.keys()])
 
-for (const manager of managers) {
-    const specific = [...managerHeaders]
-        .filter(([, supportedBy]) => supportedBy.includes(manager))
+headers.valid = new Map([['all', knownHeaders]])
+for (const mgr of headers.managers) {
+    const specific = [...headers.manager]
+        .filter(([, supportedBy]) => supportedBy.includes(mgr))
         .map(([header]) => header)
-    validHeaders.set(manager, new Set([...universalHeaders, ...specific]))
+    headers.valid.set(mgr, new Set([...headers.universal, ...specific]))
 }
+
+headers.url = new Map(Object.entries({
+    connect:         'host-pattern',
+    contributionURL: 'url',
+    defaulticon:     'url',
+    downloadURL:     'url',
+    exclude:         'pattern',
+    'exclude-match': 'pattern',
+    homepage:        'url',
+    homepageURL:     'url',
+    icon:            'url',
+    icon64:          'url',
+    include:         'pattern',
+    match:           'pattern',
+    require:         'url',
+    'require-css':   'url',
+    resource:        'named-url',
+    source:          'url',
+    supportURL:      'url',
+    updateURL:       'url',
+    website:         'url'
+}).filter(([name]) => knownHeaders.has(name)))
+
+export default headers

package/src/data/regex.js

@@ -0,0 +1,14 @@
+export default {
+    filename: {
+        license: // oxlint-disable-next-line security/detect-unsafe-regex
+            /^(?:[\w.-]*-)?(?:LICEN[SC]E|COPYING)(?:[-.][\w.-]+)?$/i
+    },
+    meta: {
+        block: /\/\/\s*==UserScript==([\s\S]*?)\/\/\s*==\/UserScript==/,
+        license: /^[ \t]*\/\/[ \t]*@license[ \t]+(\S.*)/m
+    },
+    newline: /\r?\n/,
+    specialChars: /[.*+?^${}()|[\]\\]/g,
+    url: /^https?:\/\//,
+    whitespace: { all: /\s+/, leading: /^\s*/ }
+}

package/src/index.d.ts

@@ -1,6 +1,37 @@
+type RuleSeverity = 0 | 1 | 2 | 'off' | 'warn' | 'error'
+type RuleSetting = RuleSeverity | [RuleSeverity, ...unknown[]]
+
+type ConfigName =
+    | 'recommended'
+    | 'strict'
+    | 'problem'
+    | 'tampermonkey'
+    | 'violentmonkey'
+    | 'greasemonkey'
+    | 'scriptcat'
+    | 'adguard'
+
+interface PluginConfig {
+    plugins: Record<string, unknown>
+    rules: Record<string, RuleSetting>
+}
+
+interface PluginRule {
+    meta: {
+        type?: 'problem' | 'suggestion' | 'layout'
+        deprecated?: boolean | {
+            message?: string
+            replacedBy?: Array<{ rule: { name: string } }>
+        }
+        docs?: Record<string, unknown>
+    }
+    create: (context: unknown) => Record<string, (...args: unknown[]) => void>
+}
+
 declare const plugin: {
-    rules: Record<string, unknown>
-    configs: { recommended: Record<string, unknown> }
+    meta: { name: string }
+    rules: Record<string, PluginRule>
+    configs: Record<ConfigName, PluginConfig>
 }
 
-export default plugin
+export { plugin as default, plugin as greasemonkey }

package/src/index.js

@@ -1,84 +1,9 @@
-/* eslint-disable security/detect-object-injection -- false positives */
+import init from './utils/init.js'
 
-import { rules as oldRules } from './data/deprecations.js'
+const plugin = init.plugin()
 
-import metaOrder from './rules/meta-order.js'
-import metaSpacing from './rules/meta-spacing.js'
-import noDuplicateKeys from './rules/no-duplicate-keys.js'
-import noInvalidGrants from './rules/no-invalid-grants.js'
-import noInvalidHeaders from './rules/no-invalid-headers.js'
-import noMissingGrants from './rules/no-missing-grants.js'
-import noMissingResources from './rules/no-missing-resources.js'
-import noUnusedGrants from './rules/no-unused-grants.js'
-import noUnusedResources from './rules/no-unused-resources.js'
-import preferMatch from './rules/prefer-match.js'
-import requireBlankLineAfterMetaBlock from './rules/require-blank-line-after-meta-block.js'
-import requireHomepagePair from './rules/require-homepage-pair.js'
-import requireMatchingLocalizedFields from './rules/require-matching-localized-fields.js'
-import requireRequiredFields from './rules/require-required-fields.js'
-import requireSpaceBeforeMetaKey from './rules/require-space-before-meta-key.js'
-import requireSRIhashing from './rules/require-sri-hashing.js'
-import requireUpdateDownloadPair from './rules/require-update-download-pair.js'
-import requireUserJsFilename from './rules/require-user-js-filename.js'
-import validFieldValues from './rules/valid-field-values.js'
-
-import { bundleRules, initDeprecatedAlias } from './utils.js'
-
-const plugin = {
-    rules: {
-        'meta-order': metaOrder,
-        'meta-spacing': metaSpacing,
-        'no-duplicate-keys': noDuplicateKeys,
-        'no-invalid-grants': noInvalidGrants,
-        'no-invalid-headers': noInvalidHeaders,
-        'no-missing-grants': noMissingGrants,
-        'no-unused-grants': noUnusedGrants,
-        'no-missing-resources': noMissingResources,
-        'no-unused-resources': noUnusedResources,
-        'prefer-match': preferMatch,
-        'require-blank-line-after-meta-block': requireBlankLineAfterMetaBlock,
-        'require-homepage-pair': requireHomepagePair,
-        'require-matching-localized-fields': requireMatchingLocalizedFields,
-        'require-required-fields': requireRequiredFields,
-        'require-space-before-meta-key': requireSpaceBeforeMetaKey,
-        'require-sri-hashing': requireSRIhashing,
-        'require-update-download-pair': requireUpdateDownloadPair,
-        'require-user-js-filename': requireUserJsFilename,
-        'valid-field-values': validFieldValues
-    }
-}
-
-for (const [ruleId, rule] of Object.entries(plugin.rules))
-    rule.meta.docs.url = `https://codeberg.org/adamlui/eslint-plugin-greasemonkey/#${ruleId}`
-
-for (const entry of Object.entries(oldRules))
-    initDeprecatedAlias(plugin, entry)
-
-plugin.configs = {
-    recommended: {
-        plugins: { greasemonkey: plugin },
-        rules: bundleRules(plugin.rules, rule => rule.meta.docs.recommended, 'greasemonkey')
-    },
-    strict: {
-        plugins: { greasemonkey: plugin },
-        rules: bundleRules(plugin.rules, () => true, 'greasemonkey')
-    },
-    problem: {
-        plugins: { greasemonkey: plugin },
-        rules: bundleRules(plugin.rules, rule => rule.meta.type == 'problem', 'greasemonkey')
-    }
-}
-
-for (const manager of ['tampermonkey', 'violentmonkey', 'greasemonkey', 'scriptcat', 'adguard'])
-    plugin.configs[manager] = {
-        plugins: { greasemonkey: plugin },
-        rules: {
-            ...plugin.configs.recommended.rules,
-            'greasemonkey/no-invalid-grants': ['error', { target: manager }],
-            'greasemonkey/no-invalid-headers': ['error', { target: manager }],
-            ...(['tampermonkey', 'scriptcat', 'adguard'].includes(manager) &&
-                { 'greasemonkey/require-update-download-pair': 'error' })
-        }
-    }
+init.rules(plugin)
+init.deprecations(plugin)
+init.configs(plugin)
 
 export { plugin as default, plugin as greasemonkey }

package/src/rules/meta-order.js

@@ -1,4 +1,4 @@
-import { extractMetadata } from '../utils.js'
+import metadata from '../utils/metadata.js'
 
 const defaultOrder = [
     'name', 'description', 'author', 'namespace', 'version', 'license', 'icon', 'icon64',
@@ -12,7 +12,7 @@ function findViolation(entries, keys) {
               const key = entry.key.split(':', 1)[0]
               return { entry, key, rank: ranks.get(key) }
           }).filter(item => item.rank !== undefined)
-    for (let i = 1 ; i < known.length ; i++) // eslint-disable-next-line security/detect-object-injection
+    for (let i = 1 ; i < known.length ; i++) // oxlint-disable-next-line security/detect-object-injection
         if (known[i -1].rank > known[i].rank) return [known[i -1], known[i]]
 }
 
@@ -30,8 +30,7 @@ export default {
         type: 'layout',
         docs: {
             description: 'Enforce an order for metadata keys',
-            category: 'Stylistic Issues',
-            recommended: false
+            category: 'Stylistic Issues'
         },
         fixable: 'code',
         schema: [{
@@ -54,12 +53,12 @@ export default {
         return {
             Program() {
                 const sourceCode = context.sourceCode,
-                      entries = extractMetadata(sourceCode),
+                      entries = metadata.extract(sourceCode),
                       violation = findViolation(entries, master) ?? (custom.length && findViolation(entries, custom))
                 if (!violation) return
                 const [first, second] = violation
                 const sorted = sortEntries(sortEntries(entries, master), custom)
-                const replacements = // eslint-disable-next-line security/detect-object-injection
+                const replacements = // oxlint-disable-next-line security/detect-object-injection
                     new Map(sorted.map((entry, idx) => [entries[idx], sourceCode.getText(entry.comment)]))
                 const start = entries[0].comment.range[0]
                 const end = entries.at(-1).comment.range[1]

package/src/rules/meta-spacing.js

@@ -1,6 +1,5 @@
-import { extractMetadata } from '../utils.js'
-
-const re = { leadingWhitespace: /^\s*/, whitespace: /\s+/ }
+import metadata from '../utils/metadata.js'
+import regex from '../data/regex.js'
 
 export default {
     meta: {
@@ -30,29 +29,31 @@ export default {
         return {
             Program() {
                 const sourceCode = context.sourceCode,
-                      metaEntries = extractMetadata(sourceCode)
+                      metaEntries = metadata.extract(sourceCode)
                 if (!metaEntries.length) return
                 let targetCol = metaEntries.reduce((max, entry) => Math.max(max, entry.key.length), 0) + minSpaces +4
                 for (const entry of metaEntries)
                     if (entry.key == 'resource' && entry.value.trim()) {
-                        const name = entry.value.trim().split(re.whitespace)[0],
+                        const name = entry.value.trim().split(regex.whitespace.all)[0],
                               requiredCol = 4 + entry.key.length +1 + name.length + minSpaces
                         if (requiredCol > targetCol) targetCol = requiredCol
                     }
                 for (const entry of metaEntries) {
                     if (!entry.value.trim()) continue
                     const commentText = sourceCode.getText(entry.comment),
-                          keyIdx = commentText.indexOf(entry.key) + entry.key.length,
-                          parts = entry.value.trim().split(re.whitespace),
+                          trimmed = commentText.trimEnd(),
+                          trailingWs = commentText.slice(trimmed.length),
+                          keyIdx = trimmed.indexOf(entry.key) + entry.key.length,
+                          parts = entry.value.trim().split(regex.whitespace.all),
                           named = entry.key == 'resource' && parts.length >= 2,
                           prefix = named ? ` ${parts[0]} ` : '',
                           suffix = named ? parts.slice(1).join(' ') : entry.value.trim(),
-                          fixedText = commentText.slice(0, keyIdx) + prefix
+                          fixedText = trimmed.slice(0, keyIdx) + prefix
                                     + ' '.repeat(targetCol - keyIdx - prefix.length) + suffix
-                    if (commentText !== fixedText)
+                    if (trimmed !== fixedText)
                         context.report({
                             node: entry.comment, messageId: 'misaligned', data: { column: targetCol },
-                            fix(fixer) { return fixer.replaceText(entry.comment, fixedText) }
+                            fix(fixer) { return fixer.replaceText(entry.comment, fixedText + trailingWs) }
                         })
                 }
             }

package/src/rules/no-duplicate-keys.js

@@ -1,4 +1,4 @@
-import { extractMetadata } from '../utils.js'
+import metadata from '../utils/metadata.js'
 
 const multiValKeys = new Set([
     'compatible', 'connect', 'description', 'exclude', 'exclude-match', 'grant',
@@ -20,7 +20,7 @@ export default {
     create(context) {
         return {
             Program() {
-                const metaEntries = extractMetadata(context.sourceCode),
+                const metaEntries = metadata.extract(context.sourceCode),
                       seenEntries = new Set()
                 for (const entry of metaEntries) {
                     const baseKey = entry.key.split(':')[0]