RSC: Improve type safety in RSC transform plugins (#11155)

redwoodjs · Aug 5, 2024 · 95259ce · 95259ce
1 parent fcc0351
commit 95259ce
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/packages/vite/src/plugins/vite-plugin-rsc-transform-client.ts b/packages/vite/src/plugins/vite-plugin-rsc-transform-client.ts
@@ -1,6 +1,6 @@
 import path from 'node:path'
 
-import type { Statement, ModuleDeclaration, AssignmentExpression } from 'acorn'
+import type { AssignmentExpression, Program } from 'acorn'
 import * as acorn from 'acorn-loose'
 import { normalizePath, type Plugin } from 'vite'
 
@@ -27,7 +27,7 @@ export function rscTransformUseClientPlugin(
         return code
       }
 
-      let body: (Statement | ModuleDeclaration)[]
+      let body: Program['body']
 
       try {
         body = acorn.parse(code, {
@@ -126,7 +126,7 @@ function addExportNames(names: Array<string>, node: any) {
  */
 async function parseExportNamesIntoNames(
   code: string,
-  body: (Statement | ModuleDeclaration)[],
+  body: Program['body'],
   names: Array<string>,
 ): Promise<void> {
   for (let i = 0; i < body.length; i++) {
@@ -246,7 +246,7 @@ async function parseExportNamesIntoNames(
 
 async function transformClientModule(
   code: string,
-  body: (Statement | ModuleDeclaration)[],
+  body: Program['body'],
   url: string,
   clientEntryFiles: Record<string, string>,
 ): Promise<string> {

diff --git a/packages/vite/src/plugins/vite-plugin-rsc-transform-server.ts b/packages/vite/src/plugins/vite-plugin-rsc-transform-server.ts
@@ -1,4 +1,5 @@
-import * as acorn from 'acorn-loose'
+import type { AssignmentProperty, Expression, Pattern, Program } from 'acorn'
+import { parse } from 'acorn-loose'
 import type { Plugin } from 'vite'
 
 export function rscTransformUseServerPlugin(): Plugin {
@@ -20,10 +21,10 @@ export function rscTransformUseServerPlugin(): Plugin {
         return code
       }
 
-      let body
+      let body: Program['body']
 
       try {
-        body = acorn.parse(code, {
+        body = parse(code, {
           ecmaVersion: 2024,
           sourceType: 'module',
         }).body
@@ -68,7 +69,10 @@ export function rscTransformUseServerPlugin(): Plugin {
   }
 }
 
-function addLocalExportedNames(names: Map<string, string>, node: any) {
+function addLocalExportedNames(
+  names: Map<string, string>,
+  node: Pattern | AssignmentProperty | Expression,
+) {
   switch (node.type) {
     case 'Identifier':
       names.set(node.name, node.name)
@@ -106,13 +110,20 @@ function addLocalExportedNames(names: Map<string, string>, node: any) {
     case 'ParenthesizedExpression':
       addLocalExportedNames(names, node.expression)
       return
+
+    default:
+      throw new Error(`Unsupported node type: ${node.type}`)
   }
 }
 
-function transformServerModule(body: any, url: string, code: string): string {
+function transformServerModule(
+  body: Program['body'],
+  url: string,
+  code: string,
+): string {
   // If the same local name is exported more than once, we only need one of the names.
-  const localNames = new Map()
-  const localTypes = new Map()
+  const localNames = new Map<string, string>()
+  const localTypes = new Map<string, string>()
 
   for (let i = 0; i < body.length; i++) {
     const node = body[i]
@@ -157,7 +168,14 @@ function transformServerModule(body: any, url: string, code: string): string {
 
           for (let j = 0; j < specifiers.length; j++) {
             const specifier = specifiers[j]
-            localNames.set(specifier.local.name, specifier.exported.name)
+            if (
+              specifier.local.type === 'Identifier' &&
+              specifier.exported.type === 'Identifier'
+            ) {
+              localNames.set(specifier.local.name, specifier.exported.name)
+            } else {
+              throw new Error('Unsupported export specifier')
+            }
           }
         }