Skip to content

Commit 6bb299d

Browse files
OlehDutchenkoOlehDutchenko
authored
Merge pull request #6 from WezomCompany/develop
Changes `@typescript-eslint/naming-convention` rule
2 parents 4218c7d + bb28fc4 commit 6bb299d

File tree

5 files changed

+54
-73
lines changed

5 files changed

+54
-73
lines changed

‎package-lock.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/eslint-config-ts/.eslintrc.json‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,33 +48,15 @@
4848
],
4949
"@typescript-eslint/naming-convention": [
5050
"error",
51-
{
52-
"selector": "default",
53-
"format": ["camelCase"]
54-
},
55-
{
56-
"selector": "variable",
57-
"format": ["camelCase", "PascalCase", "UPPER_CASE"],
58-
"leadingUnderscore": "allow"
59-
},
60-
{
61-
"selector": "variable",
62-
"modifiers": ["destructured"],
63-
"format": null
64-
},
6551
{
6652
"selector": "function",
6753
"format": ["camelCase", "PascalCase"],
6854
"leadingUnderscore": "allow"
6955
},
70-
{
71-
"selector": "parameter",
72-
"format": null
73-
},
7456
{
7557
"selector": "memberLike",
7658
"modifiers": ["private"],
77-
"format": ["camelCase"],
59+
"format": null,
7860
"leadingUnderscore": "require"
7961
},
8062
{

‎packages/eslint-config-ts/RULES.md‎

Lines changed: 25 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -491,33 +491,15 @@ _Value_:
491491
```json
492492
[
493493
"error",
494-
{
495-
"selector": "default",
496-
"format": ["camelCase"]
497-
},
498-
{
499-
"selector": "variable",
500-
"format": ["camelCase", "PascalCase", "UPPER_CASE"],
501-
"leadingUnderscore": "allow"
502-
},
503-
{
504-
"selector": "variable",
505-
"modifiers": ["destructured"],
506-
"format": null
507-
},
508494
{
509495
"selector": "function",
510496
"format": ["camelCase", "PascalCase"],
511497
"leadingUnderscore": "allow"
512498
},
513-
{
514-
"selector": "parameter",
515-
"format": null
516-
},
517499
{
518500
"selector": "memberLike",
519501
"modifiers": ["private"],
520-
"format": ["camelCase"],
502+
"format": null,
521503
"leadingUnderscore": "require"
522504
},
523505
{
@@ -538,19 +520,6 @@ _Usage examples_:
538520
🚧 Avoid
539521

540522
```ts
541-
// Variables
542-
543-
const my_const = 7;
544-
545-
// memberLike
546-
547-
const obj2 = {
548-
obj_prop: true,
549-
obj_method(): void {
550-
console.log(this.objProp);
551-
}
552-
};
553-
554523
// typeLike
555524

556525
class fooBar {}
@@ -564,6 +533,13 @@ type MY_TYPE = string;
564533

565534
abstract class my_class {}
566535

536+
class FooBar {
537+
private PrivateField = true;
538+
private privateField = true;
539+
private PRIVATE_FIELD = true;
540+
private private_field = true;
541+
}
542+
567543
// enumMember
568544

569545
enum MySeasons {
@@ -581,11 +557,15 @@ enum MySeasons {
581557
const myVar = 5;
582558
const _myTempVar = 6;
583559
const MY_CONST = 7;
560+
const my_const = 7;
584561
const Obj = {};
585562

586563
// Variables destructured
587564

588-
const obj = {};
565+
const obj = {
566+
no_camel_case_destructured_var: true,
567+
camelCased: true
568+
};
589569
const { no_camel_case_destructured_var, camelCased } = obj;
590570

591571
// Function parameter
@@ -605,6 +585,13 @@ function foo(
605585

606586
const obj2 = {
607587
objProp: true,
588+
ObjProp: true,
589+
obj_prop: true,
590+
OBJECT_PROP: true,
591+
_pseudoPrivateField: true,
592+
_PseudoPrivateField: true,
593+
_PSEUDO_PRIVATE_FIELD: true,
594+
_pseudo_private_field: true,
608595
objMethod(): void {
609596
console.log(this.objProp);
610597
}
@@ -614,7 +601,10 @@ class FooBar {
614601
memberProp1: string;
615602
memberProp2: string;
616603

617-
private _memberProp3 = 'xXx';
604+
private _PrivateField = true;
605+
private _privateField = true;
606+
private _PRIVATE_FIELD = true;
607+
private _private_field = true;
618608

619609
constructor(argValue1: string, argValue2: string) {
620610
this.memberProp1 = argValue1;
@@ -634,7 +624,7 @@ class FooBar {
634624
}
635625

636626
private _printPrivateMember(): void {
637-
console.log(this._memberProp3);
627+
console.log(this._private_field);
638628
}
639629

640630
static instanceTypeGuard(instance: any): instance is FooBar {

‎packages/eslint-config-ts/tests/fixtures/@typescript-eslint___naming-convention.invalid.ts‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
11
/* eslint-disable @typescript-eslint/no-unused-vars, no-undef */
2-
/* __AUTO-TEST-EXPECT-ERRORS-COUNT=10__ */
2+
/* __AUTO-TEST-EXPECT-ERRORS-COUNT=11__ */
33
export const blank = true;
44
/* __AUTO-DOC-PRINT-AFTER__ */
5-
// Variables
6-
7-
const my_const = 7;
8-
9-
// memberLike
10-
11-
const obj2 = {
12-
obj_prop: true,
13-
obj_method(): void {
14-
console.log(this.objProp);
15-
}
16-
};
175

186
// typeLike
197

@@ -31,6 +19,13 @@ abstract class my_class {
3119

3220
}
3321

22+
class FooBar {
23+
private PrivateField = true;
24+
private privateField = true;
25+
private PRIVATE_FIELD = true;
26+
private private_field = true;
27+
}
28+
3429
// enumMember
3530

3631
enum MySeasons {

‎packages/eslint-config-ts/tests/fixtures/@typescript-eslint___naming-convention.valid.ts‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,15 @@ export const blank = true;
66
const myVar = 5;
77
const _myTempVar = 6;
88
const MY_CONST = 7;
9+
const my_const = 7;
910
const Obj = {};
1011

1112
// Variables destructured
1213

13-
const obj = {};
14+
const obj = {
15+
no_camel_case_destructured_var: true,
16+
camelCased: true
17+
};
1418
const { no_camel_case_destructured_var, camelCased } = obj;
1519

1620
// Function parameter
@@ -30,6 +34,13 @@ function foo(
3034

3135
const obj2 = {
3236
objProp: true,
37+
ObjProp: true,
38+
obj_prop: true,
39+
OBJECT_PROP: true,
40+
_pseudoPrivateField: true,
41+
_PseudoPrivateField: true,
42+
_PSEUDO_PRIVATE_FIELD: true,
43+
_pseudo_private_field: true,
3344
objMethod(): void {
3445
console.log(this.objProp);
3546
}
@@ -39,7 +50,10 @@ class FooBar {
3950
memberProp1: string;
4051
memberProp2: string;
4152

42-
private _memberProp3 = 'xXx';
53+
private _PrivateField = true;
54+
private _privateField = true;
55+
private _PRIVATE_FIELD = true;
56+
private _private_field = true;
4357

4458
constructor(argValue1: string, argValue2: string) {
4559
this.memberProp1 = argValue1;
@@ -59,7 +73,7 @@ class FooBar {
5973
}
6074

6175
private _printPrivateMember(): void {
62-
console.log(this._memberProp3);
76+
console.log(this._private_field);
6377
}
6478

6579
static instanceTypeGuard(instance: any): instance is FooBar {

0 commit comments

Comments
 (0)