oxlint-plugin-react-doctor 0.2.18-dev.8691177 → 0.2.18-dev.87440ab

package/dist/index.js

@@ -4609,11 +4609,17 @@ const isCleanupFunctionLike = (node, knownCleanupFunctionNames, knownBoundSubscr
 	if (!isFunctionLike$2(node)) return false;
 	return containsReleaseLikeCall(node.body, knownCleanupFunctionNames, knownBoundSubscriptionNames);
 };
-const isCleanupReturn = (returnedValue, knownCleanupFunctionNames, knownBoundSubscriptionNames) => {
+const isCleanupReturn = (returnedValue, knownCleanupFunctionNames, knownBoundSubscriptionNames, options = {}) => {
 	if (!returnedValue) return false;
 	const unwrappedValue = unwrapChainExpression$2(returnedValue);
-	if (isNodeOfType(unwrappedValue, "Identifier")) return knownCleanupFunctionNames.has(unwrappedValue.name);
+	if (isNodeOfType(unwrappedValue, "Literal") && unwrappedValue.value === null) return false;
+	if (isNodeOfType(unwrappedValue, "Identifier")) {
+		if (unwrappedValue.name === "undefined") return false;
+		if (knownCleanupFunctionNames.has(unwrappedValue.name)) return true;
+		return options.allowOpaqueReturn === true && !knownBoundSubscriptionNames.has(unwrappedValue.name);
+	}
 	if (isCleanupReturningSubscribeLikeCallExpression(unwrappedValue)) return true;
+	if (options.allowOpaqueReturn === true && !isSubscribeLikeCallExpression(unwrappedValue)) return true;
 	if (isCleanupFunctionLike(unwrappedValue, knownCleanupFunctionNames, knownBoundSubscriptionNames)) return true;
 	return false;
 };
@@ -4634,12 +4640,14 @@ const findSubscribeLikeUsages = (callback) => {
 		if (isNodeOfType(child.callee, "Identifier") && TIMER_CALLEE_NAMES_REQUIRING_CLEANUP.has(child.callee.name)) {
 			usages.push({
 				kind: "timer",
+				node: child,
 				resourceName: child.callee.name
 			});
 			return;
 		}
 		if (isNodeOfType(child.callee, "MemberExpression") && isNodeOfType(child.callee.property, "Identifier") && SUBSCRIPTION_METHOD_NAMES.has(child.callee.property.name)) usages.push({
 			kind: "subscribe",
+			node: child,
 			resourceName: child.callee.property.name
 		});
 	});
@@ -4686,7 +4694,20 @@ const collectCleanupBindings = (effectCallback) => {
 	});
 	return bindings;
 };
