diff --git a/packages/apollo-cache-inmemory/package-lock.json b/packages/apollo-cache-inmemory/package-lock.json index 660630b353e..b173e11e51c 100644 --- a/packages/apollo-cache-inmemory/package-lock.json +++ b/packages/apollo-cache-inmemory/package-lock.json @@ -33,9 +33,9 @@ "integrity": "sha512-LWbJPZnidF8eczu7XmcnLBsumuyRBkpwIRPCZxlojouhBo5jEBO4toj6n7hMy6IxHU/c+MqDSWkvaTpPlMQcyA==" }, "optimism": { - "version": "0.6.8", - "resolved": "https://registry.npmjs.org/optimism/-/optimism-0.6.8.tgz", - "integrity": "sha512-bN5n1KCxSqwBDnmgDnzMtQTHdL+uea2HYFx1smvtE+w2AMl0Uy31g0aXnP/Nt85OINnMJPRpJyfRQLTCqn5Weg==", + "version": "0.6.9", + "resolved": "https://registry.npmjs.org/optimism/-/optimism-0.6.9.tgz", + "integrity": "sha512-xoQm2lvXbCA9Kd7SCx6y713Y7sZ6fUc5R6VYpoL5M6svKJbTuvtNopexK8sO8K4s0EOUYHuPN2+yAEsNyRggkQ==", "requires": { "immutable-tuple": "^0.4.9" } diff --git a/packages/apollo-cache-inmemory/package.json b/packages/apollo-cache-inmemory/package.json index 7f0c0945aa0..bc0fe217808 100644 --- a/packages/apollo-cache-inmemory/package.json +++ b/packages/apollo-cache-inmemory/package.json @@ -44,7 +44,7 @@ "dependencies": { "apollo-cache": "file:../apollo-cache", "apollo-utilities": "file:../apollo-utilities", - "optimism": "^0.6.8" + "optimism": "^0.6.9" }, "peerDependencies": { "graphql": "0.11.7 || ^0.12.0 || ^0.13.0 || ^14.0.0" diff --git a/packages/apollo-cache-inmemory/src/optimism.ts b/packages/apollo-cache-inmemory/src/cacheKeys.ts similarity index 59% rename from packages/apollo-cache-inmemory/src/optimism.ts rename to packages/apollo-cache-inmemory/src/cacheKeys.ts index 9f167d99fc1..4cee3d14db3 100644 --- a/packages/apollo-cache-inmemory/src/optimism.ts +++ b/packages/apollo-cache-inmemory/src/cacheKeys.ts @@ -1,19 +1,3 @@ -export type OptimisticWrapperFunction< - T = (...args: any[]) => any -> = T & { - // The .dirty(...) method of an optimistic function takes exactly the same - // parameter types as the original function. - dirty: T; -}; - -export type OptimisticWrapOptions = { - max?: number; - disposable?: boolean; - makeCacheKey?(...args: any[]): any; -}; - -export { wrap } from 'optimism'; - export class CacheKeyNode { private children: Map> | null = null; private key: KeyType | null = null; @@ -34,7 +18,7 @@ export class CacheKeyNode { const map = this.children || (this.children = new Map()); let node = map.get(value); if (!node) { - map.set(value, node = new CacheKeyNode()); + map.set(value, (node = new CacheKeyNode())); } return node; } diff --git a/packages/apollo-cache-inmemory/src/declarations.d.ts b/packages/apollo-cache-inmemory/src/declarations.d.ts deleted file mode 100644 index 8ce2256e602..00000000000 --- a/packages/apollo-cache-inmemory/src/declarations.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -declare module 'optimism' { - export function wrap( - originalFunction: T, - options?: OptimisticWrapOptions, - ): OptimisticWrapperFunction; -} diff --git a/packages/apollo-cache-inmemory/src/depTrackingCache.ts b/packages/apollo-cache-inmemory/src/depTrackingCache.ts index a671db941d7..80ef59e682d 100644 --- a/packages/apollo-cache-inmemory/src/depTrackingCache.ts +++ b/packages/apollo-cache-inmemory/src/depTrackingCache.ts @@ -1,5 +1,5 @@ import { NormalizedCache, NormalizedCacheObject, StoreObject } from './types'; -import { wrap, OptimisticWrapperFunction } from './optimism'; +import { wrap, OptimisticWrapperFunction } from 'optimism'; const hasOwn = Object.prototype.hasOwnProperty; diff --git a/packages/apollo-cache-inmemory/src/inMemoryCache.ts b/packages/apollo-cache-inmemory/src/inMemoryCache.ts index 11488ac6a92..79fc9d03d63 100644 --- a/packages/apollo-cache-inmemory/src/inMemoryCache.ts +++ b/packages/apollo-cache-inmemory/src/inMemoryCache.ts @@ -5,9 +5,9 @@ import { DocumentNode } from 'graphql'; import { Cache, ApolloCache, Transaction } from 'apollo-cache'; -import { - addTypenameToDocument, -} from 'apollo-utilities'; +import { addTypenameToDocument } from 'apollo-utilities'; + +import { wrap } from 'optimism'; import { HeuristicFragmentMatcher } from './fragmentMatcher'; import { @@ -18,9 +18,8 @@ import { import { StoreReader } from './readFromStore'; import { StoreWriter } from './writeToStore'; - import { DepTrackingCache } from './depTrackingCache'; -import { wrap, CacheKeyNode } from './optimism'; +import { CacheKeyNode } from './cacheKeys'; import { ObjectCache } from './objectCache'; export interface InMemoryCacheConfig extends ApolloReducerConfig { diff --git a/packages/apollo-cache-inmemory/src/readFromStore.ts b/packages/apollo-cache-inmemory/src/readFromStore.ts index e8fa033baca..008fea46eda 100644 --- a/packages/apollo-cache-inmemory/src/readFromStore.ts +++ b/packages/apollo-cache-inmemory/src/readFromStore.ts @@ -39,9 +39,8 @@ import { SelectionSetNode, } from 'graphql'; -import { wrap, CacheKeyNode } from './optimism'; -export { OptimisticWrapperFunction } from './optimism'; - +import { wrap } from 'optimism'; +import { CacheKeyNode } from './cacheKeys'; import { DepTrackingCache } from './depTrackingCache'; export type VariableMap = { [name: string]: any };