strapi-cache 1.10.0 → 1.11.0

package/README.md

@@ -72,7 +72,7 @@ Full configuration example:
     size: 1024 * 1024 * 1024, // Maximum size of the cache (1 GB) (only for memory cache)
     allowStale: false, // Allow stale cache items (only for memory cache)
     cacheableRoutes: ['/api/products', '/api/categories'], // Caches routes which start with these paths (if empty array, all '/api' routes are cached)
-    keyGenerator: (ctx) => `${ctx.request.method}:${ctx.request.url}`, // Optional custom cache key for REST requests; receives koa ctx
+    // keyGenerator: (ctx) => `${ctx.request.method}:${ctx.request.url}`, // (Optional) custom cache key for REST + GraphQL requests; receives koa ctx
     // cacheableEntities: ['products', 'categories'], // (Optional) Specify which entities to cache. When set, only these entities will be cached (ignores cacheableRoutes). If not set (undefined), cacheableRoutes logic is used
     excludeRoutes: ['/api/products/private'], // Exclude routes which start with these paths from being cached (takes precedence over cacheableRoutes). **Note:** `excludeRoutes` takes precedence over `cacheableRoutes`.
     provider: 'memory', // Cache provider ('memory', 'redis' or 'valkey')
@@ -88,7 +88,7 @@ Full configuration example:
     autoPurgeGraphQL: true, // Automatically purge GraphQL cache on content CRUD operations
     autoPurgeCacheOnStart: true, // Automatically purge cache on Strapi startup
     disableAdminPopups: false, // Disable popups in the admin panel
