fix(asset-bundle): fix "add manifest data" logic

change RABType,SABType->manifest->dependencyRelation type;
Wonder-Technology · Apr 16, 2019 · 9cdd2e0 · 9cdd2e0
1 parent 01d4a57
commit 9cdd2e0
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 17 deletions.
diff --git a/src/asset_bundle/all/manifest/ManifestDataSystem.re b/src/asset_bundle/all/manifest/ManifestDataSystem.re
@@ -22,10 +22,19 @@ module All = {
     |}
   ];
 
-  let buildManifestData = (dependencyRelation, arrayBuffer, buildManifestFunc) =>
+  let buildManifestData =
+      (dependencyRelation, (abRelativePath, arrayBuffer), buildManifestFunc) =>
     _getHashId(arrayBuffer)
     |> then_(hashId =>
-         buildManifestFunc(hashId, dependencyRelation) |> resolve
+         buildManifestFunc(
+           hashId,
+           dependencyRelation
+           |> WonderCommonlib.ImmutableHashMapService.get(abRelativePath)
+           |> Js.Option.getWithDefault(
+                WonderCommonlib.ArrayService.createEmpty(),
+              ),
+         )
+         |> resolve
        )
     |> Most.fromPromise;
 
@@ -83,10 +92,12 @@ module All = {
 };
 
 module SAB = {
-  let addManifestData = (dependencyRelation, sab) => {
+  let addManifestData = (dependencyRelation, (sabRelativePath, sab)) => {
     let manifestJsonUint8Array =
       All.buildManifestData(
-        dependencyRelation, sab, (hashId, dependencyRelation) =>
+        dependencyRelation,
+        (sabRelativePath, sab),
+        (hashId, dependencyRelation) =>
         ({hashId, dependencyRelation}: SABType.manifest)
       )
       |> GenerateABUtils.buildJsonUint8Array;
@@ -100,10 +111,12 @@ module SAB = {
 };
 
 module RAB = {
-  let addManifestData = (dependencyRelation, rab) => {
+  let addManifestData = (dependencyRelation, (rabRelativePath, rab)) => {
     let manifestJsonUint8Array =
       All.buildManifestData(
-        dependencyRelation, rab, (hashId, dependencyRelation) =>
+        dependencyRelation,
+        (rabRelativePath, rab),
+        (hashId, dependencyRelation) =>
         ({hashId, dependencyRelation}: RABType.manifest)
       )
       |> GenerateABUtils.buildJsonUint8Array;
@@ -119,8 +132,10 @@ module RAB = {
 let addManifestData =
     (
       dependencyRelation: DependencyDataType.dependencyRelation,
-      (sabArr, rabArr),
+      (sabDataArr, rabDataArr),
     ) => (
-  sabArr |> Js.Array.map(sab => RAB.addManifestData(dependencyRelation, sab)),
-  rabArr |> Js.Array.map(rab => RAB.addManifestData(dependencyRelation, rab)),
+  sabDataArr
+  |> Js.Array.map(data => SAB.addManifestData(dependencyRelation, data)),
+  rabDataArr
+  |> Js.Array.map(data => RAB.addManifestData(dependencyRelation, data)),
 );
diff --git a/src/asset_bundle/rab/data/RABType.re b/src/asset_bundle/rab/data/RABType.re
@@ -70,10 +70,7 @@ type resourceAssetBundleContent = {
 
 type manifest = {
   hashId: string,
-  dependencyRelation:
-    WonderCommonlib.ImmutableHashMapService.t(
-      array(AllABType.abRelativePath),
-    ),
+  dependencyRelation: array(AllABType.abRelativePath),
 };
 
 type materialComponent = int;

diff --git a/src/asset_bundle/sab/data/SABType.re b/src/asset_bundle/sab/data/SABType.re
@@ -2,8 +2,5 @@ type sceneAssetBundleContent = WDType.wd;
 
 type manifest = {
   hashId: string,
-  dependencyRelation:
-    WonderCommonlib.ImmutableHashMapService.t(
-      array(AllABType.abRelativePath),
-    ),
+  dependencyRelation: array(AllABType.abRelativePath),
 };