Skip to content

Commit 596703a

Browse files
committed
feat(asset-bundle): fix GenerateAllABAPI->generateAllABs: not check circle dependency
because has bug and it's not easy to fix...
1 parent 0e300f6 commit 596703a

File tree

2 files changed

+25
-12
lines changed

2 files changed

+25
-12
lines changed

src/asset_bundle/all/generate/GenerateAllABSystem.re

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ open WonderBsMost;
33
/* open DependencyDataType; */
44

55
/* TODO need test */
6-
let rec _isCircleDependency =
6+
/* let rec _isCircleDependency =
77
(
88
dependencyRelation,
99
recordedAbPathArr,
@@ -73,7 +73,7 @@ let _checkCircleDependency = dependencyRelation =>
7373
~params={j||j},
7474
),
7575
) :
76-
();
76+
(); */
7777

7878
/* let _checkSABDependencyRelation = () => {
7979
@@ -91,9 +91,8 @@ let buildDependencyRelation = dependencyRelationArrArr =>
9191
WonderCommonlib.ImmutableHashMapService.createEmpty(),
9292
);
9393

94-
let generate = (dependencyRelation, (sabDataArr, rabDataArr)) => {
95-
_checkCircleDependency(dependencyRelation);
96-
94+
let generate = (dependencyRelation, (sabDataArr, rabDataArr)) =>
95+
/* _checkCircleDependency(dependencyRelation); */
9796
RemoveDependencyDataSystem.removeDuplicateBufferData(
9897
dependencyRelation,
9998
FindDependencyDataSystem.buildImageAndGeometryNameMap(rabDataArr),
@@ -106,5 +105,4 @@ let generate = (dependencyRelation, (sabDataArr, rabDataArr)) => {
106105
newRabDataArr,
107106
newSabDataArr,
108107
)
109-
);
110-
};
108+
);

test/integration/no_worker/asset_bundle/generate/generateAllAB_test.re

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ let _ =
2424
});
2525
afterEach(() => restoreSandbox(refJsObjToSandbox(sandbox^)));
2626

27-
describe("check dependency relation", () => {
27+
/* describe("check dependency relation", () => {
2828
describe("if has circle dependency, fatal", () => {
2929
testPromise("test1", () =>
3030
expect(() =>
@@ -68,7 +68,7 @@ let _ =
6868
);
6969
});
7070
71-
describe("else, not fatal", () =>
71+
describe("else, not fatal", () => {
7272
testPromise("test1", () =>
7373
expect(() =>
7474
GenerateAllABSystem.generate(
@@ -82,9 +82,24 @@ let _ =
8282
|> not_
8383
|> toThrow
8484
|> resolve
85-
)
86-
);
87-
});
85+
);
86+
testPromise("test2", () =>
87+
expect(() =>
88+
GenerateAllABSystem.generate(
89+
GenerateAllABTool.buildDependencyRelation([|
90+
[|"s1.sab", "r1.rab", "r2.rab"|],
91+
[|"r1.rab", "r3.rab"|],
92+
[|"r2.rab", "r3.rab"|],
93+
|]),
94+
([||], [||]),
95+
)
96+
)
97+
|> not_
98+
|> toThrow
99+
|> resolve
100+
);
101+
});
102+
}); */
88103

89104
describe("remove duplicate buffer data", () => {
90105
describe("remove duplicate buffer data from rab", () => {

0 commit comments

Comments
 (0)