eslint-cdk-plugin 1.0.4 → 1.0.5

package/dist/index.cjs

@@ -193779,19 +193779,18 @@ const getConstructorPropertyNames = (type) => {
   return constructor.parameters.map((param) => param.name.getText());
 };
 
-const isConstructOrStackType = (type) => {
+const isConstructOrStackType = (type, ignoredClasses = ["App", "Stage"]) => {
+  if (ignoredClasses.includes(type.symbol?.name ?? "")) return false;
   return isTargetSuperClassType(
     type,
     ["Construct", "Stack"],
     isConstructOrStackType
   );
 };
-const isConstructType = (type) => {
+const isConstructType = (type, ignoredClasses = ["App", "Stage", "Stack"]) => {
+  if (ignoredClasses.includes(type.symbol?.name ?? "")) return false;
   return isTargetSuperClassType(type, ["Construct"], isConstructType);
 };
-const isStackType = (type) => {
-  return isTargetSuperClassType(type, ["Stack"], isStackType);
-};
 const isTargetSuperClassType = (type, targetSuperClasses, typeCheckFunction) => {
   if (!type.symbol) return false;
   if (targetSuperClasses.some((suffix) => type.symbol.name.endsWith(suffix))) {
@@ -194317,9 +194316,7 @@ const noVariableConstructId = utils.ESLintUtils.RuleCreator.withoutDocs({
     return {
       NewExpression(node) {
         const type = parserServices.getTypeAtLocation(node);
-        if (!isConstructType(type) || isStackType(type) || node.arguments.length < 2) {
-          return;
-        }
+        if (!isConstructType(type) || node.arguments.length < 2) return;
         const constructorPropertyNames = getConstructorPropertyNames(type);
         if (constructorPropertyNames[1] !== "id") return;
         validateConstructId$1(node, context);
@@ -194423,9 +194420,7 @@ const requirePassingThis = utils.ESLintUtils.RuleCreator.withoutDocs({
     return {
       NewExpression(node) {
         const type = parserServices.getTypeAtLocation(node);
-        if (!isConstructType(type) || isStackType(type) || !node.arguments.length) {
-          return;
-        }
+        if (!isConstructType(type) || !node.arguments.length) return;
         const argument = node.arguments[0];
         if (argument.type === utils.AST_NODE_TYPES.ThisExpression) return;
         const constructorPropertyNames = getConstructorPropertyNames(type);

package/dist/index.mjs

@@ -193756,19 +193756,18 @@ const getConstructorPropertyNames = (type) => {
   return constructor.parameters.map((param) => param.name.getText());
 };
 
-const isConstructOrStackType = (type) => {
+const isConstructOrStackType = (type, ignoredClasses = ["App", "Stage"]) => {
+  if (ignoredClasses.includes(type.symbol?.name ?? "")) return false;
   return isTargetSuperClassType(
     type,
     ["Construct", "Stack"],
     isConstructOrStackType
   );
 };
-const isConstructType = (type) => {
+const isConstructType = (type, ignoredClasses = ["App", "Stage", "Stack"]) => {
+  if (ignoredClasses.includes(type.symbol?.name ?? "")) return false;
   return isTargetSuperClassType(type, ["Construct"], isConstructType);
 };
-const isStackType = (type) => {
-  return isTargetSuperClassType(type, ["Stack"], isStackType);
-};
 const isTargetSuperClassType = (type, targetSuperClasses, typeCheckFunction) => {
   if (!type.symbol) return false;
   if (targetSuperClasses.some((suffix) => type.symbol.name.endsWith(suffix))) {
@@ -194294,9 +194293,7 @@ const noVariableConstructId = ESLintUtils.RuleCreator.withoutDocs({
     return {
       NewExpression(node) {
         const type = parserServices.getTypeAtLocation(node);
-        if (!isConstructType(type) || isStackType(type) || node.arguments.length < 2) {
-          return;
-        }
+        if (!isConstructType(type) || node.arguments.length < 2) return;
         const constructorPropertyNames = getConstructorPropertyNames(type);
         if (constructorPropertyNames[1] !== "id") return;
         validateConstructId$1(node, context);
@@ -194400,9 +194397,7 @@ const requirePassingThis = ESLintUtils.RuleCreator.withoutDocs({
     return {
       NewExpression(node) {
         const type = parserServices.getTypeAtLocation(node);
-        if (!isConstructType(type) || isStackType(type) || !node.arguments.length) {
-          return;
-        }
+        if (!isConstructType(type) || !node.arguments.length) return;
         const argument = node.arguments[0];
         if (argument.type === AST_NODE_TYPES.ThisExpression) return;
         const constructorPropertyNames = getConstructorPropertyNames(type);

package/package.json

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

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

@@ -6,7 +6,7 @@ import {
 } from "@typescript-eslint/utils";
 
 import { getConstructorPropertyNames } from "../utils/parseType";
-import { isConstructType, isStackType } from "../utils/typeCheck";
+import { isConstructType } from "../utils/typeCheck";
 
 type Context = TSESLint.RuleContext<"noVariableConstructId", []>;
 
@@ -33,13 +33,7 @@ export const noVariableConstructId = ESLintUtils.RuleCreator.withoutDocs({
       NewExpression(node) {
         const type = parserServices.getTypeAtLocation(node);
 
-        if (
-          !isConstructType(type) ||
-          isStackType(type) ||
-          node.arguments.length < 2
-        ) {
-          return;
-        }
+        if (!isConstructType(type) || node.arguments.length < 2) return;
 
         const constructorPropertyNames = getConstructorPropertyNames(type);
         if (constructorPropertyNames[1] !== "id") return;

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

@@ -1,7 +1,7 @@
 import { AST_NODE_TYPES, ESLintUtils } from "@typescript-eslint/utils";
 
 import { getConstructorPropertyNames } from "../utils/parseType";
-import { isConstructType, isStackType } from "../utils/typeCheck";
+import { isConstructType } from "../utils/typeCheck";
 
 /**
  * Enforces that `this` is passed to the constructor
@@ -28,13 +28,7 @@ export const requirePassingThis = ESLintUtils.RuleCreator.withoutDocs({
       NewExpression(node) {
         const type = parserServices.getTypeAtLocation(node);
 
-        if (
-          !isConstructType(type) ||
-          isStackType(type) ||
-          !node.arguments.length
-        ) {
-          return;
-        }
+        if (!isConstructType(type) || !node.arguments.length) return;
 
         const argument = node.arguments[0];
         if (argument.type === AST_NODE_TYPES.ThisExpression) return;

package/src/utils/typeCheck.ts

@@ -5,9 +5,14 @@ type SuperClassType = "Construct" | "Stack";
 /**
  * Check if the type extends Construct or Stack
  * @param type - The type to check
+ * @param ignoredClasses - Classes that inherit from Construct Class or Stack Class but do not want to be treated as Construct Class or Stack Class
  * @returns True if the type extends Construct or Stack, otherwise false
  */
-export const isConstructOrStackType = (type: Type): boolean => {
+export const isConstructOrStackType = (
+  type: Type,
+  ignoredClasses: readonly string[] = ["App", "Stage"] as const
+): boolean => {
+  if (ignoredClasses.includes(type.symbol?.name ?? "")) return false;
   return isTargetSuperClassType(
     type,
     ["Construct", "Stack"],
@@ -18,21 +23,17 @@ export const isConstructOrStackType = (type: Type): boolean => {
 /**
  * Check if the type extends Construct
  * @param type - The type to check
+ * @param ignoredClasses - Classes that inherit from Construct Class but do not want to be treated as Construct Class
  * @returns True if the type extends Construct, otherwise false
  */
-export const isConstructType = (type: Type): boolean => {
+export const isConstructType = (
+  type: Type,
+  ignoredClasses: readonly string[] = ["App", "Stage", "Stack"] as const
+): boolean => {
+  if (ignoredClasses.includes(type.symbol?.name ?? "")) return false;
   return isTargetSuperClassType(type, ["Construct"], isConstructType);
 };
 
-/**
- * Check if the type extends Stack
- * @param type - The type to check
- * @returns True if the type extends Stack, otherwise false
- */
-export const isStackType = (type: Type): boolean => {
-  return isTargetSuperClassType(type, ["Stack"], isStackType);
-};
-
 /**
  * Check if the type extends target super class
  * @param type - The type to check