Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: import rewrite issues #607

Merged
merged 2 commits into from
Jan 24, 2025
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
21 changes: 18 additions & 3 deletions packages/build/src/target/module/LocationRewriter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ export default abstract class LocationRewriter

#rewriteModule(targetModuleFilename: string, dependency: ESImport | ESExport): string
{
if (dependency.members.length === 0)
{
return this.#rewriteToCommon(targetModuleFilename, dependency, []);
}

const { segmentKeys, remoteKeys, commonKeys } = this.#getModuleImportKeys(targetModuleFilename, dependency);

const imports: string[] = [];
Expand All @@ -93,7 +98,7 @@ export default abstract class LocationRewriter
imports.push(this.#rewriteToCommon(targetModuleFilename, dependency, commonKeys));
}

return imports.join('\n');
return imports.filter(item => item.length > 0).join('\n');
}

#rewriteToResource(targetModuleFilename: string, dependency: ESImport | ESExport): string
Expand Down Expand Up @@ -141,8 +146,11 @@ export default abstract class LocationRewriter

#getModuleImportKeys(targetModuleFilename: string, dependency: ESImport | ESExport): ModuleImportKeys
{
const segmentKeys = this.#getSegmentImportKeys(targetModuleFilename, this.#segment);
const remoteKeys = this.#getRemoteImportKeys(targetModuleFilename, segmentKeys);
const moduleSegmentKeys = this.#getSegmentImportKeys(targetModuleFilename, this.#segment);
const moduleRemoteKeys = this.#getRemoteImportKeys(targetModuleFilename, moduleSegmentKeys);

const segmentKeys = this.#filterMemberKeys(dependency, moduleSegmentKeys);
const remoteKeys = this.#filterMemberKeys(dependency, moduleRemoteKeys);
const commonKeys = this.#extractUnsegmentedImportKeys(dependency, [...segmentKeys, ...remoteKeys]);

return { segmentKeys, remoteKeys, commonKeys };
Expand Down Expand Up @@ -171,6 +179,13 @@ export default abstract class LocationRewriter
return uniqueKeys.filter(key => segmentKeys.includes(key) === false);
}

#filterMemberKeys(dependency: ESImport | ESExport, keys: string[]): string[]
{
return dependency.members
.filter(member => keys.includes(member.name))
.map(member => member.name);
}

#extractUnsegmentedImportKeys(dependency: ESImport | ESExport, segmentedKeys: string[]): string[]
{
return dependency.members
Expand Down
5 changes: 5 additions & 0 deletions packages/build/src/target/segment/Builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ export default class Builder

for (const module of segment.getSegmentedModules())
{
if (module.members.length === 0)
{
continue;
}

const filename = this.#fileHelper.addSubExtension(module.filename, segment.name);
const members = this.#createModuleImportMembers(module);

Expand Down
Loading