eslint-cdk-plugin 2.0.1 → 2.2.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 = "2.0.0";
+var version = "2.2.0";
 
 const isConstructOrStackType = (type, ignoredClasses = ["App", "Stage"]) => {
   if (ignoredClasses.includes(type.symbol?.name ?? "")) return false;
@@ -406,12 +406,33 @@ const noParentNameConstructIdMatch = utils.ESLintUtils.RuleCreator.withoutDocs(
       messages: {
         noParentNameConstructIdMatch: "Construct ID '{{ constructId }}' should not match parent construct name '{{ parentConstructName }}'. Use a more specific identifier."
       },
-      schema: []
+      schema: [
+        {
+          type: "object",
+          properties: {
+            disallowContainingParentName: {
+              type: "boolean",
+              default: false
+            }
+          },
+          additionalProperties: false
+        }
+      ]
     },
-    defaultOptions: [],
+    defaultOptions: [
+      {
+        disallowContainingParentName: false
+      }
+    ],
     create(context) {
+      const option = context.options[0] || {
+        disallowContainingParentName: false
+      };
+      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 +445,9 @@ const noParentNameConstructIdMatch = utils.ESLintUtils.RuleCreator.withoutDocs(
               node,
               expression: body.value,
               parentClassName,
-              context
+              context,
+              parserServices,
+              option
             });
           }
         }
@@ -436,7 +459,9 @@ const validateConstructorBody = ({
   node,
   expression,
   parentClassName,
-  context
+  context,
+  parserServices,
+  option
 }) => {
   for (const statement of expression.body.body) {
     switch (statement.type) {
@@ -447,7 +472,9 @@ const validateConstructorBody = ({
           node,
           context,
           expression: newExpression,
-          parentClassName
+          parentClassName,
+          parserServices,
+          option
         });
         break;
       }
@@ -457,7 +484,9 @@ const validateConstructorBody = ({
           node,
           statement,
           parentClassName,
-          context
+          context,
+          parserServices,
+          option
         });
         break;
       }
@@ -466,7 +495,9 @@ const validateConstructorBody = ({
           node,
           context,
           parentClassName,
-          statement: statement.consequent
+          statement: statement.consequent,
+          parserServices,
+          option
         });
         break;
       }
@@ -477,7 +508,9 @@ const validateConstructorBody = ({
               node,
               context,
               parentClassName,
-              statement: statement2
+              statement: statement2,
+              parserServices,
+              option
             });
           }
         }
@@ -490,7 +523,9 @@ const traverseStatements = ({
   node,
   statement,
   parentClassName,
-  context
+  context,
+  parserServices,
+  option
 }) => {
   switch (statement.type) {
     case utils.AST_NODE_TYPES.BlockStatement: {
@@ -499,7 +534,9 @@ const traverseStatements = ({
           node,
           statement: body,
           parentClassName,
-          context
+          context,
+          parserServices,
+          option
         });
       }
       break;
@@ -511,7 +548,9 @@ const traverseStatements = ({
         node,
         statement,
         parentClassName,
-        context
+        context,
+        parserServices,
+        option
       });
       break;
     }
@@ -522,7 +561,9 @@ const traverseStatements = ({
         node,
         context,
         expression: newExpression,
-        parentClassName
+        parentClassName,
+        parserServices,
+        option
       });
       break;
     }
@@ -532,7 +573,9 @@ const validateStatement = ({
   node,
   statement,
   parentClassName,
-  context
+  context,
+  parserServices,
+  option
 }) => {
   switch (statement.type) {
     case utils.AST_NODE_TYPES.VariableDeclaration: {
@@ -542,7 +585,9 @@ const validateStatement = ({
         node,
         context,
         expression: newExpression,
-        parentClassName
+        parentClassName,
+        parserServices,
+        option
       });
       break;
     }
@@ -553,7 +598,9 @@ const validateStatement = ({
         node,
         context,
         expression: newExpression,
-        parentClassName
+        parentClassName,
+        parserServices,
+        option
       });
       break;
     }
@@ -562,7 +609,9 @@ const validateStatement = ({
         node,
         statement,
         parentClassName,
-        context
+        context,
+        parserServices,
+        option
       });
       break;
     }
