Ensure we don't remove types from 'prop-types' import

eps1lon · Mar 15, 2024 · 40dd307 · 40dd307
1 parent 29ff53e
commit 40dd307
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 23 deletions.
diff --git a/transforms/__tests__/deprecated-prop-types-types.js b/transforms/__tests__/deprecated-prop-types-types.js
@@ -206,7 +206,7 @@ describe("transform deprecated-prop-types-types", () => {
         declare const weakValidationMap: WeakValidationMap<{}>;
 			`),
 		).toMatchInlineSnapshot(`
-		"import { checkPropTypes } from 'prop-types';
+		"import { checkPropTypes, Requireable, Validator, ValidationMap, WeakValidationMap } from 'prop-types';
 		import { type ReactNode } from 'react';
 
 		declare const requireable: Requireable<ReactNode>;

diff --git a/transforms/deprecated-prop-types-types.js b/transforms/deprecated-prop-types-types.js
@@ -1,5 +1,5 @@
 const parseSync = require("./utils/parseSync");
-const { replaceType } = require("./utils/replaceType");
+const { replaceReactType } = require("./utils/replaceType");
 
 /**
  * @type {import('jscodeshift').Transform}
@@ -69,7 +69,7 @@ const deprecatedPropTypesTypes = (file, api) => {
 		"ValidationMap",
 		"WeakValidationMap",
 	]) {
-		const changedType = replaceType(
+		const changedType = replaceReactType(
 			j,
 			ast,
 			movedType,

diff --git a/transforms/deprecated-react-child.js b/transforms/deprecated-react-child.js
@@ -1,5 +1,5 @@
 const parseSync = require("./utils/parseSync");
-const { replaceType } = require("./utils/replaceType");
+const { replaceReactType } = require("./utils/replaceType");
 
 /**
  * @type {import('jscodeshift').Transform}
@@ -8,7 +8,7 @@ const deprecatedReactChildTransform = (file, api) => {
 	const j = api.jscodeshift;
 	const ast = parseSync(file);
 
-	const hasChanges = replaceType(
+	const hasChanges = replaceReactType(
 		j,
 		ast,
 		"ReactChild",

diff --git a/transforms/deprecated-react-fragment.js b/transforms/deprecated-react-fragment.js
@@ -1,5 +1,5 @@
 const parseSync = require("./utils/parseSync");
-const { replaceType } = require("./utils/replaceType");
+const { replaceReactType } = require("./utils/replaceType");
 
 /**
  * @type {import('jscodeshift').Transform}
@@ -8,7 +8,7 @@ const deprecatedReactFragmentTransform = (file, api) => {
 	const j = api.jscodeshift;
 	const ast = parseSync(file);
 
-	const hasChanges = replaceType(
+	const hasChanges = replaceReactType(
 		j,
 		ast,
 		"ReactFragment",

diff --git a/transforms/deprecated-react-node-array.js b/transforms/deprecated-react-node-array.js
@@ -1,5 +1,5 @@
 const parseSync = require("./utils/parseSync");
-const { replaceType } = require("./utils/replaceType");
+const { replaceReactType } = require("./utils/replaceType");
 
 /**
  * @type {import('jscodeshift').Transform}
@@ -8,7 +8,7 @@ const deprecatedReactNodeArrayTransform = (file, api) => {
 	const j = api.jscodeshift;
 	const ast = parseSync(file);
 
-	const hasChanges = replaceType(
+	const hasChanges = replaceReactType(
 		j,
 		ast,
 		"ReactNodeArray",

diff --git a/transforms/deprecated-react-text.js b/transforms/deprecated-react-text.js
@@ -1,5 +1,5 @@
 const parseSync = require("./utils/parseSync");
-const { replaceType } = require("./utils/replaceType");
+const { replaceReactType } = require("./utils/replaceType");
 
 /**
  * @type {import('jscodeshift').Transform}
@@ -8,7 +8,7 @@ const deprecatedReactTextTransform = (file, api) => {
 	const j = api.jscodeshift;
 	const ast = parseSync(file);
 
-	const hasChanges = replaceType(
+	const hasChanges = replaceReactType(
 		j,
 		ast,
 		"ReactText",

diff --git a/transforms/utils/replaceType.js b/transforms/utils/replaceType.js
@@ -11,7 +11,7 @@ const { findTSTypeReferenceCollections } = require("./jscodeshift-bugfixes");
  * @returns {boolean}
  */
 function renameType(j, ast, sourceIdentifier, targetIdentifier) {
-	return replaceType(
+	return replaceReactType(
 		j,
 		ast,
 		sourceIdentifier,
@@ -47,7 +47,7 @@ function renameType(j, ast, sourceIdentifier, targetIdentifier) {
  * @param {(sourcePath: import("jscodeshift").TSTypeReference) => import("jscodeshift").TSTypeReference | import("jscodeshift").TSUnionType} buildTargetTypeReference
  * @param {string | null} addedType - `null` if no type was added
  */
-function replaceType(
+function replaceReactType(
 	j,
 	ast,
 	sourceIdentifier,
@@ -66,15 +66,19 @@ function replaceType(
 			(local == null || local.name === addedType)
 		);
 	});
-	const sourceIdentifierImports = ast.find(j.ImportSpecifier, (node) => {
-		const { imported, local } = node;
-		return (
-			imported.type === "Identifier" &&
-			imported.name === sourceIdentifier &&
-			// We don't support renames generally, so we don't handle them here
-			(local == null || local.name === sourceIdentifier)
-		);
-	});
+	const sourceIdentifierImports = ast
+		.find(j.ImportDeclaration, (declaration) => {
+			return declaration.source.value === "react";
+		})
+		.find(j.ImportSpecifier, (node) => {
+			const { imported, local } = node;
+			return (
+				imported.type === "Identifier" &&
+				imported.name === sourceIdentifier &&
+				// We don't support renames generally, so we don't handle them here
+				(local == null || local.name === sourceIdentifier)
+			);
+		});
 	if (sourceIdentifierImports.length > 0) {
 		hasChanges = true;
 
@@ -120,4 +124,4 @@ function replaceType(
 	return hasChanges;
 }
 
-module.exports = { replaceType, renameType };
+module.exports = { replaceReactType, renameType };