Skip to content

Commit 3083f05

Browse files
committed
refactor: replace local isPrivateProperty with the implementation in eslint-etc
1 parent ffcdbf7 commit 3083f05

File tree

4 files changed

+12
-19
lines changed

4 files changed

+12
-19
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dependencies": {
77
"@typescript-eslint/experimental-utils": "^5.0.0",
88
"common-tags": "^1.8.0",
9-
"eslint-etc": "^5.0.0",
9+
"eslint-etc": "^5.2.0",
1010
"requireindex": "~1.2.0",
1111
"tslib": "^2.0.0"
1212
},

source/rules/prefer-composition.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ import {
1111
isAssignmentExpression,
1212
isCallExpression,
1313
isIdentifier,
14+
isPrivateIdentifier,
1415
isMemberExpression,
1516
isVariableDeclarator,
1617
} from "eslint-etc";
17-
import { ruleCreator, isPrivateIdentifier } from "../utils";
18+
import { ruleCreator } from "../utils";
1819

1920
const defaultOptions: readonly {
2021
checkDecorators?: string[];

source/utils.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,8 @@
44
*/
55

66
import { ESLintUtils } from "@typescript-eslint/experimental-utils";
7-
import { TSESTree as es } from "@typescript-eslint/experimental-utils";
87

98
export const ruleCreator = ESLintUtils.RuleCreator(
109
(name) =>
1110
`https://github.com/cartant/eslint-plugin-rxjs-angular/tree/main/docs/rules/${name}.md`
1211
);
13-
14-
// TODO: Remove when eslint-etc supports isPrivateIdentifier
15-
export function isPrivateIdentifier(
16-
node: es.Node
17-
): node is es.PrivateIdentifier {
18-
return node.type === "PrivateIdentifier";
19-
}

yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -712,14 +712,14 @@ escape-string-regexp@^1.0.5:
712712
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
713713
integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
714714

715-
eslint-etc@^5.0.0:
716-
version "5.0.1"
717-
resolved "https://registry.yarnpkg.com/eslint-etc/-/eslint-etc-5.0.1.tgz#c2caa5993cafb82fd6b57994a0ad231d7b0fe207"
718-
integrity sha512-QfRKA46LdQTOT7T0rwZJJ2kirGJSP49GgyrtxRMaFF+m04efkqDYxfrhImpP1a/gh/XQzfWBvbU2Qr2vLJk4wQ==
715+
eslint-etc@^5.2.0:
716+
version "5.2.0"
717+
resolved "https://registry.yarnpkg.com/eslint-etc/-/eslint-etc-5.2.0.tgz#c51c19a2ffb6447af76a1c5ffd13b9a212db859b"
718+
integrity sha512-Gcm/NMa349FOXb1PEEfNMMyIANuorIc2/mI5Vfu1zENNsz+FBVhF62uY6gPUCigm/xDOc8JOnl+71WGnlzlDag==
719719
dependencies:
720720
"@typescript-eslint/experimental-utils" "^5.0.0"
721721
tsutils "^3.17.1"
722-
tsutils-etc "^1.3.4"
722+
tsutils-etc "^1.4.1"
723723

724724
eslint-import-resolver-node@^0.3.6:
725725
version "0.3.6"
@@ -2056,10 +2056,10 @@ tslib@^2.0.0:
20562056
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
20572057
integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
20582058

2059-
tsutils-etc@^1.3.4:
2060-
version "1.3.4"
2061-
resolved "https://registry.yarnpkg.com/tsutils-etc/-/tsutils-etc-1.3.4.tgz#35def32592fe16f56bb5f0bdc9844acdad6c9bab"
2062-
integrity sha512-GOQJeZgE0rFiok0CsOrvNgLrIG5LiVEYtSiPHZz0KFFlSR8q3qXMkGZ3hOvFpBvB++B7PVEMhjQQmAF3tSFLKA==
2059+
tsutils-etc@^1.4.1:
2060+
version "1.4.1"
2061+
resolved "https://registry.yarnpkg.com/tsutils-etc/-/tsutils-etc-1.4.1.tgz#bd42a0079d534765ab314d087f8a89c77a68723f"
2062+
integrity sha512-6UPYgc7OXcIW5tFxlsZF3OVSBvDInl/BkS3Xsu64YITXk7WrnWTVByKWPCThFDBp5gl5IGHOzGMdQuDCE7OL4g==
20632063
dependencies:
20642064
"@types/yargs" "^17.0.0"
20652065
yargs "^17.0.0"

0 commit comments

Comments
 (0)