refactor(core): interface cleanup

Should be fine to land this time.

(cherry picked from commit a675950)

Author: JeanMeche

packages/core/src/linker/view_container_ref.ts

@@ -22,6 +22,7 @@ import {assertNodeInjector} from '../render3/assert';
 import {ComponentFactory as R3ComponentFactory} from '../render3/component_ref';
 import {getComponentDef} from '../render3/def_getters';
 import {getParentInjectorLocation, NodeInjector} from '../render3/di';
+import {nativeInsertBefore} from '../render3/dom_node_manipulation';
 import {
   CONTAINER_HEADER_OFFSET,
   DEHYDRATED_VIEWS,
@@ -51,7 +52,6 @@ import {
 } from '../render3/interfaces/view';
 import {assertTNodeType} from '../render3/node_assert';
 import {destroyLView} from '../render3/node_manipulation';
-import {nativeInsertBefore} from '../render3/dom_node_manipulation';
 import {getCurrentTNode, getLView} from '../render3/state';
 import {
   getParentInjectorIndex,
@@ -70,15 +70,15 @@ import {
   throwError,
 } from '../util/assert';
 
+import {RuntimeError, RuntimeErrorCode} from '../errors';
+import {Binding, DirectiveWithBindings} from '../render3/dynamic_bindings';
+import {addToEndOfViewTree} from '../render3/view/construction';
+import {addLViewToLContainer, createLContainer, detachView} from '../render3/view/container';
 import {ComponentFactory, ComponentRef} from './component_factory';
 import {createElementRef, ElementRef} from './element_ref';
 import {NgModuleRef} from './ng_module_factory';
 import {TemplateRef} from './template_ref';
 import {EmbeddedViewRef, ViewRef} from './view_ref';
-import {addLViewToLContainer, createLContainer, detachView} from '../render3/view/container';
-import {addToEndOfViewTree} from '../render3/view/construction';
-import {Binding, DirectiveWithBindings} from '../render3/dynamic_bindings';
-import {RuntimeError, RuntimeErrorCode} from '../errors';
 
 /**
  * Represents a container where one or more views can be attached to a component.
@@ -333,11 +333,7 @@ export function injectViewContainerRef(): ViewContainerRef {
   return createContainerRef(previousTNode, getLView());
 }
 
-const VE_ViewContainerRef = ViewContainerRef;
-
-// TODO(alxhub): cleaning up this indirection triggers a subtle bug in Closure in g3. Once the fix
-// for that lands, this can be cleaned up.
-const R3ViewContainerRef = class ViewContainerRef extends VE_ViewContainerRef {
+class R3ViewContainerRef extends ViewContainerRef {
   constructor(
     private _lContainer: LContainer,
     private _hostTNode: TElementNode | TContainerNode | TElementContainerNode,
@@ -694,7 +690,7 @@ const R3ViewContainerRef = class ViewContainerRef extends VE_ViewContainerRef {
     }
     return index;
   }
-};
+}
 
 function getViewRefs(lContainer: LContainer): ViewRef[] | null {
   return lContainer[VIEW_REFS] as ViewRef[];

packages/core/src/render3/view_ref.ts

@@ -6,12 +6,12 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
+import type {ChangeDetectorRef} from '../change_detection/change_detector_ref';
+import {NotificationSource} from '../change_detection/scheduling/zoneless_scheduling';
 import {
   USE_EXHAUSTIVE_CHECK_NO_CHANGES_DEFAULT,
   UseExhaustiveCheckNoChanges,
 } from '../change_detection/use_exhaustive_check_no_changes';
-import type {ChangeDetectorRef} from '../change_detection/change_detector_ref';
-import {NotificationSource} from '../change_detection/scheduling/zoneless_scheduling';
 import type {ApplicationRef} from '../core';
 import {RuntimeError, RuntimeErrorCode} from '../errors';
 import type {EmbeddedViewRef} from '../linker/view_ref';
@@ -36,18 +36,13 @@ import {
 import {destroyLView, detachMovedView, detachViewFromDOM} from './node_manipulation';
 import {
   markViewForRefresh,
+  requiresRefreshOrTraversal,
   storeLViewOnDestroy,
   updateAncestorTraversalFlagsOnAttach,
-  requiresRefreshOrTraversal,
 } from './util/view_utils';
 import {detachView, trackMovedView} from './view/container';
 
-// Needed due to tsickle downleveling where multiple `implements` with classes creates
-// multiple @extends in Closure annotations, which is illegal. This workaround fixes
-// the multiple @extends by making the annotation @implements instead
-interface ChangeDetectorRefInterface extends ChangeDetectorRef {}
-
-export class ViewRef<T> implements EmbeddedViewRef<T>, ChangeDetectorRefInterface {
+export class ViewRef<T> implements EmbeddedViewRef<T>, ChangeDetectorRef {
   private _appRef: ApplicationRef | null = null;
   private _attachedToViewContainer = false;
   private exhaustive?: boolean;

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

@@ -198,7 +198,6 @@
       "TracingService",
       "USE_VALUE",
       "UnsubscriptionError",
-      "VE_ViewContainerRef",
       "VIEW_REFS",
       "ViewContainerRef",
       "ViewEncapsulation",

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

@@ -263,7 +263,6 @@
       "USE_VALUE",
       "UnsubscriptionError",
       "VALID",
-      "VE_ViewContainerRef",
       "VIEW_REFS",
       "Validators",
       "ValueChangeEvent",

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

@@ -260,7 +260,6 @@
       "USE_VALUE",
       "UnsubscriptionError",
       "VALID",
-      "VE_ViewContainerRef",
       "VIEW_REFS",
       "ValueChangeEvent",
       "ViewContainerRef",

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

@@ -320,7 +320,6 @@
       "UrlSegmentGroup",
       "UrlSerializer",
       "UrlTree",
-      "VE_ViewContainerRef",
       "VIEW_REFS",
       "ViewContainerRef",
       "ViewEncapsulation",