@fedify/lint 2.2.13 → 2.2.14

package/deno.json

@@ -1,11 +1,12 @@
 {
   "name": "@fedify/lint",
-  "version": "2.2.13",
+  "version": "2.2.14",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts"
   },
   "imports": {
+    "@fedify/fixture": "jsr:@fedify/fixture@^2.2.14",
     "eslint": "npm:eslint@^9.0.0",
     "estree": "npm:@types/estree@^1.0.8"
   },

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.13";
+var version = "2.2.14";
 //#endregion
 //#region src/lib/const.ts
 /**
@@ -623,7 +623,7 @@ const DELIVERY_METHOD_NAMES = new Set(["sendActivity", "forwardActivity"]);
 const getMemberPropertyName = (expr) => {
 	if (expr.type !== "MemberExpression") return null;
 	const property = expr.property;
-	if (property.type === "Identifier") return property.name;
+	if (property.type === "Identifier" && !expr.computed) return property.name;
 	if (property.type === "Literal" && typeof property.value === "string") return property.value;
 	return null;
 };
@@ -759,35 +759,139 @@ function buildContextExpressionPattern(contextName) {
 	const boundedName = String.raw`(?<![\w$])${name}(?![\w$])`;
 	return String.raw`(?:${boundedName}|\(\s*${boundedName}(?:\s+as\s+[^)]+)?\s*\))`;
 }
-const resolveListenerReference = (expr, bindings, seen = /* @__PURE__ */ new Set()) => {
-	if (isFunction(expr)) return expr;
-	if (expr.type === "Identifier") {
-		if (seen.has(expr.name)) return null;
-		seen.add(expr.name);
-		const binding = bindings.get(expr.name);
-		if (binding == null || !isNode(binding)) return null;
-		if (isFunction(binding) || binding.type === "FunctionDeclaration") return binding;
-		if (binding.type === "Identifier") return resolveListenerReference(binding, bindings, seen);
-		return null;
+const getParent = (node) => node.parent ?? null;
+const isFunctionLike = (node) => node.type === "FunctionDeclaration" || isFunction(node);
+function bindPattern(node, bindings) {
+	switch (node.type) {
+		case "Identifier":
+			bindings.set(node.name, { value: null });
+			break;
+		case "AssignmentPattern":
+			bindPattern(node.left, bindings);
+			break;
+		case "RestElement":
+			bindPattern(node.argument, bindings);
+			break;
+		case "ObjectPattern":
+			for (const property of node.properties) bindPattern(property.type === "Property" ? property.value : property, bindings);
+			break;
+		case "ArrayPattern":
+			for (const element of node.elements) if (element != null) bindPattern(element, bindings);
+			break;
 	}
-	if (expr.type === "MemberExpression" && expr.object.type === "Identifier" && !expr.computed) {
-		const binding = bindings.get(expr.object.name);
-		if (binding == null || !isNode(binding) || binding.type !== "ObjectExpression") return null;
-		const propertyName = getMemberPropertyName(expr);
-		if (propertyName == null) return null;
-		for (const prop of binding.properties) {
-			if (!isNode(prop) || prop.type !== "Property") continue;
-			if ((prop.key.type === "Identifier" ? prop.key.name : prop.key.type === "Literal" && typeof prop.key.value === "string" ? prop.key.value : null) !== propertyName || !isNode(prop.value)) continue;
-			const value = prop.value;
-			if (isFunction(value) || value.type === "FunctionDeclaration") return value;
+}
+function createBindingIndex() {
+	const scopes = /* @__PURE__ */ new Map();
+	const scopeBindings = (scope) => {
+		let bindings = scopes.get(scope);
+		if (bindings == null) {
+			bindings = /* @__PURE__ */ new Map();
+			scopes.set(scope, bindings);
+			if (isFunctionLike(scope)) {
+				if (scope.type === "FunctionExpression" && scope.id != null) bindings.set(scope.id.name, { value: scope });
+				for (const param of scope.params) bindPattern(param, bindings);
+			}
+			if (scope.type === "ClassExpression" && scope.id != null) bindings.set(scope.id.name, { value: null });
+			if (scope.type === "CatchClause" && scope.param != null) bindPattern(scope.param, bindings);
+		}
+		return bindings;
+	};
+	const enclosingScope = (node, functionScope = false) => {
+		let scope = getParent(node);
+		while (scope.type !== "Program" && scope.type !== "StaticBlock" && scope.type !== "TSModuleBlock" && !isFunctionLike(scope) && (functionScope || ![
+			"BlockStatement",
+			"ForStatement",
+			"ForInStatement",
+			"ForOfStatement",
+			"SwitchStatement",
+			"CatchClause"
+		].includes(scope.type))) scope = getParent(scope);
+		return scope;
+	};
+	const lookup = (node, name) => {
+		for (let scope = node; scope != null; scope = getParent(scope)) {
+			const binding = scopeBindings(scope).get(name);
+			if (binding != null) return binding;
+		}
+		return null;
+	};
+	return {
+		lookup,
+		declare(node, pattern, value, hoisted = false) {
+			const bindings = scopeBindings(enclosingScope(node, hoisted));
+			if (pattern.type === "Identifier") {
+				if (hoisted && value == null && bindings.has(pattern.name)) return;
+				if (node.type === "FunctionDeclaration" && bindings.get(pattern.name)?.initializedVariable) return;
+				bindings.set(pattern.name, {
+					value,
+					initializedVariable: node.type === "VariableDeclarator" && value != null
+				});
+			} else bindPattern(pattern, bindings);
 		}
+	};
+}
+const resolveBindingValue = (expr, bindings, seen = /* @__PURE__ */ new Set()) => {
+	if (expr.type !== "Identifier") return expr;
+	const binding = bindings.lookup(expr, expr.name);
+	if (binding == null || binding.value == null || seen.has(binding)) return null;
+	seen.add(binding);
+	return resolveBindingValue(binding.value, bindings, seen);
+};
+const resolveListenerReference = (expr, bindings) => {
+	const target = resolveBindingValue(expr, bindings);
+	if (target == null) return null;
+	if (isFunctionLike(target)) return target;
+	if (target.type !== "MemberExpression") return null;
+	const object = resolveBindingValue(target.object, bindings);
+	if (object?.type !== "ObjectExpression") return null;
+	const propertyName = getMemberPropertyName(target);
+	if (propertyName == null) return null;
+	for (const prop of object.properties) {
+		if (prop.type !== "Property") continue;
+		if ((prop.key.type === "Identifier" && !prop.computed ? prop.key.name : prop.key.type === "Literal" && typeof prop.key.value === "string" ? prop.key.value : null) !== propertyName) continue;
+		const value = resolveBindingValue(prop.value, bindings);
+		if (value != null && isFunctionLike(value)) return value;
 	}
 	return null;
 };
-const listenerCallsDeliveryMethod = (sourceCode, listener) => {
+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()) {
+	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;
+	const param = unwrapContextParam(listener.params[contextIndex]);
+	if (param?.type !== "Identifier") return false;
+	const contextBinding = bindings.lookup(listener, param.name);
+	for (const call of calls) {
+		let child = call;
+		let owner = getParent(child);
+		while (owner != null && !isFunctionLike(owner)) {
+			const field = owner;
+			if ((field.type === "PropertyDefinition" || field.type === "AccessorProperty") && !field.static && field.value === child) break;
+			child = owner;
+			owner = getParent(owner);
+		}
+		if (owner !== listener) continue;
+		const helper = resolveListenerReference(call.callee, bindings);
+		if (helper == null || "generator" in helper && helper.generator) continue;
+		for (const [index, argument] of call.arguments.entries()) {
+			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;
+		}
+	}
+	return false;
+}
+const listenerCallsDeliveryMethod = (sourceCode, listener, contextIndex = 0) => {
 	const code = stripCommentsAndStrings(sourceCode.getText(listener));
 	const aliases = /* @__PURE__ */ new Set();
-	const contextParam = unwrapContextParam(listener.params[0]);
+	const contextParam = unwrapContextParam(listener.params[contextIndex]);
 	const contextName = contextParam?.type === "Identifier" ? contextParam.name : null;
 	if (contextParam?.type === "ObjectPattern") for (const prop of contextParam.properties) {
 		if (!isNode(prop) || prop.type !== "Property") continue;
@@ -816,7 +920,7 @@ const listenerCallsDeliveryMethod = (sourceCode, listener) => {
 function createRule(buildReport) {
 	return (context) => {
 		const federationTracker = trackFederationVariables();
-		const bindings = /* @__PURE__ */ new Map();
+		const bindings = createBindingIndex();
 		const pendingCalls = [];
 		const sourceCode = context.sourceCode;
 		const inspectCall = (node) => {
@@ -825,7 +929,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 (listenerCallsDeliveryMethod(sourceCode, resolvedListener)) return;
+			if (functionCallsDelivery(sourceCode, resolvedListener, bindings, pendingCalls)) return;
 			context.report({
 				node: resolvedListener,
 				...buildReport
@@ -834,10 +938,21 @@ function createRule(buildReport) {
 		return {
 			VariableDeclarator(node) {
 				federationTracker.VariableDeclarator(node);
-				if (node.id.type === "Identifier" && node.init != null) bindings.set(node.id.name, node.init);
+				const declaration = getParent(node);
+				bindings.declare(node, node.id, node.init, declaration?.kind === "var");
 			},
 			FunctionDeclaration(node) {
-				if (node.id != null) bindings.set(node.id.name, node);
+				if (node.id == null) return;
+				const parent = getParent(node);
+				const owner = parent == null ? null : getParent(parent);
+				const inVarBody = parent?.type === "BlockStatement" && owner != null && (owner.type === "StaticBlock" || isFunctionLike(owner) && owner.body === parent);
+				bindings.declare(node, node.id, node, inVarBody);
+			},
+			ImportDeclaration(node) {
+				for (const specifier of node.specifiers) bindings.declare(node, specifier.local, null);
+			},
+			ClassDeclaration(node) {
+				if (node.id != null) bindings.declare(node, node.id, null);
 			},
 			CallExpression(node) {
 				pendingCalls.push(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.13";
+var version = "2.2.14";
 //#endregion
 //#region src/lib/const.ts
 /**
@@ -596,7 +596,7 @@ const DELIVERY_METHOD_NAMES = new Set(["sendActivity", "forwardActivity"]);
 const getMemberPropertyName = (expr) => {
 	if (expr.type !== "MemberExpression") return null;
 	const property = expr.property;
-	if (property.type === "Identifier") return property.name;
+	if (property.type === "Identifier" && !expr.computed) return property.name;
 	if (property.type === "Literal" && typeof property.value === "string") return property.value;
 	return null;
 };
@@ -732,35 +732,139 @@ function buildContextExpressionPattern(contextName) {
 	const boundedName = String.raw`(?<![\w$])${name}(?![\w$])`;
 	return String.raw`(?:${boundedName}|\(\s*${boundedName}(?:\s+as\s+[^)]+)?\s*\))`;
 }
-const resolveListenerReference = (expr, bindings, seen = /* @__PURE__ */ new Set()) => {
-	if (isFunction(expr)) return expr;
-	if (expr.type === "Identifier") {
-		if (seen.has(expr.name)) return null;
-		seen.add(expr.name);
-		const binding = bindings.get(expr.name);
-		if (binding == null || !isNode(binding)) return null;
-		if (isFunction(binding) || binding.type === "FunctionDeclaration") return binding;
-		if (binding.type === "Identifier") return resolveListenerReference(binding, bindings, seen);
-		return null;
+const getParent = (node) => node.parent ?? null;
+const isFunctionLike = (node) => node.type === "FunctionDeclaration" || isFunction(node);
+function bindPattern(node, bindings) {
+	switch (node.type) {
+		case "Identifier":
+			bindings.set(node.name, { value: null });
+			break;
+		case "AssignmentPattern":
+			bindPattern(node.left, bindings);
+			break;
+		case "RestElement":
+			bindPattern(node.argument, bindings);
+			break;
+		case "ObjectPattern":
+			for (const property of node.properties) bindPattern(property.type === "Property" ? property.value : property, bindings);
+			break;
+		case "ArrayPattern":
+			for (const element of node.elements) if (element != null) bindPattern(element, bindings);
+			break;
 	}
-	if (expr.type === "MemberExpression" && expr.object.type === "Identifier" && !expr.computed) {
-		const binding = bindings.get(expr.object.name);
-		if (binding == null || !isNode(binding) || binding.type !== "ObjectExpression") return null;
-		const propertyName = getMemberPropertyName(expr);
-		if (propertyName == null) return null;
-		for (const prop of binding.properties) {
-			if (!isNode(prop) || prop.type !== "Property") continue;
-			if ((prop.key.type === "Identifier" ? prop.key.name : prop.key.type === "Literal" && typeof prop.key.value === "string" ? prop.key.value : null) !== propertyName || !isNode(prop.value)) continue;
-			const value = prop.value;
-			if (isFunction(value) || value.type === "FunctionDeclaration") return value;
+}
+function createBindingIndex() {
+	const scopes = /* @__PURE__ */ new Map();
+	const scopeBindings = (scope) => {
+		let bindings = scopes.get(scope);
+		if (bindings == null) {
+			bindings = /* @__PURE__ */ new Map();
+			scopes.set(scope, bindings);
+			if (isFunctionLike(scope)) {
+				if (scope.type === "FunctionExpression" && scope.id != null) bindings.set(scope.id.name, { value: scope });
+				for (const param of scope.params) bindPattern(param, bindings);
+			}
+			if (scope.type === "ClassExpression" && scope.id != null) bindings.set(scope.id.name, { value: null });
+			if (scope.type === "CatchClause" && scope.param != null) bindPattern(scope.param, bindings);
+		}
+		return bindings;
+	};
+	const enclosingScope = (node, functionScope = false) => {
+		let scope = getParent(node);
+		while (scope.type !== "Program" && scope.type !== "StaticBlock" && scope.type !== "TSModuleBlock" && !isFunctionLike(scope) && (functionScope || ![
+			"BlockStatement",
+			"ForStatement",
+			"ForInStatement",
+			"ForOfStatement",
+			"SwitchStatement",
+			"CatchClause"
+		].includes(scope.type))) scope = getParent(scope);
+		return scope;
+	};
+	const lookup = (node, name) => {
+		for (let scope = node; scope != null; scope = getParent(scope)) {
+			const binding = scopeBindings(scope).get(name);
+			if (binding != null) return binding;
+		}
+		return null;
+	};
+	return {
+		lookup,
+		declare(node, pattern, value, hoisted = false) {
+			const bindings = scopeBindings(enclosingScope(node, hoisted));
+			if (pattern.type === "Identifier") {
+				if (hoisted && value == null && bindings.has(pattern.name)) return;
+				if (node.type === "FunctionDeclaration" && bindings.get(pattern.name)?.initializedVariable) return;
+				bindings.set(pattern.name, {
+					value,
+					initializedVariable: node.type === "VariableDeclarator" && value != null
+				});
+			} else bindPattern(pattern, bindings);
 		}
+	};
+}
+const resolveBindingValue = (expr, bindings, seen = /* @__PURE__ */ new Set()) => {
+	if (expr.type !== "Identifier") return expr;
+	const binding = bindings.lookup(expr, expr.name);
+	if (binding == null || binding.value == null || seen.has(binding)) return null;
+	seen.add(binding);
+	return resolveBindingValue(binding.value, bindings, seen);
+};
+const resolveListenerReference = (expr, bindings) => {
+	const target = resolveBindingValue(expr, bindings);
+	if (target == null) return null;
+	if (isFunctionLike(target)) return target;
+	if (target.type !== "MemberExpression") return null;
+	const object = resolveBindingValue(target.object, bindings);
+	if (object?.type !== "ObjectExpression") return null;
+	const propertyName = getMemberPropertyName(target);
+	if (propertyName == null) return null;
+	for (const prop of object.properties) {
+		if (prop.type !== "Property") continue;
+		if ((prop.key.type === "Identifier" && !prop.computed ? prop.key.name : prop.key.type === "Literal" && typeof prop.key.value === "string" ? prop.key.value : null) !== propertyName) continue;
+		const value = resolveBindingValue(prop.value, bindings);
+		if (value != null && isFunctionLike(value)) return value;
 	}
 	return null;
 };
-const listenerCallsDeliveryMethod = (sourceCode, listener) => {
+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()) {
+	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;
+	const param = unwrapContextParam(listener.params[contextIndex]);
+	if (param?.type !== "Identifier") return false;
+	const contextBinding = bindings.lookup(listener, param.name);
+	for (const call of calls) {
+		let child = call;
+		let owner = getParent(child);
+		while (owner != null && !isFunctionLike(owner)) {
+			const field = owner;
+			if ((field.type === "PropertyDefinition" || field.type === "AccessorProperty") && !field.static && field.value === child) break;
+			child = owner;
+			owner = getParent(owner);
+		}
+		if (owner !== listener) continue;
+		const helper = resolveListenerReference(call.callee, bindings);
+		if (helper == null || "generator" in helper && helper.generator) continue;
+		for (const [index, argument] of call.arguments.entries()) {
+			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;
+		}
+	}
+	return false;
+}
+const listenerCallsDeliveryMethod = (sourceCode, listener, contextIndex = 0) => {
 	const code = stripCommentsAndStrings(sourceCode.getText(listener));
 	const aliases = /* @__PURE__ */ new Set();
-	const contextParam = unwrapContextParam(listener.params[0]);
+	const contextParam = unwrapContextParam(listener.params[contextIndex]);
 	const contextName = contextParam?.type === "Identifier" ? contextParam.name : null;
 	if (contextParam?.type === "ObjectPattern") for (const prop of contextParam.properties) {
 		if (!isNode(prop) || prop.type !== "Property") continue;
@@ -789,7 +893,7 @@ const listenerCallsDeliveryMethod = (sourceCode, listener) => {
 function createRule(buildReport) {
 	return (context) => {
 		const federationTracker = trackFederationVariables();
-		const bindings = /* @__PURE__ */ new Map();
+		const bindings = createBindingIndex();
 		const pendingCalls = [];
 		const sourceCode = context.sourceCode;
 		const inspectCall = (node) => {
@@ -798,7 +902,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 (listenerCallsDeliveryMethod(sourceCode, resolvedListener)) return;
+			if (functionCallsDelivery(sourceCode, resolvedListener, bindings, pendingCalls)) return;
 			context.report({
 				node: resolvedListener,
 				...buildReport
@@ -807,10 +911,21 @@ function createRule(buildReport) {
 		return {
 			VariableDeclarator(node) {
 				federationTracker.VariableDeclarator(node);
-				if (node.id.type === "Identifier" && node.init != null) bindings.set(node.id.name, node.init);
+				const declaration = getParent(node);
+				bindings.declare(node, node.id, node.init, declaration?.kind === "var");
 			},
 			FunctionDeclaration(node) {
-				if (node.id != null) bindings.set(node.id.name, node);
+				if (node.id == null) return;
+				const parent = getParent(node);
+				const owner = parent == null ? null : getParent(parent);
+				const inVarBody = parent?.type === "BlockStatement" && owner != null && (owner.type === "StaticBlock" || isFunctionLike(owner) && owner.body === parent);
+				bindings.declare(node, node.id, node, inVarBody);
+			},
+			ImportDeclaration(node) {
+				for (const specifier of node.specifiers) bindings.declare(node, specifier.local, null);
+			},
+			ClassDeclaration(node) {
+				if (node.id != null) bindings.declare(node, node.id, null);
 			},
 			CallExpression(node) {
 				pendingCalls.push(node);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/lint",
-  "version": "2.2.13",
+  "version": "2.2.14",
   "description": "Fedify linting rules and plugins",
   "keywords": [
     "Fedify",
@@ -47,7 +47,7 @@
   ],
   "peerDependencies": {
     "eslint": ">=9.0.0",
-    "@fedify/fedify": "^2.2.13"
+    "@fedify/fedify": "^2.2.14"
   },
   "peerDependenciesMeta": {
     "eslint": {
@@ -64,7 +64,8 @@
     "@types/estree": "^1.0.8",
     "eslint": "^9.0.0",
     "tsdown": "^0.21.6",
-    "typescript": "^6.0.0"
+    "typescript": "^6.0.0",
+    "@fedify/fixture": "^2.0.0"
   },
   "scripts": {
     "build:self": "tsdown",