refactor: replace getDocument() with inject(DOCUMENT)

This replaces `getDocument()` with `inject(DOCUMENT)` across hydration and transfer state logic.

Author: alan-agius4

packages/core/src/hydration/api.ts

@@ -24,7 +24,6 @@ import {enableLocateOrCreateElementContainerNodeImpl} from '../render3/instructi
 import {enableApplyRootElementTransformImpl} from '../render3/instructions/shared';
 import {enableLocateOrCreateContainerAnchorImpl} from '../render3/instructions/template';
 import {enableLocateOrCreateTextNodeImpl} from '../render3/instructions/text';
-import {getDocument} from '../render3/interfaces/document';
 import {TransferState} from '../transfer_state';
 import {performanceMarkFeature} from '../util/performance';
 import {NgZone} from '../zone';
@@ -56,6 +55,7 @@ import {enableFindMatchingDehydratedViewImpl} from './views';
 import {DEHYDRATED_BLOCK_REGISTRY, DehydratedBlockRegistry} from '../defer/registry';
 import {gatherDeferBlocksCommentNodes} from './node_lookup_utils';
 import {processAndInitTriggers} from '../defer/triggering';
+import {DOCUMENT} from '../document';
 
 /**
  * Indicates whether the hydration-related code was added,
@@ -186,8 +186,7 @@ export const CLIENT_RENDER_MODE_FLAG = 'ngcm';
 /**
  * Checks whether the `RenderMode.Client` was defined for the current route.
  */
-function isClientRenderModeEnabled(): boolean {
-  const doc = getDocument();
+function isClientRenderModeEnabled(doc: Document): boolean {
   return (
     (typeof ngServerMode === 'undefined' || !ngServerMode) &&
     doc.body.hasAttribute(CLIENT_RENDER_MODE_FLAG)
@@ -237,10 +236,15 @@ export function withDomHydration(): EnvironmentProviders {
           return;
         }
 
+        const doc = inject(DOCUMENT);
         if (inject(IS_HYDRATION_DOM_REUSE_ENABLED)) {
-          verifySsrContentsIntegrity(getDocument());
+          verifySsrContentsIntegrity(doc);
           enableHydrationRuntimeSupport();
-        } else if (typeof ngDevMode !== 'undefined' && ngDevMode && !isClientRenderModeEnabled()) {
+        } else if (
+          typeof ngDevMode !== 'undefined' &&
+          ngDevMode &&
+          !isClientRenderModeEnabled(doc)
+        ) {
           const console = inject(Console);
           const message = formatRuntimeError(
             RuntimeErrorCode.MISSING_HYDRATION_ANNOTATIONS,
@@ -369,7 +373,7 @@ export function withIncrementalHydration(): Provider[] {
       provide: APP_BOOTSTRAP_LISTENER,
       useFactory: () => {
         const injector = inject(Injector);
-        const doc = getDocument();
+        const doc = inject(DOCUMENT);
 
         return () => {
           const deferBlockData = processBlockData(injector);

packages/core/src/render3/util/transfer_state_utils.ts

@@ -6,11 +6,11 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {getDocument} from '../interfaces/document';
 import {Injector} from '../../di';
 import {isInternalHydrationTransferStateKey} from '../../hydration/utils';
 import {APP_ID} from '../../application/application_tokens';
 import {retrieveTransferredState} from '../../transfer_state';
+import {DOCUMENT} from '../../document';
 
 /**
  * Retrieves transfer state data from the DOM using the provided injector to get APP_ID.
@@ -22,7 +22,7 @@ import {retrieveTransferredState} from '../../transfer_state';
  * @returns The transfer state data as an object, or empty object if not available
  */
 export function getTransferState(injector: Injector): Record<string, unknown> {
-  const doc = getDocument();
+  const doc = injector.get(DOCUMENT);
   const appId = injector.get(APP_ID);
 
   const transferState = retrieveTransferredState(doc, appId);

packages/core/src/transfer_state.ts

@@ -9,7 +9,7 @@
 import {APP_ID} from './application/application_tokens';
 import {inject} from './di/injector_compatibility';
 import {ɵɵdefineInjectable} from './di/interface/defs';
-import {getDocument} from './render3/interfaces/document';
+import {DOCUMENT} from './document';
 
 /**
  * A type-safe key to use with `TransferState`.
@@ -48,15 +48,6 @@ export function makeStateKey<T = void>(key: string): StateKey<T> {
   return key as StateKey<T>;
 }
 
-function initTransferState(): TransferState {
-  const transferState = new TransferState();
-  if (typeof ngServerMode === 'undefined' || !ngServerMode) {
-    transferState.store = retrieveTransferredState(getDocument(), inject(APP_ID));
-  }
-
-  return transferState;
-}
-
 /**
  * A key value store that is transferred from the application on the server side to the application
  * on the client side.
@@ -77,7 +68,14 @@ export class TransferState {
   static ɵprov = /** @pureOrBreakMyCode */ /* @__PURE__ */ ɵɵdefineInjectable({
     token: TransferState,
     providedIn: 'root',
-    factory: initTransferState,
+    factory: () => {
+      const transferState = new TransferState();
+      if (typeof ngServerMode === 'undefined' || !ngServerMode) {
+        transferState.store = retrieveTransferredState(inject(DOCUMENT), inject(APP_ID));
+      }
+
+      return transferState;
+    },
   });
 
   /** @internal */

packages/core/test/bundling/hydration/bundle.golden_symbols.json

@@ -537,7 +537,6 @@
       "initDomAdapter",
       "initFeatures",
       "initTNodeFlags",
-      "initTransferState",
       "initializeDirectives",
       "initializeInputAndOutputAliases",
       "inject2",

packages/platform-server/test/transfer_state_spec.ts

@@ -15,7 +15,7 @@ import {
   ɵgetTransferState as getTransferState,
   Injector,
   inject,
-  ɵsetDocument as setDocument,
+  DOCUMENT,
 } from '@angular/core';
 import {BrowserModule, withEventReplay, withIncrementalHydration} from '@angular/platform-browser';
 import {renderModule, ServerModule} from '../index';
@@ -132,18 +132,27 @@ describe('transfer_state', () => {
         }
       }
 
-      const appId = 'custom-app-id';
-      const providers = [{provide: APP_ID, useValue: appId}];
       const hydrationFeatures = () => [withIncrementalHydration(), withEventReplay()];
 
-      const html = await ssr(SimpleComponent, {envProviders: providers, hydrationFeatures});
+      const appId = 'custom-app-id';
+      const html = await ssr(SimpleComponent, {
+        envProviders: [{provide: APP_ID, useValue: appId}],
+        hydrationFeatures,
+      });
       const transferCacheJson = getHydrationInfoFromTransferState(html)!;
 
       // getTransferState reaches into the DOM to retrieve the transfer state.
       // So we need to set the document with the generated HTML.
       const {document} = domino.createWindow(html);
-      setDocument(document);
-      const transferState = getTransferState(Injector.create({providers}));
+
+      const transferState = getTransferState(
+        Injector.create({
+          providers: [
+            {provide: DOCUMENT, useValue: document},
+            {provide: APP_ID, useValue: appId},
+          ],
+        }),
+      );
 
       // The transfer state also contains internal hydration keys,
       expect(Object.keys(transferState).length).not.toEqual(JSON.parse(transferCacheJson).length);