oxlint-plugin-effect 0.8.1 → 0.8.2

package/dist/rules/prefer-effect-fn.js

@@ -1,14 +1,29 @@
 import { make } from "../vendor/effect-oxlint/Diagnostic.js";
 import { RuleContext } from "../vendor/effect-oxlint/RuleContext.js";
 import { define, meta } from "../vendor/effect-oxlint/Rule.js";
+import { findVariableUp } from "../vendor/effect-oxlint/Scope.js";
 import "../vendor/effect-oxlint/index.js";
+import * as Option from "effect/Option";
 import * as Effect from "effect/Effect";
 //#region src/rules/prefer-effect-fn.ts
-const isStaticMember = (node, object, property) => node.type === "MemberExpression" && !node.computed && node.object.type === "Identifier" && node.object.name === object && node.property.type === "Identifier" && node.property.name === property;
-const isEffectGenCall = (node) => node.type === "CallExpression" && node.callee.type !== "Super" && isStaticMember(node.callee, "Effect", "gen");
-const isEffectWithSpanCall = (node) => node.type === "CallExpression" && node.callee.type !== "Super" && isStaticMember(node.callee, "Effect", "withSpan");
-const spansEffectGenDirectly = (node) => node.callee.type !== "Super" && node.callee.type === "MemberExpression" && !node.callee.computed && node.callee.property.type === "Identifier" && node.callee.property.name === "withSpan" && isEffectGenCall(node.callee.object);
-const pipesOnlyWithSpanFromEffectGen = (node) => node.callee.type !== "Super" && node.callee.type === "MemberExpression" && !node.callee.computed && node.callee.property.type === "Identifier" && node.callee.property.name === "pipe" && isEffectGenCall(node.callee.object) && node.arguments.length === 1 && node.arguments[0] !== void 0 && isEffectWithSpanCall(node.arguments[0]);
+const isStaticMember = (node, objects, property) => node.type === "MemberExpression" && !node.computed && node.object.type === "Identifier" && objects.has(node.object.name) && node.property.type === "Identifier" && node.property.name === property;
+const isEffectGenCall = (node, effectNamespaces) => node.type === "CallExpression" && node.callee.type !== "Super" && isStaticMember(node.callee, effectNamespaces, "gen");
+const isEffectWithSpanCall = (node, effectNamespaces) => node.type === "CallExpression" && node.callee.type !== "Super" && isStaticMember(node.callee, effectNamespaces, "withSpan");
+const spansEffectGenDirectly = (node, effectNamespaces) => node.callee.type !== "Super" && node.callee.type === "MemberExpression" && !node.callee.computed && node.callee.property.type === "Identifier" && node.callee.property.name === "withSpan" && isEffectGenCall(node.callee.object, effectNamespaces);
+const pipesWithSpanFromEffectGen = (node, effectNamespaces) => node.callee.type !== "Super" && node.callee.type === "MemberExpression" && !node.callee.computed && node.callee.property.type === "Identifier" && node.callee.property.name === "pipe" && isEffectGenCall(node.callee.object, effectNamespaces) && node.arguments.some((argument) => isEffectWithSpanCall(argument, effectNamespaces));
+const effectNamespaceFromImport = (node) => {
+	const source = node.source.value;
+	if (source !== "effect" && source !== "effect/Effect") return [];
+	const namespaces = [];
+	for (const specifier of node.specifiers) {
+		if (specifier.type === "ImportNamespaceSpecifier" && source === "effect/Effect") {
+			namespaces.push(specifier.local.name);
+			continue;
+		}
+		if (specifier.type === "ImportSpecifier" && source === "effect" && specifier.imported.type === "Identifier" && specifier.imported.name === "Effect") namespaces.push(specifier.local.name);
+	}
+	return namespaces;
+};
 const preferEffectFn = define({
 	name: "prefer-effect-fn",
 	meta: meta({
@@ -17,14 +32,27 @@ const preferEffectFn = define({
 	}),
 	create: function* () {
 		const ctx = yield* RuleContext;
-		return { CallExpression: (node) => {
-			if (node.type !== "CallExpression") return Effect.void;
-			if (!spansEffectGenDirectly(node) && !pipesOnlyWithSpanFromEffectGen(node)) return Effect.void;
-			return ctx.report(make({
-				node,
-				message: "Avoid a span on Effect.gen. Define the named operation with Effect.fn."
-			}));
-		} };
+		const effectNamespaces = /* @__PURE__ */ new Set();
+		const visibleEffectNamespaces = (node) => new Set([...effectNamespaces].filter((namespace) => Option.match(findVariableUp(ctx.sourceCode.getScope(node), namespace), {
+			onNone: () => true,
+			onSome: (variable) => variable.defs.some((definition) => definition.type === "ImportBinding")
+		})));
+		return {
+			ImportDeclaration: (node) => {
+				if (node.type !== "ImportDeclaration") return Effect.void;
+				for (const namespace of effectNamespaceFromImport(node)) effectNamespaces.add(namespace);
+				return Effect.void;
+			},
+			CallExpression: (node) => {
+				if (node.type !== "CallExpression") return Effect.void;
+				const namespaces = visibleEffectNamespaces(node);
+				if (!spansEffectGenDirectly(node, namespaces) && !pipesWithSpanFromEffectGen(node, namespaces)) return Effect.void;
+				return ctx.report(make({
+					node,
+					message: "Avoid a span on Effect.gen. Define the named operation with Effect.fn."
+				}));
+			}
+		};
 	}
 });
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oxlint-plugin-effect",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "oxlint plugin with Effect-specific lint rules",
   "license": "MIT",
   "repository": {