fix(rsc): avoid rewriting filtered exports in transformWrapExport

packages/plugin-rsc/src/transforms/fixtures/source-map/wrap-export/dependent-declarators.js.map.snap.md

@@ -6,9 +6,8 @@
 (2:12) " first = async () => 'first action called',\n" --> (2:3) " first = async () => 'first action called',\n"
 (3:0) "  second = first\n" --> (3:0) "  second = first\n"
 (2:0) "export const first = async () => 'first action called',\n" --> (4:0) "first = /* #__PURE__ */ registerServerReference(first, \"first\");\n"
-(2:0) "export const first = async () => 'first action called',\n" --> (5:0) "export { first };\n"
-(2:0) "export const first = async () => 'first action called',\n" --> (6:0) "second = /* #__PURE__ */ registerServerReference(second, \"second\");\n"
-(2:0) "export const first = async () => 'first action called',\n" --> (7:0) "export { second };\n"
+(2:0) "export const first = async () => 'first action called',\n" --> (5:0) "second = /* #__PURE__ */ registerServerReference(second, \"second\");\n"
+(2:0) "export const first = async () => 'first action called',\n" --> (6:0) "export { first, second };\n"
 ```
 
 ## module-export-effect

packages/plugin-rsc/src/transforms/fixtures/source-map/wrap-export/dependent-declarators.js.snap.md

@@ -13,17 +13,16 @@ export const first = async () => 'first action called',
 
 **References:** first, second
 
-[Source map visualization](https://evanw.github.io/source-map-visualization/#MjQ4ACd1c2Ugc2VydmVyJwoKbGV0IGZpcnN0ID0gYXN5bmMgKCkgPT4gJ2ZpcnN0IGFjdGlvbiBjYWxsZWQnLAogIHNlY29uZCA9IGZpcnN0CmZpcnN0ID0gLyogI19fUFVSRV9fICovIHJlZ2lzdGVyU2VydmVyUmVmZXJlbmNlKGZpcnN0LCAiZmlyc3QiKTsKZXhwb3J0IHsgZmlyc3QgfTsKc2Vjb25kID0gLyogI19fUFVSRV9fICovIHJlZ2lzdGVyU2VydmVyUmVmZXJlbmNlKHNlY29uZCwgInNlY29uZCIpOwpleHBvcnQgeyBzZWNvbmQgfTsKMzU4AHsidmVyc2lvbiI6Mywic291cmNlcyI6WyIiXSwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzZXJ2ZXInXG5cbmV4cG9ydCBjb25zdCBmaXJzdCA9IGFzeW5jICgpID0+ICdmaXJzdCBhY3Rpb24gY2FsbGVkJyxcbiAgc2Vjb25kID0gZmlyc3RcbiJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxDQUFDLEdBQUcsQ0FBQyxNQUFNOztBQUVKLEdBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDO0FBQ3RELENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO0FBRFg7QUFBQTtBQUFBO0FBQUE7In0=)
+[Source map visualization](https://evanw.github.io/source-map-visualization/#MjM3ACd1c2Ugc2VydmVyJwoKbGV0IGZpcnN0ID0gYXN5bmMgKCkgPT4gJ2ZpcnN0IGFjdGlvbiBjYWxsZWQnLAogIHNlY29uZCA9IGZpcnN0CmZpcnN0ID0gLyogI19fUFVSRV9fICovIHJlZ2lzdGVyU2VydmVyUmVmZXJlbmNlKGZpcnN0LCAiZmlyc3QiKTsKc2Vjb25kID0gLyogI19fUFVSRV9fICovIHJlZ2lzdGVyU2VydmVyUmVmZXJlbmNlKHNlY29uZCwgInNlY29uZCIpOwpleHBvcnQgeyBmaXJzdCwgc2Vjb25kIH07CjM1MwB7InZlcnNpb24iOjMsInNvdXJjZXMiOlsiIl0sInNvdXJjZXNDb250ZW50IjpbIid1c2Ugc2VydmVyJ1xuXG5leHBvcnQgY29uc3QgZmlyc3QgPSBhc3luYyAoKSA9PiAnZmlyc3QgYWN0aW9uIGNhbGxlZCcsXG4gIHNlY29uZCA9IGZpcnN0XG4iXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsQ0FBQyxHQUFHLENBQUMsTUFBTTs7QUFFSixHQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQztBQUN0RCxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztBQURYO0FBQUE7QUFBQTsifQ==)
 
 ```js
 'use server'
 
 let first = async () => 'first action called',
   second = first
 first = /* #__PURE__ */ registerServerReference(first, "first");
-export { first };
 second = /* #__PURE__ */ registerServerReference(second, "second");
-export { second };
+export { first, second };
 ```
 
 ## module-export-effect

packages/plugin-rsc/src/transforms/module-export-scan.ts

@@ -147,6 +147,9 @@ export function scanModuleExports(
                   : undefined
               return {
                 node: declarator,
+                // uniformly handle destructured exports such as
+                //   export const { foo, bar } = ...
+                // even though associated `meta` doesn't make sense anymore
                 exports: extractNames(declarator.id).map((name) => ({
                   localName: name,
                   exportName: name,

packages/plugin-rsc/src/transforms/wrap-export.test.ts

@@ -99,9 +99,8 @@ export const { x, y: [z] } = { x: 0, y: [1] };
       "
       let { x, y: [z] } = { x: 0, y: [1] };
       x = /* #__PURE__ */ $$wrap(x, "<id>", "x");
-      export { x };
       z = /* #__PURE__ */ $$wrap(z, "<id>", "z");
-      export { z };
+      export { x, z };
       "
     `)
   })
