@eslint-react/ast 5.17.2 → 5.17.3

package/dist/index.d.ts

@@ -12,7 +12,7 @@ type TSESTreeDirective = TSESTree.ExpressionStatement & {
 };
 type TSESTreeTypeExpression = TSESTree.TSAsExpression | TSESTree.TSTypeAssertion | TSESTree.TSNonNullExpression | TSESTree.TSSatisfiesExpression | TSESTree.TSInstantiationExpression;
 declare namespace check_d_exports {
-  export { is, isClass, isDirective, isExpression, isFunction, isIdentifier, isJSX, isJSXElement, isJSXElementOrFragment, isJSXFragment, isJSXTagNameExpression, isOneOf, isProperty, isPropertyOrMethod, isTypeAssertionExpression, isTypeExpression };
+  export { is, isClass, isConditional, isDirective, isExpression, isFunction, isIdentifier, isJSX, isJSXElement, isJSXElementOrFragment, isJSXFragment, isJSXTagNameExpression, isOneOf, isProperty, isPropertyOrMethod, isTypeAssertionExpression, isTypeExpression };
 }
 declare const is: <NodeType extends AST_NODE_TYPES>(nodeType: NodeType) => (node: TSESTree.Node | null | undefined) => node is Extract<TSESTree.Node, {
   type: NodeType;
@@ -34,6 +34,12 @@ declare const isJSX: (node: TSESTree.Node | null | undefined) => node is TSESTre
 declare const isTypeExpression: (node: TSESTree.Node | null | undefined) => node is TSESTree.TSAsExpression | TSESTree.TSInstantiationExpression | TSESTree.TSNonNullExpression | TSESTree.TSSatisfiesExpression | TSESTree.TSTypeAssertion;
 declare const isTypeAssertionExpression: (node: TSESTree.Node | null | undefined) => node is TSESTree.TSAsExpression | TSESTree.TSNonNullExpression | TSESTree.TSSatisfiesExpression | TSESTree.TSTypeAssertion;
 declare const isExpression: (node: TSESTree.Node | null | undefined) => node is TSESTree.ArrayExpression | TSESTree.ArrayPattern | TSESTree.ArrowFunctionExpressionWithBlockBody | TSESTree.ArrowFunctionExpressionWithExpressionBody | TSESTree.AssignmentExpression | TSESTree.AwaitExpression | TSESTree.PrivateInExpression | TSESTree.SymmetricBinaryExpression | TSESTree.CallExpression | TSESTree.ChainExpression | TSESTree.ClassExpression | TSESTree.ConditionalExpression | TSESTree.FunctionExpression | TSESTree.Identifier | TSESTree.ImportExpression | TSESTree.JSXElement | TSESTree.JSXFragment | TSESTree.BigIntLiteral | TSESTree.BooleanLiteral | TSESTree.NullLiteral | TSESTree.NumberLiteral | TSESTree.RegExpLiteral | TSESTree.StringLiteral | TSESTree.LogicalExpression | TSESTree.MemberExpressionComputedName | TSESTree.MemberExpressionNonComputedName | TSESTree.MetaProperty | TSESTree.NewExpression | TSESTree.ObjectExpression | TSESTree.ObjectPattern | TSESTree.SequenceExpression | TSESTree.Super | TSESTree.TaggedTemplateExpression | TSESTree.TemplateLiteral | TSESTree.ThisExpression | TSESTree.TSAsExpression | TSESTree.TSInstantiationExpression | TSESTree.TSNonNullExpression | TSESTree.TSSatisfiesExpression | TSESTree.TSTypeAssertion | TSESTree.UnaryExpressionBitwiseNot | TSESTree.UnaryExpressionDelete | TSESTree.UnaryExpressionMinus | TSESTree.UnaryExpressionNot | TSESTree.UnaryExpressionPlus | TSESTree.UnaryExpressionTypeof | TSESTree.UnaryExpressionVoid | TSESTree.UpdateExpression | TSESTree.YieldNoStarExpression | TSESTree.YieldStarExpression;
+/**
+ * Check if a node is a conditional expression or control flow statement
+ * @param node The node to check
+ * @returns True if the node is conditional
+ */
+declare const isConditional: (node: TSESTree.Node | null | undefined) => node is TSESTree.ConditionalExpression | TSESTree.DoWhileStatement | TSESTree.ForInStatement | TSESTree.ForOfStatement | TSESTree.ForStatement | TSESTree.IfStatement | TSESTree.LogicalExpression | TSESTree.SwitchStatement | TSESTree.WhileStatement;
 declare namespace compare_d_exports {
   export { isEqual };
 }
@@ -49,13 +55,14 @@ declare const isEqual: {
   (a: TSESTree.Node, b: TSESTree.Node): boolean;
 };
 declare namespace extract_d_exports {
-  export { getCalleeName, getFullyQualifiedName, getRootIdentifier, getStaticPropertyName, unwrap };
+  export { findProperty, getCalleeName, getFullyQualifiedName, getIdentifierAt, getPropertyName, unwrap };
 }
 declare function unwrap(node: TSESTree.Node): Exclude<TSESTree.Node, TSESTreeTypeExpression>;
-declare function getRootIdentifier(node: TSESTree.Expression | TSESTree.PrivateIdentifier): TSESTree.Identifier | null;
+declare function findProperty(properties: TSESTree.ObjectLiteralElement[], name: string): TSESTree.Property | null;
 declare function getCalleeName(node: TSESTree.CallExpression): string | null;
-declare function getStaticPropertyName(prop: TSESTree.Property): string | null;
+declare function getPropertyName(property: TSESTree.Property, effort?: "min" | "max"): string | null;
 declare function getFullyQualifiedName(node: TSESTree.Node, getText: (node: TSESTree.Node) => string): string;
+declare function getIdentifierAt(node: TSESTree.Expression | TSESTree.PrivateIdentifier, position: number): TSESTree.Identifier | null;
 declare namespace traverse_d_exports {
   export { findParent };
 }

package/dist/index.js

@@ -6,6 +6,7 @@ import { ASTUtils } from "@typescript-eslint/utils";
 var check_exports = /* @__PURE__ */ __exportAll({
 	is: () => is,
 	isClass: () => isClass,
+	isConditional: () => isConditional,
 	isDirective: () => isDirective,
 	isExpression: () => isExpression,
 	isFunction: () => isFunction,
@@ -117,6 +118,22 @@ const isExpression = isOneOf([
 	AST_NODE_TYPES.UpdateExpression,
 	AST_NODE_TYPES.YieldExpression
 ]);
+/**
+* Check if a node is a conditional expression or control flow statement
+* @param node The node to check
+* @returns True if the node is conditional
+*/
+const isConditional = isOneOf([
+	AST_NODE_TYPES.DoWhileStatement,
+	AST_NODE_TYPES.ForInStatement,
+	AST_NODE_TYPES.ForOfStatement,
+	AST_NODE_TYPES.ForStatement,
+	AST_NODE_TYPES.WhileStatement,
+	AST_NODE_TYPES.IfStatement,
+	AST_NODE_TYPES.SwitchStatement,
+	AST_NODE_TYPES.LogicalExpression,
+	AST_NODE_TYPES.ConditionalExpression
+]);
 
 //#endregion
 //#region ../../.pkgs/eff/dist/index.js
@@ -595,20 +612,25 @@ const takeWhile = dual(2, (xs, pred) => {
 //#endregion
 //#region src/extract.ts
 var extract_exports = /* @__PURE__ */ __exportAll({
+	findProperty: () => findProperty,
 	getCalleeName: () => getCalleeName,
 	getFullyQualifiedName: () => getFullyQualifiedName,
-	getRootIdentifier: () => getRootIdentifier,
-	getStaticPropertyName: () => getStaticPropertyName,
+	getIdentifierAt: () => getIdentifierAt,
+	getPropertyName: () => getPropertyName,
 	unwrap: () => unwrap
 });
 function unwrap(node) {
 	if (isTypeExpression(node) || node.type === AST_NODE_TYPES.ChainExpression) return unwrap(node.expression);
 	return node;
 }
-function getRootIdentifier(node) {
-	const expr = unwrap(node);
-	if (expr.type === AST_NODE_TYPES.Identifier) return expr;
-	if (expr.type === AST_NODE_TYPES.MemberExpression) return getRootIdentifier(expr.object);
+function findProperty(properties, name) {
+	for (const property of properties) {
+		if (property.type === AST_NODE_TYPES.Property && getPropertyName(property) === name) return property;
+		if (property.type === AST_NODE_TYPES.SpreadElement && property.argument.type === AST_NODE_TYPES.ObjectExpression) {
+			const found = findProperty(property.argument.properties, name);
+			if (found != null) return found;
+		}
+	}
 	return null;
 }
 function getCalleeName(node) {
@@ -617,9 +639,10 @@ function getCalleeName(node) {
 	if (callee.type === AST_NODE_TYPES.MemberExpression && !callee.computed && callee.property.type === AST_NODE_TYPES.Identifier) return callee.property.name;
 	return null;
 }
-function getStaticPropertyName(prop) {
-	const key = unwrap(prop.key);
-	if (key.type === AST_NODE_TYPES.Identifier && !prop.computed) return key.name;
+function getPropertyName(property, effort = "min") {
+	const key = unwrap(property.key);
+	if (key.type === AST_NODE_TYPES.Identifier && !property.computed) return key.name;
+	if (effort === "min") return null;
 	if (key.type === AST_NODE_TYPES.Literal && typeof key.value === "string") return key.value;
 	if (key.type === AST_NODE_TYPES.TemplateLiteral && key.expressions.length === 0) return key.quasis[0]?.value.cooked ?? key.quasis[0]?.value.raw ?? null;
 	return null;
@@ -640,6 +663,17 @@ function getFullyQualifiedName(node, getText) {
 		default: return getText(expr);
 	}
 }
+function getIdentifierAt(node, position) {
+	const identifiers = [];
+	let current = unwrap(node);
+	while (current.type === AST_NODE_TYPES.MemberExpression) {
+		const property = unwrap(current.property);
+		identifiers.unshift(property.type === AST_NODE_TYPES.Identifier ? property : null);
+		current = unwrap(current.object);
+	}
+	identifiers.unshift(current.type === AST_NODE_TYPES.Identifier ? current : null);
+	return identifiers.at(position) ?? null;
+}
 
 //#endregion
 //#region src/compare.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/ast",
-  "version": "5.17.2",
+  "version": "5.17.3",
   "description": "ESLint React's TSESTree AST utility module.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -41,8 +41,8 @@
     "typescript": "6.0.3",
     "vitest": "^4.1.10",
     "@local/configs": "0.0.0",
-    "@local/testkit": "0.0.0",
-    "@local/eff": "0.0.0"
+    "@local/eff": "0.0.0",
+    "@local/testkit": "0.0.0"
   },
   "peerDependencies": {
     "eslint": "*",