@eslint-react/ast 2.9.1-next.0 → 2.9.1

package/dist/index.d.ts

@@ -55,6 +55,19 @@ type TSESTreeTypeExpression = TSESTree$1.TSAsExpression | TSESTree$1.TSNonNullEx
  * Represents TypeScript type assertion expressions (excluding instantiation expressions)
  */
 type TSESTreeTypeAssertionExpression = TSESTree$1.TSAsExpression | TSESTree$1.TSNonNullExpression | TSESTree$1.TSSatisfiesExpression | TSESTree$1.TSTypeAssertion;
+/**
+ * Represents a directive expression statement in TSESTree (e.g., "use strict";)
+ */
+type TSESTreeDirective = TSESTree$1.ExpressionStatement & {
+  directive: string;
+  expression: TSESTree$1.StringLiteral;
+};
+/**
+ * Represents a directive-like expression statement in TSESTree
+ */
+type TSESTreeDirectiveLike = TSESTree$1.ExpressionStatement & {
+  expression: TSESTree$1.StringLiteral;
+};
 //#endregion
 //#region src/class-id.d.ts
 /**
@@ -66,11 +79,17 @@ declare function getClassId(node: TSESTreeClass): TSESTree.BindingName | unit;
 //#endregion
 //#region src/directive-is.d.ts
 /**
- * Check if a node is a directive
+ * Check if a node is a directive expression statement
+ * @param node The node to check
+ * @returns True if the node is a directive, false otherwise
+ */
+declare function isDirective(node: TSESTree.Node): node is TSESTreeDirective;
+/**
+ * Check if a node is a directive-like expression statement
  * @param node The node to check
  * @returns True if the node is a directive, false otherwise
  */
-declare function isDirective(node: TSESTree.Node): node is TSESTree.StringLiteral;
+declare function isDirectiveLike(node: TSESTree.Node): node is TSESTreeDirectiveLike;
 //#endregion
 //#region src/directive-kind.d.ts
 type DirectiveKind = "use client" | "use server" | "use memo" | "use no memo";
@@ -158,11 +177,11 @@ declare const getNestedCallExpressions: (node: TSESTree.Node) => TSESTree.CallEx
 //#endregion
 //#region src/file-directive.d.ts
 /**
- * Get all directive string literals from a program node
+ * Get all directive expression statements from the top of a program AST node
  * @param node The program AST node
  * @returns The array of directive string literals (e.g., "use strict")
  */
-declare function getFileDirectives(node: TSESTree.Program): TSESTree.StringLiteral[];
+declare function getFileDirectives(node: TSESTree.Program): TSESTreeDirective[];
 //#endregion
 //#region src/format.d.ts
 /**
@@ -182,11 +201,11 @@ declare function toStringFormat(node: TSESTree.Node, getText: (node: TSESTree.No
 //#endregion
 //#region src/function-directive.d.ts
 /**
- * Get all directive string literals from a function node
+ * Get all directive expression statements from the top of a function AST node
  * @param node The function AST node
  * @returns The array of directive string literals (e.g., "use memo", "use no memo")
  */
-declare function getFunctionDirectives(node: TSESTreeFunction): TSESTree.StringLiteral[];
+declare function getFunctionDirectives(node: TSESTreeFunction): TSESTreeDirective[];
 //#endregion
 //#region src/function-id.d.ts
 /**
@@ -483,4 +502,4 @@ declare function isViMock(node: TSESTree.Node | null | unit): node is TSESTree.M
  */
 declare function isViMockCallback(node: TSESTree.Node | null | unit): boolean;
 //#endregion
