eslint-plugin-react-hooks 6.1.0-canary-19baee81-20250725 → 6.1.0-canary-9be531cd-20250729

package/cjs/eslint-plugin-react-hooks.development.js

@@ -18676,7 +18676,7 @@ function printTerminal(terminal) {
             break;
         }
         case 'return': {
-            value = `[${terminal.id}] Return${terminal.value != null ? ' ' + printPlace(terminal.value) : ''}`;
+            value = `[${terminal.id}] Return ${terminal.returnVariant}${terminal.value != null ? ' ' + printPlace(terminal.value) : ''}`;
             if (terminal.effects != null) {
                 value += `\n    ${terminal.effects.map(printAliasingEffect).join('\n    ')}`;
             }
@@ -20025,6 +20025,7 @@ function mapTerminalSuccessors(terminal, fn) {
         case 'return': {
             return {
                 kind: 'return',
+                returnVariant: terminal.returnVariant,
                 loc: terminal.loc,
                 value: terminal.value,
                 id: makeInstructionId(0),
@@ -22388,6 +22389,7 @@ function lower$1(func, env, bindings = null, capturedRefs = new Map()) {
         const fallthrough = builder.reserve('block');
         const terminal = {
             kind: 'return',
+            returnVariant: 'Implicit',
             loc: GeneratedSource,
             value: lowerExpressionToTemporary(builder, body),
             id: makeInstructionId(0),
@@ -22415,6 +22417,7 @@ function lower$1(func, env, bindings = null, capturedRefs = new Map()) {
     }
     builder.terminate({
         kind: 'return',
+        returnVariant: 'Void',
         loc: GeneratedSource,
         value: lowerValueToTemporary(builder, {
             kind: 'Primitive',
@@ -22482,6 +22485,7 @@ function lowerStatement(builder, stmtPath, label = null) {
             }
             const terminal = {
                 kind: 'return',
+                returnVariant: 'Explicit',
                 loc: (_c = stmt.node.loc) !== null && _c !== void 0 ? _c : GeneratedSource,
                 value,
                 id: makeInstructionId(0),
@@ -30680,6 +30684,7 @@ const EnvironmentConfigSchema = zod.z.object({
     hookPattern: zod.z.string().nullable().default(null),
     enableTreatRefLikeIdentifiersAsRefs: zod.z.boolean().default(false),
     lowerContextAccess: ExternalFunctionSchema.nullable().default(null),
+    validateNoVoidUseMemo: zod.z.boolean().default(false),
 });
 class Environment {
     constructor(scope, fnType, compilerMode, config, contextIdentifiers, parentFunction, logger, filename, code, programContext) {
@@ -43797,43 +43802,69 @@ function getManualMemoizationReplacement(fn, loc, kind) {
         };
     }
 }
-function extractManualMemoizationArgs(instr, kind, sidemap) {
+function extractManualMemoizationArgs(instr, kind, sidemap, errors) {
     const [fnPlace, depsListPlace] = instr.value.args;
     if (fnPlace == null) {
-        CompilerError.throwInvalidReact({
-            reason: `Expected a callback function to be passed to ${kind}`,
-            loc: instr.value.loc,
+        errors.pushDiagnostic(CompilerDiagnostic.create({
+            severity: ErrorSeverity.InvalidReact,
+            category: `Expected a callback function to be passed to ${kind}`,
+            description: `Expected a callback function to be passed to ${kind}`,
             suggestions: null,
-        });
+        }).withDetail({
+            kind: 'error',
+            loc: instr.value.loc,
+            message: `Expected a callback function to be passed to ${kind}`,
+        }));
+        return { fnPlace: null, depsList: null };
     }
     if (fnPlace.kind === 'Spread' || (depsListPlace === null || depsListPlace === void 0 ? void 0 : depsListPlace.kind) === 'Spread') {
-        CompilerError.throwInvalidReact({
-            reason: `Unexpected spread argument to ${kind}`,
-            loc: instr.value.loc,
+        errors.pushDiagnostic(CompilerDiagnostic.create({
+            severity: ErrorSeverity.InvalidReact,
+            category: `Unexpected spread argument to ${kind}`,
+            description: `Unexpected spread argument to ${kind}`,
             suggestions: null,
-        });
+        }).withDetail({
+            kind: 'error',
+            loc: instr.value.loc,
+            message: `Unexpected spread argument to ${kind}`,
+        }));
+        return { fnPlace: null, depsList: null };
     }
     let depsList = null;
     if (depsListPlace != null) {
         const maybeDepsList = sidemap.maybeDepsLists.get(depsListPlace.identifier.id);
         if (maybeDepsList == null) {
-            CompilerError.throwInvalidReact({
-                reason: `Expected the dependency list for ${kind} to be an array literal`,
+            errors.pushDiagnostic(CompilerDiagnostic.create({
+                severity: ErrorSeverity.InvalidReact,
+                category: `Expected the dependency list for ${kind} to be an array literal`,
+                description: `Expected the dependency list for ${kind} to be an array literal`,
                 suggestions: null,
+            }).withDetail({
+                kind: 'error',
                 loc: depsListPlace.loc,
-            });
+                message: `Expected the dependency list for ${kind} to be an array literal`,
+            }));
+            return { fnPlace, depsList: null };
         }
-        depsList = maybeDepsList.map(dep => {
+        depsList = [];
+        for (const dep of maybeDepsList) {
             const maybeDep = sidemap.maybeDeps.get(dep.identifier.id);
             if (maybeDep == null) {
-                CompilerError.throwInvalidReact({
-                    reason: `Expected the dependency list to be an array of simple expressions (e.g. \`x\`, \`x.y.z\`, \`x?.y?.z\`)`,
+                errors.pushDiagnostic(CompilerDiagnostic.create({
+                    severity: ErrorSeverity.InvalidReact,
+                    category: `Expected the dependency list to be an array of simple expressions (e.g. \`x\`, \`x.y.z\`, \`x?.y?.z\`)`,
+                    description: `Expected the dependency list to be an array of simple expressions (e.g. \`x\`, \`x.y.z\`, \`x?.y?.z\`)`,
                     suggestions: null,
+                }).withDetail({
+                    kind: 'error',
                     loc: dep.loc,
-                });
+                    message: `Expected the dependency list to be an array of simple expressions (e.g. \`x\`, \`x.y.z\`, \`x?.y?.z\`)`,
+                }));
             }
-            return maybeDep;
-        });
+            else {
+                depsList.push(maybeDep);
+            }
+        }
     }
     return {
         fnPlace,
@@ -43841,6 +43872,8 @@ function extractManualMemoizationArgs(instr, kind, sidemap) {
     };
 }
 function dropManualMemoization(func) {
+    var _a;
+    const errors = new CompilerError();
     const isValidationEnabled = func.env.config.validatePreserveExistingMemoizationGuarantees ||
         func.env.config.validateNoSetStateInRender ||
         func.env.config.enablePreserveExistingMemoizationGuarantees;
@@ -43865,15 +43898,44 @@ function dropManualMemoization(func) {
                     : instr.value.property.identifier.id;
                 const manualMemo = sidemap.manualMemos.get(id);
                 if (manualMemo != null) {
-                    const { fnPlace, depsList } = extractManualMemoizationArgs(instr, manualMemo.kind, sidemap);
+                    const { fnPlace, depsList } = extractManualMemoizationArgs(instr, manualMemo.kind, sidemap, errors);
+                    if (fnPlace == null) {
+                        continue;
+                    }
+                    if (func.env.config.validateNoVoidUseMemo &&
+                        manualMemo.kind === 'useMemo') {
+                        const funcToCheck = (_a = sidemap.functions.get(fnPlace.identifier.id)) === null || _a === void 0 ? void 0 : _a.value;
+                        if (funcToCheck !== undefined && funcToCheck.loweredFunc.func) {
+                            if (!hasNonVoidReturn(funcToCheck.loweredFunc.func)) {
+                                errors.pushDiagnostic(CompilerDiagnostic.create({
+                                    severity: ErrorSeverity.InvalidReact,
+                                    category: 'useMemo() callbacks must return a value',
+                                    description: `This ${manualMemo.loadInstr.value.kind === 'PropertyLoad'
+                                        ? 'React.useMemo'
+                                        : 'useMemo'} callback doesn't return a value. useMemo is for computing and caching values, not for arbitrary side effects.`,
+                                    suggestions: null,
+                                }).withDetail({
+                                    kind: 'error',
+                                    loc: instr.value.loc,
+                                    message: 'useMemo() callbacks must return a value',
+                                }));
+                            }
+                        }
+                    }
                     instr.value = getManualMemoizationReplacement(fnPlace, instr.value.loc, manualMemo.kind);
                     if (isValidationEnabled) {
                         if (!sidemap.functions.has(fnPlace.identifier.id)) {
-                            CompilerError.throwInvalidReact({
-                                reason: `Expected the first argument to be an inline function expression`,
+                            errors.pushDiagnostic(CompilerDiagnostic.create({
+                                severity: ErrorSeverity.InvalidReact,
+                                category: `Expected the first argument to be an inline function expression`,
+                                description: `Expected the first argument to be an inline function expression`,
                                 suggestions: [],
+                            }).withDetail({
+                                kind: 'error',
                                 loc: fnPlace.loc,
-                            });
+                                message: `Expected the first argument to be an inline function expression`,
+                            }));
+                            continue;
                         }
                         const memoDecl = manualMemo.kind === 'useMemo'
                             ? instr.lvalue
@@ -43920,6 +43982,7 @@ function dropManualMemoization(func) {
             markInstructionIds(func.body);
         }
     }
+    return errors.asResult();
 }
 function findOptionalPlaces(fn) {
     const optionals = new Set();
@@ -43963,6 +44026,17 @@ function findOptionalPlaces(fn) {
     }
     return optionals;
 }
+function hasNonVoidReturn(func) {
+    for (const [, block] of func.body.blocks) {
+        if (block.terminal.kind === 'return') {
+            if (block.terminal.returnVariant === 'Explicit' ||
+                block.terminal.returnVariant === 'Implicit') {
+                return true;
+            }
+        }
+    }
+    return false;
+}
 
 class StableSidemap {
     constructor(env) {
@@ -49406,6 +49480,7 @@ function emitSelectorFn(env, keys) {
         terminal: {
             id: makeInstructionId(0),
             kind: 'return',
+            returnVariant: 'Explicit',
             loc: GeneratedSource,
             value: arrayInstr.lvalue,
             effects: null,
@@ -49837,6 +49912,7 @@ function emitOutlinedFn(env, jsx, oldProps, globals) {
         terminal: {
             id: makeInstructionId(0),
             kind: 'return',
+            returnVariant: 'Explicit',
             loc: GeneratedSource,
             value: instructions.at(-1).lvalue,
             effects: null,
@@ -50657,7 +50733,7 @@ function runWithEnvironment(func, env) {
         !env.config.enablePreserveExistingManualUseMemo &&
         !env.config.disableMemoizationForDebugging &&
         !env.config.enableChangeDetectionForDebugging) {
-        dropManualMemoization(hir);
+        dropManualMemoization(hir).unwrap();
         log({ kind: 'hir', name: 'DropManualMemoization', value: hir });
     }
     inlineImmediatelyInvokedFunctionExpressions(hir);
@@ -52607,6 +52683,7 @@ const COMPILER_OPTIONS = {
         validateNoImpureFunctionsInRender: true,
         validateStaticComponents: true,
         validateNoFreezingKnownMutableFunctions: true,
+        validateNoVoidUseMemo: true,
     }),
 };
 const rule$1 = {

package/cjs/eslint-plugin-react-hooks.production.js

@@ -18667,7 +18667,7 @@ function printTerminal(terminal) {
             break;
         }
         case 'return': {
-            value = `[${terminal.id}] Return${terminal.value != null ? ' ' + printPlace(terminal.value) : ''}`;
+            value = `[${terminal.id}] Return ${terminal.returnVariant}${terminal.value != null ? ' ' + printPlace(terminal.value) : ''}`;
             if (terminal.effects != null) {
                 value += `\n    ${terminal.effects.map(printAliasingEffect).join('\n    ')}`;
             }
@@ -20016,6 +20016,7 @@ function mapTerminalSuccessors(terminal, fn) {
         case 'return': {
             return {
                 kind: 'return',
+                returnVariant: terminal.returnVariant,
                 loc: terminal.loc,
                 value: terminal.value,
                 id: makeInstructionId(0),
@@ -22379,6 +22380,7 @@ function lower$1(func, env, bindings = null, capturedRefs = new Map()) {
         const fallthrough = builder.reserve('block');
         const terminal = {
             kind: 'return',
+            returnVariant: 'Implicit',
             loc: GeneratedSource,
             value: lowerExpressionToTemporary(builder, body),
             id: makeInstructionId(0),
@@ -22406,6 +22408,7 @@ function lower$1(func, env, bindings = null, capturedRefs = new Map()) {
     }
     builder.terminate({
         kind: 'return',
+        returnVariant: 'Void',
         loc: GeneratedSource,
         value: lowerValueToTemporary(builder, {
             kind: 'Primitive',
@@ -22473,6 +22476,7 @@ function lowerStatement(builder, stmtPath, label = null) {
             }
             const terminal = {
                 kind: 'return',
+                returnVariant: 'Explicit',
                 loc: (_c = stmt.node.loc) !== null && _c !== void 0 ? _c : GeneratedSource,
                 value,
                 id: makeInstructionId(0),
@@ -30507,6 +30511,7 @@ const EnvironmentConfigSchema = zod.z.object({
     hookPattern: zod.z.string().nullable().default(null),
     enableTreatRefLikeIdentifiersAsRefs: zod.z.boolean().default(false),
     lowerContextAccess: ExternalFunctionSchema.nullable().default(null),
+    validateNoVoidUseMemo: zod.z.boolean().default(false),
 });
 class Environment {
     constructor(scope, fnType, compilerMode, config, contextIdentifiers, parentFunction, logger, filename, code, programContext) {
@@ -43624,43 +43629,69 @@ function getManualMemoizationReplacement(fn, loc, kind) {
         };
     }
 }
-function extractManualMemoizationArgs(instr, kind, sidemap) {
+function extractManualMemoizationArgs(instr, kind, sidemap, errors) {
     const [fnPlace, depsListPlace] = instr.value.args;
     if (fnPlace == null) {
-        CompilerError.throwInvalidReact({
-            reason: `Expected a callback function to be passed to ${kind}`,
-            loc: instr.value.loc,
+        errors.pushDiagnostic(CompilerDiagnostic.create({
+            severity: ErrorSeverity.InvalidReact,
+            category: `Expected a callback function to be passed to ${kind}`,
+            description: `Expected a callback function to be passed to ${kind}`,
             suggestions: null,
-        });
+        }).withDetail({
+            kind: 'error',
+            loc: instr.value.loc,
+            message: `Expected a callback function to be passed to ${kind}`,
+        }));
+        return { fnPlace: null, depsList: null };
     }
     if (fnPlace.kind === 'Spread' || (depsListPlace === null || depsListPlace === void 0 ? void 0 : depsListPlace.kind) === 'Spread') {
-        CompilerError.throwInvalidReact({
-            reason: `Unexpected spread argument to ${kind}`,
-            loc: instr.value.loc,
+        errors.pushDiagnostic(CompilerDiagnostic.create({
+            severity: ErrorSeverity.InvalidReact,
+            category: `Unexpected spread argument to ${kind}`,
+            description: `Unexpected spread argument to ${kind}`,
             suggestions: null,
-        });
+        }).withDetail({
+            kind: 'error',
+            loc: instr.value.loc,
+            message: `Unexpected spread argument to ${kind}`,
+        }));
+        return { fnPlace: null, depsList: null };
     }
     let depsList = null;
     if (depsListPlace != null) {
         const maybeDepsList = sidemap.maybeDepsLists.get(depsListPlace.identifier.id);
         if (maybeDepsList == null) {
-            CompilerError.throwInvalidReact({
-                reason: `Expected the dependency list for ${kind} to be an array literal`,
+            errors.pushDiagnostic(CompilerDiagnostic.create({
+                severity: ErrorSeverity.InvalidReact,
+                category: `Expected the dependency list for ${kind} to be an array literal`,
+                description: `Expected the dependency list for ${kind} to be an array literal`,
                 suggestions: null,
+            }).withDetail({
+                kind: 'error',
                 loc: depsListPlace.loc,
-            });
+                message: `Expected the dependency list for ${kind} to be an array literal`,
+            }));
+            return { fnPlace, depsList: null };
         }
-        depsList = maybeDepsList.map(dep => {
+        depsList = [];
+        for (const dep of maybeDepsList) {
             const maybeDep = sidemap.maybeDeps.get(dep.identifier.id);
             if (maybeDep == null) {
-                CompilerError.throwInvalidReact({
-                    reason: `Expected the dependency list to be an array of simple expressions (e.g. \`x\`, \`x.y.z\`, \`x?.y?.z\`)`,
+                errors.pushDiagnostic(CompilerDiagnostic.create({
+                    severity: ErrorSeverity.InvalidReact,
+                    category: `Expected the dependency list to be an array of simple expressions (e.g. \`x\`, \`x.y.z\`, \`x?.y?.z\`)`,
+                    description: `Expected the dependency list to be an array of simple expressions (e.g. \`x\`, \`x.y.z\`, \`x?.y?.z\`)`,
                     suggestions: null,
+                }).withDetail({
+                    kind: 'error',
                     loc: dep.loc,
-                });
+                    message: `Expected the dependency list to be an array of simple expressions (e.g. \`x\`, \`x.y.z\`, \`x?.y?.z\`)`,
+                }));
             }
-            return maybeDep;
-        });
+            else {
+                depsList.push(maybeDep);
+            }
+        }
     }
     return {
         fnPlace,
@@ -43668,6 +43699,8 @@ function extractManualMemoizationArgs(instr, kind, sidemap) {
     };
 }
 function dropManualMemoization(func) {
+    var _a;
+    const errors = new CompilerError();
     const isValidationEnabled = func.env.config.validatePreserveExistingMemoizationGuarantees ||
         func.env.config.validateNoSetStateInRender ||
         func.env.config.enablePreserveExistingMemoizationGuarantees;
@@ -43692,15 +43725,44 @@ function dropManualMemoization(func) {
                     : instr.value.property.identifier.id;
                 const manualMemo = sidemap.manualMemos.get(id);
                 if (manualMemo != null) {
-                    const { fnPlace, depsList } = extractManualMemoizationArgs(instr, manualMemo.kind, sidemap);
+                    const { fnPlace, depsList } = extractManualMemoizationArgs(instr, manualMemo.kind, sidemap, errors);
+                    if (fnPlace == null) {
+                        continue;
+                    }
+                    if (func.env.config.validateNoVoidUseMemo &&
+                        manualMemo.kind === 'useMemo') {
+                        const funcToCheck = (_a = sidemap.functions.get(fnPlace.identifier.id)) === null || _a === void 0 ? void 0 : _a.value;
+                        if (funcToCheck !== undefined && funcToCheck.loweredFunc.func) {
+                            if (!hasNonVoidReturn(funcToCheck.loweredFunc.func)) {
+                                errors.pushDiagnostic(CompilerDiagnostic.create({
+                                    severity: ErrorSeverity.InvalidReact,
+                                    category: 'useMemo() callbacks must return a value',
+                                    description: `This ${manualMemo.loadInstr.value.kind === 'PropertyLoad'
+                                        ? 'React.useMemo'
+                                        : 'useMemo'} callback doesn't return a value. useMemo is for computing and caching values, not for arbitrary side effects.`,
+                                    suggestions: null,
+                                }).withDetail({
+                                    kind: 'error',
+                                    loc: instr.value.loc,
+                                    message: 'useMemo() callbacks must return a value',
+                                }));
+                            }
+                        }
+                    }
                     instr.value = getManualMemoizationReplacement(fnPlace, instr.value.loc, manualMemo.kind);
                     if (isValidationEnabled) {
                         if (!sidemap.functions.has(fnPlace.identifier.id)) {
-                            CompilerError.throwInvalidReact({
-                                reason: `Expected the first argument to be an inline function expression`,
+                            errors.pushDiagnostic(CompilerDiagnostic.create({
+                                severity: ErrorSeverity.InvalidReact,
+                                category: `Expected the first argument to be an inline function expression`,
+                                description: `Expected the first argument to be an inline function expression`,
                                 suggestions: [],
+                            }).withDetail({
+                                kind: 'error',
                                 loc: fnPlace.loc,
-                            });
+                                message: `Expected the first argument to be an inline function expression`,
+                            }));
+                            continue;
                         }
                         const memoDecl = manualMemo.kind === 'useMemo'
                             ? instr.lvalue
@@ -43747,6 +43809,7 @@ function dropManualMemoization(func) {
             markInstructionIds(func.body);
         }
     }
+    return errors.asResult();
 }
 function findOptionalPlaces(fn) {
     const optionals = new Set();
@@ -43790,6 +43853,17 @@ function findOptionalPlaces(fn) {
     }
     return optionals;
 }
+function hasNonVoidReturn(func) {
+    for (const [, block] of func.body.blocks) {
+        if (block.terminal.kind === 'return') {
+            if (block.terminal.returnVariant === 'Explicit' ||
+                block.terminal.returnVariant === 'Implicit') {
+                return true;
+            }
+        }
+    }
+    return false;
+}
 
 class StableSidemap {
     constructor(env) {
@@ -49233,6 +49307,7 @@ function emitSelectorFn(env, keys) {
         terminal: {
             id: makeInstructionId(0),
             kind: 'return',
+            returnVariant: 'Explicit',
             loc: GeneratedSource,
             value: arrayInstr.lvalue,
             effects: null,
@@ -49664,6 +49739,7 @@ function emitOutlinedFn(env, jsx, oldProps, globals) {
         terminal: {
             id: makeInstructionId(0),
             kind: 'return',
+            returnVariant: 'Explicit',
             loc: GeneratedSource,
             value: instructions.at(-1).lvalue,
             effects: null,
@@ -50484,7 +50560,7 @@ function runWithEnvironment(func, env) {
         !env.config.enablePreserveExistingManualUseMemo &&
         !env.config.disableMemoizationForDebugging &&
         !env.config.enableChangeDetectionForDebugging) {
-        dropManualMemoization(hir);
+        dropManualMemoization(hir).unwrap();
         log({ kind: 'hir', name: 'DropManualMemoization', value: hir });
     }
     inlineImmediatelyInvokedFunctionExpressions(hir);
@@ -52434,6 +52510,7 @@ const COMPILER_OPTIONS = {
         validateNoImpureFunctionsInRender: true,
         validateStaticComponents: true,
         validateNoFreezingKnownMutableFunctions: true,
+        validateNoVoidUseMemo: true,
     }),
 };
 const rule$1 = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-plugin-react-hooks",
   "description": "ESLint rules for React Hooks",
-  "version": "6.1.0-canary-19baee81-20250725",
+  "version": "6.1.0-canary-9be531cd-20250729",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/react.git",