Remove useless spread and fallbacks (#249)

fisker · web-flow · commit b925331c9901 · 2025-03-05T11:32:30.000+09:00
* Add `unicorn/no-useless-fallback-in-spread`

* Apply fix

* Enable `unicorn/no-useless-spread`

* Apply fix
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -3,6 +3,7 @@ import typescriptEslint from "@typescript-eslint/eslint-plugin"
 import eslintComments from "eslint-plugin-eslint-comments"
 import node from "eslint-plugin-n"
 import nodeDeps from "eslint-plugin-node-dependencies"
+import unicorn from "eslint-plugin-unicorn"
 import tsParser from "@typescript-eslint/parser"
 import jsonParser from "jsonc-eslint-parser"
 import path from "node:path"
@@ -114,6 +115,7 @@ export default [
             "@typescript-eslint": typescriptEslint,
             "eslint-comments": eslintComments,
             node,
+            unicorn,
         },
 
         languageOptions: {
@@ -779,6 +781,9 @@ export default [
                     ],
                 },
             ],
+
+            "unicorn/no-useless-fallback-in-spread": ["error"],
+            "unicorn/no-useless-spread": ["error"],
         },
     },
     {
diff --git a/package.json b/package.json
@@ -47,6 +47,7 @@
     "eslint-plugin-n": "^17.15.1",
     "eslint-plugin-node-dependencies": "^0.12.0",
     "eslint-plugin-prettier": "^5.2.3",
+    "eslint-plugin-unicorn": "^57.0.0",
     "fs-extra": "^10.0.0",
     "jsonc-eslint-parser": "^2.0.3",
     "mocha": "^9.1.3",
diff --git a/src/index.ts b/src/index.ts
@@ -54,7 +54,7 @@ export function parseForESLint(
         loc: true,
         range: true,
         tokens: true,
-        ...(parserOptions ?? {}),
+        ...parserOptions,
     }
 
     let result: AST.ESLintExtendedProgram
@@ -69,7 +69,7 @@ export function parseForESLint(
     }
 
     result.services = {
-        ...(result.services || {}),
+        ...result.services,
         ...services.define(code, result.ast, document, locationCalculator, {
             parserOptions: options,
         }),
diff --git a/src/script/generic.ts b/src/script/generic.ts
@@ -95,7 +95,7 @@ export function extractGeneric(element: VElement): GenericProcessInfo | null {
         typeDefScope: Scope,
         isRemoveTarget: (nodeOrToken: HasLocation) => boolean,
     ) {
-        for (const variable of [...typeDefScope.variables]) {
+        for (const variable of typeDefScope.variables) {
             let def = variable.defs.find((d) =>
                 isRemoveTarget(d.name as HasLocation),
             )
@@ -106,13 +106,13 @@ export function extractGeneric(element: VElement): GenericProcessInfo | null {
                 )
             }
         }
-        for (const reference of [...typeDefScope.references]) {
+        for (const reference of typeDefScope.references) {
             if (isRemoveTarget(reference.identifier as HasLocation)) {
                 removeReference(reference, typeDefScope)
             }
         }
 
-        for (const scope of [...scopeManager.scopes]) {
+        for (const scope of scopeManager.scopes) {
             if (isRemoveTarget(scope.block as HasLocation)) {
                 removeScope(scopeManager, scope)
             }
diff --git a/src/sfc/custom-block/index.ts b/src/sfc/custom-block/index.ts
@@ -263,7 +263,7 @@ export function createCustomBlockSharedContext({
                         { ...parserOptions, ...options },
                     )
                 },
-                ...(parsedResult.services ?? {}),
+                ...parsedResult.services,
                 ...(parsedResult.error
                     ? { parseError: parsedResult.error }
                     : {}),

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ export function extractGeneric(element: VElement): GenericProcessInfo \| null {`
`95`	`95`	`typeDefScope: Scope,`
`96`	`96`	`isRemoveTarget: (nodeOrToken: HasLocation) => boolean,`
`97`	`97`	`) {`
`98`		`- for (const variable of [...typeDefScope.variables]) {`
	`98`	`+ for (const variable of typeDefScope.variables) {`
`99`	`99`	`let def = variable.defs.find((d) =>`
`100`	`100`	`isRemoveTarget(d.name as HasLocation),`
`101`	`101`	`)`
`@@ -106,13 +106,13 @@ export function extractGeneric(element: VElement): GenericProcessInfo \| null {`
`106`	`106`	`)`
`107`	`107`	`}`
`108`	`108`	`}`
`109`		`- for (const reference of [...typeDefScope.references]) {`
	`109`	`+ for (const reference of typeDefScope.references) {`
`110`	`110`	`if (isRemoveTarget(reference.identifier as HasLocation)) {`
`111`	`111`	`removeReference(reference, typeDefScope)`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
`115`		`- for (const scope of [...scopeManager.scopes]) {`
	`115`	`+ for (const scope of scopeManager.scopes) {`
`116`	`116`	`if (isRemoveTarget(scope.block as HasLocation)) {`
`117`	`117`	`removeScope(scopeManager, scope)`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ export function createCustomBlockSharedContext({`
`263`	`263`	`{ ...parserOptions, ...options },`
`264`	`264`	`)`
`265`	`265`	`},`
`266`		`- ...(parsedResult.services ?? {}),`
	`266`	`+ ...parsedResult.services,`
`267`	`267`	`...(parsedResult.error`
`268`	`268`	`? { parseError: parsedResult.error }`
`269`	`269`	`: {}),`