From aad5b04fba2fc199d8f50674efcb2b24b4c7c1e9 Mon Sep 17 00:00:00 2001
From: Pat Cavit <github@patcavit.com>
Date: Sun, 3 Jul 2022 00:26:42 -0700
Subject: [PATCH 1/2] feat: indent/indentScript option

Allows to configure whether the contents of <script> blocks should be
indented a single tabstop or not. Defaults to true for back-compat.
---
 docs/rules/indent.md                                     | 1 +
 src/rules/indent-helpers/commons.ts                      | 1 +
 src/rules/indent-helpers/index.ts                        | 6 ++++++
 src/rules/indent-helpers/svelte.ts                       | 9 +++++++--
 src/rules/indent.ts                                      | 1 +
 .../rules/indent/invalid/indent-script/_config.json      | 3 +++
 .../invalid/indent-script/indent-script-errors.json      | 7 +++++++
 .../invalid/indent-script/indent-script-input.svelte     | 4 ++++
 .../invalid/indent-script/indent-script-output.svelte    | 4 ++++
 .../rules/indent/valid/indent-script-input.svelte        | 4 ++++
 10 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 tests/fixtures/rules/indent/invalid/indent-script/_config.json
 create mode 100644 tests/fixtures/rules/indent/invalid/indent-script/indent-script-errors.json
 create mode 100644 tests/fixtures/rules/indent/invalid/indent-script/indent-script-input.svelte
 create mode 100644 tests/fixtures/rules/indent/invalid/indent-script/indent-script-output.svelte
 create mode 100644 tests/fixtures/rules/indent/valid/indent-script-input.svelte

