fix: cache not being applied correctly

pixijs · Oct 22, 2024 · a35ecce · a35ecce
1 parent f293a15
commit a35ecce
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 23 deletions.
diff --git a/packages/assetpack/src/core/Asset.ts b/packages/assetpack/src/core/Asset.ts
@@ -4,6 +4,8 @@ import { extractTagsFromFileName } from './utils/extractTagsFromFileName.js';
 import { getHash } from './utils/getHash.js';
 import { path } from './utils/path.js';
 
+import type { CachedAsset } from './AssetCache.js';
+
 export interface AssetOptions
 {
     path: string;
@@ -288,5 +290,24 @@ export class Asset
 
         return res;
     }
+
+    toCacheData(saveHash: boolean): CachedAsset
+    {
+        const data: CachedAsset = {
+            isFolder: this.isFolder,
+            parent: this.parent?.path,
+            transformParent: this.transformParent?.path,
+            metaData: { ...this.metaData },
+            inheritedMetaData: { ...this.inheritedMetaData },
+            transformData: { ...this.transformData }
+        };
+
+        if (!this.isFolder && saveHash)
+        {
+            data.hash = this.hash;
+        }
+
+        return data;
+    }
 }
 
diff --git a/packages/assetpack/src/core/AssetCache.ts b/packages/assetpack/src/core/AssetCache.ts
@@ -51,18 +51,7 @@ export class AssetCache
 
     private _serializeAsset(asset: Asset, schema: AssetCacheData['assets'], saveHash = false)
     {
-        const serializeAsset: CachedAsset = {
-            isFolder: asset.isFolder,
-            parent: asset.parent?.path,
-            transformParent: asset.transformParent?.path,
-            metaData: asset.metaData,
-            transformData: asset.transformData
-        };
-
-        if (!asset.isFolder && saveHash)
-        {
-            serializeAsset.hash = asset.hash;
-        }
+        const serializeAsset: CachedAsset = asset.toCacheData(saveHash);
 
         schema[asset.path] = serializeAsset;
 
@@ -85,6 +74,7 @@ export interface CachedAsset
     hash?: string;
     parent: string | undefined;
     metaData: Record<string, any>;
+    inheritedMetaData: Record<string, any>;
     transformData: Record<string, any>;
     transformParent: string | undefined;
 }

diff --git a/packages/assetpack/src/core/AssetPack.ts b/packages/assetpack/src/core/AssetPack.ts
@@ -129,7 +129,7 @@ export class AssetPack
                 if (cache)
                 {
                     // write back to the cache...
-                    await (assetCache as AssetCache).write(root);
+                    (assetCache as AssetCache).write(root);
 
                     // release the buffers from the cache
                     root.releaseChildrenBuffers();

diff --git a/packages/assetpack/src/core/AssetWatcher.ts b/packages/assetpack/src/core/AssetWatcher.ts
@@ -18,7 +18,7 @@ export interface AssetWatcherOptions
     assetSettingsData?: AssetSettings[];
     ignore?: string | string[];
     onUpdate: (root: Asset) => Promise<void>;
-    onComplete: (root: Asset) => Promise<void>;
+    onComplete: (root: Asset) => void;
 }
 
 interface ChangeData

diff --git a/packages/assetpack/src/core/utils/syncAssetsWithCache.ts b/packages/assetpack/src/core/utils/syncAssetsWithCache.ts
@@ -26,6 +26,8 @@ function syncAssetsFromCache(assetHash: Record<string, Asset>, cachedData: Recor
             });
 
             assetToDelete.metaData = cachedAsset.metaData;
+            assetToDelete.transformData = cachedAsset.transformData;
+            assetToDelete.inheritedMetaData = cachedAsset.inheritedMetaData;
 
             assetToDelete.state = 'deleted';
 
@@ -87,22 +89,24 @@ function syncTransformedAssetsFromCache(assetHash: Record<string, Asset>, cached
     for (const i in cachedData)
     {
         const cachedAssetData = cachedData[i];
+        let asset = assetHash[i];
 
-        if (cachedAssetData.transformParent)
+        if (!asset)
         {
-            const transformedAsset = new Asset({
+            asset = new Asset({
                 path: i,
                 isFolder: cachedAssetData.isFolder
             });
 
-            transformedAsset.metaData = cachedAssetData.metaData;
-            transformedAsset.transformData = cachedAssetData.transformData;
+            transformedAssets[i] = asset;
+            assetHash[i] = asset;
 
-            transformedAssets[i] = transformedAsset;
-            assetHash[i] = transformedAsset;
-
-            transformedAsset.transformParent = assetHash[cachedAssetData.transformParent];
+            asset.transformParent = assetHash[cachedAssetData.transformParent!];
         }
+
+        asset.inheritedMetaData = cachedAssetData.inheritedMetaData;
+        asset.transformData = cachedAssetData.transformData;
+        asset.metaData = cachedAssetData.metaData;
     }
 
     for (const i in transformedAssets)

diff --git a/packages/assetpack/test/core/AssetCache.test.ts b/packages/assetpack/test/core/AssetCache.test.ts
@@ -37,16 +37,18 @@ describe('AssetCache', () =>
 
         expect(cachedAssetData).toEqual({
             test: {
+                inheritedMetaData: {},
                 isFolder: true,
                 metaData: {},
                 transformData: {},
             },
             'test/test.json': {
                 isFolder: false,
                 hash: '12345',
+                inheritedMetaData: {},
                 parent: 'test',
                 transformData: {},
-                metaData: {}
+                metaData: {},
             }
         });
     });