@graphql-mesh/plugin-response-cache 0.103.17 → 0.104.0-alpha-20250124181238-87366ee8e2a95025d881bdaba556f04d337e8331

package/cjs/index.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = useMeshResponseCache;
-const tslib_1 = require("tslib");
-const cache_control_parser_1 = tslib_1.__importDefault(require("cache-control-parser"));
 const response_cache_1 = require("@envelop/response-cache");
 const cross_helpers_1 = require("@graphql-mesh/cross-helpers");
 const string_interpolation_1 = require("@graphql-mesh/string-interpolation");
@@ -145,11 +143,7 @@ function useMeshResponseCache(options) {
             ttlPerSchemaCoordinate[ttlConfig.coordinate] = ttlConfig.ttl;
         }
     }
-    // Stored TTL by the context
-    // To be compared with the calculated one later in `onTtl`
-    const ttlByContext = new WeakMap();
-    // @ts-expect-error - GatewayPlugin types
-    const plugin = (0, plugin_response_cache_1.useResponseCache)({
+    return (0, plugin_response_cache_1.useResponseCache)({
         includeExtensionMetadata: options.includeExtensionMetadata != null
             ? options.includeExtensionMetadata
             : cross_helpers_1.process.env.DEBUG === '1',
@@ -163,45 +157,5 @@ function useMeshResponseCache(options) {
         cache: getCacheForResponseCache(options.cache),
         ttlPerType,
         ttlPerSchemaCoordinate,
-        // Checks the TTL stored in the context
-        // Compares it to the calculated one
-        // Then it takes the lowest value
-        onTtl({ ttl, context }) {
-            const ttlForThisContext = ttlByContext.get(context);
-            if (ttlForThisContext != null && ttlForThisContext < ttl) {
-                return ttlForThisContext;
-            }
-            return ttl;
-        },
     });
-    // Checks the TTL stored in the context
-    // Takes the lowest value
-    function checkTtl(context, ttl) {
-        const ttlForThisContext = ttlByContext.get(context);
-        if (ttlForThisContext == null || ttl < ttlForThisContext) {
-            ttlByContext.set(context, ttl);
-        }
-    }
-    plugin.onFetch = function ({ executionRequest, context }) {
-        // Only if it is a subgraph request
-        if (executionRequest && context) {
-            return function onFetchDone({ response }) {
-                const cacheControlHeader = response.headers.get('cache-control');
-                if (cacheControlHeader != null) {
-                    const parsedCacheControl = cache_control_parser_1.default.parse(cacheControlHeader);
-                    if (parsedCacheControl['max-age'] != null) {
-                        const maxAgeInSeconds = parsedCacheControl['max-age'];
-                        const maxAgeInMs = maxAgeInSeconds * 1000;
-                        checkTtl(context, maxAgeInMs);
-                    }
-                    if (parsedCacheControl['s-maxage'] != null) {
-                        const sMaxAgeInSeconds = parsedCacheControl['s-maxage'];
-                        const sMaxAgeInMs = sMaxAgeInSeconds * 1000;
-                        checkTtl(context, sMaxAgeInMs);
-                    }
-                }
-            };
-        }
-    };
-    return plugin;
 }

package/esm/index.js

@@ -1,4 +1,3 @@
-import CacheControlParser from 'cache-control-parser';
 import { defaultBuildResponseCacheKey } from '@envelop/response-cache';
 import { process } from '@graphql-mesh/cross-helpers';
 import { stringInterpolator } from '@graphql-mesh/string-interpolation';
@@ -141,11 +140,7 @@ export default function useMeshResponseCache(options) {
             ttlPerSchemaCoordinate[ttlConfig.coordinate] = ttlConfig.ttl;
         }
     }
-    // Stored TTL by the context
-    // To be compared with the calculated one later in `onTtl`
-    const ttlByContext = new WeakMap();
-    // @ts-expect-error - GatewayPlugin types
-    const plugin = useResponseCache({
+    return useResponseCache({
         includeExtensionMetadata: options.includeExtensionMetadata != null
             ? options.includeExtensionMetadata
             : process.env.DEBUG === '1',
@@ -159,45 +154,5 @@ export default function useMeshResponseCache(options) {
         cache: getCacheForResponseCache(options.cache),
         ttlPerType,
         ttlPerSchemaCoordinate,
-        // Checks the TTL stored in the context
-        // Compares it to the calculated one
-        // Then it takes the lowest value
-        onTtl({ ttl, context }) {
-            const ttlForThisContext = ttlByContext.get(context);
-            if (ttlForThisContext != null && ttlForThisContext < ttl) {
-                return ttlForThisContext;
-            }
-            return ttl;
-        },
     });
-    // Checks the TTL stored in the context
-    // Takes the lowest value
-    function checkTtl(context, ttl) {
-        const ttlForThisContext = ttlByContext.get(context);
-        if (ttlForThisContext == null || ttl < ttlForThisContext) {
-            ttlByContext.set(context, ttl);
-        }
-    }
-    plugin.onFetch = function ({ executionRequest, context }) {
-        // Only if it is a subgraph request
-        if (executionRequest && context) {
-            return function onFetchDone({ response }) {
-                const cacheControlHeader = response.headers.get('cache-control');
-                if (cacheControlHeader != null) {
-                    const parsedCacheControl = CacheControlParser.parse(cacheControlHeader);
-                    if (parsedCacheControl['max-age'] != null) {
-                        const maxAgeInSeconds = parsedCacheControl['max-age'];
-                        const maxAgeInMs = maxAgeInSeconds * 1000;
-                        checkTtl(context, maxAgeInMs);
-                    }
-                    if (parsedCacheControl['s-maxage'] != null) {
-                        const sMaxAgeInSeconds = parsedCacheControl['s-maxage'];
-                        const sMaxAgeInMs = sMaxAgeInSeconds * 1000;
-                        checkTtl(context, sMaxAgeInMs);
-                    }
-                }
-            };
-        }
-    };
-    return plugin;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-mesh/plugin-response-cache",
-  "version": "0.103.17",
+  "version": "0.104.0-alpha-20250124181238-87366ee8e2a95025d881bdaba556f04d337e8331",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "*"
@@ -8,13 +8,12 @@
   "dependencies": {
     "@envelop/core": "^5.0.0",
     "@envelop/response-cache": "^6.1.1",
-    "@graphql-mesh/cross-helpers": "^0.4.10",
+    "@graphql-mesh/cross-helpers": "^0.4.9",
     "@graphql-mesh/string-interpolation": "0.5.8",
-    "@graphql-mesh/types": "^0.103.16",
-    "@graphql-mesh/utils": "^0.103.16",
+    "@graphql-mesh/types": "0.104.0-alpha-20250124181238-87366ee8e2a95025d881bdaba556f04d337e8331",
+    "@graphql-mesh/utils": "0.104.0-alpha-20250124181238-87366ee8e2a95025d881bdaba556f04d337e8331",
     "@graphql-tools/utils": "^10.6.2",
     "@graphql-yoga/plugin-response-cache": "^3.1.1",
-    "cache-control-parser": "^2.0.6",
     "graphql-yoga": "^5.7.0",
     "tslib": "^2.4.0"
   },

package/typings/index.d.cts

@@ -1,4 +1,4 @@
-import type { GatewayPlugin } from '@graphql-hive/gateway-runtime';
+import type { Plugin } from 'graphql-yoga';
 import type { KeyValueCache, YamlConfig } from '@graphql-mesh/types';
 import type { UseResponseCacheParameter } from '@graphql-yoga/plugin-response-cache';
 export type ResponseCacheConfig = Omit<UseResponseCacheParameter, 'cache'> & {
@@ -20,11 +20,11 @@ export type ResponseCacheConfig = Omit<UseResponseCacheParameter, 'cache'> & {
  * Response cache plugin for GraphQL Mesh
  * @param options
  */
-export default function useMeshResponseCache(options: ResponseCacheConfig): GatewayPlugin;
+export default function useMeshResponseCache(options: ResponseCacheConfig): Plugin;
 /**
  * @deprecated Use new configuration format `ResponseCacheConfig`
  * @param options
  */
 export default function useMeshResponseCache(options: YamlConfig.ResponseCacheConfig & {
     cache: KeyValueCache;
-}): GatewayPlugin;
+}): Plugin;

package/typings/index.d.ts

@@ -1,4 +1,4 @@
-import type { GatewayPlugin } from '@graphql-hive/gateway-runtime';
+import type { Plugin } from 'graphql-yoga';
 import type { KeyValueCache, YamlConfig } from '@graphql-mesh/types';
 import type { UseResponseCacheParameter } from '@graphql-yoga/plugin-response-cache';
 export type ResponseCacheConfig = Omit<UseResponseCacheParameter, 'cache'> & {
@@ -20,11 +20,11 @@ export type ResponseCacheConfig = Omit<UseResponseCacheParameter, 'cache'> & {
  * Response cache plugin for GraphQL Mesh
  * @param options
  */
-export default function useMeshResponseCache(options: ResponseCacheConfig): GatewayPlugin;
+export default function useMeshResponseCache(options: ResponseCacheConfig): Plugin;
 /**
  * @deprecated Use new configuration format `ResponseCacheConfig`
  * @param options
  */
 export default function useMeshResponseCache(options: YamlConfig.ResponseCacheConfig & {
     cache: KeyValueCache;
-}): GatewayPlugin;
+}): Plugin;