@cdklabs/eslint-plugin 1.1.0 → 1.2.0

package/.test-output/no-this-in-static/static-function-using-super.ts

@@ -0,0 +1,26 @@
+class Super3 {
+  static propOneHop = 'abc';
+  static propThreeHops = 'abc';
+}
+
+class Super2 extends Super3 {
+  static oneHop() {
+  }
+
+  static twoHops() {
+  }
+}
+
+class Super extends Super2 {
+  static propOneHop = 'abc';
+  static oneHop() {
+  }
+}
+
+class Foo extends Super {
+  static baz() {
+    Super.oneHop();
+    Super2.twoHops();
+    return Super.propOneHop + Super3.propThreeHops;
+  }
+}

package/.test-output/no-this-in-static/static-function-using-this.ts

@@ -0,0 +1,11 @@
+class Foo {
+  static prop = 'abc';
+
+  static bar() {
+  }
+
+  static baz() {
+    Foo.bar();
+    return Foo.prop;
+  }
+}

package/.test-output/no-this-in-static/this-in-constructor.ts

@@ -0,0 +1,6 @@
+class A {
+  x: string;
+  constructor(x: string) {
+    this.x = x;
+  }
+}

package/.test-output/no-this-in-static/this-in-instance-method.ts

@@ -0,0 +1,4 @@
+class A {
+  private x = 'foo';
+  foo() { return this.x; }
+}

package/README.md

@@ -19,6 +19,27 @@ Eslint plugin for the CDK repository. Contains rules that need to be applied spe
 
 * `consider-promise-all`: when using `Promise.all()`, attest that there is no unbounded parallelism.
 
+* `no-throw-default-error`: Forbid throwing the default JavaScript error type. Instead a custom typed error should be thrown.
+
+* `no-this-in-static`: Forbid the use of the keywords `this` and `super` in 
+  static methods.
+
+## How to use these rules
+
+Import the plugin and declare rules with the `@cdklabs` prefix:
+
+```js
+module.exports = {
+  plugins: [
+    // ... other plugins
+    '@cdklabs',
+  ],
+  rules: {
+    '@cdklabs/no-throw-default-error': [ 'error' ],
+  }
+}
+```
+
 ## How to add new rules
 
 * Make a new file in `lib/rules`. It should export one function called `create`. The

package/lib/index.d.ts

@@ -9,4 +9,5 @@ export declare const rules: {
     'no-invalid-path': any;
     'no-throw-default-error': any;
     'promiseall-no-unbounded-parallelism': any;
+    'no-this-in-static': any;
 };

package/lib/index.js

