@agrodt/astro-redis-cache-provider 0.1.1 → 0.2.0

package/README.md

@@ -22,7 +22,7 @@ pnpm add @agrodt/astro-redis-cache-provider
 ```
 
 `node-redis` already comes as a dependency of this package. You only need
-a reachable Redis server.
+a reachable Redis server and Astro 7.3 or later within Astro 7.
 
 ## Usage
 
@@ -32,17 +32,29 @@ import { defineConfig } from "astro/config";
 import { redisCache } from "@agrodt/astro-redis-cache-provider/config";
 
 export default defineConfig({
-  experimental: {
-    cache: {
-      provider: redisCache({
-        url: () => process.env.REDIS_URL,
-        keyPrefix: "astro:cache",
-      }),
-    },
+  cache: {
+    provider: redisCache({
+      url: () => process.env.REDIS_URL,
+      keyPrefix: "astro:cache",
+    }),
   },
 });
 ```
 
+## Upgrading from Astro 6
+
+Move `experimental.cache` to the top-level `cache` option. This provider uses
+Astro's public `astro/cache/provider-utils` helpers for response headers and
+path/tag invalidation. URL normalization, response serialization, `Vary`, and
+background revalidation remain provider-owned because Astro does not export
+runtime helpers for them.
+
+Redis keys now use the `v2` namespace: paths are indexed using Astro's
+`astro-path:` tags. Existing `v1` entries are not reused, so the cache starts
+cold after upgrading. Old entries and indexes expire according to their TTL;
+old `v1:vary:*` metadata has no TTL and may be removed separately.
+The `astro-path:` tag prefix is reserved for path invalidation.
+
 ## Options
 
 ```ts

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,OAAO,CAAC;AAEjD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AAE9D;;GAEG;AACH,wBAAgB,UAAU,CACxB,MAAM,GAAE,yBAA8B,GACrC,mBAAmB,CAAC,yBAAyB,CAAC,CAMhD;AAED,eAAe,UAAU,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,OAAO,CAAC;AAEjD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AAE9D;;GAEG;AACH,wBAAgB,UAAU,CACxB,MAAM,GAAE,yBAA8B,GACrC,mBAAmB,CAAC,yBAAyB,CAAC,CAMhD;eAEc,UAAU"}

package/dist/runtime.d.ts

@@ -64,6 +64,8 @@ interface RedisCacheProviderOptions {
  * Astro cache provider implementation with an explicit shutdown hook.
  */
 interface RedisCacheProvider extends CacheProvider {
+    onRequest: NonNullable<CacheProvider["onRequest"]>;
+    setHeaders: NonNullable<CacheProvider["setHeaders"]>;
     /** Closes the Redis client connection used by the provider instance. */
     close(): Promise<void>;
 }

package/dist/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAM3C,YAAY,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,IAAI,OAAO,EAAE,CAAC;AAIzE;;;GAGG;AACH,eAAO,MAAM,uBAAuB,YAClC,OAAO,EACP,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,SAAS,EACT,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,KAAK,EACL,QAAQ,EACR,OAAO,EACP,KAAK,EACL,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,SAAS,EACT,UAAU,EACV,OAAO,EACP,KAAK,EACL,KAAK,CACG,CAAC;AAEX;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAUD;;GAEG;AACH,UAAU,yBAAyB;IACjC;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC;IAE1C;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,KAAK,CAAC,EAAE,gBAAgB,CAAC;IAEzB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CACvC;AAED;;GAEG;AACH,UAAU,kBAAmB,SAAQ,aAAa;IAChD,wEAAwE;IACxE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAqQD;;GAEG;AACH,iBAAS,wBAAwB,CAC/B,MAAM,GAAE,yBAA8B,GACrC,kBAAkB,CAmUpB"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAa3C,YAAY,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,IAAI,OAAO,EAAE,CAAC;AAKzE;;;GAGG;AACH,eAAO,MAAM,uBAAuB,YAClC,OAAO,EACP,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,SAAS,EACT,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,KAAK,EACL,QAAQ,EACR,OAAO,EACP,KAAK,EACL,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,SAAS,EACT,UAAU,EACV,OAAO,EACP,KAAK,EACL,KAAK,CACG,CAAC;AAEX;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAYD;;GAEG;AACH,UAAU,yBAAyB;IACjC;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC;IAE1C;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,KAAK,CAAC,EAAE,gBAAgB,CAAC;IAEzB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CACvC;AAED;;GAEG;AACH,UAAU,kBAAmB,SAAQ,aAAa;IAChD,SAAS,EAAE,WAAW,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC;IACnD,UAAU,EAAE,WAAW,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC;IACrD,wEAAwE;IACxE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AA2PD;;GAEG;AACH,iBAAS,wBAAwB,CAC/B,MAAM,GAAE,yBAA8B,GACrC,kBAAkB,CAwUpB"}

package/dist/runtime.js

@@ -1,9 +1,11 @@
 import { hash as nodeHash } from "node:crypto";
+import { buildCacheControlDirectives, collectInvalidationTags, normalizeTags, pathTag, setConditionalHeaders, } from "astro/cache/provider-utils";
 import picomatch from "picomatch";
 import { createClient, RESP_TYPES } from "redis";
 import { StoredCacheEntry } from "./schemas.js";
 export { createRedisCacheProvider, createRedisCacheProvider as default };
-const SCHEMA_VERSION = 1;
+// Version 2 uses Astro path tags instead of separate path indexes.
+const SCHEMA_VERSION = 2;
 /**
  * Built-in query parameter patterns excluded from cache keys.
  * @internal
@@ -162,20 +164,14 @@ function buildEntryKey(prefix, cacheKey) {
 function buildVaryKey(prefix, primaryKey) {
     return `${prefix}v${SCHEMA_VERSION}:vary:${hash(primaryKey)}`;
 }
-function buildPathIndexKey(prefix, path) {
-    return `${prefix}v${SCHEMA_VERSION}:idx:path:${hash(path)}`;
-}
 function buildTagIndexKey(prefix, tag) {
     return `${prefix}v${SCHEMA_VERSION}:idx:tag:${hash(tag)}`;
 }
 function buildRevalidateLockKey(prefix, cacheKey) {
     return `${prefix}v${SCHEMA_VERSION}:lock:${hash(cacheKey)}`;
 }
-function warn(message) {
-    console.warn(`[astro:cache:redis] ${message}`);
-}
 function getCacheFreshness(entry) {
-    const ageSeconds = Math.floor((Date.now() - entry.storedAt.getTime()) / 1000);
+    const ageSeconds = (Date.now() - entry.storedAt.getTime()) / 1000;
     if (ageSeconds <= entry.maxAge) {
         return "fresh";
     }
@@ -185,7 +181,7 @@ function getCacheFreshness(entry) {
     return "expired";
 }
 function createResponseFromEntry(entry) {
-    const headers = new Headers(entry.headers);
+    const headers = new Headers([...entry.headers]);
     const body = Buffer.from(entry.body);
     return new Response(body, {
         status: entry.status,
@@ -249,7 +245,7 @@ function createRedisCacheProvider(config = {}) {
         }
     }
     let clientPromise;
-    const getClient = () => {
+    const getClient = (logger = console) => {
         if (clientPromise) {
             return clientPromise;
         }
@@ -259,7 +255,7 @@ function createRedisCacheProvider(config = {}) {
         }
         const client = createClientWithTypeMapping(redisUrl);
         client.on("error", (error) => {
-            warn(`Redis client error: ${String(error)}`);
+            logger.warn(`Redis client error: ${String(error)}`);
         });
         const pending = client
             .connect()
@@ -276,8 +272,7 @@ function createRedisCacheProvider(config = {}) {
         const multi = client.multi();
         multi.del(key);
         if (existing) {
-            multi.sRem(buildPathIndexKey(keyPrefix, existing.path), key);
-            for (const tag of existing.tags) {
+            for (const tag of [pathTag(existing.path), ...existing.tags]) {
                 multi.sRem(buildTagIndexKey(keyPrefix, tag), key);
             }
         }
@@ -296,16 +291,11 @@ function createRedisCacheProvider(config = {}) {
             multi.del(varyKey);
         }
         if (existing) {
-            multi.sRem(buildPathIndexKey(keyPrefix, existing.path), key);
-            for (const tag of existing.tags) {
+            for (const tag of [pathTag(existing.path), ...existing.tags]) {
                 multi.sRem(buildTagIndexKey(keyPrefix, tag), key);
             }
         }
-        const pathIndexKey = buildPathIndexKey(keyPrefix, entry.path);
-        multi.sAdd(pathIndexKey, key);
-        multi.expire(pathIndexKey, ttl, "NX");
-        multi.expire(pathIndexKey, ttl, "GT");
-        for (const tag of entry.tags) {
+        for (const tag of [pathTag(entry.path), ...entry.tags]) {
             const tagIndexKey = buildTagIndexKey(keyPrefix, tag);
             multi.sAdd(tagIndexKey, key);
             multi.expire(tagIndexKey, ttl, "NX");
@@ -317,14 +307,14 @@ function createRedisCacheProvider(config = {}) {
         const raw = await client.get(buildVaryKey(keyPrefix, primaryKey));
         return raw ? decodeVaryHeaders(raw) : undefined;
     };
-    const maybeStoreResponse = async (client, response, request, requestUrl, primaryKey) => {
+    const maybeStoreResponse = async (client, response, request, requestUrl, primaryKey, logger) => {
         const cdnCacheControl = response.headers.get("CDN-Cache-Control");
         const { maxAge, swr } = parseCdnCacheControl(cdnCacheControl);
         if (maxAge <= 0) {
             return false;
         }
         if (response.headers.has("set-cookie")) {
-            warn(`Skipping cache for ${requestUrl.pathname}${requestUrl.search} because response includes Set-Cookie.`);
+            logger.warn(`Skipping cache for ${requestUrl.pathname}${requestUrl.search} because response includes Set-Cookie.`);
             return false;
         }
         const tags = parseCacheTags(response.headers.get("Cache-Tag"));
@@ -334,7 +324,7 @@ function createRedisCacheProvider(config = {}) {
         await storeEntry(client, key, primaryKey, entry);
         return true;
     };
-    const revalidateInBackground = async (client, lockKey, requestUrl, request, primaryKey, next) => {
+    const revalidateInBackground = async (client, lockKey, requestUrl, request, primaryKey, next, logger) => {
         const lock = await client.set(lockKey, "1", {
             NX: true,
             EX: lockTtlSeconds,
@@ -344,10 +334,10 @@ function createRedisCacheProvider(config = {}) {
         }
         try {
             const freshResponse = await next();
-            await maybeStoreResponse(client, freshResponse, request, requestUrl, primaryKey);
+            await maybeStoreResponse(client, freshResponse, request, requestUrl, primaryKey, logger);
         }
         catch (error) {
-            warn(`Background revalidation failed for ${requestUrl.pathname}${requestUrl.search}: ${String(error)}`);
+            logger.warn(`Background revalidation failed for ${requestUrl.pathname}${requestUrl.search}: ${String(error)}`);
         }
         finally {
             try {
@@ -367,6 +357,19 @@ function createRedisCacheProvider(config = {}) {
     };
     return {
         name: "redis",
+        setHeaders(options) {
+            const headers = new Headers();
+            const directives = buildCacheControlDirectives(options);
+            if (directives !== undefined) {
+                headers.set("CDN-Cache-Control", directives);
+            }
+            const tags = normalizeTags(options.tags);
+            if (tags.length > 0) {
+                headers.set("Cache-Tag", tags.join(", "));
+            }
+            setConditionalHeaders(headers, options);
+            return headers;
+        },
         async onRequest(context, next) {
             if (context.request.method !== "GET") {
                 return next();
@@ -375,10 +378,10 @@ function createRedisCacheProvider(config = {}) {
             const primaryKey = getCachePrimaryKey(requestUrl, queryConfig);
             let client;
             try {
-                client = await getClient();
+                client = await getClient(context.logger);
             }
             catch (error) {
-                warn(`Redis is unavailable, bypassing cache: ${String(error)}`);
+                context.logger.warn(`Redis is unavailable, bypassing cache: ${String(error)}`);
                 return next();
             }
             try {
@@ -395,10 +398,9 @@ function createRedisCacheProvider(config = {}) {
                     }
                     if (freshness === "stale") {
                         const lockKey = buildRevalidateLockKey(keyPrefix, lookupKey);
-                        const task = revalidateInBackground(client, lockKey, requestUrl, context.request, primaryKey, next);
-                        const waitUntil = context.waitUntil;
-                        if (typeof waitUntil === "function") {
-                            waitUntil(task);
+                        const task = revalidateInBackground(client, lockKey, requestUrl, context.request, primaryKey, next, context.logger);
+                        if (context.waitUntil) {
+                            context.waitUntil(task);
                         }
                         else {
                             void task;
@@ -410,35 +412,32 @@ function createRedisCacheProvider(config = {}) {
                 }
             }
             catch (error) {
-                warn(`Cache read failed, bypassing cache read path: ${String(error)}`);
+                context.logger.warn(`Cache read failed, bypassing cache read path: ${String(error)}`);
                 return next();
             }
             const response = await next();
             try {
                 const [forCache, forClient] = [response.clone(), response];
-                const stored = await maybeStoreResponse(client, forCache, context.request, requestUrl, primaryKey);
+                const stored = await maybeStoreResponse(client, forCache, context.request, requestUrl, primaryKey, context.logger);
                 if (stored) {
                     forClient.headers.set("X-Astro-Cache", "MISS");
                 }
                 return forClient;
             }
             catch (error) {
-                warn(`Cache write failed, returning uncached response: ${String(error)}`);
+                context.logger.warn(`Cache write failed, returning uncached response: ${String(error)}`);
                 return response;
             }
         },
         async invalidate(options) {
             const client = await getClient();
-            if (options.path) {
-                await invalidateByIndex(client, buildPathIndexKey(keyPrefix, options.path));
-            }
-            if (options.tags) {
-                const tags = Array.isArray(options.tags)
-                    ? options.tags
-                    : [options.tags];
-                for (const tag of tags) {
-                    await invalidateByIndex(client, buildTagIndexKey(keyPrefix, tag));
-                }
+            // Astro's helper appends the path tag, so pass a copy of caller-owned tags.
+            const tags = collectInvalidationTags({
+                ...options,
+                tags: [...normalizeTags(options.tags)],
+            });
+            for (const tag of new Set(tags)) {
+                await invalidateByIndex(client, buildTagIndexKey(keyPrefix, tag));
             }
         },
         async close() {

package/dist/runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC;AAG/C,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGhD,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,IAAI,OAAO,EAAE,CAAC;AAEzE,MAAM,cAAc,GAAG,CAAC,CAAC;AAEzB;;;GAGG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,OAAO;IACP,QAAQ;IACR,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,OAAO;IACP,SAAS;IACT,QAAQ;IACR,WAAW;IACX,QAAQ;IACR,QAAQ;IACR,KAAK;IACL,KAAK;IACL,QAAQ;IACR,OAAO;IACP,KAAK;IACL,aAAa;IACb,YAAY;IACZ,YAAY;IACZ,OAAO;IACP,SAAS;IACT,UAAU;IACV,OAAO;IACP,KAAK;IACL,KAAK;CACG,CAAC;AAgFX,SAAS,2BAA2B,CAAC,GAAuB;IAC1D,OAAO,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,eAAe,CAAC;QAC3C,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,MAAM;KACjC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,oBAAoB,CAAC,MAAqB;IAIjD,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YACnC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;YACpD,SAAS;QACX,CAAC;QACD,IAAI,OAAO,CAAC,UAAU,CAAC,yBAAyB,CAAC,EAAE,CAAC;YAClD,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;AACzB,CAAC;AAED,SAAS,cAAc,CAAC,MAAqB;IAC3C,MAAM,IAAI,GAAG,EAAE,CAAC;IAEhB,IAAI,MAAM,EAAE,CAAC;QACX,KAAK,IAAI,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YAClC,GAAG,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;YACjB,IAAI,GAAG,EAAE,CAAC;gBACR,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACjB,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,eAAe,CACtB,QAAkB,EAClB,kBAAuC;IAEvC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1C,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;QACjC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,IAAI;SACR,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;SAClC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,WAAW,CAAC,OAAgB,EAAE,KAAuB;IAC5D,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;QAChC,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACvD,IAAI,YAAY,KAAK,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YAClD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,eAAe,CAAC,OAAgB,EAAE,WAAqB;IAC9D,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,MAAM,IAAI,WAAW,EAAE,CAAC;QACjC,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;AACjC,CAAC;AAED,SAAS,iBAAiB,CAAC,WAAqB;IAC9C,OAAO,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAW;IACpC,OAAO,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,oBAAoB,CAAC,EAC5B,OAAO,EACP,OAAO,EACP,IAAI,GAAG,IAAI,GACZ,GAAqB,EAAE;IACtB,IAAI,OAAO,IAAI,OAAO,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAC;IACJ,CAAC;IAED,MAAM,eAAe,GAAG,OAAO;QAC7B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,GAAG,uBAAuB,CAAC,CAAC,CAAC;IAC9C,MAAM,cAAc,GAClB,eAAe,CAAC,MAAM,GAAG,CAAC;QACxB,CAAC,CAAC,SAAS,CAAC,eAAe,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,IAAI,CAAC;IAEX,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;AAC5D,CAAC;AAED,SAAS,gBAAgB,CAAC,GAAQ,EAAE,MAAmB;IACrD,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAErD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACxC,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YAC5C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBACtB,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;QAC1B,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YAC5C,IAAI,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC/B,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAChB,MAAM,CAAC,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IACtC,OAAO,WAAW,CAAC,CAAC,CAAC,IAAI,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AAC9C,CAAC;AAED,SAAS,kBAAkB,CAAC,GAAQ,EAAE,WAAwB;IAC5D,OAAO,GAAG,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,QAAQ,GAAG,gBAAgB,CAAC,GAAG,EAAE,WAAW,CAAC,EAAE,CAAC;AAC7E,CAAC;AAED,SAAS,YAAY,CAAC,GAAQ,EAAE,WAAwB;IACtD,OAAO,GAAG,GAAG,CAAC,QAAQ,GAAG,gBAAgB,CAAC,GAAG,EAAE,WAAW,CAAC,EAAE,CAAC;AAChE,CAAC;AAED,SAAS,IAAI,CAAC,KAAa;IACzB,OAAO,QAAQ,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAyB;IACnD,MAAM,MAAM,GAAG,KAAK,EAAE,IAAI,EAAE,IAAI,aAAa,CAAC;IAC9C,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,CAAC;AACtD,CAAC;AAED,SAAS,aAAa,CAAC,MAAc,EAAE,QAAgB;IACrD,OAAO,GAAG,MAAM,IAAI,cAAc,UAAU,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;AAC/D,CAAC;AAED,SAAS,YAAY,CAAC,MAAc,EAAE,UAAkB;IACtD,OAAO,GAAG,MAAM,IAAI,cAAc,SAAS,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;AAChE,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAc,EAAE,IAAY;IACrD,OAAO,GAAG,MAAM,IAAI,cAAc,aAAa,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;AAC9D,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAc,EAAE,GAAW;IACnD,OAAO,GAAG,MAAM,IAAI,cAAc,YAAY,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AAC5D,CAAC;AAED,SAAS,sBAAsB,CAAC,MAAc,EAAE,QAAgB;IAC9D,OAAO,GAAG,MAAM,IAAI,cAAc,SAAS,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;AAC9D,CAAC;AAED,SAAS,IAAI,CAAC,OAAe;IAC3B,OAAO,CAAC,IAAI,CAAC,uBAAuB,OAAO,EAAE,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,iBAAiB,CACxB,KAAuB;IAEvB,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;IAC9E,IAAI,UAAU,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QAC/B,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,IAAI,UAAU,IAAI,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;QAC3C,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAuB;IACtD,MAAM,OAAO,GAAG,IAAI,OAAO,CACzB,KAAK,CAAC,OAA4C,CACnD,CAAC;IACF,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACrC,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE;QACxB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,OAAO;KACR,CAAC,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,GAAkB;IAC1C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC;QACH,OAAO,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACtC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,QAAkB,EAClB,OAAgB,EAChB,IAAY,EACZ,MAAc,EACd,GAAW,EACX,IAAc,EACd,kBAAuC;IAEvC,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC;IAChD,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC;IAE7C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;IAC1B,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QACtC,IAAI,GAAG,CAAC,WAAW,EAAE,KAAK,YAAY,EAAE,CAAC;YACvC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,eAAe,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;IAC3D,MAAM,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;IAC7B,KAAK,MAAM,MAAM,IAAI,IAAI,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAChD,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,OAAO;QACL,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,OAAO;QACP,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,IAAI,IAAI,EAAE;QACpB,MAAM;QACN,GAAG;QACH,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI;QACJ,IAAI;QACJ,UAAU;KACX,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,wBAAwB,CAC/B,MAAM,GAA8B,EAAE;IAEtC,MAAM,SAAS,GAAG,kBAAkB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,oBAAoB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACxD,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,iBAAiB,IAAI,EAAE,CAAC,CAAC;IACpE,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnD,MAAM,uBAAuB,GAAG,MAAM,EAAE,kBAAkB,CAAC;IAC3D,IAAI,uBAAuB,EAAE,CAAC;QAC5B,KAAK,MAAM,MAAM,IAAI,uBAAuB,EAAE,CAAC;YAC7C,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,iBAAiB,EAAE,CAAC;YACrD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1B,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACrC,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,aAA+C,CAAC;IAEpD,MAAM,SAAS,GAAG,GAAyB,EAAE;QAC3C,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,aAAa,CAAC;QACvB,CAAC;QAED,IAAI,QAAQ,GAAG,MAAM,EAAE,GAAG,CAAC;QAC3B,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE,CAAC;YACnC,QAAQ,GAAG,QAAQ,EAAE,CAAC;QACxB,CAAC;QAED,MAAM,MAAM,GAAG,2BAA2B,CAAC,QAAQ,CAAC,CAAC;QACrD,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC3B,IAAI,CAAC,uBAAuB,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,MAAM;aACnB,OAAO,EAAE;aACT,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;aAClB,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACf,aAAa,GAAG,SAAS,CAAC;YAC1B,MAAM,KAAK,CAAC;QACd,CAAC,CAAC,CAAC;QACL,aAAa,GAAG,OAAO,CAAC;QAExB,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,KAAK,EACvB,MAAmB,EACnB,GAAW,EACI,EAAE;QACjB,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACzD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;QAC7B,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEf,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;YAC7D,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAChC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;QAED,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,KAAK,EACtB,MAAmB,EACnB,GAAW,EACX,UAAkB,EAClB,KAAuB,EACR,EAAE;QACjB,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACzD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7D,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;QAE7B,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QACzE,MAAM,OAAO,GAAG,YAAY,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QACpD,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACtB,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACrB,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;YAC7D,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAChC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;QAED,MAAM,YAAY,GAAG,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9D,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QAC9B,KAAK,CAAC,MAAM,CAAC,YAAY,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QACtC,KAAK,CAAC,MAAM,CAAC,YAAY,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QACtC,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YAC7B,MAAM,WAAW,GAAG,gBAAgB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;YACrD,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;YAC7B,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YACrC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QACvC,CAAC;QAED,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC,CAAC;IAEF,MAAM,oBAAoB,GAAG,KAAK,EAChC,MAAmB,EACnB,UAAkB,EACa,EAAE;QACjC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;QAClE,OAAO,GAAG,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAClD,CAAC,CAAC;IAEF,MAAM,kBAAkB,GAAG,KAAK,EAC9B,MAAmB,EACnB,QAAkB,EAClB,OAAgB,EAChB,UAAe,EACf,UAAkB,EACA,EAAE;QACpB,MAAM,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAClE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,oBAAoB,CAAC,eAAe,CAAC,CAAC;QAC9D,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC;YAChB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;YACvC,IAAI,CACF,sBAAsB,UAAU,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,wCAAwC,CACtG,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,IAAI,GAAG,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;QAC/D,MAAM,KAAK,GAAG,MAAM,iBAAiB,CACnC,QAAQ,EACR,OAAO,EACP,YAAY,CAAC,UAAU,EAAE,WAAW,CAAC,EACrC,MAAM,EACN,GAAG,EACH,IAAI,EACJ,kBAAkB,CACnB,CAAC;QAEF,MAAM,GAAG,GAAG,aAAa,CACvB,SAAS,EACT,UAAU;YACR,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAClE,CAAC;QACF,MAAM,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QAEjD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,MAAM,sBAAsB,GAAG,KAAK,EAClC,MAAmB,EACnB,OAAe,EACf,UAAe,EACf,OAAgB,EAChB,UAAkB,EAClB,IAA6B,EACd,EAAE;QACjB,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE;YAC1C,EAAE,EAAE,IAAI;YACR,EAAE,EAAE,cAAc;SACnB,CAAC,CAAC;QACH,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,MAAM,IAAI,EAAE,CAAC;YACnC,MAAM,kBAAkB,CACtB,MAAM,EACN,aAAa,EACb,OAAO,EACP,UAAU,EACV,UAAU,CACX,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CACF,sCAAsC,UAAU,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,KAAK,MAAM,CAAC,KAAK,CAAC,EAAE,CAClG,CAAC;QACJ,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC5B,CAAC;YAAC,MAAM,CAAC;gBACP,wDAAwD;YAC1D,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,iBAAiB,GAAG,KAAK,EAC7B,MAAmB,EACnB,QAAgB,EACD,EAAE;QACjB,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC7C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QAClD,CAAC;QACD,MAAM,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC,CAAC;IAEF,OAAO;QACL,IAAI,EAAE,OAAO;QACb,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI;YAC3B,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;gBACrC,OAAO,IAAI,EAAE,CAAC;YAChB,CAAC;YAED,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAChD,MAAM,UAAU,GAAG,kBAAkB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;YAE/D,IAAI,MAAmB,CAAC;YACxB,IAAI,CAAC;gBACH,MAAM,GAAG,MAAM,SAAS,EAAE,CAAC;YAC7B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,0CAA0C,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAChE,OAAO,IAAI,EAAE,CAAC;YAChB,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;gBACjE,MAAM,SAAS,GAAG,aAAa,CAC7B,SAAS,EACT,UAAU;oBACR,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CACjE,CAAC;gBAEF,MAAM,WAAW,GAAG,gBAAgB,CAAC,MAAM,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;gBAClE,IAAI,WAAW,IAAI,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC;oBAC7D,MAAM,SAAS,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;oBAEjD,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;wBAC1B,MAAM,QAAQ,GAAG,uBAAuB,CAAC,WAAW,CAAC,CAAC;wBACtD,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;wBAC7C,OAAO,QAAQ,CAAC;oBAClB,CAAC;oBAED,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;wBAC1B,MAAM,OAAO,GAAG,sBAAsB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;wBAC7D,MAAM,IAAI,GAAG,sBAAsB,CACjC,MAAM,EACN,OAAO,EACP,UAAU,EACV,OAAO,CAAC,OAAO,EACf,UAAU,EACV,IAAI,CACL,CAAC;wBAEF,MAAM,SAAS,GACb,OAGD,CAAC,SAAS,CAAC;wBAEZ,IAAI,OAAO,SAAS,KAAK,UAAU,EAAE,CAAC;4BACpC,SAAS,CAAC,IAAI,CAAC,CAAC;wBAClB,CAAC;6BAAM,CAAC;4BACN,KAAK,IAAI,CAAC;wBACZ,CAAC;wBAED,MAAM,QAAQ,GAAG,uBAAuB,CAAC,WAAW,CAAC,CAAC;wBACtD,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;wBAC/C,OAAO,QAAQ,CAAC;oBAClB,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,iDAAiD,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACvE,OAAO,IAAI,EAAE,CAAC;YAChB,CAAC;YAED,MAAM,QAAQ,GAAG,MAAM,IAAI,EAAE,CAAC;YAC9B,IAAI,CAAC;gBACH,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,QAAQ,CAAC,CAAC;gBAC3D,MAAM,MAAM,GAAG,MAAM,kBAAkB,CACrC,MAAM,EACN,QAAQ,EACR,OAAO,CAAC,OAAO,EACf,UAAU,EACV,UAAU,CACX,CAAC;gBACF,IAAI,MAAM,EAAE,CAAC;oBACX,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;gBACjD,CAAC;gBACD,OAAO,SAAS,CAAC;YACnB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CACF,oDAAoD,MAAM,CAAC,KAAK,CAAC,EAAE,CACpE,CAAC;gBACF,OAAO,QAAQ,CAAC;YAClB,CAAC;QACH,CAAC;QACD,KAAK,CAAC,UAAU,CAAC,OAAO;YACtB,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAC;YAEjC,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;gBACjB,MAAM,iBAAiB,CACrB,MAAM,EACN,iBAAiB,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAC3C,CAAC;YACJ,CAAC;YAED,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;gBACjB,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;oBACtC,CAAC,CAAC,OAAO,CAAC,IAAI;oBACd,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACnB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;oBACvB,MAAM,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC;gBACpE,CAAC;YACH,CAAC;QACH,CAAC;QACD,KAAK,CAAC,KAAK;YACT,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,OAAO;YACT,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC;gBACnC,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACvB,CAAC;YAAC,MAAM,CAAC;gBACP,oEAAoE;YACtE,CAAC;oBAAS,CAAC;gBACT,aAAa,GAAG,SAAS,CAAC;YAC5B,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agrodt/astro-redis-cache-provider",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Redis cache provider for Astro route caching using node-redis.",
   "keywords": [
     "astro",
@@ -46,25 +46,25 @@
   },
   "dependencies": {
     "bebop": "^3.2.3",
-    "picomatch": "^4.0.4",
-    "redis": "^5.11.0"
+    "picomatch": "^4.0.7",
+    "redis": "^6.2.1"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.4.11",
-    "@types/node": "^25.6.0",
+    "@biomejs/biome": "^2.5.13",
+    "@types/node": "^26.5.1",
     "@types/picomatch": "^4.0.3",
-    "@typescript/native-preview": "7.0.0-dev.20260410.1",
-    "astro": "^6.1.5"
+    "astro": "^7.3.2",
+    "typescript": "7.0.2"
   },
   "peerDependencies": {
-    "astro": "^6.1"
+    "astro": "^7.3"
   },
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
-    "build": "tsgo -p tsconfig.json",
-    "check": "tsgo -p tsconfig.json --noEmit",
+    "build": "tsc -p tsconfig.json",
+    "check": "tsc -p tsconfig.json --noEmit",
     "docs:build": "pnpm dlx --package typedoc-github-theme typedoc --plugin typedoc-github-theme",
     "format": "biome format",
     "format:fix": "biome format --fix",

package/src/runtime.ts

@@ -1,6 +1,13 @@
 import { hash as nodeHash } from "node:crypto";
 
 import type { CacheProvider } from "astro";
+import {
+  buildCacheControlDirectives,
+  collectInvalidationTags,
+  normalizeTags,
+  pathTag,
+  setConditionalHeaders,
+} from "astro/cache/provider-utils";
 import picomatch from "picomatch";
 import { createClient, RESP_TYPES } from "redis";
 
@@ -9,7 +16,8 @@ import { StoredCacheEntry } from "./schemas.js";
 export type { RedisCacheProvider, RedisCacheProviderOptions };
 export { createRedisCacheProvider, createRedisCacheProvider as default };
 
-const SCHEMA_VERSION = 1;
+// Version 2 uses Astro path tags instead of separate path indexes.
+const SCHEMA_VERSION = 2;
 
 /**
  * Built-in query parameter patterns excluded from cache keys.
@@ -74,6 +82,8 @@ interface QueryConfig {
   sort: boolean;
 }
 
+type RequestContext = Parameters<NonNullable<CacheProvider["onRequest"]>>[0];
+
 type RedisClient = ReturnType<typeof createClientWithTypeMapping>;
 
 /**
@@ -117,6 +127,8 @@ interface RedisCacheProviderOptions {
  * Astro cache provider implementation with an explicit shutdown hook.
  */
 interface RedisCacheProvider extends CacheProvider {
+  onRequest: NonNullable<CacheProvider["onRequest"]>;
+  setHeaders: NonNullable<CacheProvider["setHeaders"]>;
   /** Closes the Redis client connection used by the provider instance. */
   close(): Promise<void>;
 }
@@ -288,10 +300,6 @@ function buildVaryKey(prefix: string, primaryKey: string): string {
   return `${prefix}v${SCHEMA_VERSION}:vary:${hash(primaryKey)}`;
 }
 
-function buildPathIndexKey(prefix: string, path: string): string {
-  return `${prefix}v${SCHEMA_VERSION}:idx:path:${hash(path)}`;
-}
-
 function buildTagIndexKey(prefix: string, tag: string): string {
   return `${prefix}v${SCHEMA_VERSION}:idx:tag:${hash(tag)}`;
 }
@@ -300,14 +308,10 @@ function buildRevalidateLockKey(prefix: string, cacheKey: string): string {
   return `${prefix}v${SCHEMA_VERSION}:lock:${hash(cacheKey)}`;
 }
 
-function warn(message: string): void {
-  console.warn(`[astro:cache:redis] ${message}`);
-}
-
 function getCacheFreshness(
   entry: StoredCacheEntry,
 ): "fresh" | "stale" | "expired" {
-  const ageSeconds = Math.floor((Date.now() - entry.storedAt.getTime()) / 1000);
+  const ageSeconds = (Date.now() - entry.storedAt.getTime()) / 1000;
   if (ageSeconds <= entry.maxAge) {
     return "fresh";
   }
@@ -318,9 +322,7 @@ function getCacheFreshness(
 }
 
 function createResponseFromEntry(entry: StoredCacheEntry): Response {
-  const headers = new Headers(
-    entry.headers as unknown as Record<string, string>,
-  );
+  const headers = new Headers([...entry.headers]);
   const body = Buffer.from(entry.body);
   return new Response(body, {
     status: entry.status,
@@ -403,7 +405,9 @@ function createRedisCacheProvider(
 
   let clientPromise: Promise<RedisClient> | undefined;
 
-  const getClient = (): Promise<RedisClient> => {
+  const getClient = (
+    logger: Pick<RequestContext["logger"], "warn"> = console,
+  ): Promise<RedisClient> => {
     if (clientPromise) {
       return clientPromise;
     }
@@ -415,7 +419,7 @@ function createRedisCacheProvider(
 
     const client = createClientWithTypeMapping(redisUrl);
     client.on("error", (error) => {
-      warn(`Redis client error: ${String(error)}`);
+      logger.warn(`Redis client error: ${String(error)}`);
     });
 
     const pending = client
@@ -439,8 +443,7 @@ function createRedisCacheProvider(
     multi.del(key);
 
     if (existing) {
-      multi.sRem(buildPathIndexKey(keyPrefix, existing.path), key);
-      for (const tag of existing.tags) {
+      for (const tag of [pathTag(existing.path), ...existing.tags]) {
         multi.sRem(buildTagIndexKey(keyPrefix, tag), key);
       }
     }
@@ -467,17 +470,12 @@ function createRedisCacheProvider(
     }
 
     if (existing) {
-      multi.sRem(buildPathIndexKey(keyPrefix, existing.path), key);
-      for (const tag of existing.tags) {
+      for (const tag of [pathTag(existing.path), ...existing.tags]) {
         multi.sRem(buildTagIndexKey(keyPrefix, tag), key);
       }
     }
 
-    const pathIndexKey = buildPathIndexKey(keyPrefix, entry.path);
-    multi.sAdd(pathIndexKey, key);
-    multi.expire(pathIndexKey, ttl, "NX");
-    multi.expire(pathIndexKey, ttl, "GT");
-    for (const tag of entry.tags) {
+    for (const tag of [pathTag(entry.path), ...entry.tags]) {
       const tagIndexKey = buildTagIndexKey(keyPrefix, tag);
       multi.sAdd(tagIndexKey, key);
       multi.expire(tagIndexKey, ttl, "NX");
@@ -501,6 +499,7 @@ function createRedisCacheProvider(
     request: Request,
     requestUrl: URL,
     primaryKey: string,
+    logger: RequestContext["logger"],
   ): Promise<boolean> => {
     const cdnCacheControl = response.headers.get("CDN-Cache-Control");
     const { maxAge, swr } = parseCdnCacheControl(cdnCacheControl);
@@ -509,7 +508,7 @@ function createRedisCacheProvider(
     }
 
     if (response.headers.has("set-cookie")) {
-      warn(
+      logger.warn(
         `Skipping cache for ${requestUrl.pathname}${requestUrl.search} because response includes Set-Cookie.`,
       );
       return false;
@@ -543,6 +542,7 @@ function createRedisCacheProvider(
     request: Request,
     primaryKey: string,
     next: () => Promise<Response>,
+    logger: RequestContext["logger"],
   ): Promise<void> => {
     const lock = await client.set(lockKey, "1", {
       NX: true,
@@ -560,9 +560,10 @@ function createRedisCacheProvider(
         request,
         requestUrl,
         primaryKey,
+        logger,
       );
     } catch (error) {
-      warn(
+      logger.warn(
         `Background revalidation failed for ${requestUrl.pathname}${requestUrl.search}: ${String(error)}`,
       );
     } finally {
@@ -587,6 +588,19 @@ function createRedisCacheProvider(
 
   return {
     name: "redis",
+    setHeaders(options) {
+      const headers = new Headers();
+      const directives = buildCacheControlDirectives(options);
+      if (directives !== undefined) {
+        headers.set("CDN-Cache-Control", directives);
+      }
+      const tags = normalizeTags(options.tags);
+      if (tags.length > 0) {
+        headers.set("Cache-Tag", tags.join(", "));
+      }
+      setConditionalHeaders(headers, options);
+      return headers;
+    },
     async onRequest(context, next) {
       if (context.request.method !== "GET") {
         return next();
@@ -597,9 +611,11 @@ function createRedisCacheProvider(
 
       let client: RedisClient;
       try {
-        client = await getClient();
+        client = await getClient(context.logger);
       } catch (error) {
-        warn(`Redis is unavailable, bypassing cache: ${String(error)}`);
+        context.logger.warn(
+          `Redis is unavailable, bypassing cache: ${String(error)}`,
+        );
         return next();
       }
 
@@ -630,16 +646,11 @@ function createRedisCacheProvider(
               context.request,
               primaryKey,
               next,
+              context.logger,
             );
 
-            const waitUntil = (
-              context as {
-                waitUntil?: (promise: Promise<unknown>) => void;
-              }
-            ).waitUntil;
-
-            if (typeof waitUntil === "function") {
-              waitUntil(task);
+            if (context.waitUntil) {
+              context.waitUntil(task);
             } else {
               void task;
             }
@@ -650,7 +661,9 @@ function createRedisCacheProvider(
           }
         }
       } catch (error) {
-        warn(`Cache read failed, bypassing cache read path: ${String(error)}`);
+        context.logger.warn(
+          `Cache read failed, bypassing cache read path: ${String(error)}`,
+        );
         return next();
       }
 
@@ -663,13 +676,14 @@ function createRedisCacheProvider(
           context.request,
           requestUrl,
           primaryKey,
+          context.logger,
         );
         if (stored) {
           forClient.headers.set("X-Astro-Cache", "MISS");
         }
         return forClient;
       } catch (error) {
-        warn(
+        context.logger.warn(
           `Cache write failed, returning uncached response: ${String(error)}`,
         );
         return response;
@@ -678,20 +692,13 @@ function createRedisCacheProvider(
     async invalidate(options) {
       const client = await getClient();
 
-      if (options.path) {
-        await invalidateByIndex(
-          client,
-          buildPathIndexKey(keyPrefix, options.path),
-        );
-      }
-
-      if (options.tags) {
-        const tags = Array.isArray(options.tags)
-          ? options.tags
-          : [options.tags];
-        for (const tag of tags) {
-          await invalidateByIndex(client, buildTagIndexKey(keyPrefix, tag));
-        }
+      // Astro's helper appends the path tag, so pass a copy of caller-owned tags.
+      const tags = collectInvalidationTags({
+        ...options,
+        tags: [...normalizeTags(options.tags)],
+      });
+      for (const tag of new Set(tags)) {
+        await invalidateByIndex(client, buildTagIndexKey(keyPrefix, tag));
       }
     },
     async close() {