eslint-cdk-plugin 2.0.0 → 2.1.0

package/dist/index.cjs

@@ -26,7 +26,7 @@ function _interopNamespaceDefault(e) {
 var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 
 var name = "eslint-cdk-plugin";
-var version = "1.1.1";
+var version = "2.0.1";
 
 const isConstructOrStackType = (type, ignoredClasses = ["App", "Stage"]) => {
   if (ignoredClasses.includes(type.symbol?.name ?? "")) return false;
@@ -410,8 +410,11 @@ const noParentNameConstructIdMatch = utils.ESLintUtils.RuleCreator.withoutDocs(
     },
     defaultOptions: [],
     create(context) {
+      const parserServices = utils.ESLintUtils.getParserServices(context);
       return {
         ClassBody(node) {
+          const type = parserServices.getTypeAtLocation(node);
+          if (!isConstructOrStackType(type)) return;
           const parent = node.parent;
           if (parent?.type !== utils.AST_NODE_TYPES.ClassDeclaration) return;
           const parentClassName = parent.id?.name;
@@ -424,7 +427,8 @@ const noParentNameConstructIdMatch = utils.ESLintUtils.RuleCreator.withoutDocs(
               node,
               expression: body.value,
               parentClassName,
-              context
+              context,
+              parserServices
             });
           }
         }
@@ -436,7 +440,8 @@ const validateConstructorBody = ({
   node,
   expression,
   parentClassName,
-  context
+  context,
+  parserServices
 }) => {
   for (const statement of expression.body.body) {
     switch (statement.type) {
@@ -447,7 +452,8 @@ const validateConstructorBody = ({
           node,
           context,
           expression: newExpression,
-          parentClassName
+          parentClassName,
+          parserServices
         });
         break;
       }
@@ -457,7 +463,8 @@ const validateConstructorBody = ({
           node,
           statement,
           parentClassName,
-          context
+          context,
+          parserServices
         });
         break;
       }
@@ -466,7 +473,8 @@ const validateConstructorBody = ({
           node,
           context,
           parentClassName,
-          statement: statement.consequent
+          statement: statement.consequent,
+          parserServices
         });
         break;
       }
@@ -477,7 +485,8 @@ const validateConstructorBody = ({
               node,
               context,
               parentClassName,
-              statement: statement2
+              statement: statement2,
+              parserServices
             });
           }
         }
@@ -490,7 +499,8 @@ const traverseStatements = ({
   node,
   statement,
   parentClassName,
-  context
+  context,
+  parserServices
 }) => {
   switch (statement.type) {
     case utils.AST_NODE_TYPES.BlockStatement: {
@@ -499,7 +509,8 @@ const traverseStatements = ({
           node,
           statement: body,
           parentClassName,
-          context
+          context,
+          parserServices
         });
       }
       break;
@@ -511,7 +522,8 @@ const traverseStatements = ({
         node,
         statement,
         parentClassName,
-        context
+        context,
+        parserServices
       });
       break;
     }
@@ -522,7 +534,8 @@ const traverseStatements = ({
         node,
         context,
         expression: newExpression,
-        parentClassName
+        parentClassName,
+        parserServices
       });
       break;
     }
@@ -532,7 +545,8 @@ const validateStatement = ({
   node,
   statement,
   parentClassName,
-  context
+  context,
+  parserServices
 }) => {
   switch (statement.type) {
     case utils.AST_NODE_TYPES.VariableDeclaration: {
@@ -542,7 +556,8 @@ const validateStatement = ({
         node,
         context,
         expression: newExpression,
-        parentClassName
+        parentClassName,
+        parserServices
       });
       break;
     }
@@ -553,7 +568,8 @@ const validateStatement = ({
         node,
         context,
         expression: newExpression,
-        parentClassName
+        parentClassName,
+        parserServices
       });
       break;
     }
@@ -562,7 +578,8 @@ const validateStatement = ({
         node,
         statement,
         parentClassName,
-        context
+        context,
+        parserServices
       });
       break;
     }