@@ -235,8 +234,7 @@ export { a as aa };
       a = /* #__PURE__ */ $$wrap(a, "<id>", "a");
       export { a };
       b = /* #__PURE__ */ $$wrap(b, "<id>", "b");
-      export { b };
-      export { b_no };
+      export { b, b_no };
       ;
       import { c as $$import_c } from "./c";
       const $$wrap_$$import_c = /* #__PURE__ */ $$wrap($$import_c, "<id>", "c");
@@ -247,6 +245,70 @@ export { a as aa };
     `)
   })
 
+  test.each([
+    `export function action() {}`,
+    `export const action = () => {}`,
+    `const action = () => {}; export { action }`,
+    `export { action } from './dep'`,
+    `export default () => {}`,
+  ])('does not rewrite fully filtered export groups: %s', async (input) => {
+    const ast = await parseAstAsync(input)
+    const result = transformWrapExport(input, ast, {
+      runtime: (value) => `$$wrap(${value})`,
+      filter: () => false,
+    })
+
+    expect(result.exportNames).toEqual([])
+    expect(result.output.hasChanged()).toBe(false)
+    expect(result.output.toString()).toBe(input)
+  })
+
+  test('preserves filtered export specifiers', async () => {
+    const input = `\
+const selected = 0, skipped = 1
+export { selected, skipped as renamed }
+export { remote, ignored as forwarded } from './dep'
+`
+    const result = await testTransform(input, {
+      filter: (name) => name === 'selected' || name === 'remote',
+    })
+
+    expect(result).toMatchInlineSnapshot(`
+      "const selected = 0, skipped = 1
+
+
+      ;
+      const $$wrap_selected = /* #__PURE__ */ $$wrap(selected, \"<id>\", \"selected\");
+      export { $$wrap_selected as selected };
+      export { skipped as renamed };
+      import { remote as $$import_remote } from './dep';
+      const $$wrap_$$import_remote = /* #__PURE__ */ $$wrap($$import_remote, \"<id>\", \"remote\");
+      export { $$wrap_$$import_remote as remote };
+      export { ignored as forwarded } from './dep';
+      "
+    `)
+  })
+
+  test('rejects selected uninitialized variables', async () => {
+    const input = `export let selected, skipped`
+    const ast = await parseAstAsync(input)
+
+    expect(() =>
+      transformWrapExport(input, ast, {
+        runtime: (value) => `$$wrap(${value})`,
+        rejectNonAsyncFunction: true,
+        filter: (name) => name === 'selected',
+      }),
+    ).toThrow('unsupported non async function')
+
+    const filtered = transformWrapExport(input, ast, {
+      runtime: (value) => `$$wrap(${value})`,
+      rejectNonAsyncFunction: true,
+      filter: () => false,
+    })
+    expect(filtered.output.hasChanged()).toBe(false)
+  })
+
   test('filter meta', async () => {
     const input = `
 export const a = 0;
@@ -259,11 +321,10 @@ export default function d() {}
     })
     expect(result).toMatchInlineSnapshot(`
       "
-      let a = 0;
+      export const a = 0;
       let b = function() {}
       let c = () => {}
       function d() {}
-      export { a };
       b = /* #__PURE__ */ $$wrap(b, "<id>", "b");
       export { b };
       c = /* #__PURE__ */ $$wrap(c, "<id>", "c");
@@ -282,13 +343,7 @@ export default () => {}
     const result = await testTransform(input, {
       filter: (_name, meta) => !!(meta.isFunction && meta.declName),
     })
-    expect(result).toMatchInlineSnapshot(`
-      "
-      const $$default = () => {}
-      ;
-      export { $$default as default };
-      "
-    `)
+    expect(result).toMatchInlineSnapshot(`false`)
   })
 
   test('filter defaultExportIdentifierName', async () => {
@@ -329,12 +384,10 @@ export const tags = []
     expect(result.exportNames).toEqual(['action'])
     expect(result.output.toString()).toMatchInlineSnapshot(`
       "let action = async () => {}
-      let metadata = {}
-      let tags = []
+      export const metadata = {}
+      export const tags = []
       action = /* #__PURE__ */ $$wrap(action, "action");
       export { action };
-      export { metadata };
-      export { tags };
       "
     `)
   })
@@ -353,9 +406,8 @@ export default async function Page() {}
     expect(result.exportNames).toEqual(['default'])
     expect(result.output.toString()).toMatchInlineSnapshot(`
       "
-      let revalidate = 1;
+      export const revalidate = 1;
       async function Page() {}
-      export { revalidate };
       ;
       const $$wrap_Page = /* #__PURE__ */ $$wrap(Page, "default");
       export { $$wrap_Page as default };
@@ -372,11 +424,8 @@ export default async function Page() {}
       filter: () => false,
     })
     expect(result.exportNames).toEqual([])
-    expect(result.output.toString()).toMatchInlineSnapshot(`
-      "const $$default = 1;;
-      export { $$default as default };
-      "
-    `)
+    expect(result.output.hasChanged()).toBe(false)
+    expect(result.output.toString()).toBe(input)
   })
 
   test('unknown identifier exports remain eligible for wrapping', async () => {