Skip to content

Commit 8edae3c

Browse files
style: bump internal tseslint to 8.13, fix new errors
1 parent e21d4aa commit 8edae3c

File tree

5 files changed

+75
-75
lines changed

5 files changed

+75
-75
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"@stylistic/eslint-plugin": "^2.10.1",
7171
"@types/common-tags": "^1.8.4",
7272
"@types/node": "^18.18.0",
73-
"@typescript-eslint/rule-tester": "^8.12.2",
73+
"@typescript-eslint/rule-tester": "^8.13.0",
7474
"@typescript/vfs": "^1.6.0",
7575
"@vitest/coverage-v8": "^2.1.4",
7676
"@vitest/eslint-plugin": "^1.1.7",
@@ -87,7 +87,7 @@
8787
"tsup": "^8.3.5",
8888
"tsx": "^4.19.2",
8989
"typescript": "~5.6.3",
90-
"typescript-eslint": "^8.12.2",
90+
"typescript-eslint": "^8.13.0",
9191
"vitest": "^2.1.4"
9292
},
9393
"engines": {

src/rules/finnish.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ export const finnishRule = ruleCreator({
118118
}
119119
: () => { /* noop */ };
120120
if (
121-
couldBeObservable(typeNode || nameNode)
122-
|| couldReturnObservable(typeNode || nameNode)
121+
couldBeObservable(typeNode ?? nameNode)
122+
|| couldReturnObservable(typeNode ?? nameNode)
123123
) {
124124
for (const name of names) {
125125
const { regExp, validate } = name;
@@ -131,8 +131,8 @@ export const finnishRule = ruleCreator({
131131
for (const type of types) {
132132
const { regExp, validate } = type;
133133
if (
134-
(couldBeType(typeNode || nameNode, regExp)
135-
|| couldReturnType(typeNode || nameNode, regExp))
134+
(couldBeType(typeNode ?? nameNode, regExp)
135+
|| couldReturnType(typeNode ?? nameNode, regExp))
136136
&& !validate
137137
) {
138138
shouldNotBeFinnish();

src/rules/no-finnish.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ export const noFinnishRule = ruleCreator({
2626

2727
function checkNode(nameNode: es.Node, typeNode?: es.Node) {
2828
if (
29-
couldBeObservable(typeNode || nameNode)
30-
|| couldReturnObservable(typeNode || nameNode)
29+
couldBeObservable(typeNode ?? nameNode)
30+
|| couldReturnObservable(typeNode ?? nameNode)
3131
) {
3232
const tsNode = esTreeNodeToTSNodeMap.get(nameNode);
3333
if (/[$]+$/.test(tsNode.getText())) {

src/rules/suffix-subjects.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ export const suffixSubjectsRule = ruleCreator({
7676
const text = tsNode.getText();
7777
if (
7878
!suffixRegex.test(text)
79-
&& couldBeType(typeNode || nameNode, 'Subject')
79+
&& couldBeType(typeNode ?? nameNode, 'Subject')
8080
) {
8181
for (const type of types) {
8282
const { regExp, validate } = type;
83-
if (couldBeType(typeNode || nameNode, regExp) && !validate) {
83+
if (couldBeType(typeNode ?? nameNode, regExp) && !validate) {
8484
return;
8585
}
8686
}

yarn.lock

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,15 +1023,15 @@ __metadata:
10231023
languageName: node
10241024
linkType: hard
10251025

1026-
"@typescript-eslint/eslint-plugin@npm:8.12.2":
1027-
version: 8.12.2
1028-
resolution: "@typescript-eslint/eslint-plugin@npm:8.12.2"
1026+
"@typescript-eslint/eslint-plugin@npm:8.13.0":
1027+
version: 8.13.0
1028+
resolution: "@typescript-eslint/eslint-plugin@npm:8.13.0"
10291029
dependencies:
10301030
"@eslint-community/regexpp": "npm:^4.10.0"
1031-
"@typescript-eslint/scope-manager": "npm:8.12.2"
1032-
"@typescript-eslint/type-utils": "npm:8.12.2"
1033-
"@typescript-eslint/utils": "npm:8.12.2"
1034-
"@typescript-eslint/visitor-keys": "npm:8.12.2"
1031+
"@typescript-eslint/scope-manager": "npm:8.13.0"
1032+
"@typescript-eslint/type-utils": "npm:8.13.0"
1033+
"@typescript-eslint/utils": "npm:8.13.0"
1034+
"@typescript-eslint/visitor-keys": "npm:8.13.0"
10351035
graphemer: "npm:^1.4.0"
10361036
ignore: "npm:^5.3.1"
10371037
natural-compare: "npm:^1.4.0"
@@ -1042,41 +1042,41 @@ __metadata:
10421042
peerDependenciesMeta:
10431043
typescript:
10441044
optional: true
1045-
checksum: 10c0/0f9c0982bc652c723923d22944254cb7c96fbb972e375f4eb1b031a512e67abc83a335f4ba677cff2275e83a7a61d3937473a3939ae4aa9a5b52a5313f02fb75
1045+
checksum: 10c0/ee96515e9def17b0d1b8d568d4afcd21c5a8a1bc01bf2f30c4d1f396b41a2f49de3508f79c6231a137ca06943dd6933ac00032652190ab99a4e935ffef44df0b
10461046
languageName: node
10471047
linkType: hard
10481048

1049-
"@typescript-eslint/parser@npm:8.12.2":
1050-
version: 8.12.2
1051-
resolution: "@typescript-eslint/parser@npm:8.12.2"
1049+
"@typescript-eslint/parser@npm:8.13.0":
1050+
version: 8.13.0
1051+
resolution: "@typescript-eslint/parser@npm:8.13.0"
10521052
dependencies:
1053-
"@typescript-eslint/scope-manager": "npm:8.12.2"
1054-
"@typescript-eslint/types": "npm:8.12.2"
1055-
"@typescript-eslint/typescript-estree": "npm:8.12.2"
1056-
"@typescript-eslint/visitor-keys": "npm:8.12.2"
1053+
"@typescript-eslint/scope-manager": "npm:8.13.0"
1054+
"@typescript-eslint/types": "npm:8.13.0"
1055+
"@typescript-eslint/typescript-estree": "npm:8.13.0"
1056+
"@typescript-eslint/visitor-keys": "npm:8.13.0"
10571057
debug: "npm:^4.3.4"
10581058
peerDependencies:
10591059
eslint: ^8.57.0 || ^9.0.0
10601060
peerDependenciesMeta:
10611061
typescript:
10621062
optional: true
1063-
checksum: 10c0/0d41f02e91045c5dca70e347731c74a4162ab567bedf3f7f69a2c3f152f629f2d1f96cf09188270c7df48e8a2d6193ccf177e636dcaa3e58cb85ba453c343d24
1063+
checksum: 10c0/fa04f6c417c0f72104e148f1d7ff53e04108d383550365a556fbfae5d2283484696235db522189e17bc49039946977078e324100cef991ca01f78704182624ad
10641064
languageName: node
10651065
linkType: hard
10661066

1067-
"@typescript-eslint/rule-tester@npm:^8.12.2":
1068-
version: 8.12.2
1069-
resolution: "@typescript-eslint/rule-tester@npm:8.12.2"
1067+
"@typescript-eslint/rule-tester@npm:^8.13.0":
1068+
version: 8.13.0
1069+
resolution: "@typescript-eslint/rule-tester@npm:8.13.0"
10701070
dependencies:
1071-
"@typescript-eslint/typescript-estree": "npm:8.12.2"
1072-
"@typescript-eslint/utils": "npm:8.12.2"
1071+
"@typescript-eslint/typescript-estree": "npm:8.13.0"
1072+
"@typescript-eslint/utils": "npm:8.13.0"
10731073
ajv: "npm:^6.12.6"
10741074
json-stable-stringify-without-jsonify: "npm:^1.0.1"
10751075
lodash.merge: "npm:4.6.2"
10761076
semver: "npm:^7.6.0"
10771077
peerDependencies:
10781078
eslint: ^8.57.0 || ^9.0.0
1079-
checksum: 10c0/07543958d518fd2fd3b2b39fe13807a8ab883266d94b5e7d32012ad2ddfc4cf7e866f706bcc54e7e4454d2748a05f3d3bca82c9b2d0acfc5aecbdfc2cd383d4f
1079+
checksum: 10c0/8425f70e8a2cfa3e6392972de9b90df5caf9c7419449abb1c6788cb2bb245e51b5a7b57180908d08519179a488b00b06e84c3a59265dbfe44fc668355782b076
10801080
languageName: node
10811081
linkType: hard
10821082

@@ -1090,28 +1090,28 @@ __metadata:
10901090
languageName: node
10911091
linkType: hard
10921092

1093-
"@typescript-eslint/scope-manager@npm:8.12.2, @typescript-eslint/scope-manager@npm:^8.1.0":
1094-
version: 8.12.2
1095-
resolution: "@typescript-eslint/scope-manager@npm:8.12.2"
1093+
"@typescript-eslint/scope-manager@npm:8.13.0, @typescript-eslint/scope-manager@npm:^8.1.0":
1094+
version: 8.13.0
1095+
resolution: "@typescript-eslint/scope-manager@npm:8.13.0"
10961096
dependencies:
1097-
"@typescript-eslint/types": "npm:8.12.2"
1098-
"@typescript-eslint/visitor-keys": "npm:8.12.2"
1099-
checksum: 10c0/e953838e9c1a55cc23c8ec5ecd0a7d447020ac8a1171bed248b6751fc3ec3910a5dad3497a63b660106844a4abeb17265b9a49ce2d0e29264213579b6cda20ab
1097+
"@typescript-eslint/types": "npm:8.13.0"
1098+
"@typescript-eslint/visitor-keys": "npm:8.13.0"
1099+
checksum: 10c0/1924b3e740e244d98f8a99740b4196d23ae3263303b387c66db94e140455a3132e603a130f3f70fc71e37f4bda5d0c0c67224ae3911908b097ef3f972c136be4
11001100
languageName: node
11011101
linkType: hard
11021102

1103-
"@typescript-eslint/type-utils@npm:8.12.2":
1104-
version: 8.12.2
1105-
resolution: "@typescript-eslint/type-utils@npm:8.12.2"
1103+
"@typescript-eslint/type-utils@npm:8.13.0":
1104+
version: 8.13.0
1105+
resolution: "@typescript-eslint/type-utils@npm:8.13.0"
11061106
dependencies:
1107-
"@typescript-eslint/typescript-estree": "npm:8.12.2"
1108-
"@typescript-eslint/utils": "npm:8.12.2"
1107+
"@typescript-eslint/typescript-estree": "npm:8.13.0"
1108+
"@typescript-eslint/utils": "npm:8.13.0"
11091109
debug: "npm:^4.3.4"
11101110
ts-api-utils: "npm:^1.3.0"
11111111
peerDependenciesMeta:
11121112
typescript:
11131113
optional: true
1114-
checksum: 10c0/88fb254acb022a6997a7335f1d9db54112f89a6f090afbf7c0ca52a6b70885391db7d6d40cf016084425f2899aaff49dac31e9df8cff12aae90c9c051eab69ff
1114+
checksum: 10c0/65319084616f3aea3d9f8dfab30c9b0a70de7314b445805016fdf0d0e39fe073eef2813c3e16c3e1c6a40462ba8eecfdbb12ab1e8570c3407a1cccdb69d4bc8b
11151115
languageName: node
11161116
linkType: hard
11171117

@@ -1122,10 +1122,10 @@ __metadata:
11221122
languageName: node
11231123
linkType: hard
11241124

1125-
"@typescript-eslint/types@npm:8.12.2":
1126-
version: 8.12.2
1127-
resolution: "@typescript-eslint/types@npm:8.12.2"
1128-
checksum: 10c0/7fdc26b349a4f0faa9e80683d425fe7a5761a50c76f2fad6ebdf30f1ef75443c06c158e17b2a529f70fc6d56560a130b4e59038b6e2f583c8cb54c1d0ab9cf73
1125+
"@typescript-eslint/types@npm:8.13.0":
1126+
version: 8.13.0
1127+
resolution: "@typescript-eslint/types@npm:8.13.0"
1128+
checksum: 10c0/bd3f88b738a92b2222f388bcf831357ef8940a763c2c2eb1947767e1051dd2f8bee387020e8cf4c2309e4142353961b659abc2885e30679109a0488b0bfefc23
11291129
languageName: node
11301130
linkType: hard
11311131

@@ -1147,12 +1147,12 @@ __metadata:
11471147
languageName: node
11481148
linkType: hard
11491149

1150-
"@typescript-eslint/typescript-estree@npm:8.12.2":
1151-
version: 8.12.2
1152-
resolution: "@typescript-eslint/typescript-estree@npm:8.12.2"
1150+
"@typescript-eslint/typescript-estree@npm:8.13.0":
1151+
version: 8.13.0
1152+
resolution: "@typescript-eslint/typescript-estree@npm:8.13.0"
11531153
dependencies:
1154-
"@typescript-eslint/types": "npm:8.12.2"
1155-
"@typescript-eslint/visitor-keys": "npm:8.12.2"
1154+
"@typescript-eslint/types": "npm:8.13.0"
1155+
"@typescript-eslint/visitor-keys": "npm:8.13.0"
11561156
debug: "npm:^4.3.4"
11571157
fast-glob: "npm:^3.3.2"
11581158
is-glob: "npm:^4.0.3"
@@ -1162,21 +1162,21 @@ __metadata:
11621162
peerDependenciesMeta:
11631163
typescript:
11641164
optional: true
1165-
checksum: 10c0/133db215be60c64bf9fb20d678aaf258b31d752380492474228946ba04f540210b371217414f56c37e61b04d77a451085c421ac9a19aca818b07ac67b7139b86
1165+
checksum: 10c0/2d45bc5ed4ac352bea927167ac28ef23bd13b6ae352ff50e85cddfdc4b06518f1dd4ae5f2495e30d6f62d247987677a4e807065d55829ba28963908a821dc96d
11661166
languageName: node
11671167
linkType: hard
11681168

1169-
"@typescript-eslint/utils@npm:8.12.2, @typescript-eslint/utils@npm:^8.1.0, @typescript-eslint/utils@npm:^8.12.2":
1170-
version: 8.12.2
1171-
resolution: "@typescript-eslint/utils@npm:8.12.2"
1169+
"@typescript-eslint/utils@npm:8.13.0, @typescript-eslint/utils@npm:^8.1.0, @typescript-eslint/utils@npm:^8.12.2":
1170+
version: 8.13.0
1171+
resolution: "@typescript-eslint/utils@npm:8.13.0"
11721172
dependencies:
11731173
"@eslint-community/eslint-utils": "npm:^4.4.0"
1174-
"@typescript-eslint/scope-manager": "npm:8.12.2"
1175-
"@typescript-eslint/types": "npm:8.12.2"
1176-
"@typescript-eslint/typescript-estree": "npm:8.12.2"
1174+
"@typescript-eslint/scope-manager": "npm:8.13.0"
1175+
"@typescript-eslint/types": "npm:8.13.0"
1176+
"@typescript-eslint/typescript-estree": "npm:8.13.0"
11771177
peerDependencies:
11781178
eslint: ^8.57.0 || ^9.0.0
1179-
checksum: 10c0/c050637aca88e8a5a09c2cee20d667ee3dbf1efa5488a11eca14069b320447419db3f8a42b7d3598d9acaad3a109cb6017d0e32d782255641721a41e95b2be2f
1179+
checksum: 10c0/3fc5a7184a949df5f5b64f6af039a1d21ef7fe15f3d88a5d485ccbb535746d18514751143993a5aee287228151be3e326baf8f899a0a0a93368f6f20857ffa6d
11801180
languageName: node
11811181
linkType: hard
11821182

@@ -1208,13 +1208,13 @@ __metadata:
12081208
languageName: node
12091209
linkType: hard
12101210

1211-
"@typescript-eslint/visitor-keys@npm:8.12.2":
1212-
version: 8.12.2
1213-
resolution: "@typescript-eslint/visitor-keys@npm:8.12.2"
1211+
"@typescript-eslint/visitor-keys@npm:8.13.0":
1212+
version: 8.13.0
1213+
resolution: "@typescript-eslint/visitor-keys@npm:8.13.0"
12141214
dependencies:
1215-
"@typescript-eslint/types": "npm:8.12.2"
1215+
"@typescript-eslint/types": "npm:8.13.0"
12161216
eslint-visitor-keys: "npm:^3.4.3"
1217-
checksum: 10c0/1f770d361bcb03ed028e5589824f6c7ba364da59fe8b982c2fed0878ad25890d80ebd6c72618ab5149317501964b7db106e20834179d4aa707a8cbffcca89d08
1217+
checksum: 10c0/50b35f3cf673aaed940613f0007f7c4558a89ebef15c49824e65b6f084b700fbf01b01a4e701e24bbe651297a39678645e739acd255255f1603867a84bef0383
12181218
languageName: node
12191219
linkType: hard
12201220

@@ -2408,7 +2408,7 @@ __metadata:
24082408
"@stylistic/eslint-plugin": "npm:^2.10.1"
24092409
"@types/common-tags": "npm:^1.8.4"
24102410
"@types/node": "npm:^18.18.0"
2411-
"@typescript-eslint/rule-tester": "npm:^8.12.2"
2411+
"@typescript-eslint/rule-tester": "npm:^8.13.0"
24122412
"@typescript-eslint/scope-manager": "npm:^8.1.0"
24132413
"@typescript-eslint/utils": "npm:^8.1.0"
24142414
"@typescript/vfs": "npm:^1.6.0"
@@ -2431,7 +2431,7 @@ __metadata:
24312431
tsup: "npm:^8.3.5"
24322432
tsx: "npm:^4.19.2"
24332433
typescript: "npm:~5.6.3"
2434-
typescript-eslint: "npm:^8.12.2"
2434+
typescript-eslint: "npm:^8.13.0"
24352435
vitest: "npm:^2.1.4"
24362436
peerDependencies:
24372437
eslint: ^8.57.0 || ^9.0.0
@@ -4749,17 +4749,17 @@ __metadata:
47494749
languageName: node
47504750
linkType: hard
47514751

4752-
"typescript-eslint@npm:^8.12.2":
4753-
version: 8.12.2
4754-
resolution: "typescript-eslint@npm:8.12.2"
4752+
"typescript-eslint@npm:^8.13.0":
4753+
version: 8.13.0
4754+
resolution: "typescript-eslint@npm:8.13.0"
47554755
dependencies:
4756-
"@typescript-eslint/eslint-plugin": "npm:8.12.2"
4757-
"@typescript-eslint/parser": "npm:8.12.2"
4758-
"@typescript-eslint/utils": "npm:8.12.2"
4756+
"@typescript-eslint/eslint-plugin": "npm:8.13.0"
4757+
"@typescript-eslint/parser": "npm:8.13.0"
4758+
"@typescript-eslint/utils": "npm:8.13.0"
47594759
peerDependenciesMeta:
47604760
typescript:
47614761
optional: true
4762-
checksum: 10c0/8a80916204da1a056fa3776d7c69d3d21b9a242d8d2bea75ca32b25d86a0c0e28711fb185605024e463b311e582f693166950d6fe0f66f0969603214e190cbcc
4762+
checksum: 10c0/a84958e7602360c4cb2e6227fd9aae19dd18cdf1a2cfd9ece2a81d54098f80454b5707e861e98547d0b2e5dae552b136aa6733b74f0dd743ca7bfe178083c441
47634763
languageName: node
47644764
linkType: hard
47654765

0 commit comments

Comments
 (0)