-const effectHasCleanupRelease = (callback) => {
+const getRangeStart = (node) => {
+	const rangeStart = node.range?.[0];
+	return typeof rangeStart === "number" ? rangeStart : null;
+};
+const cleanupReturnRunsAfterUsage = (returnStatement, usages) => {
+	if (returnStatement.argument && isCleanupReturningSubscribeLikeCallExpression(returnStatement.argument)) return true;
+	const returnStart = getRangeStart(returnStatement);
+	if (returnStart === null) return true;
+	return usages.some((usage) => {
+		const usageStart = getRangeStart(usage.node);
+		return usageStart === null || usageStart < returnStart;
+	});
+};
+const effectHasCleanupReturn = (callback, usages) => {
 	if (!isNodeOfType(callback, "ArrowFunctionExpression") && !isNodeOfType(callback, "FunctionExpression")) return false;
 	if (!isNodeOfType(callback.body, "BlockStatement")) return isCleanupReturningSubscribeLikeCallExpression(callback.body);
 	const cleanupBindings = collectCleanupBindings(callback);
@@ -4694,7 +4715,8 @@ const effectHasCleanupRelease = (callback) => {
 	walkInsideStatementBlocks(callback.body, (child) => {
 		if (didFindCleanupReturn) return;
 		if (!isNodeOfType(child, "ReturnStatement")) return;
-		if (isCleanupReturn(child.argument, cleanupBindings.cleanupFunctionNames, cleanupBindings.subscriptionNames)) didFindCleanupReturn = true;
+		if (!cleanupReturnRunsAfterUsage(child, usages)) return;
+		if (isCleanupReturn(child.argument, cleanupBindings.cleanupFunctionNames, cleanupBindings.subscriptionNames, { allowOpaqueReturn: true })) didFindCleanupReturn = true;
 	});
 	return didFindCleanupReturn;
 };
@@ -4710,7 +4732,7 @@ const effectNeedsCleanup = defineRule({
 		if (!callback) return;
 		const usages = findSubscribeLikeUsages(callback);
 		if (usages.length === 0) return;
-		if (effectHasCleanupRelease(callback)) return;
+		if (effectHasCleanupReturn(callback, usages)) return;
 		const firstUsage = usages[0];
 		const verb = firstUsage.kind === "timer" ? "schedules" : "subscribes via";
 		context.report({
@@ -20179,6 +20201,12 @@ const getReactDoctorStringSetting = (settings, settingName) => {
 	const settingValue = readOwnPropertyValue(bag, settingName);
 	return typeof settingValue === "string" ? settingValue : void 0;
 };
+const getReactDoctorNumberSetting = (settings, settingName) => {
+	const bag = readReactDoctorSettingsBag(settings);
+	if (!bag) return void 0;
+	const settingValue = readOwnPropertyValue(bag, settingName);
+	return typeof settingValue === "number" && Number.isFinite(settingValue) ? settingValue : void 0;
+};
 const getReactDoctorStringArraySetting = (settings, settingName) => {
 	const bag = readReactDoctorSettingsBag(settings);
 	if (!bag) return [];
@@ -27052,7 +27080,6 @@ const LEGACY_EXPO_PACKAGE_REPLACEMENTS = new Map([
 	["expo-av", "expo-audio for audio and expo-video for video"],
 	["expo-permissions", "the permissions API in each module (e.g. Camera.requestPermissionsAsync())"],
 	["expo-app-loading", "expo-splash-screen"],
-	["expo-linear-gradient", "the `backgroundImage` CSS gradient style prop (New Architecture) or expo-linear-gradient's successor"],
 	["react-native-fast-image", "expo-image (drop-in with caching, placeholders, and crossfades)"]
 ]);
 const EXPO_UI_MODULE_SOURCES = new Set([
@@ -27207,6 +27234,10 @@ const RECYCLABLE_LIST_PACKAGES = {
 	LegendList: ["@legendapp/list"]
 };
 const SIZING_HINT_ATTRIBUTE_NAMES = new Set(["estimatedItemSize", "estimatedListSize"]);
+const isFlashListV2OrNewer = (context) => {
+	const flashListMajorVersion = getReactDoctorNumberSetting(context.settings, "shopifyFlashListMajorVersion");
+	return flashListMajorVersion !== void 0 && flashListMajorVersion >= 2;
+};
 const isEmptyArrayLiteral = (node) => {
 	if (!isNodeOfType(node.value, "JSXExpressionContainer")) return false;
 	const expression = node.value.expression;
@@ -27228,6 +27259,7 @@ const rnListMissingEstimatedItemSize = defineRule({
 			break;
 		}
 		if (!canonicalRecyclerName) return;
+		if (canonicalRecyclerName === "FlashList" && isFlashListV2OrNewer(context)) return;
 		let hasSizingHint = false;
 		let dataIsEmptyLiteral = false;
 		let hasDataProp = false;
@@ -28170,37 +28202,22 @@ const rnNoSingleElementStyleArray = defineRule({
 	} })
 });
 //#endregion
-//#region src/plugin/rules/react-native/utils/scrollview_names.ts
-const SCROLLVIEW_NAMES = new Set([
-	"ScrollView",
-	"FlatList",
-	"SectionList",
-	"VirtualizedList",
-	"KeyboardAwareScrollView"
-]);
+//#region src/plugin/utils/define-retired-rule.ts
+const defineRetiredRule = (rule) => defineRule({
+	...rule,
+	defaultEnabled: false,
+	lifecycle: "retired",
+	create: () => ({})
+});
 //#endregion
 //#region src/plugin/rules/react-native/rn-prefer-content-inset-adjustment.ts
-const rnPreferContentInsetAdjustment = defineRule({
+const rnPreferContentInsetAdjustment = defineRetiredRule({
 	id: "rn-prefer-content-inset-adjustment",
-	title: "SafeAreaView instead of contentInsetAdjustment",
+	title: "Manual safe-area inset adjustment",
 	tags: ["test-noise"],
 	requires: ["react-native"],
 	severity: "warn",
-	recommendation: "Drop the SafeAreaView wrapper and set `contentInsetAdjustmentBehavior=\"automatic\"` on the ScrollView so the OS handles the safe area.",
-	create: (context) => ({ JSXElement(node) {
-		if (resolveJsxElementName(node.openingElement) !== "SafeAreaView") return;
-		for (const child of node.children ?? []) {
-			if (!isNodeOfType(child, "JSXElement")) continue;
-			const childName = resolveJsxElementName(child.openingElement);
-			if (!childName || !SCROLLVIEW_NAMES.has(childName)) continue;
-			if (childName === "KeyboardAwareScrollView") continue;
-			context.report({
-				node,
-				message: `Your users render an extra wrapper view from <SafeAreaView> around <${childName}>.`
-			});
-			return;
-		}
-	} })
+	recommendation: "Prefer native content inset adjustment only when it replaces manual inset plumbing; SafeAreaView wrappers are valid and intentionally ignored."
 });
 //#endregion
 //#region src/react-native-dependency-names.ts
@@ -28586,6 +28603,15 @@ const rnPressableSharedValueMutation = defineRule({
 	}
 });
 //#endregion
+//#region src/plugin/rules/react-native/utils/scrollview_names.ts
+const SCROLLVIEW_NAMES = new Set([
+	"ScrollView",
+	"FlatList",
+	"SectionList",
+	"VirtualizedList",
+	"KeyboardAwareScrollView"
+]);
+//#endregion
 //#region src/plugin/rules/react-native/rn-scrollview-dynamic-padding.ts
 const rnScrollviewDynamicPadding = defineRule({
 	id: "rn-scrollview-dynamic-padding",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oxlint-plugin-react-doctor",
-  "version": "0.2.18-dev.8691177",
+  "version": "0.2.18-dev.87440ab",
   "description": "oxlint plugin for React Doctor: diagnose React codebases for security, performance, correctness, accessibility, bundle-size, and architecture issues",
   "keywords": [
     "accessibility",