Merge branch 'master' into tsdown

# Conflicts:
#	.gitignore
#	eslint.config.mjs
#	package.json
#	tsconfig.json

Author: 9romise

.github/workflows/CI.yml

@@ -55,10 +55,8 @@ jobs:
       run: npm install -f
     - name: Install ESLint v${{ matrix.eslint }}
       run: node scripts/ci-install-eslint ${{ matrix.eslint }}
-    - name: Build
-      run: npm run -s build
     - name: Test
-      run: npm run -s test:mocha
+      run: npm run -s test
   test-for-old-eslint:
     name: Test
     strategy:
@@ -82,4 +80,4 @@ jobs:
     - name: Install ESLint v${{ matrix.eslint }}
       run: node scripts/ci-install-eslint ${{ matrix.eslint }}
     - name: Test
-      run: npm run -s test:debug
+      run: npm run -s test

.gitignore

@@ -1,4 +1,3 @@
-/.nyc_output
 /coverage
 node_modules
 /test/temp

.nycrc

@@ -22,7 +22,6 @@ const compat = new FlatCompat({
 export default [
     {
         ignores: [
-            ".nyc_output",
             "coverage",
             "dist",
             "**/node_modules",
@@ -62,7 +61,7 @@ export default [
                 },
 
                 loggerFn: false,
-                project: "tsconfig.json",
+                project: ["tsconfig.json", "tsconfig.test.json"],
             },
         },
 

eslint.config.mjs

@@ -30,11 +30,12 @@
     "@eslint/js": "^9.19.0",
     "@types/debug": "^4.1.7",
     "@types/estree": "^1.0.0",
-    "@types/mocha": "^9.0.0",
     "@types/node": "^18.8.4",
     "@types/semver": "^7.3.12",
     "@typescript-eslint/eslint-plugin": "^8.22.0",
     "@typescript-eslint/parser": "^8.22.0",
+    "@vitest/coverage-v8": "^3.2.4",
+    "@vitest/ui": "^3.2.4",
     "chokidar": "^3.5.2",
     "cross-spawn": "^7.0.3",
     "eslint": "^9.19.0",
@@ -46,38 +47,31 @@
     "eslint-plugin-unicorn": "^57.0.0",
     "fs-extra": "^10.0.0",
     "jsonc-eslint-parser": "^2.0.3",
-    "mocha": "^9.1.3",
     "npm-run-all": "^4.1.5",
-    "nyc": "^15.1.0",
-    "opener": "^1.5.2",
     "prettier": "^3.4.2",
     "rimraf": "^3.0.2",
     "ts-node": "^10.9.2",
     "tsdown": "^0.12.9",
     "typescript": "~5.7.3",
+    "vite": "^6.3.5",
+    "vitest": "^3.2.4",
     "wait-on": "^6.0.0",
     "warun": "^1.0.0"
   },
   "scripts": {
     "build": "tsdown",
-    "clean": "rimraf .nyc_output coverage",
-    "coverage": "opener ./coverage/lcov-report/index.html",
+    "coverage": "vitest --coverage --ui",
     "lint": "eslint src test package.json",
-    "pretest": "run-s build lint",
-    "test": "npm run -s test:mocha",
-    "test:mocha": "mocha --require ts-node/register \"test/*.js\" --reporter dot --timeout 60000",
-    "test:cover": "nyc mocha \"test/*.js\" --reporter dot --timeout 60000",
-    "test:debug": "mocha --require ts-node/register/transpile-only \"test/*.js\" --reporter dot --timeout 60000",
+    "test": "vitest",
+    "test:cover": "vitest --coverage",
     "update-fixtures": "ts-node --transpile-only scripts/update-fixtures-ast.js && ts-node --transpile-only scripts/update-fixtures-document-fragment.js",
     "preversion": "npm test",
     "version": "npm run -s build",
     "postversion": "git push && git push --tags",
     "prewatch": "npm run -s clean",
     "watch": "run-p watch:*",
     "watch:tsdown": "tsdown --watch",
-    "watch:test": "wait-on dist/index.js && warun dist/index.js \"test/*.js\" \"test/fixtures/ast/*/*.json\" \"test/fixtures/*\" --debounce 1000 --no-initial -- nyc mocha \"test/*.js\" --reporter dot --timeout 10000",
-    "watch:update-ast": "wait-on dist/index.js && warun dist/index.js \"test/fixtures/ast/*/*.vue\" -- ts-node scripts/update-fixtures-ast.js",
-    "watch:coverage-report": "wait-on coverage/lcov-report/index.html && opener coverage/lcov-report/index.html"
+    "watch:update-ast": "wait-on dist/index.js && warun dist/index.js \"test/fixtures/ast/*/*.vue\" -- ts-node scripts/update-fixtures-ast.js"
   },
   "repository": {
     "type": "git",

package.json

@@ -30,6 +30,8 @@ function sh(command) {
 
     // Install ESLint of the requested version
     await sh(`npm install eslint@${requestedVersionSpec} -f`)
+    if (Number(requestedVersion) < 9)
+        await sh(`npm install @types/eslint -D -f`)
 
     // Install ESLint submodule of the requested version
     // const installedVersion = require("eslint/package.json").version

scripts/ci-install-eslint.js

@@ -8,6 +8,7 @@ import type { ParseError } from "./errors"
 import type { HasLocation } from "./locations"
 import type { Token } from "./tokens"
 import type { TSESTree } from "@typescript-eslint/utils"
+import type { ParserServices } from "../parser-services"
 
 //------------------------------------------------------------------------------
 // Common
@@ -70,7 +71,7 @@ export type ESLintNode =
  */
 export interface ESLintExtendedProgram {
     ast: ESLintProgram
-    services?: {}
+    services?: ParserServices
     visitorKeys?: { [type: string]: string[] }
     scopeManager?: ScopeManager
 }

src/ast/nodes.ts

@@ -85,7 +85,7 @@ export function parseForESLint(
  * @param options The parser options.
  * @returns The parsing result.
  */
-export function parse(code: string, options: any): AST.ESLintProgram {
+export function parse(code: string, options?: any): AST.ESLintProgram {
     return parseForESLint(code, options).ast
 }
 

src/index.ts

@@ -83,7 +83,7 @@ export interface ParserServices {
                 | ((lang: string | null, customBlock: VElement) => boolean)
             create: CustomBlockVisitorFactory
         },
-        scriptVisitor: { [key: string]: (...args: any) => void },
+        scriptVisitor?: { [key: string]: (...args: any) => void },
     ): { [key: string]: (...args: any) => void }
 
     /**
@@ -262,7 +262,7 @@ export function define(
                     | ((lang: string | null, customBlock: VElement) => boolean)
                 create: CustomBlockVisitorFactory
             },
-            scriptVisitor: { [key: string]: (...args: any) => void },
+            scriptVisitor?: { [key: string]: (...args: any) => void },
         ): { [key: string]: (...args: any) => void } {
             if (scriptVisitor == null) {
                 scriptVisitor = {} //eslint-disable-line no-param-reassign