Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions packages/directive-functions-plugin/src/compilers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,24 @@ export function findDirectives(
compileDirective(path.get('declaration') as SupportedFunctionPath)
}
},
ExportDeclaration(path) {
if (
babel.types.isExportNamedDeclaration(path.node) &&
babel.types.isVariableDeclaration(path.node.declaration) &&
(babel.types.isFunctionExpression(
path.node.declaration.declarations[0]?.init,
) ||
babel.types.isArrowFunctionExpression(
path.node.declaration.declarations[0]?.init,
))
) {
compileDirective(
path.get(
'declaration.declarations.0.init',
) as SupportedFunctionPath,
)
}
},
})
} else {
// Find all directives
Expand Down
62 changes: 62 additions & 0 deletions packages/directive-functions-plugin/tests/compiler.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -648,4 +648,66 @@ describe('server function compilation', () => {
export { bytesSignupServerFn_1 };"
`)
})

test('file-wide use server directive', () => {
const code = `
'use server'

import { imported } from 'imported'

export const serverFnConstWithImport = async () => {
return imported
}

export function serverFnNamedWithImport () {
return imported
}
`

const client = compileDirectives({ ...clientConfig, code })
const ssr = compileDirectives({ ...ssrConfig, code })
const server = compileDirectives({
...serverConfig,
code,
filename:
ssr.directiveFnsById[Object.keys(ssr.directiveFnsById)[0]!]!
.extractedFilename,
})

console.log(ssr.directiveFnsById)

expect(client.compiledResult.code).toMatchInlineSnapshot(`
"'use server';

import { createClientRpc } from "my-rpc-lib-client";
const serverFnConstWithImport_1 = createClientRpc("test_ts--serverFnConstWithImport_1");
export const serverFnConstWithImport = serverFnConstWithImport_1;
const serverFnNamedWithImport_1 = createClientRpc("test_ts--serverFnNamedWithImport_1");
export const serverFnNamedWithImport = serverFnNamedWithImport_1;"
`)

expect(ssr.compiledResult.code).toMatchInlineSnapshot(`
"'use server';

import { createSsrRpc } from "my-rpc-lib-server";
const serverFnConstWithImport_1 = createSsrRpc("test_ts--serverFnConstWithImport_1");
export const serverFnConstWithImport = serverFnConstWithImport_1;
const serverFnNamedWithImport_1 = createSsrRpc("test_ts--serverFnNamedWithImport_1");
export const serverFnNamedWithImport = serverFnNamedWithImport_1;"
`)

expect(server.compiledResult.code).toMatchInlineSnapshot(`
"'use server';

import { createServerRpc } from "my-rpc-lib-server";
import { imported } from 'imported';
const serverFnConstWithImport_1 = createServerRpc("test_ts--serverFnConstWithImport_1", async () => {
return imported;
});
const serverFnNamedWithImport_1 = createServerRpc("test_ts--serverFnNamedWithImport_1", function serverFnNamedWithImport() {
return imported;
});
export { serverFnConstWithImport_1, serverFnNamedWithImport_1 };"
`)
})
})