@angular/core 13.2.0-rc.0 → 13.2.2

package/fesm2015/core.mjs

@@ -1,5 +1,5 @@
 /**
- * @license Angular v13.2.0-rc.0
+ * @license Angular v13.2.2
  * (c) 2010-2022 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -152,20 +152,37 @@ const ERROR_DETAILS_PAGE_BASE_URL = 'https://angular.io/errors';
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+/**
+ * Class that represents a runtime error.
+ * Formats and outputs the error message in a consistent way.
+ *
+ * Example:
+ * ```
+ *  throw new RuntimeError(
+ *    RuntimeErrorCode.INJECTOR_ALREADY_DESTROYED,
+ *    ngDevMode && 'Injector has already been destroyed.');
+ * ```
+ *
+ * Note: the `message` argument contains a descriptive error message as a string in development
+ * mode (when the `ngDevMode` is defined). In production mode (after tree-shaking pass), the
+ * `message` argument becomes `false`, thus we account for it in the typings and the runtime logic.
+ */
 class RuntimeError extends Error {
     constructor(code, message) {
         super(formatRuntimeError(code, message));
         this.code = code;
     }
 }
-/** Called to format a runtime error */
+/**
+ * Called to format a runtime error.
+ * See additional info on the `message` argument type in the `RuntimeError` class description.
+ */
 function formatRuntimeError(code, message) {
-    const codeAsNumber = code;
     // Error code might be a negative number, which is a special marker that instructs the logic to
     // generate a link to the error details page on angular.io.
-    const fullCode = `NG0${Math.abs(codeAsNumber)}`;
+    const fullCode = `NG0${Math.abs(code)}`;
     let errorMessage = `${fullCode}${message ? ': ' + message : ''}`;
-    if (ngDevMode && codeAsNumber < 0) {
+    if (ngDevMode && code < 0) {
         errorMessage = `${errorMessage}. Find more at ${ERROR_DETAILS_PAGE_BASE_URL}/${fullCode}`;
     }
     return errorMessage;
@@ -1552,8 +1569,15 @@ const profiler = function (event, instance, hookOrListener) {
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-const SVG_NAMESPACE = 'http://www.w3.org/2000/svg';
-const MATH_ML_NAMESPACE = 'http://www.w3.org/1998/MathML/';
+const SVG_NAMESPACE = 'svg';
+const SVG_NAMESPACE_URI = 'http://www.w3.org/2000/svg';
+const MATH_ML_NAMESPACE = 'math';
+const MATH_ML_NAMESPACE_URI = 'http://www.w3.org/1998/MathML/';
+function getNamespaceUri(namespace) {
+    const name = namespace.toLowerCase();
+    return name === SVG_NAMESPACE ? SVG_NAMESPACE_URI :
+        (name === MATH_ML_NAMESPACE ? MATH_ML_NAMESPACE_URI : null);
+}
 
 /**
  * @license
@@ -4450,7 +4474,7 @@ const ES2015_INHERITED_CLASS_WITH_CTOR = /^class\s+[A-Za-z\d$_]*\s*extends\s+[^{
  * Regular expression that detects ES2015 classes which extend from other classes
  * and inherit a constructor.
  */
-const ES2015_INHERITED_CLASS_WITH_DELEGATE_CTOR = /^class\s+[A-Za-z\d$_]*\s*extends\s+[^{]+{[\s\S]*constructor\s*\(\)\s*{\s*super\(\.\.\.arguments\)/;
+const ES2015_INHERITED_CLASS_WITH_DELEGATE_CTOR = /^class\s+[A-Za-z\d$_]*\s*extends\s+[^{]+{[\s\S]*constructor\s*\(\)\s*{[^}]*super\(\.\.\.arguments\)/;
 /**
  * Determine whether a stringified type is a class which delegates its constructor
  * to its parent.
@@ -6973,8 +6997,9 @@ function createElementNode(renderer, name, namespace) {
         return renderer.createElement(name, namespace);
     }
     else {
-        return namespace === null ? renderer.createElement(name) :
-            renderer.createElementNS(namespace, name);
+        const namespaceUri = namespace !== null ? getNamespaceUri(namespace) : null;
+        return namespaceUri === null ? renderer.createElement(name) :
+            renderer.createElementNS(namespaceUri, name);
     }
 }
 /**
@@ -10369,7 +10394,7 @@ function cacheMatchingLocalNames(tNode, localRefs, exportsMap) {
         for (let i = 0; i < localRefs.length; i += 2) {
             const index = exportsMap[localRefs[i + 1]];
             if (index == null)
-                throw new RuntimeError(-301 /* EXPORT_NOT_FOUND */, `Export of name '${localRefs[i + 1]}' not found!`);
+                throw new RuntimeError(-301 /* EXPORT_NOT_FOUND */, ngDevMode && `Export of name '${localRefs[i + 1]}' not found!`);
             localNames.push(localRefs[i], index);
         }
     }
@@ -11295,10 +11320,7 @@ class R3Injector {
     }
     assertNotDestroyed() {
         if (this._destroyed) {
-            const errorMessage = (typeof ngDevMode === 'undefined' || ngDevMode) ?
-                'Injector has already been destroyed.' :
-                '';
-            throw new RuntimeError(205 /* INJECTOR_ALREADY_DESTROYED */, errorMessage);
+            throw new RuntimeError(205 /* INJECTOR_ALREADY_DESTROYED */, ngDevMode && 'Injector has already been destroyed.');
         }
     }
     /**
@@ -11462,28 +11484,21 @@ function injectableDefOrInjectorDefFactory(token) {
     // InjectionTokens should have an injectable def (ɵprov) and thus should be handled above.
     // If it's missing that, it's an error.
     if (token instanceof InjectionToken) {
-        const errorMessage = (typeof ngDevMode === 'undefined' || ngDevMode) ?
-            `Token ${stringify(token)} is missing a ɵprov definition.` :
-            '';
-        throw new RuntimeError(204 /* INVALID_INJECTION_TOKEN */, errorMessage);
+        throw new RuntimeError(204 /* INVALID_INJECTION_TOKEN */, ngDevMode && `Token ${stringify(token)} is missing a ɵprov definition.`);
     }
     // Undecorated types can sometimes be created if they have no constructor arguments.
     if (token instanceof Function) {
         return getUndecoratedInjectableFactory(token);
     }
     // There was no way to resolve a factory for this token.
-    const errorMessage = (typeof ngDevMode === 'undefined' || ngDevMode) ? 'unreachable' : '';
-    throw new RuntimeError(204 /* INVALID_INJECTION_TOKEN */, errorMessage);
+    throw new RuntimeError(204 /* INVALID_INJECTION_TOKEN */, ngDevMode && 'unreachable');
 }
 function getUndecoratedInjectableFactory(token) {
     // If the token has parameters then it has dependencies that we cannot resolve implicitly.
     const paramLength = token.length;
     if (paramLength > 0) {
         const args = newArray(paramLength, '?');
-        const errorMessage = (typeof ngDevMode === 'undefined' || ngDevMode) ?
-            `Can't resolve all parameters for ${stringify(token)}: (${args.join(', ')}).` :
-            '';
-        throw new RuntimeError(204 /* INVALID_INJECTION_TOKEN */, errorMessage);
+        throw new RuntimeError(204 /* INVALID_INJECTION_TOKEN */, ngDevMode && `Can't resolve all parameters for ${stringify(token)}: (${args.join(', ')}).`);
     }
     // The constructor function appears to have no parameters.
     // This might be because it inherits from a super-class. In which case, use an injectable
@@ -21061,7 +21076,7 @@ class Version {
 /**
  * @publicApi
  */
-const VERSION = new Version('13.2.0-rc.0');
+const VERSION = new Version('13.2.2');
 
 /**
  * @license
@@ -21089,37 +21104,6 @@ const VERSION = new Version('13.2.0-rc.0');
 // - mod2.injector.get(token, default)
 const NOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR = {};
 
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-/**
- * Injector that looks up a value using a specific injector, before falling back to the module
- * injector. Used primarily when creating components or embedded views dynamically.
- */
-class ChainedInjector {
-    constructor(injector, parentInjector) {
-        this.injector = injector;
-        this.parentInjector = parentInjector;
-    }
-    get(token, notFoundValue, flags) {
-        const value = this.injector.get(token, NOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR, flags);
-        if (value !== NOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR ||
-            notFoundValue === NOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR) {
-            // Return the value from the root element injector when
-            // - it provides it
-            //   (value !== NOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR)
-            // - the module injector should not be checked
-            //   (notFoundValue === NOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR)
-            return value;
-        }
-        return this.parentInjector.get(token, notFoundValue, flags);
-    }
-}
-
 /**
  * @license
  * Copyright Google LLC All Rights Reserved.
@@ -21505,6 +21489,23 @@ const SCHEDULER = new InjectionToken('SCHEDULER_TOKEN', {
     providedIn: 'root',
     factory: () => defaultScheduler,
 });
+function createChainedInjector(rootViewInjector, moduleInjector) {
+    return {
+        get: (token, notFoundValue, flags) => {
+            const value = rootViewInjector.get(token, NOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR, flags);
+            if (value !== NOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR ||
+                notFoundValue === NOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR) {
+                // Return the value from the root element injector when
+                // - it provides it
+                //   (value !== NOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR)
+                // - the module injector should not be checked
+                //   (notFoundValue === NOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR)
+                return value;
+            }
+            return moduleInjector.get(token, notFoundValue, flags);
+        }
+    };
+}
 /**
  * Render3 implementation of {@link viewEngine_ComponentFactory}.
  */
@@ -21531,7 +21532,7 @@ class ComponentFactory extends ComponentFactory$1 {
     }
     create(injector, projectableNodes, rootSelectorOrNode, ngModule) {
         ngModule = ngModule || this.ngModule;
-        const rootViewInjector = ngModule ? new ChainedInjector(injector, ngModule.injector) : injector;
+        const rootViewInjector = ngModule ? createChainedInjector(injector, ngModule.injector) : injector;
         const rendererFactory = rootViewInjector.get(RendererFactory2, domRendererFactory3);
         const sanitizer = rootViewInjector.get(Sanitizer, null);
         const hostRenderer = rendererFactory.createRenderer(null, this.componentDef);
@@ -22667,9 +22668,9 @@ const R3TemplateRef = class TemplateRef extends ViewEngineTemplateRef {
         this._declarationTContainer = _declarationTContainer;
         this.elementRef = elementRef;
     }
-    createEmbeddedView(context, injector) {
+    createEmbeddedView(context) {
         const embeddedTView = this._declarationTContainer.tViews;
-        const embeddedLView = createLView(this._declarationLView, embeddedTView, context, 16 /* CheckAlways */, null, embeddedTView.declTNode, null, null, null, createEmbeddedViewInjector(injector, this._declarationLView[INJECTOR$1]));
+        const embeddedLView = createLView(this._declarationLView, embeddedTView, context, 16 /* CheckAlways */, null, embeddedTView.declTNode, null, null, null, null);
         const declarationLContainer = this._declarationLView[this._declarationTContainer.index];
         ngDevMode && assertLContainer(declarationLContainer);
         embeddedLView[DECLARATION_LCONTAINER] = declarationLContainer;
@@ -22681,14 +22682,6 @@ const R3TemplateRef = class TemplateRef extends ViewEngineTemplateRef {
         return new ViewRef$1(embeddedLView);
     }
 };
-function createEmbeddedViewInjector(embeddedViewInjector, declarationViewInjector) {
-    if (!embeddedViewInjector) {
-        return null;
-    }
-    return declarationViewInjector ?
-        new ChainedInjector(embeddedViewInjector, declarationViewInjector) :
-        embeddedViewInjector;
-}
 /**
  * Creates a TemplateRef given a node.
  *
@@ -22793,17 +22786,8 @@ const R3ViewContainerRef = class ViewContainerRef extends VE_ViewContainerRef {
     get length() {
         return this._lContainer.length - CONTAINER_HEADER_OFFSET;
     }
-    createEmbeddedView(templateRef, context, indexOrOptions) {
-        let index;
-        let injector;
-        if (typeof indexOrOptions === 'number') {
-            index = indexOrOptions;
-        }
-        else if (indexOrOptions != null) {
-            index = indexOrOptions.index;
-            injector = indexOrOptions.injector;
-        }
-        const viewRef = templateRef.createEmbeddedView(context || {}, injector);
+    createEmbeddedView(templateRef, context, index) {
+        const viewRef = templateRef.createEmbeddedView(context || {});
         this.insert(viewRef, index);
         return viewRef;
     }
@@ -24571,19 +24555,20 @@ const HostBinding = makePropDecorator('HostBinding', (hostPropertyName) => ({ ho
  *
  * ```
  *
- * The following example registers another DOM event handler that listens for key-press events.
+ * The following example registers another DOM event handler that listens for `Enter` key-press
+ * events on the global `window`.
  * ``` ts
  * import { HostListener, Component } from "@angular/core";
  *
  * @Component({
  *   selector: 'app',
- *   template: `<h1>Hello, you have pressed keys {{counter}} number of times!</h1> Press any key to
- * increment the counter.
+ *   template: `<h1>Hello, you have pressed enter {{counter}} number of times!</h1> Press enter key
+ * to increment the counter.
  *   <button (click)="resetCounter()">Reset Counter</button>`
  * })
  * class AppComponent {
  *   counter = 0;
- *   @HostListener('window:keydown', ['$event'])
+ *   @HostListener('window:keydown.enter', ['$event'])
  *   handleKeyDown(event: KeyboardEvent) {
  *     this.counter++;
  *   }
@@ -24592,6 +24577,14 @@ const HostBinding = makePropDecorator('HostBinding', (hostPropertyName) => ({ ho
  *   }
  * }
  * ```
+ * The list of valid key names for `keydown` and `keyup` events
+ * can be found here:
+ * https://www.w3.org/TR/DOM-Level-3-Events-key/#named-key-attribute-values
+ *
+ * Note that keys can also be combined, e.g. `@HostListener('keydown.shift.a')`.
+ *
+ * The global target names that can be used to prefix an event name are
+ * `document:`, `window:` and `body:`.
  *
  * @Annotation
  * @publicApi
@@ -25320,7 +25313,8 @@ class NgZone {
         forkInnerZoneWithAngularBehavior(self);
     }
     static isInAngularZone() {
-        return Zone.current.get('isAngularZone') === true;
+        // Zone needs to be checked, because this method might be called even when NoopNgZone is used.
+        return typeof Zone !== 'undefined' && Zone.current.get('isAngularZone') === true;
     }
     static assertInAngularZone() {
         if (!NgZone.isInAngularZone()) {
@@ -25998,26 +25992,7 @@ class PlatformRef {
         this._destroyed = false;
     }
     /**
-     * Creates an instance of an `@NgModule` for the given platform for offline compilation.
-     *
-     * @usageNotes
-     *
-     * The following example creates the NgModule for a browser platform.
-     *
-     * ```typescript
-     * my_module.ts:
-     *
-     * @NgModule({
-     *   imports: [BrowserModule]
-     * })
-     * class MyModule {}
-     *
-     * main.ts:
-     * import {MyModuleNgFactory} from './my_module.ngfactory';
-     * import {platformBrowser} from '@angular/platform-browser';
-     *
-     * let moduleRef = platformBrowser().bootstrapModuleFactory(MyModuleNgFactory);
-     * ```
+     * Creates an instance of an `@NgModule` for the given platform.
      *
      * @deprecated Passing NgModule factories as the `PlatformRef.bootstrapModuleFactory` function
      *     argument is deprecated. Use the `PlatformRef.bootstrapModule` API instead.
@@ -26071,7 +26046,7 @@ class PlatformRef {
         });
     }
     /**
-     * Creates an instance of an `@NgModule` for a given platform using the given runtime compiler.
+     * Creates an instance of an `@NgModule` for a given platform.
      *
      * @usageNotes
      * ### Simple Example
@@ -26818,8 +26793,6 @@ var ng_module_factory_loader_impl = {};
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// TODO(alxhub): recombine the interfaces and implementations here and move the docs back onto the
-// original classes.
 /**
  * @publicApi
  */
@@ -26835,43 +26808,88 @@ class DebugEventListener {
 function asNativeElements(debugEls) {
     return debugEls.map((el) => el.nativeElement);
 }
-class DebugNode__POST_R3__ {
+/**
+ * @publicApi
+ */
+class DebugNode {
     constructor(nativeNode) {
         this.nativeNode = nativeNode;
     }
+    /**
+     * The `DebugElement` parent. Will be `null` if this is the root element.
+     */
     get parent() {
         const parent = this.nativeNode.parentNode;
-        return parent ? new DebugElement__POST_R3__(parent) : null;
+        return parent ? new DebugElement(parent) : null;
     }
+    /**
+     * The host dependency injector. For example, the root element's component instance injector.
+     */
     get injector() {
         return getInjector(this.nativeNode);
     }
+    /**
+     * The element's own component instance, if it has one.
+     */
     get componentInstance() {
         const nativeElement = this.nativeNode;
         return nativeElement &&
             (getComponent$1(nativeElement) || getOwningComponent(nativeElement));
     }
+    /**
+     * An object that provides parent context for this element. Often an ancestor component instance
+     * that governs this element.
+     *
+     * When an element is repeated within *ngFor, the context is an `NgForOf` whose `$implicit`
+     * property is the value of the row instance value. For example, the `hero` in `*ngFor="let hero
+     * of heroes"`.
+     */
     get context() {
         return getComponent$1(this.nativeNode) || getContext(this.nativeNode);
     }
+    /**
+     * The callbacks attached to the component's @Output properties and/or the element's event
+     * properties.
+     */
     get listeners() {
         return getListeners(this.nativeNode).filter(listener => listener.type === 'dom');
     }
+    /**
+     * Dictionary of objects associated with template local variables (e.g. #foo), keyed by the local
+     * variable name.
+     */
     get references() {
         return getLocalRefs(this.nativeNode);
     }
+    /**
+     * This component's injector lookup tokens. Includes the component itself plus the tokens that the
+     * component lists in its providers metadata.
+     */
     get providerTokens() {
         return getInjectionTokens(this.nativeNode);
     }
 }
-class DebugElement__POST_R3__ extends DebugNode__POST_R3__ {
+/**
+ * @publicApi
+ *
+ * @see [Component testing scenarios](guide/testing-components-scenarios)
+ * @see [Basics of testing components](guide/testing-components-basics)
+ * @see [Testing utility APIs](guide/testing-utility-apis)
+ */
+class DebugElement extends DebugNode {
     constructor(nativeNode) {
         ngDevMode && assertDomNode(nativeNode);
         super(nativeNode);
     }
+    /**
+     * The underlying DOM element at the root of the component.
+     */
     get nativeElement() {
         return this.nativeNode.nodeType == Node.ELEMENT_NODE ? this.nativeNode : null;
     }
+    /**
+     * The element tag name, if it is an element.
+     */
     get name() {
         const context = getLContext(this.nativeNode);
         if (context !== null) {
@@ -26912,6 +26930,9 @@ class DebugElement__POST_R3__ extends DebugNode__POST_R3__ {
         collectPropertyBindings(properties, tNode, lView, tData);
         return properties;
     }
+    /**
+     *  A map of attribute names to attribute values for an element.
+     */
     get attributes() {
         const attributes = {};
         const element = this.nativeElement;
@@ -26960,12 +26981,29 @@ class DebugElement__POST_R3__ extends DebugNode__POST_R3__ {
         }
         return attributes;
     }
+    /**
+     * The inline styles of the DOM element.
+     *
+     * Will be `null` if there is no `style` property on the underlying DOM element.
+     *
+     * @see [ElementCSSInlineStyle](https://developer.mozilla.org/en-US/docs/Web/API/ElementCSSInlineStyle/style)
+     */
     get styles() {
         if (this.nativeElement && this.nativeElement.style) {
             return this.nativeElement.style;
         }
         return {};
     }
+    /**
+     * A map containing the class names on the element as keys.
+     *
+     * This map is derived from the `className` property of the DOM element.
+     *
+     * Note: The values of this object will always be `true`. The class key will not appear in the KV
+     * object if it does not exist on the element.
+     *
+     * @see [Element.className](https://developer.mozilla.org/en-US/docs/Web/API/Element/className)
+     */
     get classes() {
         const result = {};
         const element = this.nativeElement;
@@ -26975,15 +27013,23 @@ class DebugElement__POST_R3__ extends DebugNode__POST_R3__ {
         classes.forEach((value) => result[value] = true);
         return result;
     }
+    /**
+     * The `childNodes` of the DOM element as a `DebugNode` array.
+     *
+     * @see [Node.childNodes](https://developer.mozilla.org/en-US/docs/Web/API/Node/childNodes)
+     */
     get childNodes() {
         const childNodes = this.nativeNode.childNodes;
         const children = [];
         for (let i = 0; i < childNodes.length; i++) {
             const element = childNodes[i];
-            children.push(getDebugNode__POST_R3__(element));
+            children.push(getDebugNode(element));
         }
         return children;
     }
+    /**
+     * The immediate `DebugElement` children. Walk the tree by descending through `children`.
+     */
     get children() {
         const nativeElement = this.nativeElement;
         if (!nativeElement)
@@ -26992,24 +27038,45 @@ class DebugElement__POST_R3__ extends DebugNode__POST_R3__ {
         const children = [];
         for (let i = 0; i < childNodes.length; i++) {
             const element = childNodes[i];
-            children.push(getDebugNode__POST_R3__(element));
+            children.push(getDebugNode(element));
         }
         return children;
     }
+    /**
+     * @returns the first `DebugElement` that matches the predicate at any depth in the subtree.
+     */
     query(predicate) {
         const results = this.queryAll(predicate);
         return results[0] || null;
     }
+    /**
+     * @returns All `DebugElement` matches for the predicate at any depth in the subtree.
+     */
     queryAll(predicate) {
         const matches = [];
-        _queryAllR3(this, predicate, matches, true);
+        _queryAll(this, predicate, matches, true);
         return matches;
     }
+    /**
+     * @returns All `DebugNode` matches for the predicate at any depth in the subtree.
+     */
     queryAllNodes(predicate) {
         const matches = [];
-        _queryAllR3(this, predicate, matches, false);
+        _queryAll(this, predicate, matches, false);
         return matches;
     }
+    /**
+     * Triggers the event by its name if there is a corresponding listener in the element's
+     * `listeners` collection.
+     *
+     * If the event lacks a listener or there's some other problem, consider
+     * calling `nativeElement.dispatchEvent(eventObject)`.
+     *
+     * @param eventName The name of the event to trigger
+     * @param eventObj The _event object_ expected by the handler
+     *
+     * @see [Testing components scenarios](guide/testing-components-scenarios#trigger-event-handler)
+     */
     triggerEventHandler(eventName, eventObj) {
         const node = this.nativeNode;
         const invokedListeners = [];
@@ -27068,11 +27135,11 @@ function isPrimitiveValue(value) {
     return typeof value === 'string' || typeof value === 'boolean' || typeof value === 'number' ||
         value === null;
 }
-function _queryAllR3(parentElement, predicate, matches, elementsOnly) {
+function _queryAll(parentElement, predicate, matches, elementsOnly) {
     const context = getLContext(parentElement.nativeNode);
     if (context !== null) {
         const parentTNode = context.lView[TVIEW].data[context.nodeIndex];
-        _queryNodeChildrenR3(parentTNode, context.lView, predicate, matches, elementsOnly, parentElement.nativeNode);
+        _queryNodeChildren(parentTNode, context.lView, predicate, matches, elementsOnly, parentElement.nativeNode);
     }
     else {
         // If the context is null, then `parentElement` was either created with Renderer2 or native DOM
@@ -27090,26 +27157,26 @@ function _queryAllR3(parentElement, predicate, matches, elementsOnly) {
  * @param elementsOnly whether only elements should be searched
  * @param rootNativeNode the root native node on which predicate should not be matched
  */
-function _queryNodeChildrenR3(tNode, lView, predicate, matches, elementsOnly, rootNativeNode) {
+function _queryNodeChildren(tNode, lView, predicate, matches, elementsOnly, rootNativeNode) {
     ngDevMode && assertTNodeForLView(tNode, lView);
     const nativeNode = getNativeByTNodeOrNull(tNode, lView);
     // For each type of TNode, specific logic is executed.
     if (tNode.type & (3 /* AnyRNode */ | 8 /* ElementContainer */)) {
         // Case 1: the TNode is an element
         // The native node has to be checked.
-        _addQueryMatchR3(nativeNode, predicate, matches, elementsOnly, rootNativeNode);
+        _addQueryMatch(nativeNode, predicate, matches, elementsOnly, rootNativeNode);
         if (isComponentHost(tNode)) {
             // If the element is the host of a component, then all nodes in its view have to be processed.
             // Note: the component's content (tNode.child) will be processed from the insertion points.
             const componentView = getComponentLViewByIndex(tNode.index, lView);
             if (componentView && componentView[TVIEW].firstChild) {
-                _queryNodeChildrenR3(componentView[TVIEW].firstChild, componentView, predicate, matches, elementsOnly, rootNativeNode);
+                _queryNodeChildren(componentView[TVIEW].firstChild, componentView, predicate, matches, elementsOnly, rootNativeNode);
             }
         }
         else {
             if (tNode.child) {
                 // Otherwise, its children have to be processed.
-                _queryNodeChildrenR3(tNode.child, lView, predicate, matches, elementsOnly, rootNativeNode);
+                _queryNodeChildren(tNode.child, lView, predicate, matches, elementsOnly, rootNativeNode);
             }
             // We also have to query the DOM directly in order to catch elements inserted through
             // Renderer2. Note that this is __not__ optimal, because we're walking similar trees multiple
@@ -27125,16 +27192,16 @@ function _queryNodeChildrenR3(tNode, lView, predicate, matches, elementsOnly, ro
         // processed.
         const nodeOrContainer = lView[tNode.index];
         if (isLContainer(nodeOrContainer)) {
-            _queryNodeChildrenInContainerR3(nodeOrContainer, predicate, matches, elementsOnly, rootNativeNode);
+            _queryNodeChildrenInContainer(nodeOrContainer, predicate, matches, elementsOnly, rootNativeNode);
         }
     }
     else if (tNode.type & 4 /* Container */) {
         // Case 2: the TNode is a container
         // The native node has to be checked.
         const lContainer = lView[tNode.index];
-        _addQueryMatchR3(lContainer[NATIVE], predicate, matches, elementsOnly, rootNativeNode);
+        _addQueryMatch(lContainer[NATIVE], predicate, matches, elementsOnly, rootNativeNode);
         // Each view inside the container has to be processed.
-        _queryNodeChildrenInContainerR3(lContainer, predicate, matches, elementsOnly, rootNativeNode);
+        _queryNodeChildrenInContainer(lContainer, predicate, matches, elementsOnly, rootNativeNode);
     }
     else if (tNode.type & 16 /* Projection */) {
         // Case 3: the TNode is a projection insertion point (i.e. a <ng-content>).
@@ -27144,18 +27211,18 @@ function _queryNodeChildrenR3(tNode, lView, predicate, matches, elementsOnly, ro
         const head = componentHost.projection[tNode.projection];
         if (Array.isArray(head)) {
             for (let nativeNode of head) {
-                _addQueryMatchR3(nativeNode, predicate, matches, elementsOnly, rootNativeNode);
+                _addQueryMatch(nativeNode, predicate, matches, elementsOnly, rootNativeNode);
             }
         }
         else if (head) {
             const nextLView = componentView[PARENT];
             const nextTNode = nextLView[TVIEW].data[head.index];
-            _queryNodeChildrenR3(nextTNode, nextLView, predicate, matches, elementsOnly, rootNativeNode);
+            _queryNodeChildren(nextTNode, nextLView, predicate, matches, elementsOnly, rootNativeNode);
         }
     }
     else if (tNode.child) {
         // Case 4: the TNode is a view.
-        _queryNodeChildrenR3(tNode.child, lView, predicate, matches, elementsOnly, rootNativeNode);
+        _queryNodeChildren(tNode.child, lView, predicate, matches, elementsOnly, rootNativeNode);
     }
     // We don't want to go to the next sibling of the root node.
     if (rootNativeNode !== nativeNode) {
@@ -27163,7 +27230,7 @@ function _queryNodeChildrenR3(tNode, lView, predicate, matches, elementsOnly, ro
         // link, depending on whether the current node has been projected.
         const nextTNode = (tNode.flags & 4 /* isProjected */) ? tNode.projectionNext : tNode.next;
         if (nextTNode) {
-            _queryNodeChildrenR3(nextTNode, lView, predicate, matches, elementsOnly, rootNativeNode);
+            _queryNodeChildren(nextTNode, lView, predicate, matches, elementsOnly, rootNativeNode);
         }
     }
 }
@@ -27176,12 +27243,12 @@ function _queryNodeChildrenR3(tNode, lView, predicate, matches, elementsOnly, ro
  * @param elementsOnly whether only elements should be searched
  * @param rootNativeNode the root native node on which predicate should not be matched
  */
-function _queryNodeChildrenInContainerR3(lContainer, predicate, matches, elementsOnly, rootNativeNode) {
+function _queryNodeChildrenInContainer(lContainer, predicate, matches, elementsOnly, rootNativeNode) {
     for (let i = CONTAINER_HEADER_OFFSET; i < lContainer.length; i++) {
         const childView = lContainer[i];
         const firstChild = childView[TVIEW].firstChild;
         if (firstChild) {
-            _queryNodeChildrenR3(firstChild, childView, predicate, matches, elementsOnly, rootNativeNode);
+            _queryNodeChildren(firstChild, childView, predicate, matches, elementsOnly, rootNativeNode);
         }
     }
 }
@@ -27194,7 +27261,7 @@ function _queryNodeChildrenInContainerR3(lContainer, predicate, matches, element
  * @param elementsOnly whether only elements should be searched
  * @param rootNativeNode the root native node on which predicate should not be matched
  */
-function _addQueryMatchR3(nativeNode, predicate, matches, elementsOnly, rootNativeNode) {
+function _addQueryMatch(nativeNode, predicate, matches, elementsOnly, rootNativeNode) {
     if (rootNativeNode !== nativeNode) {
         const debugNode = getDebugNode(nativeNode);
         if (!debugNode) {
@@ -27203,7 +27270,7 @@ function _addQueryMatchR3(nativeNode, predicate, matches, elementsOnly, rootNati
         // Type of the "predicate and "matches" array are set based on the value of
         // the "elementsOnly" parameter. TypeScript is not able to properly infer these
         // types with generics, so we manually cast the parameters accordingly.
-        if (elementsOnly && debugNode instanceof DebugElement__POST_R3__ && predicate(debugNode) &&
+        if (elementsOnly && (debugNode instanceof DebugElement) && predicate(debugNode) &&
             matches.indexOf(debugNode) === -1) {
             matches.push(debugNode);
         }
@@ -27228,7 +27295,7 @@ function _queryNativeNodeDescendants(parentNode, predicate, matches, elementsOnl
         const node = nodes[i];
         const debugNode = getDebugNode(node);
         if (debugNode) {
-            if (elementsOnly && debugNode instanceof DebugElement__POST_R3__ && predicate(debugNode) &&
+            if (elementsOnly && (debugNode instanceof DebugElement) && predicate(debugNode) &&
                 matches.indexOf(debugNode) === -1) {
                 matches.push(debugNode);
             }
@@ -27269,25 +27336,24 @@ function collectPropertyBindings(properties, tNode, lView, tData) {
 // Need to keep the nodes in a global Map so that multiple angular apps are supported.
 const _nativeNodeToDebugNode = new Map();
 const NG_DEBUG_PROPERTY = '__ng_debug__';
-function getDebugNode__POST_R3__(nativeNode) {
+/**
+ * @publicApi
+ */
+function getDebugNode(nativeNode) {
     if (nativeNode instanceof Node) {
         if (!(nativeNode.hasOwnProperty(NG_DEBUG_PROPERTY))) {
             nativeNode[NG_DEBUG_PROPERTY] = nativeNode.nodeType == Node.ELEMENT_NODE ?
-                new DebugElement__POST_R3__(nativeNode) :
-                new DebugNode__POST_R3__(nativeNode);
+                new DebugElement(nativeNode) :
+                new DebugNode(nativeNode);
         }
         return nativeNode[NG_DEBUG_PROPERTY];
     }
     return null;
 }
-/**
- * @publicApi
- */
-const getDebugNode = getDebugNode__POST_R3__;
-function getDebugNodeR2__POST_R3__(_nativeNode) {
+// TODO: cleanup all references to this function and remove it.
+function getDebugNodeR2(_nativeNode) {
     return null;
 }
-const getDebugNodeR2 = getDebugNodeR2__POST_R3__;
 function getAllDebugNodes() {
     return Array.from(_nativeNodeToDebugNode.values());
 }
@@ -27297,14 +27363,6 @@ function indexDebugNode(node) {
 function removeDebugNodeFromIndex(node) {
     _nativeNodeToDebugNode.delete(node.nativeNode);
 }
-/**
- * @publicApi
- */
-const DebugNode = DebugNode__POST_R3__;
-/**
- * @publicApi
- */
-const DebugElement = DebugElement__POST_R3__;
 
 /**
  * @license