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

feat: deduplicate reexports and renderedExports to simplify output #4759

Merged
merged 8 commits into from Dec 21, 2022
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 32 additions & 4 deletions src/Chunk.ts
Expand Up @@ -603,13 +603,17 @@ export default class Chunk {
const renderedExports = exportMode === 'none' ? [] : this.getChunkExportDeclarations(format);
let hasExports = renderedExports.length > 0;
let hasDefaultExport = false;
for (const { reexports } of renderedDependencies) {
for (const renderedDependence of renderedDependencies) {
const { reexports } = renderedDependence;
if (reexports?.length) {
hasExports = true;
if (reexports.some(reexport => reexport.reexported === 'default')) {
if (!hasDefaultExport && reexports.some(reexport => reexport.reexported === 'default')) {
hasDefaultExport = true;
break;
}
renderedDependence.reexports = reexports.filter(
// eslint-disable-next-line unicorn/prefer-array-some
({ reexported }) => !renderedExports.find(({ exported }) => exported === reexported)
);
}
}
if (!hasDefaultExport) {
Expand Down Expand Up @@ -769,7 +773,31 @@ export default class Chunk {
const variable = this.exportsByName.get(exportName)!;
if (!(variable instanceof SyntheticNamedExportVariable)) {
const module = variable.module;
if (module && this.chunkByModule.get(module as Module) !== this) continue;
if (module) {
const chunk = this.chunkByModule.get(module as Module);
if (!chunk) {
continue;
}
if (chunk !== this) {
if (!this.renderedDependencies) {
continue;
}
const chunkDep = this.renderedDependencies.get(chunk);
if (!chunkDep) {
continue;
}
TrickyPi marked this conversation as resolved.
Show resolved Hide resolved
const { imports, reexports } = chunkDep;
const importedByreexported = reexports?.find(
({ reexported }) => reexported === exportName
);
const isImported = imports?.find(
({ imported }) => imported === importedByreexported?.imported
);
if (!isImported) {
continue;
}
}
}
}
let expression = null;
let hoisted = false;
Expand Down
2 changes: 1 addition & 1 deletion src/finalisers/system.ts
Expand Up @@ -151,7 +151,7 @@ function analyzeDependencies(
} else {
setter.push(`exports(${exportMapping});`);
}
} else {
} else if (reexportedNames.length === 1) {
const [key, value] = reexportedNames[0];
setter.push(`exports('${key}',${_}${value});`);
}
Expand Down
@@ -1,8 +1,9 @@
import foo from './default.js';
export { default } from './default.js';
import { value } from './named.js';

console.log(foo, value);

import('./default.js').then(result => console.log(result.default));
import('./named.js').then(result => console.log(result.value));

export { foo as default };
Expand Up @@ -4,7 +4,6 @@ System.register(['./default.js', './named.js'], (function (exports, module) {
return {
setters: [function (module) {
foo = module.default;
exports('default', module.default);
}, function (module) {
value = module.value;
}],
Expand Down
@@ -1,4 +1,5 @@
import { __exports as other } from './_virtual/other.js';
export { __exports as default } from './_virtual/other.js';

other.value = 43;

export { other as default };
Expand Up @@ -4,7 +4,6 @@ System.register(['./_virtual/other.js'], (function (exports) {
return {
setters: [function (module) {
other = module.__exports;
exports('default', module.__exports);
}],
execute: (function () {

Expand Down
@@ -1,8 +1,9 @@
import foo from './default.js';
export { default } from './default.js';
import { value } from './named.js';

console.log(foo, value);

import('./default.js').then(result => console.log(result.default));
import('./named.js').then(result => console.log(result.value));

export { foo as default };
Expand Up @@ -4,7 +4,6 @@ System.register(['./default.js', './named.js'], (function (exports, module) {
return {
setters: [function (module) {
foo = module.default;
exports('default', module.default);
}, function (module) {
value = module.value;
}],
Expand Down
@@ -1,2 +1,5 @@
import foo from './dep2.js';
export { default } from './dep2.js';



export { foo as default };
Expand Up @@ -4,10 +4,11 @@ System.register(['./dep2.js'], (function (exports) {
return {
setters: [function (module) {
foo = module.default;
exports('default', module.default);
}],
execute: (function () {

exports('default', foo);



})
Expand Down
@@ -1,4 +1,5 @@
import { value } from './main.js';
export { value } from './main.js';

console.log('dynamic2', value);

export { value };
Expand Up @@ -4,7 +4,6 @@ System.register(['./main.js'], (function (exports) {
return {
setters: [function (module) {
value = module.value;
exports('value', module.value);
}],
execute: (function () {

Expand Down
@@ -1,4 +1,5 @@
import { value } from './generated-dynamic1.js';
export { value } from './generated-dynamic1.js';

console.log('dynamic2', value);

export { value };
Expand Up @@ -4,7 +4,6 @@ System.register(['./generated-dynamic1.js'], (function (exports) {
return {
setters: [function (module) {
value = module.value;
exports('value', module.value);
}],
execute: (function () {

Expand Down
@@ -1,6 +1,6 @@
import { v as value1 } from './generated-from-main-1-and-dynamic.js';
export { v as value1 } from './generated-from-main-1-and-dynamic.js';
import { v as value2 } from './generated-from-main-1-and-2.js';
export { v as value2 } from './generated-from-main-1-and-2.js';

console.log('dynamic1', value1, value2);

export { value1, value2 };
@@ -1,7 +1,7 @@
import { v as value1 } from './generated-from-main-1-and-dynamic.js';
export { v as value1 } from './generated-from-main-1-and-dynamic.js';
import { v as value2, a as value3 } from './generated-from-main-1-and-2.js';
export { v as value2, a as value3 } from './generated-from-main-1-and-2.js';

console.log('main1', value1, value2, value3);
import('./generated-dynamic.js');

export { value1, value2, value3 };
@@ -1,5 +1,6 @@
import { v as value2, a as value3 } from './generated-from-main-1-and-2.js';
export { v as value2, a as value3 } from './generated-from-main-1-and-2.js';

console.log('main2', value2, value3);
import('./generated-dynamic.js');

export { value2, value3 };
Expand Up @@ -4,10 +4,8 @@ System.register(['./generated-from-main-1-and-dynamic.js', './generated-from-mai
return {
setters: [function (module) {
value1 = module.v;
exports('value1', module.v);
}, function (module) {
value2 = module.v;
exports('value2', module.v);
}],
execute: (function () {

Expand Down
Expand Up @@ -4,11 +4,9 @@ System.register(['./generated-from-main-1-and-dynamic.js', './generated-from-mai
return {
setters: [function (module) {
value1 = module.v;
exports('value1', module.v);
}, function (module) {
value2 = module.v;
value3 = module.a;
exports({ value2: module.v, value3: module.a });
}],
execute: (function () {

Expand Down
Expand Up @@ -5,7 +5,6 @@ System.register(['./generated-from-main-1-and-2.js'], (function (exports, module
setters: [function (module) {
value2 = module.v;
value3 = module.a;
exports({ value2: module.v, value3: module.a });
}],
execute: (function () {

Expand Down
@@ -1,6 +1,6 @@
import { v as value1 } from './generated-dep1.js';
export { v as value1 } from './generated-dep1.js';
import { v as value2 } from './generated-dep2.js';
export { v as value2 } from './generated-dep2.js';

console.log('dynamic1', value1, value2);

export { value1, value2 };
@@ -1,9 +1,9 @@
import { v as value1 } from './generated-dep1.js';
export { v as value1 } from './generated-dep1.js';
import { v as value2 } from './generated-dep2.js';
export { v as value2 } from './generated-dep2.js';

const something = 'something';

console.log('main1', value1, value2, something);
import('./generated-dynamic.js');

export { value1, value2 };
@@ -1,5 +1,6 @@
import { v as value2 } from './generated-dep2.js';
export { v as value2 } from './generated-dep2.js';

console.log('main2', value2);
import('./generated-dynamic.js');

export { value2 };
Expand Up @@ -4,10 +4,8 @@ System.register(['./generated-dep1.js', './generated-dep2.js'], (function (expor
return {
setters: [function (module) {
value1 = module.v;
exports('value1', module.v);
}, function (module) {
value2 = module.v;
exports('value2', module.v);
}],
execute: (function () {

Expand Down
Expand Up @@ -4,10 +4,8 @@ System.register(['./generated-dep1.js', './generated-dep2.js'], (function (expor
return {
setters: [function (module) {
value1 = module.v;
exports('value1', module.v);
}, function (module) {
value2 = module.v;
exports('value2', module.v);
}],
execute: (function () {

Expand Down
Expand Up @@ -4,7 +4,6 @@ System.register(['./generated-dep2.js'], (function (exports, module) {
return {
setters: [function (module) {
value2 = module.v;
exports('value2', module.v);
}],
execute: (function () {

Expand Down
Expand Up @@ -5,7 +5,7 @@ define(['require', 'exports', './generated-dep2'], (function (require, exports,
console.log('main1', value1, dep2.value2);
new Promise(function (resolve, reject) { require(['./generated-dynamic1'], resolve, reject); });

exports.value2 = dep2.value2;
exports.value1 = value1;
exports.value2 = dep2.value2;

}));
Expand Up @@ -7,5 +7,5 @@ const value1 = 'shared1';
console.log('main1', value1, dep2.value2);
Promise.resolve().then(function () { return require('./generated-dynamic1.js'); });

exports.value2 = dep2.value2;
exports.value1 = value1;
exports.value2 = dep2.value2;
@@ -1,5 +1,6 @@
import { value1 } from './main1.js';
export { value1 } from './main1.js';
import './generated-dep2.js';

console.log('dynamic1', value1);

export { value1 };
@@ -1,4 +1,5 @@
import { v as value2 } from './generated-dep2.js';
export { v as value2 } from './generated-dep2.js';

console.log('dynamic2', value2);

export { value2 };
@@ -1,9 +1,8 @@
import { v as value2 } from './generated-dep2.js';
export { v as value2 } from './generated-dep2.js';

const value1 = 'shared1';

console.log('main1', value1, value2);
import('./generated-dynamic1.js');

export { value1 };
export { value1, value2 };
@@ -1,5 +1,6 @@
import { v as value2 } from './generated-dep2.js';
export { v as value2 } from './generated-dep2.js';

console.log('main2', value2);
import('./generated-dynamic2.js');

export { value2 };
Expand Up @@ -4,7 +4,6 @@ System.register(['./main1.js', './generated-dep2.js'], (function (exports) {
return {
setters: [function (module) {
value1 = module.value1;
exports('value1', module.value1);
}, null],
execute: (function () {

Expand Down
Expand Up @@ -4,7 +4,6 @@ System.register(['./generated-dep2.js'], (function (exports) {
return {
setters: [function (module) {
value2 = module.v;
exports('value2', module.v);
}],
execute: (function () {

Expand Down
Expand Up @@ -4,7 +4,6 @@ System.register(['./generated-dep2.js'], (function (exports, module) {
return {
setters: [function (module) {
value2 = module.v;
exports('value2', module.v);
}],
execute: (function () {

Expand Down
Expand Up @@ -4,7 +4,6 @@ System.register(['./generated-dep2.js'], (function (exports, module) {
return {
setters: [function (module) {
value2 = module.v;
exports('value2', module.v);
}],
execute: (function () {

Expand Down
@@ -1,4 +1,5 @@
import { value } from './main.js';
export { value } from './main.js';

console.log('dynamic', value);

export { value };
Expand Up @@ -4,7 +4,6 @@ System.register(['./main.js'], (function (exports) {
return {
setters: [function (module) {
value = module.value;
exports('value', module.value);
}],
execute: (function () {

Expand Down
@@ -1,4 +1,5 @@
import { value } from './main.js';
export { value } from './main.js';

console.log('dynamic', value);

export { value };
Expand Up @@ -4,7 +4,6 @@ System.register(['./main.js'], (function (exports) {
return {
setters: [function (module) {
value = module.value;
exports('value', module.value);
}],
execute: (function () {

Expand Down