Moduletrace/bunext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bogfix: update server module stripping function.

Browse Source
This commit is contained in:
tben
2026-03-22 12:32:15 +01:00
parent c3e1341ff8
commit e2df3256f4
6 changed files with 157 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/functions/bundler/strip-server-side-logic.tsx
+86 -44
View File
@@ -7,6 +7,9 @@ type Params = {
};
export default function stripServerSideLogic({ txt_code, file_path }: Params) {
const file_dir_name = path.dirname(file_path);
// 1. Initial Parse of the source
const sourceFile = ts.createSourceFile(
"file.tsx",
txt_code,
@@ -15,38 +18,42 @@ export default function stripServerSideLogic({ txt_code, file_path }: Params) {
ts.ScriptKind.TSX,
);
const printer = ts.createPrinter();
const file_fir_name = path.dirname(file_path);
const transformer: ts.TransformerFactory<ts.SourceFile> =
/**
* PASS 1: Remove 'server' export and resolve absolute paths
*/
const stripTransformer: ts.TransformerFactory<ts.SourceFile> =
(context) => (rootNode) => {
const visitor = (node: ts.Node): ts.Node | undefined => {
// 1. Strip the 'server' export
// Remove 'export const server'
if (
ts.isVariableStatement(node) &&
node.modifiers?.some(
(m) => m.kind === ts.SyntaxKind.ExportKeyword,
)
) {
const isServer = node.declarationList.declarations.some(
(d) =>
ts.isIdentifier(d.name) && d.name.text === "server",
);
if (isServer) return undefined;
if (
node.declarationList.declarations.some(
(d) =>
ts.isIdentifier(d.name) &&
d.name.text === "server",
)
) {
return undefined;
}
}
// 2. Convert relative imports to absolute imports
// Convert relative imports to absolute
if (ts.isImportDeclaration(node)) {
const moduleSpecifier = node.moduleSpecifier;
const specifier = node.moduleSpecifier;
if (
ts.isStringLiteral(moduleSpecifier) &&
moduleSpecifier.text.startsWith(".")
ts.isStringLiteral(specifier) &&
specifier.text.startsWith(".")
) {
// Resolve the relative path to an absolute filesystem path
const absolutePath = path.resolve(
file_fir_name,
moduleSpecifier.text,
file_dir_name,
specifier.text,
);
return ts.factory.updateImportDeclaration(
node,
node.modifiers,
@@ -56,67 +63,102 @@ export default function stripServerSideLogic({ txt_code, file_path }: Params) {
);
}
}
return ts.visitEachChild(node, visitor, context);
};
return ts.visitNode(rootNode, visitor) as ts.SourceFile;
};
const result = ts.transform(sourceFile, [transformer]);
const intermediate = printer.printFile(result.transformed[0]);
const step1Result = ts.transform(sourceFile, [stripTransformer]);
const intermediateCode = printer.printFile(step1Result.transformed[0]);
// Pass 2: Cleanup unused imports (Same logic as before)
// 2. Re-parse to get a "Clean Slate" AST
const cleanSource = ts.createSourceFile(
"clean.tsx",
intermediate,
intermediateCode,
ts.ScriptTarget.Latest,
true,
ts.ScriptKind.TSX,
);
const cleanup: ts.TransformerFactory<ts.SourceFile> =
/**
* PASS 2: Collect all used Identifiers and Prune Imports
*/
const usedIdentifiers = new Set<string>();
function walkAndFindUsages(node: ts.Node) {
if (ts.isIdentifier(node)) {
// We only care about identifiers that AREN'T the names in the import statements themselves
const parent = node.parent;
const isImportName =
ts.isImportSpecifier(parent) ||
ts.isImportClause(parent) ||
ts.isNamespaceImport(parent);
if (!isImportName) {
usedIdentifiers.add(node.text);
}
}
ts.forEachChild(node, walkAndFindUsages);
}
walkAndFindUsages(cleanSource);
const cleanupTransformer: ts.TransformerFactory<ts.SourceFile> =
(context) => (rootNode) => {
const visitor = (node: ts.Node): ts.Node | undefined => {
if (ts.isImportDeclaration(node)) {
const clause = node.importClause;
if (!clause) return node;
// 1. Clean Named Imports: { A, B }
if (
clause.namedBindings &&
ts.isNamedImports(clause.namedBindings)
) {
const used = clause.namedBindings.elements.filter(
(el) => {
const regex = new RegExp(
`\\b${el.name.text}\\b`,
"g",
);
return (
(intermediate.match(regex) || []).length > 1
);
},
);
if (used.length === 0) return undefined;
const activeElements =
clause.namedBindings.elements.filter((el) =>
usedIdentifiers.has(el.name.text),
);
// If no named imports are used and there is no default import, nix the whole line
if (activeElements.length === 0 && !clause.name)
return undefined;
// If we have some named imports left, update the node
return ts.factory.updateImportDeclaration(
node,
node.modifiers,
ts.factory.updateImportClause(
clause,
clause.isTypeOnly,
clause.name,
ts.factory.createNamedImports(used),
// Only keep default import if it's used
clause.name &&
usedIdentifiers.has(clause.name.text)
? clause.name
: undefined,
ts.factory.createNamedImports(activeElements),
),
node.moduleSpecifier,
node.attributes,
);
}
if (clause.name) {
const regex = new RegExp(
`\\b${clause.name.text}\\b`,
"g",
// 2. Clean Default Imports: import X from '...'
if (clause.name && !usedIdentifiers.has(clause.name.text)) {
// If there are no named bindings attached, nix the whole line
if (!clause.namedBindings) return undefined;
// Otherwise, just strip the default name and keep the named bindings
return ts.factory.updateImportDeclaration(
node,
node.modifiers,
ts.factory.updateImportClause(
clause,
clause.isTypeOnly,
undefined,
clause.namedBindings,
),
node.moduleSpecifier,
node.attributes,
);
if ((intermediate.match(regex) || []).length <= 1)
return undefined;
}
}
return ts.visitEachChild(node, visitor, context);
@@ -124,6 +166,6 @@ export default function stripServerSideLogic({ txt_code, file_path }: Params) {
return ts.visitNode(rootNode, visitor) as ts.SourceFile;
};
const final = ts.transform(cleanSource, [cleanup]);
return printer.printFile(final.transformed[0]);
const finalResult = ts.transform(cleanSource, [cleanupTransformer]);
return printer.printFile(finalResult.transformed[0]);
}
src/utils/rewrite-pages-module.ts
+4
View File
@@ -21,6 +21,10 @@ export default async function rewritePagesModule(params?: Params) {
const page_path = target_pages[i];
const dst_path = pagePathTransform({ page_path });
if (page_path.match(/__root\.tsx?/)) {
continue;
}
const origin_page_content = await Bun.file(page_path).text();
const dst_page_content = stripServerSideLogic({
txt_code: origin_page_content,