@eslint-react/ast 3.0.0-rc.0 → 3.0.0-rc.1

package/dist/index.d.ts

@@ -91,6 +91,9 @@ declare function isDirective(node: TSESTree.Node): node is TSESTreeDirective;
 declare function isDirectiveLike(node: TSESTree.Node): node is TSESTreeDirectiveLike;
 //#endregion
 //#region src/directive-kind.d.ts
+/**
+ * Known directive kinds in React
+ */
 type DirectiveKind = "use client" | "use server" | "use memo" | "use no memo";
 /**
  * Check if a node is a directive kind

package/dist/index.js

@@ -427,8 +427,8 @@ function getNestedIdentifiers(node) {
 		identifiers.push(...chunk);
 	}
 	if (node.type === AST_NODE_TYPES.MemberExpression) {
-		const chunk = getNestedIdentifiers(node.object);
-		identifiers.push(...chunk);
+		identifiers.push(...getNestedIdentifiers(node.object));
+		if (node.computed) identifiers.push(...getNestedIdentifiers(node.property));
 	}
 	if (node.type === AST_NODE_TYPES.UnaryExpression) {
 		const chunk = getNestedIdentifiers(node.argument);
@@ -450,6 +450,22 @@ function getNestedIdentifiers(node) {
 		const chunk = getNestedIdentifiers(node.expression);
 		identifiers.push(...chunk);
 	}
+	if (node.type === AST_NODE_TYPES.ConditionalExpression) {
+		identifiers.push(...getNestedIdentifiers(node.test));
+		identifiers.push(...getNestedIdentifiers(node.consequent));
+		identifiers.push(...getNestedIdentifiers(node.alternate));
+	}
+	if (node.type === AST_NODE_TYPES.AwaitExpression) identifiers.push(...getNestedIdentifiers(node.argument));
+	if (node.type === AST_NODE_TYPES.YieldExpression && node.argument != null) identifiers.push(...getNestedIdentifiers(node.argument));
+	if (node.type === AST_NODE_TYPES.UpdateExpression) identifiers.push(...getNestedIdentifiers(node.argument));
+	if (node.type === AST_NODE_TYPES.CallExpression || node.type === AST_NODE_TYPES.NewExpression) identifiers.push(...getNestedIdentifiers(node.callee));
+	if (node.type === AST_NODE_TYPES.TaggedTemplateExpression) {
+		identifiers.push(...getNestedIdentifiers(node.tag));
+		identifiers.push(...getNestedIdentifiers(node.quasi));
+	}
+	if (node.type === AST_NODE_TYPES.ImportExpression) identifiers.push(...getNestedIdentifiers(node.source));
+	if (node.type === AST_NODE_TYPES.TSTypeAssertion) identifiers.push(...getNestedIdentifiers(node.expression));
+	if (node.type === AST_NODE_TYPES.TSInstantiationExpression) identifiers.push(...getNestedIdentifiers(node.expression));
 	return identifiers;
 }
 /**
@@ -475,84 +491,77 @@ function getNestedReturnStatements(node) {
 */
 function getNestedExpressionsOfType(type) {
 	const isNodeOfType = is(type);
-	return (node) => {
-		const boundGetNestedExpressionsOfType = getNestedExpressionsOfType(type);
+	const recurse = (node) => {
 		const expressions = [];
 		if (isNodeOfType(node)) expressions.push(node);
 		if ("arguments" in node) {
-			const chunk = node.arguments.flatMap(getNestedExpressionsOfType(type));
+			const chunk = node.arguments.flatMap(recurse);
 			expressions.push(...chunk);
 		}
 		if ("expression" in node && node.expression !== true && node.expression !== false) {
-			const chunk = boundGetNestedExpressionsOfType(node.expression);
+			const chunk = recurse(node.expression);
 			expressions.push(...chunk);
 		}
 		if ("left" in node) {
-			const chunk = boundGetNestedExpressionsOfType(node.left);
+			const chunk = recurse(node.left);
 			expressions.push(...chunk);
 		}
 		if ("right" in node) {
-			const chunk = boundGetNestedExpressionsOfType(node.right);
+			const chunk = recurse(node.right);
 			expressions.push(...chunk);
 		}
 		if ("test" in node && node.test != null) {
-			const chunk = boundGetNestedExpressionsOfType(node.test);
+			const chunk = recurse(node.test);
 			expressions.push(...chunk);
 		}
 		if ("consequent" in node) {
-			const chunk = Array.isArray(node.consequent) ? node.consequent.flatMap(boundGetNestedExpressionsOfType) : boundGetNestedExpressionsOfType(node.consequent);
+			const chunk = Array.isArray(node.consequent) ? node.consequent.flatMap(recurse) : recurse(node.consequent);
 			expressions.push(...chunk);
 		}
 		if ("alternate" in node && node.alternate != null) {
-			const chunk = Array.isArray(node.alternate) ? node.alternate.flatMap(boundGetNestedExpressionsOfType) : boundGetNestedExpressionsOfType(node.alternate);
+			const chunk = Array.isArray(node.alternate) ? node.alternate.flatMap(recurse) : recurse(node.alternate);
 			expressions.push(...chunk);
 		}
 		if ("elements" in node) {
-			const chunk = node.elements.filter((x) => x != null).flatMap(getNestedExpressionsOfType(type));
+			const chunk = node.elements.filter((x) => x != null).flatMap(recurse);
 			expressions.push(...chunk);
 		}
 		if ("properties" in node) {
-			const chunk = node.properties.flatMap(boundGetNestedExpressionsOfType);
+			const chunk = node.properties.flatMap(recurse);
 			expressions.push(...chunk);
 		}
 		if ("expressions" in node) {
-			const chunk = node.expressions.flatMap(boundGetNestedExpressionsOfType);
+			const chunk = node.expressions.flatMap(recurse);
 			expressions.push(...chunk);
 		}
 		if (node.type === AST_NODE_TYPES.Property) {
-			const chunk = boundGetNestedExpressionsOfType(node.value);
+			const chunk = recurse(node.value);
 			expressions.push(...chunk);
 		}
 		if (node.type === AST_NODE_TYPES.SpreadElement) {
-			const chunk = boundGetNestedExpressionsOfType(node.argument);
+			const chunk = recurse(node.argument);
 			expressions.push(...chunk);
 		}
 		if (node.type === AST_NODE_TYPES.MemberExpression) {
-			const chunk = boundGetNestedExpressionsOfType(node.object);
-			expressions.push(...chunk);
+			expressions.push(...recurse(node.object));
+			if (node.computed) expressions.push(...recurse(node.property));
 		}
 		if (node.type === AST_NODE_TYPES.UnaryExpression) {
-			const chunk = boundGetNestedExpressionsOfType(node.argument);
-			expressions.push(...chunk);
-		}
-		if (node.type === AST_NODE_TYPES.ChainExpression) {
-			const chunk = boundGetNestedExpressionsOfType(node.expression);
+			const chunk = recurse(node.argument);
 			expressions.push(...chunk);
 		}
-		if (node.type === AST_NODE_TYPES.TSNonNullExpression) {
-			const chunk = boundGetNestedExpressionsOfType(node.expression);
-			expressions.push(...chunk);
-		}
-		if (node.type === AST_NODE_TYPES.TSAsExpression) {
-			const chunk = boundGetNestedExpressionsOfType(node.expression);
-			expressions.push(...chunk);
-		}
-		if (node.type === AST_NODE_TYPES.TSSatisfiesExpression) {
-			const chunk = boundGetNestedExpressionsOfType(node.expression);
-			expressions.push(...chunk);
+		if (node.type === AST_NODE_TYPES.AwaitExpression) expressions.push(...recurse(node.argument));
+		if (node.type === AST_NODE_TYPES.YieldExpression && node.argument != null) expressions.push(...recurse(node.argument));
+		if (node.type === AST_NODE_TYPES.UpdateExpression) expressions.push(...recurse(node.argument));
+		if (node.type === AST_NODE_TYPES.CallExpression || node.type === AST_NODE_TYPES.NewExpression) expressions.push(...recurse(node.callee));
+		if (node.type === AST_NODE_TYPES.TaggedTemplateExpression) {
+			expressions.push(...recurse(node.tag));
+			expressions.push(...recurse(node.quasi));
 		}
+		if (node.type === AST_NODE_TYPES.ImportExpression) expressions.push(...recurse(node.source));
 		return expressions;
 	};
+	return recurse;
 }
 /**
 * Get all nested new expressions in an expression like node

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/ast",
-  "version": "3.0.0-rc.0",
+  "version": "3.0.0-rc.1",
   "description": "ESLint React's TSESTree AST utility module.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -36,7 +36,7 @@
     "string-ts": "^2.3.1"
   },
   "devDependencies": {
-    "tsdown": "^0.21.0",
+    "tsdown": "^0.21.2",
     "@local/configs": "0.0.0",
     "@local/eff": "3.0.0-beta.72"
   },
@@ -47,6 +47,9 @@
   "engines": {
     "node": ">=22.0.0"
   },
+  "inlinedDependencies": {
+    "@local/eff": "workspace:*"
+  },
   "scripts": {
     "build": "tsdown --dts-resolve",
     "lint:publish": "publint",