apollographql · trevor-scheer · Jun 7, 2022 · Jun 1, 2022 · Jun 3, 2022 · Jun 3, 2022
diff --git a/.prettierignore b/.prettierignore
@@ -10,3 +10,5 @@ docs/.cache/
 
 # Don't format generated files!
 **/generated/**
+
+.volta
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -86,7 +86,7 @@ The version headers in this history reflect the versions of Apollo Server itself
   new ApolloServer({
     documentStore: new InMemoryLRUCache<DocumentNode>({
       maxSize: Math.pow(2, 20) * approximateDocumentStoreMiB,
-      sizeCalculator: InMemoryLRUCache.jsonBytesSizeCalculator,
+      sizeCalculator: InMemoryLRUCache.sizeCalculator,
     }),
     ...moreOptions,
   })

diff --git a/cspell-dict.txt b/cspell-dict.txt
@@ -79,6 +79,7 @@ iteratees
 josephg
 jsdelivr
 keyv
+keyvaluecache
 KHTML
 Kubernetes
 linearizability

diff --git a/docs/source/api/apollo-server.mdx b/docs/source/api/apollo-server.mdx
@@ -209,12 +209,12 @@ To use `InMemoryLRUCache` but change its size to an amount `approximateDocumentS
 <div style="max-width: 400px;">
 
 ```typescript
-import { InMemoryLRUCache } from 'apollo-server-caching';
+import { InMemoryLRUCache } from '@apollo/utils.keyvaluecache';
 import type { DocumentNode } from 'graphql';
 new ApolloServer({
   documentStore: new InMemoryLRUCache<DocumentNode>({
     maxSize: Math.pow(2, 20) * approximateDocumentStoreMiB,
-    sizeCalculator: InMemoryLRUCache.jsonBytesSizeCalculator,
+    sizeCalculation: InMemoryLRUCache.sizeCalculation,
   }),
   // ...
 })

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json
@@ -18,8 +18,8 @@
     "node": ">=12.0"
   },
   "dependencies": {
+    "@apollo/utils.keyvaluecache": "^1.0.1",
     "apollo-datasource": "file:../apollo-datasource",
-    "apollo-server-caching": "file:../apollo-server-caching",
     "apollo-server-env": "file:../apollo-server-env",
     "apollo-server-errors": "file:../apollo-server-errors",
     "http-cache-semantics": "^4.1.0"

diff --git a/packages/apollo-datasource-rest/src/HTTPCache.ts b/packages/apollo-datasource-rest/src/HTTPCache.ts
@@ -6,7 +6,7 @@ import {
   KeyValueCache,
   InMemoryLRUCache,
   PrefixingKeyValueCache,
-} from 'apollo-server-caching';
+} from '@apollo/utils.keyvaluecache';
 import type { CacheOptions } from './RESTDataSource';
 
 export class HTTPCache {

diff --git a/packages/apollo-datasource-rest/src/__tests__/HTTPCache.test.ts b/packages/apollo-datasource-rest/src/__tests__/HTTPCache.test.ts
@@ -352,8 +352,11 @@ describe('HTTPCache', () => {
 
     await httpCache.fetch(new Request('https://api.example.com/people/1'));
 
-    expect(storeSet.mock.calls[0][2]).toEqual({ ttl: 30 });
-
+    expect(storeSet).toHaveBeenCalledWith(
+      expect.any(String),
+      expect.any(String),
+      { ttl: 30 },
+    );
     storeSet.mockRestore();
   });
 
@@ -367,7 +370,11 @@ describe('HTTPCache', () => {
 
     await httpCache.fetch(new Request('https://api.example.com/people/1'));
 
-    expect(storeSet.mock.calls[0][2]).toEqual({ ttl: 60 });
+    expect(storeSet).toHaveBeenCalledWith(
+      expect.any(String),
+      expect.any(String),
+      { ttl: 60 },
+    );
 
     storeSet.mockRestore();
   });

diff --git a/packages/apollo-datasource-rest/src/__tests__/MapKeyValueCache.ts b/packages/apollo-datasource-rest/src/__tests__/MapKeyValueCache.ts
@@ -1,14 +1,11 @@
-import type {
-  KeyValueCache,
-  KeyValueCacheSetOptions,
-} from 'apollo-server-caching';
+import type { KeyValueCache } from '@apollo/utils.keyvaluecache';
 
 export class MapKeyValueCache<V> implements KeyValueCache<V> {
   store = new Map<string, V>();
   async get(key: string) {
     return this.store.get(key);
   }
-  async set(key: string, value: V, _?: KeyValueCacheSetOptions) {
+  async set(key: string, value: V) {
     this.store.set(key, value);
   }
   async delete(key: string) {

diff --git a/packages/apollo-datasource-rest/tsconfig.json b/packages/apollo-datasource-rest/tsconfig.json
@@ -8,7 +8,6 @@
   "exclude": ["**/__tests__"],
   "references": [
     { "path": "../apollo-datasource" },
-    { "path": "../apollo-server-caching" },
     { "path": "../apollo-server-errors" },
   ]
 }
