enforce usage of declare namespace over namespace (#12784)

* enforce usage of `declare namespace` over `namespace`

* refactor `EntityStore` runtime namespace

* chores

* formatting

* adjustments

* chore

Author: phryneas

.api-reports/api-report-cache.api.md

@@ -386,6 +386,10 @@ export abstract class EntityStore implements NormalizedCache {
     replace(newData: NormalizedCacheObject | null): void;
     // (undocumented)
     retain(rootId: string): number;
+    // Warning: (ae-forgotten-export) The symbol "Root" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    static Root: typeof Root;
     // (undocumented)
     get supportsResultCaching(): boolean;
     // (undocumented)
@@ -396,30 +400,6 @@ export abstract class EntityStore implements NormalizedCache {
     toReference: ToReferenceFunction;
 }
 
-// @public (undocumented)
-export namespace EntityStore {
-    // (undocumented)
-    export class Root extends EntityStore {
-        constructor({ policies, resultCaching, seed, }: {
-            policies: Policies;
-            resultCaching?: boolean;
-            seed?: NormalizedCacheObject;
-        });
-        // (undocumented)
-        addLayer(layerId: string, replay: (layer: EntityStore) => any): Layer;
-        // (undocumented)
-        getStorage(): StorageType;
-        // (undocumented)
-        removeLayer(): Root;
-        // (undocumented)
-        readonly storageTrie: Trie<StorageType>;
-        // Warning: (ae-forgotten-export) The symbol "Stump" needs to be exported by the entry point index.d.ts
-        //
-        // (undocumented)
-        readonly stump: Stump;
-    }
-}
-
 // @public (undocumented)
 export interface FieldFunctionOptions<TArgs = Record<string, any>, TVariables = Record<string, any>> {
     // (undocumented)
@@ -873,6 +853,27 @@ export type ReadQueryOptions = {
 
 export { Reference }
 
+// @public (undocumented)
+class Root extends EntityStore {
+    constructor({ policies, resultCaching, seed, }: {
+        policies: Policies;
+        resultCaching?: boolean;
+        seed?: NormalizedCacheObject;
+    });
+    // (undocumented)
+    addLayer(layerId: string, replay: (layer: EntityStore) => any): Layer;
+    // (undocumented)
+    getStorage(): StorageType;
+    // (undocumented)
+    removeLayer(): Root;
+    // (undocumented)
+    readonly storageTrie: Trie<StorageType>;
+    // Warning: (ae-forgotten-export) The symbol "Stump" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    readonly stump: Stump;
+}
+
 // @public (undocumented)
 type SafeReadonly<T> = T extends object ? Readonly<T> : T;
 
@@ -890,7 +891,7 @@ export { StoreValue }
 
 // @public (undocumented)
 class Stump extends Layer {
-    constructor(root: EntityStore.Root);
+    constructor(root: Root);
     // (undocumented)
     merge(older: string | StoreObject, newer: string | StoreObject): void;
     // (undocumented)

.api-reports/api-report-core.api.md

@@ -749,7 +749,6 @@ namespace OverridableTypes {
         // (undocumented)
         return: this["arg1"];
     }
-        {};
 }
 
 export { parseAndCheckHttpResponse }
@@ -1067,7 +1066,7 @@ export type WatchQueryOptions<TVariables extends OperationVariables = OperationV
 
 // Warnings were encountered during analysis:
 //
-// src/core/ApolloClient.ts:360:5 - (ae-forgotten-export) The symbol "NextFetchPolicyContext" needs to be exported by the entry point index.d.ts
+// src/core/ApolloClient.ts:358:5 - (ae-forgotten-export) The symbol "NextFetchPolicyContext" needs to be exported by the entry point index.d.ts
 // src/core/ObservableQuery.ts:359:5 - (ae-forgotten-export) The symbol "QueryManager" needs to be exported by the entry point index.d.ts
 // src/core/QueryManager.ts:175:5 - (ae-forgotten-export) The symbol "MutationStoreValue" needs to be exported by the entry point index.d.ts
 

.api-reports/api-report-link_persisted-queries.api.md

@@ -9,7 +9,6 @@ import type { DocumentNode } from 'graphql';
 import type { ErrorLike } from '@apollo/client';
 import type { FormattedExecutionResult } from 'graphql';
 import type { Operation } from '@apollo/client/link';
-import type { Prettify } from '@apollo/client/utilities/internal';
 
 // @public (undocumented)
 interface BaseOptions {
@@ -21,14 +20,6 @@ interface BaseOptions {
     useGETForHashedQueries?: boolean;
 }
 
-// @public (undocumented)
-type CallbackOptions = {
-    error: ErrorLike;
-    operation: Operation;
-    meta: ErrorMeta;
-    result?: FormattedExecutionResult;
-};
-
 // @public @deprecated (undocumented)
 export const createPersistedQueryLink: (options: PersistedQueryLink.Options) => PersistedQueryLink;
 
@@ -44,7 +35,21 @@ type GenerateHashFunction = (document: DocumentNode) => string | PromiseLike<str
 // @public (undocumented)
 export namespace PersistedQueryLink {
     // (undocumented)
-    export type DisableFunctionOptions = Prettify<CallbackOptions>;
+    export interface CallbackOptions {
+        // (undocumented)
+        error: ErrorLike;
+        // Warning: (ae-forgotten-export) The symbol "ErrorMeta" needs to be exported by the entry point index.d.ts
+        //
+        // (undocumented)
+        meta: ErrorMeta;
+        // (undocumented)
+        operation: Operation;
+        // (undocumented)
+        result?: FormattedExecutionResult;
+    }
+    // (undocumented)
+    export interface DisableFunctionOptions extends CallbackOptions {
+    }
     // (undocumented)
     export interface GenerateHashOptions extends BaseOptions {
         // Warning: (ae-forgotten-export) The symbol "GenerateHashFunction" needs to be exported by the entry point index.d.ts
@@ -56,10 +61,9 @@ export namespace PersistedQueryLink {
     }
     // (undocumented)
     export type Options = SHA256Options | GenerateHashOptions;
-    // Warning: (ae-forgotten-export) The symbol "CallbackOptions" needs to be exported by the entry point index.d.ts
-    //
     // (undocumented)
-    export type RetryFunctionOptions = Prettify<CallbackOptions>;
+    export interface RetryFunctionOptions extends CallbackOptions {
+    }
     // Warning: (ae-forgotten-export) The symbol "BaseOptions" needs to be exported by the entry point index.d.ts
     //
     // (undocumented)
@@ -71,7 +75,6 @@ export namespace PersistedQueryLink {
         // (undocumented)
         sha256: SHA256Function;
     }
-        {};
 }
 
 // @public (undocumented)
@@ -87,10 +90,6 @@ type SHA256Function = (...args: any[]) => string | PromiseLike<string>;
 // @public (undocumented)
 export const VERSION = 1;
 
-// Warnings were encountered during analysis:
-//
-// src/link/persisted-queries/index.ts:38:3 - (ae-forgotten-export) The symbol "ErrorMeta" needs to be exported by the entry point index.d.ts
-
 // (No @packageDocumentation comment for this package)
 
 ```

.api-reports/api-report-masking.api.md

@@ -159,7 +159,6 @@ export namespace GraphQLCodegenDataMasking {
     // Warning: (ae-forgotten-export) The symbol "UnwrapFragmentRefs" needs to be exported by the entry point index.d.ts
     // Warning: (ae-forgotten-export) The symbol "RemoveFragmentName" needs to be exported by the entry point index.d.ts
     export type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? true extends ContainsFragmentsRefs<TData> ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData : TData;
-        {};
 }
 
 // @public

.api-reports/api-report-react.api.md

@@ -704,7 +704,6 @@ namespace OverridableTypes {
         // (undocumented)
         return: this["arg1"];
     }
-        {};
 }
 
 export { PreloadedQueryRef }
@@ -1866,17 +1865,17 @@ type WatchQueryFetchPolicy_2 = FetchPolicy | "cache-and-network" | "standby";
 
 // Warnings were encountered during analysis:
 //
-// src/core/ApolloClient.ts:174:5 - (ae-forgotten-export) The symbol "MutationQueryReducersMap" needs to be exported by the entry point index.d.ts
-// src/core/ApolloClient.ts:177:5 - (ae-forgotten-export) The symbol "NormalizedExecutionResult" needs to be exported by the entry point index.d.ts
-// src/core/ApolloClient.ts:177:5 - (ae-forgotten-export) The symbol "InternalRefetchQueriesInclude" needs to be exported by the entry point index.d.ts
-// src/core/ApolloClient.ts:187:5 - (ae-forgotten-export) The symbol "MutationUpdaterFunction" needs to be exported by the entry point index.d.ts
-// src/core/ApolloClient.ts:190:5 - (ae-forgotten-export) The symbol "OnQueryUpdated" needs to be exported by the entry point index.d.ts
-// src/core/ApolloClient.ts:193:5 - (ae-forgotten-export) The symbol "ErrorPolicy" needs to be exported by the entry point index.d.ts
-// src/core/ApolloClient.ts:199:5 - (ae-forgotten-export) The symbol "MutationFetchPolicy" needs to be exported by the entry point index.d.ts
-// src/core/ApolloClient.ts:236:5 - (ae-forgotten-export) The symbol "FetchPolicy" needs to be exported by the entry point index.d.ts
-// src/core/ApolloClient.ts:357:5 - (ae-forgotten-export) The symbol "WatchQueryFetchPolicy_2" needs to be exported by the entry point index.d.ts
-// src/core/ApolloClient.ts:360:5 - (ae-forgotten-export) The symbol "NextFetchPolicyContext" needs to be exported by the entry point index.d.ts
-// src/core/ApolloClient.ts:372:5 - (ae-forgotten-export) The symbol "RefetchWritePolicy" needs to be exported by the entry point index.d.ts
+// src/core/ApolloClient.ts:172:5 - (ae-forgotten-export) The symbol "MutationQueryReducersMap" needs to be exported by the entry point index.d.ts
+// src/core/ApolloClient.ts:175:5 - (ae-forgotten-export) The symbol "NormalizedExecutionResult" needs to be exported by the entry point index.d.ts
+// src/core/ApolloClient.ts:175:5 - (ae-forgotten-export) The symbol "InternalRefetchQueriesInclude" needs to be exported by the entry point index.d.ts
+// src/core/ApolloClient.ts:185:5 - (ae-forgotten-export) The symbol "MutationUpdaterFunction" needs to be exported by the entry point index.d.ts
+// src/core/ApolloClient.ts:188:5 - (ae-forgotten-export) The symbol "OnQueryUpdated" needs to be exported by the entry point index.d.ts
+// src/core/ApolloClient.ts:191:5 - (ae-forgotten-export) The symbol "ErrorPolicy" needs to be exported by the entry point index.d.ts
+// src/core/ApolloClient.ts:197:5 - (ae-forgotten-export) The symbol "MutationFetchPolicy" needs to be exported by the entry point index.d.ts
+// src/core/ApolloClient.ts:234:5 - (ae-forgotten-export) The symbol "FetchPolicy" needs to be exported by the entry point index.d.ts
+// src/core/ApolloClient.ts:355:5 - (ae-forgotten-export) The symbol "WatchQueryFetchPolicy_2" needs to be exported by the entry point index.d.ts
+// src/core/ApolloClient.ts:358:5 - (ae-forgotten-export) The symbol "NextFetchPolicyContext" needs to be exported by the entry point index.d.ts
+// src/core/ApolloClient.ts:370:5 - (ae-forgotten-export) The symbol "RefetchWritePolicy" needs to be exported by the entry point index.d.ts
 // src/core/ObservableQuery.ts:236:5 - (ae-forgotten-export) The symbol "NetworkStatus" needs to be exported by the entry point index.d.ts
 // src/core/ObservableQuery.ts:359:5 - (ae-forgotten-export) The symbol "QueryManager" needs to be exported by the entry point index.d.ts
 // src/core/QueryManager.ts:175:5 - (ae-forgotten-export) The symbol "MutationStoreValue" needs to be exported by the entry point index.d.ts

.api-reports/api-report.api.md

@@ -880,6 +880,10 @@ abstract class EntityStore implements NormalizedCache {
     replace(newData: NormalizedCacheObject | null): void;
     // (undocumented)
     retain(rootId: string): number;
+    // Warning: (ae-forgotten-export) The symbol "Root" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    static Root: typeof Root;
     // (undocumented)
     get supportsResultCaching(): boolean;
     // (undocumented)
@@ -890,30 +894,6 @@ abstract class EntityStore implements NormalizedCache {
     toReference: ToReferenceFunction;
 }
 
-// @public (undocumented)
-namespace EntityStore {
-    // (undocumented)
-    class Root extends EntityStore {
-        constructor({ policies, resultCaching, seed, }: {
-            policies: Policies;
-            resultCaching?: boolean;
-            seed?: NormalizedCacheObject;
-        });
-        // (undocumented)
-        addLayer(layerId: string, replay: (layer: EntityStore) => any): Layer;
-        // (undocumented)
-        getStorage(): StorageType;
-        // (undocumented)
-        removeLayer(): Root;
-        // (undocumented)
-        readonly storageTrie: Trie<StorageType>;
-        // Warning: (ae-forgotten-export) The symbol "Stump" needs to be exported by the entry point index.d.ts
-        //
-        // (undocumented)
-        readonly stump: Stump;
-    }
-}
-
 // @public
 export interface ErrorLike {
     // (undocumented)
@@ -1219,7 +1199,6 @@ namespace GraphQLCodegenDataMasking {
     // Warning: (ae-forgotten-export) The symbol "UnwrapFragmentRefs" needs to be exported by the entry point index.d.ts
     // Warning: (ae-forgotten-export) The symbol "RemoveFragmentName" needs to be exported by the entry point index.d.ts
     type Unmasked<TData> = true extends IsAny<TData> ? TData : TData extends object ? true extends ContainsFragmentsRefs<TData> ? UnwrapFragmentRefs<RemoveMaskedMarker<RemoveFragmentName<TData>>> : TData : TData;
-        {};
 }
 
 // @public (undocumented)
@@ -2123,7 +2102,6 @@ namespace OverridableTypes {
         // (undocumented)
         return: this["arg1"];
     }
-        {};
 }
 
 // @public (undocumented)
@@ -2446,6 +2424,27 @@ export function rewriteURIForGET(chosenURI: string, body: HttpLink.Body): {
     parseError?: undefined;
 };
 
+// @public (undocumented)
+class Root extends EntityStore {
+    constructor({ policies, resultCaching, seed, }: {
+        policies: Policies;
+        resultCaching?: boolean;
+        seed?: NormalizedCacheObject;
+    });
+    // (undocumented)
+    addLayer(layerId: string, replay: (layer: EntityStore) => any): Layer;
+    // (undocumented)
+    getStorage(): StorageType;
+    // (undocumented)
+    removeLayer(): Root;
+    // (undocumented)
+    readonly storageTrie: Trie<StorageType>;
+    // Warning: (ae-forgotten-export) The symbol "Stump" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    readonly stump: Stump;
+}
+
 // @public (undocumented)
 type SafeReadonly<T> = T extends object ? Readonly<T> : T;
 
@@ -2538,7 +2537,7 @@ export type StoreValue = number | string | string[] | Reference | Reference[] |
 
 // @public (undocumented)
 class Stump extends Layer {
-    constructor(root: EntityStore.Root);
+    constructor(root: Root);
     // (undocumented)
     merge(older: string | StoreObject, newer: string | StoreObject): void;
     // (undocumented)
@@ -2741,8 +2740,8 @@ interface WriteContext extends ReadMergeModifyContext {
 // src/cache/inmemory/policies.ts:166:3 - (ae-forgotten-export) The symbol "KeySpecifier" needs to be exported by the entry point index.d.ts
 // src/cache/inmemory/policies.ts:166:3 - (ae-forgotten-export) The symbol "KeyArgsFunction" needs to be exported by the entry point index.d.ts
 // src/cache/inmemory/types.ts:134:3 - (ae-forgotten-export) The symbol "KeyFieldsFunction" needs to be exported by the entry point index.d.ts
-// src/core/ApolloClient.ts:166:5 - (ae-forgotten-export) The symbol "IgnoreModifier" needs to be exported by the entry point index.d.ts
-// src/core/ApolloClient.ts:360:5 - (ae-forgotten-export) The symbol "NextFetchPolicyContext" needs to be exported by the entry point index.d.ts
+// src/core/ApolloClient.ts:164:5 - (ae-forgotten-export) The symbol "IgnoreModifier" needs to be exported by the entry point index.d.ts
+// src/core/ApolloClient.ts:358:5 - (ae-forgotten-export) The symbol "NextFetchPolicyContext" needs to be exported by the entry point index.d.ts
 // src/core/ObservableQuery.ts:359:5 - (ae-forgotten-export) The symbol "QueryManager" needs to be exported by the entry point index.d.ts
 // src/core/QueryManager.ts:175:5 - (ae-forgotten-export) The symbol "MutationStoreValue" needs to be exported by the entry point index.d.ts
 // src/local-state/LocalState.ts:140:5 - (ae-forgotten-export) The symbol "LocalState" needs to be exported by the entry point index.d.ts

.size-limits.json

@@ -1,6 +1,6 @@
 {
-  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (CJS)": 43823,
-  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (production) (CJS)": 38816,
-  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\"": 33459,
-  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (production)": 27742
+  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (CJS)": 43844,
+  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (production) (CJS)": 38842,
+  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\"": 33439,
+  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (production)": 27709
 }

eslint.config.mjs

@@ -118,6 +118,12 @@ export default [
           fixStyle: "separate-type-imports",
         },
       ],
+      "@typescript-eslint/no-namespace": [
+        "error",
+        {
+          allowDeclarations: true,
+        },
+      ],
     },
   },
   ...fixupConfigRules(compat.extends("plugin:react-hooks/recommended")).map(

src/cache/core/types/Cache.ts

@@ -6,7 +6,7 @@ import type { ApolloCache } from "../cache.js";
 import type { AllFieldsModifier, Modifiers } from "./common.js";
 import { DataProxy } from "./DataProxy.js";
 
-export namespace Cache {
+export declare namespace Cache {
   export type WatchCallback<TData = unknown> = (
     diff: Cache.DiffResult<TData>,
     lastDiff?: Cache.DiffResult<TData>

src/cache/core/types/DataProxy.ts

@@ -1,13 +1,13 @@
 import type { TypedDocumentNode } from "@graphql-typed-document-node/core";
 import type { DocumentNode } from "graphql"; // ignore-comment eslint-disable-line import/no-extraneous-dependencies, import/no-unresolved
 
-import type { OperationVariables, DataValue } from "@apollo/client";
+import type { DataValue, OperationVariables } from "@apollo/client";
 import type { Unmasked } from "@apollo/client/masking";
 import type { Reference } from "@apollo/client/utilities";
 
 import type { MissingFieldError } from "./common.js";
 
-export namespace DataProxy {
+export declare namespace DataProxy {
   export interface Query<TVariables, TData> {
     /**
      * The GraphQL query shape to be used constructed using the `gql` template