eslint-plugin-awscdk 4.3.0 → 4.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-awscdk",
-  "version": "4.3.0",
+  "version": "4.3.3",
   "description": "eslint plugin for AWS CDK projects",
   "keywords": [
     "aws",
@@ -44,39 +44,28 @@
     "access": "public"
   },
   "scripts": {
-    "build": "tsdown",
-    "test": "vitest --run",
-    "test:integration": "sh scripts/integration-test.sh",
-    "lint": "eslint --fix",
-    "fmt": "oxfmt",
-    "fmt:check": "oxfmt --check",
-    "check": "tsgo --noEmit",
-    "pack": "pnpm run build && npm pack",
-    "docs": "pnpm run --filter=@eslint-plugin-awscdk/docs",
-    "example:flat-config": "pnpm run --filter=@eslint-plugin-awscdk/example-flat-config",
-    "example:classic-config": "pnpm run --filter=@eslint-plugin-awscdk/example-classic-config",
-    "example:oxlint": "pnpm run --filter=@eslint-plugin-awscdk/example-oxlint"
+    "pack": "vp pack",
+    "check": "vp check",
+    "test": "vp test --run",
+    "docs": "vp run -F @eslint-plugin-awscdk/docs"
   },
   "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.46.2",
-    "@typescript-eslint/rule-tester": "^8.46.2",
-    "@typescript-eslint/utils": "^8.46.2",
-    "@typescript/native-preview": "^7.0.0-dev.20250601",
+    "@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",
-    "eslint-plugin-import": "^2.32.0",
-    "oxfmt": "^0.36.0",
-    "secretlint": "^11.2.5",
-    "tsdown": "^0.21.0",
-    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.56.0",
-    "vitest": "^4.0.6"
+    "secretlint": "^13.0.0",
+    "typescript": "^6.0.2",
+    "typescript-eslint": "^8.58.0",
+    "vite-plus": "^0.1.11"
   },
   "peerDependencies": {
     "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
-    "typescript": ">=4.8.4 <6.0.0"
+    "typescript": ">=4.8.4 <6.1.0"
   },
   "engines": {
     "node": "^18.18.0 || ^20.9.0 || >=21.1.0"

package/src/configs/classic-config.ts

@@ -1,18 +1,18 @@
 import { ClassicConfig } from "@typescript-eslint/utils/ts-eslint";
 
-const createClassicConfig = (
-  rules: ClassicConfig.RulesRecord,
-): {
+type ClassicRulesConfig = {
   plugins: ["awscdk"];
   rules: ClassicConfig.RulesRecord;
-} => {
+};
+
+const createClassicConfig = (rules: ClassicConfig.RulesRecord): ClassicRulesConfig => {
   return {
     plugins: ["awscdk"],
     rules,
   };
 };
 
-export const recommended = createClassicConfig({
+export const recommended: ClassicRulesConfig = createClassicConfig({
   "awscdk/construct-constructor-property": "error",
   "awscdk/migrate-disable-comments": "error",
   "awscdk/no-construct-in-interface": "error",
@@ -28,7 +28,7 @@ export const recommended = createClassicConfig({
   "awscdk/require-passing-this": ["error", { allowNonThisAndDisallowScope: true }],
 });
 
-export const strict = createClassicConfig({
+export const strict: ClassicRulesConfig = createClassicConfig({
   "awscdk/construct-constructor-property": "error",
   "awscdk/migrate-disable-comments": "error",
   "awscdk/no-construct-in-interface": "error",

package/src/configs/flat-config.ts

@@ -30,7 +30,7 @@ const createFlatConfig = (rules: _FlatConfig.Rules): FlatConfig => {
   };
 };
 
-export const recommended = createFlatConfig({
+export const recommended: FlatConfig = createFlatConfig({
   "awscdk/construct-constructor-property": "error",
   "awscdk/migrate-disable-comments": "error",
   "awscdk/no-construct-in-interface": "error",
@@ -46,7 +46,7 @@ export const recommended = createFlatConfig({
   "awscdk/require-passing-this": ["error", { allowNonThisAndDisallowScope: true }],
 });
 
-export const strict = createFlatConfig({
+export const strict: FlatConfig = createFlatConfig({
   "awscdk/construct-constructor-property": "error",
   "awscdk/migrate-disable-comments": "error",
   "awscdk/no-construct-in-interface": "error",

package/src/configs/index.ts

@@ -1,7 +1,12 @@
 import { recommended as classicRecommended, strict as classicStrict } from "./classic-config";
 import { recommended, strict } from "./flat-config";
 
-export const configs = {
+export const configs: Readonly<{
+  recommended: typeof recommended;
+  strict: typeof strict;
+  classicRecommended: typeof classicRecommended;
+  classicStrict: typeof classicStrict;
+}> = {
   recommended,
   strict,
   classicRecommended,

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/core/cdk-construct/type-checker/is-resource-with-readonly-interface.ts

@@ -7,7 +7,6 @@ import {
 } from "typescript";
 
 import { isClassType } from "../../ts-type/checker/is-class";
-
 import { isResourceType } from "./is-resource";
 
 /**

package/src/rules/index.ts

@@ -1,3 +1,6 @@
+import type { TSESLint } from "@typescript-eslint/utils";
+import type { Rule } from "eslint";
+
 import { constructConstructorProperty } from "./construct-constructor-property";
 import { migrateDisableComments } from "./migrate-disable-comments";
 import { noConstructInInterface } from "./no-construct-in-interface";
@@ -17,7 +20,9 @@ import { requireJSDoc } from "./require-jsdoc";
 import { requirePassingThis } from "./require-passing-this";
 import { requirePropsDefaultDoc } from "./require-props-default-doc";
 
-export const rules = {
+type RuleModule = TSESLint.RuleModule<string, readonly unknown[]> | Rule.RuleModule;
+
+export const rules: Record<string, RuleModule> = {
   "construct-constructor-property": constructConstructorProperty,
   "migrate-disable-comments": migrateDisableComments,
   "no-construct-in-interface": noConstructInInterface,

package/src/rules/no-import-private.ts

@@ -1,6 +1,5 @@
-import * as path from "path";
-
 import { Rule } from "eslint";
+import * as path from "path";
 
 /**
  * Disallow importing modules from private directories at different levels of the hierarchy.

package/src/rules/no-unused-props/index.ts

@@ -10,7 +10,6 @@ import { Type } from "typescript";
 import { findConstructor } from "../../core/ast-node/finder/constructor";
 import { isConstructType } from "../../core/cdk-construct/type-checker/is-construct";
 import { createRule } from "../../shared/create-rule";
-
 import { PropsUsageAnalyzer } from "./props-usage-analyzer";
 import { IPropsUsageTracker, PropsUsageTracker } from "./props-usage-tracker";
 

package/src/rules/no-unused-props/props-usage-analyzer.ts

@@ -14,7 +14,11 @@ export interface IPropsUsageAnalyzer {
 }
 
 export class PropsUsageAnalyzer implements IPropsUsageAnalyzer {
-  constructor(private readonly tracker: IPropsUsageTracker) {}
+  private readonly tracker: IPropsUsageTracker;
+
+  constructor(tracker: IPropsUsageTracker) {
+    this.tracker = tracker;
+  }
 
   analyze(constructor: TSESTree.MethodDefinition, propsParam: TSESTree.Identifier): void {
     const constructorBody = constructor.value.body;

package/src/rules/no-unused-props/visitor/direct-props-usage-visitor.ts

@@ -1,7 +1,6 @@
 import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/utils";
 
 import { IPropsUsageTracker } from "../props-usage-tracker";
-
 import { INodeVisitor } from "./interface/node-visitor";
 
 /**

package/src/rules/no-unused-props/visitor/instance-variable-usage-visitor.ts

@@ -1,7 +1,6 @@
 import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/utils";
 
 import { IPropsUsageTracker } from "../props-usage-tracker";
-
 import { INodeVisitor } from "./interface/node-visitor";
 
 /**

package/src/rules/no-unused-props/visitor/method-call-collector-visitor.ts

@@ -26,8 +26,11 @@ type MethodCallInfo = {
  */
 export class MethodCallCollectorVisitor implements INodeVisitor {
   private readonly _result: MethodCallInfo[] = [];
+  private readonly propsParamName: string;
 
-  constructor(private readonly propsParamName: string) {}
+  constructor(propsParamName: string) {
+    this.propsParamName = propsParamName;
+  }
 
   visitCallExpression(node: TSESTree.CallExpression): void {
     // NOTE: Check for this.methodName(...) pattern

package/src/rules/no-unused-props/visitor/props-alias-visitor.ts

@@ -1,7 +1,6 @@
 import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/utils";
 
 import { IPropsUsageTracker } from "../props-usage-tracker";
-
 import { INodeVisitor } from "./interface/node-visitor";
 
 /**

package/src/rules/no-unused-props/visitor/traverse-nodes.ts

@@ -1,7 +1,6 @@
 import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/utils";
 
 import { findChildNodes } from "../../../core/ast-node/finder/child-nodes";
-
 import { INodeVisitor } from "./interface/node-visitor";
 
 export const traverseNodes = (node: TSESTree.Node, visitor: INodeVisitor): void => {

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