@@ -13,5 +13,6 @@ exports.rules = {
     'no-invalid-path': require('./rules/no-invalid-path'),
     'no-throw-default-error': require('./rules/no-throw-default-error'),
     'promiseall-no-unbounded-parallelism': require('./rules/promiseall-no-unbounded-parallelism'),
+    'no-this-in-static': require('./rules/no-this-in-static'),
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBEQUEwRDs7O0FBRTdDLFFBQUEsSUFBSSxHQUFHO0lBQ2xCLElBQUksRUFBRSxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBQyxJQUFJO0lBQ3JDLE9BQU8sRUFBRSxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBQyxPQUFPO0NBQzVDLENBQUM7QUFFVyxRQUFBLEtBQUssR0FBRztJQUNuQixtQkFBbUIsRUFBRSxPQUFPLENBQUMsMkJBQTJCLENBQUM7SUFDekQscUJBQXFCLEVBQUUsT0FBTyxDQUFDLDZCQUE2QixDQUFDO0lBQzdELHNCQUFzQixFQUFFLE9BQU8sQ0FBQyw4QkFBOEIsQ0FBQztJQUMvRCxpQkFBaUIsRUFBRSxPQUFPLENBQUMseUJBQXlCLENBQUM7SUFDckQsd0JBQXdCLEVBQUUsT0FBTyxDQUFDLGdDQUFnQyxDQUFDO0lBQ25FLHFDQUFxQyxFQUFFLE9BQU8sQ0FBQyw2Q0FBNkMsQ0FBQztDQUM5RixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyogZXNsaW50LWRpc2FibGUgQHR5cGVzY3JpcHQtZXNsaW50L25vLXJlcXVpcmUtaW1wb3J0cyAqL1xuXG5leHBvcnQgY29uc3QgbWV0YSA9IHtcbiAgbmFtZTogcmVxdWlyZSgnLi4vcGFja2FnZS5qc29uJykubmFtZSxcbiAgdmVyc2lvbjogcmVxdWlyZSgnLi4vcGFja2FnZS5qc29uJykudmVyc2lvbixcbn07XG5cbmV4cG9ydCBjb25zdCBydWxlcyA9IHtcbiAgJ25vLWNvcmUtY29uc3RydWN0JzogcmVxdWlyZSgnLi9ydWxlcy9uby1jb3JlLWNvbnN0cnVjdCcpLFxuICAnaW52YWxpZC1jZm4taW1wb3J0cyc6IHJlcXVpcmUoJy4vcnVsZXMvaW52YWxpZC1jZm4taW1wb3J0cycpLFxuICAnbm8tbGl0ZXJhbC1wYXJ0aXRpb24nOiByZXF1aXJlKCcuL3J1bGVzL25vLWxpdGVyYWwtcGFydGl0aW9uJyksXG4gICduby1pbnZhbGlkLXBhdGgnOiByZXF1aXJlKCcuL3J1bGVzL25vLWludmFsaWQtcGF0aCcpLFxuICAnbm8tdGhyb3ctZGVmYXVsdC1lcnJvcic6IHJlcXVpcmUoJy4vcnVsZXMvbm8tdGhyb3ctZGVmYXVsdC1lcnJvcicpLFxuICAncHJvbWlzZWFsbC1uby11bmJvdW5kZWQtcGFyYWxsZWxpc20nOiByZXF1aXJlKCcuL3J1bGVzL3Byb21pc2VhbGwtbm8tdW5ib3VuZGVkLXBhcmFsbGVsaXNtJyksXG59O1xuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBEQUEwRDs7O0FBRTdDLFFBQUEsSUFBSSxHQUFHO0lBQ2xCLElBQUksRUFBRSxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBQyxJQUFJO0lBQ3JDLE9BQU8sRUFBRSxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBQyxPQUFPO0NBQzVDLENBQUM7QUFFVyxRQUFBLEtBQUssR0FBRztJQUNuQixtQkFBbUIsRUFBRSxPQUFPLENBQUMsMkJBQTJCLENBQUM7SUFDekQscUJBQXFCLEVBQUUsT0FBTyxDQUFDLDZCQUE2QixDQUFDO0lBQzdELHNCQUFzQixFQUFFLE9BQU8sQ0FBQyw4QkFBOEIsQ0FBQztJQUMvRCxpQkFBaUIsRUFBRSxPQUFPLENBQUMseUJBQXlCLENBQUM7SUFDckQsd0JBQXdCLEVBQUUsT0FBTyxDQUFDLGdDQUFnQyxDQUFDO0lBQ25FLHFDQUFxQyxFQUFFLE9BQU8sQ0FBQyw2Q0FBNkMsQ0FBQztJQUM3RixtQkFBbUIsRUFBRSxPQUFPLENBQUMsMkJBQTJCLENBQUM7Q0FDMUQsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qIGVzbGludC1kaXNhYmxlIEB0eXBlc2NyaXB0LWVzbGludC9uby1yZXF1aXJlLWltcG9ydHMgKi9cblxuZXhwb3J0IGNvbnN0IG1ldGEgPSB7XG4gIG5hbWU6IHJlcXVpcmUoJy4uL3BhY2thZ2UuanNvbicpLm5hbWUsXG4gIHZlcnNpb246IHJlcXVpcmUoJy4uL3BhY2thZ2UuanNvbicpLnZlcnNpb24sXG59O1xuXG5leHBvcnQgY29uc3QgcnVsZXMgPSB7XG4gICduby1jb3JlLWNvbnN0cnVjdCc6IHJlcXVpcmUoJy4vcnVsZXMvbm8tY29yZS1jb25zdHJ1Y3QnKSxcbiAgJ2ludmFsaWQtY2ZuLWltcG9ydHMnOiByZXF1aXJlKCcuL3J1bGVzL2ludmFsaWQtY2ZuLWltcG9ydHMnKSxcbiAgJ25vLWxpdGVyYWwtcGFydGl0aW9uJzogcmVxdWlyZSgnLi9ydWxlcy9uby1saXRlcmFsLXBhcnRpdGlvbicpLFxuICAnbm8taW52YWxpZC1wYXRoJzogcmVxdWlyZSgnLi9ydWxlcy9uby1pbnZhbGlkLXBhdGgnKSxcbiAgJ25vLXRocm93LWRlZmF1bHQtZXJyb3InOiByZXF1aXJlKCcuL3J1bGVzL25vLXRocm93LWRlZmF1bHQtZXJyb3InKSxcbiAgJ3Byb21pc2VhbGwtbm8tdW5ib3VuZGVkLXBhcmFsbGVsaXNtJzogcmVxdWlyZSgnLi9ydWxlcy9wcm9taXNlYWxsLW5vLXVuYm91bmRlZC1wYXJhbGxlbGlzbScpLFxuICAnbm8tdGhpcy1pbi1zdGF0aWMnOiByZXF1aXJlKCcuL3J1bGVzL25vLXRoaXMtaW4tc3RhdGljJyksXG59O1xuIl19

package/lib/rules/no-this-in-static.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Adapted from https://github.com/mysticatea/eslint-plugin/blob/v13.0.0/tests/lib/rules/no-this-in-static.js
+ * @author Toru Nagashima
+ * @copyright 2016 Toru Nagashima. All rights reserved.
+ * MIT License
+ */
+import { Rule } from 'eslint';
+export declare const meta: {
+    fixable: boolean;
+};
+export declare function create(context: Rule.RuleContext): Rule.NodeListener;

package/lib/rules/no-this-in-static.js

@@ -0,0 +1,120 @@
+"use strict";
+/**
+ * Adapted from https://github.com/mysticatea/eslint-plugin/blob/v13.0.0/tests/lib/rules/no-this-in-static.js
+ * @author Toru Nagashima
+ * @copyright 2016 Toru Nagashima. All rights reserved.
+ * MIT License
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.meta = void 0;
+exports.create = create;
+exports.meta = {
+    fixable: true,
+};
+function create(context) {
+    const sourceCode = context.sourceCode;
+    const staticFunctionStack = [];
+    const classDeclarations = new Map();
+    function isStaticMethod(node) {
+        return (node.type === 'FunctionExpression' &&
+            node.parent.type === 'MethodDefinition' &&
+            node.parent.static === true);
+    }
+    function enterFunction(node) {
+        staticFunctionStack.push(isStaticMethod(node));
+    }
+    function exitFunction() {
+        staticFunctionStack.pop();
+    }
+    function reportIfStatic(node) {
+        var _a;
+        const currentMethodIsStatic = staticFunctionStack.length > 0 && staticFunctionStack[staticFunctionStack.length - 1];
+        if (currentMethodIsStatic) {
+            context.report({
+                node,
+                loc: (_a = node.loc) !== null && _a !== void 0 ? _a : { line: 0, column: 0 },
+                message: "'{{type}}' keyword found in a static method. Replace it with the class name.",
+                data: { type: sourceCode.getText(node) },
+                fix(fixer) {
+                    if (node.type === 'Super') {
+                        const hierarchy = superClasses(findClassDeclaration(node));
+                        const memberName = findMemberName(node);
+                        if (memberName == null) {
+                            return null;
+                        }
+                        const superDecl = hierarchy.find(hasStaticMemberCalled(memberName));
+                        return superDecl ? fixer.replaceText(node, superDecl.id.name) : null;
+                    }
+                    if (node.type === 'ThisExpression') {
+                        const decl = findClassDeclaration(node);
+                        return decl ? fixer.replaceText(node, decl.id.name) : null;
+                    }
+                    return null;
+                },
+            });
+        }
+    }
+    function superClasses(node) {
+        var _a;
+        if (node == null) {
+            return [];
+        }
+        const result = [];
+        let superClass = node.superClass;
+        while (superClass != null) {
+            if (superClass.type === 'Identifier') {
+                const className = superClass.name;
+                const decl = classDeclarations.get(className);
+                result.push(decl);
+                superClass = (_a = classDeclarations.get(className)) === null || _a === void 0 ? void 0 : _a.superClass;
+            }
+        }
+        return result;
+    }
+    function enterClass(node) {
+        classDeclarations.set(node.id.name, node);
+    }
+    function findClassDeclaration(node) {
+        let parent = node.parent;
+        while (parent != null) {
+            if (parent.type === 'ClassDeclaration') {
+                return parent;
+            }
+            parent = parent.parent;
+        }
+        return null;
+    }
+    function findMemberName(node) {
+        let parent = node.parent;
+        while (parent != null) {
+            if (parent.type == 'MemberExpression'
+                && parent.property.type === 'Identifier') {
+                return parent.property.name;
+            }
+            if (parent.type === 'CallExpression'
+                && parent.callee.type === 'MemberExpression'
+                && parent.callee.property.type === 'Identifier') {
+                return parent.callee.property.name;
+            }
+            parent = parent.parent;
+        }
+        return null;
+    }
+    const hasStaticMemberCalled = (name) => (decl) => {
+        return decl.body.body.some((node) => {
+            return (node.type === 'MethodDefinition' || node.type === 'PropertyDefinition')
+                && node.static && node.key.type === 'Identifier'
+                && node.key.name === name;
+        });
+    };
+    return {
+        'FunctionDeclaration': enterFunction,
+        'FunctionExpression': enterFunction,
+        'FunctionDeclaration:exit': exitFunction,
+        'FunctionExpression:exit': exitFunction,
+        'ThisExpression': reportIfStatic,
+        'Super': reportIfStatic,
+        'ClassDeclaration': enterClass,
+    };
+}
+//# 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"]}

package/package.json

@@ -46,7 +46,7 @@
     "commit-and-tag-version": "^12",
     "constructs": "^10.0.0",
     "eslint": "^8",
-    "eslint-import-resolver-typescript": "^3.6.3",
+    "eslint-import-resolver-typescript": "^3.7.0",
     "eslint-plugin-import": "^2.31.0",
     "jest": "^29.7.0",
     "jest-junit": "^15",
@@ -70,7 +70,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.1.0",
+  "version": "1.2.0",
   "jest": {
     "coverageProvider": "v8",
     "testMatch": [