diff --git a/packages/apollo-datasource/package.json b/packages/apollo-datasource/package.json
@@ -18,7 +18,7 @@
     "node": ">=12.0"
   },
   "dependencies": {
-    "apollo-server-caching": "file:../apollo-server-caching",
+    "@apollo/utils.keyvaluecache": "^1.0.1",
     "apollo-server-env": "file:../apollo-server-env"
   }
 }
diff --git a/packages/apollo-datasource/src/index.ts b/packages/apollo-datasource/src/index.ts
@@ -1,4 +1,4 @@
-import type { KeyValueCache } from 'apollo-server-caching';
+import type { KeyValueCache } from '@apollo/utils.keyvaluecache';
 
 export interface DataSourceConfig<TContext> {
   context: TContext;

diff --git a/packages/apollo-datasource/tsconfig.json b/packages/apollo-datasource/tsconfig.json
@@ -6,7 +6,5 @@
   },
   "include": ["src/**/*"],
   "exclude": ["**/__tests__"],
-  "references": [
-    { "path": "../apollo-server-caching" },
-  ]
+  "references": []
 }
diff --git a/packages/apollo-server-cache-memcached/package.json b/packages/apollo-server-cache-memcached/package.json
@@ -18,6 +18,7 @@
     "node": ">=12.0"
   },
   "dependencies": {
+    "@apollo/utils.keyvaluecache": "^1.0.1",
     "apollo-server-caching": "file:../apollo-server-caching",
     "apollo-server-env": "file:../apollo-server-env",
     "memcached": "^2.2.2"

diff --git a/packages/apollo-server-cache-memcached/src/index.ts b/packages/apollo-server-cache-memcached/src/index.ts
@@ -1,7 +1,7 @@
 import type {
   KeyValueCache,
   KeyValueCacheSetOptions,
-} from 'apollo-server-caching';
+} from '@apollo/utils.keyvaluecache';
 import Memcached from 'memcached';
 import { promisify } from 'util';
 

diff --git a/packages/apollo-server-cache-memcached/tsconfig.json b/packages/apollo-server-cache-memcached/tsconfig.json
@@ -6,7 +6,5 @@
   },
   "include": ["src/**/*"],
   "exclude": ["**/__tests__"],
-  "references": [
-    { "path": "../apollo-server-caching" },
-  ]
+  "references": []
 }
diff --git a/packages/apollo-server-cache-redis/package.json b/packages/apollo-server-cache-redis/package.json
@@ -18,7 +18,7 @@
     "node": ">=12.0"
   },
   "dependencies": {
-    "apollo-server-caching": "file:../apollo-server-caching",
+    "@apollo/utils.keyvaluecache": "^1.0.1",
     "apollo-server-env": "file:../apollo-server-env",
     "dataloader": "^2.0.0",
     "ioredis": "^4.17.3"

diff --git a/packages/apollo-server-cache-redis/src/BaseRedisCache.ts b/packages/apollo-server-cache-redis/src/BaseRedisCache.ts
@@ -1,7 +1,7 @@
 import type {
   KeyValueCache,
   KeyValueCacheSetOptions,
-} from 'apollo-server-caching';
+} from '@apollo/utils.keyvaluecache';
 import DataLoader from 'dataloader';
 
 interface BaseRedisClient {

diff --git a/packages/apollo-server-cache-redis/tsconfig.json b/packages/apollo-server-cache-redis/tsconfig.json
@@ -6,7 +6,5 @@
   },
   "include": ["src/**/*"],
   "exclude": ["**/__tests__"],
-  "references": [
-    { "path": "../apollo-server-caching" },
-  ]
+  "references": []
 }
diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json
@@ -25,6 +25,7 @@
     "node": ">=12.0"
   },
   "dependencies": {
+    "@apollo/utils.keyvaluecache": "^1.0.1",
     "@apollo/utils.logger": "^1.0.0",
     "@apollo/utils.usagereporting": "^1.0.0",
     "@apollographql/apollo-tools": "^0.5.3",
@@ -34,7 +35,6 @@
     "@josephg/resolvable": "^1.0.0",
     "apollo-datasource": "file:../apollo-datasource",
     "apollo-reporting-protobuf": "file:../apollo-reporting-protobuf",
-    "apollo-server-caching": "file:../apollo-server-caching",
     "apollo-server-env": "file:../apollo-server-env",
     "apollo-server-errors": "file:../apollo-server-errors",
     "apollo-server-plugin-base": "file:../apollo-server-plugin-base",