-export { DirectiveKind, DisplayNameAssignmentExpression, FunctionID, FunctionInitPath, ImplicitReturnArrowFunctionExpression, ObjectDestructuringVariableDeclarator, SEL_DISPLAY_NAME_ASSIGNMENT_EXPRESSION, SEL_IMPLICIT_RETURN_ARROW_FUNCTION_EXPRESSION, SEL_OBJECT_DESTRUCTURING_VARIABLE_DECLARATOR, TSESTreeArrayTupleType, TSESTreeClass, TSESTreeDestructuringPattern, TSESTreeFunction, TSESTreeFunctionType, TSESTreeJSX, TSESTreeJSXAttributeLike, TSESTreeLoop, TSESTreeMethodOrProperty, TSESTreeProperty, TSESTreeTypeAssertionExpression, TSESTreeTypeDeclaration, TSESTreeTypeExpression, findParentNode, getClassId, getFileDirectives, getFunctionDirectives, getFunctionId, getFunctionInitPath, getNestedCallExpressions, getNestedExpressionsOfType, getNestedIdentifiers, getNestedNewExpressions, getNestedReturnStatements, getPropertyName, getUnderlyingExpression, hasCallInFunctionInitPath, is, isClass, isConditional, isControlFlow, isDirective, isDirectiveKind, isDirectiveName, isFunction, isFunctionEmpty, isFunctionImmediatelyInvoked, isFunctionType, isIdentifier, isIdentifierName, isJSX, isJSXElement, isJSXFragment, isJSXTagNameExpression, isLineBreak, isLiteral, isLoop, isMethodOrProperty, isMultiLine, isNodeEqual, isOneOf, isProcessEnvNodeEnv, isProcessEnvNodeEnvCompare, isProperty, isThisExpressionLoose, isTypeAssertionExpression, isTypeExpression, isViMock, isViMockCallback, toDelimiterFormat, toStringFormat };
+export { DirectiveKind, DisplayNameAssignmentExpression, FunctionID, FunctionInitPath, ImplicitReturnArrowFunctionExpression, ObjectDestructuringVariableDeclarator, SEL_DISPLAY_NAME_ASSIGNMENT_EXPRESSION, SEL_IMPLICIT_RETURN_ARROW_FUNCTION_EXPRESSION, SEL_OBJECT_DESTRUCTURING_VARIABLE_DECLARATOR, TSESTreeArrayTupleType, TSESTreeClass, TSESTreeDestructuringPattern, TSESTreeDirective, TSESTreeDirectiveLike, TSESTreeFunction, TSESTreeFunctionType, TSESTreeJSX, TSESTreeJSXAttributeLike, TSESTreeLoop, TSESTreeMethodOrProperty, TSESTreeProperty, TSESTreeTypeAssertionExpression, TSESTreeTypeDeclaration, TSESTreeTypeExpression, findParentNode, getClassId, getFileDirectives, getFunctionDirectives, getFunctionId, getFunctionInitPath, getNestedCallExpressions, getNestedExpressionsOfType, getNestedIdentifiers, getNestedNewExpressions, getNestedReturnStatements, getPropertyName, getUnderlyingExpression, hasCallInFunctionInitPath, is, isClass, isConditional, isControlFlow, isDirective, isDirectiveKind, isDirectiveLike, isDirectiveName, isFunction, isFunctionEmpty, isFunctionImmediatelyInvoked, isFunctionType, isIdentifier, isIdentifierName, isJSX, isJSXElement, isJSXFragment, isJSXTagNameExpression, isLineBreak, isLiteral, isLoop, isMethodOrProperty, isMultiLine, isNodeEqual, isOneOf, isProcessEnvNodeEnv, isProcessEnvNodeEnvCompare, isProperty, isThisExpressionLoose, isTypeAssertionExpression, isTypeExpression, isViMock, isViMockCallback, toDelimiterFormat, toStringFormat };

package/dist/index.js

