wip: rename rule

Also tightened up matching based on feedback

Author: tivac

docs/rules/no-unnecessary-reactive-curlies.md renamed to docs/rules/no-extra-reactive-curlies.md

@@ -1,11 +1,11 @@
 ---
 pageClass: "rule-details"
 sidebarDepth: 0
-title: "svelte/no-unnecessary-reactive-curlies"
+title: "svelte/no-extra-reactive-curlies"
 description: "disallow unnecessary curly braces around reactive statements"
 ---
 
-# svelte/no-unnecessary-reactive-curlies
+# svelte/no-extra-reactive-curlies
 
 > disallow unnecessary curly braces around reactive statements
 
@@ -19,14 +19,14 @@ This rule reports if curly brackets (`{` and `}`) are used unnecessarily around
 
 ```svelte
 <script>
-  /* eslint svelte/no-unnecessary-reactive-curlies: "error" */
-  
+  /* eslint svelte/no-extra-reactive-curlies: "error" */
+
   /* ✓ GOOD */
-  $: foo = "red";
+  $: foo = "red"
 
   /* ✗ BAD */
   $: {
-    foo = "red";
+    foo = "red"
   }
 </script>
 ```
@@ -50,5 +50,5 @@ This rule was introduced in eslint-plugin-svelte v2.4.0
 
 ## :mag: Implementation
 
-- [Rule source](https://github.com/ota-meshi/eslint-plugin-svelte/blob/main/src/rules/no-unnecessary-reactive-curlies.ts)
-- [Test source](https://github.com/ota-meshi/eslint-plugin-svelte/blob/main/tests/src/rules/no-unnecessary-reactive-curlies.ts)
+- [Rule source](https://github.com/ota-meshi/eslint-plugin-svelte/blob/main/src/rules/no-extra-reactive-curlies.ts)
+- [Test source](https://github.com/ota-meshi/eslint-plugin-svelte/blob/main/tests/src/rules/no-extra-reactive-curlies.ts)

src/rules/no-unnecessary-reactive-curlies.ts renamed to src/rules/no-extra-reactive-curlies.ts

@@ -1,32 +1,43 @@
-import type { AST } from "svelte-eslint-parser"
+import type { TSESTree } from "@typescript-eslint/types"
 import { createRule } from "../utils"
 
-export default createRule("no-unnecessary-reactive-curlies", {
+export default createRule("no-extra-reactive-curlies", {
   meta: {
     docs: {
       description:
         "disallow wrapping single reactive statements in curly braces",
       category: "Stylistic Issues",
       recommended: false,
+      conflictWithPrettier: false,
     },
     fixable: "code",
     schema: [],
     messages: {
-      unnecessaryCurlies: `Do not wrap reactive statements in curly braces unless necessary.`,
+      extraCurlies: `Do not wrap reactive statements in curly braces unless necessary.`,
     },
     type: "suggestion",
   },
   create(context) {
     return {
       [`SvelteReactiveStatement > BlockStatement[body.length=1]`]: (
-        node: AST.SvelteReactiveStatement,
+        node: TSESTree.BlockStatement,
       ) => {
+        // $: { foo = "bar"; }
+        // Only want to transform if the contents of the block is a single assignment
+        // Anything else gets us into potentially weird territory and probably isn't worth handling
+        if (
+          node.body[0].type !== "ExpressionStatement" ||
+          node.body[0].expression.type !== "AssignmentExpression"
+        ) {
+          return false
+        }
+
         const source = context.getSourceCode()
 
         return context.report({
           node,
           loc: node.loc,
-          messageId: "unnecessaryCurlies",
+          messageId: "extraCurlies",
 
           fix(fixer) {
             const tokens = source.getTokens(node, { includeComments: true })

src/utils/rules.ts

@@ -20,7 +20,7 @@ import noShorthandStylePropertyOverrides from "../rules/no-shorthand-style-prope
 import noSpacesAroundEqualSignsInAttribute from "../rules/no-spaces-around-equal-signs-in-attribute"
 import noTargetBlank from "../rules/no-target-blank"
 import noUnknownStyleDirectiveProperty from "../rules/no-unknown-style-directive-property"
-import noUnnecessaryReactiveCurlies from "../rules/no-unnecessary-reactive-curlies"
+import noExtraReactiveCurlies from "../rules/no-extra-reactive-curlies"
 import noUnusedSvelteIgnore from "../rules/no-unused-svelte-ignore"
 import noUselessMustaches from "../rules/no-useless-mustaches"
 import preferClassDirective from "../rules/prefer-class-directive"
@@ -54,7 +54,7 @@ export const rules = [
   noSpacesAroundEqualSignsInAttribute,
   noTargetBlank,
   noUnknownStyleDirectiveProperty,
-  noUnnecessaryReactiveCurlies,
+  noExtraReactiveCurlies,
   noUnusedSvelteIgnore,
   noUselessMustaches,
   preferClassDirective,

tests/fixtures/rules/no-unnecessary-reactive-curlies/invalid/test01-errors.json renamed to tests/fixtures/rules/no-extra-reactive-curlies/invalid/test01-errors.json

@@ -0,0 +1,7 @@
+[
+  {
+    "message": "Do not wrap reactive statements in curly braces unless necessary.",
+    "line": 3,
+    "column": 6
+  }
+]

tests/fixtures/rules/no-unnecessary-reactive-curlies/invalid/test01-input.svelte renamed to tests/fixtures/rules/no-extra-reactive-curlies/invalid/test01-input.svelte

@@ -0,0 +1,4 @@
+<!-- prettier-ignore -->
+<script>
+  $: { foo = info; }
+</script>

tests/fixtures/rules/no-unnecessary-reactive-curlies/invalid/test01-output.svelte renamed to tests/fixtures/rules/no-extra-reactive-curlies/invalid/test01-output.svelte

@@ -0,0 +1,4 @@
+<!-- prettier-ignore -->
+<script>
+  $: foo = info;
+</script>

tests/fixtures/rules/no-extra-reactive-curlies/invalid/test02-errors.json

@@ -0,0 +1,5 @@
+<!-- prettier-ignore -->
+<script>
+  $: foo1 = "bar"
+  $: foo2 = "bar";
+</script>

tests/fixtures/rules/no-extra-reactive-curlies/invalid/test02-input.svelte

@@ -0,0 +1,12 @@
+<script>
+  $: {
+    let foo = "bar"
+  }
+
+  $: {
+    function fn() {}
+  }
+  $: {
+    class Klass {}
+  }
+</script>

tests/fixtures/rules/no-extra-reactive-curlies/invalid/test02-output.svelte

@@ -1,5 +1,5 @@
 import { RuleTester } from "eslint"
-import rule from "../../../src/rules/no-unnecessary-reactive-curlies"
+import rule from "../../../src/rules/no-extra-reactive-curlies"
 import { loadTestCases } from "../../utils/utils"
 
 const tester = new RuleTester({
@@ -10,7 +10,7 @@ const tester = new RuleTester({
 })
 
 tester.run(
-  "no-unnecessary-reactive-curlies",
+  "no-extra-reactive-curlies",
   rule as any,
-  loadTestCases("no-unnecessary-reactive-curlies"),
+  loadTestCases("no-extra-reactive-curlies"),
 )