-    disableAdminButtons: false, // Disable the purge cache buttons in the admin panel (list view and edit view)
+    disableAdminButtons: false, // Disable the purge cache buttons in the admin panel. Use true for all content types or an array like ['/api/products'] for specific content types
   },
 },
 ```
@@ -97,32 +97,32 @@ Full configuration example:
 
 Possible configuration keys are listed below; omitted keys keep the plugin defaults.
 
-| Key                       | Description                                                                                                                   | Possible values                                                                                                               |
-| ------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
-| `debug`                   | Log cache decisions and operations to the server console                                                                      | `true` or `false` (default: `false`)                                                                                          |
-| `provider`                | Where entries are stored                                                                                                      | `'memory'`, `'redis'`, or `'valkey'` (default: `'memory'`)                                                                    |
-| `redisConfig`             | Redis/Valkey connection: URL string or client options passed to ioredis/iovalkey                                              | String or object; **required** when `provider` is `'redis'` or `'valkey'`. Default: value of `REDIS_URL` from the environment |
-| `redisClusterNodes`       | Seed nodes for Redis cluster mode; non-empty list switches to a cluster client                                                | Array of `{ host: string, port: number }` (default: `[]`)                                                                     |
-| `redisClusterOptions`     | Options for the cluster client (e.g. `scaleReads`); `redisOptions` often come from `redisConfig`                              | Object (default: `{}`)                                                                                                        |
-| `redisScanDeleteCount`    | `COUNT` hint for `SCAN` when purging keys (Redis/Valkey)                                                                      | Positive number (default: `100`)                                                                                              |
-| `max`                     | Maximum number of entries (in-memory provider only)                                                                           | Positive integer (default: `1000`)                                                                                            |
-| `ttl`                     | Time-to-live for each entry, in milliseconds                                                                                  | Non-negative number (default: `3600000`, i.e. 1 hour)                                                                         |
-| `size`                    | Approximate max total size in bytes (in-memory provider only)                                                                 | Positive integer (default: `10485760`, i.e. 10 MB)                                                                            |
-| `allowStale`              | Whether stale entries may be returned (in-memory provider only)                                                               | `true` or `false` (default: `false`)                                                                                          |
-| `cacheableRoutes`         | Only URLs starting with one of these paths are cached; if empty, every URL under the REST API prefix matches                  | Array of path prefix strings (default: `[]` meaning “all API routes”)                                                         |
-| `keyGenerator`            | Custom function to build REST cache keys; receives Koa `ctx`; when omitted, default key is `${method}:${url}`                 | Function `(ctx) => string` (default: unset)                                                                                   |
-| `cacheableEntities`       | If non-empty, only these API “entity” segments are cached; **when set, this drives eligibility instead of** `cacheableRoutes` | Array of strings (e.g. collection/table names), or omit / leave empty to use `cacheableRoutes`                                |
-| `excludeRoutes`           | URLs starting with any of these prefixes are **never** cached; evaluated before `cacheableRoutes` / entities                  | Array of path prefix strings (default: `[]`)                                                                                  |
-| `cacheHeaders`            | Store and replay response headers with the body                                                                               | `true` or `false` (default: `true`)                                                                                           |
-| `cacheHeadersDenyList`    | Header names (lowercase) to strip when `cacheHeaders` is `true`                                                               | Array of strings (default: `[]`)                                                                                              |
-| `cacheHeadersAllowList`   | If non-empty, only these header names (lowercase) are stored; if empty, all headers are stored (subject to deny list)         | Array of strings (default: `[]`)                                                                                              |
-| `cacheAuthorizedRequests` | Whether to cache requests that include an `Authorization` header                                                              | `true` or `false` (default: `false`)                                                                                          |
-| `cacheGetTimeoutInMs`     | Max time to wait for a cache read before treating it as a miss                                                                | Milliseconds (default: `1000`)                                                                                                |
-| `autoPurgeCache`          | Invalidate relevant REST cache entries after content create/update/delete                                                     | `true` or `false` (default: `true`)                                                                                           |
-| `autoPurgeGraphQL`        | Invalidate GraphQL cache after content create/update/delete                                                                   | `true` or `false` (default: `false` if omitted; set `true` to enable)                                                         |
-| `autoPurgeCacheOnStart`   | Clear the cache when Strapi starts                                                                                            | `true` or `false` (default: `true`)                                                                                           |
-| `disableAdminPopups`      | Turn off admin UI notifications for cache actions                                                                             | `true` or `false` (default: `false`)                                                                                          |
-| `disableAdminButtons`     | Hide manual purge controls in the admin (list and edit views)                                                                 | `true` or `false` (default: `false`)                                                                                          |
+| Key                       | Description                                                                                                                                                                                                                                     | Possible values                                                                                                               |
+| ------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `debug`                   | Log cache decisions and operations to the server console                                                                                                                                                                                        | `true` or `false` (default: `false`)                                                                                          |
+| `provider`                | Where entries are stored                                                                                                                                                                                                                        | `'memory'`, `'redis'`, or `'valkey'` (default: `'memory'`)                                                                    |
+| `redisConfig`             | Redis/Valkey connection: URL string or client options passed to ioredis/iovalkey                                                                                                                                                                | String or object; **required** when `provider` is `'redis'` or `'valkey'`. Default: value of `REDIS_URL` from the environment |
+| `redisClusterNodes`       | Seed nodes for Redis cluster mode; non-empty list switches to a cluster client                                                                                                                                                                  | Array of `{ host: string, port: number }` (default: `[]`)                                                                     |
+| `redisClusterOptions`     | Options for the cluster client (e.g. `scaleReads`); `redisOptions` often come from `redisConfig`                                                                                                                                                | Object (default: `{}`)                                                                                                        |
+| `redisScanDeleteCount`    | `COUNT` hint for `SCAN` when purging keys (Redis/Valkey)                                                                                                                                                                                        | Positive number (default: `100`)                                                                                              |
+| `max`                     | Maximum number of entries (in-memory provider only)                                                                                                                                                                                             | Positive integer (default: `1000`)                                                                                            |
+| `ttl`                     | Time-to-live for each entry, in milliseconds                                                                                                                                                                                                    | Non-negative number (default: `3600000`, i.e. 1 hour)                                                                         |
+| `size`                    | Approximate max total size in bytes (in-memory provider only)                                                                                                                                                                                   | Positive integer (default: `10485760`, i.e. 10 MB)                                                                            |
+| `allowStale`              | Whether stale entries may be returned (in-memory provider only)                                                                                                                                                                                 | `true` or `false` (default: `false`)                                                                                          |
+| `cacheableRoutes`         | Only URLs starting with one of these paths are cached; if empty, every URL under the REST API prefix matches                                                                                                                                    | Array of path prefix strings (default: `[]` meaning “all API routes”)                                                         |
+| `keyGenerator`            | Custom function to build REST cache keys; receives Koa `ctx`; when omitted, default key is `${method}:${url}`; for graphql, if set, the ctx gets additional fields: `rootFields` and `operationName` which may be useful for invalidation logic | Function `(ctx) => string` (default: unset)                                                                                   |
+| `cacheableEntities`       | If non-empty, only these API “entity” segments are cached; **when set, this drives eligibility instead of** `cacheableRoutes`                                                                                                                   | Array of strings (e.g. collection/table names), or omit / leave empty to use `cacheableRoutes`                                |
+| `excludeRoutes`           | URLs starting with any of these prefixes are **never** cached; evaluated before `cacheableRoutes` / entities                                                                                                                                    | Array of path prefix strings (default: `[]`)                                                                                  |
+| `cacheHeaders`            | Store and replay response headers with the body                                                                                                                                                                                                 | `true` or `false` (default: `true`)                                                                                           |
+| `cacheHeadersDenyList`    | Header names (lowercase) to strip when `cacheHeaders` is `true`                                                                                                                                                                                 | Array of strings (default: `[]`)                                                                                              |
+| `cacheHeadersAllowList`   | If non-empty, only these header names (lowercase) are stored; if empty, all headers are stored (subject to deny list)                                                                                                                           | Array of strings (default: `[]`)                                                                                              |
+| `cacheAuthorizedRequests` | Whether to cache requests that include an `Authorization` header                                                                                                                                                                                | `true` or `false` (default: `false`)                                                                                          |
+| `cacheGetTimeoutInMs`     | Max time to wait for a cache read before treating it as a miss                                                                                                                                                                                  | Milliseconds (default: `1000`)                                                                                                |
+| `autoPurgeCache`          | Invalidate relevant REST cache entries after content create/update/delete                                                                                                                                                                       | `true` or `false` (default: `true`)                                                                                           |
+| `autoPurgeGraphQL`        | Invalidate GraphQL cache after content create/update/delete                                                                                                                                                                                     | `true` or `false` (default: `false` if omitted; set `true` to enable)                                                         |
+| `autoPurgeCacheOnStart`   | Clear the cache when Strapi starts                                                                                                                                                                                                              | `true` or `false` (default: `true`)                                                                                           |
+| `disableAdminPopups`      | Turn off admin UI notifications for cache actions                                                                                                                                                                                               | `true` or `false` (default: `false`)                                                                                          |
+| `disableAdminButtons`     | Hide manual purge controls in the admin (list and edit views), either globally or for specific REST content type paths                                                                                                                          | `true`, `false`, or an array of paths such as `['/api/products', '/api/tags']` (default: `false`)                              |
 
 ## 🔍 Routes
 

package/dist/_chunks/{index-Bdo3ZcJs.js → index-BI_IgcrO.js}

@@ -4,7 +4,7 @@ const jsxRuntime = require("react/jsx-runtime");
 const designSystem = require("@strapi/design-system");
 const reactIntl = require("react-intl");
 const admin = require("@strapi/strapi/admin");
-const index = require("./index-EMYe2zF8.js");
+const index = require("./index-CvGwTcIJ.js");
 const react = require("react");
 const SettingsPage = () => {
   const { formatMessage } = reactIntl.useIntl();

package/dist/_chunks/{index-BovuTRdq.mjs → index-CYg363QI.mjs}

@@ -296,12 +296,42 @@ function PurgeModal({
     ] })
   ] });
 }
+const stripTrailingSlashes = (path) => {
+  let end = path.length;
+  while (end > 1 && path[end - 1] === "/") {
+    end--;
+  }
+  return path.slice(0, end);
+};
+const normalizeApiPath = (path) => {
+  const trimmedPath = path.trim();
+  const pathWithLeadingSlash = trimmedPath.startsWith("/") ? trimmedPath : `/${trimmedPath}`;
+  return stripTrailingSlashes(pathWithLeadingSlash);
+};
+const getContentTypeApiPath = (contentType, isSingleType = false) => {
+  const useSingleName = isSingleType || contentType?.kind === "singleType";
+  const apiPath = useSingleName ? contentType?.info?.singularName ?? contentType?.apiID : contentType?.info?.pluralName ?? contentType?.apiID;
+  return apiPath ? normalizeApiPath(`/api/${apiPath}`) : void 0;
+};
+const shouldDisableAdminButtons = (disableAdminButtons, contentTypeApiPath) => {
+  if (typeof disableAdminButtons === "boolean") {
+    return disableAdminButtons;
+  }
+  if (!Array.isArray(disableAdminButtons) || !contentTypeApiPath) {
+    return false;
+  }
+  const normalizedContentTypeApiPath = normalizeApiPath(contentTypeApiPath);
+  return disableAdminButtons.some(
+    (apiPath) => normalizeApiPath(apiPath) === normalizedContentTypeApiPath
+  );
+};
 function PurgeCacheButton() {
   const { contentType } = unstable_useContentManagerContext();
   const { formatMessage } = useIntl();
   const { config } = useCacheConfig();
   const keyToUse = contentType?.info.pluralName;
-  if (config?.disableAdminButtons) {
+  const contentTypeApiPath = getContentTypeApiPath(contentType);
+  if (shouldDisableAdminButtons(config?.disableAdminButtons, contentTypeApiPath)) {
     return null;
   }
   return /* @__PURE__ */ jsx(
@@ -320,10 +350,11 @@ function PurgeEntityButton() {
   const { id, isSingleType, contentType } = unstable_useContentManagerContext();
   const { config } = useCacheConfig();
   const apiPath = isSingleType ? contentType?.info.singularName : id;
+  const contentTypeApiPath = getContentTypeApiPath(contentType, isSingleType);
   if (!apiPath) {
     return null;
   }
-  if (config?.disableAdminButtons) {
+  if (shouldDisableAdminButtons(config?.disableAdminButtons, contentTypeApiPath)) {
     return null;
   }
   const keyToUse = encodeURIComponent(apiPath);
@@ -373,7 +404,7 @@ const index = {
           },
           id: "settings",
           to: `${PLUGIN_ID}/settings`,
-          Component: () => import("./index-DLoQ9I8J.mjs"),
+          Component: () => import("./index-Dlr_QM4N.mjs"),
           permissions: pluginPermissions.viewSettings
         }
       ]

package/dist/_chunks/{index-EMYe2zF8.js → index-CvGwTcIJ.js}

@@ -297,12 +297,42 @@ function PurgeModal({
     ] })
   ] });
 }
+const stripTrailingSlashes = (path) => {
+  let end = path.length;
+  while (end > 1 && path[end - 1] === "/") {
+    end--;
+  }
+  return path.slice(0, end);
+};
+const normalizeApiPath = (path) => {
+  const trimmedPath = path.trim();
+  const pathWithLeadingSlash = trimmedPath.startsWith("/") ? trimmedPath : `/${trimmedPath}`;
+  return stripTrailingSlashes(pathWithLeadingSlash);
+};
+const getContentTypeApiPath = (contentType, isSingleType = false) => {
+  const useSingleName = isSingleType || contentType?.kind === "singleType";
+  const apiPath = useSingleName ? contentType?.info?.singularName ?? contentType?.apiID : contentType?.info?.pluralName ?? contentType?.apiID;
+  return apiPath ? normalizeApiPath(`/api/${apiPath}`) : void 0;
+};
+const shouldDisableAdminButtons = (disableAdminButtons, contentTypeApiPath) => {
+  if (typeof disableAdminButtons === "boolean") {
+    return disableAdminButtons;
+  }
+  if (!Array.isArray(disableAdminButtons) || !contentTypeApiPath) {
+    return false;
+  }
+  const normalizedContentTypeApiPath = normalizeApiPath(contentTypeApiPath);
+  return disableAdminButtons.some(
+    (apiPath) => normalizeApiPath(apiPath) === normalizedContentTypeApiPath
+  );
+};
 function PurgeCacheButton() {
   const { contentType } = admin.unstable_useContentManagerContext();
   const { formatMessage } = reactIntl.useIntl();
   const { config } = useCacheConfig();
   const keyToUse = contentType?.info.pluralName;
-  if (config?.disableAdminButtons) {
+  const contentTypeApiPath = getContentTypeApiPath(contentType);
+  if (shouldDisableAdminButtons(config?.disableAdminButtons, contentTypeApiPath)) {
     return null;
   }
   return /* @__PURE__ */ jsxRuntime.jsx(
@@ -321,10 +351,11 @@ function PurgeEntityButton() {
   const { id, isSingleType, contentType } = admin.unstable_useContentManagerContext();
   const { config } = useCacheConfig();
   const apiPath = isSingleType ? contentType?.info.singularName : id;
+  const contentTypeApiPath = getContentTypeApiPath(contentType, isSingleType);
   if (!apiPath) {
     return null;
   }
-  if (config?.disableAdminButtons) {
+  if (shouldDisableAdminButtons(config?.disableAdminButtons, contentTypeApiPath)) {
     return null;
   }
   const keyToUse = encodeURIComponent(apiPath);
@@ -374,7 +405,7 @@ const index = {
           },
           id: "settings",
           to: `${PLUGIN_ID}/settings`,
-          Component: () => Promise.resolve().then(() => require("./index-Bdo3ZcJs.js")),
+          Component: () => Promise.resolve().then(() => require("./index-BI_IgcrO.js")),
           permissions: pluginPermissions.viewSettings
         }
       ]

package/dist/_chunks/{index-DLoQ9I8J.mjs → index-Dlr_QM4N.mjs}

@@ -2,7 +2,7 @@ import { jsx, jsxs } from "react/jsx-runtime";
 import { Typography, TextInput } from "@strapi/design-system";
 import { useIntl } from "react-intl";
 import { Page } from "@strapi/strapi/admin";
-import { p as pluginPermissions, P as PurgeModal } from "./index-BovuTRdq.mjs";
+import { p as pluginPermissions, P as PurgeModal } from "./index-CYg363QI.mjs";
 import { useState } from "react";
 const SettingsPage = () => {
   const { formatMessage } = useIntl();

package/dist/admin/index.js

@@ -1,3 +1,3 @@
 "use strict";
-const index = require("../_chunks/index-EMYe2zF8.js");
+const index = require("../_chunks/index-CvGwTcIJ.js");
 module.exports = index.index;

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-import { i } from "../_chunks/index-BovuTRdq.mjs";
+import { i } from "../_chunks/index-CYg363QI.mjs";
 export {
   i as default
 };

package/dist/admin/src/hooks/useCacheConfig.d.ts

@@ -1,7 +1,8 @@
+import type { DisableAdminButtonsConfig } from '../utils/adminButtons';
 export type CacheConfig = {
     cacheableRoutes: string[];
     disableAdminPopups: boolean;
-    disableAdminButtons: boolean;
+    disableAdminButtons: DisableAdminButtonsConfig;
 };
 export declare const useCacheConfig: (enabled?: boolean) => {
     config: CacheConfig | undefined;

package/dist/admin/src/utils/adminButtons.d.ts

@@ -0,0 +1,12 @@
+export type DisableAdminButtonsConfig = boolean | string[];
+type AdminContentType = {
+    apiID?: string;
+    kind?: string;
+    info?: {
+        pluralName?: string;
+        singularName?: string;
+    };
+};
+export declare const getContentTypeApiPath: (contentType?: AdminContentType, isSingleType?: boolean) => string | undefined;
+export declare const shouldDisableAdminButtons: (disableAdminButtons: DisableAdminButtonsConfig | undefined, contentTypeApiPath?: string) => boolean;
+export {};

package/dist/server/index.js

@@ -31,6 +31,9 @@ const loggy = {
     strapi.log.warn(`[STRAPI CACHE] ${msg}`);
   }
 };
+const escapeRegex = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+const getGraphqlEndpoint = (strapi2) => strapi2.plugin("graphql")?.config("endpoint", "/graphql") ?? "/graphql";
+const getGraphqlAllKeysRegex = (strapi2) => new RegExp(`^(GET|POST):${escapeRegex(getGraphqlEndpoint(strapi2))}.*`);
 async function invalidateCache(event, cacheStore, strapi2) {
   const { model } = event;
   const uid = model.uid;
@@ -63,7 +66,7 @@ async function invalidateGraphqlCache(event, cacheStore, strapi2) {
     const contentType = strapi2.contentType(model.uid);
     if (!contentType || !contentType.info) {
       loggy.info(`Content type ${model.uid} not found, purging all GraphQL cache`);
-      const graphqlRegex2 = new RegExp(`^(GET|POST):${strapi2.plugin("graphql")?.config("endpoint", "/graphql") ?? "/graphql"}:.*`);
+      const graphqlRegex2 = getGraphqlAllKeysRegex(strapi2);
       await cacheStore.clearByRegexp([graphqlRegex2]);
       return;
     }
@@ -72,12 +75,14 @@ async function invalidateGraphqlCache(event, cacheStore, strapi2) {
     const fieldNames = [...new Set([singularName, pluralName].filter(Boolean))];
     if (fieldNames.length === 0) {
       loggy.info(`No field names for ${model.uid}, purging all GraphQL cache`);
-      const graphqlRegex2 = new RegExp(`^(GET|POST):${strapi2.plugin("graphql")?.config("endpoint", "/graphql") ?? "/graphql"}:.*`);
+      const graphqlRegex2 = getGraphqlAllKeysRegex(strapi2);
       await cacheStore.clearByRegexp([graphqlRegex2]);
       return;
     }
-    const escapedNames = fieldNames.map((name) => name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
-    const graphqlRegex = new RegExp(`^(GET|POST):${strapi2.plugin("graphql")?.config("endpoint", "/graphql") ?? "/graphql"}:[^:]*\\b(${escapedNames})\\b[^:]*:`);
+    const escapedNames = fieldNames.map((name) => escapeRegex(name)).join("|");
+    const graphqlRegex = new RegExp(
+      `^(GET|POST):${escapeRegex(getGraphqlEndpoint(strapi2))}:[^:]*\\b(${escapedNames})\\b[^:]*:`
+    );
     await cacheStore.clearByRegexp([graphqlRegex]);
     loggy.info(`Invalidated GraphQL cache for ${model.uid} (${fieldNames.join(", ")})`);
   } catch (error) {
@@ -152,12 +157,21 @@ const bootstrap = ({ strapi: strapi2 }) => {
   loggy.info("Plugin initialized");
   strapi2.admin.services.permission.actionProvider.registerMany(actions);
 };
+const getCustomCacheKey = (context, keyGenerator) => {
+  if (typeof keyGenerator !== "function") {
+    return void 0;
+  }
+  const customKey = keyGenerator(context);
+  if (typeof customKey === "string") {
+    return customKey;
+  }
+  return void 0;
+};
+const resolveGraphqlCacheKey = (context, fallbackKey, keyGenerator) => getCustomCacheKey(context, keyGenerator) ?? fallbackKey;
 const generateCacheKey = (context, keyGenerator) => {
-  if (typeof keyGenerator === "function") {
-    const customKey = keyGenerator(context);
-    if (typeof customKey === "string") {
-      return customKey;
-    }
+  const customKey = getCustomCacheKey(context, keyGenerator);
+  if (customKey !== void 0) {
+    return customKey;
   }
   const { url } = context.request;
   const { method } = context.request;
@@ -402,6 +416,7 @@ const middleware = async (ctx, next) => {
     return;
   }
   const cacheService = strapi.plugin("strapi-cache").services.service;
+  const keyGenerator = strapi.plugin("strapi-cache").config("keyGenerator");
   const { cacheHeaders, cacheHeadersDenyList, cacheHeadersAllowList, cacheAuthorizedRequests } = getCacheHeaderConfig();
   const cacheStore = cacheService.getCacheInstance();
   const isGet = method === "GET";
@@ -431,7 +446,10 @@ const middleware = async (ctx, next) => {
   }
   const payload = parseGraphqlPayload(body, isGet);
   const rootFields = getRootFieldsFromQuery(payload.query);
-  const key = generateGraphqlCacheKey(body, isGet ? "GET" : "POST", rootFields, strapi);
+  const graphqlKey = generateGraphqlCacheKey(body, isGet ? "GET" : "POST", rootFields, strapi);
+  ctx.rootFields = rootFields.length ? rootFields : void 0;
+  ctx.operationName = payload.operationName;
+  const key = resolveGraphqlCacheKey(ctx, graphqlKey, keyGenerator);
   loggy.info(
     `GraphQL request: ${JSON.stringify({
       operationName: payload.operationName,
@@ -635,8 +653,8 @@ const config = {
     if (typeof config2.disableAdminPopups !== "boolean") {
       throw new Error(`Invalid config: disableAdminPopups must be a boolean`);
     }
-    if (typeof config2.disableAdminButtons !== "boolean") {
-      throw new Error(`Invalid config: disableAdminButtons must be a boolean`);
+    if (typeof config2.disableAdminButtons !== "boolean" && (!Array.isArray(config2.disableAdminButtons) || config2.disableAdminButtons.some((item) => typeof item !== "string"))) {
+      throw new Error(`Invalid config: disableAdminButtons must be a boolean or string array`);
     }
     if (typeof config2.redisScanDeleteCount !== "number") {
       throw new Error(`Invalid config: redisScanDeleteCount must be a number`);

package/dist/server/index.mjs

@@ -27,6 +27,9 @@ const loggy = {
     strapi.log.warn(`[STRAPI CACHE] ${msg}`);
   }
 };
+const escapeRegex = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+const getGraphqlEndpoint = (strapi2) => strapi2.plugin("graphql")?.config("endpoint", "/graphql") ?? "/graphql";
+const getGraphqlAllKeysRegex = (strapi2) => new RegExp(`^(GET|POST):${escapeRegex(getGraphqlEndpoint(strapi2))}.*`);
 async function invalidateCache(event, cacheStore, strapi2) {
   const { model } = event;
   const uid = model.uid;
@@ -59,7 +62,7 @@ async function invalidateGraphqlCache(event, cacheStore, strapi2) {
     const contentType = strapi2.contentType(model.uid);
     if (!contentType || !contentType.info) {
       loggy.info(`Content type ${model.uid} not found, purging all GraphQL cache`);
-      const graphqlRegex2 = new RegExp(`^(GET|POST):${strapi2.plugin("graphql")?.config("endpoint", "/graphql") ?? "/graphql"}:.*`);
+      const graphqlRegex2 = getGraphqlAllKeysRegex(strapi2);
       await cacheStore.clearByRegexp([graphqlRegex2]);
       return;
     }
@@ -68,12 +71,14 @@ async function invalidateGraphqlCache(event, cacheStore, strapi2) {
     const fieldNames = [...new Set([singularName, pluralName].filter(Boolean))];
     if (fieldNames.length === 0) {
       loggy.info(`No field names for ${model.uid}, purging all GraphQL cache`);
-      const graphqlRegex2 = new RegExp(`^(GET|POST):${strapi2.plugin("graphql")?.config("endpoint", "/graphql") ?? "/graphql"}:.*`);
+      const graphqlRegex2 = getGraphqlAllKeysRegex(strapi2);
       await cacheStore.clearByRegexp([graphqlRegex2]);
       return;
     }
-    const escapedNames = fieldNames.map((name) => name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
-    const graphqlRegex = new RegExp(`^(GET|POST):${strapi2.plugin("graphql")?.config("endpoint", "/graphql") ?? "/graphql"}:[^:]*\\b(${escapedNames})\\b[^:]*:`);
+    const escapedNames = fieldNames.map((name) => escapeRegex(name)).join("|");
+    const graphqlRegex = new RegExp(
+      `^(GET|POST):${escapeRegex(getGraphqlEndpoint(strapi2))}:[^:]*\\b(${escapedNames})\\b[^:]*:`
+    );
     await cacheStore.clearByRegexp([graphqlRegex]);
     loggy.info(`Invalidated GraphQL cache for ${model.uid} (${fieldNames.join(", ")})`);
   } catch (error) {
@@ -148,12 +153,21 @@ const bootstrap = ({ strapi: strapi2 }) => {
   loggy.info("Plugin initialized");
   strapi2.admin.services.permission.actionProvider.registerMany(actions);
 };
+const getCustomCacheKey = (context, keyGenerator) => {
+  if (typeof keyGenerator !== "function") {
+    return void 0;
+  }
+  const customKey = keyGenerator(context);
+  if (typeof customKey === "string") {
+    return customKey;
+  }
+  return void 0;
+};
+const resolveGraphqlCacheKey = (context, fallbackKey, keyGenerator) => getCustomCacheKey(context, keyGenerator) ?? fallbackKey;
 const generateCacheKey = (context, keyGenerator) => {
-  if (typeof keyGenerator === "function") {
-    const customKey = keyGenerator(context);
-    if (typeof customKey === "string") {
-      return customKey;
-    }
+  const customKey = getCustomCacheKey(context, keyGenerator);
+  if (customKey !== void 0) {
+    return customKey;
   }
   const { url } = context.request;
   const { method } = context.request;
@@ -398,6 +412,7 @@ const middleware = async (ctx, next) => {
     return;
   }
   const cacheService = strapi.plugin("strapi-cache").services.service;
+  const keyGenerator = strapi.plugin("strapi-cache").config("keyGenerator");
   const { cacheHeaders, cacheHeadersDenyList, cacheHeadersAllowList, cacheAuthorizedRequests } = getCacheHeaderConfig();
   const cacheStore = cacheService.getCacheInstance();
   const isGet = method === "GET";
@@ -427,7 +442,10 @@ const middleware = async (ctx, next) => {
   }
   const payload = parseGraphqlPayload(body, isGet);
   const rootFields = getRootFieldsFromQuery(payload.query);
-  const key = generateGraphqlCacheKey(body, isGet ? "GET" : "POST", rootFields, strapi);
+  const graphqlKey = generateGraphqlCacheKey(body, isGet ? "GET" : "POST", rootFields, strapi);
+  ctx.rootFields = rootFields.length ? rootFields : void 0;
+  ctx.operationName = payload.operationName;
+  const key = resolveGraphqlCacheKey(ctx, graphqlKey, keyGenerator);
   loggy.info(
     `GraphQL request: ${JSON.stringify({
       operationName: payload.operationName,
@@ -631,8 +649,8 @@ const config = {
     if (typeof config2.disableAdminPopups !== "boolean") {
       throw new Error(`Invalid config: disableAdminPopups must be a boolean`);
     }
-    if (typeof config2.disableAdminButtons !== "boolean") {
-      throw new Error(`Invalid config: disableAdminButtons must be a boolean`);
+    if (typeof config2.disableAdminButtons !== "boolean" && (!Array.isArray(config2.disableAdminButtons) || config2.disableAdminButtons.some((item) => typeof item !== "string"))) {
+      throw new Error(`Invalid config: disableAdminButtons must be a boolean or string array`);
     }
     if (typeof config2.redisScanDeleteCount !== "number") {
       throw new Error(`Invalid config: redisScanDeleteCount must be a number`);

package/dist/server/src/utils/key.d.ts

@@ -1,6 +1,8 @@
 import { Core } from '@strapi/strapi';
 import { Context } from 'koa';
 export type CacheKeyGenerator = (context: Context) => string;
+export declare const getCustomCacheKey: (context: Context, keyGenerator?: CacheKeyGenerator) => string;
+export declare const resolveGraphqlCacheKey: (context: Context, fallbackKey: string, keyGenerator?: CacheKeyGenerator) => string;
 export declare const generateCacheKey: (context: Context, keyGenerator?: CacheKeyGenerator) => string;
 export declare const generateGraphqlCacheKey: (payload: string, method?: 'GET' | 'POST', rootFields?: string[], strapi?: Core.Strapi) => string;
 export declare const escapeRegExp: (s: string) => string;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.10.0",
+  "version": "1.11.0",
   "keywords": [
     "strapi cache",
     "strapi rest cache",