eslint-cdk-plugin 1.0.3 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-cdk-plugin",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "eslint plugin for AWS CDK projects",
   "main": "./dist/index.mjs",
   "types": "./dist/index.d.ts",

package/src/rules/no-construct-stack-suffix.ts

@@ -6,6 +6,7 @@ import {
 } from "@typescript-eslint/utils";
 
 import { toPascalCase } from "../utils/convertString";
+import { getConstructorPropertyNames } from "../utils/parseType";
 import { isConstructOrStackType } from "../utils/typeCheck";
 
 type Context = TSESLint.RuleContext<"noConstructStackSuffix", []>;
@@ -38,6 +39,10 @@ export const noConstructStackSuffix = ESLintUtils.RuleCreator.withoutDocs({
         if (!isConstructOrStackType(type) || node.arguments.length < 2) {
           return;
         }
+
+        const constructorPropertyNames = getConstructorPropertyNames(type);
+        if (constructorPropertyNames[1] !== "id") return;
+
         validateConstructId(node, context);
       },
     };

package/src/rules/no-variable-construct-id.ts

@@ -5,6 +5,7 @@ import {
   TSESTree,
 } from "@typescript-eslint/utils";
 
+import { getConstructorPropertyNames } from "../utils/parseType";
 import { isConstructType, isStackType } from "../utils/typeCheck";
 
 type Context = TSESLint.RuleContext<"noVariableConstructId", []>;
@@ -40,6 +41,9 @@ export const noVariableConstructId = ESLintUtils.RuleCreator.withoutDocs({
           return;
         }
 
+        const constructorPropertyNames = getConstructorPropertyNames(type);
+        if (constructorPropertyNames[1] !== "id") return;
+
         validateConstructId(node, context);
       },
     };

package/src/rules/pascal-case-construct-id.ts

@@ -6,6 +6,7 @@ import {
 } from "@typescript-eslint/utils";
 
 import { toPascalCase } from "../utils/convertString";
+import { getConstructorPropertyNames } from "../utils/parseType";
 import { isConstructOrStackType } from "../utils/typeCheck";
 
 const QUOTE_TYPE = {
@@ -45,6 +46,10 @@ export const pascalCaseConstructId = ESLintUtils.RuleCreator.withoutDocs({
         if (!isConstructOrStackType(type) || node.arguments.length < 2) {
           return;
         }
+
+        const constructorPropertyNames = getConstructorPropertyNames(type);
+        if (constructorPropertyNames[1] !== "id") return;
+
         validateConstructId(node, context);
       },
     };

package/src/rules/require-passing-this.ts

@@ -1,5 +1,6 @@
 import { AST_NODE_TYPES, ESLintUtils } from "@typescript-eslint/utils";
 
+import { getConstructorPropertyNames } from "../utils/parseType";
 import { isConstructType, isStackType } from "../utils/typeCheck";
 
 /**
@@ -38,6 +39,9 @@ export const requirePassingThis = ESLintUtils.RuleCreator.withoutDocs({
         const argument = node.arguments[0];
         if (argument.type === AST_NODE_TYPES.ThisExpression) return;
 
+        const constructorPropertyNames = getConstructorPropertyNames(type);
+        if (constructorPropertyNames[0] !== "scope") return;
+
         context.report({
           node,
           messageId: "requirePassingThis",

package/src/utils/parseType.ts

@@ -0,0 +1,20 @@
+import { isClassDeclaration, isConstructorDeclaration, Type } from "typescript";
+
+/**
+ * Parses type to get the property names of the class constructor.
+ * @returns The property names of the class constructor.
+ */
+export const getConstructorPropertyNames = (type: Type): string[] => {
+  const declarations = type.symbol?.declarations;
+  if (!declarations?.length) return [];
+
+  const classDeclaration = declarations[0];
+  if (!isClassDeclaration(classDeclaration)) return [];
+
+  const constructor = classDeclaration.members.find((member) =>
+    isConstructorDeclaration(member)
+  );
+  if (!constructor?.parameters.length) return [];
+
+  return constructor.parameters.map((param) => param.name.getText());
+};