Skip to content

Commit 045d2ab

Browse files
authored
fix: keep named re-export ids when the same request is also star re-exported (#22351)
1 parent 2bd039a commit 045d2ab

11 files changed

Lines changed: 98 additions & 30 deletions

File tree

‎lib/optimize/LazyBarrel.js‎

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -36,28 +36,8 @@ const Dependency = require("../graph/Dependency");
3636
*/
3737

3838
/**
39-
* Collects the export names a dependency group requests from its target.
40-
* @param {Dependency[]} dependencies dependency group resolving to one module
41-
* @returns {Set<string> | true} requested export names, true for all
42-
*/
43-
function getForwardedIds(dependencies) {
44-
/** @type {Set<string>} */
45-
const ids = new Set();
46-
for (const dependency of dependencies) {
47-
// TODO in the next major release: remove
48-
// It may be missing on custom dependency types not extending the base Dependency
49-
if (!("getForwardId" in dependency)) continue;
50-
51-
const id = dependency.getForwardId();
52-
if (id === true) return true;
53-
if (id !== null) ids.add(id);
54-
}
55-
return ids;
56-
}
57-
58-
/**
59-
* Tracks the deferred dependencies of a side-effect-free barrel module and
60-
* keeps the export forwarding needed after those dependencies are resolved.
39+
* Tracks the deferred (not yet factorized/built) dependencies of a
40+
* side-effect-free barrel module and which export names resolve to them.
6141
*/
6242
class LazyBarrelInfo {
6343
constructor() {
@@ -450,10 +430,18 @@ class LazyBarrelController {
450430
const modules = this._modules;
451431
const state = modules.get(module);
452432

453-
const getRequestedIds = () => {
454-
const directIds = getForwardedIds(dependencies);
455-
if (directIds !== true && directIds.size !== 0) return directIds;
433+
/**
434+
* @returns {Set<string> | true} requested export names, true for all
435+
*/
436+
const getForwardedIds = () => {
437+
/** @type {Set<string>} */
438+
const ids = new Set();
456439
for (const dependency of dependencies) {
440+
// TODO in the next major release: remove
441+
// It may be missing on custom dependency types not extending the base Dependency
442+
if (!("getForwardId" in dependency)) continue;
443+
444+
// star re-export: forward the barrel's names, merged with named re-exports of the same request
457445
if (
458446
"getLazyUntil" in dependency &&
459447
dependency.getLazyUntil() === Dependency.LAZY_UNTIL_FALLBACK
@@ -463,15 +451,20 @@ class LazyBarrelController {
463451
const parentState =
464452
parent === undefined ? undefined : modules.get(parent);
465453
if (parentState !== undefined) {
466-
return parentState.forwardedIds;
454+
if (parentState.forwardedIds === true) return true;
455+
for (const id of parentState.forwardedIds) ids.add(id);
456+
continue;
467457
}
468458
}
459+
const id = dependency.getForwardId();
460+
if (id === true) return true;
461+
if (id !== null) ids.add(id);
469462
}
470-
if (directIds === true || directIds.size !== 0) return directIds;
471-
return directIds;
463+
return ids;
472464
};
465+
const forwardedIds = getForwardedIds();
466+
473467
if (state === undefined) {
474-
const forwardedIds = getRequestedIds();
475468
if (forwardedIds !== true && forwardedIds.size === 0) return;
476469
modules.set(module, {
477470
forwardedIds,
@@ -480,7 +473,6 @@ class LazyBarrelController {
480473
return;
481474
}
482475

483-
const forwardedIds = getRequestedIds();
484476
if (forwardedIds !== true && forwardedIds.size === 0) return;
485477
if (state.forwardedIds !== true) {
486478
if (forwardedIds === true) state.forwardedIds = true;
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { Button, getButtonUtilityClass } from "./lib/index.mjs";
2+
3+
it("should build the default re-exported through a nested barrel", () => {
4+
expect(typeof Button).toBe("function");
5+
expect(Button()).toBe("Button");
6+
});
7+
8+
it("should build a star re-export from the same nested barrel", () => {
9+
expect(getButtonUtilityClass("root")).toBe("MuiButton-root");
10+
});
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export default function Button() {
2+
return "Button";
3+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
export function getButtonUtilityClass(slot) {
2+
return `MuiButton-${slot}`;
3+
}
4+
const buttonClasses = { root: "MuiButton-root" };
5+
export default buttonClasses;
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export { default } from "./Button.mjs";
2+
export { default as buttonClasses } from "./buttonClasses.mjs";
3+
export * from "./buttonClasses.mjs";
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export default function Table() {
2+
return "Table";
3+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export { default } from "./Table.mjs";
2+
export { default as tableClasses } from "./tableClasses.mjs";
3+
export * from "./tableClasses.mjs";
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
export function getTableUtilityClass(slot) {
2+
return `MuiTable-${slot}`;
3+
}
4+
const tableClasses = { root: "MuiTable-root" };
5+
export default tableClasses;
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// @mui/material shape: named default + star from a nested barrel
2+
export { default as Button } from "./Button/index.mjs";
3+
export * from "./Button/index.mjs";
4+
export { default as Table } from "./Table/index.mjs";
5+
export * from "./Table/index.mjs";
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"name": "nested-default-reexport",
3+
"version": "1.0.0",
4+
"sideEffects": false
5+
}

0 commit comments

Comments
 (0)