eslint-plugin-react-rsc 5.10.1 → 5.10.3

package/dist/index.js

@@ -34,7 +34,7 @@ const rules$4 = { "react-rsc/function-definition": "off" };
 //#endregion
 //#region package.json
 var name$4 = "eslint-plugin-react-rsc";
-var version = "5.10.1";
+var version = "5.10.3";
 
 //#endregion
 //#region src/utils/create-rule.ts
@@ -66,148 +66,145 @@ var function_definition_default = createRule({
 	create,
 	defaultOptions: []
 });
+function isDirectiveName(value) {
+	return value === "use client" || value === "use server";
+}
+/**
+* Match a statement against directive-like expressions (`'use client'`, `"use server"`, `` `use server` ``, etc.)
+* @param stmt The statement to match
+* @returns The match result, or `null` if the statement is not directive-like
+*/
+function matchDirective(stmt) {
+	if (stmt.type !== AST_NODE_TYPES.ExpressionStatement) return null;
+	const { expression } = stmt;
+	if (Check.isStringLiteral(expression)) {
+		if (!isDirectiveName(expression.value)) return null;
+		return {
+			kind: stmt.directive != null ? "well-formed" : "misplaced",
+			name: expression.value,
+			node: stmt
+		};
+	}
+	if (expression.type === AST_NODE_TYPES.TemplateLiteral && expression.expressions.length === 0 && expression.quasis.length === 1) {
+		const value = expression.quasis[0]?.value.cooked;
+		if (!isDirectiveName(value)) return null;
+		return {
+			kind: "backtick",
+			name: value,
+			node: stmt
+		};
+	}
+	return null;
+}
 function create(context) {
-	const hasUseServer = context.sourceCode.text.includes("use server");
-	const hasUseClient = context.sourceCode.text.includes("use client");
-	if (!hasUseServer && !hasUseClient) return {};
+	const text = context.sourceCode.text;
+	if (!text.includes("use server") && !text.includes("use client")) return {};
 	const hasFileLevelUseServerDirective = context.sourceCode.ast.body.some(Check.isDirective("use server"));
 	/**
-	* Check if `node` is an async function, and report if not
-	* @param node The function node to check
-	* @returns Whether a report was made
+	* Build a fix that makes `node` an async function
+	* @param node The function node to fix
+	* @returns The fix function, or `null` if no fix is available
 	*/
 	function getAsyncFix(node) {
-		if (node.type === AST_NODE_TYPES.FunctionDeclaration || node.type === AST_NODE_TYPES.FunctionExpression) {
-			const fnToken = context.sourceCode.getFirstToken(node);
-			if (fnToken != null) return (fixer) => fixer.insertTextBefore(fnToken, "async ");
-			return null;
-		}
 		if (node.type === AST_NODE_TYPES.ArrowFunctionExpression) return (fixer) => fixer.insertTextBefore(node, "async ");
-		return null;
-	}
-	function reportNonAsyncFunction(node, messageId) {
-		if (node == null) return false;
-		const unwrapped = Extract.unwrap(node);
-		if (!Check.isFunction(unwrapped)) return false;
-		if (!unwrapped.async) {
-			context.report({
-				fix: getAsyncFix(unwrapped),
-				messageId,
-				node: unwrapped
-			});
-			return true;
-		}
-		return false;
-	}
-	/**
-	* Check non-exported local functions for 'use server' directives, and report if they are not async
-	* @param node The function node to check
-	*/
-	function checkLocalServerFunction(node) {
-		if (core.getFunctionDirectives(node).some((d) => d.directive === "use server")) reportNonAsyncFunction(node, "local");
+		const functionToken = context.sourceCode.getFirstToken(node);
+		if (functionToken == null) return null;
+		return (fixer) => fixer.insertTextBefore(functionToken, "async ");
 	}
 	/**
-	* Find function declarations from exports and check them
-	* @param id The identifier of the exported function
+	* Report `node` if it resolves to a non-async function
+	* @param node The node to check, may be `null` for convenience at call sites
+	* @param messageId The message to report with
 	*/
-	function findAndCheckExportedFunctionDeclarations(id) {
-		const initNode = resolve(context, id);
-		if (initNode == null) return;
-		const unwrapped = Extract.unwrap(initNode);
-		if (!Check.isFunction(unwrapped)) return;
-		reportNonAsyncFunction(unwrapped, "file");
+	function reportNonAsyncFunction(node, messageId) {
+		if (node == null) return;
+		const fn = Extract.unwrap(node);
+		if (!Check.isFunction(fn) || fn.async) return;
+		context.report({
+			fix: getAsyncFix(fn),
+			messageId,
+			node: fn
+		});
 	}
 	/**
 	* Check file-level directives for correct position and quote style.
-	* Well-formed directives at the beginning of the file will have a `directive` property.
-	* If they appear after other code, the parser will not set `directive`.
+	* @param program The Program node
 	*/
-	function checkFileLevelDirectives() {
-		for (const node of context.sourceCode.ast.body) {
-			if (node.type !== AST_NODE_TYPES.ExpressionStatement) continue;
-			if (Check.isStringLiteral(node.expression)) {
-				const value = node.expression.value;
-				if ((value === "use server" || value === "use client") && node.directive == null) context.report({
-					data: { name: value },
-					messageId: "fileDirectivePosition",
-					node
-				});
-				continue;
-			}
-			if (node.expression.type === AST_NODE_TYPES.TemplateLiteral && node.expression.quasis.length === 1 && node.expression.expressions.length === 0) {
-				const value = node.expression.quasis[0]?.value.cooked;
-				if (value === "use server" || value === "use client") context.report({
-					data: { name: value },
-					messageId: "fileDirectiveQuote",
-					node
-				});
-			}
+	function checkFileDirectives(program) {
+		for (const stmt of program.body) {
+			const match = matchDirective(stmt);
+			if (match == null || match.kind === "well-formed") continue;
+			context.report({
+				data: { name: match.name },
+				messageId: match.kind === "backtick" ? "fileDirectiveQuote" : "fileDirectivePosition",
+				node: match.node
+			});
 		}
 	}
 	/**
-	* Check function-level directives for correct position and quote style.
+	* Check function-level directives for correct position and quote style,
+	* and report if a `use server` function is not async.
 	* @param node The function node to check
 	*/
-	function checkFunctionDirectives(node) {
+	function checkFunction(node) {
 		if (node.body.type !== AST_NODE_TYPES.BlockStatement) return;
 		for (const stmt of node.body.body) {
-			if (stmt.type !== AST_NODE_TYPES.ExpressionStatement) continue;
-			if (Check.isStringLiteral(stmt.expression)) {
-				const value = stmt.expression.value;
-				if (value === "use server" && stmt.directive == null) context.report({
-					data: { name: value },
-					messageId: "localDirectivePosition",
-					node: stmt
-				});
-				if (value === "use client") context.report({
-					data: { name: value },
-					messageId: "localDirectiveUnexpected",
-					node: stmt
-				});
-				continue;
-			}
-			if (stmt.expression.type === AST_NODE_TYPES.TemplateLiteral && stmt.expression.quasis.length === 1 && stmt.expression.expressions.length === 0) {
-				const value = stmt.expression.quasis[0]?.value.cooked;
-				if (value === "use server" || value === "use client") context.report({
-					data: { name: value },
-					messageId: "localDirectiveQuote",
-					node: stmt
-				});
+			const match = matchDirective(stmt);
+			if (match == null) continue;
+			switch (true) {
+				case match.kind === "backtick":
+					context.report({
+						data: { name: match.name },
+						messageId: "localDirectiveQuote",
+						node: match.node
+					});
+					break;
+				case match.name === "use client":
+					context.report({
+						data: { name: match.name },
+						messageId: "localDirectiveUnexpected",
+						node: match.node
+					});
+					break;
+				case match.kind === "misplaced":
+					context.report({
+						data: { name: match.name },
+						messageId: "localDirectivePosition",
+						node: match.node
+					});
+					break;
 			}
 		}
+		if (core.isFunctionHasDirective(node, "use server")) reportNonAsyncFunction(node, "local");
 	}
 	return {
-		ArrowFunctionExpression(node) {
-			checkFunctionDirectives(node);
-			checkLocalServerFunction(node);
-		},
+		ArrowFunctionExpression: checkFunction,
 		ExportDefaultDeclaration(node) {
 			if (!hasFileLevelUseServerDirective) return;
-			const decl = node.declaration;
-			if (reportNonAsyncFunction(decl, "file")) return;
-			if (decl.type === AST_NODE_TYPES.Identifier) findAndCheckExportedFunctionDeclarations(decl);
+			const decl = Extract.unwrap(node.declaration);
+			if (decl.type === AST_NODE_TYPES.Identifier) {
+				reportNonAsyncFunction(resolve(context, decl), "file");
+				return;
+			}
+			reportNonAsyncFunction(decl, "file");
 		},
 		ExportNamedDeclaration(node) {
 			if (!hasFileLevelUseServerDirective) return;
-			if (node.declaration != null) {
-				const decl = node.declaration;
-				if (reportNonAsyncFunction(decl, "file")) return;
-				if (decl.type === AST_NODE_TYPES.VariableDeclaration) for (const declarator of decl.declarations) reportNonAsyncFunction(declarator.init, "file");
+			const decl = node.declaration;
+			if (decl != null) {
+				if (decl.type === AST_NODE_TYPES.VariableDeclaration) {
+					for (const declarator of decl.declarations) reportNonAsyncFunction(declarator.init, "file");
+					return;
+				}
+				reportNonAsyncFunction(decl, "file");
 				return;
 			}
-			if (node.source == null && node.specifiers.length > 0) for (const spec of node.specifiers) findAndCheckExportedFunctionDeclarations(spec.local);
+			if (node.source != null) return;
+			for (const spec of node.specifiers) reportNonAsyncFunction(resolve(context, spec.local), "file");
 		},
-		FunctionDeclaration(node) {
-			checkFunctionDirectives(node);
-			checkLocalServerFunction(node);
-		},
-		FunctionExpression(node) {
-			checkFunctionDirectives(node);
-			checkLocalServerFunction(node);
-		},
-		Program() {
-			checkFileLevelDirectives();
-		}
+		FunctionDeclaration: checkFunction,
+		FunctionExpression: checkFunction,
+		Program: checkFileDirectives
 	};
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-rsc",
-  "version": "5.10.1",
+  "version": "5.10.3",
   "description": "ESLint React's ESLint plugin for RSC related rules.",
   "keywords": [
     "react",
@@ -38,11 +38,11 @@
   "dependencies": {
     "@typescript-eslint/types": "^8.62.1",
     "@typescript-eslint/utils": "^8.62.1",
-    "@eslint-react/ast": "5.10.1",
-    "@eslint-react/shared": "5.10.1",
-    "@eslint-react/core": "5.10.1",
-    "@eslint-react/var": "5.10.1",
-    "@eslint-react/eslint": "5.10.1"
+    "@eslint-react/ast": "5.10.3",
+    "@eslint-react/core": "5.10.3",
+    "@eslint-react/shared": "5.10.3",
+    "@eslint-react/eslint": "5.10.3",
+    "@eslint-react/var": "5.10.3"
   },
   "devDependencies": {
     "@types/react": "^19.2.17",
@@ -51,8 +51,8 @@
     "eslint": "^10.6.0",
     "tsdown": "^0.22.3",
     "typescript": "6.0.3",
-    "@local/configs": "0.0.0",
-    "@local/eff": "0.0.0"
+    "@local/eff": "0.0.0",
+    "@local/configs": "0.0.0"
   },
   "peerDependencies": {
     "eslint": "*",