diff --git a/docs/rules/indent.md b/docs/rules/indent.md
index 0d5a59101..294ad37e2 100644
--- a/docs/rules/indent.md
+++ b/docs/rules/indent.md
@@ -88,6 +88,7 @@ This rule only checks `.svelte` files and does not interfere with other `.js` fi
 ```
 
 - `indent` (`number | "tab"`) ... The type of indentation. Default is `2`. If this is a number, it's the number of spaces for one indent. If this is `"tab"`, it uses one tab for one indent.
+- `indentScript` (`boolean`) ... If contents within a `<script>` block should be indented a level or not. Default is `true`.
 - `ignoredNodes` ... Can be used to disable indentation checking for any AST node. This accepts an array of [selectors](https://eslint.org/docs/developer-guide/selectors). If an AST node is matched by any of the selectors, the indentation of tokens which are direct children of that node will be ignored. This can be used as an escape hatch to relax the rule if you disagree with the indentation that it enforces for a particular syntactic pattern.
 - `switchCase` ... Enforces indentation level for case clauses in switch statements. Default is `1`.
 - `alignAttributesVertically` ... Condition for whether attributes should be vertically aligned to the first attribute in multiline case or not. Default is `false`
diff --git a/src/rules/indent-helpers/commons.ts b/src/rules/indent-helpers/commons.ts
index de8eed2ac..ae3a11270 100644
--- a/src/rules/indent-helpers/commons.ts
+++ b/src/rules/indent-helpers/commons.ts
@@ -13,6 +13,7 @@ export type MaybeNode = {
 
 export type IndentOptions = {
   indentChar: " " | "\t"
+  indentScript: boolean
   indentSize: number
   switchCase: number
   alignAttributesVertically: boolean
diff --git a/src/rules/indent-helpers/index.ts b/src/rules/indent-helpers/index.ts
index 10ed2d9d6..5aa2150a7 100644
--- a/src/rules/indent-helpers/index.ts
+++ b/src/rules/indent-helpers/index.ts
@@ -12,6 +12,7 @@ import { OffsetContext } from "./offset-context"
 
 type IndentUserOptions = {
   indent?: number | "tab"
+  indentScript?: boolean
   switchCase?: number
   alignAttributesVertically?: boolean
   ignoredNodes?: string[]
@@ -30,6 +31,7 @@ function parseOptions(
 ): IndentOptions {
   const ret: IndentOptions = {
     indentChar: " ",
+    indentScript: true,
     indentSize: 2,
     switchCase: 1,
     alignAttributesVertically: false,
@@ -44,6 +46,10 @@ function parseOptions(
     ret.indentSize = 1
   }
 
+  if (typeof options.indentScript === "boolean") {
+    ret.indentScript = options.indentScript
+  }
+
   if (options.switchCase != null && Number.isSafeInteger(options.switchCase)) {
     ret.switchCase = options.switchCase
   }
diff --git a/src/rules/indent-helpers/svelte.ts b/src/rules/indent-helpers/svelte.ts
index 95706d2b4..b2229f6b9 100644
--- a/src/rules/indent-helpers/svelte.ts
+++ b/src/rules/indent-helpers/svelte.ts
@@ -23,7 +23,12 @@ export function defineVisitor(context: IndentContext): NodeListener {
     // ELEMENTS
     // ----------------------------------------------------------------------
     SvelteScriptElement(node: AST.SvelteScriptElement) {
-      offsets.setOffsetElementList(node.body, node.startTag, node.endTag, 1)
+      offsets.setOffsetElementList(
+        node.body,
+        node.startTag,
+        node.endTag,
+        options.indentScript ? 1 : 0,
+      )
     },
     SvelteStyleElement(node: AST.SvelteStyleElement) {
       node.children.forEach((n) => offsets.ignore(n))
@@ -38,7 +43,7 @@ export function defineVisitor(context: IndentContext): NodeListener {
             node.children.filter(isNotEmptyTextNode),
             node.startTag,
             node.endTag,
-            1,
+            options.indentScript ? 1 : 0,
           )
         }
       } else {
diff --git a/src/rules/indent.ts b/src/rules/indent.ts
index 54d5e293d..d8321926d 100644
--- a/src/rules/indent.ts
+++ b/src/rules/indent.ts
@@ -16,6 +16,7 @@ export default createRule("indent", {
           indent: {
             anyOf: [{ type: "integer", minimum: 1 }, { enum: ["tab"] }],
           },
+          indentScript: { type: "boolean" },
           switchCase: { type: "integer", minimum: 0 },
           alignAttributesVertically: { type: "boolean" },
           ignoredNodes: {
diff --git a/tests/fixtures/rules/indent/invalid/indent-script/_config.json b/tests/fixtures/rules/indent/invalid/indent-script/_config.json
new file mode 100644
index 000000000..d88cdae55
--- /dev/null
+++ b/tests/fixtures/rules/indent/invalid/indent-script/_config.json
@@ -0,0 +1,3 @@
+{
+  "options": [{ "indentScript": false }]
+}
diff --git a/tests/fixtures/rules/indent/invalid/indent-script/indent-script-errors.json b/tests/fixtures/rules/indent/invalid/indent-script/indent-script-errors.json
new file mode 100644
index 000000000..72988f411
--- /dev/null
+++ b/tests/fixtures/rules/indent/invalid/indent-script/indent-script-errors.json
@@ -0,0 +1,7 @@
+[
+  {
+    "message": "Expected indentation of 0 spaces but found 2 spaces.",
+    "line": 3,
+    "column": 1
+  }
+]
diff --git a/tests/fixtures/rules/indent/invalid/indent-script/indent-script-input.svelte b/tests/fixtures/rules/indent/invalid/indent-script/indent-script-input.svelte
new file mode 100644
index 000000000..105f80da8
--- /dev/null
+++ b/tests/fixtures/rules/indent/invalid/indent-script/indent-script-input.svelte
@@ -0,0 +1,4 @@
+<!-- prettier-ignore -->
+<script>
+  const a = "indent-script-input.svelte"
+</script>
diff --git a/tests/fixtures/rules/indent/invalid/indent-script/indent-script-output.svelte b/tests/fixtures/rules/indent/invalid/indent-script/indent-script-output.svelte
new file mode 100644
index 000000000..bfd37fe5e
--- /dev/null
+++ b/tests/fixtures/rules/indent/invalid/indent-script/indent-script-output.svelte
@@ -0,0 +1,4 @@
+<!-- prettier-ignore -->
+<script>
+const a = "indent-script-input.svelte"
+</script>
diff --git a/tests/fixtures/rules/indent/valid/indent-script-input.svelte b/tests/fixtures/rules/indent/valid/indent-script-input.svelte
new file mode 100644
index 000000000..105f80da8
--- /dev/null
+++ b/tests/fixtures/rules/indent/valid/indent-script-input.svelte
@@ -0,0 +1,4 @@
+<!-- prettier-ignore -->
+<script>
+  const a = "indent-script-input.svelte"
+</script>

From 4e08c4181a019d600074556792fcf167eb32da89 Mon Sep 17 00:00:00 2001
From: Pat Cavit <github@patcavit.com>
Date: Wed, 6 Jul 2022 16:50:32 -0700
Subject: [PATCH 2/2] fix: remove errant changed line

---
 src/rules/indent-helpers/svelte.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rules/indent-helpers/svelte.ts b/src/rules/indent-helpers/svelte.ts
index b2229f6b9..8ab030175 100644
--- a/src/rules/indent-helpers/svelte.ts
+++ b/src/rules/indent-helpers/svelte.ts
@@ -43,7 +43,7 @@ export function defineVisitor(context: IndentContext): NodeListener {
             node.children.filter(isNotEmptyTextNode),
             node.startTag,
             node.endTag,
-            options.indentScript ? 1 : 0,
+            1,
           )
         }
       } else {