Refactor for types

Author: ota-meshi

.github/workflows/NodeCI.yml

@@ -18,6 +18,19 @@ jobs:
         run: npm install
       - name: Lint
         run: npm run lint
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 14
+      - name: Install Packages
+        run: npm install
+      - name: Build
+        run: |+
+          npm run update
+          npm run build
   test:
     name: "Test for ESLint ${{ matrix.eslint }} on ${{ matrix.node }} OS: ${{matrix.os}}"
     runs-on: ${{ matrix.os }}

package.json

@@ -23,7 +23,8 @@
     "debug": "mocha --require ts-node/register/transpile-only \"tests/src/**/*.ts\" --reporter dot --timeout 60000",
     "lint": "eslint .",
     "eslint-fix": "eslint . --fix",
-    "update": "ts-node --transpile-only ./tools/update.ts && npm run eslint-fix && npm run test",
+    "update": "ts-node --transpile-only ./tools/update.ts && npm run format-for-gen-file",
+    "format-for-gen-file": "eslint src/types-for-node.ts src/utils/rules.ts src/configs --fix",
     "new": "ts-node --transpile-only ./tools/new-rule.ts",
     "docs:watch": "svelte-kit dev",
     "docs:build": "node --experimental-loader ./svelte-kit-import-hook.mjs node_modules/@sveltejs/kit/svelte-kit.js build",
@@ -80,6 +81,7 @@
     "@types/eslint": "^8.0.0",
     "@types/eslint-scope": "^3.7.0",
     "@types/eslint-visitor-keys": "^1.0.0",
+    "@types/estree": "^0.0.50",
     "@types/mocha": "^9.0.0",
     "@types/node": "^16.0.0",
     "@typescript-eslint/eslint-plugin": "^5.4.0",

src/rules/indent-helpers/es.ts

@@ -1,7 +1,6 @@
 import type { AST } from "svelte-eslint-parser"
 import type * as ESTree from "estree"
 import type { TSESTree } from "@typescript-eslint/types"
-import type { ASTNode } from "../../types"
 import type { IndentContext } from "./commons"
 import { getFirstAndLastTokens } from "./commons"
 import {
@@ -17,17 +16,9 @@ import {
   isOpeningParenToken,
   isSemicolonToken,
 } from "eslint-utils"
+import type { ESNodeListener } from "../../types-for-node"
 
-type NodeWithParent =
-  | (Exclude<ESTree.Node, ESTree.Program> & { parent: ASTNode })
-  | AST.SvelteProgram
-  | AST.SvelteReactiveStatement
-
-type NodeListener = {
-  [key in NodeWithParent["type"]]: (
-    node: NodeWithParent & { type: key },
-  ) => void
-}
+type NodeListener = ESNodeListener
 
 /**
  * Creates AST event handlers for ES nodes.

src/rules/indent-helpers/svelte.ts

@@ -1,18 +1,13 @@
 import type { AST } from "svelte-eslint-parser"
 import type { ASTNode } from "../../types"
+import type { SvelteNodeListener } from "../../types-for-node"
 import { isNotWhitespace } from "./ast"
 import type { IndentContext } from "./commons"
 import { isBeginningOfElement } from "./commons"
 import { isBeginningOfLine } from "./commons"
 import { getFirstAndLastTokens } from "./commons"
-type NodeWithoutES = Exclude<
-  AST.SvelteNode,
-  AST.SvelteProgram | AST.SvelteReactiveStatement
->
 
-type NodeListener = {
-  [key in NodeWithoutES["type"]]: (node: NodeWithoutES & { type: key }) => void
-}
+type NodeListener = SvelteNodeListener
 const PREFORMATTED_ELEMENT_NAMES = ["pre", "textarea", "template"]
 
 /**

src/rules/indent-helpers/ts.ts

@@ -13,29 +13,9 @@ import {
 import type { AnyToken, IndentContext } from "./commons"
 import { isBeginningOfLine } from "./commons"
 import { getFirstAndLastTokens } from "./commons"
+import type { TSNodeListener } from "../../types-for-node"
 
-type NodeWithoutES = Exclude<
-  TSESTree.Node,
-  | { type: ESTree.Node["type"] }
-  | TSESTree.JSXAttribute
-  | TSESTree.JSXClosingElement
-  | TSESTree.JSXClosingFragment
-  | TSESTree.JSXElement
-  | TSESTree.JSXEmptyExpression
-  | TSESTree.JSXExpressionContainer
-  | TSESTree.JSXFragment
-  | TSESTree.JSXIdentifier
-  | TSESTree.JSXMemberExpression
-  | TSESTree.JSXNamespacedName
-  | TSESTree.JSXOpeningElement
-  | TSESTree.JSXOpeningFragment
-  | TSESTree.JSXSpreadAttribute
-  | TSESTree.JSXSpreadChild
-  | TSESTree.JSXText
->
-type NodeListener = {
-  [key in NodeWithoutES["type"]]: (node: NodeWithoutES & { type: key }) => void
-}
+type NodeListener = TSNodeListener
 
 /**
  * Creates AST event handlers for svelte nodes.