fix imports copied twice (#360)

* fix imports copied twice * fix test
codemod-com · Sep 21, 2023 · 8266571 · 8266571
1 parent 28af725
commit 8266571
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 8 deletions.
diff --git a/next/13/replace-next-head/index.ts b/next/13/replace-next-head/index.ts
@@ -1622,17 +1622,17 @@ const mergeOrCreateImports = (
 
 	const importedModule =
 		importDeclarations.find((importDeclaration) => {
-			const oldSpecifierText = importDeclaration
+			const oldPathRelative = importDeclaration
 				.getModuleSpecifier()
-				.getText();
+				.getLiteralText();
 
-			// compare by absolute paths
-			const oldPath = resolveModuleName(
-				oldSpecifierText.substring(1, oldSpecifierText.length - 1),
-				path,
-			);
+			const oldPathAbsolute = resolveModuleName(oldPathRelative, path);
 
-			return oldPath === moduleSpecifier;
+			const moduleIsLibOrUnresolved = oldPathAbsolute === null;
+			return (
+				oldPathAbsolute === moduleSpecifier ||
+				(moduleIsLibOrUnresolved && oldPathRelative === moduleSpecifier)
+			);
 		}) ?? null;
 
 	const pathIsAbsolute = isAbsolute(moduleSpecifier);

diff --git a/next/13/replace-next-head/test.ts b/next/13/replace-next-head/test.ts
@@ -454,6 +454,57 @@ Checkout my React component:
 		);
 	});
 
+	it('should move identifier definitions that are ImportDeclarations: should not copy dependencies multiple times ', async function (this: Context) {
+		const A_CONTENT = `
+		import Head from 'next/head';
+		import A from 'lib';
+		
+			export default function Page() {
+				return (<>
+					<Head>
+						<meta property="og:image" content={A} />
+						<meta property="twitter:image" content={A} />
+					</Head>
+					</>)
+			}
+		`;
+
+		const [command] = await transform({
+			'/opt/project/pages/a/index.tsx': A_CONTENT,
+		});
+
+		const expectedResult = `
+			import { Metadata } from "next";
+			import Head from 'next/head';
+			import A from 'lib';
+			
+			export const metadata: Metadata = {
+				openGraph: { 
+					images: [{ 
+						url: A 
+					}] 
+				} 
+			}
+			
+			export default function Page() {
+				return (<>
+					<Head>
+						<meta property="og:image" content={A} />
+						<meta property="twitter:image" content={A} />
+					</Head>
+				</>)
+			}
+		`;
+
+		deepStrictEqual(command?.kind, 'upsertFile');
+		deepStrictEqual(command.path, '/opt/project/pages/a/index.tsx');
+
+		deepStrictEqual(
+			command.data.replace(/\s/gm, ''),
+			expectedResult.replace(/\s/gm, ''),
+		);
+	});
+
 	it('should move identifier definitions that are ImportDeclarations: should not update moduleSpecifier if moving a library ', async function (this: Context) {
 		const A_CONTENT = `
 			import Meta from '../../components/a.tsx';