@@ -571,7 +620,9 @@ const validateStatement = ({
         node,
         statement,
         parentClassName,
-        context
+        context,
+        parserServices,
+        option
       });
       break;
     }
@@ -581,20 +632,26 @@ const validateIfStatement = ({
   node,
   statement,
   parentClassName,
-  context
+  context,
+  parserServices,
+  option
 }) => {
   traverseStatements({
     node,
     context,
     parentClassName,
-    statement: statement.consequent
+    statement: statement.consequent,
+    parserServices,
+    option
   });
 };
 const validateSwitchStatement = ({
   node,
   statement,
   parentClassName,
-  context
+  context,
+  parserServices,
+  option
 }) => {
   for (const caseStatement of statement.cases) {
     for (const _consequent of caseStatement.consequent) {
@@ -602,7 +659,9 @@ const validateSwitchStatement = ({
         node,
         context,
         parentClassName,
-        statement: _consequent
+        statement: _consequent,
+        parserServices,
+        option
       });
     }
   }
@@ -611,8 +670,11 @@ const validateConstructId$2 = ({
   node,
   context,
   expression,
-  parentClassName
+  parentClassName,
+  parserServices,
+  option
 }) => {
+  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 +682,28 @@ 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 (option.disallowContainingParentName && formattedConstructId.includes(formattedParentClassName)) {
+    context.report({
+      node,
+      messageId: "noParentNameConstructIdMatch",
+      data: {
+        constructId: secondArg.value,
+        parentConstructName: parentClassName
+      }
+    });
+    return;
+  }
+  if (formattedParentClassName === formattedConstructId) {
+    context.report({
+      node,
+      messageId: "noParentNameConstructIdMatch",
+      data: {
+        constructId: secondArg.value,
+        parentConstructName: parentClassName
+      }
+    });
+  }
 };
 
 const noPublicClassFields = utils.ESLintUtils.RuleCreator.withoutDocs({
@@ -1082,7 +1157,10 @@ const createFlatConfig = (rules2) => {
 const recommended = createFlatConfig({
   "cdk/no-class-in-interface": "error",
   "cdk/no-construct-stack-suffix": "error",
-  "cdk/no-parent-name-construct-id-match": "error",
+  "cdk/no-parent-name-construct-id-match": [
+    "error",
+    { disallowContainingParentName: false }
+  ],
   "cdk/no-public-class-fields": "error",
   "cdk/pascal-case-construct-id": "error",
   "cdk/require-passing-this": ["error", { allowNonThisAndDisallowScope: true }],
@@ -1094,7 +1172,10 @@ const recommended = createFlatConfig({
 const strict = createFlatConfig({
   "cdk/no-class-in-interface": "error",
   "cdk/no-construct-stack-suffix": "error",
-  "cdk/no-parent-name-construct-id-match": "error",
+  "cdk/no-parent-name-construct-id-match": [
+    "error",
+    { disallowContainingParentName: true }
+  ],
   "cdk/no-public-class-fields": "error",
   "cdk/pascal-case-construct-id": "error",
   "cdk/require-passing-this": "error",

package/dist/index.d.ts

@@ -4,7 +4,9 @@ declare const rules: {
     "no-construct-stack-suffix": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noConstructStackSuffix", [{
         disallowedSuffixes: ("Construct" | "Stack")[];
     }], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
-    "no-parent-name-construct-id-match": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noParentNameConstructIdMatch", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
+    "no-parent-name-construct-id-match": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noParentNameConstructIdMatch", [{
+        disallowContainingParentName?: boolean;
+    }], 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>;
     "require-passing-this": import("@typescript-eslint/utils/ts-eslint").RuleModule<"requirePassingThis", [{
@@ -38,7 +40,9 @@ declare const configs: {
                     "no-construct-stack-suffix": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noConstructStackSuffix", [{
                         disallowedSuffixes: ("Construct" | "Stack")[];
                     }], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
-                    "no-parent-name-construct-id-match": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noParentNameConstructIdMatch", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
+                    "no-parent-name-construct-id-match": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noParentNameConstructIdMatch", [{
+                        disallowContainingParentName?: boolean;
+                    }], 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>;
                     "require-passing-this": import("@typescript-eslint/utils/ts-eslint").RuleModule<"requirePassingThis", [{
@@ -75,7 +79,9 @@ declare const configs: {
                     "no-construct-stack-suffix": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noConstructStackSuffix", [{
                         disallowedSuffixes: ("Construct" | "Stack")[];
                     }], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
-                    "no-parent-name-construct-id-match": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noParentNameConstructIdMatch", [], unknown, import("@typescript-eslint/utils/ts-eslint").RuleListener>;
+                    "no-parent-name-construct-id-match": import("@typescript-eslint/utils/ts-eslint").RuleModule<"noParentNameConstructIdMatch", [{
+                        disallowContainingParentName?: boolean;
+                    }], 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>;
                     "require-passing-this": import("@typescript-eslint/utils/ts-eslint").RuleModule<"requirePassingThis", [{

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;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"}
+{"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;AA0DF,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 = "2.0.0";
+var version = "2.2.0";
 
 const isConstructOrStackType = (type, ignoredClasses = ["App", "Stage"]) => {
   if (ignoredClasses.includes(type.symbol?.name ?? "")) return false;
@@ -383,12 +383,33 @@ const noParentNameConstructIdMatch = ESLintUtils.RuleCreator.withoutDocs(
       messages: {
         noParentNameConstructIdMatch: "Construct ID '{{ constructId }}' should not match parent construct name '{{ parentConstructName }}'. Use a more specific identifier."
       },
-      schema: []
+      schema: [
+        {
+          type: "object",
+          properties: {
+            disallowContainingParentName: {
+              type: "boolean",
+              default: false
+            }
+          },
+          additionalProperties: false
+        }
+      ]
     },
-    defaultOptions: [],
+    defaultOptions: [
+      {
+        disallowContainingParentName: false
+      }
+    ],
     create(context) {
+      const option = context.options[0] || {
+        disallowContainingParentName: false
+      };
+      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 +422,9 @@ const noParentNameConstructIdMatch = ESLintUtils.RuleCreator.withoutDocs(
               node,
               expression: body.value,
               parentClassName,
-              context
+              context,
+              parserServices,
+              option
             });
           }
         }
@@ -413,7 +436,9 @@ const validateConstructorBody = ({
   node,
   expression,
   parentClassName,
-  context
+  context,
+  parserServices,
+  option
 }) => {
   for (const statement of expression.body.body) {
     switch (statement.type) {
@@ -424,7 +449,9 @@ const validateConstructorBody = ({
           node,
           context,
           expression: newExpression,
-          parentClassName
+          parentClassName,
+          parserServices,
+          option
         });
         break;
       }
@@ -434,7 +461,9 @@ const validateConstructorBody = ({
           node,
           statement,
           parentClassName,
-          context
+          context,
+          parserServices,
+          option
         });
         break;
       }
@@ -443,7 +472,9 @@ const validateConstructorBody = ({
           node,
           context,
           parentClassName,
-          statement: statement.consequent
+          statement: statement.consequent,
+          parserServices,
+          option
         });
         break;
       }
@@ -454,7 +485,9 @@ const validateConstructorBody = ({
               node,
               context,
               parentClassName,
-              statement: statement2
+              statement: statement2,
+              parserServices,
+              option
             });
           }
         }
@@ -467,7 +500,9 @@ const traverseStatements = ({
   node,
   statement,
   parentClassName,
-  context
+  context,
+  parserServices,
+  option
 }) => {
   switch (statement.type) {
     case AST_NODE_TYPES.BlockStatement: {
@@ -476,7 +511,9 @@ const traverseStatements = ({
           node,
           statement: body,
           parentClassName,
-          context
+          context,
+          parserServices,
+          option
         });
       }
       break;
@@ -488,7 +525,9 @@ const traverseStatements = ({
         node,
         statement,
         parentClassName,
-        context
+        context,
+        parserServices,
+        option
       });
       break;
     }
@@ -499,7 +538,9 @@ const traverseStatements = ({
         node,
         context,
         expression: newExpression,
-        parentClassName
+        parentClassName,
+        parserServices,
+        option
       });
       break;
     }
@@ -509,7 +550,9 @@ const validateStatement = ({
   node,
   statement,
   parentClassName,
-  context
+  context,
+  parserServices,
+  option
 }) => {
   switch (statement.type) {
     case AST_NODE_TYPES.VariableDeclaration: {
@@ -519,7 +562,9 @@ const validateStatement = ({
         node,
         context,
         expression: newExpression,
-        parentClassName
+        parentClassName,
+        parserServices,
+        option
       });
       break;
     }
@@ -530,7 +575,9 @@ const validateStatement = ({
         node,
         context,
         expression: newExpression,
-        parentClassName
+        parentClassName,
+        parserServices,
+        option
       });
       break;
     }
@@ -539,7 +586,9 @@ const validateStatement = ({
         node,
         statement,
         parentClassName,
-        context
+        context,
+        parserServices,
+        option
       });
       break;
     }
@@ -548,7 +597,9 @@ const validateStatement = ({
         node,
         statement,
         parentClassName,
-        context
+        context,
+        parserServices,
+        option
       });
       break;
     }
@@ -558,20 +609,26 @@ const validateIfStatement = ({
   node,
   statement,
   parentClassName,
-  context
+  context,
+  parserServices,
+  option
 }) => {
   traverseStatements({
     node,
     context,
     parentClassName,
-    statement: statement.consequent
+    statement: statement.consequent,
+    parserServices,
+    option
   });
 };
 const validateSwitchStatement = ({
   node,
   statement,
   parentClassName,
-  context
+  context,
+  parserServices,
+  option
 }) => {
   for (const caseStatement of statement.cases) {
     for (const _consequent of caseStatement.consequent) {
@@ -579,7 +636,9 @@ const validateSwitchStatement = ({
         node,
         context,
         parentClassName,
-        statement: _consequent
+        statement: _consequent,
+        parserServices,
+        option
       });
     }
   }
@@ -588,8 +647,11 @@ const validateConstructId$2 = ({
   node,
   context,
   expression,
-  parentClassName
+  parentClassName,
+  parserServices,
+  option
 }) => {
+  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 +659,28 @@ 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 (option.disallowContainingParentName && formattedConstructId.includes(formattedParentClassName)) {
+    context.report({
+      node,
+      messageId: "noParentNameConstructIdMatch",
+      data: {
+        constructId: secondArg.value,
+        parentConstructName: parentClassName
+      }
+    });
+    return;
+  }
+  if (formattedParentClassName === formattedConstructId) {
+    context.report({
+      node,
+      messageId: "noParentNameConstructIdMatch",
+      data: {
+        constructId: secondArg.value,
+        parentConstructName: parentClassName
+      }
+    });
+  }
 };
 
 const noPublicClassFields = ESLintUtils.RuleCreator.withoutDocs({
@@ -1059,7 +1134,10 @@ const createFlatConfig = (rules2) => {
 const recommended = createFlatConfig({
   "cdk/no-class-in-interface": "error",
   "cdk/no-construct-stack-suffix": "error",
-  "cdk/no-parent-name-construct-id-match": "error",
+  "cdk/no-parent-name-construct-id-match": [
+    "error",
+    { disallowContainingParentName: false }
+  ],
   "cdk/no-public-class-fields": "error",
   "cdk/pascal-case-construct-id": "error",
   "cdk/require-passing-this": ["error", { allowNonThisAndDisallowScope: true }],
@@ -1071,7 +1149,10 @@ const recommended = createFlatConfig({
 const strict = createFlatConfig({
   "cdk/no-class-in-interface": "error",
   "cdk/no-construct-stack-suffix": "error",
-  "cdk/no-parent-name-construct-id-match": "error",
+  "cdk/no-parent-name-construct-id-match": [
+    "error",
+    { disallowContainingParentName: true }
+  ],
   "cdk/no-public-class-fields": "error",
   "cdk/pascal-case-construct-id": "error",
   "cdk/require-passing-this": "error",

package/package.json

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

package/src/index.ts

@@ -57,7 +57,10 @@ const createFlatConfig = (rules: Record<string, unknown>) => {
 const recommended = createFlatConfig({
   "cdk/no-class-in-interface": "error",
   "cdk/no-construct-stack-suffix": "error",
-  "cdk/no-parent-name-construct-id-match": "error",
+  "cdk/no-parent-name-construct-id-match": [
+    "error",
+    { disallowContainingParentName: false },
+  ],
   "cdk/no-public-class-fields": "error",
   "cdk/pascal-case-construct-id": "error",
   "cdk/require-passing-this": ["error", { allowNonThisAndDisallowScope: true }],
@@ -70,7 +73,10 @@ const recommended = createFlatConfig({
 const strict = createFlatConfig({
   "cdk/no-class-in-interface": "error",
   "cdk/no-construct-stack-suffix": "error",
-  "cdk/no-parent-name-construct-id-match": "error",
+  "cdk/no-parent-name-construct-id-match": [
+    "error",
+    { disallowContainingParentName: true },
+  ],
   "cdk/no-public-class-fields": "error",
   "cdk/pascal-case-construct-id": "error",
   "cdk/require-passing-this": "error",

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

@@ -1,19 +1,29 @@
 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", []>;
+type Options = [
+  {
+    disallowContainingParentName?: boolean;
+  }
+];
+
+type Context = TSESLint.RuleContext<"noParentNameConstructIdMatch", Options>;
 
 type ValidateStatementArgs<T extends TSESTree.Statement> = {
   node: TSESTree.ClassBody;
   statement: T;
   parentClassName: string;
   context: Context;
+  parserServices: ParserServicesWithTypeInformation;
+  option: Options[0];
 };
 
 type ValidateExpressionArgs<T extends TSESTree.Expression> = {
@@ -21,6 +31,8 @@ type ValidateExpressionArgs<T extends TSESTree.Expression> = {
   expression: T;
   parentClassName: string;
   context: Context;
+  parserServices: ParserServicesWithTypeInformation;
+  option: Options[0];
 };
 
 /**
@@ -41,12 +53,36 @@ export const noParentNameConstructIdMatch = ESLintUtils.RuleCreator.withoutDocs(
         noParentNameConstructIdMatch:
           "Construct ID '{{ constructId }}' should not match parent construct name '{{ parentConstructName }}'. Use a more specific identifier.",
       },
-      schema: [],
+      schema: [
+        {
+          type: "object",
+          properties: {
+            disallowContainingParentName: {
+              type: "boolean",
+              default: false,
+            },
+          },
+          additionalProperties: false,
+        },
+      ],
     },
-    defaultOptions: [],
-    create(context) {
+    defaultOptions: [
+      {
+        disallowContainingParentName: false,
+      },
+    ],
+
+    create(context: Context) {
+      const option = context.options[0] || {
+        disallowContainingParentName: false,
+      };
+      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 +103,8 @@ export const noParentNameConstructIdMatch = ESLintUtils.RuleCreator.withoutDocs(
               expression: body.value,
               parentClassName,
               context,
+              parserServices,
+              option,
             });
           }
         },
@@ -84,6 +122,8 @@ const validateConstructorBody = ({
   expression,
   parentClassName,
   context,
+  parserServices,
+  option,
 }: ValidateExpressionArgs<TSESTree.FunctionExpression>): void => {
   for (const statement of expression.body.body) {
     switch (statement.type) {
@@ -95,6 +135,8 @@ const validateConstructorBody = ({
           context,
           expression: newExpression,
           parentClassName,
+          parserServices,
+          option,
         });
         break;
       }
@@ -105,6 +147,8 @@ const validateConstructorBody = ({
           statement,
           parentClassName,
           context,
+          parserServices,
+          option,
         });
         break;
       }
@@ -114,6 +158,8 @@ const validateConstructorBody = ({
           context,
           parentClassName,
           statement: statement.consequent,
+          parserServices,
+          option,
         });
         break;
       }
@@ -125,6 +171,8 @@ const validateConstructorBody = ({
               context,
               parentClassName,
               statement,
+              parserServices,
+              option,
             });
           }
         }
@@ -144,6 +192,8 @@ const traverseStatements = ({
   statement,
   parentClassName,
   context,
+  parserServices,
+  option,
 }: ValidateStatementArgs<TSESTree.Statement>) => {
   switch (statement.type) {
     case AST_NODE_TYPES.BlockStatement: {
@@ -153,6 +203,8 @@ const traverseStatements = ({
           statement: body,
           parentClassName,
           context,
+          parserServices,
+          option,
         });
       }
       break;
@@ -165,6 +217,8 @@ const traverseStatements = ({
         statement,
         parentClassName,
         context,
+        parserServices,
+        option,
       });
       break;
     }
@@ -176,6 +230,8 @@ const traverseStatements = ({
         context,
         expression: newExpression,
         parentClassName,
+        parserServices,
+        option,
       });
       break;
     }
@@ -192,6 +248,8 @@ const validateStatement = ({
   statement,
   parentClassName,
   context,
+  parserServices,
+  option,
 }: ValidateStatementArgs<TSESTree.Statement>): void => {
   switch (statement.type) {
     case AST_NODE_TYPES.VariableDeclaration: {
@@ -202,6 +260,8 @@ const validateStatement = ({
         context,
         expression: newExpression,
         parentClassName,
+        parserServices,
+        option,
       });
       break;
     }
@@ -213,6 +273,8 @@ const validateStatement = ({
         context,
         expression: newExpression,
         parentClassName,
+        parserServices,
+        option,
       });
       break;
     }
@@ -222,6 +284,8 @@ const validateStatement = ({
         statement,
         parentClassName,
         context,
+        parserServices,
+        option,
       });
       break;
     }
@@ -231,6 +295,8 @@ const validateStatement = ({
         statement,
         parentClassName,
         context,
+        parserServices,
+        option,
       });
       break;
     }
@@ -246,12 +312,16 @@ const validateIfStatement = ({
   statement,
   parentClassName,
   context,
+  parserServices,
+  option,
 }: ValidateStatementArgs<TSESTree.IfStatement>): void => {
   traverseStatements({
     node,
     context,
     parentClassName,
     statement: statement.consequent,
+    parserServices,
+    option,
   });
 };
 
@@ -264,6 +334,8 @@ const validateSwitchStatement = ({
   statement,
   parentClassName,
   context,
+  parserServices,
+  option,
 }: ValidateStatementArgs<TSESTree.SwitchStatement>): void => {
   for (const caseStatement of statement.cases) {
     for (const _consequent of caseStatement.consequent) {
@@ -272,6 +344,8 @@ const validateSwitchStatement = ({
         context,
         parentClassName,
         statement: _consequent,
+        parserServices,
+        option,
       });
     }
   }
@@ -285,7 +359,11 @@ const validateConstructId = ({
   context,
   expression,
   parentClassName,
+  parserServices,
+  option,
 }: ValidateExpressionArgs<TSESTree.NewExpression>): void => {
+  const type = parserServices.getTypeAtLocation(expression);
+
   if (expression.arguments.length < 2) return;
 
   // NOTE: Treat the second argument as ID
@@ -299,14 +377,31 @@ 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 (
+    option.disallowContainingParentName &&
+    formattedConstructId.includes(formattedParentClassName)
+  ) {
+    context.report({
+      node,
+      messageId: "noParentNameConstructIdMatch",
+      data: {
+        constructId: secondArg.value,
+        parentConstructName: parentClassName,
+      },
+    });
+    return;
+  }
+  if (formattedParentClassName === formattedConstructId) {
+    context.report({
+      node,
+      messageId: "noParentNameConstructIdMatch",
+      data: {
+        constructId: secondArg.value,
+        parentConstructName: parentClassName,
+      },
+    });
+  }
 };