Skip to content

Commit fd541af

Browse files
committed
Upgrade prettier and typescript-eslint
1 parent 1f97682 commit fd541af

File tree

6 files changed

+319
-120
lines changed

6 files changed

+319
-120
lines changed

package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
"@types/ramda": "^0.27.3",
3636
"@types/wrap-ansi": "^3.0.0",
3737
"@types/yargs": "^17.0.0",
38-
"@typescript-eslint/eslint-plugin": "^5.3.1",
39-
"@typescript-eslint/parser": "^5.9.1",
38+
"@typescript-eslint/eslint-plugin": "^6.3.0",
39+
"@typescript-eslint/parser": "^6.3.0",
4040
"eslint": "^8.6.0",
41-
"eslint-plugin-prettier": "^4.0.0",
41+
"eslint-plugin-prettier": "^5.0.0",
4242
"jest": "^27.2.0",
4343
"jest-cli": "^27.2.0",
44-
"prettier": "^2.0.2",
44+
"prettier": "^3.0.1",
4545
"ts-jest": "^27.0.3",
4646
"ts-node": "^10.0.0"
4747
},

src/fp-utils.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,4 @@ export function sequenceAIM<A>(ta: InferM.InferM<A>[]): InferM.InferM<A[]> {
2626
export const concat2 =
2727
<A>() =>
2828
(arr1: A[]) =>
29-
(arr2: A[]): A[] =>
30-
[...arr1, ...arr2]
29+
(arr2: A[]): A[] => [...arr1, ...arr2]

src/prettify.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export async function runPrettier(
44
): Promise<string> {
55
let format, resolveConfig
66
try {
7-
// eslint-disable-next-line @typescript-eslint/no-extra-semi
7+
// eslint-disable-next-line no-extra-semi
88
;({ format, resolveConfig } = require('prettier'))
99
} catch (_err) {
1010
console.warn(

src/typed-parser/index.ts

+22-5
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ export function isParseError(e: any): e is ParseError {
3636

3737
class ParseErrorImpl extends Error implements ParseError {
3838
private positions = new Map<number, Position>()
39-
constructor(private source: string, private error: Failure) {
39+
constructor(
40+
private source: string,
41+
private error: Failure
42+
) {
4043
super(error.message)
4144
}
4245
get offset(): number {
@@ -150,7 +153,11 @@ abstract class AbstractFailure implements Failure {
150153

151154
class Expect extends AbstractFailure {
152155
public alias: string | null = null
153-
constructor(context: Context, public what: string, public type: string) {
156+
constructor(
157+
context: Context,
158+
public what: string,
159+
public type: string
160+
) {
154161
super(context)
155162
}
156163
get message(): string {
@@ -162,7 +169,11 @@ class Expect extends AbstractFailure {
162169
}
163170

164171
class NotFound extends AbstractFailure {
165-
constructor(context: Context, public what: string, public name: string) {
172+
constructor(
173+
context: Context,
174+
public what: string,
175+
public name: string
176+
) {
166177
super(context)
167178
}
168179
get message(): string {
@@ -179,14 +190,20 @@ class ExpectEnd extends AbstractFailure {
179190
}
180191
}
181192
class CustomErr extends AbstractFailure {
182-
constructor(context: Context, public message: string) {
193+
constructor(
194+
context: Context,
195+
public message: string
196+
) {
183197
super(context)
184198
}
185199
}
186200

187201
class ExpectOneOf extends AbstractFailure {
188202
public alias: string | null = null
189-
constructor(context: Context, public errors: Failure[]) {
203+
constructor(
204+
context: Context,
205+
public errors: Failure[]
206+
) {
190207
super(context)
191208
}
192209
get message(): string {

tests/cli.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function recursiveDeleteTsFiles(dir: string) {
3131
}
3232

3333
function removeGeneratedFiles() {
34-
// eslint-disable-next-line @typescript-eslint/no-extra-semi
34+
// eslint-disable-next-line no-extra-semi
3535
;[sqlsDir, invalidSqlsDir].forEach(recursiveDeleteTsFiles)
3636
if (fs.existsSync(checkTs)) fs.unlinkSync(checkTs)
3737
}

0 commit comments

Comments
 (0)