@@ -32,11 +32,11 @@ export async function getMostRecentTagExpirationTimestamp(tags: string[]) {
3232
3333  const  cacheStore  =  getMemoizedKeyValueStoreBackedByRegionalBlobStore ( {  consistency : 'strong'  } ) 
3434
35-   const  timestampsOrNulls  =  await  Promise . all ( tags . map ( ( tag )  =>  getTagManifest ( tag ,  cacheStore ) ) ) 
35+   const  manifestsOrNulls  =  await  Promise . all ( tags . map ( ( tag )  =>  getTagManifest ( tag ,  cacheStore ) ) ) 
3636
37-   const  expirationTimestamps  =  timestampsOrNulls 
37+   const  expirationTimestamps  =  manifestsOrNulls 
3838    . filter ( ( manifest )  =>  manifest  !==  null ) 
39-     . map ( ( manifest )  =>  manifest . expiredAt ) 
39+     . map ( ( manifest )  =>  manifest . expireAt ) 
4040  if  ( expirationTimestamps . length  ===  0 )  { 
4141    return  0 
4242  } 
@@ -57,7 +57,7 @@ export type TagStaleOrExpiredStatus =
5757export  function  isAnyTagStaleOrExpired ( 
5858  tags : string [ ] , 
5959  timestamp : number , 
60- ) : Promise < TagStaleOrExpired >  { 
60+ ) : Promise < TagStaleOrExpiredStatus >  { 
6161  if  ( tags . length  ===  0  ||  ! timestamp )  { 
6262    return  Promise . resolve ( {  stale : false ,  expired : false  } ) 
6363  } 
@@ -72,8 +72,8 @@ export function isAnyTagStaleOrExpired(
7272  //    running in case future `CacheHandler.get` calls would be able to use results). 
7373  //    "Worst case" scenario is none of tag was expired in which case we need to wait 
7474  //    for all blob store checks to finish before we can be certain that no tag is expired. 
75-   return  new  Promise < TagStaleOrExpired > ( ( resolve ,  reject )  =>  { 
76-     const  tagManifestPromises : Promise < TagStaleOrExpired > [ ]  =  [ ] 
75+   return  new  Promise < TagStaleOrExpiredStatus > ( ( resolve ,  reject )  =>  { 
76+     const  tagManifestPromises : Promise < TagStaleOrExpiredStatus > [ ]  =  [ ] 
7777
7878    for  ( const  tag  of  tags )  { 
7979      const  tagManifestPromise  =  getTagManifest ( tag ,  cacheStore ) 
@@ -85,10 +85,10 @@ export function isAnyTagStaleOrExpired(
8585            return  {  stale : false ,  expired : false  } 
8686          } 
8787          const  stale  =  tagManifest . staleAt  >=  timestamp 
88-           const  expired  =  tagManifest . expiredAt  >=  timestamp  &&  tagManifest . expiredAt  <=  Date . now ( ) 
88+           const  expired  =  tagManifest . expireAt  >=  timestamp  &&  tagManifest . expireAt  <=  Date . now ( ) 
8989
9090          if  ( expired  &&  stale )  { 
91-             const  expiredResult : TagStaleOrExpired  =  { 
91+             const  expiredResult : TagStaleOrExpiredStatus  =  { 
9292              stale, 
9393              expired, 
9494            } 
@@ -98,10 +98,10 @@ export function isAnyTagStaleOrExpired(
9898          } 
9999
100100          if  ( stale )  { 
101-             const  staleResult : TagStaleOrExpired  =  { 
101+             const  staleResult : TagStaleOrExpiredStatus  =  { 
102102              stale, 
103103              expired, 
104-               expireAt : tagManifest . expiredAt , 
104+               expireAt : tagManifest . expireAt , 
105105            } 
106106            return  staleResult 
107107          } 
@@ -113,7 +113,7 @@ export function isAnyTagStaleOrExpired(
113113    // make sure we resolve promise after all blobs are checked (if we didn't resolve as expired yet) 
114114    Promise . all ( tagManifestPromises ) 
115115      . then ( ( tagManifestsAreStaleOrExpired )  =>  { 
116-         let  result : TagStaleOrExpired  =  {  stale : false ,  expired : false  } 
116+         let  result : TagStaleOrExpiredStatus  =  {  stale : false ,  expired : false  } 
117117
118118        for  ( const  tagResult  of  tagManifestsAreStaleOrExpired )  { 
119119          if  ( tagResult . expired )  { 
@@ -181,7 +181,7 @@ async function doRevalidateTagAndPurgeEdgeCache(
181181
182182  const  tagManifest : TagManifest  =  { 
183183    staleAt : now , 
184-     expiredAt : now  +  ( durations ?. expire  ? durations . expire  *  1000  : 0 ) , 
184+     expireAt : now  +  ( durations ?. expire  ? durations . expire  *  1000  : 0 ) , 
185185  } 
186186
187187  const  cacheStore  =  getMemoizedKeyValueStoreBackedByRegionalBlobStore ( {  consistency : 'strong'  } ) 
0 commit comments