fix: last line strip indentation

gajus · web-flow · commit 427e03dad2f0 · 2023-08-01T13:29:04.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,9 +7,9 @@
   "dependencies": {
     "astring": "^1.8.3",
     "debug": "^4.3.4",
-    "dedent": "^1.5.1",
     "lodash": "^4.17.21",
     "pg-formatter": "^2.0.2",
+    "redent": "^4.0.0",
     "sql-parse": "^0.1.5"
   },
   "description": "SQL linting rules for ESLint.",
diff --git a/src/rules/format.ts b/src/rules/format.ts
@@ -1,7 +1,7 @@
 import isSqlQuery from '../utilities/isSqlQuery';
 import { generate } from 'astring';
 import { format } from 'pg-formatter';
-import stripIndent from 'strip-indent';
+import redent from 'redent';
 
 const create = (context) => {
   const placeholderRule = context.settings?.sql?.placeholderRule;
@@ -48,7 +48,7 @@ const create = (context) => {
       }
 
       if (ignoreBaseIndent) {
-        literal = stripIndent(literal);
+        literal = redent(literal);
       }
 
       let formatted = format(literal, context.options[1]);

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import isSqlQuery from '../utilities/isSqlQuery';`
`2`	`2`	`import { generate } from 'astring';`
`3`	`3`	`import { format } from 'pg-formatter';`
`4`		`-import stripIndent from 'strip-indent';`
	`4`	`+import redent from 'redent';`
`5`	`5`
`6`	`6`	`const create = (context) => {`
`7`	`7`	`const placeholderRule = context.settings?.sql?.placeholderRule;`
`@@ -48,7 +48,7 @@ const create = (context) => {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`if (ignoreBaseIndent) {`
`51`		`- literal = stripIndent(literal);`
	`51`	`+ literal = redent(literal);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`let formatted = format(literal, context.options[1]);`