@@ -44,12 +44,20 @@ function isLiteral(node, type) {
 //#endregion
 //#region src/directive-is.ts
 /**
-* Check if a node is a directive
+* Check if a node is a directive expression statement
 * @param node The node to check
 * @returns True if the node is a directive, false otherwise
 */
 function isDirective(node) {
-	return isLiteral(node, "string") && isDirectiveName(node.value);
+	return node.type === AST_NODE_TYPES.ExpressionStatement && node.directive != null;
+}
+/**
+* Check if a node is a directive-like expression statement
+* @param node The node to check
+* @returns True if the node is a directive, false otherwise
+*/
+function isDirectiveLike(node) {
+	return node.type === AST_NODE_TYPES.ExpressionStatement && isLiteral(node.expression, "string") && isDirectiveName(node.expression.value);
 }
 
 //#endregion
@@ -483,17 +491,15 @@ const getNestedCallExpressions = getNestedExpressionsOfType(AST_NODE_TYPES.CallE
 //#endregion
 //#region src/file-directive.ts
 /**
-* Get all directive string literals from a program node
+* Get all directive expression statements from the top of a program AST node
 * @param node The program AST node
 * @returns The array of directive string literals (e.g., "use strict")
 */
 function getFileDirectives(node) {
 	const directives = [];
 	for (const stmt of node.body) {
-		if (stmt.type !== AST_NODE_TYPES.ExpressionStatement) continue;
-		const expr = getUnderlyingExpression(stmt.expression);
-		if (!isDirective(expr)) continue;
-		directives.push(expr);
+		if (!isDirective(stmt)) continue;
+		directives.push(stmt);
 	}
 	return directives;
 }
@@ -538,7 +544,7 @@ function toStringFormat(node, getText) {
 //#endregion
 //#region src/function-directive.ts
 /**
-* Get all directive string literals from a function node
+* Get all directive expression statements from the top of a function AST node
 * @param node The function AST node
 * @returns The array of directive string literals (e.g., "use memo", "use no memo")
 */
@@ -546,10 +552,8 @@ function getFunctionDirectives(node) {
 	const directives = [];
 	if (node.body.type !== AST_NODE_TYPES.BlockStatement) return directives;
 	for (const stmt of node.body.body) {
-		if (stmt.type !== AST_NODE_TYPES.ExpressionStatement) continue;
-		const expr = getUnderlyingExpression(stmt.expression);
-		if (!isDirective(expr)) continue;
-		directives.push(expr);
+		if (!isDirective(stmt)) continue;
+		directives.push(stmt);
 	}
 	return directives;
 }
@@ -796,4 +800,4 @@ function isViMockCallback(node) {
 }
 
 //#endregion
-export { SEL_DISPLAY_NAME_ASSIGNMENT_EXPRESSION, SEL_IMPLICIT_RETURN_ARROW_FUNCTION_EXPRESSION, SEL_OBJECT_DESTRUCTURING_VARIABLE_DECLARATOR, findParentNode, getClassId, getFileDirectives, getFunctionDirectives, getFunctionId, getFunctionInitPath, getNestedCallExpressions, getNestedExpressionsOfType, getNestedIdentifiers, getNestedNewExpressions, getNestedReturnStatements, getPropertyName, getUnderlyingExpression, hasCallInFunctionInitPath, is, isClass, isConditional, isControlFlow, isDirective, isDirectiveKind, isDirectiveName, isFunction, isFunctionEmpty, isFunctionImmediatelyInvoked, isFunctionType, isIdentifier, isIdentifierName, isJSX, isJSXElement, isJSXFragment, isJSXTagNameExpression, isLineBreak, isLiteral, isLoop, isMethodOrProperty, isMultiLine, isNodeEqual, isOneOf, isProcessEnvNodeEnv, isProcessEnvNodeEnvCompare, isProperty, isThisExpressionLoose, isTypeAssertionExpression, isTypeExpression, isViMock, isViMockCallback, toDelimiterFormat, toStringFormat };
+export { SEL_DISPLAY_NAME_ASSIGNMENT_EXPRESSION, SEL_IMPLICIT_RETURN_ARROW_FUNCTION_EXPRESSION, SEL_OBJECT_DESTRUCTURING_VARIABLE_DECLARATOR, findParentNode, getClassId, getFileDirectives, getFunctionDirectives, getFunctionId, getFunctionInitPath, getNestedCallExpressions, getNestedExpressionsOfType, getNestedIdentifiers, getNestedNewExpressions, getNestedReturnStatements, getPropertyName, getUnderlyingExpression, hasCallInFunctionInitPath, is, isClass, isConditional, isControlFlow, isDirective, isDirectiveKind, isDirectiveLike, isDirectiveName, isFunction, isFunctionEmpty, isFunctionImmediatelyInvoked, isFunctionType, isIdentifier, isIdentifierName, isJSX, isJSXElement, isJSXFragment, isJSXTagNameExpression, isLineBreak, isLiteral, isLoop, isMethodOrProperty, isMultiLine, isNodeEqual, isOneOf, isProcessEnvNodeEnv, isProcessEnvNodeEnvCompare, isProperty, isThisExpressionLoose, isTypeAssertionExpression, isTypeExpression, isViMock, isViMockCallback, toDelimiterFormat, toStringFormat };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/ast",
-  "version": "2.9.1-next.0",
+  "version": "2.9.1",
   "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.54.0",
     "@typescript-eslint/utils": "^8.54.0",
     "string-ts": "^2.3.1",
-    "@eslint-react/eff": "2.9.1-next.0"
+    "@eslint-react/eff": "2.9.1"
   },
   "devDependencies": {
     "tsdown": "^0.20.1",