@cdklabs/eslint-plugin 1.1.0 → 1.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.test-output/no-this-in-static/static-function-using-super.ts +26 -0
- package/.test-output/no-this-in-static/static-function-using-this.ts +11 -0
- package/.test-output/no-this-in-static/this-in-constructor.ts +6 -0
- package/.test-output/no-this-in-static/this-in-instance-method.ts +4 -0
- package/README.md +21 -0
- package/lib/index.d.ts +1 -0
- package/lib/index.js +2 -1
- package/lib/rules/no-this-in-static.d.ts +11 -0
- package/lib/rules/no-this-in-static.js +120 -0
- package/lib/rules/no-throw-default-error.js +62 -21
- package/package.json +2 -2
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
class Super3 {
|
|
2
|
+
static propOneHop = 'abc';
|
|
3
|
+
static propThreeHops = 'abc';
|
|
4
|
+
}
|
|
5
|
+
|
|
6
|
+
class Super2 extends Super3 {
|
|
7
|
+
static oneHop() {
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
static twoHops() {
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
class Super extends Super2 {
|
|
15
|
+
static propOneHop = 'abc';
|
|
16
|
+
static oneHop() {
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
class Foo extends Super {
|
|
21
|
+
static baz() {
|
|
22
|
+
Super.oneHop();
|
|
23
|
+
Super2.twoHops();
|
|
24
|
+
return Super.propOneHop + Super3.propThreeHops;
|
|
25
|
+
}
|
|
26
|
+
}
|
package/README.md
CHANGED
|
@@ -19,6 +19,27 @@ Eslint plugin for the CDK repository. Contains rules that need to be applied spe
|
|
|
19
19
|
|
|
20
20
|
* `consider-promise-all`: when using `Promise.all()`, attest that there is no unbounded parallelism.
|
|
21
21
|
|
|
22
|
+
* `no-throw-default-error`: Forbid throwing the default JavaScript error type. Instead a custom typed error should be thrown.
|
|
23
|
+
|
|
24
|
+
* `no-this-in-static`: Forbid the use of the keywords `this` and `super` in
|
|
25
|
+
static methods.
|
|
26
|
+
|
|
27
|
+
## How to use these rules
|
|
28
|
+
|
|
29
|
+
Import the plugin and declare rules with the `@cdklabs` prefix:
|
|
30
|
+
|
|
31
|
+
```js
|
|
32
|
+
module.exports = {
|
|
33
|
+
plugins: [
|
|
34
|
+
// ... other plugins
|
|
35
|
+
'@cdklabs',
|
|
36
|
+
],
|
|
37
|
+
rules: {
|
|
38
|
+
'@cdklabs/no-throw-default-error': [ 'error' ],
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
```
|
|
42
|
+
|
|
22
43
|
## How to add new rules
|
|
23
44
|
|
|
24
45
|
* Make a new file in `lib/rules`. It should export one function called `create`. The
|
package/lib/index.d.ts
CHANGED
package/lib/index.js
CHANGED
|
@@ -13,5 +13,6 @@ exports.rules = {
|
|
|
13
13
|
'no-invalid-path': require('./rules/no-invalid-path'),
|
|
14
14
|
'no-throw-default-error': require('./rules/no-throw-default-error'),
|
|
15
15
|
'promiseall-no-unbounded-parallelism': require('./rules/promiseall-no-unbounded-parallelism'),
|
|
16
|
+
'no-this-in-static': require('./rules/no-this-in-static'),
|
|
16
17
|
};
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBEQUEwRDs7O0FBRTdDLFFBQUEsSUFBSSxHQUFHO0lBQ2xCLElBQUksRUFBRSxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBQyxJQUFJO0lBQ3JDLE9BQU8sRUFBRSxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBQyxPQUFPO0NBQzVDLENBQUM7QUFFVyxRQUFBLEtBQUssR0FBRztJQUNuQixtQkFBbUIsRUFBRSxPQUFPLENBQUMsMkJBQTJCLENBQUM7SUFDekQscUJBQXFCLEVBQUUsT0FBTyxDQUFDLDZCQUE2QixDQUFDO0lBQzdELHNCQUFzQixFQUFFLE9BQU8sQ0FBQyw4QkFBOEIsQ0FBQztJQUMvRCxpQkFBaUIsRUFBRSxPQUFPLENBQUMseUJBQXlCLENBQUM7SUFDckQsd0JBQXdCLEVBQUUsT0FBTyxDQUFDLGdDQUFnQyxDQUFDO0lBQ25FLHFDQUFxQyxFQUFFLE9BQU8sQ0FBQyw2Q0FBNkMsQ0FBQztJQUM3RixtQkFBbUIsRUFBRSxPQUFPLENBQUMsMkJBQTJCLENBQUM7Q0FDMUQsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qIGVzbGludC1kaXNhYmxlIEB0eXBlc2NyaXB0LWVzbGludC9uby1yZXF1aXJlLWltcG9ydHMgKi9cblxuZXhwb3J0IGNvbnN0IG1ldGEgPSB7XG4gIG5hbWU6IHJlcXVpcmUoJy4uL3BhY2thZ2UuanNvbicpLm5hbWUsXG4gIHZlcnNpb246IHJlcXVpcmUoJy4uL3BhY2thZ2UuanNvbicpLnZlcnNpb24sXG59O1xuXG5leHBvcnQgY29uc3QgcnVsZXMgPSB7XG4gICduby1jb3JlLWNvbnN0cnVjdCc6IHJlcXVpcmUoJy4vcnVsZXMvbm8tY29yZS1jb25zdHJ1Y3QnKSxcbiAgJ2ludmFsaWQtY2ZuLWltcG9ydHMnOiByZXF1aXJlKCcuL3J1bGVzL2ludmFsaWQtY2ZuLWltcG9ydHMnKSxcbiAgJ25vLWxpdGVyYWwtcGFydGl0aW9uJzogcmVxdWlyZSgnLi9ydWxlcy9uby1saXRlcmFsLXBhcnRpdGlvbicpLFxuICAnbm8taW52YWxpZC1wYXRoJzogcmVxdWlyZSgnLi9ydWxlcy9uby1pbnZhbGlkLXBhdGgnKSxcbiAgJ25vLXRocm93LWRlZmF1bHQtZXJyb3InOiByZXF1aXJlKCcuL3J1bGVzL25vLXRocm93LWRlZmF1bHQtZXJyb3InKSxcbiAgJ3Byb21pc2VhbGwtbm8tdW5ib3VuZGVkLXBhcmFsbGVsaXNtJzogcmVxdWlyZSgnLi9ydWxlcy9wcm9taXNlYWxsLW5vLXVuYm91bmRlZC1wYXJhbGxlbGlzbScpLFxuICAnbm8tdGhpcy1pbi1zdGF0aWMnOiByZXF1aXJlKCcuL3J1bGVzL25vLXRoaXMtaW4tc3RhdGljJyksXG59O1xuIl19
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Adapted from https://github.com/mysticatea/eslint-plugin/blob/v13.0.0/tests/lib/rules/no-this-in-static.js
|
|
3
|
+
* @author Toru Nagashima
|
|
4
|
+
* @copyright 2016 Toru Nagashima. All rights reserved.
|
|
5
|
+
* MIT License
|
|
6
|
+
*/
|
|
7
|
+
import { Rule } from 'eslint';
|
|
8
|
+
export declare const meta: {
|
|
9
|
+
fixable: boolean;
|
|
10
|
+
};
|
|
11
|
+
export declare function create(context: Rule.RuleContext): Rule.NodeListener;
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Adapted from https://github.com/mysticatea/eslint-plugin/blob/v13.0.0/tests/lib/rules/no-this-in-static.js
|
|
4
|
+
* @author Toru Nagashima
|
|
5
|
+
* @copyright 2016 Toru Nagashima. All rights reserved.
|
|
6
|
+
* MIT License
|
|
7
|
+
*/
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.meta = void 0;
|
|
10
|
+
exports.create = create;
|
|
11
|
+
exports.meta = {
|
|
12
|
+
fixable: true,
|
|
13
|
+
};
|
|
14
|
+
function create(context) {
|
|
15
|
+
const sourceCode = context.sourceCode;
|
|
16
|
+
const staticFunctionStack = [];
|
|
17
|
+
const classDeclarations = new Map();
|
|
18
|
+
function isStaticMethod(node) {
|
|
19
|
+
return (node.type === 'FunctionExpression' &&
|
|
20
|
+
node.parent.type === 'MethodDefinition' &&
|
|
21
|
+
node.parent.static === true);
|
|
22
|
+
}
|
|
23
|
+
function enterFunction(node) {
|
|
24
|
+
staticFunctionStack.push(isStaticMethod(node));
|
|
25
|
+
}
|
|
26
|
+
function exitFunction() {
|
|
27
|
+
staticFunctionStack.pop();
|
|
28
|
+
}
|
|
29
|
+
function reportIfStatic(node) {
|
|
30
|
+
var _a;
|
|
31
|
+
const currentMethodIsStatic = staticFunctionStack.length > 0 && staticFunctionStack[staticFunctionStack.length - 1];
|
|
32
|
+
if (currentMethodIsStatic) {
|
|
33
|
+
context.report({
|
|
34
|
+
node,
|
|
35
|
+
loc: (_a = node.loc) !== null && _a !== void 0 ? _a : { line: 0, column: 0 },
|
|
36
|
+
message: "'{{type}}' keyword found in a static method. Replace it with the class name.",
|
|
37
|
+
data: { type: sourceCode.getText(node) },
|
|
38
|
+
fix(fixer) {
|
|
39
|
+
if (node.type === 'Super') {
|
|
40
|
+
const hierarchy = superClasses(findClassDeclaration(node));
|
|
41
|
+
const memberName = findMemberName(node);
|
|
42
|
+
if (memberName == null) {
|
|
43
|
+
return null;
|
|
44
|
+
}
|
|
45
|
+
const superDecl = hierarchy.find(hasStaticMemberCalled(memberName));
|
|
46
|
+
return superDecl ? fixer.replaceText(node, superDecl.id.name) : null;
|
|
47
|
+
}
|
|
48
|
+
if (node.type === 'ThisExpression') {
|
|
49
|
+
const decl = findClassDeclaration(node);
|
|
50
|
+
return decl ? fixer.replaceText(node, decl.id.name) : null;
|
|
51
|
+
}
|
|
52
|
+
return null;
|
|
53
|
+
},
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
function superClasses(node) {
|
|
58
|
+
var _a;
|
|
59
|
+
if (node == null) {
|
|
60
|
+
return [];
|
|
61
|
+
}
|
|
62
|
+
const result = [];
|
|
63
|
+
let superClass = node.superClass;
|
|
64
|
+
while (superClass != null) {
|
|
65
|
+
if (superClass.type === 'Identifier') {
|
|
66
|
+
const className = superClass.name;
|
|
67
|
+
const decl = classDeclarations.get(className);
|
|
68
|
+
result.push(decl);
|
|
69
|
+
superClass = (_a = classDeclarations.get(className)) === null || _a === void 0 ? void 0 : _a.superClass;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
return result;
|
|
73
|
+
}
|
|
74
|
+
function enterClass(node) {
|
|
75
|
+
classDeclarations.set(node.id.name, node);
|
|
76
|
+
}
|
|
77
|
+
function findClassDeclaration(node) {
|
|
78
|
+
let parent = node.parent;
|
|
79
|
+
while (parent != null) {
|
|
80
|
+
if (parent.type === 'ClassDeclaration') {
|
|
81
|
+
return parent;
|
|
82
|
+
}
|
|
83
|
+
parent = parent.parent;
|
|
84
|
+
}
|
|
85
|
+
return null;
|
|
86
|
+
}
|
|
87
|
+
function findMemberName(node) {
|
|
88
|
+
let parent = node.parent;
|
|
89
|
+
while (parent != null) {
|
|
90
|
+
if (parent.type == 'MemberExpression'
|
|
91
|
+
&& parent.property.type === 'Identifier') {
|
|
92
|
+
return parent.property.name;
|
|
93
|
+
}
|
|
94
|
+
if (parent.type === 'CallExpression'
|
|
95
|
+
&& parent.callee.type === 'MemberExpression'
|
|
96
|
+
&& parent.callee.property.type === 'Identifier') {
|
|
97
|
+
return parent.callee.property.name;
|
|
98
|
+
}
|
|
99
|
+
parent = parent.parent;
|
|
100
|
+
}
|
|
101
|
+
return null;
|
|
102
|
+
}
|
|
103
|
+
const hasStaticMemberCalled = (name) => (decl) => {
|
|
104
|
+
return decl.body.body.some((node) => {
|
|
105
|
+
return (node.type === 'MethodDefinition' || node.type === 'PropertyDefinition')
|
|
106
|
+
&& node.static && node.key.type === 'Identifier'
|
|
107
|
+
&& node.key.name === name;
|
|
108
|
+
});
|
|
109
|
+
};
|
|
110
|
+
return {
|
|
111
|
+
'FunctionDeclaration': enterFunction,
|
|
112
|
+
'FunctionExpression': enterFunction,
|
|
113
|
+
'FunctionDeclaration:exit': exitFunction,
|
|
114
|
+
'FunctionExpression:exit': exitFunction,
|
|
115
|
+
'ThisExpression': reportIfStatic,
|
|
116
|
+
'Super': reportIfStatic,
|
|
117
|
+
'ClassDeclaration': enterClass,
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"no-this-in-static.js","sourceRoot":"","sources":["../../src/rules/no-this-in-static.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Adapted from https://github.com/mysticatea/eslint-plugin/blob/v13.0.0/tests/lib/rules/no-this-in-static.js\n * @author Toru Nagashima\n * @copyright 2016 Toru Nagashima. All rights reserved.\n * MIT License\n */\n\nimport { Rule } from 'eslint';\nimport type { ClassDeclaration, FunctionDeclaration, FunctionExpression, Super, ThisExpression } from 'estree';\nimport NodeParentExtension = Rule.NodeParentExtension;\n\nexport const meta = {\n  fixable: true,\n};\n\nexport function create(context: Rule.RuleContext): Rule.NodeListener {\n  const sourceCode = context.sourceCode;\n  const staticFunctionStack: boolean[] = [];\n  const classDeclarations: Map<string, ClassDeclaration> = new Map();\n\n  function isStaticMethod(node: any): boolean {\n    return (\n      node.type === 'FunctionExpression' &&\n      node.parent.type === 'MethodDefinition' &&\n      node.parent.static === true\n    );\n  }\n\n  function enterFunction(node: (FunctionDeclaration | FunctionExpression) & NodeParentExtension) {\n    staticFunctionStack.push(isStaticMethod(node));\n  }\n\n  function exitFunction() {\n    staticFunctionStack.pop();\n  }\n\n  function reportIfStatic(node: (ThisExpression | Super) & NodeParentExtension) {\n    const currentMethodIsStatic = staticFunctionStack.length > 0 && staticFunctionStack[staticFunctionStack.length - 1];\n\n    if (currentMethodIsStatic) {\n      context.report({\n        node,\n        loc: node.loc ?? { line: 0, column: 0 },\n        message: \"'{{type}}' keyword found in a static method. Replace it with the class name.\",\n        data: { type: sourceCode.getText(node) },\n        fix(fixer: Rule.RuleFixer) {\n          if (node.type === 'Super') {\n            const hierarchy = superClasses(findClassDeclaration(node));\n            const memberName = findMemberName(node);\n\n            if (memberName == null) {\n              return null;\n            }\n\n            const superDecl = hierarchy.find(hasStaticMemberCalled(memberName));\n            return superDecl ? fixer.replaceText(node, superDecl.id.name) : null;\n          }\n\n          if (node.type === 'ThisExpression') {\n            const decl = findClassDeclaration(node);\n            return decl ? fixer.replaceText(node, decl.id.name) : null;\n          }\n\n          return null;\n        },\n      });\n    }\n  }\n\n  function superClasses(node: ClassDeclaration | null): ClassDeclaration[] {\n    if (node == null) {\n      return [];\n    }\n\n    const result: ClassDeclaration[] = [];\n\n    let superClass = node.superClass;\n\n    while (superClass != null) {\n      if (superClass.type === 'Identifier') {\n        const className = superClass.name;\n        const decl = classDeclarations.get(className)!;\n        result.push(decl);\n        superClass = classDeclarations.get(className)?.superClass;\n      }\n    }\n\n    return result;\n  }\n\n  function enterClass(node: ClassDeclaration & NodeParentExtension) {\n    classDeclarations.set(node.id.name, node);\n  }\n\n  function findClassDeclaration(node: NodeParentExtension): ClassDeclaration | null {\n    let parent = node.parent;\n\n    while (parent != null) {\n      if (parent.type === 'ClassDeclaration') {\n        return parent;\n      }\n\n      parent = parent.parent;\n    }\n\n    return null;\n  }\n\n  function findMemberName(node: NodeParentExtension): string | null {\n    let parent = node.parent;\n\n    while (parent != null) {\n      if (\n        parent.type == 'MemberExpression'\n        && parent.property.type === 'Identifier'\n      ) {\n        return parent.property.name;\n      }\n\n      if (\n        parent.type === 'CallExpression'\n        && parent.callee.type === 'MemberExpression'\n        && parent.callee.property.type === 'Identifier'\n      ) {\n        return parent.callee.property.name;\n      }\n\n      parent = parent.parent;\n    }\n\n    return null;\n  }\n\n  const hasStaticMemberCalled = (name: string) => (decl: ClassDeclaration) => {\n    return decl.body.body.some((node) => {\n      return (node.type === 'MethodDefinition' || node.type === 'PropertyDefinition')\n        && node.static && node.key.type === 'Identifier'\n        && node.key.name === name;\n    });\n  };\n\n  return {\n    'FunctionDeclaration': enterFunction,\n    'FunctionExpression': enterFunction,\n    'FunctionDeclaration:exit': exitFunction,\n    'FunctionExpression:exit': exitFunction,\n    'ThisExpression': reportIfStatic,\n    'Super': reportIfStatic,\n    'ClassDeclaration': enterClass,\n  };\n}\n"]}
|
|
@@ -6,6 +6,8 @@ exports.meta = {
|
|
|
6
6
|
hasSuggestions: true,
|
|
7
7
|
};
|
|
8
8
|
function create(context) {
|
|
9
|
+
const fileName = context.filename;
|
|
10
|
+
const isCliFile = fileName.includes('packages/aws-cdk/');
|
|
9
11
|
return {
|
|
10
12
|
ThrowStatement(node) {
|
|
11
13
|
if (node.argument.type !== 'NewExpression') {
|
|
@@ -15,32 +17,71 @@ function create(context) {
|
|
|
15
17
|
if (newExpr.callee &&
|
|
16
18
|
newExpr.callee.type === 'Identifier' &&
|
|
17
19
|
newExpr.callee.name === 'Error') {
|
|
20
|
+
const suggestions = [
|
|
21
|
+
{
|
|
22
|
+
desc: 'Replace with `ValidationError`',
|
|
23
|
+
fix: (fixer) => {
|
|
24
|
+
var _a;
|
|
25
|
+
// no existing args
|
|
26
|
+
if (newExpr.arguments.length === 0) {
|
|
27
|
+
return fixer.replaceText(newExpr, "new ValidationError('<insert error message>', this)");
|
|
28
|
+
}
|
|
29
|
+
const fixes = [
|
|
30
|
+
fixer.replaceText(newExpr.callee, 'ValidationError'),
|
|
31
|
+
];
|
|
32
|
+
const last = (_a = newExpr.arguments.at(-1)) === null || _a === void 0 ? void 0 : _a.range;
|
|
33
|
+
if (last) {
|
|
34
|
+
fixes.push(fixer.insertTextAfterRange(last, ', this'));
|
|
35
|
+
}
|
|
36
|
+
return fixes;
|
|
37
|
+
},
|
|
38
|
+
},
|
|
39
|
+
];
|
|
40
|
+
// Adds ToolkitError and AuthenticationError suggestions for CLI files.
|
|
41
|
+
if (isCliFile) {
|
|
42
|
+
suggestions.push({
|
|
43
|
+
desc: 'Replace with `ToolkitError`',
|
|
44
|
+
fix: (fixer) => {
|
|
45
|
+
var _a;
|
|
46
|
+
// no existing args
|
|
47
|
+
if (newExpr.arguments.length === 0) {
|
|
48
|
+
return fixer.replaceText(newExpr, "new ToolkitError('<insert error message>')");
|
|
49
|
+
}
|
|
50
|
+
const fixes = [
|
|
51
|
+
fixer.replaceText(newExpr.callee, 'ToolkitError'),
|
|
52
|
+
];
|
|
53
|
+
const last = (_a = newExpr.arguments.at(-1)) === null || _a === void 0 ? void 0 : _a.range;
|
|
54
|
+
if (last) {
|
|
55
|
+
fixes.push(fixer.insertTextAfterRange(last, ', this'));
|
|
56
|
+
}
|
|
57
|
+
return fixes;
|
|
58
|
+
},
|
|
59
|
+
}, {
|
|
60
|
+
desc: 'Replace with `AuthenticationError`',
|
|
61
|
+
fix: (fixer) => {
|
|
62
|
+
var _a;
|
|
63
|
+
// no existing args
|
|
64
|
+
if (newExpr.arguments.length === 0) {
|
|
65
|
+
return fixer.replaceText(newExpr, "new AuthenticationError('<insert error message>')");
|
|
66
|
+
}
|
|
67
|
+
const fixes = [
|
|
68
|
+
fixer.replaceText(newExpr.callee, 'AuthenticationError'),
|
|
69
|
+
];
|
|
70
|
+
const last = (_a = newExpr.arguments.at(-1)) === null || _a === void 0 ? void 0 : _a.range;
|
|
71
|
+
if (last) {
|
|
72
|
+
fixes.push(fixer.insertTextAfterRange(last, ', this'));
|
|
73
|
+
}
|
|
74
|
+
return fixes;
|
|
75
|
+
},
|
|
76
|
+
});
|
|
77
|
+
}
|
|
18
78
|
context.report({
|
|
19
79
|
node: newExpr,
|
|
20
80
|
message: 'Expected a non-default error object to be thrown.',
|
|
21
|
-
suggest:
|
|
22
|
-
{
|
|
23
|
-
desc: 'Replace with `ValidationError`',
|
|
24
|
-
fix: (fixer) => {
|
|
25
|
-
var _a;
|
|
26
|
-
// no existing args
|
|
27
|
-
if (newExpr.arguments.length === 0) {
|
|
28
|
-
return fixer.replaceText(newExpr, "new ValidationError('<insert error message>', this)");
|
|
29
|
-
}
|
|
30
|
-
const fixes = [
|
|
31
|
-
fixer.replaceText(newExpr.callee, 'ValidationError'),
|
|
32
|
-
];
|
|
33
|
-
const last = (_a = newExpr.arguments.at(-1)) === null || _a === void 0 ? void 0 : _a.range;
|
|
34
|
-
if (last) {
|
|
35
|
-
fixes.push(fixer.insertTextAfterRange(last, ', this'));
|
|
36
|
-
}
|
|
37
|
-
return fixes;
|
|
38
|
-
},
|
|
39
|
-
},
|
|
40
|
-
],
|
|
81
|
+
suggest: suggestions,
|
|
41
82
|
});
|
|
42
83
|
}
|
|
43
84
|
},
|
|
44
85
|
};
|
|
45
86
|
}
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
87
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm8tdGhyb3ctZGVmYXVsdC1lcnJvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ydWxlcy9uby10aHJvdy1kZWZhdWx0LWVycm9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQU9BLHdCQW1HQztBQXZHWSxRQUFBLElBQUksR0FBRztJQUNsQixjQUFjLEVBQUUsSUFBSTtDQUNyQixDQUFDO0FBRUYsU0FBZ0IsTUFBTSxDQUFDLE9BQXlCO0lBQzlDLE1BQU0sUUFBUSxHQUFHLE9BQU8sQ0FBQyxRQUFRLENBQUM7SUFDbEMsTUFBTSxTQUFTLEdBQUcsUUFBUSxDQUFDLFFBQVEsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO0lBRXpELE9BQU87UUFDTCxjQUFjLENBQUMsSUFBb0I7WUFDakMsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksS0FBSyxlQUFlLEVBQUUsQ0FBQztnQkFDM0MsT0FBTztZQUNULENBQUM7WUFFRCxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsUUFBeUIsQ0FBQztZQUMvQyxJQUNFLE9BQU8sQ0FBQyxNQUFNO2dCQUNkLE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSxLQUFLLFlBQVk7Z0JBQ3BDLE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSxLQUFLLE9BQU8sRUFDL0IsQ0FBQztnQkFDRCxNQUFNLFdBQVcsR0FBRztvQkFDbEI7d0JBQ0UsSUFBSSxFQUFFLGdDQUFnQzt3QkFDdEMsR0FBRyxFQUFFLENBQUMsS0FBcUIsRUFBRSxFQUFFOzs0QkFDN0IsbUJBQW1COzRCQUNuQixJQUFJLE9BQU8sQ0FBQyxTQUFTLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO2dDQUNuQyxPQUFPLEtBQUssQ0FBQyxXQUFXLENBQUMsT0FBTyxFQUFFLHFEQUFxRCxDQUFDLENBQUM7NEJBQzNGLENBQUM7NEJBRUQsTUFBTSxLQUFLLEdBQUc7Z0NBQ1osS0FBSyxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLGlCQUFpQixDQUFDOzZCQUNyRCxDQUFDOzRCQUVGLE1BQU0sSUFBSSxHQUFHLE1BQUEsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsMENBQUUsS0FBSyxDQUFDOzRCQUM3QyxJQUFJLElBQUksRUFBRSxDQUFDO2dDQUNULEtBQUssQ0FBQyxJQUFJLENBQ1IsS0FBSyxDQUFDLG9CQUFvQixDQUFDLElBQUksRUFBRSxRQUFRLENBQUMsQ0FDM0MsQ0FBQzs0QkFDSixDQUFDOzRCQUVELE9BQU8sS0FBSyxDQUFDO3dCQUNmLENBQUM7cUJBQ0Y7aUJBQ0YsQ0FBQztnQkFFRix1RUFBdUU7Z0JBQ3ZFLElBQUksU0FBUyxFQUFFLENBQUM7b0JBQ2QsV0FBVyxDQUFDLElBQUksQ0FDZDt3QkFDRSxJQUFJLEVBQUUsNkJBQTZCO3dCQUNuQyxHQUFHLEVBQUUsQ0FBQyxLQUFxQixFQUFFLEVBQUU7OzRCQUM3QixtQkFBbUI7NEJBQ25CLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFLENBQUM7Z0NBQ25DLE9BQU8sS0FBSyxDQUFDLFdBQVcsQ0FBQyxPQUFPLEVBQUUsNENBQTRDLENBQUMsQ0FBQzs0QkFDbEYsQ0FBQzs0QkFFRCxNQUFNLEtBQUssR0FBRztnQ0FDWixLQUFLLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsY0FBYyxDQUFDOzZCQUNsRCxDQUFDOzRCQUVGLE1BQU0sSUFBSSxHQUFHLE1BQUEsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsMENBQUUsS0FBSyxDQUFDOzRCQUM3QyxJQUFJLElBQUksRUFBRSxDQUFDO2dDQUNULEtBQUssQ0FBQyxJQUFJLENBQ1IsS0FBSyxDQUFDLG9CQUFvQixDQUFDLElBQUksRUFBRSxRQUFRLENBQUMsQ0FDM0MsQ0FBQzs0QkFDSixDQUFDOzRCQUVELE9BQU8sS0FBSyxDQUFDO3dCQUNmLENBQUM7cUJBQ0YsRUFDRDt3QkFDRSxJQUFJLEVBQUUsb0NBQW9DO3dCQUMxQyxHQUFHLEVBQUUsQ0FBQyxLQUFxQixFQUFFLEVBQUU7OzRCQUM3QixtQkFBbUI7NEJBQ25CLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFLENBQUM7Z0NBQ25DLE9BQU8sS0FBSyxDQUFDLFdBQVcsQ0FBQyxPQUFPLEVBQUUsbURBQW1ELENBQUMsQ0FBQzs0QkFDekYsQ0FBQzs0QkFFRCxNQUFNLEtBQUssR0FBRztnQ0FDWixLQUFLLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUscUJBQXFCLENBQUM7NkJBQ3pELENBQUM7NEJBRUYsTUFBTSxJQUFJLEdBQUcsTUFBQSxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQywwQ0FBRSxLQUFLLENBQUM7NEJBQzdDLElBQUksSUFBSSxFQUFFLENBQUM7Z0NBQ1QsS0FBSyxDQUFDLElBQUksQ0FDUixLQUFLLENBQUMsb0JBQW9CLENBQUMsSUFBSSxFQUFFLFFBQVEsQ0FBQyxDQUMzQyxDQUFDOzRCQUNKLENBQUM7NEJBRUQsT0FBTyxLQUFLLENBQUM7d0JBQ2YsQ0FBQztxQkFDRixDQUNGLENBQUM7Z0JBQ0osQ0FBQztnQkFFRCxPQUFPLENBQUMsTUFBTSxDQUFDO29CQUNiLElBQUksRUFBRSxPQUFPO29CQUNiLE9BQU8sRUFBRSxtREFBbUQ7b0JBQzVELE9BQU8sRUFBRSxXQUFXO2lCQUNyQixDQUFDLENBQUM7WUFDTCxDQUFDO1FBQ0gsQ0FBQztLQUNGLENBQUM7QUFDSixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgUnVsZSB9IGZyb20gJ2VzbGludCc7XG5pbXBvcnQgdHlwZSB7IE5ld0V4cHJlc3Npb24sIFRocm93U3RhdGVtZW50IH0gZnJvbSAnZXN0cmVlJztcblxuZXhwb3J0IGNvbnN0IG1ldGEgPSB7XG4gIGhhc1N1Z2dlc3Rpb25zOiB0cnVlLFxufTtcblxuZXhwb3J0IGZ1bmN0aW9uIGNyZWF0ZShjb250ZXh0OiBSdWxlLlJ1bGVDb250ZXh0KTogUnVsZS5Ob2RlTGlzdGVuZXIge1xuICBjb25zdCBmaWxlTmFtZSA9IGNvbnRleHQuZmlsZW5hbWU7XG4gIGNvbnN0IGlzQ2xpRmlsZSA9IGZpbGVOYW1lLmluY2x1ZGVzKCdwYWNrYWdlcy9hd3MtY2RrLycpO1xuXG4gIHJldHVybiB7XG4gICAgVGhyb3dTdGF0ZW1lbnQobm9kZTogVGhyb3dTdGF0ZW1lbnQpIHtcbiAgICAgIGlmIChub2RlLmFyZ3VtZW50LnR5cGUgIT09ICdOZXdFeHByZXNzaW9uJykge1xuICAgICAgICByZXR1cm47XG4gICAgICB9XG5cbiAgICAgIGNvbnN0IG5ld0V4cHIgPSBub2RlLmFyZ3VtZW50IGFzIE5ld0V4cHJlc3Npb247XG4gICAgICBpZiAoXG4gICAgICAgIG5ld0V4cHIuY2FsbGVlICYmXG4gICAgICAgIG5ld0V4cHIuY2FsbGVlLnR5cGUgPT09ICdJZGVudGlmaWVyJyAmJlxuICAgICAgICBuZXdFeHByLmNhbGxlZS5uYW1lID09PSAnRXJyb3InXG4gICAgICApIHtcbiAgICAgICAgY29uc3Qgc3VnZ2VzdGlvbnMgPSBbXG4gICAgICAgICAge1xuICAgICAgICAgICAgZGVzYzogJ1JlcGxhY2Ugd2l0aCBgVmFsaWRhdGlvbkVycm9yYCcsXG4gICAgICAgICAgICBmaXg6IChmaXhlcjogUnVsZS5SdWxlRml4ZXIpID0+IHtcbiAgICAgICAgICAgICAgLy8gbm8gZXhpc3RpbmcgYXJnc1xuICAgICAgICAgICAgICBpZiAobmV3RXhwci5hcmd1bWVudHMubGVuZ3RoID09PSAwKSB7XG4gICAgICAgICAgICAgICAgcmV0dXJuIGZpeGVyLnJlcGxhY2VUZXh0KG5ld0V4cHIsIFwibmV3IFZhbGlkYXRpb25FcnJvcignPGluc2VydCBlcnJvciBtZXNzYWdlPicsIHRoaXMpXCIpO1xuICAgICAgICAgICAgICB9XG5cbiAgICAgICAgICAgICAgY29uc3QgZml4ZXMgPSBbXG4gICAgICAgICAgICAgICAgZml4ZXIucmVwbGFjZVRleHQobmV3RXhwci5jYWxsZWUsICdWYWxpZGF0aW9uRXJyb3InKSxcbiAgICAgICAgICAgICAgXTtcblxuICAgICAgICAgICAgICBjb25zdCBsYXN0ID0gbmV3RXhwci5hcmd1bWVudHMuYXQoLTEpPy5yYW5nZTtcbiAgICAgICAgICAgICAgaWYgKGxhc3QpIHtcbiAgICAgICAgICAgICAgICBmaXhlcy5wdXNoKFxuICAgICAgICAgICAgICAgICAgZml4ZXIuaW5zZXJ0VGV4dEFmdGVyUmFuZ2UobGFzdCwgJywgdGhpcycpLFxuICAgICAgICAgICAgICAgICk7XG4gICAgICAgICAgICAgIH1cblxuICAgICAgICAgICAgICByZXR1cm4gZml4ZXM7XG4gICAgICAgICAgICB9LFxuICAgICAgICAgIH0sXG4gICAgICAgIF07XG5cbiAgICAgICAgLy8gQWRkcyBUb29sa2l0RXJyb3IgYW5kIEF1dGhlbnRpY2F0aW9uRXJyb3Igc3VnZ2VzdGlvbnMgZm9yIENMSSBmaWxlcy5cbiAgICAgICAgaWYgKGlzQ2xpRmlsZSkge1xuICAgICAgICAgIHN1Z2dlc3Rpb25zLnB1c2goXG4gICAgICAgICAgICB7XG4gICAgICAgICAgICAgIGRlc2M6ICdSZXBsYWNlIHdpdGggYFRvb2xraXRFcnJvcmAnLFxuICAgICAgICAgICAgICBmaXg6IChmaXhlcjogUnVsZS5SdWxlRml4ZXIpID0+IHtcbiAgICAgICAgICAgICAgICAvLyBubyBleGlzdGluZyBhcmdzXG4gICAgICAgICAgICAgICAgaWYgKG5ld0V4cHIuYXJndW1lbnRzLmxlbmd0aCA9PT0gMCkge1xuICAgICAgICAgICAgICAgICAgcmV0dXJuIGZpeGVyLnJlcGxhY2VUZXh0KG5ld0V4cHIsIFwibmV3IFRvb2xraXRFcnJvcignPGluc2VydCBlcnJvciBtZXNzYWdlPicpXCIpO1xuICAgICAgICAgICAgICAgIH1cblxuICAgICAgICAgICAgICAgIGNvbnN0IGZpeGVzID0gW1xuICAgICAgICAgICAgICAgICAgZml4ZXIucmVwbGFjZVRleHQobmV3RXhwci5jYWxsZWUsICdUb29sa2l0RXJyb3InKSxcbiAgICAgICAgICAgICAgICBdO1xuXG4gICAgICAgICAgICAgICAgY29uc3QgbGFzdCA9IG5ld0V4cHIuYXJndW1lbnRzLmF0KC0xKT8ucmFuZ2U7XG4gICAgICAgICAgICAgICAgaWYgKGxhc3QpIHtcbiAgICAgICAgICAgICAgICAgIGZpeGVzLnB1c2goXG4gICAgICAgICAgICAgICAgICAgIGZpeGVyLmluc2VydFRleHRBZnRlclJhbmdlKGxhc3QsICcsIHRoaXMnKSxcbiAgICAgICAgICAgICAgICAgICk7XG4gICAgICAgICAgICAgICAgfVxuXG4gICAgICAgICAgICAgICAgcmV0dXJuIGZpeGVzO1xuICAgICAgICAgICAgICB9LFxuICAgICAgICAgICAgfSxcbiAgICAgICAgICAgIHtcbiAgICAgICAgICAgICAgZGVzYzogJ1JlcGxhY2Ugd2l0aCBgQXV0aGVudGljYXRpb25FcnJvcmAnLFxuICAgICAgICAgICAgICBmaXg6IChmaXhlcjogUnVsZS5SdWxlRml4ZXIpID0+IHtcbiAgICAgICAgICAgICAgICAvLyBubyBleGlzdGluZyBhcmdzXG4gICAgICAgICAgICAgICAgaWYgKG5ld0V4cHIuYXJndW1lbnRzLmxlbmd0aCA9PT0gMCkge1xuICAgICAgICAgICAgICAgICAgcmV0dXJuIGZpeGVyLnJlcGxhY2VUZXh0KG5ld0V4cHIsIFwibmV3IEF1dGhlbnRpY2F0aW9uRXJyb3IoJzxpbnNlcnQgZXJyb3IgbWVzc2FnZT4nKVwiKTtcbiAgICAgICAgICAgICAgICB9XG5cbiAgICAgICAgICAgICAgICBjb25zdCBmaXhlcyA9IFtcbiAgICAgICAgICAgICAgICAgIGZpeGVyLnJlcGxhY2VUZXh0KG5ld0V4cHIuY2FsbGVlLCAnQXV0aGVudGljYXRpb25FcnJvcicpLFxuICAgICAgICAgICAgICAgIF07XG5cbiAgICAgICAgICAgICAgICBjb25zdCBsYXN0ID0gbmV3RXhwci5hcmd1bWVudHMuYXQoLTEpPy5yYW5nZTtcbiAgICAgICAgICAgICAgICBpZiAobGFzdCkge1xuICAgICAgICAgICAgICAgICAgZml4ZXMucHVzaChcbiAgICAgICAgICAgICAgICAgICAgZml4ZXIuaW5zZXJ0VGV4dEFmdGVyUmFuZ2UobGFzdCwgJywgdGhpcycpLFxuICAgICAgICAgICAgICAgICAgKTtcbiAgICAgICAgICAgICAgICB9XG5cbiAgICAgICAgICAgICAgICByZXR1cm4gZml4ZXM7XG4gICAgICAgICAgICAgIH0sXG4gICAgICAgICAgICB9LFxuICAgICAgICAgICk7XG4gICAgICAgIH1cblxuICAgICAgICBjb250ZXh0LnJlcG9ydCh7XG4gICAgICAgICAgbm9kZTogbmV3RXhwcixcbiAgICAgICAgICBtZXNzYWdlOiAnRXhwZWN0ZWQgYSBub24tZGVmYXVsdCBlcnJvciBvYmplY3QgdG8gYmUgdGhyb3duLicsXG4gICAgICAgICAgc3VnZ2VzdDogc3VnZ2VzdGlvbnMsXG4gICAgICAgIH0pO1xuICAgICAgfVxuICAgIH0sXG4gIH07XG59XG4iXX0=
|
package/package.json
CHANGED
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"commit-and-tag-version": "^12",
|
|
47
47
|
"constructs": "^10.0.0",
|
|
48
48
|
"eslint": "^8",
|
|
49
|
-
"eslint-import-resolver-typescript": "^3.
|
|
49
|
+
"eslint-import-resolver-typescript": "^3.7.0",
|
|
50
50
|
"eslint-plugin-import": "^2.31.0",
|
|
51
51
|
"jest": "^29.7.0",
|
|
52
52
|
"jest-junit": "^15",
|
|
@@ -70,7 +70,7 @@
|
|
|
70
70
|
"publishConfig": {
|
|
71
71
|
"access": "public"
|
|
72
72
|
},
|
|
73
|
-
"version": "1.
|
|
73
|
+
"version": "1.3.0",
|
|
74
74
|
"jest": {
|
|
75
75
|
"coverageProvider": "v8",
|
|
76
76
|
"testMatch": [
|