npm - @envelop/response-cache - Versions diffs - 8.2.0-alpha-20251013081815-d6f74fceb1a32fd336b2664f90f87872e1bbf2fe → 10.0.0-alpha-20251211205538-5005189af5ce4a47150dc63ed3732eee84998197 - Mend

@envelop/response-cache 8.2.0-alpha-20251013081815-d6f74fceb1a32fd336b2664f90f87872e1bbf2fe → 10.0.0-alpha-20251211205538-5005189af5ce4a47150dc63ed3732eee84998197

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/cjs/plugin.js CHANGED Viewed

@@ -233,9 +233,11 @@ function useResponseCache({ cache = (0, in_memory_cache_js_1.createInMemoryCache
                 }
             }
             function invalidateCache(result, setResult) {
+                let changed = false;
                 if (result.data) {
-                    collectEntities(result.data, onEntity);
-                    setStringifyWithoutMetadata(result);
+                    result = { ...result };
+                    result.data = removeMetadataFieldsFromResult(result.data, onEntity);
+                    changed = true;
                 }
                 const cacheInstance = cacheFactory(onExecuteParams.args.contextValue);
                 if (cacheInstance == null) {
@@ -251,6 +253,9 @@ function useResponseCache({ cache = (0, in_memory_cache_js_1.createInMemoryCache
                         }));
                     }
                 }
+                if (changed) {
+                    setResult(result);
+                }
             }
             if (invalidateViaMutation !== false) {
                 const operationAST = (0, graphql_1.getOperationAST)(onExecuteParams.args.document, onExecuteParams.args.operationName);
@@ -291,8 +296,7 @@ function useResponseCache({ cache = (0, in_memory_cache_js_1.createInMemoryCache
                     }
                     function maybeCacheResult(result, setResult) {
                         if (result.data) {
-                            collectEntities(result.data, onEntity);
-                            setStringifyWithoutMetadata(result);
+                            result.data = removeMetadataFieldsFromResult(result.data, onEntity);
                         }
                         // we only use the global ttl if no currentTtl has been determined.
                         let finalTtl = currentTtl ?? globalTtl;
@@ -340,7 +344,7 @@ function handleAsyncIterableResult(handler) {
         onNext(payload) {
             // This is the first result with the initial data payload sent to the client. We use it as the base result
             if (payload.result.data) {
-                result.data = structuredClone(payload.result.data);
+                result.data = payload.result.data;
             }
             if (payload.result.errors) {
                 result.errors = payload.result.errors;
@@ -352,10 +356,7 @@ function handleAsyncIterableResult(handler) {
                 const { incremental, hasNext } = payload.result;
                 if (incremental) {
                     for (const patch of incremental) {
-                        (0, utils_1.mergeIncrementalResult)({
-                            executionResult: result,
-                            incrementalResult: structuredClone(patch),
-                        });
+                        (0, utils_1.mergeIncrementalResult)({ executionResult: result, incrementalResult: patch });
                     }
                 }
                 if (!hasNext) {
@@ -363,22 +364,30 @@ function handleAsyncIterableResult(handler) {
                     handler(result, payload.setResult);
                 }
             }
-            if (payload.result.data) {
-                collectEntities(payload.result.data);
+            const newResult = { ...payload.result };
+            // Handle initial/single result
+            if (newResult.data) {
+                newResult.data = removeMetadataFieldsFromResult(newResult.data);
             }
             // Handle Incremental results
-            if ('hasNext' in payload.result && payload.result.incremental) {
-                payload.result.incremental = payload.result.incremental.map(value => {
+            if ('hasNext' in newResult && newResult.incremental) {
+                newResult.incremental = newResult.incremental.map(value => {
                     if ('items' in value && value.items) {
-                        collectEntities(value.items);
+                        return {
+                            ...value,
+                            items: removeMetadataFieldsFromResult(value.items),
+                        };
                     }
                     if ('data' in value && value.data) {
-                        collectEntities(value.data);
+                        return {
+                            ...value,
+                            data: removeMetadataFieldsFromResult(value.data),
+                        };
                     }
                     return value;
                 });
             }
-            setStringifyWithoutMetadata(payload.result);
+            payload.setResult(newResult);
         },
     };
 }
@@ -423,45 +432,38 @@ exports.cacheControlDirective = `
   directive @cacheControl(maxAge: Int, scope: CacheControlScope) on FIELD_DEFINITION | OBJECT
 `;
-function collectEntities(data, onEntity) {
+function removeMetadataFieldsFromResult(data, onEntity) {
     if (Array.isArray(data)) {
-        for (const record of data) {
-            collectEntities(record, onEntity);
-        }
-        return;
+        return data.map(record => removeMetadataFieldsFromResult(record, onEntity));
     }
     if (typeof data !== 'object' || data == null) {
-        return;
+        return data;
     }
     const dataPrototype = Object.getPrototypeOf(data);
-    // TODO: For some reason, when running in Jest, `structuredClone` result have a weird prototype
-    //       that doesn't equal Object.prototype as it should.
-    //       As a workaround, we can just check that there is no parent prototype, which should be
-    //       the case only when it's the Object prototype
-    //       Rollback once migrated to Bun or vitest
-    //
-    // if (dataPrototype != null && dataPrototype !== Object.prototype) {
-    if (dataPrototype != null && Object.getPrototypeOf(dataPrototype) !== null) {
-        // It is not a plain object, like a Date, don't inspect further
-        return;
+    if (dataPrototype != null && dataPrototype !== Object.prototype) {
+        return data;
     }
+    // clone the data to avoid mutation
+    data = { ...data };
     const typename = data.__responseCacheTypeName ?? data.__typename;
     if (typeof typename === 'string') {
         const entity = { typename };
+        delete data.__responseCacheTypeName;
         if (data.__responseCacheId &&
             (typeof data.__responseCacheId === 'string' || typeof data.__responseCacheId === 'number')) {
             entity.id = data.__responseCacheId;
+            delete data.__responseCacheId;
         }
         onEntity?.(entity, data);
     }
     for (const key in data) {
-        collectEntities(data[key], onEntity);
+        const value = data[key];
+        if (Array.isArray(value)) {
+            data[key] = removeMetadataFieldsFromResult(value, onEntity);
+        }
+        if (value !== null && typeof value === 'object') {
+            data[key] = removeMetadataFieldsFromResult(value, onEntity);
+        }
     }
+    return data;
 }
-function setStringifyWithoutMetadata(result) {
-    result.stringify = stringifyWithoutMetadata;
-    return result;
-}
-const stringifyWithoutMetadata = result => {
-    return JSON.stringify(result, (key, value) => key === '__responseCacheId' || key === '__responseCacheTypeName' ? undefined : value);
-};

package/esm/plugin.js CHANGED Viewed

@@ -224,9 +224,11 @@ export function useResponseCache({ cache = createInMemoryCache(), ttl: globalTtl
                 }
             }
             function invalidateCache(result, setResult) {
+                let changed = false;
                 if (result.data) {
-                    collectEntities(result.data, onEntity);
-                    setStringifyWithoutMetadata(result);
+                    result = { ...result };
+                    result.data = removeMetadataFieldsFromResult(result.data, onEntity);
+                    changed = true;
                 }
                 const cacheInstance = cacheFactory(onExecuteParams.args.contextValue);
                 if (cacheInstance == null) {
@@ -242,6 +244,9 @@ export function useResponseCache({ cache = createInMemoryCache(), ttl: globalTtl
                         }));
                     }
                 }
+                if (changed) {
+                    setResult(result);
+                }
             }
             if (invalidateViaMutation !== false) {
                 const operationAST = getOperationAST(onExecuteParams.args.document, onExecuteParams.args.operationName);
@@ -282,8 +287,7 @@ export function useResponseCache({ cache = createInMemoryCache(), ttl: globalTtl
                     }
                     function maybeCacheResult(result, setResult) {
                         if (result.data) {
-                            collectEntities(result.data, onEntity);
-                            setStringifyWithoutMetadata(result);
+                            result.data = removeMetadataFieldsFromResult(result.data, onEntity);
                         }
                         // we only use the global ttl if no currentTtl has been determined.
                         let finalTtl = currentTtl ?? globalTtl;
@@ -331,7 +335,7 @@ function handleAsyncIterableResult(handler) {
         onNext(payload) {
             // This is the first result with the initial data payload sent to the client. We use it as the base result
             if (payload.result.data) {
-                result.data = structuredClone(payload.result.data);
+                result.data = payload.result.data;
             }
             if (payload.result.errors) {
                 result.errors = payload.result.errors;
@@ -343,10 +347,7 @@ function handleAsyncIterableResult(handler) {
                 const { incremental, hasNext } = payload.result;
                 if (incremental) {
                     for (const patch of incremental) {
-                        mergeIncrementalResult({
-                            executionResult: result,
-                            incrementalResult: structuredClone(patch),
-                        });
+                        mergeIncrementalResult({ executionResult: result, incrementalResult: patch });
                     }
                 }
                 if (!hasNext) {
@@ -354,22 +355,30 @@ function handleAsyncIterableResult(handler) {
                     handler(result, payload.setResult);
                 }
             }
-            if (payload.result.data) {
-                collectEntities(payload.result.data);
+            const newResult = { ...payload.result };
+            // Handle initial/single result
+            if (newResult.data) {
+                newResult.data = removeMetadataFieldsFromResult(newResult.data);
             }
             // Handle Incremental results
-            if ('hasNext' in payload.result && payload.result.incremental) {
-                payload.result.incremental = payload.result.incremental.map(value => {
+            if ('hasNext' in newResult && newResult.incremental) {
+                newResult.incremental = newResult.incremental.map(value => {
                     if ('items' in value && value.items) {
-                        collectEntities(value.items);
+                        return {
+                            ...value,
+                            items: removeMetadataFieldsFromResult(value.items),
+                        };
                     }
                     if ('data' in value && value.data) {
-                        collectEntities(value.data);
+                        return {
+                            ...value,
+                            data: removeMetadataFieldsFromResult(value.data),
+                        };
                     }
                     return value;
                 });
             }
-            setStringifyWithoutMetadata(payload.result);
+            payload.setResult(newResult);
         },
     };
 }
@@ -414,45 +423,38 @@ export const cacheControlDirective = /* GraphQL */ `
   directive @cacheControl(maxAge: Int, scope: CacheControlScope) on FIELD_DEFINITION | OBJECT
 `;
-function collectEntities(data, onEntity) {
+function removeMetadataFieldsFromResult(data, onEntity) {
     if (Array.isArray(data)) {
-        for (const record of data) {
-            collectEntities(record, onEntity);
-        }
-        return;
+        return data.map(record => removeMetadataFieldsFromResult(record, onEntity));
     }
     if (typeof data !== 'object' || data == null) {
-        return;
+        return data;
     }
     const dataPrototype = Object.getPrototypeOf(data);
-    // TODO: For some reason, when running in Jest, `structuredClone` result have a weird prototype
-    //       that doesn't equal Object.prototype as it should.
-    //       As a workaround, we can just check that there is no parent prototype, which should be
-    //       the case only when it's the Object prototype
-    //       Rollback once migrated to Bun or vitest
-    //
-    // if (dataPrototype != null && dataPrototype !== Object.prototype) {
-    if (dataPrototype != null && Object.getPrototypeOf(dataPrototype) !== null) {
-        // It is not a plain object, like a Date, don't inspect further
-        return;
+    if (dataPrototype != null && dataPrototype !== Object.prototype) {
+        return data;
     }
+    // clone the data to avoid mutation
+    data = { ...data };
     const typename = data.__responseCacheTypeName ?? data.__typename;
     if (typeof typename === 'string') {
         const entity = { typename };
+        delete data.__responseCacheTypeName;
         if (data.__responseCacheId &&
             (typeof data.__responseCacheId === 'string' || typeof data.__responseCacheId === 'number')) {
             entity.id = data.__responseCacheId;
+            delete data.__responseCacheId;
         }
         onEntity?.(entity, data);
     }
     for (const key in data) {
-        collectEntities(data[key], onEntity);
+        const value = data[key];
+        if (Array.isArray(value)) {
+            data[key] = removeMetadataFieldsFromResult(value, onEntity);
+        }
+        if (value !== null && typeof value === 'object') {
+            data[key] = removeMetadataFieldsFromResult(value, onEntity);
+        }
     }
+    return data;
 }
-function setStringifyWithoutMetadata(result) {
-    result.stringify = stringifyWithoutMetadata;
-    return result;
-}
-const stringifyWithoutMetadata = result => {
-    return JSON.stringify(result, (key, value) => key === '__responseCacheId' || key === '__responseCacheTypeName' ? undefined : value);
-};

package/package.json CHANGED Viewed

@@ -1,10 +1,10 @@
 {
   "name": "@envelop/response-cache",
-  "version": "8.2.0-alpha-20251013081815-d6f74fceb1a32fd336b2664f90f87872e1bbf2fe",
+  "version": "10.0.0-alpha-20251211205538-5005189af5ce4a47150dc63ed3732eee84998197",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0",
-    "@envelop/core": "^5.3.2"
+    "@envelop/core": "^5.5.0-alpha-20251211205538-5005189af5ce4a47150dc63ed3732eee84998197"
   },
   "dependencies": {
     "@graphql-tools/utils": "^10.0.3",