eslint-plugin-awscdk 4.3.2 → 4.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-awscdk",
-  "version": "4.3.2",
+  "version": "4.3.3",
   "description": "eslint plugin for AWS CDK projects",
   "keywords": [
     "aws",
@@ -51,15 +51,15 @@
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@secretlint/secretlint-rule-preset-recommend": "^11.2.5",
+    "@secretlint/secretlint-rule-preset-recommend": "^13.0.0",
     "@types/node": "^24.10.13",
     "@typescript-eslint/parser": "^8.58.0",
     "@typescript-eslint/rule-tester": "^8.58.0",
     "@typescript-eslint/utils": "^8.58.0",
     "@voidzero-dev/vite-plus-core": "^0.1.11",
     "eslint": "^10.0.0",
-    "secretlint": "^11.2.5",
-    "typescript": "^5.9.3",
+    "secretlint": "^13.0.0",
+    "typescript": "^6.0.2",
     "typescript-eslint": "^8.58.0",
     "vite-plus": "^0.1.11"
   },

package/src/core/ast-node/finder/enclosing-class.ts

@@ -0,0 +1,12 @@
+import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/utils";
+
+/**
+ * Find the enclosing ClassDeclaration from a given node
+ * @param node The node to start searching from
+ * @returns The enclosing ClassDeclaration or undefined if not found
+ */
+export const findEnclosingClass = (node: TSESTree.Node): TSESTree.ClassDeclaration | undefined => {
+  if (!node.parent) return undefined;
+  if (node.parent.type === AST_NODE_TYPES.ClassDeclaration) return node.parent;
+  return findEnclosingClass(node.parent);
+};

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

@@ -1,6 +1,8 @@
 import { AST_NODE_TYPES, ESLintUtils, TSESLint, TSESTree } from "@typescript-eslint/utils";
 
+import { findEnclosingClass } from "../core/ast-node/finder/enclosing-class";
 import { isConstructType } from "../core/cdk-construct/type-checker/is-construct";
+import { isConstructOrStackType } from "../core/cdk-construct/type-checker/is-construct-or-stack";
 import { findConstructorPropertyNames } from "../core/ts-type/finder/constructor-property-name";
 import { createRule } from "../shared/create-rule";
 
@@ -32,6 +34,13 @@ export const noVariableConstructId = createRule({
 
         if (!isConstructType(type) || node.arguments.length < 2) return;
 
+        // NOTE: Skip when inside a class that is not Construct/Stack
+        const enclosingClass = findEnclosingClass(node);
+        const enclosingClassType = enclosingClass
+          ? parserServices.getTypeAtLocation(enclosingClass)
+          : undefined;
+        if (enclosingClassType && !isConstructOrStackType(enclosingClassType)) return;
+
         const constructorPropertyNames = findConstructorPropertyNames(type);
         if (constructorPropertyNames[1] !== "id") return;
 
@@ -96,6 +105,12 @@ const shouldSkipIdValidation = (node: TSESTree.Node): boolean => {
       return true;
     }
 
+    // Constructs in standalone functions (outside of classes) are intended to be called
+    // multiple times with different IDs
+    if (current.type === AST_NODE_TYPES.FunctionDeclaration) {
+      return true;
+    }
+
     current = current.parent;
   }
   return false;

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

@@ -1,6 +1,8 @@
 import { AST_NODE_TYPES, ESLintUtils, TSESLint } from "@typescript-eslint/utils";
 
+import { findEnclosingClass } from "../core/ast-node/finder/enclosing-class";
 import { isConstructType } from "../core/cdk-construct/type-checker/is-construct";
+import { isConstructOrStackType } from "../core/cdk-construct/type-checker/is-construct-or-stack";
 import { findConstructorPropertyNames } from "../core/ts-type/finder/constructor-property-name";
 import { createRule } from "../shared/create-rule";
 
@@ -53,6 +55,12 @@ export const requirePassingThis = createRule({
 
         if (!isConstructType(type) || !node.arguments.length) return;
 
+        // NOTE: Only flag when inside a Construct/Stack class where `this` is available
+        const enclosingClass = findEnclosingClass(node);
+        if (!enclosingClass) return;
+        const enclosingClassType = parserServices.getTypeAtLocation(enclosingClass);
+        if (!isConstructOrStackType(enclosingClassType)) return;
+
         const argument = node.arguments[0];
 
         // NOTE: If the first argument is already `this`, it's valid