@fedify/lint 2.2.14-dev.2082 → 2.2.15-dev.2196

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/lint",
-  "version": "2.2.14-dev.2082+79cd52e9",
+  "version": "2.2.15-dev.2196+10201be2",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts"

package/dist/index.cjs

@@ -29,7 +29,7 @@ let _typescript_eslint_parser = require("@typescript-eslint/parser");
 _typescript_eslint_parser = __toESM(_typescript_eslint_parser);
 //#region deno.json
 var name = "@fedify/lint";
-var version = "2.2.14-dev.2082+79cd52e9";
+var version = "2.2.15-dev.2196+10201be2";
 //#endregion
 //#region src/lib/const.ts
 /**
@@ -830,6 +830,37 @@ function createBindingIndex() {
 		}
 	};
 }
+const position = (node) => node.range?.[0] ?? node.start ?? -1;
+const endPosition = (node) => node.range?.[1] ?? node.end ?? -1;
+const enclosingFunction = (node) => {
+	for (let parent = getParent(node); parent != null; parent = getParent(parent)) if (isFunctionLike(parent)) return parent;
+	return null;
+};
+const isInside = (node, ancestor) => {
+	for (let current = node; current != null; current = getParent(current)) if (current === ancestor) return true;
+	return false;
+};
+const isDirectStatement = (node, fn) => {
+	let current = node;
+	while (getParent(current) !== fn.body) {
+		const parent = getParent(current);
+		if (parent == null || ![
+			"AwaitExpression",
+			"ExpressionStatement",
+			"ReturnStatement",
+			"VariableDeclarator",
+			"VariableDeclaration",
+			"BlockStatement"
+		].includes(parent.type)) return false;
+		current = parent;
+	}
+	return [
+		"ExpressionStatement",
+		"ReturnStatement",
+		"VariableDeclaration",
+		"BlockStatement"
+	].includes(current.type);
+};
 const resolveBindingValue = (expr, bindings, seen = /* @__PURE__ */ new Set()) => {
 	if (expr.type !== "Identifier") return expr;
 	const binding = bindings.lookup(expr, expr.name);
@@ -858,12 +889,45 @@ function unwrapArgument(node) {
 	while (node.type === "TSAsExpression" || node.type === "TSTypeAssertion" || node.type === "TSNonNullExpression") node = node.expression;
 	return node;
 }
-function functionCallsDelivery(sourceCode, listener, bindings, calls, contextIndex = 0, visited = /* @__PURE__ */ new Map()) {
+function ignoredLocalSetupFunctions(listener, bindings, calls, assignments) {
+	const ignored = [];
+	const directCalls = calls.filter((call) => enclosingFunction(call) === listener && isDirectStatement(call, listener));
+	for (const assignment of assignments) {
+		if (assignment.type !== "AssignmentExpression" || assignment.operator !== "=" || assignment.left.type !== "MemberExpression" || !isFunction(assignment.right)) continue;
+		const setup = enclosingFunction(assignment);
+		if (setup == null || setup === listener || !isInside(setup, listener)) continue;
+		const setupParent = getParent(setup);
+		const namedLocalSetup = enclosingFunction(setup) === listener && (setup.type === "FunctionDeclaration" || setupParent?.type === "VariableDeclarator" && setupParent.init === setup && setupParent.id.type === "Identifier");
+		const passedToCall = calls.some((call) => call.arguments.some((argument) => argument.type !== "SpreadElement" && resolveListenerReference(argument, bindings) === setup));
+		if (!namedLocalSetup || passedToCall) continue;
+		const installed = assignment.right;
+		if (!isDirectStatement(assignment, setup) || assignment.left.object.type !== "Identifier") {
+			ignored.push(installed);
+			continue;
+		}
+		const property = getMemberPropertyName(assignment.left);
+		if (property == null) continue;
+		const setupCalls = directCalls.filter((call) => resolveListenerReference(call.callee, bindings) === setup);
+		if (setupCalls.length === 0) {
+			const called = calls.some((call) => resolveListenerReference(call.callee, bindings) === setup);
+			ignored.push(called ? assignment.right : setup);
+			continue;
+		}
+		const objectBinding = bindings.lookup(assignment.left.object, assignment.left.object.name);
+		const deliveryCalls = directCalls.filter((call) => {
+			const callee = call.callee;
+			return callee.type === "MemberExpression" && callee.object.type === "Identifier" && getMemberPropertyName(callee) === property && bindings.lookup(callee.object, callee.object.name) === objectBinding;
+		});
+		if (!(objectBinding != null && setupCalls.some((setupCall) => deliveryCalls.some((deliveryCall) => position(setupCall) >= 0 && position(setupCall) < position(deliveryCall))))) ignored.push(installed);
+	}
+	return ignored;
+}
+function functionCallsDelivery(sourceCode, listener, bindings, calls, assignments, contextIndex = 0, visited = /* @__PURE__ */ new Map()) {
 	let indices = visited.get(listener);
 	if (indices?.has(contextIndex)) return false;
 	if (indices == null) visited.set(listener, indices = /* @__PURE__ */ new Set());
 	indices.add(contextIndex);
-	if (listenerCallsDeliveryMethod(sourceCode, listener, contextIndex)) return true;
+	if (listenerCallsDeliveryMethod(sourceCode, listener, contextIndex, ignoredLocalSetupFunctions(listener, bindings, calls, assignments))) return true;
 	const param = unwrapContextParam(listener.params[contextIndex]);
 	if (param?.type !== "Identifier") return false;
 	const contextBinding = bindings.lookup(listener, param.name);
@@ -883,13 +947,21 @@ function functionCallsDelivery(sourceCode, listener, bindings, calls, contextInd
 			if (argument.type === "SpreadElement") break;
 			const arg = unwrapArgument(argument);
 			if (arg.type !== "Identifier" || arg.name !== param.name || bindings.lookup(arg, arg.name) !== contextBinding || helper.params[index]?.type === "RestElement") continue;
-			if (functionCallsDelivery(sourceCode, helper, bindings, calls, index, visited)) return true;
+			if (functionCallsDelivery(sourceCode, helper, bindings, calls, assignments, index, visited)) return true;
 		}
 	}
 	return false;
 }
-const listenerCallsDeliveryMethod = (sourceCode, listener, contextIndex = 0) => {
-	const code = stripCommentsAndStrings(sourceCode.getText(listener));
+const listenerCallsDeliveryMethod = (sourceCode, listener, contextIndex = 0, ignored = []) => {
+	let text = sourceCode.getText(listener);
+	const start = position(listener);
+	for (const fn of ignored) {
+		const from = position(fn) - start;
+		const to = endPosition(fn) - start;
+		if (from < 0 || to > text.length || to < from) continue;
+		text = text.slice(0, from) + " ".repeat(to - from) + text.slice(to);
+	}
+	const code = stripCommentsAndStrings(text);
 	const aliases = /* @__PURE__ */ new Set();
 	const contextParam = unwrapContextParam(listener.params[contextIndex]);
 	const contextName = contextParam?.type === "Identifier" ? contextParam.name : null;
@@ -922,6 +994,7 @@ function createRule(buildReport) {
 		const federationTracker = trackFederationVariables();
 		const bindings = createBindingIndex();
 		const pendingCalls = [];
+		const pendingAssignments = [];
 		const sourceCode = context.sourceCode;
 		const inspectCall = (node) => {
 			if (!hasMemberExpressionCallee(node) || !hasIdentifierProperty(node) || !hasMethodName("on")(node) || node.arguments.length < 2) return;
@@ -929,7 +1002,7 @@ function createRule(buildReport) {
 			const listener = node.arguments[1];
 			const resolvedListener = isNode(listener) && isFunction(listener) ? listener : isNode(listener) ? resolveListenerReference(listener, bindings) : null;
 			if (resolvedListener == null) return;
-			if (functionCallsDelivery(sourceCode, resolvedListener, bindings, pendingCalls)) return;
+			if (functionCallsDelivery(sourceCode, resolvedListener, bindings, pendingCalls, pendingAssignments)) return;
 			context.report({
 				node: resolvedListener,
 				...buildReport
@@ -957,6 +1030,9 @@ function createRule(buildReport) {
 			CallExpression(node) {
 				pendingCalls.push(node);
 			},
+			AssignmentExpression(node) {
+				pendingAssignments.push(node);
+			},
 			"Program:exit"() {
 				for (const node of pendingCalls) inspectCall(node);
 			}

package/dist/index.js

@@ -2,7 +2,7 @@ import { always, every, fromEntries, head, isEmpty, isObject, keys, map, negate,
 import parser from "@typescript-eslint/parser";
 //#region deno.json
 var name = "@fedify/lint";
-var version = "2.2.14-dev.2082+79cd52e9";
+var version = "2.2.15-dev.2196+10201be2";
 //#endregion
 //#region src/lib/const.ts
 /**
@@ -803,6 +803,37 @@ function createBindingIndex() {
 		}
 	};
 }
+const position = (node) => node.range?.[0] ?? node.start ?? -1;
+const endPosition = (node) => node.range?.[1] ?? node.end ?? -1;
+const enclosingFunction = (node) => {
+	for (let parent = getParent(node); parent != null; parent = getParent(parent)) if (isFunctionLike(parent)) return parent;
+	return null;
+};
+const isInside = (node, ancestor) => {
+	for (let current = node; current != null; current = getParent(current)) if (current === ancestor) return true;
+	return false;
+};
+const isDirectStatement = (node, fn) => {
+	let current = node;
+	while (getParent(current) !== fn.body) {
+		const parent = getParent(current);
+		if (parent == null || ![
+			"AwaitExpression",
+			"ExpressionStatement",
+			"ReturnStatement",
+			"VariableDeclarator",
+			"VariableDeclaration",
+			"BlockStatement"
+		].includes(parent.type)) return false;
+		current = parent;
+	}
+	return [
+		"ExpressionStatement",
+		"ReturnStatement",
+		"VariableDeclaration",
+		"BlockStatement"
+	].includes(current.type);
+};
 const resolveBindingValue = (expr, bindings, seen = /* @__PURE__ */ new Set()) => {
 	if (expr.type !== "Identifier") return expr;
 	const binding = bindings.lookup(expr, expr.name);
@@ -831,12 +862,45 @@ function unwrapArgument(node) {
 	while (node.type === "TSAsExpression" || node.type === "TSTypeAssertion" || node.type === "TSNonNullExpression") node = node.expression;
 	return node;
 }
-function functionCallsDelivery(sourceCode, listener, bindings, calls, contextIndex = 0, visited = /* @__PURE__ */ new Map()) {
+function ignoredLocalSetupFunctions(listener, bindings, calls, assignments) {
+	const ignored = [];
+	const directCalls = calls.filter((call) => enclosingFunction(call) === listener && isDirectStatement(call, listener));
+	for (const assignment of assignments) {
+		if (assignment.type !== "AssignmentExpression" || assignment.operator !== "=" || assignment.left.type !== "MemberExpression" || !isFunction(assignment.right)) continue;
+		const setup = enclosingFunction(assignment);
+		if (setup == null || setup === listener || !isInside(setup, listener)) continue;
+		const setupParent = getParent(setup);
+		const namedLocalSetup = enclosingFunction(setup) === listener && (setup.type === "FunctionDeclaration" || setupParent?.type === "VariableDeclarator" && setupParent.init === setup && setupParent.id.type === "Identifier");
+		const passedToCall = calls.some((call) => call.arguments.some((argument) => argument.type !== "SpreadElement" && resolveListenerReference(argument, bindings) === setup));
+		if (!namedLocalSetup || passedToCall) continue;
+		const installed = assignment.right;
+		if (!isDirectStatement(assignment, setup) || assignment.left.object.type !== "Identifier") {
+			ignored.push(installed);
+			continue;
+		}
+		const property = getMemberPropertyName(assignment.left);
+		if (property == null) continue;
+		const setupCalls = directCalls.filter((call) => resolveListenerReference(call.callee, bindings) === setup);
+		if (setupCalls.length === 0) {
+			const called = calls.some((call) => resolveListenerReference(call.callee, bindings) === setup);
+			ignored.push(called ? assignment.right : setup);
+			continue;
+		}
+		const objectBinding = bindings.lookup(assignment.left.object, assignment.left.object.name);
+		const deliveryCalls = directCalls.filter((call) => {
+			const callee = call.callee;
+			return callee.type === "MemberExpression" && callee.object.type === "Identifier" && getMemberPropertyName(callee) === property && bindings.lookup(callee.object, callee.object.name) === objectBinding;
+		});
+		if (!(objectBinding != null && setupCalls.some((setupCall) => deliveryCalls.some((deliveryCall) => position(setupCall) >= 0 && position(setupCall) < position(deliveryCall))))) ignored.push(installed);
+	}
+	return ignored;
+}
+function functionCallsDelivery(sourceCode, listener, bindings, calls, assignments, contextIndex = 0, visited = /* @__PURE__ */ new Map()) {
 	let indices = visited.get(listener);
 	if (indices?.has(contextIndex)) return false;
 	if (indices == null) visited.set(listener, indices = /* @__PURE__ */ new Set());
 	indices.add(contextIndex);
-	if (listenerCallsDeliveryMethod(sourceCode, listener, contextIndex)) return true;
+	if (listenerCallsDeliveryMethod(sourceCode, listener, contextIndex, ignoredLocalSetupFunctions(listener, bindings, calls, assignments))) return true;
 	const param = unwrapContextParam(listener.params[contextIndex]);
 	if (param?.type !== "Identifier") return false;
 	const contextBinding = bindings.lookup(listener, param.name);
@@ -856,13 +920,21 @@ function functionCallsDelivery(sourceCode, listener, bindings, calls, contextInd
 			if (argument.type === "SpreadElement") break;
 			const arg = unwrapArgument(argument);
 			if (arg.type !== "Identifier" || arg.name !== param.name || bindings.lookup(arg, arg.name) !== contextBinding || helper.params[index]?.type === "RestElement") continue;
-			if (functionCallsDelivery(sourceCode, helper, bindings, calls, index, visited)) return true;
+			if (functionCallsDelivery(sourceCode, helper, bindings, calls, assignments, index, visited)) return true;
 		}
 	}
 	return false;
 }
-const listenerCallsDeliveryMethod = (sourceCode, listener, contextIndex = 0) => {
-	const code = stripCommentsAndStrings(sourceCode.getText(listener));
+const listenerCallsDeliveryMethod = (sourceCode, listener, contextIndex = 0, ignored = []) => {
+	let text = sourceCode.getText(listener);
+	const start = position(listener);
+	for (const fn of ignored) {
+		const from = position(fn) - start;
+		const to = endPosition(fn) - start;
+		if (from < 0 || to > text.length || to < from) continue;
+		text = text.slice(0, from) + " ".repeat(to - from) + text.slice(to);
+	}
+	const code = stripCommentsAndStrings(text);
 	const aliases = /* @__PURE__ */ new Set();
 	const contextParam = unwrapContextParam(listener.params[contextIndex]);
 	const contextName = contextParam?.type === "Identifier" ? contextParam.name : null;
@@ -895,6 +967,7 @@ function createRule(buildReport) {
 		const federationTracker = trackFederationVariables();
 		const bindings = createBindingIndex();
 		const pendingCalls = [];
+		const pendingAssignments = [];
 		const sourceCode = context.sourceCode;
 		const inspectCall = (node) => {
 			if (!hasMemberExpressionCallee(node) || !hasIdentifierProperty(node) || !hasMethodName("on")(node) || node.arguments.length < 2) return;
@@ -902,7 +975,7 @@ function createRule(buildReport) {
 			const listener = node.arguments[1];
 			const resolvedListener = isNode(listener) && isFunction(listener) ? listener : isNode(listener) ? resolveListenerReference(listener, bindings) : null;
 			if (resolvedListener == null) return;
-			if (functionCallsDelivery(sourceCode, resolvedListener, bindings, pendingCalls)) return;
+			if (functionCallsDelivery(sourceCode, resolvedListener, bindings, pendingCalls, pendingAssignments)) return;
 			context.report({
 				node: resolvedListener,
 				...buildReport
@@ -930,6 +1003,9 @@ function createRule(buildReport) {
 			CallExpression(node) {
 				pendingCalls.push(node);
 			},
+			AssignmentExpression(node) {
+				pendingAssignments.push(node);
+			},
 			"Program:exit"() {
 				for (const node of pendingCalls) inspectCall(node);
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/lint",
-  "version": "2.2.14-dev.2082+79cd52e9",
+  "version": "2.2.15-dev.2196+10201be2",
   "description": "Fedify linting rules and plugins",
   "keywords": [
     "Fedify",
@@ -47,7 +47,7 @@
   ],
   "peerDependencies": {
     "eslint": ">=9.0.0",
-    "@fedify/fedify": "^2.2.14-dev.2082+79cd52e9"
+    "@fedify/fedify": "^2.2.15-dev.2196+10201be2"
   },
   "peerDependenciesMeta": {
     "eslint": {