@sarj/eslint-plugin 16.38.53 → 16.38.54

package/dist/index.cjs

@@ -2662,14 +2662,32 @@ function validConsumerFixCalls(node, parameter, sourceCode, services) {
   if (owner.type !== import_utils24.AST_NODE_TYPES.FunctionDeclaration && owner.type !== import_utils24.AST_NODE_TYPES.VariableDeclarator) return false;
   const binding3 = sourceCode.getDeclaredVariables(owner).find((variable) => variable.defs.some((definition) => definition.node === owner && (definition.type === "FunctionName" || definition.type === "Variable")));
   if (!binding3) return false;
+  const declaration = services.esTreeNodeToTSNodeMap.get(node);
+  if (!import_typescript3.default.isFunctionDeclaration(declaration) && !import_typescript3.default.isArrowFunction(declaration) || parameter.parent !== declaration || declaration.parameters.some((entry) => import_typescript3.default.isIdentifier(entry.name) && entry.name.text === "this")) return false;
+  const selected = declaration.parameters.indexOf(parameter);
+  if (selected < 0) return false;
   const checker = services.program.getTypeChecker();
-  const original = checker.getTypeAtLocation(parameter);
+  const originals = declaration.parameters.map((entry) => checker.getTypeAtLocation(entry));
+  const original = originals[selected];
+  if (!original) return false;
   const fields2 = /* @__PURE__ */ new Set();
   const collect = (type) => {
     if (type.isUnionOrIntersection()) type.types.forEach(collect);
     else type.getProperties().forEach((property) => fields2.add(property.name));
   };
   collect(original);
+  const validArguments = (call) => {
+    if (declaration.parameters.length > 1) {
+      const nativeCall = services.esTreeNodeToTSNodeMap.get(call);
+      if (!import_typescript3.default.isCallExpression(nativeCall) || checker.getResolvedSignature(nativeCall)?.declaration !== declaration) return false;
+    }
+    return call.arguments.every((argument, index) => {
+      const target = originals[index];
+      const nativeArgument = services.esTreeNodeToTSNodeMap.get(argument);
+      const type = checker.getTypeAtLocation(nativeArgument);
+      return target !== void 0 && (index === selected ? knownArgument(type, nativeArgument, fields2, checker) : known(type)) && checker.isTypeAssignableTo(type, target);
+    });
+  };
   let calls = 0;
   for (const reference of binding3.references) {
     if (reference.isWrite()) {
@@ -2677,10 +2695,7 @@ function validConsumerFixCalls(node, parameter, sourceCode, services) {
       continue;
     }
     const call = reference.identifier.parent;
-    if (reference.isTypeReference || !reference.isReadOnly() || call.type !== import_utils24.AST_NODE_TYPES.CallExpression || call.callee !== reference.identifier || call.optional || call.typeArguments || call.arguments.length !== 1 || call.arguments[0]?.type !== import_utils24.AST_NODE_TYPES.Identifier) return false;
-    const argument = services.esTreeNodeToTSNodeMap.get(call.arguments[0]);
-    const type = checker.getTypeAtLocation(argument);
-    if (!knownArgument(type, argument, fields2, checker) || !checker.isTypeAssignableTo(type, original)) return false;
+    if (reference.isTypeReference || !reference.isReadOnly() || call.type !== import_utils24.AST_NODE_TYPES.CallExpression || call.callee !== reference.identifier || call.optional || call.typeArguments || call.arguments.length !== declaration.parameters.length || !call.arguments.every((argument) => argument.type === import_utils24.AST_NODE_TYPES.Identifier) || !validArguments(call)) return false;
     calls += 1;
   }
   return calls > 0;
@@ -2777,10 +2792,10 @@ var RETURNED_OPERANDS = /* @__PURE__ */ new Set([import_typescript5.default.Synt
 function scalarParameterView(parameter, body3, checker) {
   return parameterReads(parameter, body3, checker, true);
 }
-function scalarParameterReads(parameter, body3, checker, callProgram) {
-  return parameterReads(parameter, body3, checker, false, callProgram);
+function scalarParameterReads(parameter, body3, checker, callProgram, auxiliaries) {
+  return parameterReads(parameter, body3, checker, false, callProgram, auxiliaries);
 }
-function parameterReads(parameter, body3, checker, jsx, callProgram) {
+function parameterReads(parameter, body3, checker, jsx, callProgram, auxiliaries) {
   if (parameter.dotDotDotToken || parameter.initializer || import_typescript5.default.isArrayBindingPattern(parameter.name)) return null;
   const root = import_typescript5.default.isIdentifier(parameter.name) ? checker.getSymbolAtLocation(parameter.name) : void 0;
   if (import_typescript5.default.isIdentifier(parameter.name) && !root) return null;
@@ -2788,7 +2803,7 @@ function parameterReads(parameter, body3, checker, jsx, callProgram) {
   const aliases = parameterAliases(parameter.name, checker, reads);
   if (!aliases) return null;
   const expression = returnedExpression(body3);
-  const view = { checker, props: checker.getTypeAtLocation(parameter), root, aliases, reads, callProgram };
+  const view = { checker, props: checker.getTypeAtLocation(parameter), root, aliases, reads, callProgram, auxiliaries };
   return expression && scalarView(expression, view, jsx) ? reads : null;
 }
 function scalarType(type, allowUndefined = true) {
@@ -2820,6 +2835,7 @@ function scalarView(node, view, jsx = false) {
   if (import_typescript5.default.isJsxExpression(node)) return !node.dotDotDotToken && (!node.expression || scalarView(node.expression, view, jsx));
   if (import_typescript5.default.isIdentifier(node)) {
     const binding3 = view.checker.getSymbolAtLocation(node);
+    if (binding3 && view.auxiliaries?.has(binding3)) return scalarType(view.checker.getTypeAtLocation(node));
     const key = binding3 && view.aliases.get(binding3);
     return key !== void 0 && readField(node, key, view);
   }
@@ -2890,8 +2906,19 @@ function primitiveKeyword(node) {
 function nullishPrimitiveUnion(node) {
   return node !== void 0 && import_typescript6.default.isUnionTypeNode(node) && node.types.length === 2 && node.types.some(primitiveKeyword) && node.types.some((part) => part.kind === import_typescript6.default.SyntaxKind.UndefinedKeyword || import_typescript6.default.isLiteralTypeNode(part) && part.literal.kind === import_typescript6.default.SyntaxKind.NullKeyword);
 }
-function consumerAnnotation(node) {
-  if (node.params.length !== 1) return void 0;
+function consumerAnnotation(node, auxiliaryScalars = false) {
+  if (node.params.length !== 1) {
+    if (!auxiliaryScalars) return void 0;
+    let annotation;
+    for (const parameter2 of node.params) {
+      if (parameter2.type !== import_utils25.AST_NODE_TYPES.Identifier && parameter2.type !== import_utils25.AST_NODE_TYPES.ObjectPattern) continue;
+      const current = parameter2.typeAnnotation?.typeAnnotation;
+      if (current?.type !== import_utils25.AST_NODE_TYPES.TSTypeLiteral) continue;
+      if (annotation) return void 0;
+      annotation = current;
+    }
+    return annotation;
+  }
   const parameter = node.params[0];
   return parameter?.type === import_utils25.AST_NODE_TYPES.Identifier || parameter?.type === import_utils25.AST_NODE_TYPES.ObjectPattern ? parameter.typeAnnotation?.typeAnnotation : void 0;
 }
@@ -2899,29 +2926,48 @@ function exportedSymbols(source, checker) {
   const symbol = checker.getSymbolAtLocation(source);
   return new Set(symbol ? checker.getExportsOfModule(symbol).map((entry) => (entry.flags & import_typescript6.default.SymbolFlags.Alias) !== 0 ? checker.getAliasedSymbol(entry) : entry) : []);
 }
-function privateScalarConsumer(node, sourceCode, services, exports2, scalarCalls = false) {
+function privateScalarConsumer(node, sourceCode, services, exports2, options = {}) {
   const native = services.esTreeNodeToTSNodeMap.get(node);
-  if (!import_typescript6.default.isFunctionDeclaration(native) && !import_typescript6.default.isArrowFunction(native) || !native.body || !independentSignature(native)) return null;
+  if (!import_typescript6.default.isFunctionDeclaration(native) && !import_typescript6.default.isArrowFunction(native) || !native.body) return null;
+  let parameter = native.parameters[0];
+  if (native.parameters.length !== 1) {
+    const annotation = consumerAnnotation(node, options.auxiliaryScalars);
+    const selected = annotation && services.esTreeNodeToTSNodeMap.get(annotation);
+    parameter = native.parameters.find((entry) => entry.type === selected);
+  }
+  if (!parameter || !independentSignature(native, parameter, options.auxiliaryScalars === true)) return null;
   const checker = services.program.getTypeChecker();
   if (!import_typescript6.default.isExternalModule(native.getSourceFile()) || !services.program.getCompilerOptions().strict) return null;
-  const parameter = native.parameters[0];
-  if (!parameter) return null;
-  const binding3 = callableBinding(node, sourceCode);
-  if (!binding3 || binding3.defs.length !== 1) return null;
-  const name = import_typescript6.default.isFunctionDeclaration(native) ? native.name : import_typescript6.default.isVariableDeclaration(native.parent) ? native.parent.name : void 0;
-  const symbol = name && checker.getSymbolAtLocation(name);
-  if (!symbol || symbol.declarations?.length !== 1 || exports2.has(symbol) || !directCalls(binding3)) return null;
+  if (!privateDirectCallable(node, native, sourceCode, checker, exports2)) return null;
   const signature = checker.getSignatureFromDeclaration(native);
   if (!signature || signature.typeParameters?.length || checker.getTypePredicateOfSignature(signature)) return null;
   const expression = returnedExpression(native.body);
   if (!expression || !checker.isTypeAssignableTo(checker.getTypeAtLocation(expression), checker.getReturnTypeOfSignature(signature))) return null;
-  const reads = scalarParameterReads(parameter, native.body, checker, scalarCalls ? services.program : void 0);
+  const auxiliaries = native.parameters.length > 1 ? auxiliaryBindings(native, parameter, checker) : void 0;
+  if (auxiliaries === null) return null;
+  const reads = scalarParameterReads(parameter, native.body, checker, options.scalarCalls ? services.program : void 0, auxiliaries);
   return reads?.size ? { parameter, reads } : null;
 }
-function independentSignature(native) {
-  if (native.parameters.length !== 1 || native.typeParameters?.length || native.asteriskToken || native.modifiers?.length || !primitiveKeyword(native.type)) return false;
-  const parameter = native.parameters[0];
-  return parameter !== void 0 && parameter.type !== void 0 && !parameter.modifiers?.length && !parameter.questionToken && !parameter.initializer && !parameter.dotDotDotToken && (!import_typescript6.default.isIdentifier(parameter.name) || parameter.name.text !== "this");
+function privateDirectCallable(node, native, sourceCode, checker, exports2) {
+  const binding3 = callableBinding(node, sourceCode);
+  if (!binding3 || binding3.defs.length !== 1) return false;
+  const name = import_typescript6.default.isFunctionDeclaration(native) ? native.name : import_typescript6.default.isVariableDeclaration(native.parent) ? native.parent.name : void 0;
+  const symbol = name && checker.getSymbolAtLocation(name);
+  return symbol !== void 0 && symbol.declarations?.length === 1 && !exports2.has(symbol) && directCalls(binding3, native.parameters.length);
+}
+function independentSignature(native, selected, auxiliaryScalars) {
+  if (!auxiliaryScalars && native.parameters.length !== 1 || native.typeParameters?.length || native.asteriskToken || native.modifiers?.length || !primitiveKeyword(native.type)) return false;
+  return native.parameters.every((parameter) => parameter.type !== void 0 && !parameter.modifiers?.length && !parameter.questionToken && !parameter.initializer && !parameter.dotDotDotToken && (!import_typescript6.default.isIdentifier(parameter.name) || parameter.name.text !== "this") && (parameter === selected || import_typescript6.default.isIdentifier(parameter.name) && primitiveKeyword(parameter.type)));
+}
+function auxiliaryBindings(native, selected, checker) {
+  const bindings = /* @__PURE__ */ new Set();
+  for (const parameter of native.parameters) {
+    if (parameter === selected) continue;
+    const symbol = import_typescript6.default.isIdentifier(parameter.name) ? checker.getSymbolAtLocation(parameter.name) : void 0;
+    if (!symbol || symbol.declarations?.length !== 1 || symbol.declarations[0] !== parameter || bindings.has(symbol)) return null;
+    bindings.add(symbol);
+  }
+  return bindings;
 }
 function callableBinding(node, sourceCode) {
   if (node.type === import_utils25.AST_NODE_TYPES.FunctionDeclaration) {
@@ -2932,12 +2978,12 @@ function callableBinding(node, sourceCode) {
   if (declaration.type !== import_utils25.AST_NODE_TYPES.VariableDeclarator || declaration.init !== node || declaration.id.type !== import_utils25.AST_NODE_TYPES.Identifier || declaration.id.typeAnnotation || declaration.parent.kind !== "const" || declaration.parent.parent.type !== import_utils25.AST_NODE_TYPES.Program) return void 0;
   return sourceCode.getDeclaredVariables(declaration).find((variable) => variable.defs.some((definition) => definition.type === "Variable" && definition.node === declaration));
 }
-function directCalls(binding3) {
+function directCalls(binding3, arity) {
   let calls = 0;
   const stable2 = stableValueBinding(binding3, (reference) => {
     const identifier = reference.identifier;
     const call = identifier.parent;
-    if (reference.isTypeReference || !reference.isReadOnly() || call.type !== import_utils25.AST_NODE_TYPES.CallExpression || call.callee !== identifier || call.optional || call.typeArguments || call.arguments.length !== 1 || call.arguments[0]?.type !== import_utils25.AST_NODE_TYPES.Identifier) return false;
+    if (reference.isTypeReference || !reference.isReadOnly() || call.type !== import_utils25.AST_NODE_TYPES.CallExpression || call.callee !== identifier || call.optional || call.typeArguments || call.arguments.length !== arity || !call.arguments.every((argument) => argument.type === import_utils25.AST_NODE_TYPES.Identifier)) return false;
     calls += 1;
     return true;
   });
@@ -3122,6 +3168,7 @@ var EXAMPLE2 = 'export {}; const account = {name: "Ada", email: "a"}; function l
 var HELPER_EXAMPLE = 'export {}; const account = {name: "Ada", email: "a"}; function formatName(name: string): string {return name.toUpperCase();} function label(user: {email: string; name: string}): string {return formatName(user.name);} label(account);';
 var NULLABLE_EXAMPLE2 = 'export {}; const account = {name: "Ada", email: null}; function label(user: {email: string | null; name: string}): string {return user.name;} label(account);';
 var READ_NULLABLE_EXAMPLE = EXAMPLE2.replace('name: "Ada"', "name: null").replace("readonly name: string", "readonly name: string | null").replace("return user.name;", 'return user.name ?? "";');
+var AUXILIARY_EXAMPLE = EXAMPLE2.replaceAll("readonly ", "").replace("function label(user:", 'const prefix = "Hello "; function label(prefix: string, user:').replace("return user.name;", "return prefix + user.name;").replace("label(account);", "label(prefix, account);");
 var PREFER_MINIMAL_PARAMETER_CONTRACT_DOCUMENTATION = {
   defaultLevel: "warning",
   summary: "Prefer the proven read-only subset for a private consumer parameter.",
@@ -3130,8 +3177,8 @@ var PREFER_MINIMAL_PARAMETER_CONTRACT_DOCUMENTATION = {
   category: "architecture",
   autofix: "safe",
   limitations: [
-    "Automatic fixes additionally require every existing identifier caller to be natively assignable to the original contract, without Any, unknown, error or unresolved types on the relevant surface. Comments inside the annotation and TypeScript suppression directives keep the finding manual. Only unread required property signatures are removed; every read or optional member, modifier and terminator token is preserved. Edits that would merge distinct CR and LF terminators remain manual.",
-    "Requires parser-owned TypeScript information and a strict external module. Only top-level private function declarations and raw const arrows with exactly one explicit parameter and an independent broad primitive return annotation are supported. Every callable reference must be a direct call with one identifier argument; exports including type-only exports, typeof queries, callbacks, storage, constructors, contextual signatures, overloads, generics, decorators, async functions and direct eval prevent findings.",
+    "Automatic fixes additionally require every existing identifier argument to be natively assignable to its corresponding original parameter contract, without Any, unknown, error or unresolved types on the relevant surface. Comments inside the annotation and TypeScript suppression directives keep the finding manual. Only unread required object property signatures are removed; every read or optional member, modifier and terminator token is preserved. Auxiliary annotations and argument order stay unchanged. Edits that would merge distinct CR and LF terminators remain manual.",
+    "Requires parser-owned TypeScript information and a strict external module. Only top-level private function declarations and raw const arrows with one explicit inline object parameter and an independent broad primitive return annotation are supported. Other parameters must be required identifiers annotated directly as string, number, boolean or bigint; optional, default, rest, destructured, domain-specific and explicit this auxiliaries are excluded. Every callable reference must be a direct call with an identifier argument for every parameter; exports including type-only exports, typeof queries, callbacks, storage, constructors, contextual signatures, overloads, generics, decorators, async functions and direct eval prevent findings.",
     "Only anonymous inline contracts made of broad string, number, boolean or bigint property types are supported. A read field or an unread required field may additionally have exactly one such keyword and null or undefined in a direct two-part union; unread optional nullable fields and more complex unions remain excluded. Fields may be plain or readonly; the consumer body must still prove read-only usage. Every read field keeps its exact type, modifiers and optionality. Named domain contracts, brands, literal discriminants, classes, methods, callbacks, indexes, mapped types and imported parameter contracts are excluded. At least one read required field and one unread required field must be established; all-optional reduced contracts can reject existing callers through weak-type checks.",
     "The single return expression may use only fixed scalar field reads, flat destructuring, literals, operators, templates and scalar calls to same-file implemented top-level functions or raw const arrows with an explicit return annotation. These calls require one native resolved declaration, no generic or predicate signature, scalar arguments/result and complete active native checking of the local implementation file. Their helper bodies need not be pure because only scalar values cross the call and only an erased parameter annotation changes. Imported, aliased, ambient, overloaded, optional, spread and member calls remain unsupported. Bound destructured fields count as reads even when their local aliases are unused. Whole-object escape, identity, mutation, closures, reflection, serialization, dynamic keys, implicit Object capabilities and JSX are unsupported. Unknown semantic information causes abstention. Findings outside the fix proof remain manual; this is not a requirement to minimize every object or discard useful producer fields."
   ],
@@ -3143,7 +3190,9 @@ var PREFER_MINIMAL_PARAMETER_CONTRACT_DOCUMENTATION = {
     { id: "unread-nullable-field", scenarioId: "nullable-private-field", title: "A required nullable field is never inspected", outcome: "match", files: [{ path: "src/case.ts", source: NULLABLE_EXAMPLE2 }, CONFIG2], focusPath: "src/case.ts", expectedCount: 1, public: true, fixedFiles: [{ path: "src/case.ts", source: NULLABLE_EXAMPLE2.replace("email: string | null;", "") }] },
     { id: "read-nullable-field", scenarioId: "nullable-private-field", title: "An inspected nullable field keeps its contract", outcome: "no-match", files: [{ path: "src/case.ts", source: NULLABLE_EXAMPLE2.replace("return user.name;", "return user.email ?? user.name;") }, CONFIG2], focusPath: "src/case.ts", expectedCount: 0, public: true },
     { id: "retained-nullable-read", scenarioId: "retained-nullable-field", title: "A nullable name remains while an unread email requirement is removed", outcome: "match", files: [{ path: "src/case.ts", source: READ_NULLABLE_EXAMPLE }, CONFIG2], focusPath: "src/case.ts", expectedCount: 1, public: true, fixedFiles: [{ path: "src/case.ts", source: READ_NULLABLE_EXAMPLE.replace("readonly email: string;", "") }] },
-    { id: "retained-nullable-all-used", scenarioId: "retained-nullable-field", title: "Both requirements remain when the nullable view reads email too", outcome: "no-match", files: [{ path: "src/case.ts", source: READ_NULLABLE_EXAMPLE.replace('return user.name ?? "";', "return user.name ?? user.email;") }, CONFIG2], focusPath: "src/case.ts", expectedCount: 0, public: true }
+    { id: "retained-nullable-all-used", scenarioId: "retained-nullable-field", title: "Both requirements remain when the nullable view reads email too", outcome: "no-match", files: [{ path: "src/case.ts", source: READ_NULLABLE_EXAMPLE.replace('return user.name ?? "";', "return user.name ?? user.email;") }, CONFIG2], focusPath: "src/case.ts", expectedCount: 0, public: true },
+    { id: "auxiliary-scalar", scenarioId: "auxiliary-scalar-parameter", title: "A scalar prefix does not require the object's unread email", outcome: "match", files: [{ path: "src/case.ts", source: AUXILIARY_EXAMPLE }, CONFIG2], focusPath: "src/case.ts", expectedCount: 1, public: true, fixedFiles: [{ path: "src/case.ts", source: AUXILIARY_EXAMPLE.replace("email: string;", "") }] },
+    { id: "auxiliary-all-used", scenarioId: "auxiliary-scalar-parameter", title: "Reading both object fields retains their requirements", outcome: "no-match", files: [{ path: "src/case.ts", source: AUXILIARY_EXAMPLE.replace("return prefix + user.name;", "return prefix + user.name + user.email;") }, CONFIG2], focusPath: "src/case.ts", expectedCount: 0, public: true }
   ]
 };
 function inlineFields(node, reads) {
@@ -3169,7 +3218,7 @@ var prefer_minimal_parameter_contract_default = createRule({
     const candidates = [];
     let dynamic = false;
     const remember = (node) => {
-      if (consumerAnnotation(node)?.type === import_utils27.AST_NODE_TYPES.TSTypeLiteral) candidates.push(node);
+      if (consumerAnnotation(node, true)?.type === import_utils27.AST_NODE_TYPES.TSTypeLiteral) candidates.push(node);
     };
     return {
       FunctionDeclaration: remember,
@@ -3185,7 +3234,7 @@ var prefer_minimal_parameter_contract_default = createRule({
         const checker = services.program.getTypeChecker();
         const exports2 = exportedSymbols(source, checker);
         for (const candidate2 of candidates) {
-          const consumer = privateScalarConsumer(candidate2, context.sourceCode, services, exports2, true);
+          const consumer = privateScalarConsumer(candidate2, context.sourceCode, services, exports2, { scalarCalls: true, auxiliaryScalars: true });
           const annotation = consumer?.parameter.type;
           if (!consumer || !annotation || !import_typescript8.default.isTypeLiteralNode(annotation)) continue;
           const fields2 = inlineFields(annotation, consumer.reads);
@@ -4264,7 +4313,7 @@ function isSearchParamReceiver(call, services) {
 // package.json
 var package_default = {
   name: "@sarj/eslint-plugin",
-  version: "16.38.53",
+  version: "16.38.54",
   packageManager: "npm@12.2.1",
   description: "Custom ESLint rules for hypermodern TypeScript / React / Next.js projects",
   type: "module",

package/dist/index.js

@@ -2611,14 +2611,32 @@ function validConsumerFixCalls(node, parameter, sourceCode, services) {
   if (owner.type !== AST_NODE_TYPES22.FunctionDeclaration && owner.type !== AST_NODE_TYPES22.VariableDeclarator) return false;
   const binding3 = sourceCode.getDeclaredVariables(owner).find((variable) => variable.defs.some((definition) => definition.node === owner && (definition.type === "FunctionName" || definition.type === "Variable")));
   if (!binding3) return false;
+  const declaration = services.esTreeNodeToTSNodeMap.get(node);
+  if (!ts3.isFunctionDeclaration(declaration) && !ts3.isArrowFunction(declaration) || parameter.parent !== declaration || declaration.parameters.some((entry) => ts3.isIdentifier(entry.name) && entry.name.text === "this")) return false;
+  const selected = declaration.parameters.indexOf(parameter);
+  if (selected < 0) return false;
   const checker = services.program.getTypeChecker();
-  const original = checker.getTypeAtLocation(parameter);
+  const originals = declaration.parameters.map((entry) => checker.getTypeAtLocation(entry));
+  const original = originals[selected];
+  if (!original) return false;
   const fields2 = /* @__PURE__ */ new Set();
   const collect = (type) => {
     if (type.isUnionOrIntersection()) type.types.forEach(collect);
     else type.getProperties().forEach((property) => fields2.add(property.name));
   };
   collect(original);
+  const validArguments = (call) => {
+    if (declaration.parameters.length > 1) {
+      const nativeCall = services.esTreeNodeToTSNodeMap.get(call);
+      if (!ts3.isCallExpression(nativeCall) || checker.getResolvedSignature(nativeCall)?.declaration !== declaration) return false;
+    }
+    return call.arguments.every((argument, index) => {
+      const target = originals[index];
+      const nativeArgument = services.esTreeNodeToTSNodeMap.get(argument);
+      const type = checker.getTypeAtLocation(nativeArgument);
+      return target !== void 0 && (index === selected ? knownArgument(type, nativeArgument, fields2, checker) : known(type)) && checker.isTypeAssignableTo(type, target);
+    });
+  };
   let calls = 0;
   for (const reference of binding3.references) {
     if (reference.isWrite()) {
@@ -2626,10 +2644,7 @@ function validConsumerFixCalls(node, parameter, sourceCode, services) {
       continue;
     }
     const call = reference.identifier.parent;
-    if (reference.isTypeReference || !reference.isReadOnly() || call.type !== AST_NODE_TYPES22.CallExpression || call.callee !== reference.identifier || call.optional || call.typeArguments || call.arguments.length !== 1 || call.arguments[0]?.type !== AST_NODE_TYPES22.Identifier) return false;
-    const argument = services.esTreeNodeToTSNodeMap.get(call.arguments[0]);
-    const type = checker.getTypeAtLocation(argument);
-    if (!knownArgument(type, argument, fields2, checker) || !checker.isTypeAssignableTo(type, original)) return false;
+    if (reference.isTypeReference || !reference.isReadOnly() || call.type !== AST_NODE_TYPES22.CallExpression || call.callee !== reference.identifier || call.optional || call.typeArguments || call.arguments.length !== declaration.parameters.length || !call.arguments.every((argument) => argument.type === AST_NODE_TYPES22.Identifier) || !validArguments(call)) return false;
     calls += 1;
   }
   return calls > 0;
@@ -2726,10 +2741,10 @@ var RETURNED_OPERANDS = /* @__PURE__ */ new Set([ts5.SyntaxKind.AmpersandAmpersa
 function scalarParameterView(parameter, body3, checker) {
   return parameterReads(parameter, body3, checker, true);
 }
-function scalarParameterReads(parameter, body3, checker, callProgram) {
-  return parameterReads(parameter, body3, checker, false, callProgram);
+function scalarParameterReads(parameter, body3, checker, callProgram, auxiliaries) {
+  return parameterReads(parameter, body3, checker, false, callProgram, auxiliaries);
 }
-function parameterReads(parameter, body3, checker, jsx, callProgram) {
+function parameterReads(parameter, body3, checker, jsx, callProgram, auxiliaries) {
   if (parameter.dotDotDotToken || parameter.initializer || ts5.isArrayBindingPattern(parameter.name)) return null;
   const root = ts5.isIdentifier(parameter.name) ? checker.getSymbolAtLocation(parameter.name) : void 0;
   if (ts5.isIdentifier(parameter.name) && !root) return null;
@@ -2737,7 +2752,7 @@ function parameterReads(parameter, body3, checker, jsx, callProgram) {
   const aliases = parameterAliases(parameter.name, checker, reads);
   if (!aliases) return null;
   const expression = returnedExpression(body3);
-  const view = { checker, props: checker.getTypeAtLocation(parameter), root, aliases, reads, callProgram };
+  const view = { checker, props: checker.getTypeAtLocation(parameter), root, aliases, reads, callProgram, auxiliaries };
   return expression && scalarView(expression, view, jsx) ? reads : null;
 }
 function scalarType(type, allowUndefined = true) {
@@ -2769,6 +2784,7 @@ function scalarView(node, view, jsx = false) {
   if (ts5.isJsxExpression(node)) return !node.dotDotDotToken && (!node.expression || scalarView(node.expression, view, jsx));
   if (ts5.isIdentifier(node)) {
     const binding3 = view.checker.getSymbolAtLocation(node);
+    if (binding3 && view.auxiliaries?.has(binding3)) return scalarType(view.checker.getTypeAtLocation(node));
     const key = binding3 && view.aliases.get(binding3);
     return key !== void 0 && readField(node, key, view);
   }
@@ -2839,8 +2855,19 @@ function primitiveKeyword(node) {
 function nullishPrimitiveUnion(node) {
   return node !== void 0 && ts6.isUnionTypeNode(node) && node.types.length === 2 && node.types.some(primitiveKeyword) && node.types.some((part) => part.kind === ts6.SyntaxKind.UndefinedKeyword || ts6.isLiteralTypeNode(part) && part.literal.kind === ts6.SyntaxKind.NullKeyword);
 }
-function consumerAnnotation(node) {
-  if (node.params.length !== 1) return void 0;
+function consumerAnnotation(node, auxiliaryScalars = false) {
+  if (node.params.length !== 1) {
+    if (!auxiliaryScalars) return void 0;
+    let annotation;
+    for (const parameter2 of node.params) {
+      if (parameter2.type !== AST_NODE_TYPES23.Identifier && parameter2.type !== AST_NODE_TYPES23.ObjectPattern) continue;
+      const current = parameter2.typeAnnotation?.typeAnnotation;
+      if (current?.type !== AST_NODE_TYPES23.TSTypeLiteral) continue;
+      if (annotation) return void 0;
+      annotation = current;
+    }
+    return annotation;
+  }
   const parameter = node.params[0];
   return parameter?.type === AST_NODE_TYPES23.Identifier || parameter?.type === AST_NODE_TYPES23.ObjectPattern ? parameter.typeAnnotation?.typeAnnotation : void 0;
 }
@@ -2848,29 +2875,48 @@ function exportedSymbols(source, checker) {
   const symbol = checker.getSymbolAtLocation(source);
   return new Set(symbol ? checker.getExportsOfModule(symbol).map((entry) => (entry.flags & ts6.SymbolFlags.Alias) !== 0 ? checker.getAliasedSymbol(entry) : entry) : []);
 }
-function privateScalarConsumer(node, sourceCode, services, exports, scalarCalls = false) {
+function privateScalarConsumer(node, sourceCode, services, exports, options = {}) {
   const native = services.esTreeNodeToTSNodeMap.get(node);
-  if (!ts6.isFunctionDeclaration(native) && !ts6.isArrowFunction(native) || !native.body || !independentSignature(native)) return null;
+  if (!ts6.isFunctionDeclaration(native) && !ts6.isArrowFunction(native) || !native.body) return null;
+  let parameter = native.parameters[0];
+  if (native.parameters.length !== 1) {
+    const annotation = consumerAnnotation(node, options.auxiliaryScalars);
+    const selected = annotation && services.esTreeNodeToTSNodeMap.get(annotation);
+    parameter = native.parameters.find((entry) => entry.type === selected);
+  }
+  if (!parameter || !independentSignature(native, parameter, options.auxiliaryScalars === true)) return null;
   const checker = services.program.getTypeChecker();
   if (!ts6.isExternalModule(native.getSourceFile()) || !services.program.getCompilerOptions().strict) return null;
-  const parameter = native.parameters[0];
-  if (!parameter) return null;
-  const binding3 = callableBinding(node, sourceCode);
-  if (!binding3 || binding3.defs.length !== 1) return null;
-  const name = ts6.isFunctionDeclaration(native) ? native.name : ts6.isVariableDeclaration(native.parent) ? native.parent.name : void 0;
-  const symbol = name && checker.getSymbolAtLocation(name);
-  if (!symbol || symbol.declarations?.length !== 1 || exports.has(symbol) || !directCalls(binding3)) return null;
+  if (!privateDirectCallable(node, native, sourceCode, checker, exports)) return null;
   const signature = checker.getSignatureFromDeclaration(native);
   if (!signature || signature.typeParameters?.length || checker.getTypePredicateOfSignature(signature)) return null;
   const expression = returnedExpression(native.body);
   if (!expression || !checker.isTypeAssignableTo(checker.getTypeAtLocation(expression), checker.getReturnTypeOfSignature(signature))) return null;
-  const reads = scalarParameterReads(parameter, native.body, checker, scalarCalls ? services.program : void 0);
+  const auxiliaries = native.parameters.length > 1 ? auxiliaryBindings(native, parameter, checker) : void 0;
+  if (auxiliaries === null) return null;
+  const reads = scalarParameterReads(parameter, native.body, checker, options.scalarCalls ? services.program : void 0, auxiliaries);
   return reads?.size ? { parameter, reads } : null;
 }
-function independentSignature(native) {
-  if (native.parameters.length !== 1 || native.typeParameters?.length || native.asteriskToken || native.modifiers?.length || !primitiveKeyword(native.type)) return false;
-  const parameter = native.parameters[0];
-  return parameter !== void 0 && parameter.type !== void 0 && !parameter.modifiers?.length && !parameter.questionToken && !parameter.initializer && !parameter.dotDotDotToken && (!ts6.isIdentifier(parameter.name) || parameter.name.text !== "this");
+function privateDirectCallable(node, native, sourceCode, checker, exports) {
+  const binding3 = callableBinding(node, sourceCode);
+  if (!binding3 || binding3.defs.length !== 1) return false;
+  const name = ts6.isFunctionDeclaration(native) ? native.name : ts6.isVariableDeclaration(native.parent) ? native.parent.name : void 0;
+  const symbol = name && checker.getSymbolAtLocation(name);
+  return symbol !== void 0 && symbol.declarations?.length === 1 && !exports.has(symbol) && directCalls(binding3, native.parameters.length);
+}
+function independentSignature(native, selected, auxiliaryScalars) {
+  if (!auxiliaryScalars && native.parameters.length !== 1 || native.typeParameters?.length || native.asteriskToken || native.modifiers?.length || !primitiveKeyword(native.type)) return false;
+  return native.parameters.every((parameter) => parameter.type !== void 0 && !parameter.modifiers?.length && !parameter.questionToken && !parameter.initializer && !parameter.dotDotDotToken && (!ts6.isIdentifier(parameter.name) || parameter.name.text !== "this") && (parameter === selected || ts6.isIdentifier(parameter.name) && primitiveKeyword(parameter.type)));
+}
+function auxiliaryBindings(native, selected, checker) {
+  const bindings = /* @__PURE__ */ new Set();
+  for (const parameter of native.parameters) {
+    if (parameter === selected) continue;
+    const symbol = ts6.isIdentifier(parameter.name) ? checker.getSymbolAtLocation(parameter.name) : void 0;
+    if (!symbol || symbol.declarations?.length !== 1 || symbol.declarations[0] !== parameter || bindings.has(symbol)) return null;
+    bindings.add(symbol);
+  }
+  return bindings;
 }
 function callableBinding(node, sourceCode) {
   if (node.type === AST_NODE_TYPES23.FunctionDeclaration) {
@@ -2881,12 +2927,12 @@ function callableBinding(node, sourceCode) {
   if (declaration.type !== AST_NODE_TYPES23.VariableDeclarator || declaration.init !== node || declaration.id.type !== AST_NODE_TYPES23.Identifier || declaration.id.typeAnnotation || declaration.parent.kind !== "const" || declaration.parent.parent.type !== AST_NODE_TYPES23.Program) return void 0;
   return sourceCode.getDeclaredVariables(declaration).find((variable) => variable.defs.some((definition) => definition.type === "Variable" && definition.node === declaration));
 }
-function directCalls(binding3) {
+function directCalls(binding3, arity) {
   let calls = 0;
   const stable2 = stableValueBinding(binding3, (reference) => {
     const identifier = reference.identifier;
     const call = identifier.parent;
-    if (reference.isTypeReference || !reference.isReadOnly() || call.type !== AST_NODE_TYPES23.CallExpression || call.callee !== identifier || call.optional || call.typeArguments || call.arguments.length !== 1 || call.arguments[0]?.type !== AST_NODE_TYPES23.Identifier) return false;
+    if (reference.isTypeReference || !reference.isReadOnly() || call.type !== AST_NODE_TYPES23.CallExpression || call.callee !== identifier || call.optional || call.typeArguments || call.arguments.length !== arity || !call.arguments.every((argument) => argument.type === AST_NODE_TYPES23.Identifier)) return false;
     calls += 1;
     return true;
   });
@@ -3071,6 +3117,7 @@ var EXAMPLE2 = 'export {}; const account = {name: "Ada", email: "a"}; function l
 var HELPER_EXAMPLE = 'export {}; const account = {name: "Ada", email: "a"}; function formatName(name: string): string {return name.toUpperCase();} function label(user: {email: string; name: string}): string {return formatName(user.name);} label(account);';
 var NULLABLE_EXAMPLE2 = 'export {}; const account = {name: "Ada", email: null}; function label(user: {email: string | null; name: string}): string {return user.name;} label(account);';
 var READ_NULLABLE_EXAMPLE = EXAMPLE2.replace('name: "Ada"', "name: null").replace("readonly name: string", "readonly name: string | null").replace("return user.name;", 'return user.name ?? "";');
+var AUXILIARY_EXAMPLE = EXAMPLE2.replaceAll("readonly ", "").replace("function label(user:", 'const prefix = "Hello "; function label(prefix: string, user:').replace("return user.name;", "return prefix + user.name;").replace("label(account);", "label(prefix, account);");
 var PREFER_MINIMAL_PARAMETER_CONTRACT_DOCUMENTATION = {
   defaultLevel: "warning",
   summary: "Prefer the proven read-only subset for a private consumer parameter.",
@@ -3079,8 +3126,8 @@ var PREFER_MINIMAL_PARAMETER_CONTRACT_DOCUMENTATION = {
   category: "architecture",
   autofix: "safe",
   limitations: [
-    "Automatic fixes additionally require every existing identifier caller to be natively assignable to the original contract, without Any, unknown, error or unresolved types on the relevant surface. Comments inside the annotation and TypeScript suppression directives keep the finding manual. Only unread required property signatures are removed; every read or optional member, modifier and terminator token is preserved. Edits that would merge distinct CR and LF terminators remain manual.",
-    "Requires parser-owned TypeScript information and a strict external module. Only top-level private function declarations and raw const arrows with exactly one explicit parameter and an independent broad primitive return annotation are supported. Every callable reference must be a direct call with one identifier argument; exports including type-only exports, typeof queries, callbacks, storage, constructors, contextual signatures, overloads, generics, decorators, async functions and direct eval prevent findings.",
+    "Automatic fixes additionally require every existing identifier argument to be natively assignable to its corresponding original parameter contract, without Any, unknown, error or unresolved types on the relevant surface. Comments inside the annotation and TypeScript suppression directives keep the finding manual. Only unread required object property signatures are removed; every read or optional member, modifier and terminator token is preserved. Auxiliary annotations and argument order stay unchanged. Edits that would merge distinct CR and LF terminators remain manual.",
+    "Requires parser-owned TypeScript information and a strict external module. Only top-level private function declarations and raw const arrows with one explicit inline object parameter and an independent broad primitive return annotation are supported. Other parameters must be required identifiers annotated directly as string, number, boolean or bigint; optional, default, rest, destructured, domain-specific and explicit this auxiliaries are excluded. Every callable reference must be a direct call with an identifier argument for every parameter; exports including type-only exports, typeof queries, callbacks, storage, constructors, contextual signatures, overloads, generics, decorators, async functions and direct eval prevent findings.",
     "Only anonymous inline contracts made of broad string, number, boolean or bigint property types are supported. A read field or an unread required field may additionally have exactly one such keyword and null or undefined in a direct two-part union; unread optional nullable fields and more complex unions remain excluded. Fields may be plain or readonly; the consumer body must still prove read-only usage. Every read field keeps its exact type, modifiers and optionality. Named domain contracts, brands, literal discriminants, classes, methods, callbacks, indexes, mapped types and imported parameter contracts are excluded. At least one read required field and one unread required field must be established; all-optional reduced contracts can reject existing callers through weak-type checks.",
     "The single return expression may use only fixed scalar field reads, flat destructuring, literals, operators, templates and scalar calls to same-file implemented top-level functions or raw const arrows with an explicit return annotation. These calls require one native resolved declaration, no generic or predicate signature, scalar arguments/result and complete active native checking of the local implementation file. Their helper bodies need not be pure because only scalar values cross the call and only an erased parameter annotation changes. Imported, aliased, ambient, overloaded, optional, spread and member calls remain unsupported. Bound destructured fields count as reads even when their local aliases are unused. Whole-object escape, identity, mutation, closures, reflection, serialization, dynamic keys, implicit Object capabilities and JSX are unsupported. Unknown semantic information causes abstention. Findings outside the fix proof remain manual; this is not a requirement to minimize every object or discard useful producer fields."
   ],
@@ -3092,7 +3139,9 @@ var PREFER_MINIMAL_PARAMETER_CONTRACT_DOCUMENTATION = {
     { id: "unread-nullable-field", scenarioId: "nullable-private-field", title: "A required nullable field is never inspected", outcome: "match", files: [{ path: "src/case.ts", source: NULLABLE_EXAMPLE2 }, CONFIG2], focusPath: "src/case.ts", expectedCount: 1, public: true, fixedFiles: [{ path: "src/case.ts", source: NULLABLE_EXAMPLE2.replace("email: string | null;", "") }] },
     { id: "read-nullable-field", scenarioId: "nullable-private-field", title: "An inspected nullable field keeps its contract", outcome: "no-match", files: [{ path: "src/case.ts", source: NULLABLE_EXAMPLE2.replace("return user.name;", "return user.email ?? user.name;") }, CONFIG2], focusPath: "src/case.ts", expectedCount: 0, public: true },
     { id: "retained-nullable-read", scenarioId: "retained-nullable-field", title: "A nullable name remains while an unread email requirement is removed", outcome: "match", files: [{ path: "src/case.ts", source: READ_NULLABLE_EXAMPLE }, CONFIG2], focusPath: "src/case.ts", expectedCount: 1, public: true, fixedFiles: [{ path: "src/case.ts", source: READ_NULLABLE_EXAMPLE.replace("readonly email: string;", "") }] },
-    { id: "retained-nullable-all-used", scenarioId: "retained-nullable-field", title: "Both requirements remain when the nullable view reads email too", outcome: "no-match", files: [{ path: "src/case.ts", source: READ_NULLABLE_EXAMPLE.replace('return user.name ?? "";', "return user.name ?? user.email;") }, CONFIG2], focusPath: "src/case.ts", expectedCount: 0, public: true }
+    { id: "retained-nullable-all-used", scenarioId: "retained-nullable-field", title: "Both requirements remain when the nullable view reads email too", outcome: "no-match", files: [{ path: "src/case.ts", source: READ_NULLABLE_EXAMPLE.replace('return user.name ?? "";', "return user.name ?? user.email;") }, CONFIG2], focusPath: "src/case.ts", expectedCount: 0, public: true },
+    { id: "auxiliary-scalar", scenarioId: "auxiliary-scalar-parameter", title: "A scalar prefix does not require the object's unread email", outcome: "match", files: [{ path: "src/case.ts", source: AUXILIARY_EXAMPLE }, CONFIG2], focusPath: "src/case.ts", expectedCount: 1, public: true, fixedFiles: [{ path: "src/case.ts", source: AUXILIARY_EXAMPLE.replace("email: string;", "") }] },
+    { id: "auxiliary-all-used", scenarioId: "auxiliary-scalar-parameter", title: "Reading both object fields retains their requirements", outcome: "no-match", files: [{ path: "src/case.ts", source: AUXILIARY_EXAMPLE.replace("return prefix + user.name;", "return prefix + user.name + user.email;") }, CONFIG2], focusPath: "src/case.ts", expectedCount: 0, public: true }
   ]
 };
 function inlineFields(node, reads) {
@@ -3118,7 +3167,7 @@ var prefer_minimal_parameter_contract_default = createRule({
     const candidates = [];
     let dynamic = false;
     const remember = (node) => {
-      if (consumerAnnotation(node)?.type === AST_NODE_TYPES25.TSTypeLiteral) candidates.push(node);
+      if (consumerAnnotation(node, true)?.type === AST_NODE_TYPES25.TSTypeLiteral) candidates.push(node);
     };
     return {
       FunctionDeclaration: remember,
@@ -3134,7 +3183,7 @@ var prefer_minimal_parameter_contract_default = createRule({
         const checker = services.program.getTypeChecker();
         const exports = exportedSymbols(source, checker);
         for (const candidate2 of candidates) {
-          const consumer = privateScalarConsumer(candidate2, context.sourceCode, services, exports, true);
+          const consumer = privateScalarConsumer(candidate2, context.sourceCode, services, exports, { scalarCalls: true, auxiliaryScalars: true });
           const annotation = consumer?.parameter.type;
           if (!consumer || !annotation || !ts8.isTypeLiteralNode(annotation)) continue;
           const fields2 = inlineFields(annotation, consumer.reads);
@@ -4217,7 +4266,7 @@ function isSearchParamReceiver(call, services) {
 // package.json
 var package_default = {
   name: "@sarj/eslint-plugin",
-  version: "16.38.53",
+  version: "16.38.54",
   packageManager: "npm@12.2.1",
   description: "Custom ESLint rules for hypermodern TypeScript / React / Next.js projects",
   type: "module",

package/package.json

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