From 7d300581f34d4977c5bb7ecd33863bece40ac91f Mon Sep 17 00:00:00 2001 From: d0whc3r Date: Fri, 20 Sep 2019 23:25:16 +0200 Subject: [PATCH] refactor: change utils --- package-lock.json | 32 ++++++++++++------------ package.json | 6 ++--- src/rules/decorators-style.ts | 4 +-- src/rules/own-methods-must-be-private.ts | 6 ++--- src/rules/own-props-must-be-private.ts | 4 +-- src/utils.ts | 4 +-- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/package-lock.json b/package-lock.json index c84f012..8708c04 100644 --- a/package-lock.json +++ b/package-lock.json @@ -561,12 +561,12 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.2.0.tgz", - "integrity": "sha512-rOodtI+IvaO8USa6ValYOrdWm9eQBgqwsY+B0PPiB+aSiK6p6Z4l9jLn/jI3z3WM4mkABAhKIqvGIBl0AFRaLQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.3.0.tgz", + "integrity": "sha512-QgO/qmNye+rKsU7dan6pkBTSfpbyrHJidsw9bR3gZCrQNTB9eWQ5+UDkrrev/fu9xg6Qh7ebbx03IVuGnGRmEw==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "2.2.0", + "@typescript-eslint/experimental-utils": "2.3.0", "eslint-utils": "^1.4.2", "functional-red-black-tree": "^1.0.1", "regexpp": "^2.0.1", @@ -574,30 +574,30 @@ } }, "@typescript-eslint/experimental-utils": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.2.0.tgz", - "integrity": "sha512-IMhbewFs27Frd/ICHBRfIcsUCK213B8MsEUqvKFK14SDPjPR5JF6jgOGPlroybFTrGWpMvN5tMZdXAf+xcmxsA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.3.0.tgz", + "integrity": "sha512-ry+fgd0Hh33LyzS30bIhX/a1HJpvtnecjQjWxxsZTavrRa1ymdmX7tz+7lPrPAxB018jnNzwNtog6s3OhxPTAg==", "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "2.2.0", + "@typescript-eslint/typescript-estree": "2.3.0", "eslint-scope": "^5.0.0" } }, "@typescript-eslint/parser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.2.0.tgz", - "integrity": "sha512-0mf893kj9L65O5sA7wP6EoYvTybefuRFavUNhT7w9kjhkdZodoViwVS+k3D+ZxKhvtL7xGtP/y/cNMJX9S8W4A==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.3.0.tgz", + "integrity": "sha512-Dc+LAtHts0yDuusxG0NVjGvrpPy2kZauxqPbfFs0fmcMB4JhNs+WwIDMFGWeKjbGoPt/SIUC9XJ7E0ZD/f8InQ==", "requires": { "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "2.2.0", - "@typescript-eslint/typescript-estree": "2.2.0", + "@typescript-eslint/experimental-utils": "2.3.0", + "@typescript-eslint/typescript-estree": "2.3.0", "eslint-visitor-keys": "^1.1.0" } }, "@typescript-eslint/typescript-estree": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.2.0.tgz", - "integrity": "sha512-9/6x23A3HwWWRjEQbuR24on5XIfVmV96cDpGR9671eJv1ebFKHj2sGVVAwkAVXR2UNuhY1NeKS2QMv5P8kQb2Q==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.3.0.tgz", + "integrity": "sha512-WBxfwsTeCOsmQ7cLjow7lgysviBKUW34npShu7dxJYUQCbSG5nfZWZTgmQPKEc+3flpbSM7tjXjQOgETYp+njQ==", "requires": { "glob": "^7.1.4", "is-glob": "^4.0.1", diff --git a/package.json b/package.json index 49c67a5..ff96caf 100644 --- a/package.json +++ b/package.json @@ -22,17 +22,17 @@ }, "dependencies": { "@types/eslint": "^6.1.1", - "@typescript-eslint/parser": "^2.2.0", + "@typescript-eslint/parser": "^2.3.0", "eslint-utils": "^1.4.2", "tsutils": "^3.17.1" }, "peerDependencies": { - "@typescript-eslint/parser": "^2.2.0", + "@typescript-eslint/parser": "^2.3.0", "eslint": "^6.4.0" }, "devDependencies": { "@types/jest": "^24.0.18", - "@typescript-eslint/eslint-plugin": "^2.2.0", + "@typescript-eslint/eslint-plugin": "^2.3.0", "eslint": "^6.4.0", "jest": "^24.9.0", "jest-cli": "^24.9.0", diff --git a/src/rules/decorators-style.ts b/src/rules/decorators-style.ts index 1c36f65..a055050 100644 --- a/src/rules/decorators-style.ts +++ b/src/rules/decorators-style.ts @@ -1,6 +1,6 @@ import { Rule } from 'eslint'; import ts from 'typescript'; -import { decoratorName, getDecorator, stencilComponentContext, stencilDecorators } from '../utils'; +import { decoratorName, getDecorator, stencilComponentContext, DECORATORS } from '../utils'; import * as os from 'os'; type DecoratorsStyleOptionsEnum = 'inline' | 'multiline' | 'ignore'; @@ -111,7 +111,7 @@ const rule: Rule.RuleModule = { return; } const decorators: any[] = getDecorator(node); - decorators.filter((dec) => stencilDecorators.includes(decoratorName(dec))).forEach(checkStyle); + decorators.filter((dec) => DECORATORS.includes(decoratorName(dec))).forEach(checkStyle); } return { diff --git a/src/rules/own-methods-must-be-private.ts b/src/rules/own-methods-must-be-private.ts index 5a8d1f3..d360795 100644 --- a/src/rules/own-methods-must-be-private.ts +++ b/src/rules/own-methods-must-be-private.ts @@ -1,6 +1,6 @@ import { Rule } from 'eslint'; import ts from 'typescript'; -import { isPrivate, stencilComponentContext, stencilDecorators, stencilLifecycle } from '../utils'; +import { isPrivate, stencilComponentContext, DECORATORS, LIFECYCLE_METHODS } from '../utils'; const rule: Rule.RuleModule = { meta: { @@ -26,8 +26,8 @@ const rule: Rule.RuleModule = { } const originalNode = parserServices.esTreeNodeToTSNodeMap.get(node); const stencilDecorator = originalNode.decorators && originalNode.decorators.some( - (dec: any) => stencilDecorators.includes(dec.expression.expression.escapedText)); - const stencilCycle = stencilLifecycle.includes(originalNode.name.escapedText); + (dec: any) => DECORATORS.includes(dec.expression.expression.escapedText)); + const stencilCycle = LIFECYCLE_METHODS.includes(originalNode.name.escapedText); if (!stencilDecorator && !stencilCycle && !isPrivate(originalNode)) { const text = String(originalNode.getFullText()); context.report({ diff --git a/src/rules/own-props-must-be-private.ts b/src/rules/own-props-must-be-private.ts index 9dc5c84..74e9224 100644 --- a/src/rules/own-props-must-be-private.ts +++ b/src/rules/own-props-must-be-private.ts @@ -1,5 +1,5 @@ import { Rule } from 'eslint'; -import { isPrivate, stencilComponentContext, stencilDecorators } from '../utils'; +import { isPrivate, stencilComponentContext, DECORATORS } from '../utils'; const rule: Rule.RuleModule = { meta: { @@ -25,7 +25,7 @@ const rule: Rule.RuleModule = { } const originalNode = parserServices.esTreeNodeToTSNodeMap.get(node); const stencilDecorator = originalNode.decorators && originalNode.decorators.some( - (dec: any) => stencilDecorators.includes(dec.expression.expression.escapedText)); + (dec: any) => DECORATORS.includes(dec.expression.expression.escapedText)); if (!stencilDecorator && !isPrivate(originalNode)) { const text = String(originalNode.getFullText()); context.report({ diff --git a/src/utils.ts b/src/utils.ts index 7628f9c..c32f2bf 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -67,9 +67,9 @@ export function getType(node: any) { return node.typeAnnotation.typeAnnotation.typeName.name; } -export const stencilDecorators = ['Component', 'Prop', 'State', 'Watch', 'Element', 'Method', 'Event', 'Listen']; +export const DECORATORS = ['Component', 'Prop', 'State', 'Watch', 'Element', 'Method', 'Event', 'Listen']; -export const stencilLifecycle = [ +export const LIFECYCLE_METHODS = [ 'connectedCallback', 'disconnectedCallback', 'componentWillLoad',