@sarj/eslint-plugin 18.0.3 → 18.0.4

package/dist/index.cjs

@@ -893,6 +893,7 @@ function stableValueBinding(variable, acceptRead) {
 
 // src/rules/_react-prop-bindings.ts
 var VIEWS = /* @__PURE__ */ new WeakMap();
+var PARAMETER_BINDINGS = /* @__PURE__ */ new WeakMap();
 function renderFunction(node) {
   let parent = node.parent;
   while (parent !== void 0 && parent !== null) {
@@ -909,6 +910,19 @@ function renderFunction(node) {
   return null;
 }
 function firstParameterBindings(source, node) {
+  let functions = PARAMETER_BINDINGS.get(source);
+  if (functions === void 0) {
+    functions = /* @__PURE__ */ new WeakMap();
+    PARAMETER_BINDINGS.set(source, functions);
+  }
+  let bindings = functions.get(node);
+  if (bindings === void 0) {
+    bindings = collectParameterBindings(source, node);
+    functions.set(node, bindings);
+  }
+  return bindings;
+}
+function collectParameterBindings(source, node) {
   const parameter = node.params[0];
   const identifiers = [];
   if (parameter?.type === import_utils8.AST_NODE_TYPES.Identifier)
@@ -1015,7 +1029,7 @@ var PREFER_SERVER_DATA_PREPARATION_DOCUMENTATION = {
   category: "architecture",
   limitations: [
     "Advisory only. Local syntax cannot establish whether a caller is a Server Component, whether props change interactively or whether server preparation reduces the total cost. This rule is a review lead, never proof that code can be moved to the server. No automatic fix is provided.",
-    "Requires an explicit use client directive and parser-owned TypeScript services resolving map/filter/flatMap to the standard Array or ReadonlyArray library signature. The containing view must have an independent React useState/useReducer call or an intrinsic DOM onClick/onChange/onInput/onSubmit handler. Noninteractive boundaries remain owned by no-unnecessary-use-client; custom hooks and other indirect client requirements are unsupported.",
+    "Requires an explicit use client directive and parser-owned TypeScript services resolving map/filter/flatMap to the standard Array or ReadonlyArray library signature. The receiver beneath erased wrappers must itself have an Array, ReadonlyArray or tuple type after nullish narrowing; casts from opaque or custom collections do not establish this. Subclass and structural collection types outside those native array types are excluded. The containing view must have an independent React useState/useReducer call or a native callable type on an intrinsic DOM onClick/onChange/onInput/onSubmit handler. Nullish, noncallable and opaque handler types do not establish interaction. Noninteractive boundaries remain owned by no-unnecessary-use-client; custom hooks and indirect client requirements are unsupported.",
     "Every runtime reference to the source parameter binding must be a supported native data projection or a field-only JSX display loop. Inputs also needed for editing, whole-record forwarding, lookup, mutation, other fields or opaque helpers are excluded. Only direct first-parameter paths and synchronous single-expression callbacks are supported. Whole-row identity maps and constant maps are excluded; supported projections must read a fixed input field.",
     "JSX-rendering callbacks are never reported as preparation findings. Callback calls, captured values, destructuring defaults/rest/nesting, async callbacks, event handlers, effects, memo callbacks, opaque helpers, dynamic/optional paths, custom collection signatures, missing type services, generated source and tests are excluded. First-parameter provenance is syntactic; annotations cannot prove absence of runtime getters or patched array methods. Analysis does not claim callback purity or preserve semantics of a hypothetical move.",
     "Reports the direct source projection once; chained operations with a call receiver are not independently reported. A static subprojection may still be prepared by its producer while a union with pending local edits remains in the client."
@@ -1063,7 +1077,27 @@ var prefer_server_data_preparation_default = createRule({
     const services = getTypeServices(context);
     const checker = services.program.getTypeChecker();
     const interactions = /* @__PURE__ */ new WeakMap();
+    const projectedInputs = /* @__PURE__ */ new WeakMap();
+    const callable = (node) => {
+      const type = checker.getTypeAtLocation(
+        services.esTreeNodeToTSNodeMap.get(unwrapExpression(node))
+      );
+      const members = type.isUnion() ? type.types : [type];
+      return members.some((member3) => member3.getCallSignatures().length > 0);
+    };
     const nativeArray = (node) => {
+      const callee = unwrapExpression(node.callee);
+      if (callee.type !== import_utils9.AST_NODE_TYPES.MemberExpression) return false;
+      const receiver = checker.getNonNullableType(
+        checker.getTypeAtLocation(
+          services.esTreeNodeToTSNodeMap.get(unwrapExpression(callee.object))
+        )
+      );
+      const members = receiver.isUnion() ? receiver.types : [receiver];
+      if (!members.every(
+        (type) => checker.isArrayType(type) || checker.isTupleType(type)
+      ))
+        return false;
       const declaration = checker.getResolvedSignature(
         services.esTreeNodeToTSNodeMap.get(node)
       )?.declaration;
@@ -1084,14 +1118,24 @@ var prefer_server_data_preparation_default = createRule({
           context.sourceCode,
           callee.object,
           firstParameterBindings(context.sourceCode, component)
-        ) || !projection(context.sourceCode, callback) || !nativeArray(node) || !onlyProjectedInput(context.sourceCode, callee.object, nativeArray))
+        ) || !projection(context.sourceCode, callback))
           return;
         let interactive = interactions.get(component);
         if (interactive === void 0) {
-          interactive = clientInteraction(context.sourceCode, component.body);
+          interactive = clientInteraction(
+            context.sourceCode,
+            component.body,
+            callable
+          );
           interactions.set(component, interactive);
         }
-        if (!interactive) return;
+        if (!interactive || !onlyProjectedInput(
+          context.sourceCode,
+          callee.object,
+          nativeArray,
+          projectedInputs
+        ))
+          return;
         context.report({ node, messageId: "prepareData" });
       }
     };
@@ -1161,13 +1205,16 @@ function displayProjection(node, inspectChild) {
     return node.expression.type === import_utils9.AST_NODE_TYPES.JSXEmptyExpression || inspectChild(node.expression);
   return false;
 }
-function onlyProjectedInput(source, receiver, nativeArray) {
+function onlyProjectedInput(source, receiver, nativeArray, cache) {
   let root = unwrapExpression(receiver);
   while (root.type === import_utils9.AST_NODE_TYPES.MemberExpression)
     root = unwrapExpression(root.object);
   if (root.type !== import_utils9.AST_NODE_TYPES.Identifier) return false;
   const variable = import_utils9.ASTUtils.findVariable(source.getScope(root), root.name);
-  return variable !== null && variable.references.every((reference) => {
+  if (variable === null) return false;
+  const cached = cache.get(variable);
+  if (cached !== void 0) return cached;
+  const projected = variable.references.every((reference) => {
     if (typeOnlyReference(reference)) return true;
     if (!reference.isRead()) return false;
     let access = outerExpression(reference.identifier);
@@ -1184,19 +1231,21 @@ function onlyProjectedInput(source, receiver, nativeArray) {
     const callback = call.arguments[0];
     return (callback?.type === import_utils9.AST_NODE_TYPES.ArrowFunctionExpression || callback?.type === import_utils9.AST_NODE_TYPES.FunctionExpression) && (projection(source, callback) || projection(source, callback, "view")) && call.callee === access;
   });
+  cache.set(variable, projected);
+  return projected;
 }
-function clientInteraction(source, node) {
+function clientInteraction(source, node, callable) {
   if (node.type === import_utils9.AST_NODE_TYPES.ArrowFunctionExpression || node.type === import_utils9.AST_NODE_TYPES.FunctionExpression || node.type === import_utils9.AST_NODE_TYPES.FunctionDeclaration)
     return false;
   if (node.type === import_utils9.AST_NODE_TYPES.CallExpression && (reactHook(source, node.callee, "useState") || reactHook(source, node.callee, "useReducer")))
     return true;
   if (node.type === import_utils9.AST_NODE_TYPES.JSXOpeningElement && node.name.type === import_utils9.AST_NODE_TYPES.JSXIdentifier && /^[a-z]/u.test(node.name.name) && node.attributes.some(
-    (attribute) => attribute.type === import_utils9.AST_NODE_TYPES.JSXAttribute && attribute.name.type === import_utils9.AST_NODE_TYPES.JSXIdentifier && DOM_EVENTS.has(attribute.name.name) && attribute.value !== null
+    (attribute) => attribute.type === import_utils9.AST_NODE_TYPES.JSXAttribute && attribute.name.type === import_utils9.AST_NODE_TYPES.JSXIdentifier && DOM_EVENTS.has(attribute.name.name) && attribute.value?.type === import_utils9.AST_NODE_TYPES.JSXExpressionContainer && attribute.value.expression.type !== import_utils9.AST_NODE_TYPES.JSXEmptyExpression && callable(attribute.value.expression)
   ))
     return true;
   return forEachOwnAstChild(
     node,
-    (child) => clientInteraction(source, child),
+    (child) => clientInteraction(source, child, callable),
     (key) => key !== "tokens" && key !== "comments"
   );
 }
@@ -1360,9 +1409,8 @@ var CONFIG2 = {
   path: "tsconfig.json",
   source: '{"compilerOptions":{"strict":true,"target":"ESNext","module":"ESNext","moduleResolution":"Bundler","jsx":"preserve"},"include":["src/**/*"]}'
 };
-var OPAQUE_TYPES = import_typescript4.default.TypeFlags.Any | import_typescript4.default.TypeFlags.Unknown | import_typescript4.default.TypeFlags.Never | import_typescript4.default.TypeFlags.TypeParameter | import_typescript4.default.TypeFlags.Conditional | import_typescript4.default.TypeFlags.IndexedAccess | import_typescript4.default.TypeFlags.Substitution;
+var PRIMITIVE_TYPES = import_typescript4.default.TypeFlags.StringLike | import_typescript4.default.TypeFlags.NumberLike | import_typescript4.default.TypeFlags.BigIntLike | import_typescript4.default.TypeFlags.BooleanLike | import_typescript4.default.TypeFlags.ESSymbolLike | import_typescript4.default.TypeFlags.Null | import_typescript4.default.TypeFlags.Undefined;
 var MAX_TYPE_DEPTH = 16;
-var FUNCTION_MEMBERS = ["apply", "bind", "call"];
 var NO_READONLY_PROP_STATE_DOCUMENTATION = {
   defaultLevel: "warning",
   summary: "Review props copied into state without a usable updater.",
@@ -1372,11 +1420,12 @@ var NO_READONLY_PROP_STATE_DOCUMENTATION = {
   limitations: [
     "Advisory only: initial snapshots can be intentional. There is no automatic fix because replacing state with current props changes how later updates behave.",
     "Recognizes direct React useState imports and default/namespace member calls, including renamed imports, through lexical binding identity. Checks a direct array destructure in a function containing its own JSX and a direct first-parameter property path, or a zero-argument synchronous lazy initializer returning that path.",
-    "Eager initializers require parser-owned TypeScript services and a non-callable type without Any, unknown or unresolved generics. Callable unions, constructors and legacy function-like types exposing apply/bind/call are excluded because React executes function arguments as lazy initializers. Explicit zero-argument lazy callbacks returning the prop directly do not require type information. Type annotations cannot prove runtime identity under opaque casts; lifecycle changes stay manual.",
+    "Eager initializers require parser-owned TypeScript services and primitive types, including unions composed entirely of primitives. Object and void types can hide callable values through structural assignment or ignored return values, so eager nonprimitive values, Any, unknown and unresolved generics are excluded. React executes function arguments as lazy initializers. Explicit zero-argument lazy callbacks returning a prop directly remain supported for all value types without type services. Opaque casts cannot prove runtime identity; lifecycle changes stay manual.",
     "An updater read, escape, reassignment or nontrivial destructuring excludes the finding. Unused state values remain owned by unused-variable checks. Opaque initialization, property aliases, optional/dynamic paths, rest/default bindings, dynamic eval, non-JSX hooks, generated source and tests are outside scope. This does not ban interactive useState or replace the upstream set-state-in-effect rule."
   ],
   references: [
     "https://react.dev/learn/choosing-the-state-structure",
+    "https://react.dev/reference/react/useState",
     "https://react.dev/reference/eslint-plugin-react-hooks/lints/set-state-in-effect"
   ],
   examples: [
@@ -1441,7 +1490,7 @@ var no_readonly_prop_state_default = createRule({
             return;
           const services = getTypeServices(context);
           const type = services.program.getTypeChecker().getTypeAtLocation(services.esTreeNodeToTSNodeMap.get(initial));
-          if (!isNonCallableType(type)) return;
+          if (!isPrimitiveType(type)) return;
         }
         context.report({ node, messageId: "readonlyPropState" });
       }
@@ -1481,10 +1530,11 @@ function initializerValue(node) {
   const [statement] = node.body.body;
   return node.body.body.length === 1 && statement?.type === import_utils12.AST_NODE_TYPES.ReturnStatement ? statement.argument : null;
 }
-function isNonCallableType(type, depth = 0) {
-  if (depth >= MAX_TYPE_DEPTH || (type.flags & OPAQUE_TYPES) !== 0 || type.getCallSignatures().length !== 0 || type.getConstructSignatures().length !== 0 || FUNCTION_MEMBERS.every((member3) => type.getProperty(member3) !== void 0))
-    return false;
-  return !type.isUnionOrIntersection() || type.types.every((member3) => isNonCallableType(member3, depth + 1));
+function isPrimitiveType(type, depth = 0) {
+  if (depth >= MAX_TYPE_DEPTH) return false;
+  if (type.isIntersection())
+    return type.getCallSignatures().length === 0 && type.getConstructSignatures().length === 0 && type.types.some((member3) => isPrimitiveType(member3, depth + 1));
+  return type.isUnion() ? type.types.every((member3) => isPrimitiveType(member3, depth + 1)) : (type.flags & PRIMITIVE_TYPES) !== 0;
 }
 
 // src/rules/no-runtime-typeof.ts
@@ -5539,7 +5589,7 @@ function isSearchParamReceiver(call, services) {
 // package.json
 var package_default = {
   name: "@sarj/eslint-plugin",
-  version: "18.0.3",
+  version: "18.0.4",
   packageManager: "npm@12.2.1",
   description: "Custom ESLint rules for hypermodern TypeScript / React / Next.js projects",
   type: "module",
@@ -28703,7 +28753,7 @@ var import_utils165 = require("@typescript-eslint/utils");
 
 // src/rules/_existing-type-alias-fix.ts
 var import_utils164 = require("@typescript-eslint/utils");
-var PRIMITIVE_TYPES = /* @__PURE__ */ new Set([
+var PRIMITIVE_TYPES2 = /* @__PURE__ */ new Set([
   "TSStringKeyword",
   "TSNumberKeyword",
   "TSBooleanKeyword",
@@ -28760,7 +28810,7 @@ function tokenSignature(sourceCode, node) {
   );
 }
 function closedType(node) {
-  if (PRIMITIVE_TYPES.has(node.type)) return true;
+  if (PRIMITIVE_TYPES2.has(node.type)) return true;
   switch (node.type) {
     case import_utils164.AST_NODE_TYPES.TSLiteralType:
       return node.literal.type === import_utils164.AST_NODE_TYPES.Literal || node.literal.type === import_utils164.AST_NODE_TYPES.UnaryExpression && node.literal.operator === "-" && node.literal.argument.type === import_utils164.AST_NODE_TYPES.Literal;
@@ -30748,8 +30798,8 @@ var memberValidationPolarity = (test, access) => {
   }
   if (test.type === import_utils173.AST_NODE_TYPES.BinaryExpression) {
     const isMatchingTypeof = (node) => node.type === import_utils173.AST_NODE_TYPES.UnaryExpression && node.operator === "typeof" && isSamePlainMember(node.argument, access);
-    const isPrimitiveType = (node) => node.type === import_utils173.AST_NODE_TYPES.Literal && typeof node.value === "string" && PRIMITIVE_TYPEOF_RESULTS.has(node.value);
-    if (!(isMatchingTypeof(test.left) && isPrimitiveType(test.right) || isMatchingTypeof(test.right) && isPrimitiveType(test.left))) {
+    const isPrimitiveType2 = (node) => node.type === import_utils173.AST_NODE_TYPES.Literal && typeof node.value === "string" && PRIMITIVE_TYPEOF_RESULTS.has(node.value);
+    if (!(isMatchingTypeof(test.left) && isPrimitiveType2(test.right) || isMatchingTypeof(test.right) && isPrimitiveType2(test.left))) {
       return null;
     }
     if (test.operator === "===" || test.operator === "==") {

package/dist/index.js

@@ -848,6 +848,7 @@ function stableValueBinding(variable, acceptRead) {
 
 // src/rules/_react-prop-bindings.ts
 var VIEWS = /* @__PURE__ */ new WeakMap();
+var PARAMETER_BINDINGS = /* @__PURE__ */ new WeakMap();
 function renderFunction(node) {
   let parent = node.parent;
   while (parent !== void 0 && parent !== null) {
@@ -864,6 +865,19 @@ function renderFunction(node) {
   return null;
 }
 function firstParameterBindings(source, node) {
+  let functions = PARAMETER_BINDINGS.get(source);
+  if (functions === void 0) {
+    functions = /* @__PURE__ */ new WeakMap();
+    PARAMETER_BINDINGS.set(source, functions);
+  }
+  let bindings = functions.get(node);
+  if (bindings === void 0) {
+    bindings = collectParameterBindings(source, node);
+    functions.set(node, bindings);
+  }
+  return bindings;
+}
+function collectParameterBindings(source, node) {
   const parameter = node.params[0];
   const identifiers = [];
   if (parameter?.type === AST_NODE_TYPES7.Identifier)
@@ -970,7 +984,7 @@ var PREFER_SERVER_DATA_PREPARATION_DOCUMENTATION = {
   category: "architecture",
   limitations: [
     "Advisory only. Local syntax cannot establish whether a caller is a Server Component, whether props change interactively or whether server preparation reduces the total cost. This rule is a review lead, never proof that code can be moved to the server. No automatic fix is provided.",
-    "Requires an explicit use client directive and parser-owned TypeScript services resolving map/filter/flatMap to the standard Array or ReadonlyArray library signature. The containing view must have an independent React useState/useReducer call or an intrinsic DOM onClick/onChange/onInput/onSubmit handler. Noninteractive boundaries remain owned by no-unnecessary-use-client; custom hooks and other indirect client requirements are unsupported.",
+    "Requires an explicit use client directive and parser-owned TypeScript services resolving map/filter/flatMap to the standard Array or ReadonlyArray library signature. The receiver beneath erased wrappers must itself have an Array, ReadonlyArray or tuple type after nullish narrowing; casts from opaque or custom collections do not establish this. Subclass and structural collection types outside those native array types are excluded. The containing view must have an independent React useState/useReducer call or a native callable type on an intrinsic DOM onClick/onChange/onInput/onSubmit handler. Nullish, noncallable and opaque handler types do not establish interaction. Noninteractive boundaries remain owned by no-unnecessary-use-client; custom hooks and indirect client requirements are unsupported.",
     "Every runtime reference to the source parameter binding must be a supported native data projection or a field-only JSX display loop. Inputs also needed for editing, whole-record forwarding, lookup, mutation, other fields or opaque helpers are excluded. Only direct first-parameter paths and synchronous single-expression callbacks are supported. Whole-row identity maps and constant maps are excluded; supported projections must read a fixed input field.",
     "JSX-rendering callbacks are never reported as preparation findings. Callback calls, captured values, destructuring defaults/rest/nesting, async callbacks, event handlers, effects, memo callbacks, opaque helpers, dynamic/optional paths, custom collection signatures, missing type services, generated source and tests are excluded. First-parameter provenance is syntactic; annotations cannot prove absence of runtime getters or patched array methods. Analysis does not claim callback purity or preserve semantics of a hypothetical move.",
     "Reports the direct source projection once; chained operations with a call receiver are not independently reported. A static subprojection may still be prepared by its producer while a union with pending local edits remains in the client."
@@ -1018,7 +1032,27 @@ var prefer_server_data_preparation_default = createRule({
     const services = getTypeServices(context);
     const checker = services.program.getTypeChecker();
     const interactions = /* @__PURE__ */ new WeakMap();
+    const projectedInputs = /* @__PURE__ */ new WeakMap();
+    const callable = (node) => {
+      const type = checker.getTypeAtLocation(
+        services.esTreeNodeToTSNodeMap.get(unwrapExpression(node))
+      );
+      const members = type.isUnion() ? type.types : [type];
+      return members.some((member3) => member3.getCallSignatures().length > 0);
+    };
     const nativeArray = (node) => {
+      const callee = unwrapExpression(node.callee);
+      if (callee.type !== AST_NODE_TYPES8.MemberExpression) return false;
+      const receiver = checker.getNonNullableType(
+        checker.getTypeAtLocation(
+          services.esTreeNodeToTSNodeMap.get(unwrapExpression(callee.object))
+        )
+      );
+      const members = receiver.isUnion() ? receiver.types : [receiver];
+      if (!members.every(
+        (type) => checker.isArrayType(type) || checker.isTupleType(type)
+      ))
+        return false;
       const declaration = checker.getResolvedSignature(
         services.esTreeNodeToTSNodeMap.get(node)
       )?.declaration;
@@ -1039,14 +1073,24 @@ var prefer_server_data_preparation_default = createRule({
           context.sourceCode,
           callee.object,
           firstParameterBindings(context.sourceCode, component)
-        ) || !projection(context.sourceCode, callback) || !nativeArray(node) || !onlyProjectedInput(context.sourceCode, callee.object, nativeArray))
+        ) || !projection(context.sourceCode, callback))
           return;
         let interactive = interactions.get(component);
         if (interactive === void 0) {
-          interactive = clientInteraction(context.sourceCode, component.body);
+          interactive = clientInteraction(
+            context.sourceCode,
+            component.body,
+            callable
+          );
           interactions.set(component, interactive);
         }
-        if (!interactive) return;
+        if (!interactive || !onlyProjectedInput(
+          context.sourceCode,
+          callee.object,
+          nativeArray,
+          projectedInputs
+        ))
+          return;
         context.report({ node, messageId: "prepareData" });
       }
     };
@@ -1116,13 +1160,16 @@ function displayProjection(node, inspectChild) {
     return node.expression.type === AST_NODE_TYPES8.JSXEmptyExpression || inspectChild(node.expression);
   return false;
 }
-function onlyProjectedInput(source, receiver, nativeArray) {
+function onlyProjectedInput(source, receiver, nativeArray, cache) {
   let root = unwrapExpression(receiver);
   while (root.type === AST_NODE_TYPES8.MemberExpression)
     root = unwrapExpression(root.object);
   if (root.type !== AST_NODE_TYPES8.Identifier) return false;
   const variable = ASTUtils4.findVariable(source.getScope(root), root.name);
-  return variable !== null && variable.references.every((reference) => {
+  if (variable === null) return false;
+  const cached = cache.get(variable);
+  if (cached !== void 0) return cached;
+  const projected = variable.references.every((reference) => {
     if (typeOnlyReference(reference)) return true;
     if (!reference.isRead()) return false;
     let access = outerExpression(reference.identifier);
@@ -1139,19 +1186,21 @@ function onlyProjectedInput(source, receiver, nativeArray) {
     const callback = call.arguments[0];
     return (callback?.type === AST_NODE_TYPES8.ArrowFunctionExpression || callback?.type === AST_NODE_TYPES8.FunctionExpression) && (projection(source, callback) || projection(source, callback, "view")) && call.callee === access;
   });
+  cache.set(variable, projected);
+  return projected;
 }
-function clientInteraction(source, node) {
+function clientInteraction(source, node, callable) {
   if (node.type === AST_NODE_TYPES8.ArrowFunctionExpression || node.type === AST_NODE_TYPES8.FunctionExpression || node.type === AST_NODE_TYPES8.FunctionDeclaration)
     return false;
   if (node.type === AST_NODE_TYPES8.CallExpression && (reactHook(source, node.callee, "useState") || reactHook(source, node.callee, "useReducer")))
     return true;
   if (node.type === AST_NODE_TYPES8.JSXOpeningElement && node.name.type === AST_NODE_TYPES8.JSXIdentifier && /^[a-z]/u.test(node.name.name) && node.attributes.some(
-    (attribute) => attribute.type === AST_NODE_TYPES8.JSXAttribute && attribute.name.type === AST_NODE_TYPES8.JSXIdentifier && DOM_EVENTS.has(attribute.name.name) && attribute.value !== null
+    (attribute) => attribute.type === AST_NODE_TYPES8.JSXAttribute && attribute.name.type === AST_NODE_TYPES8.JSXIdentifier && DOM_EVENTS.has(attribute.name.name) && attribute.value?.type === AST_NODE_TYPES8.JSXExpressionContainer && attribute.value.expression.type !== AST_NODE_TYPES8.JSXEmptyExpression && callable(attribute.value.expression)
   ))
     return true;
   return forEachOwnAstChild(
     node,
-    (child) => clientInteraction(source, child),
+    (child) => clientInteraction(source, child, callable),
     (key) => key !== "tokens" && key !== "comments"
   );
 }
@@ -1315,9 +1364,8 @@ var CONFIG2 = {
   path: "tsconfig.json",
   source: '{"compilerOptions":{"strict":true,"target":"ESNext","module":"ESNext","moduleResolution":"Bundler","jsx":"preserve"},"include":["src/**/*"]}'
 };
-var OPAQUE_TYPES = ts4.TypeFlags.Any | ts4.TypeFlags.Unknown | ts4.TypeFlags.Never | ts4.TypeFlags.TypeParameter | ts4.TypeFlags.Conditional | ts4.TypeFlags.IndexedAccess | ts4.TypeFlags.Substitution;
+var PRIMITIVE_TYPES = ts4.TypeFlags.StringLike | ts4.TypeFlags.NumberLike | ts4.TypeFlags.BigIntLike | ts4.TypeFlags.BooleanLike | ts4.TypeFlags.ESSymbolLike | ts4.TypeFlags.Null | ts4.TypeFlags.Undefined;
 var MAX_TYPE_DEPTH = 16;
-var FUNCTION_MEMBERS = ["apply", "bind", "call"];
 var NO_READONLY_PROP_STATE_DOCUMENTATION = {
   defaultLevel: "warning",
   summary: "Review props copied into state without a usable updater.",
@@ -1327,11 +1375,12 @@ var NO_READONLY_PROP_STATE_DOCUMENTATION = {
   limitations: [
     "Advisory only: initial snapshots can be intentional. There is no automatic fix because replacing state with current props changes how later updates behave.",
     "Recognizes direct React useState imports and default/namespace member calls, including renamed imports, through lexical binding identity. Checks a direct array destructure in a function containing its own JSX and a direct first-parameter property path, or a zero-argument synchronous lazy initializer returning that path.",
-    "Eager initializers require parser-owned TypeScript services and a non-callable type without Any, unknown or unresolved generics. Callable unions, constructors and legacy function-like types exposing apply/bind/call are excluded because React executes function arguments as lazy initializers. Explicit zero-argument lazy callbacks returning the prop directly do not require type information. Type annotations cannot prove runtime identity under opaque casts; lifecycle changes stay manual.",
+    "Eager initializers require parser-owned TypeScript services and primitive types, including unions composed entirely of primitives. Object and void types can hide callable values through structural assignment or ignored return values, so eager nonprimitive values, Any, unknown and unresolved generics are excluded. React executes function arguments as lazy initializers. Explicit zero-argument lazy callbacks returning a prop directly remain supported for all value types without type services. Opaque casts cannot prove runtime identity; lifecycle changes stay manual.",
     "An updater read, escape, reassignment or nontrivial destructuring excludes the finding. Unused state values remain owned by unused-variable checks. Opaque initialization, property aliases, optional/dynamic paths, rest/default bindings, dynamic eval, non-JSX hooks, generated source and tests are outside scope. This does not ban interactive useState or replace the upstream set-state-in-effect rule."
   ],
   references: [
     "https://react.dev/learn/choosing-the-state-structure",
+    "https://react.dev/reference/react/useState",
     "https://react.dev/reference/eslint-plugin-react-hooks/lints/set-state-in-effect"
   ],
   examples: [
@@ -1396,7 +1445,7 @@ var no_readonly_prop_state_default = createRule({
             return;
           const services = getTypeServices(context);
           const type = services.program.getTypeChecker().getTypeAtLocation(services.esTreeNodeToTSNodeMap.get(initial));
-          if (!isNonCallableType(type)) return;
+          if (!isPrimitiveType(type)) return;
         }
         context.report({ node, messageId: "readonlyPropState" });
       }
@@ -1436,10 +1485,11 @@ function initializerValue(node) {
   const [statement] = node.body.body;
   return node.body.body.length === 1 && statement?.type === AST_NODE_TYPES11.ReturnStatement ? statement.argument : null;
 }
-function isNonCallableType(type, depth = 0) {
-  if (depth >= MAX_TYPE_DEPTH || (type.flags & OPAQUE_TYPES) !== 0 || type.getCallSignatures().length !== 0 || type.getConstructSignatures().length !== 0 || FUNCTION_MEMBERS.every((member3) => type.getProperty(member3) !== void 0))
-    return false;
-  return !type.isUnionOrIntersection() || type.types.every((member3) => isNonCallableType(member3, depth + 1));
+function isPrimitiveType(type, depth = 0) {
+  if (depth >= MAX_TYPE_DEPTH) return false;
+  if (type.isIntersection())
+    return type.getCallSignatures().length === 0 && type.getConstructSignatures().length === 0 && type.types.some((member3) => isPrimitiveType(member3, depth + 1));
+  return type.isUnion() ? type.types.every((member3) => isPrimitiveType(member3, depth + 1)) : (type.flags & PRIMITIVE_TYPES) !== 0;
 }
 
 // src/rules/no-runtime-typeof.ts
@@ -5494,7 +5544,7 @@ function isSearchParamReceiver(call, services) {
 // package.json
 var package_default = {
   name: "@sarj/eslint-plugin",
-  version: "18.0.3",
+  version: "18.0.4",
   packageManager: "npm@12.2.1",
   description: "Custom ESLint rules for hypermodern TypeScript / React / Next.js projects",
   type: "module",
@@ -28689,7 +28739,7 @@ import {
   AST_NODE_TYPES as AST_NODE_TYPES148,
   ASTUtils as ASTUtils96
 } from "@typescript-eslint/utils";
-var PRIMITIVE_TYPES = /* @__PURE__ */ new Set([
+var PRIMITIVE_TYPES2 = /* @__PURE__ */ new Set([
   "TSStringKeyword",
   "TSNumberKeyword",
   "TSBooleanKeyword",
@@ -28746,7 +28796,7 @@ function tokenSignature(sourceCode, node) {
   );
 }
 function closedType(node) {
-  if (PRIMITIVE_TYPES.has(node.type)) return true;
+  if (PRIMITIVE_TYPES2.has(node.type)) return true;
   switch (node.type) {
     case AST_NODE_TYPES148.TSLiteralType:
       return node.literal.type === AST_NODE_TYPES148.Literal || node.literal.type === AST_NODE_TYPES148.UnaryExpression && node.literal.operator === "-" && node.literal.argument.type === AST_NODE_TYPES148.Literal;
@@ -30737,8 +30787,8 @@ var memberValidationPolarity = (test, access) => {
   }
   if (test.type === AST_NODE_TYPES157.BinaryExpression) {
     const isMatchingTypeof = (node) => node.type === AST_NODE_TYPES157.UnaryExpression && node.operator === "typeof" && isSamePlainMember(node.argument, access);
-    const isPrimitiveType = (node) => node.type === AST_NODE_TYPES157.Literal && typeof node.value === "string" && PRIMITIVE_TYPEOF_RESULTS.has(node.value);
-    if (!(isMatchingTypeof(test.left) && isPrimitiveType(test.right) || isMatchingTypeof(test.right) && isPrimitiveType(test.left))) {
+    const isPrimitiveType2 = (node) => node.type === AST_NODE_TYPES157.Literal && typeof node.value === "string" && PRIMITIVE_TYPEOF_RESULTS.has(node.value);
+    if (!(isMatchingTypeof(test.left) && isPrimitiveType2(test.right) || isMatchingTypeof(test.right) && isPrimitiveType2(test.left))) {
       return null;
     }
     if (test.operator === "===" || test.operator === "==") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sarj/eslint-plugin",
-  "version": "18.0.3",
+  "version": "18.0.4",
   "packageManager": "npm@12.2.1",
   "description": "Custom ESLint rules for hypermodern TypeScript / React / Next.js projects",
   "type": "module",