refactor: cleanup remaining signal primitive usages

goldens/aria/grid/index.api.md

@@ -9,7 +9,6 @@ import * as _angular_cdk_bidi from '@angular/cdk/bidi';
 import * as _angular_core from '@angular/core';
 import { ElementRef } from '@angular/core';
 import { Signal } from '@angular/core';
-import { WritableSignal } from '@angular/core';
 
 // @public
 export class Grid {

goldens/aria/private/index.api.md

@@ -7,7 +7,6 @@
 import * as _angular_core from '@angular/core';
 import { OnDestroy } from '@angular/core';
 import { untracked } from '@angular/core/primitives/signals';
-import { WritableSignal } from '@angular/core';
 
 // @public
 export interface AccordionGroupInputs extends Omit<ListNavigationInputs<AccordionTriggerPattern> & ListFocusInputs<AccordionTriggerPattern> & Omit<ListExpansionInputs, 'items'>, 'focusMode'> {
@@ -338,17 +337,17 @@ export class GridCellPattern implements GridCell {
     // (undocumented)
     readonly inputs: GridCellInputs;
     readonly isActivated: SignalLike<boolean>;
-    readonly isFocused: WritableSignal<boolean>;
-    readonly keydown: _angular_core.Signal<KeyboardEventManager<KeyboardEvent>>;
+    readonly isFocused: WritableSignalLike<boolean>;
+    readonly keydown: SignalLike<KeyboardEventManager<KeyboardEvent>>;
     readonly multiWidgetMode: SignalLike<boolean>;
     readonly navigationActivated: WritableSignalLike<boolean>;
     readonly navigationBehavior: ListNavigation<GridCellWidgetPattern>;
     readonly navigationDisabled: SignalLike<boolean>;
-    readonly nextKey: _angular_core.Signal<"ArrowRight" | "ArrowLeft" | "ArrowDown">;
+    readonly nextKey: SignalLike<"ArrowRight" | "ArrowLeft" | "ArrowDown">;
     onFocusIn(event: FocusEvent): void;
     onFocusOut(event: FocusEvent): void;
     onKeydown(event: KeyboardEvent): void;
-    readonly prevKey: _angular_core.Signal<"ArrowUp" | "ArrowRight" | "ArrowLeft">;
+    readonly prevKey: SignalLike<"ArrowUp" | "ArrowRight" | "ArrowLeft">;
     readonly rowSpan: SignalLike<number>;
     readonly selectable: SignalLike<boolean>;
     readonly selected: WritableSignalLike<boolean>;
@@ -660,16 +659,16 @@ export interface OptionInputs<V> extends Omit<ListItem<V>, 'index' | 'selectable
 // @public
 export class OptionPattern<V> {
     constructor(args: OptionInputs<V>);
-    active: _angular_core.Signal<boolean>;
+    active: SignalLike<boolean>;
     disabled: SignalLike<boolean>;
     element: SignalLike<HTMLElement | undefined>;
     id: SignalLike<string>;
-    index: _angular_core.Signal<number>;
+    index: SignalLike<number>;
     listbox: SignalLike<ListboxPattern$1<V> | undefined>;
     searchTerm: SignalLike<string>;
     selectable: () => boolean;
-    selected: _angular_core.Signal<boolean | undefined>;
-    tabIndex: _angular_core.Signal<0 | -1 | undefined>;
+    selected: SignalLike<boolean | undefined>;
+    tabIndex: SignalLike<0 | -1 | undefined>;
     value: SignalLike<V>;
 }
 

src/aria/private/behaviors/grid/grid-navigation.ts

@@ -6,8 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {computed} from '@angular/core';
-import {SignalLike} from '../signal-like/signal-like';
+import {SignalLike, computed} from '../signal-like/signal-like';
 import {GridFocus, GridFocusCell, GridFocusInputs} from './grid-focus';
 import {GridData, RowCol} from './grid-data';
 

src/aria/private/behaviors/label/BUILD

@@ -8,7 +8,6 @@ ts_project(
         "label.ts",
     ],
     deps = [
-        "//:node_modules/@angular/core",
         "//src/aria/private/behaviors/signal-like",
     ],
 )
@@ -21,7 +20,6 @@ ng_project(
     ],
     deps = [
         ":label",
-        "//:node_modules/@angular/core",
         "//src/aria/private/behaviors/signal-like",
     ],
 )

src/aria/private/behaviors/label/label.ts

@@ -5,8 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.dev/license
  */
-import {computed} from '@angular/core';
-import {SignalLike} from '../signal-like/signal-like';
+import {computed, SignalLike} from '../signal-like/signal-like';
 
 /** Represents the required inputs for the label control. */
 export interface LabelControlInputs {

src/aria/private/behaviors/list-navigation/BUILD.bazel

@@ -9,7 +9,6 @@ ts_project(
         exclude = ["**/*.spec.ts"],
     ),
     deps = [
-        "//:node_modules/@angular/core",
         "//src/aria/private/behaviors/list-focus",
         "//src/aria/private/behaviors/signal-like",
     ],
@@ -21,8 +20,8 @@ ng_project(
     srcs = glob(["**/*.spec.ts"]),
     deps = [
         ":list-navigation",
-        "//:node_modules/@angular/core",
         "//src/aria/private/behaviors/list-focus:unit_test_sources",
+        "//src/aria/private/behaviors/signal-like",
     ],
 )
 

src/aria/private/behaviors/list-navigation/list-navigation.spec.ts

@@ -6,12 +6,12 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {signal, WritableSignal} from '@angular/core';
+import {signal, WritableSignalLike} from '../signal-like/signal-like';
 import {ListNavigation, ListNavigationInputs, ListNavigationItem} from './list-navigation';
 import {getListFocus} from '../list-focus/list-focus.spec';
 
 type TestItem = ListNavigationItem & {
-  disabled: WritableSignal<boolean>;
+  disabled: WritableSignalLike<boolean>;
 };
 type TestInputs = Partial<ListNavigationInputs<ListNavigationItem>> & {
   numItems?: number;

src/aria/private/behaviors/signal-like/signal-like.ts

@@ -43,17 +43,20 @@ export function computed<T>(computation: () => T): SignalLike<T> {
   const computed = createComputed(computation);
   // TODO: Remove the `toString` after https://github.com/angular/angular/pull/65948 is merged.
   computed.toString = () => `[Computed: ${computed()}]`;
+  computed[SIGNAL].debugName = '';
   return computed;
 }
 
 export function signal<T>(initialValue: T): WritableSignalLike<T> {
   const [get, set, update] = createSignal(initialValue);
+  get[SIGNAL].debugName = '';
   // tslint:disable-next-line:ban Have to use `Object.assign` to preserve the getter function.
   return Object.assign(get, {set, update, asReadonly: () => get});
 }
 
 export function linkedSignal<T>(sourceFn: () => T): WritableSignalLike<T> {
   const getter = createLinkedSignal(sourceFn, s => s);
+  getter[SIGNAL].debugName = '';
   // tslint:disable-next-line:ban Have to use `Object.assign` to preserve the getter function.
   return Object.assign(getter, {
     set: (v: T) => linkedSignalSetFn(getter[SIGNAL], v),

src/aria/private/grid/cell.ts

@@ -6,11 +6,16 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {computed, signal, linkedSignal, WritableSignal} from '@angular/core';
 import {KeyboardEventManager} from '../behaviors/event-manager';
 import {ListFocus} from '../behaviors/list-focus/list-focus';
 import {ListNavigation, ListNavigationInputs} from '../behaviors/list-navigation/list-navigation';
-import {SignalLike, WritableSignalLike} from '../behaviors/signal-like/signal-like';
+import {
+  computed,
+  signal,
+  linkedSignal,
+  SignalLike,
+  WritableSignalLike,
+} from '../behaviors/signal-like/signal-like';
 import {GridCell} from '../behaviors/grid';
 import type {GridPattern} from './grid';
 import type {GridRowPattern} from './row';
@@ -52,7 +57,7 @@ export class GridCellPattern implements GridCell {
   readonly element: SignalLike<HTMLElement> = () => this.inputs.element();
 
   /** Whether the cell has focus. */
-  readonly isFocused: WritableSignal<boolean> = signal(false);
+  readonly isFocused: WritableSignalLike<boolean> = signal(false);
 
   /** Whether the cell is selected. */
   readonly selected: WritableSignalLike<boolean>;

src/aria/private/listbox/option.ts

@@ -6,8 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {computed} from '@angular/core';
-import {SignalLike} from '../behaviors/signal-like/signal-like';
+import {computed, SignalLike} from '../behaviors/signal-like/signal-like';
 import {List, ListInputs, ListItem} from '../behaviors/list/list';
 
 /**