@eslint-react/ast 2.3.13-beta.2 → 2.3.13-beta.4

package/dist/index.d.ts

@@ -9,53 +9,6 @@ declare function getArrayMethodCallbackIndexParamPosition(methodName: string): n
 declare function isArrayFromCall(node: TSESTree.Node, loose?: boolean): node is TSESTree.CallExpression;
 declare function isArrayMapCall(node: TSESTree.Node, loose?: boolean): node is TSESTree.CallExpression;
 //#endregion
-//#region src/node-equal.d.ts
-/**
- * Determines whether node equals to another node
- * @param a node to compare
- * @param b node to compare
- * @returns `true` if node equal
- * @see https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/src/util/isNodeEqual.ts
- */
-declare const isNodeEqual: {
-  (a: TSESTree.Node): (b: TSESTree.Node) => boolean;
-  (a: TSESTree.Node, b: TSESTree.Node): boolean;
-};
-//#endregion
-//#region src/node-format.d.ts
-/**
- * @internal
- */
-declare function toDelimiterFormat(node: TSESTree.Node, delimiter?: string): "RegExp literal" | Lowercase<string> | `JSX ${Lowercase<string>}`;
-/**
- * Incomplete but sufficient stringification of AST nodes for common use cases
- *
- * @internal
- */
-declare function toStringFormat(node: TSESTree.Node, getText: (node: TSESTree.Node) => string): string;
-//#endregion
-//#region src/node-is.d.ts
-declare const is: <NodeType extends TSESTree.AST_NODE_TYPES>(nodeType: NodeType) => (node: TSESTree.Node | null | undefined) => node is Extract<TSESTree.Node, {
-  type: NodeType;
-}>;
-declare const isOneOf: <NodeTypes extends readonly TSESTree.AST_NODE_TYPES[]>(nodeTypes: NodeTypes) => (node: TSESTree.Node | null | undefined) => node is Extract<TSESTree.Node, {
-  type: NodeTypes[number];
-}>;
-declare const isFunction: (node: TSESTree.Node | null | undefined) => node is TSESTree.ArrowFunctionExpression | TSESTree.FunctionDeclarationWithName | TSESTree.FunctionDeclarationWithOptionalName | TSESTree.FunctionExpression;
-declare const isFunctionType: (node: TSESTree.Node | null | undefined) => node is TSESTree.ArrowFunctionExpression | TSESTree.FunctionDeclarationWithName | TSESTree.FunctionDeclarationWithOptionalName | TSESTree.FunctionExpression | TSESTree.TSCallSignatureDeclaration | TSESTree.TSConstructSignatureDeclaration | TSESTree.TSDeclareFunctionNoDeclare | TSESTree.TSDeclareFunctionWithDeclare | TSESTree.TSEmptyBodyFunctionExpression | TSESTree.TSFunctionType | TSESTree.TSMethodSignatureComputedName | TSESTree.TSMethodSignatureNonComputedName;
-declare const isClass: (node: TSESTree.Node | null | undefined) => node is TSESTree.ClassDeclarationWithName | TSESTree.ClassDeclarationWithOptionalName | TSESTree.ClassExpression;
-declare const isMethodOrProperty: (node: TSESTree.Node | null | undefined) => node is TSESTree.MethodDefinitionComputedName | TSESTree.MethodDefinitionNonComputedName | TSESTree.PropertyDefinitionComputedName | TSESTree.PropertyDefinitionNonComputedName;
-declare const isProperty: (node: TSESTree.Node | null | undefined) => node is TSESTree.PropertyDefinitionComputedName | TSESTree.PropertyDefinitionNonComputedName | TSESTree.TSIndexSignature | TSESTree.TSParameterProperty | TSESTree.TSPropertySignatureComputedName | TSESTree.TSPropertySignatureNonComputedName;
-declare const isJSXElement: (node: TSESTree.Node | null | undefined) => node is TSESTree.JSXElement;
-declare const isJSXFragment: (node: TSESTree.Node | null | undefined) => node is TSESTree.JSXFragment;
-declare const isJSXTagNameExpression: (node: TSESTree.Node | null | undefined) => node is TSESTree.JSXIdentifier | TSESTree.JSXMemberExpression | TSESTree.JSXNamespacedName;
-declare const isJSX: (node: TSESTree.Node | null | undefined) => node is TSESTree.JSXAttribute | TSESTree.JSXClosingElement | TSESTree.JSXClosingFragment | TSESTree.JSXElement | TSESTree.JSXEmptyExpression | TSESTree.JSXExpressionContainer | TSESTree.JSXFragment | TSESTree.JSXIdentifier | TSESTree.JSXMemberExpression | TSESTree.JSXNamespacedName | TSESTree.JSXOpeningElement | TSESTree.JSXOpeningFragment | TSESTree.JSXSpreadAttribute | TSESTree.JSXSpreadChild | TSESTree.JSXText;
-declare const isLoop: (node: TSESTree.Node | null | undefined) => node is TSESTree.DoWhileStatement | TSESTree.ForInStatement | TSESTree.ForOfStatement | TSESTree.ForStatement | TSESTree.WhileStatement;
-declare const isControlFlow: (data: TSESTree.Node | null | undefined) => data is TSESTree.DoWhileStatement | TSESTree.ForInStatement | TSESTree.ForOfStatement | TSESTree.ForStatement | TSESTree.IfStatement | TSESTree.SwitchStatement | TSESTree.WhileStatement;
-declare const isConditional: (data: TSESTree.Node | null | undefined) => data is TSESTree.ConditionalExpression | TSESTree.DoWhileStatement | TSESTree.ForInStatement | TSESTree.ForOfStatement | TSESTree.ForStatement | TSESTree.IfStatement | TSESTree.LogicalExpression | TSESTree.SwitchStatement | TSESTree.WhileStatement;
-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;
-//#endregion
 //#region src/node-types.d.ts
 type TSESTreeFunction = TSESTree$1.ArrowFunctionExpression | TSESTree$1.FunctionDeclaration | TSESTree$1.FunctionExpression;
 type TSESTreeFunctionType = TSESTree$1.TSCallSignatureDeclaration | TSESTree$1.TSConstructSignatureDeclaration | TSESTree$1.TSDeclareFunction | TSESTree$1.TSEmptyBodyFunctionExpression | TSESTree$1.TSFunctionType | TSESTree$1.TSMethodSignature | TSESTreeFunction;
