Reenable Rollup preserveModules option, and consolidate utils/utilities directories.

CHANGELOG.md

@@ -53,8 +53,11 @@
   - `QueryManager#startQuery`
   - `ObservableQuery#currentResult`
 
-- `ApolloClient` is now only available as a named export. The default
-  `ApolloClient` export has been removed.
+- `ApolloClient` is now only available as a named export. The default `ApolloClient` export has been removed. <br/>
+  [@hwillson](https://github.com/hwillson) in [#5425](https://github.com/apollographql/apollo-client/pull/5425)
+
+- Utilities that were previously externally available through the `apollo-utilities` package, are now internal only. <br/>
+  [@hwillson](https://github.com/hwillson) in [#TODO](https://github.com/apollographql/apollo-client/pull/TODO)
 
 ## Apollo Client (2.6.4)
 

config/jest.config.js

@@ -12,7 +12,8 @@ module.exports = {
   testURL: 'http://localhost',
   testPathIgnorePatterns: [
     '/node_modules/',
-    '/dist/'
+    '/dist/',
+    'src/__tests__/utils'
   ],
   modulePathIgnorePatterns: ['/dist/'],
   setupFiles: ['<rootDir>/src/config/jest/setup.ts'],

config/rollup.config.js

@@ -38,6 +38,12 @@ function prepareESM() {
       format: 'esm',
       sourcemap: true,
     },
+    // The purpose of this job is to ensure each `./dist` ESM file is run
+    // through the `invariantPlugin`, with any resulting changes added
+    // directly back into each ESM file. By setting `preserveModules`
+    // to `true`, we're making sure Rollup doesn't attempt to create a single
+    // combined ESM bundle with the final result of running this job.
+    preserveModules: true,
     plugins: [
       nodeResolve(),
       invariantPlugin({

package.json

@@ -48,7 +48,7 @@
     {
       "name": "apollo-client",
       "path": "./dist/apollo-client.cjs.min.js",
-      "maxSize": "24 kB"
+      "maxSize": "22.75 kB"
     }
   ],
   "peerDependencies": {

src/ApolloClient.ts

@@ -1,13 +1,11 @@
 import { ExecutionResult, DocumentNode } from 'graphql';
 import { invariant, InvariantError } from 'ts-invariant';
 
-import {
-  ApolloLink,
-  FetchResult,
-  GraphQLRequest,
-  execute,
-} from './link/core';
-import { ApolloCache, DataProxy } from './cache/core';
+import { ApolloLink } from './link/core/ApolloLink';
+import { FetchResult, GraphQLRequest } from './link/core/types';
+import { execute } from './link/core/execute';
+import { ApolloCache } from './cache/core/cache';
+import { DataProxy } from './cache/core/types/DataProxy';
 import { QueryManager } from './core/QueryManager';
 import {
   ApolloQueryResult,
@@ -16,7 +14,7 @@ import {
 } from './core/types';
 import { ObservableQuery } from './core/ObservableQuery';
 import { LocalState, FragmentMatcher } from './core/LocalState';
-import { Observable } from './util/Observable';
+import { Observable } from './utilities/observables/Observable';
 import {
   QueryOptions,
   WatchQueryOptions,
@@ -26,7 +24,8 @@ import {
 } from './core/watchQueryOptions';
 import { DataStore } from './data/store';
 import { version } from './version';
-import { UriFunction, HttpLink } from './link/http';
+import { HttpLink } from './link/http/HttpLink';
+import { UriFunction } from './link/http/selectHttpOptionsAndBody';
 
 export interface DefaultOptions {
   watchQuery?: Partial<WatchQueryOptions>;

src/__mocks__/mockLinks.ts

@@ -1,12 +1,12 @@
 import { print } from 'graphql/language/printer';
 
-import { Observable } from '../util/Observable';
+import { Observable } from '../utilities/observables/Observable';
+import { ApolloLink } from '../link/core/ApolloLink';
 import {
   Operation,
-  ApolloLink,
   FetchResult,
   GraphQLRequest,
-} from '../link/core';
+} from '../link/core/types';
 
 interface MockApolloLink extends ApolloLink {
   operation?: Operation;

src/__mocks__/mockQueryManager.ts

@@ -3,7 +3,7 @@ import { QueryManager } from '../core/QueryManager';
 import { mockSingleLink, MockedResponse } from './mockLinks';
 
 import { DataStore } from '../data/store';
-import { InMemoryCache } from '../cache/inmemory';
+import { InMemoryCache } from '../cache/inmemory/inMemoryCache';
 
 // Helper method for the tests that construct a query manager out of a
 // a list of mocked responses for a mocked network interface.

src/__tests__/ApolloClient.ts

@@ -1,11 +1,12 @@
 import gql from 'graphql-tag';
 
-import { Observable } from '../util/Observable';
-import { ApolloLink } from '../link/core';
-import { HttpLink } from '../link/http';
-import { InMemoryCache, makeReference } from '../cache/inmemory';
-import { stripSymbols } from '../utilities';
-import { withWarning } from '../util/wrap';
+import { Observable } from '../utilities/observables/Observable';
+import { ApolloLink } from '../link/core/ApolloLink';
+import { HttpLink } from '../link/http/HttpLink';
+import { InMemoryCache } from '../cache/inmemory/inMemoryCache';
+import { makeReference } from '../cache/inmemory/helpers';
+import { stripSymbols } from './utils/stripSymbols';
+import { withWarning } from './utils/wrap';
 import { ApolloClient } from '../';
 import { DefaultOptions } from '../ApolloClient';
 import { FetchPolicy, QueryOptions } from '../core/watchQueryOptions';

src/__tests__/client.ts

@@ -2,15 +2,16 @@ import { cloneDeep, assign } from 'lodash';
 import { GraphQLError, ExecutionResult, DocumentNode } from 'graphql';
 import gql from 'graphql-tag';
 
-import { Observable } from '../util/Observable';
-import { ApolloLink } from '../link/core';
-import { InMemoryCache, PossibleTypesMap } from '../cache/inmemory';
-import { stripSymbols } from '../utilities';
+import { Observable } from '../utilities/observables/Observable';
+import { ApolloLink } from '../link/core/ApolloLink';
+import { InMemoryCache } from '../cache/inmemory/inMemoryCache';
+import { PossibleTypesMap } from '../cache/inmemory/types';
+import { stripSymbols } from './utils/stripSymbols';
 import { WatchQueryOptions, FetchPolicy } from '../core/watchQueryOptions';
 import { ApolloError } from '../errors/ApolloError';
 import { ApolloClient } from '..';
-import subscribeAndCount from '../util/subscribeAndCount';
-import { withWarning } from '../util/wrap';
+import subscribeAndCount from './utils/subscribeAndCount';
+import { withWarning } from './utils/wrap';
 import { mockSingleLink } from '../__mocks__/mockLinks';
 
 describe('client', () => {

src/__tests__/fetchMore.ts

@@ -2,7 +2,7 @@ import { assign, cloneDeep } from 'lodash';
 import gql from 'graphql-tag';
 
 import { mockSingleLink } from '../__mocks__/mockLinks';
-import { InMemoryCache } from '../cache/inmemory';
+import { InMemoryCache } from '../cache/inmemory/inMemoryCache';
 import { ApolloClient, NetworkStatus, ObservableQuery } from '../';
 
 describe('updateQuery on a simple query', () => {

src/__tests__/graphqlSubscriptions.ts

@@ -1,7 +1,7 @@
 import gql from 'graphql-tag';
 
 import { mockObservableLink, MockedSubscription } from '../__mocks__/mockLinks';
-import { InMemoryCache } from '../cache/inmemory';
+import { InMemoryCache } from '../cache/inmemory/inMemoryCache';
 import { ApolloClient } from '../';
 import { QueryManager } from '../core/QueryManager';
 import { DataStore } from '../data/store';

src/__tests__/local-state/export.ts

@@ -1,10 +1,10 @@
 import gql from 'graphql-tag';
 import { print } from 'graphql/language/printer';
 
-import { Observable } from '../../util/Observable';
-import { ApolloLink } from '../../link/core';
+import { Observable } from '../../utilities/observables/Observable';
+import { ApolloLink } from '../../link/core/ApolloLink';
 import { ApolloClient } from '../..';
-import { InMemoryCache } from '../../cache/inmemory';
+import { InMemoryCache } from '../../cache/inmemory/inMemoryCache';
 
 describe('@client @export tests', () => {
   it(

src/__tests__/local-state/general.ts

@@ -2,12 +2,13 @@ import gql from 'graphql-tag';
 import { DocumentNode, GraphQLError } from 'graphql';
 import { introspectionQuery } from 'graphql/utilities';
 
-import { Observable } from '../../util/Observable';
-import { ApolloLink, Operation } from '../../link/core';
+import { Observable } from '../../utilities/observables/Observable';
+import { ApolloLink } from '../../link/core/ApolloLink';
+import { Operation } from '../../link/core/types';
 import { ApolloClient } from '../..';
-import { ApolloCache } from '../../cache/core';
-import { InMemoryCache } from '../../cache/inmemory';
-import { hasDirectives } from '../../utilities';
+import { ApolloCache } from '../../cache/core/cache';
+import { InMemoryCache } from '../../cache/inmemory/inMemoryCache';
+import { hasDirectives } from '../../utilities/graphql/directives';
 
 describe('General functionality', () => {
   it('should not impact normal non-@client use', () => {

src/__tests__/local-state/resolvers.ts

@@ -2,16 +2,15 @@ import gql from 'graphql-tag';
 import { DocumentNode, ExecutionResult } from 'graphql';
 import { assign } from 'lodash';
 
-import { Observable } from '../../util/Observable';
-import { ApolloLink } from '../../link/core';
+import { Observable, Observer } from '../../utilities/observables/Observable';
+import { ApolloLink } from '../../link/core/ApolloLink';
 import { ApolloClient } from '../..';
 import mockQueryManager from '../../__mocks__/mockQueryManager';
-import { Observer } from '../../util/Observable';
-import wrap from '../../util/wrap';
+import wrap from '../../__tests__/utils/wrap';
 import { ApolloQueryResult, Resolvers } from '../../core/types';
 import { WatchQueryOptions } from '../../core/watchQueryOptions';
 import { LocalState } from '../../core/LocalState';
-import { InMemoryCache } from '../../cache/inmemory';
+import { InMemoryCache } from '../../cache/inmemory/inMemoryCache';
 
 // Helper method that sets up a mockQueryManager and then passes on the
 // results to an observer.

src/__tests__/local-state/subscriptions.ts

@@ -1,9 +1,9 @@
 import gql from 'graphql-tag';
 
-import { Observable } from '../../util/Observable';
-import { ApolloLink } from '../../link/core';
+import { Observable } from '../../utilities/observables/Observable';
+import { ApolloLink } from '../../link/core/ApolloLink';
 import { ApolloClient } from '../..';
-import { InMemoryCache } from '../../cache/inmemory';
+import { InMemoryCache } from '../../cache/inmemory/inMemoryCache';
 
 describe('Basic functionality', () => {
   it('should not break subscriptions', done => {

src/__tests__/mutationResults.ts

@@ -1,13 +1,12 @@
 import { cloneDeep } from 'lodash';
 import gql from 'graphql-tag';
 
-import { Observable } from '../util/Observable';
-import { ApolloLink } from '../link/core';
+import { Observable, Subscription } from '../utilities/observables/Observable';
+import { ApolloLink } from '../link/core/ApolloLink';
 import { mockSingleLink } from '../__mocks__/mockLinks';
 import { ApolloClient } from '..';
-import { InMemoryCache } from '../cache/inmemory';
-import { Subscription } from '../util/Observable';
-import { withWarning } from '../util/wrap';
+import { InMemoryCache } from '../cache/inmemory/inMemoryCache';
+import { withWarning } from './utils/wrap';
 
 describe('mutation results', () => {
   const query = gql`

src/__tests__/optimistic.ts

@@ -5,10 +5,12 @@ import gql from 'graphql-tag';
 
 import { mockSingleLink } from '../__mocks__/mockLinks';
 import { MutationQueryReducersMap } from '../core/types';
-import { Subscription } from '../util/Observable';
+import { Subscription } from '../utilities/observables/Observable';
 import { ApolloClient } from '../';
-import { addTypenameToDocument, stripSymbols } from '../utilities';
-import { InMemoryCache, makeReference } from '../cache/inmemory';
+import { addTypenameToDocument } from '../utilities/graphql/transform';
+import { stripSymbols } from './utils/stripSymbols';
+import { InMemoryCache } from '../cache/inmemory/inMemoryCache';
+import { makeReference } from '../cache/inmemory/helpers';
 
 describe('optimistic mutation results', () => {
   const query = gql`

src/utilities/util/__tests__/stripSymbols.ts → src/__tests__/stripSymbols.ts

@@ -1,4 +1,4 @@
-import { stripSymbols } from '../stripSymbols';
+import { stripSymbols } from './utils/stripSymbols';
 
 interface SymbolConstructor {
   (description?: string | number): symbol;

src/__tests__/subscribeToMore.ts

@@ -1,11 +1,12 @@
 import gql from 'graphql-tag';
 import { DocumentNode, OperationDefinitionNode } from 'graphql';
 
-import { ApolloLink, Operation } from '../link/core';
+import { ApolloLink } from '../link/core/ApolloLink';
+import { Operation } from '../link/core/types';
 import { mockSingleLink, mockObservableLink } from '../__mocks__/mockLinks';
 import { ApolloClient } from '../';
-import { InMemoryCache } from '../cache/inmemory';
-import { stripSymbols } from '../utilities';
+import { InMemoryCache } from '../cache/inmemory/inMemoryCache';
+import { stripSymbols } from './utils/stripSymbols';
 
 const isSub = (operation: Operation) =>
   (operation.query as DocumentNode).definitions

src/util/observableToPromise.ts → src/__tests__/utils/observableToPromise.ts

@@ -1,6 +1,6 @@
-import { ObservableQuery } from '../core/ObservableQuery';
-import { ApolloQueryResult } from '../core/types';
-import { Subscription } from '../util/Observable';
+import { ObservableQuery } from '../../core/ObservableQuery';
+import { ApolloQueryResult } from '../../core/types';
+import { Subscription } from '../../utilities/observables/Observable';
 
 /**
  *

src/util/subscribeAndCount.ts → src/__tests__/utils/subscribeAndCount.ts

@@ -1,7 +1,7 @@
-import { ObservableQuery } from '../core/ObservableQuery';
-import { ApolloQueryResult } from '../core/types';
-import { Subscription } from '../util/Observable';
-import { asyncMap } from './observables';
+import { ObservableQuery } from '../../core/ObservableQuery';
+import { ApolloQueryResult } from '../../core/types';
+import { Subscription } from '../../utilities/observables/Observable';
+import { asyncMap } from '../../utilities/observables/observables';
 
 export default function subscribeAndCount(
   done: jest.DoneCallback,

src/cache/core/cache.ts

@@ -1,7 +1,8 @@
 import { DocumentNode } from 'graphql';
 
-import { getFragmentQueryDocument } from '../../utilities';
-import { DataProxy, Cache } from './types';
+import { getFragmentQueryDocument } from '../../utilities/graphql/fragments';
+import { DataProxy } from './types/DataProxy';
+import { Cache } from './types/Cache';
 import { justTypenameQuery, queryFromPojo, fragmentFromPojo } from './utils';
 
 export type Transaction<T> = (c: ApolloCache<T>) => void;

src/cache/inmemory/__tests__/cache.ts

@@ -1,7 +1,8 @@
 import gql, { disableFragmentWarnings } from 'graphql-tag';
 
-import { stripSymbols, cloneDeep } from '../../../utilities';
-import { InMemoryCache, InMemoryCacheConfig } from '..';
+import { stripSymbols } from '../../../__tests__/utils/stripSymbols';
+import { cloneDeep } from '../../../utilities/common/cloneDeep';
+import { InMemoryCache, InMemoryCacheConfig } from '../inMemoryCache';
 import { makeReference } from '../helpers';
 
 disableFragmentWarnings();

src/cache/inmemory/__tests__/readFromStore.ts

@@ -1,8 +1,8 @@
 import { assign, omit } from 'lodash';
 import gql from 'graphql-tag';
 
-import { stripSymbols } from '../../../utilities';
-import { StoreObject } from '../';
+import { stripSymbols } from '../../../__tests__/utils/stripSymbols';
+import { StoreObject } from '../types';
 import { StoreReader } from '../readFromStore';
 import { defaultNormalizedCacheFactory } from '../entityCache';
 import { withError } from './diffAgainstStore';

src/cache/inmemory/__tests__/roundtrip.ts

@@ -4,7 +4,8 @@ import gql from 'graphql-tag';
 import { withError } from './diffAgainstStore';
 import { withWarning } from './writeToStore';
 import { EntityCache } from '../entityCache';
-import { StoreReader, StoreWriter } from '../';
+import { StoreReader } from '../readFromStore';
+import { StoreWriter } from '../writeToStore';
 
 function assertDeeplyFrozen(value: any, stack: any[] = []) {
   if (value !== null && typeof value === 'object' && stack.indexOf(value) < 0) {

src/cache/inmemory/__tests__/writeToStore.ts

@@ -9,11 +9,9 @@ import {
 } from 'graphql';
 import gql from 'graphql-tag';
 
-import {
-  storeKeyNameFromField,
-  addTypenameToDocument,
-  cloneDeep,
-} from '../../../utilities';
+import { storeKeyNameFromField } from '../../../utilities/graphql/storeUtils';
+import { addTypenameToDocument } from '../../../utilities/graphql/transform';
+import { cloneDeep } from '../../../utilities/common/cloneDeep';
 import { StoreWriter } from '../writeToStore';
 import { defaultNormalizedCacheFactory } from '../entityCache';
 import { makeReference } from '../helpers';

src/cache/inmemory/inMemoryCache.ts

@@ -5,8 +5,10 @@ import { DocumentNode } from 'graphql';
 import { wrap } from 'optimism';
 import { KeyTrie } from 'optimism';
 
-import { Cache, ApolloCache, Transaction } from '../core';
-import { addTypenameToDocument, canUseWeakMap } from '../../utilities';
+import { ApolloCache, Transaction } from '../core/cache';
+import { Cache } from '../core/types/Cache';
+import { addTypenameToDocument } from '../../utilities/graphql/transform';
+import { canUseWeakMap } from '../../utilities/common/canUse';
 import {
   ApolloReducerConfig,
   NormalizedCacheObject,