ast fix

Author: AlemTuzlak

src/vite/utils/data-functions-augment.test.ts

@@ -675,6 +675,24 @@ describe("transform", () => {
 		`)
 			expect(removeWhitespace(result.code)).toStrictEqual(expected)
 		})
+		it("should transform the client action export when it's imported from another file and exported and keep the export around if more things are exported", () => {
+			const result = augmentDataFetchingFunctions(
+				`
+			import { withClientActionContextWrapper as _withClientActionContextWrapper   } from "react-router-devtools/context";
+      import { clientAction as _clientAction } from "./client-action.js";
+			export const clientAction = _withClientActionContextWrapper(_clientAction, "test");
+			`,
+				"test",
+				"/file/path"
+			)
+			const expected = removeWhitespace(`
+			import { withClientActionWrapper as _withClientActionWrapper   } from "react-router-devtools/client";
+			import { withClientActionContextWrapper as _withClientActionContextWrapper   } from "react-router-devtools/context";
+      import { clientAction as _clientAction } from "./client-action.js";
+			export const clientAction = _withClientActionWrapper(_withClientActionContextWrapper(_clientAction, "test"), "test");
+		`)
+			expect(removeWhitespace(result.code)).toStrictEqual(expected)
+		})
 
 		it("should wrap the clientAction export when it's exported via export { clientAction } and declared within the file", () => {
 			const result = augmentDataFetchingFunctions(

src/vite/utils/data-functions-augment.ts

@@ -47,11 +47,14 @@ const transform = (ast: ParseResult<Babel.File>, routeId: string) => {
 				if (!ALL_EXPORTS.includes(name)) {
 					continue
 				}
-				const uniqueName = path.scope.generateUidIdentifier(name)
+				const isReimported = specifier.local.name !== name
+				const uniqueName = isReimported ? specifier.local : path.scope.generateUidIdentifier(name)
 				imports.push([name, uniqueName])
 				specifier.local = uniqueName
 				// Replace the import specifier with a new one
-				path.scope.rename(name, uniqueName.name)
+				if (!isReimported) {
+					path.scope.rename(name, uniqueName.name)
+				}
 			}
 		},
 		ExportDeclaration(path) {

src/vite/utils/inject-context.test.ts

@@ -584,6 +584,25 @@ describe("transform", () => {
 		`)
 			expect(removeWhitespace(result.code)).toStrictEqual(expected)
 		})
+		it("should transform the client action export when it's imported from another file and exported and already transformed", () => {
+			const result = injectContext(
+				`
+				import { withClientActionWrapper as _withClientActionWrapper   } from "react-router-devtools/client";
+      import { clientAction as _clientAction } from "./client-action.js";
+
+			export const clientAction = _withClientActionWrapper(_clientAction, "test");
+			`,
+				"test",
+				"/file/path"
+			)
+			const expected = removeWhitespace(`
+			import { withClientActionContextWrapper as _withClientActionContextWrapper   } from "react-router-devtools/context";
+      import { withClientActionWrapper as _withClientActionWrapper   } from "react-router-devtools/client";
+			import { clientAction as _clientAction } from "./client-action.js";
+			export const clientAction = _withClientActionContextWrapper(_withClientActionWrapper(_clientAction, "test"),"test");
+		`)
+			expect(removeWhitespace(result.code)).toStrictEqual(expected)
+		})
 
 		it("should transform the clientAction export when it's re-exported from another file and remove empty export declaration", () => {
 			const result = injectContext(

src/vite/utils/inject-context.ts

@@ -37,11 +37,14 @@ const transform = (ast: ParseResult<Babel.File>, routeId: string) => {
 				if (!ALL_EXPORTS.includes(name)) {
 					continue
 				}
-				const uniqueName = path.scope.generateUidIdentifier(name)
+				const isReimported = specifier.local.name !== name
+				const uniqueName = isReimported ? specifier.local : path.scope.generateUidIdentifier(name)
 				imports.push([name, uniqueName])
 				specifier.local = uniqueName
 				// Replace the import specifier with a new one
-				path.scope.rename(name, uniqueName.name)
+				if (!isReimported) {
+					path.scope.rename(name, uniqueName.name)
+				}
 			}
 		},
 		ExportDeclaration(path) {
@@ -64,7 +67,7 @@ const transform = (ast: ParseResult<Babel.File>, routeId: string) => {
 
 					return
 				}
-
+				// not this
 				if (decl.isFunctionDeclaration()) {
 					const { id } = decl.node
 					if (!id) return
@@ -100,21 +103,16 @@ const transform = (ast: ParseResult<Babel.File>, routeId: string) => {
 				if (path.node.source) {
 					// Special condition: export { loader, action } from "./path"
 					const source = path.node.source.value
-
+					const unique = path.scope.generateUidIdentifier(name)
 					importDeclarations.push(
-						t.importDeclaration(
-							[t.importSpecifier(t.identifier(`_${name}`), t.identifier(name))],
-							t.stringLiteral(source)
-						)
+						t.importDeclaration([t.importSpecifier(unique, t.identifier(name))], t.stringLiteral(source))
 					)
+
 					transformations.push(() => {
 						path.insertBefore(
 							t.exportNamedDeclaration(
 								t.variableDeclaration("const", [
-									t.variableDeclarator(
-										t.identifier(name),
-										t.callExpression(uid, [t.identifier(`_${name}`), t.stringLiteral(routeId)])
-									),
+									t.variableDeclarator(t.identifier(name), t.callExpression(uid, [unique, t.stringLiteral(routeId)])),
 								])
 							)
 						)
@@ -150,6 +148,7 @@ const transform = (ast: ParseResult<Babel.File>, routeId: string) => {
 						init.replaceWith(t.callExpression(uid, [init.node, t.stringLiteral(routeId)]))
 					}
 				} else {
+					// not this
 					transformations.push(() => {
 						const existingImport = imports.find(([existingName]) => existingName === name)
 						const uniqueName = existingImport?.[1].name ?? path.scope.generateUidIdentifier(name).name