[fix] Migrate type comments on arrow functions (#5933)

sveltejs · Aug 16, 2022 · f950398 · f950398
1 parent 7f51caf
commit f950398
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/.changeset/fluffy-crews-fry.md b/.changeset/fluffy-crews-fry.md
@@ -0,0 +1,5 @@
+---
+'svelte-migrate': patch
+---
+
+Migrate type comments on arrow functions
diff --git a/packages/migrate/migrations/routes/migrate_page_js/samples.md b/packages/migrate/migrations/routes/migrate_page_js/samples.md
@@ -191,6 +191,7 @@ export function load() {
 ## Arrow function load
 
 ```js before
+/** @type {import('./$types').Load} */
 export const load = () => ({
 	props: {
 		a: 1
@@ -199,6 +200,7 @@ export const load = () => ({
 ```
 
 ```js after
+/** @type {import('./$types').PageLoad} */
 export const load = () => ({
 	a: 1
 });

diff --git a/packages/migrate/migrations/routes/migrate_page_server/samples.md b/packages/migrate/migrations/routes/migrate_page_server/samples.md
@@ -92,6 +92,7 @@ export function load() {
 ## Arrow function GET
 
 ```js before
+/** @type {import('./$types').RequestHandler} */
 export const GET = () => ({
 	body: {
 		a: 1
@@ -100,6 +101,7 @@ export const GET = () => ({
 ```
 
 ```js after
+/** @type {import('./$types').PageServerLoad} */
 export const load = () => ({
 	a: 1
 });

diff --git a/packages/migrate/migrations/routes/utils.js b/packages/migrate/migrations/routes/utils.js
@@ -473,9 +473,10 @@ export function read_samples(test_file) {
  */
 export function rewrite_type(node, code, old_type, new_type) {
 	// @ts-ignore
-	if (node.jsDoc) {
+	let jsDoc = node.jsDoc || node.parent?.parent?.parent?.jsDoc;
+	if (jsDoc) {
 		// @ts-ignore
-		for (const comment of node.jsDoc) {
+		for (const comment of jsDoc) {
 			const str = comment.getText();
 			const index = str.indexOf(old_type);