@@ -571,7 +588,8 @@ const validateStatement = ({
         node,
         statement,
         parentClassName,
-        context
+        context,
+        parserServices
       });
       break;
     }
@@ -581,20 +599,23 @@ const validateIfStatement = ({
   node,
   statement,
   parentClassName,
-  context
+  context,
+  parserServices
 }) => {
   traverseStatements({
     node,
     context,
     parentClassName,
-    statement: statement.consequent
+    statement: statement.consequent,
+    parserServices
   });
 };
 const validateSwitchStatement = ({
   node,
   statement,
   parentClassName,
-  context
+  context,
+  parserServices
 }) => {
   for (const caseStatement of statement.cases) {
     for (const _consequent of caseStatement.consequent) {
@@ -602,7 +623,8 @@ const validateSwitchStatement = ({
         node,
         context,
         parentClassName,
-        statement: _consequent
+        statement: _consequent,
+        parserServices
       });
     }
   }
@@ -611,8 +633,10 @@ const validateConstructId$2 = ({
   node,
   context,
   expression,
-  parentClassName
+  parentClassName,
+  parserServices
 }) => {
+  const type = parserServices.getTypeAtLocation(expression);
   if (expression.arguments.length < 2) return;
   const secondArg = expression.arguments[1];
   if (secondArg.type !== utils.AST_NODE_TYPES.Literal || typeof secondArg.value !== "string") {
@@ -620,15 +644,17 @@ const validateConstructId$2 = ({
   }
   const formattedConstructId = toPascalCase(secondArg.value);
   const formattedParentClassName = toPascalCase(parentClassName);
-  if (formattedParentClassName !== formattedConstructId) return;
-  context.report({
-    node,
-    messageId: "noParentNameConstructIdMatch",
-    data: {
-      constructId: secondArg.value,
-      parentConstructName: parentClassName
-    }
-  });
+  if (!isConstructType(type)) return;
+  if (formattedConstructId.includes(formattedParentClassName)) {
+    context.report({
+      node,
+      messageId: "noParentNameConstructIdMatch",
+      data: {
+        constructId: secondArg.value,
+        parentConstructName: parentClassName
+      }
+    });
+  }
 };
 
 const noPublicClassFields = utils.ESLintUtils.RuleCreator.withoutDocs({
@@ -1046,16 +1072,16 @@ const requirePropsDefaultDoc = utils.ESLintUtils.RuleCreator.withoutDocs({
 });
 
 const rules = {
-  "construct-constructor-property": constructConstructorProperty,
   "no-class-in-interface": noClassInInterface,
   "no-construct-stack-suffix": noConstructStackSuffix,
   "no-parent-name-construct-id-match": noParentNameConstructIdMatch,
   "no-public-class-fields": noPublicClassFields,
   "pascal-case-construct-id": pascalCaseConstructId,
-  "no-mutable-public-fields": noMutablePublicFields,
-  "no-mutable-props-interface": noMutablePropsInterface,
   "require-passing-this": requirePassingThis,
   "no-variable-construct-id": noVariableConstructId,
+  "no-mutable-public-fields": noMutablePublicFields,
+  "no-mutable-props-interface": noMutablePropsInterface,
+  "construct-constructor-property": constructConstructorProperty,
   "require-jsdoc": requireJSDoc,
   "require-props-default-doc": requirePropsDefaultDoc,
   "props-name-convention": propsNameConvention,
@@ -1068,10 +1094,9 @@ const cdkPlugin = {
 const createFlatConfig = (rules2) => {
   return {
     languageOptions: {
+      parser: tsParser,
       parserOptions: {
-        projectService: true,
-        parser: tsParser,
-        sourceType: "module"
+        projectService: true
       }
     },
     plugins: {
@@ -1081,7 +1106,6 @@ const createFlatConfig = (rules2) => {
   };
 };
 const recommended = createFlatConfig({
-  "cdk/construct-constructor-property": "error",
   "cdk/no-class-in-interface": "error",
   "cdk/no-construct-stack-suffix": "error",
   "cdk/no-parent-name-construct-id-match": "error",
@@ -1090,10 +1114,10 @@ const recommended = createFlatConfig({
   "cdk/require-passing-this": ["error", { allowNonThisAndDisallowScope: true }],
   "cdk/no-variable-construct-id": "error",
   "cdk/no-mutable-public-fields": "warn",
-  "cdk/no-mutable-props-interface": "warn"
+  "cdk/no-mutable-props-interface": "warn",
+  "cdk/construct-constructor-property": "error"
 });
 const strict = createFlatConfig({
-  "cdk/construct-constructor-property": "error",
   "cdk/no-class-in-interface": "error",
   "cdk/no-construct-stack-suffix": "error",
   "cdk/no-parent-name-construct-id-match": "error",
@@ -1103,10 +1127,11 @@ const strict = createFlatConfig({
   "cdk/no-variable-construct-id": "error",
   "cdk/no-mutable-public-fields": "error",
   "cdk/no-mutable-props-interface": "error",
-  "cdk/no-import-private": "error",
+  "cdk/construct-constructor-property": "error",
+  "cdk/require-jsdoc": "error",
   "cdk/require-props-default-doc": "error",
   "cdk/props-name-convention": "error",
-  "cdk/require-jsdoc": "error"
+  "cdk/no-import-private": "error"
 });
 const configs = {
   recommended,

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 import tsParser from "@typescript-eslint/parser";
 declare const rules: {
-    "construct-constructor-property": import("@typescript-eslint/utils/ts-eslint").RuleModule<"invalidConstructorProperty", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
     "no-class-in-interface": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noClassInInterfaceProps", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
     "no-construct-stack-suffix": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noConstructStackSuffix", [{
         disallowedSuffixes: ("Construct" | "Stack")[];
@@ -8,12 +7,13 @@ declare const rules: {
     "no-parent-name-construct-id-match": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noParentNameConstructIdMatch", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
     "no-public-class-fields": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noPublicClassFields", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
     "pascal-case-construct-id": import("@typescript-eslint/utils/ts-eslint").RuleModule<"pascalCaseConstructId", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
-    "no-mutable-public-fields": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noMutablePublicFields", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
-    "no-mutable-props-interface": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noMutablePropsInterface", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
     "require-passing-this": import("@typescript-eslint/utils/ts-eslint").RuleModule<"requirePassingThis", [{
         allowNonThisAndDisallowScope?: boolean;
     }], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
     "no-variable-construct-id": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noVariableConstructId", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
+    "no-mutable-public-fields": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noMutablePublicFields", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
+    "no-mutable-props-interface": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noMutablePropsInterface", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
+    "construct-constructor-property": import("@typescript-eslint/utils/ts-eslint").RuleModule<"invalidConstructorProperty", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
     "require-jsdoc": import("@typescript-eslint/utils/ts-eslint").RuleModule<"missingJSDoc", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
     "require-props-default-doc": import("@typescript-eslint/utils/ts-eslint").RuleModule<"missingDefaultDoc", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
     "props-name-convention": import("@typescript-eslint/utils/ts-eslint").RuleModule<"invalidPropsName", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
@@ -22,10 +22,9 @@ declare const rules: {
 declare const configs: {
     recommended: {
         languageOptions: {
+            parser: typeof tsParser;
             parserOptions: {
                 projectService: boolean;
-                parser: typeof tsParser;
-                sourceType: string;
             };
         };
         plugins: {
@@ -35,7 +34,6 @@ declare const configs: {
                     version: string;
                 };
                 rules: {
-                    "construct-constructor-property": import("@typescript-eslint/utils/ts-eslint").RuleModule<"invalidConstructorProperty", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
                     "no-class-in-interface": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noClassInInterfaceProps", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
                     "no-construct-stack-suffix": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noConstructStackSuffix", [{
                         disallowedSuffixes: ("Construct" | "Stack")[];
@@ -43,12 +41,13 @@ declare const configs: {
                     "no-parent-name-construct-id-match": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noParentNameConstructIdMatch", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
                     "no-public-class-fields": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noPublicClassFields", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
                     "pascal-case-construct-id": import("@typescript-eslint/utils/ts-eslint").RuleModule<"pascalCaseConstructId", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
-                    "no-mutable-public-fields": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noMutablePublicFields", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
-                    "no-mutable-props-interface": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noMutablePropsInterface", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
                     "require-passing-this": import("@typescript-eslint/utils/ts-eslint").RuleModule<"requirePassingThis", [{
                         allowNonThisAndDisallowScope?: boolean;
                     }], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
                     "no-variable-construct-id": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noVariableConstructId", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
+                    "no-mutable-public-fields": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noMutablePublicFields", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
+                    "no-mutable-props-interface": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noMutablePropsInterface", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
+                    "construct-constructor-property": import("@typescript-eslint/utils/ts-eslint").RuleModule<"invalidConstructorProperty", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
                     "require-jsdoc": import("@typescript-eslint/utils/ts-eslint").RuleModule<"missingJSDoc", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
                     "require-props-default-doc": import("@typescript-eslint/utils/ts-eslint").RuleModule<"missingDefaultDoc", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
                     "props-name-convention": import("@typescript-eslint/utils/ts-eslint").RuleModule<"invalidPropsName", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
@@ -60,10 +59,9 @@ declare const configs: {
     };
     strict: {
         languageOptions: {
+            parser: typeof tsParser;
             parserOptions: {
                 projectService: boolean;
-                parser: typeof tsParser;
-                sourceType: string;
             };
         };
         plugins: {
@@ -73,7 +71,6 @@ declare const configs: {
                     version: string;
                 };
                 rules: {
-                    "construct-constructor-property": import("@typescript-eslint/utils/ts-eslint").RuleModule<"invalidConstructorProperty", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
                     "no-class-in-interface": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noClassInInterfaceProps", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
                     "no-construct-stack-suffix": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noConstructStackSuffix", [{
                         disallowedSuffixes: ("Construct" | "Stack")[];
@@ -81,12 +78,13 @@ declare const configs: {
                     "no-parent-name-construct-id-match": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noParentNameConstructIdMatch", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
                     "no-public-class-fields": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noPublicClassFields", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
                     "pascal-case-construct-id": import("@typescript-eslint/utils/ts-eslint").RuleModule<"pascalCaseConstructId", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
-                    "no-mutable-public-fields": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noMutablePublicFields", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
-                    "no-mutable-props-interface": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noMutablePropsInterface", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
                     "require-passing-this": import("@typescript-eslint/utils/ts-eslint").RuleModule<"requirePassingThis", [{
                         allowNonThisAndDisallowScope?: boolean;
                     }], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
                     "no-variable-construct-id": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noVariableConstructId", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
+                    "no-mutable-public-fields": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noMutablePublicFields", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
+                    "no-mutable-props-interface": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noMutablePropsInterface", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
+                    "construct-constructor-property": import("@typescript-eslint/utils/ts-eslint").RuleModule<"invalidConstructorProperty", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
                     "require-jsdoc": import("@typescript-eslint/utils/ts-eslint").RuleModule<"missingJSDoc", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
                     "require-props-default-doc": import("@typescript-eslint/utils/ts-eslint").RuleModule<"missingDefaultDoc", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
                     "props-name-convention": import("@typescript-eslint/utils/ts-eslint").RuleModule<"invalidPropsName", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AAmBjD,QAAA,MAAM,KAAK;;;;;;;;;;;;;;;;;;;CAeV,CAAC;AAqDF,QAAA,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAGZ,CAAC;AAEF,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AAE1B,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,OAAO,EAAE,OAAO,OAAO,CAAC;CACzB;AAED,QAAA,MAAM,eAAe,EAAE,eAGtB,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AAmBjD,QAAA,MAAM,KAAK;;;;;;;;;;;;;;;;;;;CAeV,CAAC;AAoDF,QAAA,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAGZ,CAAC;AAEF,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AAE1B,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,OAAO,EAAE,OAAO,OAAO,CAAC;CACzB;AAED,QAAA,MAAM,eAAe,EAAE,eAGtB,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { ESLintUtils, AST_NODE_TYPES, AST_TOKEN_TYPES } from '@typescript-eslint
 import * as path from 'path';
 
 var name = "eslint-cdk-plugin";
-var version = "1.1.1";
+var version = "2.0.1";
 
 const isConstructOrStackType = (type, ignoredClasses = ["App", "Stage"]) => {
   if (ignoredClasses.includes(type.symbol?.name ?? "")) return false;
@@ -387,8 +387,11 @@ const noParentNameConstructIdMatch = ESLintUtils.RuleCreator.withoutDocs(
     },
     defaultOptions: [],
     create(context) {
+      const parserServices = ESLintUtils.getParserServices(context);
       return {
         ClassBody(node) {
+          const type = parserServices.getTypeAtLocation(node);
+          if (!isConstructOrStackType(type)) return;
           const parent = node.parent;
           if (parent?.type !== AST_NODE_TYPES.ClassDeclaration) return;
           const parentClassName = parent.id?.name;
@@ -401,7 +404,8 @@ const noParentNameConstructIdMatch = ESLintUtils.RuleCreator.withoutDocs(
               node,
               expression: body.value,
               parentClassName,
-              context
+              context,
+              parserServices
             });
           }
         }
@@ -413,7 +417,8 @@ const validateConstructorBody = ({
   node,
   expression,
   parentClassName,
-  context
+  context,
+  parserServices
 }) => {
   for (const statement of expression.body.body) {
     switch (statement.type) {
@@ -424,7 +429,8 @@ const validateConstructorBody = ({
           node,
           context,
           expression: newExpression,
-          parentClassName
+          parentClassName,
+          parserServices
         });
         break;
       }
@@ -434,7 +440,8 @@ const validateConstructorBody = ({
           node,
           statement,
           parentClassName,
-          context
+          context,
+          parserServices
         });
         break;
       }
@@ -443,7 +450,8 @@ const validateConstructorBody = ({
           node,
           context,
           parentClassName,
-          statement: statement.consequent
+          statement: statement.consequent,
+          parserServices
         });
         break;
       }
@@ -454,7 +462,8 @@ const validateConstructorBody = ({
               node,
               context,
               parentClassName,
-              statement: statement2
+              statement: statement2,
+              parserServices
             });
           }
         }
@@ -467,7 +476,8 @@ const traverseStatements = ({
   node,
   statement,
   parentClassName,
-  context
+  context,
+  parserServices
 }) => {
   switch (statement.type) {
     case AST_NODE_TYPES.BlockStatement: {
@@ -476,7 +486,8 @@ const traverseStatements = ({
           node,
           statement: body,
           parentClassName,
-          context
+          context,
+          parserServices
         });
       }
       break;
@@ -488,7 +499,8 @@ const traverseStatements = ({
         node,
         statement,
         parentClassName,
-        context
+        context,
+        parserServices
       });
       break;
     }
@@ -499,7 +511,8 @@ const traverseStatements = ({
         node,
         context,
         expression: newExpression,
-        parentClassName
+        parentClassName,
+        parserServices
       });
       break;
     }
@@ -509,7 +522,8 @@ const validateStatement = ({
   node,
   statement,
   parentClassName,
-  context
+  context,
+  parserServices
 }) => {
   switch (statement.type) {
     case AST_NODE_TYPES.VariableDeclaration: {
@@ -519,7 +533,8 @@ const validateStatement = ({
         node,
         context,
         expression: newExpression,
-        parentClassName
+        parentClassName,
+        parserServices
       });
       break;
     }
@@ -530,7 +545,8 @@ const validateStatement = ({
         node,
         context,
         expression: newExpression,
-        parentClassName
+        parentClassName,
+        parserServices
       });
       break;
     }
@@ -539,7 +555,8 @@ const validateStatement = ({
         node,
         statement,
         parentClassName,
-        context
+        context,
+        parserServices
       });
       break;
     }
@@ -548,7 +565,8 @@ const validateStatement = ({
         node,
         statement,
         parentClassName,
-        context
+        context,
+        parserServices
       });
       break;
     }
@@ -558,20 +576,23 @@ const validateIfStatement = ({
   node,
   statement,
   parentClassName,
-  context
+  context,
+  parserServices
 }) => {
   traverseStatements({
     node,
     context,
     parentClassName,
-    statement: statement.consequent
+    statement: statement.consequent,
+    parserServices
   });
 };
 const validateSwitchStatement = ({
   node,
   statement,
   parentClassName,
-  context
+  context,
+  parserServices
 }) => {
   for (const caseStatement of statement.cases) {
     for (const _consequent of caseStatement.consequent) {
@@ -579,7 +600,8 @@ const validateSwitchStatement = ({
         node,
         context,
         parentClassName,
-        statement: _consequent
+        statement: _consequent,
+        parserServices
       });
     }
   }
@@ -588,8 +610,10 @@ const validateConstructId$2 = ({
   node,
   context,
   expression,
-  parentClassName
+  parentClassName,
+  parserServices
 }) => {
+  const type = parserServices.getTypeAtLocation(expression);
   if (expression.arguments.length < 2) return;
   const secondArg = expression.arguments[1];
   if (secondArg.type !== AST_NODE_TYPES.Literal || typeof secondArg.value !== "string") {
@@ -597,15 +621,17 @@ const validateConstructId$2 = ({
   }
   const formattedConstructId = toPascalCase(secondArg.value);
   const formattedParentClassName = toPascalCase(parentClassName);
-  if (formattedParentClassName !== formattedConstructId) return;
-  context.report({
-    node,
-    messageId: "noParentNameConstructIdMatch",
-    data: {
-      constructId: secondArg.value,
-      parentConstructName: parentClassName
-    }
-  });
+  if (!isConstructType(type)) return;
+  if (formattedConstructId.includes(formattedParentClassName)) {
+    context.report({
+      node,
+      messageId: "noParentNameConstructIdMatch",
+      data: {
+        constructId: secondArg.value,
+        parentConstructName: parentClassName
+      }
+    });
+  }
 };
 
 const noPublicClassFields = ESLintUtils.RuleCreator.withoutDocs({
@@ -1023,16 +1049,16 @@ const requirePropsDefaultDoc = ESLintUtils.RuleCreator.withoutDocs({
 });
 
 const rules = {
-  "construct-constructor-property": constructConstructorProperty,
   "no-class-in-interface": noClassInInterface,
   "no-construct-stack-suffix": noConstructStackSuffix,
   "no-parent-name-construct-id-match": noParentNameConstructIdMatch,
   "no-public-class-fields": noPublicClassFields,
   "pascal-case-construct-id": pascalCaseConstructId,
-  "no-mutable-public-fields": noMutablePublicFields,
-  "no-mutable-props-interface": noMutablePropsInterface,
   "require-passing-this": requirePassingThis,
   "no-variable-construct-id": noVariableConstructId,
+  "no-mutable-public-fields": noMutablePublicFields,
+  "no-mutable-props-interface": noMutablePropsInterface,
+  "construct-constructor-property": constructConstructorProperty,
   "require-jsdoc": requireJSDoc,
   "require-props-default-doc": requirePropsDefaultDoc,
   "props-name-convention": propsNameConvention,
@@ -1045,10 +1071,9 @@ const cdkPlugin = {
 const createFlatConfig = (rules2) => {
   return {
     languageOptions: {
+      parser: tsParser,
       parserOptions: {
-        projectService: true,
-        parser: tsParser,
-        sourceType: "module"
+        projectService: true
       }
     },
     plugins: {
@@ -1058,7 +1083,6 @@ const createFlatConfig = (rules2) => {
   };
 };
 const recommended = createFlatConfig({
-  "cdk/construct-constructor-property": "error",
   "cdk/no-class-in-interface": "error",
   "cdk/no-construct-stack-suffix": "error",
   "cdk/no-parent-name-construct-id-match": "error",
@@ -1067,10 +1091,10 @@ const recommended = createFlatConfig({
   "cdk/require-passing-this": ["error", { allowNonThisAndDisallowScope: true }],
   "cdk/no-variable-construct-id": "error",
   "cdk/no-mutable-public-fields": "warn",
-  "cdk/no-mutable-props-interface": "warn"
+  "cdk/no-mutable-props-interface": "warn",
+  "cdk/construct-constructor-property": "error"
 });
 const strict = createFlatConfig({
-  "cdk/construct-constructor-property": "error",
   "cdk/no-class-in-interface": "error",
   "cdk/no-construct-stack-suffix": "error",
   "cdk/no-parent-name-construct-id-match": "error",
@@ -1080,10 +1104,11 @@ const strict = createFlatConfig({
   "cdk/no-variable-construct-id": "error",
   "cdk/no-mutable-public-fields": "error",
   "cdk/no-mutable-props-interface": "error",
-  "cdk/no-import-private": "error",
+  "cdk/construct-constructor-property": "error",
+  "cdk/require-jsdoc": "error",
   "cdk/require-props-default-doc": "error",
   "cdk/props-name-convention": "error",
-  "cdk/require-jsdoc": "error"
+  "cdk/no-import-private": "error"
 });
 const configs = {
   recommended,

package/package.json

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

package/src/index.ts

@@ -42,10 +42,9 @@ const cdkPlugin = {
 const createFlatConfig = (rules: Record<string, unknown>) => {
   return {
     languageOptions: {
+      parser: tsParser,
       parserOptions: {
         projectService: true,
-        parser: tsParser,
-        sourceType: "module",
       },
     },
     plugins: {

package/src/rules/no-parent-name-construct-id-match.ts

@@ -1,11 +1,13 @@
 import {
   AST_NODE_TYPES,
   ESLintUtils,
+  ParserServicesWithTypeInformation,
   TSESLint,
   TSESTree,
 } from "@typescript-eslint/utils";
 
 import { toPascalCase } from "../utils/convertString";
+import { isConstructOrStackType, isConstructType } from "../utils/typeCheck";
 
 type Context = TSESLint.RuleContext<"noParentNameConstructIdMatch", []>;
 
@@ -14,6 +16,7 @@ type ValidateStatementArgs<T extends TSESTree.Statement> = {
   statement: T;
   parentClassName: string;
   context: Context;
+  parserServices: ParserServicesWithTypeInformation;
 };
 
 type ValidateExpressionArgs<T extends TSESTree.Expression> = {
@@ -21,6 +24,7 @@ type ValidateExpressionArgs<T extends TSESTree.Expression> = {
   expression: T;
   parentClassName: string;
   context: Context;
+  parserServices: ParserServicesWithTypeInformation;
 };
 
 /**
@@ -45,8 +49,13 @@ export const noParentNameConstructIdMatch = ESLintUtils.RuleCreator.withoutDocs(
     },
     defaultOptions: [],
     create(context) {
+      const parserServices = ESLintUtils.getParserServices(context);
       return {
         ClassBody(node) {
+          const type = parserServices.getTypeAtLocation(node);
+
+          if (!isConstructOrStackType(type)) return;
+
           const parent = node.parent;
           if (parent?.type !== AST_NODE_TYPES.ClassDeclaration) return;
 
@@ -67,6 +76,7 @@ export const noParentNameConstructIdMatch = ESLintUtils.RuleCreator.withoutDocs(
               expression: body.value,
               parentClassName,
               context,
+              parserServices,
             });
           }
         },
@@ -84,6 +94,7 @@ const validateConstructorBody = ({
   expression,
   parentClassName,
   context,
+  parserServices,
 }: ValidateExpressionArgs<TSESTree.FunctionExpression>): void => {
   for (const statement of expression.body.body) {
     switch (statement.type) {
@@ -95,6 +106,7 @@ const validateConstructorBody = ({
           context,
           expression: newExpression,
           parentClassName,
+          parserServices,
         });
         break;
       }
@@ -105,6 +117,7 @@ const validateConstructorBody = ({
           statement,
           parentClassName,
           context,
+          parserServices,
         });
         break;
       }
@@ -114,6 +127,7 @@ const validateConstructorBody = ({
           context,
           parentClassName,
           statement: statement.consequent,
+          parserServices,
         });
         break;
       }
@@ -125,6 +139,7 @@ const validateConstructorBody = ({
               context,
               parentClassName,
               statement,
+              parserServices,
             });
           }
         }
@@ -144,6 +159,7 @@ const traverseStatements = ({
   statement,
   parentClassName,
   context,
+  parserServices,
 }: ValidateStatementArgs<TSESTree.Statement>) => {
   switch (statement.type) {
     case AST_NODE_TYPES.BlockStatement: {
@@ -153,6 +169,7 @@ const traverseStatements = ({
           statement: body,
           parentClassName,
           context,
+          parserServices,
         });
       }
       break;
@@ -165,6 +182,7 @@ const traverseStatements = ({
         statement,
         parentClassName,
         context,
+        parserServices,
       });
       break;
     }
@@ -176,6 +194,7 @@ const traverseStatements = ({
         context,
         expression: newExpression,
         parentClassName,
+        parserServices,
       });
       break;
     }
@@ -192,6 +211,7 @@ const validateStatement = ({
   statement,
   parentClassName,
   context,
+  parserServices,
 }: ValidateStatementArgs<TSESTree.Statement>): void => {
   switch (statement.type) {
     case AST_NODE_TYPES.VariableDeclaration: {
@@ -202,6 +222,7 @@ const validateStatement = ({
         context,
         expression: newExpression,
         parentClassName,
+        parserServices,
       });
       break;
     }
@@ -213,6 +234,7 @@ const validateStatement = ({
         context,
         expression: newExpression,
         parentClassName,
+        parserServices,
       });
       break;
     }
@@ -222,6 +244,7 @@ const validateStatement = ({
         statement,
         parentClassName,
         context,
+        parserServices,
       });
       break;
     }
@@ -231,6 +254,7 @@ const validateStatement = ({
         statement,
         parentClassName,
         context,
+        parserServices,
       });
       break;
     }
@@ -246,12 +270,14 @@ const validateIfStatement = ({
   statement,
   parentClassName,
   context,
+  parserServices,
 }: ValidateStatementArgs<TSESTree.IfStatement>): void => {
   traverseStatements({
     node,
     context,
     parentClassName,
     statement: statement.consequent,
+    parserServices,
   });
 };
 
@@ -264,6 +290,7 @@ const validateSwitchStatement = ({
   statement,
   parentClassName,
   context,
+  parserServices,
 }: ValidateStatementArgs<TSESTree.SwitchStatement>): void => {
   for (const caseStatement of statement.cases) {
     for (const _consequent of caseStatement.consequent) {
@@ -272,6 +299,7 @@ const validateSwitchStatement = ({
         context,
         parentClassName,
         statement: _consequent,
+        parserServices,
       });
     }
   }
@@ -285,7 +313,10 @@ const validateConstructId = ({
   context,
   expression,
   parentClassName,
+  parserServices,
 }: ValidateExpressionArgs<TSESTree.NewExpression>): void => {
+  const type = parserServices.getTypeAtLocation(expression);
+
   if (expression.arguments.length < 2) return;
 
   // NOTE: Treat the second argument as ID
@@ -299,14 +330,17 @@ const validateConstructId = ({
 
   const formattedConstructId = toPascalCase(secondArg.value);
   const formattedParentClassName = toPascalCase(parentClassName);
-  if (formattedParentClassName !== formattedConstructId) return;
 
-  context.report({
-    node,
-    messageId: "noParentNameConstructIdMatch",
-    data: {
-      constructId: secondArg.value,
-      parentConstructName: parentClassName,
-    },
-  });
+  if (!isConstructType(type)) return;
+
+  if (formattedConstructId.includes(formattedParentClassName)) {
+    context.report({
+      node,
+      messageId: "noParentNameConstructIdMatch",
+      data: {
+        constructId: secondArg.value,
+        parentConstructName: parentClassName,
+      },
+    });
+  }
 };