@@ -189,6 +142,53 @@ declare function isMultiLine(node: TSESTree.Node): boolean;
  */
 declare function isLineBreak(node: TSESTree.Node): boolean;
 //#endregion
+//#region src/node-equal.d.ts
+/**
+ * Determines whether node equals to another node
+ * @param a node to compare
+ * @param b node to compare
+ * @returns `true` if node equal
+ * @see https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/src/util/isNodeEqual.ts
+ */
+declare const isNodeEqual: {
+  (a: TSESTree.Node): (b: TSESTree.Node) => boolean;
+  (a: TSESTree.Node, b: TSESTree.Node): boolean;
+};
+//#endregion
+//#region src/node-format.d.ts
+/**
+ * @internal
+ */
+declare function toDelimiterFormat(node: TSESTree.Node, delimiter?: string): "RegExp literal" | Lowercase<string> | `JSX ${Lowercase<string>}`;
+/**
+ * Incomplete but sufficient stringification of AST nodes for common use cases
+ *
+ * @internal
+ */
+declare function toStringFormat(node: TSESTree.Node, getText: (node: TSESTree.Node) => string): string;
+//#endregion
+//#region src/node-is.d.ts
+declare const is: <NodeType extends TSESTree.AST_NODE_TYPES>(nodeType: NodeType) => (node: TSESTree.Node | null | undefined) => node is Extract<TSESTree.Node, {
+  type: NodeType;
+}>;
+declare const isOneOf: <NodeTypes extends readonly TSESTree.AST_NODE_TYPES[]>(nodeTypes: NodeTypes) => (node: TSESTree.Node | null | undefined) => node is Extract<TSESTree.Node, {
+  type: NodeTypes[number];
+}>;
+declare const isFunction: (node: TSESTree.Node | null | undefined) => node is TSESTree.ArrowFunctionExpression | TSESTree.FunctionDeclarationWithName | TSESTree.FunctionDeclarationWithOptionalName | TSESTree.FunctionExpression;
+declare const isFunctionType: (node: TSESTree.Node | null | undefined) => node is TSESTree.ArrowFunctionExpression | TSESTree.FunctionDeclarationWithName | TSESTree.FunctionDeclarationWithOptionalName | TSESTree.FunctionExpression | TSESTree.TSCallSignatureDeclaration | TSESTree.TSConstructSignatureDeclaration | TSESTree.TSDeclareFunctionNoDeclare | TSESTree.TSDeclareFunctionWithDeclare | TSESTree.TSEmptyBodyFunctionExpression | TSESTree.TSFunctionType | TSESTree.TSMethodSignatureComputedName | TSESTree.TSMethodSignatureNonComputedName;
+declare const isClass: (node: TSESTree.Node | null | undefined) => node is TSESTree.ClassDeclarationWithName | TSESTree.ClassDeclarationWithOptionalName | TSESTree.ClassExpression;
+declare const isMethodOrProperty: (node: TSESTree.Node | null | undefined) => node is TSESTree.MethodDefinitionComputedName | TSESTree.MethodDefinitionNonComputedName | TSESTree.PropertyDefinitionComputedName | TSESTree.PropertyDefinitionNonComputedName;
+declare const isProperty: (node: TSESTree.Node | null | undefined) => node is TSESTree.PropertyDefinitionComputedName | TSESTree.PropertyDefinitionNonComputedName | TSESTree.TSIndexSignature | TSESTree.TSParameterProperty | TSESTree.TSPropertySignatureComputedName | TSESTree.TSPropertySignatureNonComputedName;
+declare const isJSXElement: (node: TSESTree.Node | null | undefined) => node is TSESTree.JSXElement;
+declare const isJSXFragment: (node: TSESTree.Node | null | undefined) => node is TSESTree.JSXFragment;
+declare const isJSXTagNameExpression: (node: TSESTree.Node | null | undefined) => node is TSESTree.JSXIdentifier | TSESTree.JSXMemberExpression | TSESTree.JSXNamespacedName;
+declare const isJSX: (node: TSESTree.Node | null | undefined) => node is TSESTree.JSXAttribute | TSESTree.JSXClosingElement | TSESTree.JSXClosingFragment | TSESTree.JSXElement | TSESTree.JSXEmptyExpression | TSESTree.JSXExpressionContainer | TSESTree.JSXFragment | TSESTree.JSXIdentifier | TSESTree.JSXMemberExpression | TSESTree.JSXNamespacedName | TSESTree.JSXOpeningElement | TSESTree.JSXOpeningFragment | TSESTree.JSXSpreadAttribute | TSESTree.JSXSpreadChild | TSESTree.JSXText;
+declare const isLoop: (node: TSESTree.Node | null | undefined) => node is TSESTree.DoWhileStatement | TSESTree.ForInStatement | TSESTree.ForOfStatement | TSESTree.ForStatement | TSESTree.WhileStatement;
+declare const isControlFlow: (data: TSESTree.Node | null | undefined) => data is TSESTree.DoWhileStatement | TSESTree.ForInStatement | TSESTree.ForOfStatement | TSESTree.ForStatement | TSESTree.IfStatement | TSESTree.SwitchStatement | TSESTree.WhileStatement;
+declare const isConditional: (data: TSESTree.Node | null | undefined) => data is TSESTree.ConditionalExpression | TSESTree.DoWhileStatement | TSESTree.ForInStatement | TSESTree.ForOfStatement | TSESTree.ForStatement | TSESTree.IfStatement | TSESTree.LogicalExpression | TSESTree.SwitchStatement | TSESTree.WhileStatement;
+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;
+//#endregion
 //#region src/node-selectors.d.ts
 type ImplicitReturnArrowFunctionExpression = TSESTree$1.ArrowFunctionExpression & {
   body: TSESTree$1.Expression;
@@ -233,7 +233,7 @@ declare function isThenCall(node: TSESTree.CallExpression): boolean;
 //#region src/property-name.d.ts
 declare function getPropertyName(node: TSESTree.Node): string | unit;
 //#endregion
-//#region src/traverse-up.d.ts
+//#region src/traverse.d.ts
 /**
  * Find the parent node that satisfies the test function
  * @param node The AST node

package/dist/index.js

@@ -1,8 +1,8 @@
 import { AST_NODE_TYPES } from "@typescript-eslint/types";
 import { dual, or, unit } from "@eslint-react/eff";
-import { delimiterCase, replace, toLowerCase } from "string-ts";
 import { ASTUtils } from "@typescript-eslint/utils";
 import { simpleTraverse } from "@typescript-eslint/typescript-estree";
+import { delimiterCase, replace, toLowerCase } from "string-ts";
 
 //#region src/array-index.ts
 const indexParamPosition = new Map([
@@ -48,45 +48,6 @@ function getClassId(node) {
 	return unit;
 }
 
-//#endregion
-//#region src/node-equal.ts
-/**
-* Determines whether node equals to another node
-* @param a node to compare
-* @param b node to compare
-* @returns `true` if node equal
-* @see https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/src/util/isNodeEqual.ts
-*/
-const isNodeEqual = dual(2, (a, b) => {
-	switch (true) {
-		case a === b: return true;
-		case a.type !== b.type: return false;
-		case a.type === AST_NODE_TYPES.Literal && b.type === AST_NODE_TYPES.Literal: return a.value === b.value;
-		case a.type === AST_NODE_TYPES.TemplateElement && b.type === AST_NODE_TYPES.TemplateElement: return a.value.raw === b.value.raw;
-		case a.type === AST_NODE_TYPES.TemplateLiteral && b.type === AST_NODE_TYPES.TemplateLiteral: {
-			if (a.quasis.length !== b.quasis.length || a.expressions.length !== b.expressions.length) return false;
-			let i = a.quasis.length;
-			while (i--) if (a.quasis[i]?.value.raw !== b.quasis[i]?.value.raw) return false;
-			i = a.expressions.length;
-			while (i--) {
-				const exprA = a.expressions[i];
-				const exprB = b.expressions[i];
-				if (!isNodeEqual(exprA, exprB)) return false;
-			}
-			return true;
-		}
-		case a.type === AST_NODE_TYPES.Identifier && b.type === AST_NODE_TYPES.Identifier: return a.name === b.name;
-		case a.type === AST_NODE_TYPES.PrivateIdentifier && b.type === AST_NODE_TYPES.PrivateIdentifier: return a.name === b.name;
-		case a.type === AST_NODE_TYPES.MemberExpression && b.type === AST_NODE_TYPES.MemberExpression: return isNodeEqual(a.property, b.property) && isNodeEqual(a.object, b.object);
-		case a.type === AST_NODE_TYPES.JSXAttribute && b.type === AST_NODE_TYPES.JSXAttribute:
-			if (a.name.name !== b.name.name) return false;
-			if (a.value == null || b.value == null) return a.value === b.value;
-			return isNodeEqual(a.value, b.value);
-		case a.type === AST_NODE_TYPES.ThisExpression && b.type === AST_NODE_TYPES.ThisExpression: return true;
-		default: return false;
-	}
-});
-
 //#endregion
 //#region src/node-is.ts
 const is = ASTUtils.isNodeOfType;
@@ -162,42 +123,6 @@ const isTypeAssertionExpression = isOneOf([
 	AST_NODE_TYPES.TSSatisfiesExpression
 ]);
 
-//#endregion
-//#region src/node-format.ts
-function getLiteralValueType(input) {
-	if (input === null) return "null";
-	return typeof input;
-}
-/**
-* @internal
-*/
-function toDelimiterFormat(node, delimiter = " ") {
-	if (node.type === AST_NODE_TYPES.Literal) {
-		if ("regex" in node) return "RegExp literal";
-		return `${getLiteralValueType(node.value)} literal`;
-	}
-	if (isJSX(node)) return `JSX ${toLowerCase(delimiterCase(replace(node.type, "JSX", ""), delimiter))}`;
-	return toLowerCase(delimiterCase(node.type, delimiter));
-}
-/**
-* Incomplete but sufficient stringification of AST nodes for common use cases
-*
-* @internal
-*/
-function toStringFormat(node, getText) {
-	switch (node.type) {
-		case AST_NODE_TYPES.Identifier:
-		case AST_NODE_TYPES.JSXIdentifier:
-		case AST_NODE_TYPES.PrivateIdentifier: return node.name;
-		case AST_NODE_TYPES.MemberExpression:
-		case AST_NODE_TYPES.JSXMemberExpression: return `${toStringFormat(node.object, getText)}.${toStringFormat(node.property, getText)}`;
-		case AST_NODE_TYPES.JSXNamespacedName: return `${node.namespace.name}:${node.name.name}`;
-		case AST_NODE_TYPES.JSXText: return node.value;
-		case AST_NODE_TYPES.Literal: return node.raw;
-		default: return getText(node);
-	}
-}
-
 //#endregion
 //#region src/expression-base.ts
 /**
@@ -226,7 +151,7 @@ function isThisExpression(node) {
 }
 
 //#endregion
-//#region src/traverse-up.ts
+//#region src/traverse.ts
 function findParentNode(node, test) {
 	if (node == null) return unit;
 	let parent = node.parent;
@@ -555,6 +480,83 @@ function isLineBreak(node) {
 	return isOneOf([AST_NODE_TYPES.Literal, AST_NODE_TYPES.JSXText])(node) && typeof node.value === "string" && node.value.trim() === "" && isMultiLine(node);
 }
 
+//#endregion
+//#region src/node-equal.ts
+/**
+* Determines whether node equals to another node
+* @param a node to compare
+* @param b node to compare
+* @returns `true` if node equal
+* @see https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/src/util/isNodeEqual.ts
+*/
+const isNodeEqual = dual(2, (a, b) => {
+	a = isTypeExpression(a) ? getUnderlyingExpression(a) : a;
+	b = isTypeExpression(b) ? getUnderlyingExpression(b) : b;
+	switch (true) {
+		case a === b: return true;
+		case a.type !== b.type: return false;
+		case a.type === AST_NODE_TYPES.Literal && b.type === AST_NODE_TYPES.Literal: return a.value === b.value;
+		case a.type === AST_NODE_TYPES.TemplateElement && b.type === AST_NODE_TYPES.TemplateElement: return a.value.raw === b.value.raw;
+		case a.type === AST_NODE_TYPES.TemplateLiteral && b.type === AST_NODE_TYPES.TemplateLiteral: {
+			if (a.quasis.length !== b.quasis.length || a.expressions.length !== b.expressions.length) return false;
+			let i = a.quasis.length;
+			while (i--) if (a.quasis[i]?.value.raw !== b.quasis[i]?.value.raw) return false;
+			i = a.expressions.length;
+			while (i--) {
+				const exprA = a.expressions[i];
+				const exprB = b.expressions[i];
+				if (!isNodeEqual(exprA, exprB)) return false;
+			}
+			return true;
+		}
+		case a.type === AST_NODE_TYPES.Identifier && b.type === AST_NODE_TYPES.Identifier: return a.name === b.name;
+		case a.type === AST_NODE_TYPES.PrivateIdentifier && b.type === AST_NODE_TYPES.PrivateIdentifier: return a.name === b.name;
+		case a.type === AST_NODE_TYPES.MemberExpression && b.type === AST_NODE_TYPES.MemberExpression: return isNodeEqual(a.property, b.property) && isNodeEqual(a.object, b.object);
+		case a.type === AST_NODE_TYPES.JSXAttribute && b.type === AST_NODE_TYPES.JSXAttribute:
+			if (a.name.name !== b.name.name) return false;
+			if (a.value == null || b.value == null) return a.value === b.value;
+			return isNodeEqual(a.value, b.value);
+		case a.type === AST_NODE_TYPES.ThisExpression && b.type === AST_NODE_TYPES.ThisExpression: return true;
+		default: return false;
+	}
+});
+
+//#endregion
+//#region src/node-format.ts
+function getLiteralValueType(input) {
+	if (input === null) return "null";
+	return typeof input;
+}
+/**
+* @internal
+*/
+function toDelimiterFormat(node, delimiter = " ") {
+	if (node.type === AST_NODE_TYPES.Literal) {
+		if ("regex" in node) return "RegExp literal";
+		return `${getLiteralValueType(node.value)} literal`;
+	}
+	if (isJSX(node)) return `JSX ${toLowerCase(delimiterCase(replace(node.type, "JSX", ""), delimiter))}`;
+	return toLowerCase(delimiterCase(node.type, delimiter));
+}
+/**
+* Incomplete but sufficient stringification of AST nodes for common use cases
+*
+* @internal
+*/
+function toStringFormat(node, getText) {
+	switch (node.type) {
+		case AST_NODE_TYPES.Identifier:
+		case AST_NODE_TYPES.JSXIdentifier:
+		case AST_NODE_TYPES.PrivateIdentifier: return node.name;
+		case AST_NODE_TYPES.MemberExpression:
+		case AST_NODE_TYPES.JSXMemberExpression: return `${toStringFormat(node.object, getText)}.${toStringFormat(node.property, getText)}`;
+		case AST_NODE_TYPES.JSXNamespacedName: return `${node.namespace.name}:${node.name.name}`;
+		case AST_NODE_TYPES.JSXText: return node.value;
+		case AST_NODE_TYPES.Literal: return node.raw;
+		default: return getText(node);
+	}
+}
+
 //#endregion
 //#region src/node-selectors.ts
 const SEL_IMPLICIT_RETURN_ARROW_FUNCTION_EXPRESSION = "ArrowFunctionExpression[body.type!='BlockStatement']";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/ast",
-  "version": "2.3.13-beta.2",
+  "version": "2.3.13-beta.4",
   "description": "ESLint React's TSESTree AST utility module.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -34,7 +34,7 @@
     "@typescript-eslint/typescript-estree": "^8.48.1",
     "@typescript-eslint/utils": "^8.48.1",
     "string-ts": "^2.3.1",
-    "@eslint-react/eff": "2.3.13-beta.2"
+    "@eslint-react/eff": "2.3.13-beta.4"
   },
   "peerDependencies": {
     "eslint": "^8.57.0 || ^9.0.0",