@angular/core 18.0.0-rc.1 → 18.0.0-rc.2

package/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * @license Angular v18.0.0-rc.1
+ * @license Angular v18.0.0-rc.2
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -1325,6 +1325,8 @@ export declare interface Component extends Directive {
     encapsulation?: ViewEncapsulation;
     /**
      * Overrides the default interpolation start and end delimiters (`{{` and `}}`).
+     *
+     * @deprecated use Angular's default interpolation delimiters instead.
      */
     interpolation?: [string, string];
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/core",
-  "version": "18.0.0-rc.1",
+  "version": "18.0.0-rc.2",
   "description": "Angular - the core framework",
   "author": "angular",
   "license": "MIT",

package/primitives/event-dispatch/index.d.ts

@@ -1,11 +1,11 @@
 /**
- * @license Angular v18.0.0-rc.1
+ * @license Angular v18.0.0-rc.2
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */
 
 
-declare namespace a11yClickLib {
+declare namespace a11yClick {
     export {
         updateEventInfoForA11yClick,
         preventDefaultForA11yClick,
@@ -24,6 +24,54 @@ declare interface ActionInfo {
 
 declare type ActionInfoInternal = [name: string, element: Element];
 
+/** Resolves actions for Events. */
+declare class ActionResolver {
+    private a11yClickSupport;
+    private readonly syntheticMouseEventSupport;
+    private updateEventInfoForA11yClick?;
+    private preventDefaultForA11yClick?;
+    private populateClickOnlyAction?;
+    constructor({ syntheticMouseEventSupport, }?: {
+        syntheticMouseEventSupport?: boolean;
+    });
+    resolve(eventInfo: eventInfoLib.EventInfo): void;
+    /**
+     * Searches for a jsaction that the DOM event maps to and creates an
+     * object containing event information used for dispatching by
+     * jsaction.Dispatcher. This method populates the `action` and `actionElement`
+     * fields of the EventInfo object passed in by finding the first
+     * jsaction attribute above the target Node of the event, and below
+     * the container Node, that specifies a jsaction for the event
+     * type. If no such jsaction is found, then action is undefined.
+     *
+     * @param eventInfo `EventInfo` to set `action` and `actionElement` if an
+     *    action is found on any `Element` in the path of the `Event`.
+     */
+    private populateAction;
+    /**
+     * Accesses the jsaction map on a node and retrieves the name of the
+     * action the given event is mapped to, if any. It parses the
+     * attribute value and stores it in a property on the node for
+     * subsequent retrieval without re-parsing and re-accessing the
+     * attribute.
+     *
+     * @param actionElement The DOM node to retrieve the jsaction map from.
+     * @param eventInfo `EventInfo` to set `action` and `actionElement` if an
+     *    action is found on the `actionElement`.
+     */
+    private populateActionOnElement;
+    /**
+     * Parses and caches an element's jsaction element into a map.
+     *
+     * This is primarily for internal use.
+     *
+     * @param actionElement The DOM node to retrieve the jsaction map from.
+     * @return Map from event to qualified name of the jsaction bound to it.
+     */
+    private parseActions;
+    addA11yClickSupport(updateEventInfoForA11yClick: typeof a11yClick.updateEventInfoForA11yClick, preventDefaultForA11yClick: typeof a11yClick.preventDefaultForA11yClick, populateClickOnlyAction: typeof a11yClick.populateClickOnlyAction): void;
+}
+
 /**
  * Provides a factory function for bootstrapping an event contract on a
  * specified object (by default, exposed on the `window`).
@@ -35,19 +83,7 @@ declare type ActionInfoInternal = [name: string, element: Element];
  * @param captureEventTypes An array of event names that should be listened to with capture.
  * @param earlyJsactionTracker The object that should receive the event contract.
  */
-export declare function bootstrapEarlyEventContract(field: string, container: HTMLElement, appId: string, eventTypes: string[], captureEventTypes: string[], earlyJsactionTracker?: EventContractTracker<EarlyJsactionDataContainer>): void;
-
-/**
- * Provides a factory function for bootstrapping an event contract on a
- * specified object (by default, exposed on the `window`).
- * @param field The property on the object that the event contract will be placed on.
- * @param container The container that listens to events
- * @param appId A given identifier for an application. If there are multiple apps on the page
- *              then this is how contracts can be initialized for each one.
- * @param events An array of event names that should be listened to.
- * @param earlyJsactionTracker The object that should receive the event contract.
- */
-export declare function bootstrapEventContract(field: string, container: Element, appId: string, events: string[], earlyJsactionTracker?: EventContractTracker<EventContract>): void;
+export declare function bootstrapEarlyEventContract(field: string, container: HTMLElement, appId: string, eventTypes?: string[], captureEventTypes?: string[], earlyJsactionTracker?: EventContractTracker<EarlyJsactionDataContainer>): void;
 
 /** Clones an `EventInfo` */
 declare function cloneEventInfo(eventInfo: EventInfo): EventInfo;
@@ -83,30 +119,23 @@ declare function createEventInfoFromParameters(eventType: string, event: Event,
  * jsaction.
  */
 export declare class Dispatcher {
-    private readonly getHandler?;
-    private readonly baseDispatcher;
-    /** Whether to stop propagation for an `EventInfo`. */
-    private readonly stopPropagation;
-    /**
-     * The actions that are registered for this Dispatcher instance.
-     * This should be the primary one used once migration off of registerHandlers
-     * is done.
-     */
-    private readonly actions;
-    /** A map of global event handlers, where each key is an event type. */
-    private readonly globalHandlers;
-    /** The event replayer. */
+    private readonly dispatchDelegate;
+    private actionResolver?;
+    /** The replayer function to be called when there are queued events. */
     private eventReplayer?;
+    /** Whether the event replay is scheduled. */
+    private eventReplayScheduled;
+    /** The queue of events. */
+    private readonly replayEventInfoWrappers;
     /**
-     * Receives a DOM event, determines the jsaction associated with the source
-     * element of the DOM event, and invokes the handler associated with the
-     * jsaction.
-     *
-     * @param getHandler A function that knows how to get the handler for a
-     *     given event info.
+     * Options are:
+     *   1. `eventReplayer`: When the event contract dispatches replay events
+     *      to the Dispatcher, the Dispatcher collects them and in the next tick
+     *      dispatches them to the `eventReplayer`.
+     * @param dispatchDelegate A function that should handle dispatching an `EventInfoWrapper` to handlers.
      */
-    constructor(getHandler?: ((eventInfoWrapper: EventInfoWrapper) => EventInfoWrapperHandler | void) | undefined, { stopPropagation, eventReplayer, }?: {
-        stopPropagation?: boolean;
+    constructor(dispatchDelegate: (eventInfoWrapper: EventInfoWrapper) => void, { actionResolver, eventReplayer, }?: {
+        actionResolver?: ActionResolver;
         eventReplayer?: Replayer;
     });
     /**
@@ -129,84 +158,13 @@ export declare class Dispatcher {
      * @param eventInfo The info for the event that triggered this call or the
      *     queue of events from EventContract.
      */
-    dispatch(eventInfo: EventInfo, isGlobalDispatch?: boolean): void;
-    /**
-     * Dispatches an `EventInfoWrapper`.
-     */
-    private dispatchToHandler;
-    /**
-     * Registers multiple methods all bound to the same object
-     * instance. This is a common case: an application module binds
-     * multiple of its methods under public names to the event contract of
-     * the application. So we provide a shortcut for it.
-     * Attempts to replay the queued events after registering the handlers.
-     *
-     * @param namespace The namespace of the jsaction name.
-     *
-     * @param instance The object to bind the methods to. If this is null, then
-     *     the functions are not bound, but directly added under the public names.
-     *
-     * @param methods A map from public name to functions that will be bound to
-     *     instance and registered as action under the public name. I.e. the
-     *     property names are the public names. The property values are the
-     *     methods of instance.
-     */
-    registerEventInfoHandlers<T>(namespace: string, instance: T | null, methods: {
-        [key: string]: EventInfoWrapperHandler;
-    }): void;
-    /**
-     * Unregisters an action.  Provided as an easy way to reverse the effects of
-     * registerHandlers.
-     * @param namespace The namespace of the jsaction name.
-     * @param name The action name to unbind.
-     */
-    unregisterHandler(namespace: string, name: string): void;
-    /** Registers a global event handler. */
-    registerGlobalHandler(eventType: string, handler: GlobalHandler): void;
-    /** Unregisters a global event handler. */
-    unregisterGlobalHandler(eventType: string, handler: GlobalHandler): void;
-    /**
-     * Checks whether there is an action registered under the given
-     * name. This returns true if there is a namespace handler, even
-     * if it can not yet handle the event.
-     *
-     * @param name Action name.
-     * @return Whether the name is registered.
-     * @see #canDispatch
-     */
-    hasAction(name: string): boolean;
-    /**
-     * Whether this dispatcher can dispatch the event. This can be used by
-     * event replayer to check whether the dispatcher can replay an event.
-     */
-    canDispatch(eventInfoWrapper: EventInfoWrapper): boolean;
+    dispatch(eventInfo: EventInfo): void;
     /**
-     * Sets the event replayer, enabling queued events to be replayed when actions
-     * are bound. To replay events, you must register the dispatcher to the
-     * contract after setting the `EventReplayer`. The event replayer takes as
-     * parameters the queue of events and the dispatcher (used to check whether
-     * actions have handlers registered and can be replayed). The event replayer
-     * is also responsible for dequeuing events.
-     *
-     * Example: An event replayer that replays only the last event.
-     *
-     *   const dispatcher = new Dispatcher();
-     *   // ...
-     *   dispatcher.setEventReplayer((queue, dispatcher) => {
-     *     const lastEventInfoWrapper = queue[queue.length -1];
-     *     if (dispatcher.canDispatch(lastEventInfoWrapper.getAction())) {
-     *       jsaction.replay.replayEvent(
-     *           lastEventInfoWrapper.getEvent(),
-     *           lastEventInfoWrapper.getTargetElement(),
-     *           lastEventInfoWrapper.getEventType(),
-     *       );
-     *       queue.length = 0;
-     *     }
-     *   });
-     *
-     * @param eventReplayer It allows elements to be replayed and dequeuing.
+     * Schedules an `EventInfoWrapper` for replay. The replaying will happen in its own
+     * stack once the current flow cedes control. This is done to mimic
+     * browser event handling.
      */
-    setEventReplayer(eventReplayer: Replayer): void;
+    private scheduleEventInfoWrapperReplay;
 }
 
 /** A function that is called to handle events captured by the EventContract. */
@@ -216,14 +174,19 @@ declare type Dispatcher_2 = (eventInfo: eventInfoLib.EventInfo, globalDispatch?:
  * Defines the early jsaction data types.
  */
 declare interface EarlyJsactionData {
+    /** List used to keep track of the early JSAction event types. */
     et: string[];
+    /** List used to keep track of capture event types. */
     etc: string[];
+    /** List used to keep track of the JSAction events if using earlyeventcontract. */
     q: EventInfo[];
+    /** Early Jsaction handler. */
     h: (event: Event) => void;
+    /** Container for listening to events. */
     c: HTMLElement;
 }
 
-declare interface EarlyJsactionDataContainer {
+export declare interface EarlyJsactionDataContainer {
     _ejsa?: EarlyJsactionData;
 }
 
@@ -242,11 +205,11 @@ declare interface EarlyJsactionDataContainer {
  * be delay loaded in a generic way.
  */
 export declare class EventContract implements UnrenamedEventContract {
-    static CUSTOM_EVENT_SUPPORT: boolean;
+    private readonly useActionResolver;
     static A11Y_CLICK_SUPPORT: boolean;
     static MOUSE_SPECIAL_SUPPORT: boolean;
     private containerManager;
-    private readonly actionResolver;
+    private readonly actionResolver?;
     /**
      * The DOM events which this contract covers. Used to prevent double
      * registration of event types. The value of the map is the
@@ -271,8 +234,8 @@ export declare class EventContract implements UnrenamedEventContract {
     private queuedEventInfos;
     /** Whether to add an a11y click listener. */
     private addA11yClickListener;
-    ecaacs?: (updateEventInfoForA11yClick: typeof a11yClickLib.updateEventInfoForA11yClick, preventDefaultForA11yClick: typeof a11yClickLib.preventDefaultForA11yClick, populateClickOnlyAction: typeof a11yClickLib.populateClickOnlyAction) => void;
-    constructor(containerManager: EventContractContainerManager);
+    ecaacs?: (updateEventInfoForA11yClick: typeof a11yClick.updateEventInfoForA11yClick, preventDefaultForA11yClick: typeof a11yClick.preventDefaultForA11yClick, populateClickOnlyAction: typeof a11yClick.populateClickOnlyAction) => void;
+    constructor(containerManager: EventContractContainerManager, useActionResolver?: boolean);
     private handleEvent;
     /**
      * Handle an `EventInfo`.
@@ -500,11 +463,6 @@ export declare class EventInfoWrapper {
     clone(): EventInfoWrapper;
 }
 
-/**
- * A handler is dispatched to during normal handling.
- */
-declare type EventInfoWrapperHandler = (eventInfoWrapper: EventInfoWrapper) => void;
-
 /** Added for readability when accessing stable property names. */
 declare function getA11yClickKey(eventInfo: EventInfo): boolean | undefined;
 
@@ -535,12 +493,6 @@ declare function getTargetElement(eventInfo: EventInfo): Element;
 /** Added for readability when accessing stable property names. */
 declare function getTimestamp(eventInfo: EventInfo): number;
 
-/**
- * A global handler is dispatched to before normal handler dispatch. Returning
- * false will `preventDefault` on the event.
- */
-declare type GlobalHandler = (event: Event) => boolean | void;
-
 /**
  * Sets the `action` to `clickonly` for a click event that is not an a11y click
  * and if there is not already a click action.
@@ -565,14 +517,14 @@ export declare function registerDispatcher(eventContract: UnrenamedEventContract
  * A replayer is a function that is called when there are queued events,
  * either from the `EventContract` or when there are no detected handlers.
  */
-declare type Replayer = (eventInfoWrappers: EventInfoWrapper[], dispatcher: Dispatcher) => void;
+declare type Replayer = (eventInfoWrappers: EventInfoWrapper[]) => void;
 
 
 /**
  * @fileoverview An enum to control who can call certain jsaction APIs.
  */
 declare enum Restriction {
-    I_AM_THE_JSACTION_FRAMEWORK = 1
+    I_AM_THE_JSACTION_FRAMEWORK = 0
 }
 
 /** Added for readability when accessing stable property names. */
@@ -604,7 +556,7 @@ declare function setTimestamp(eventInfo: EventInfo, timestamp: number): void;
  */
 declare interface UnrenamedEventContract {
     ecrd(dispatcher: Dispatcher_2, restriction: Restriction): void;
-    ecaacs?: (updateEventInfoForA11yClick: typeof a11yClickLib.updateEventInfoForA11yClick, preventDefaultForA11yClick: typeof a11yClickLib.preventDefaultForA11yClick, populateClickOnlyAction: typeof a11yClickLib.populateClickOnlyAction) => void;
+    ecaacs?: (updateEventInfoForA11yClick: typeof a11yClick.updateEventInfoForA11yClick, preventDefaultForA11yClick: typeof a11yClick.preventDefaultForA11yClick, populateClickOnlyAction: typeof a11yClick.populateClickOnlyAction) => void;
 }
 
 /** Added for readability when accessing stable property names. */

package/primitives/signals/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * @license Angular v18.0.0-rc.1
+ * @license Angular v18.0.0-rc.2
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */

package/rxjs-interop/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * @license Angular v18.0.0-rc.1
+ * @license Angular v18.0.0-rc.2
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */

package/schematics/migrations/http-providers/bundle.js

@@ -60,7 +60,7 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 
-// bazel-out/k8-fastbuild/bin/packages/core/schematics/migrations/http-providers/index.mjs
+// bazel-out/darwin_arm64-fastbuild/bin/packages/core/schematics/migrations/http-providers/index.mjs
 var http_providers_exports = {};
 __export(http_providers_exports, {
   default: () => http_providers_default
@@ -69,7 +69,7 @@ module.exports = __toCommonJS(http_providers_exports);
 var import_schematics = require("@angular-devkit/schematics");
 var import_path3 = require("path");
 
-// bazel-out/k8-fastbuild/bin/packages/core/schematics/utils/project_tsconfig_paths.mjs
+// bazel-out/darwin_arm64-fastbuild/bin/packages/core/schematics/utils/project_tsconfig_paths.mjs
 var import_core = require("@angular-devkit/core");
 function getProjectTsConfigPaths(tree) {
   return __async(this, null, function* () {
@@ -149,11 +149,11 @@ function getWorkspace(tree) {
   });
 }
 
-// bazel-out/k8-fastbuild/bin/packages/core/schematics/utils/typescript/compiler_host.mjs
+// bazel-out/darwin_arm64-fastbuild/bin/packages/core/schematics/utils/typescript/compiler_host.mjs
 var import_path = require("path");
 var import_typescript2 = __toESM(require("typescript"), 1);
 
-// bazel-out/k8-fastbuild/bin/packages/core/schematics/utils/typescript/parse_tsconfig.mjs
+// bazel-out/darwin_arm64-fastbuild/bin/packages/core/schematics/utils/typescript/parse_tsconfig.mjs
 var path = __toESM(require("path"), 1);
 var import_typescript = __toESM(require("typescript"), 1);
 function parseTsconfigFile(tsconfigPath, basePath) {
@@ -170,7 +170,7 @@ function parseTsconfigFile(tsconfigPath, basePath) {
   return import_typescript.default.parseJsonConfigFileContent(config, parseConfigHost, basePath, {});
 }
 
-// bazel-out/k8-fastbuild/bin/packages/core/schematics/utils/typescript/compiler_host.mjs
+// bazel-out/darwin_arm64-fastbuild/bin/packages/core/schematics/utils/typescript/compiler_host.mjs
 function createMigrationProgram(tree, tsconfigPath, basePath, fakeFileRead, additionalFiles) {
   const { rootNames, options, host } = createProgramOptions(tree, tsconfigPath, basePath, fakeFileRead, additionalFiles);
   return import_typescript2.default.createProgram(rootNames, options, host);
@@ -203,13 +203,13 @@ function canMigrateFile(basePath, sourceFile, program) {
   return !(0, import_path.relative)(basePath, sourceFile.fileName).startsWith("..");
 }
 
-// bazel-out/k8-fastbuild/bin/packages/core/schematics/migrations/http-providers/utils.mjs
+// bazel-out/darwin_arm64-fastbuild/bin/packages/core/schematics/migrations/http-providers/utils.mjs
 var import_typescript7 = __toESM(require("typescript"), 1);
 
-// bazel-out/k8-fastbuild/bin/packages/core/schematics/utils/change_tracker.mjs
+// bazel-out/darwin_arm64-fastbuild/bin/packages/core/schematics/utils/change_tracker.mjs
 var import_typescript4 = __toESM(require("typescript"), 1);
 
-// bazel-out/k8-fastbuild/bin/packages/core/schematics/utils/import_manager.mjs
+// bazel-out/darwin_arm64-fastbuild/bin/packages/core/schematics/utils/import_manager.mjs
 var import_path2 = require("path");
 var import_typescript3 = __toESM(require("typescript"), 1);
 var ImportManager = class {
@@ -393,7 +393,7 @@ ${text}`;
   }
 };
 
-// bazel-out/k8-fastbuild/bin/packages/core/schematics/utils/change_tracker.mjs
+// bazel-out/darwin_arm64-fastbuild/bin/packages/core/schematics/utils/change_tracker.mjs
 var ChangeTracker = class {
   constructor(_printer, _importRemapper) {
     __publicField(this, "_printer");
@@ -456,10 +456,10 @@ function normalizePath(path2) {
   return path2.replace(/\\/g, "/");
 }
 
-// bazel-out/k8-fastbuild/bin/packages/core/schematics/utils/typescript/decorators.mjs
+// bazel-out/darwin_arm64-fastbuild/bin/packages/core/schematics/utils/typescript/decorators.mjs
 var import_typescript6 = __toESM(require("typescript"), 1);
 
-// bazel-out/k8-fastbuild/bin/packages/core/schematics/utils/typescript/imports.mjs
+// bazel-out/darwin_arm64-fastbuild/bin/packages/core/schematics/utils/typescript/imports.mjs
 var import_typescript5 = __toESM(require("typescript"), 1);
 function getImportOfIdentifier(typeChecker, node) {
   const symbol = typeChecker.getSymbolAtLocation(node);
@@ -519,7 +519,7 @@ function findImportSpecifier(nodes, specifierName) {
   });
 }
 
-// bazel-out/k8-fastbuild/bin/packages/core/schematics/utils/typescript/decorators.mjs
+// bazel-out/darwin_arm64-fastbuild/bin/packages/core/schematics/utils/typescript/decorators.mjs
 function getCallDecoratorImport(typeChecker, decorator) {
   if (!import_typescript6.default.isCallExpression(decorator.expression) || !import_typescript6.default.isIdentifier(decorator.expression.expression)) {
     return null;
@@ -528,7 +528,7 @@ function getCallDecoratorImport(typeChecker, decorator) {
   return getImportOfIdentifier(typeChecker, identifier);
 }
 
-// bazel-out/k8-fastbuild/bin/packages/core/schematics/utils/ng_decorators.mjs
+// bazel-out/darwin_arm64-fastbuild/bin/packages/core/schematics/utils/ng_decorators.mjs
 function getAngularDecorators(typeChecker, decorators) {
   return decorators.map((node) => ({ node, importData: getCallDecoratorImport(typeChecker, node) })).filter(({ importData }) => importData && importData.importModule.startsWith("@angular/")).map(({ node, importData }) => ({
     node,
@@ -538,7 +538,7 @@ function getAngularDecorators(typeChecker, decorators) {
   }));
 }
 
-// bazel-out/k8-fastbuild/bin/packages/core/schematics/migrations/http-providers/utils.mjs
+// bazel-out/darwin_arm64-fastbuild/bin/packages/core/schematics/migrations/http-providers/utils.mjs
 var HTTP_CLIENT_MODULE = "HttpClientModule";
 var HTTP_CLIENT_XSRF_MODULE = "HttpClientXsrfModule";
 var HTTP_CLIENT_JSONP_MODULE = "HttpClientJsonpModule";
@@ -571,7 +571,7 @@ function migrateFile(sourceFile, typeChecker, rewriteFn) {
     if (import_typescript7.default.isClassDeclaration(node)) {
       const decorators = getAngularDecorators(typeChecker, import_typescript7.default.getDecorators(node) || []);
       decorators.forEach((decorator) => {
-        migrateDecorator(decorator, commonHttpIdentifiers, addedImports, changeTracker);
+        migrateDecorator(decorator, commonHttpIdentifiers, commonHttpTestingIdentifiers, addedImports, changeTracker);
       });
     }
     migrateTestingModuleImports(node, commonHttpIdentifiers, commonHttpTestingIdentifiers, addedImports, changeTracker);
@@ -610,7 +610,7 @@ function migrateFile(sourceFile, typeChecker, rewriteFn) {
     }
   }
 }
-function migrateDecorator(decorator, commonHttpIdentifiers, addedImports, changeTracker) {
+function migrateDecorator(decorator, commonHttpIdentifiers, commonHttpTestingIdentifiers, addedImports, changeTracker) {
   var _a;
   if (decorator.name !== "NgModule" && decorator.name !== "Component" || decorator.node.expression.arguments.length < 1) {
     return;
@@ -623,13 +623,14 @@ function migrateDecorator(decorator, commonHttpIdentifiers, addedImports, change
   if (!moduleImports) {
     return;
   }
-  const importedModules = getImportedHttpModules(moduleImports, commonHttpIdentifiers);
+  const importedModules = getImportedHttpModules(moduleImports, commonHttpIdentifiers, commonHttpTestingIdentifiers);
   if (!importedModules) {
     return;
   }
   const addedProviders = /* @__PURE__ */ new Set();
   const commonHttpAddedImports = addedImports.get(COMMON_HTTP);
-  if (importedModules.client) {
+  commonHttpAddedImports == null ? void 0 : commonHttpAddedImports.add(PROVIDE_HTTP_CLIENT);
+  if (importedModules.client || importedModules.clientTesting) {
     commonHttpAddedImports == null ? void 0 : commonHttpAddedImports.add(WITH_INTERCEPTORS_FROM_DI);
     addedProviders.add(createCallExpression(WITH_INTERCEPTORS_FROM_DI));
   }
@@ -647,19 +648,28 @@ function migrateDecorator(decorator, commonHttpIdentifiers, addedImports, change
     }
   }
   const newImports = import_typescript7.default.factory.createArrayLiteralExpression([
-    ...moduleImports.elements.filter((item) => item !== importedModules.client && item !== importedModules.clientJsonp && item !== importedModules.xsrf)
+    ...moduleImports.elements.filter((item) => item !== importedModules.client && item !== importedModules.clientJsonp && item !== importedModules.xsrf && item !== importedModules.clientTesting)
   ]);
-  commonHttpAddedImports == null ? void 0 : commonHttpAddedImports.add(PROVIDE_HTTP_CLIENT);
   const providers = getProvidersFromLiteralExpr(metadata);
+  let provideHttpClientTestingExpr;
+  if (importedModules.clientTesting) {
+    const commonHttpTestingAddedImports = addedImports.get(COMMON_HTTP_TESTING);
+    commonHttpTestingAddedImports == null ? void 0 : commonHttpTestingAddedImports.add(PROVIDE_HTTP_CLIENT_TESTING);
+    provideHttpClientTestingExpr = createCallExpression(PROVIDE_HTTP_CLIENT_TESTING);
+  }
   const provideHttpExpr = createCallExpression(PROVIDE_HTTP_CLIENT, [...addedProviders]);
+  const providersToAppend = provideHttpClientTestingExpr ? [provideHttpExpr, provideHttpClientTestingExpr] : [provideHttpExpr];
   let newProviders;
   if (!providers) {
-    newProviders = import_typescript7.default.factory.createArrayLiteralExpression([provideHttpExpr]);
+    newProviders = import_typescript7.default.factory.createArrayLiteralExpression(providersToAppend);
   } else {
-    newProviders = import_typescript7.default.factory.updateArrayLiteralExpression(providers, import_typescript7.default.factory.createNodeArray([...providers.elements, provideHttpExpr], providers.elements.hasTrailingComma));
+    newProviders = import_typescript7.default.factory.updateArrayLiteralExpression(providers, import_typescript7.default.factory.createNodeArray([...providers.elements, ...providersToAppend], providers.elements.hasTrailingComma));
   }
   const newDecoratorArgs = import_typescript7.default.factory.createObjectLiteralExpression([
-    ...metadata.properties.filter((p) => p.getText() === "imports"),
+    ...metadata.properties.filter((property) => {
+      var _a2, _b;
+      return ((_a2 = property.name) == null ? void 0 : _a2.getText()) !== "imports" && ((_b = property.name) == null ? void 0 : _b.getText()) !== "providers";
+    }),
     import_typescript7.default.factory.createPropertyAssignment("imports", newImports),
     import_typescript7.default.factory.createPropertyAssignment("providers", newProviders)
   ]);
@@ -753,15 +763,16 @@ function getProvidersFromLiteralExpr(literal) {
   }
   return null;
 }
-function getImportedHttpModules(imports, commonHttpIdentifiers) {
+function getImportedHttpModules(imports, commonHttpIdentifiers, commonHttpTestingIdentifiers) {
   let client = null;
   let clientJsonp = null;
   let xsrf = null;
+  let clientTesting = null;
   let xsrfOptions = null;
   for (const item of imports.elements) {
     if (import_typescript7.default.isIdentifier(item)) {
       const moduleName = item.getText();
-      if (!commonHttpIdentifiers.has(moduleName)) {
+      if (!commonHttpIdentifiers.has(moduleName) && !commonHttpTestingIdentifiers.has(moduleName)) {
         continue;
       }
       if (moduleName === HTTP_CLIENT_MODULE) {
@@ -770,6 +781,8 @@ function getImportedHttpModules(imports, commonHttpIdentifiers) {
         clientJsonp = item;
       } else if (moduleName === HTTP_CLIENT_XSRF_MODULE) {
         xsrf = item;
+      } else if (moduleName === HTTP_CLIENT_TESTING_MODULE) {
+        clientTesting = item;
       }
     } else if (import_typescript7.default.isCallExpression(item) && import_typescript7.default.isPropertyAccessExpression(item.expression)) {
       const moduleName = item.expression.expression.getText();
@@ -786,8 +799,8 @@ function getImportedHttpModules(imports, commonHttpIdentifiers) {
       }
     }
   }
-  if (client !== null || clientJsonp !== null || xsrf !== null) {
-    return { client, clientJsonp, xsrf, xsrfOptions };
+  if (client !== null || clientJsonp !== null || xsrf !== null || clientTesting !== null) {
+    return { client, clientJsonp, xsrf, xsrfOptions, clientTesting };
   }
   return null;
 }
@@ -796,19 +809,23 @@ function createCallExpression(functionName, args = []) {
 }
 function updateTestBedConfiguration(configureTestingModuleArgs, newImports, newProviders) {
   return import_typescript7.default.factory.updateObjectLiteralExpression(configureTestingModuleArgs, [
+    ...configureTestingModuleArgs.properties.filter((property) => {
+      var _a, _b;
+      return ((_a = property.name) == null ? void 0 : _a.getText()) !== "imports" && ((_b = property.name) == null ? void 0 : _b.getText()) !== "providers";
+    }),
     import_typescript7.default.factory.createPropertyAssignment("imports", newImports),
     import_typescript7.default.factory.createPropertyAssignment("providers", newProviders)
   ]);
 }
 
-// bazel-out/k8-fastbuild/bin/packages/core/schematics/migrations/http-providers/index.mjs
+// bazel-out/darwin_arm64-fastbuild/bin/packages/core/schematics/migrations/http-providers/index.mjs
 function http_providers_default() {
   return (tree) => __async(this, null, function* () {
     const { buildPaths, testPaths } = yield getProjectTsConfigPaths(tree);
     const basePath = process.cwd();
     const allPaths = [...buildPaths, ...testPaths];
     if (!allPaths.length) {
-      throw new import_schematics.SchematicsException("Could not find any tsconfig file. Cannot run the transfer state migration.");
+      throw new import_schematics.SchematicsException("Could not find any tsconfig file. Cannot run the http providers migration.");
     }
     for (const tsconfigPath of allPaths) {
       runMigration(tree, tsconfigPath, basePath);