fix(multiple): incorrect paths in declaration files for aria

A few places in the `@angular/aria` package were producing invalid paths when compiled for npm. We didn't catch them, because the Aria package wasn't running the same integration tests as the rest of the repo.

These changes fix the issues by using explicit type annotations.

Fixes #32665.

Author: crisbeto

goldens/aria/grid/index.api.md

@@ -4,7 +4,6 @@
 
 ```ts
 
-import * as _angular_aria_private_public_api from '@angular/aria/private/public-api';
 import * as _angular_cdk_bidi from '@angular/cdk/bidi';
 import * as _angular_core from '@angular/core';
 import { ElementRef } from '@angular/core';
@@ -83,7 +82,7 @@ export class GridCellWidget {
 // @public
 export class GridRow {
     readonly element: HTMLElement;
-    readonly _gridPattern: Signal<_angular_aria_private_public_api.GridPattern>;
+    readonly _gridPattern: Signal<GridPattern>;
     readonly _pattern: GridRowPattern;
     readonly rowIndex: _angular_core.InputSignal<number | undefined>;
     // (undocumented)

goldens/aria/listbox/index.api.md

@@ -4,7 +4,6 @@
 
 ```ts
 
-import * as _angular_aria_private_public_api from '@angular/aria/private/public-api';
 import * as _angular_cdk_bidi from '@angular/cdk/bidi';
 import * as _angular_core from '@angular/core';
 
@@ -16,7 +15,7 @@ export class Listbox<V> {
     focusMode: _angular_core.InputSignal<"roving" | "activedescendant">;
     gotoFirst(): void;
     readonly id: _angular_core.InputSignal<string>;
-    protected items: _angular_core.Signal<_angular_aria_private_public_api.OptionPattern<any>[]>;
+    protected items: _angular_core.Signal<OptionPattern<V>[]>;
     multi: _angular_core.InputSignalWithTransform<boolean, unknown>;
     // (undocumented)
     _onFocus(): void;

goldens/aria/tabs/index.api.md

@@ -4,8 +4,6 @@
 
 ```ts
 
-import * as _angular_aria_private from '@angular/aria/private';
-import * as _angular_aria_private_public_api from '@angular/aria/private/public-api';
 import * as _angular_cdk_bidi from '@angular/cdk/bidi';
 import * as _angular_core from '@angular/core';
 import { OnDestroy } from '@angular/core';
@@ -59,7 +57,7 @@ export class TabList implements OnInit, OnDestroy {
     readonly selectedTab: _angular_core.ModelSignal<string | undefined>;
     readonly selectionMode: _angular_core.InputSignal<"follow" | "explicit">;
     readonly softDisabled: _angular_core.InputSignalWithTransform<boolean, unknown>;
-    readonly _tabPatterns: _angular_core.Signal<_angular_aria_private_public_api.TabPattern[]>;
+    readonly _tabPatterns: _angular_core.Signal<TabPattern[]>;
     readonly textDirection: _angular_core.WritableSignal<_angular_cdk_bidi.Direction>;
     // (undocumented)
     _unregister(child: Tab): void;
@@ -93,8 +91,8 @@ export class Tabs {
     readonly element: HTMLElement;
     // (undocumented)
     _register(child: TabList | TabPanel): void;
-    readonly _tabPatterns: _angular_core.Signal<_angular_aria_private.TabPattern[] | undefined>;
-    readonly _unorderedTabpanelPatterns: _angular_core.Signal<_angular_aria_private.TabPanelPattern[]>;
+    readonly _tabPatterns: _angular_core.Signal<TabPattern[] | undefined>;
+    readonly _unorderedTabpanelPatterns: _angular_core.Signal<TabPanelPattern[]>;
     // (undocumented)
     _unregister(child: TabList | TabPanel): void;
     // (undocumented)

goldens/aria/toolbar/index.api.md

@@ -4,7 +4,6 @@
 
 ```ts
 
-import * as _angular_aria_private_public_api from '@angular/aria/private/public-api';
 import * as _angular_cdk_bidi from '@angular/cdk/bidi';
 import * as _angular_core from '@angular/core';
 import { OnDestroy } from '@angular/core';
@@ -15,7 +14,7 @@ export class Toolbar<V> {
     constructor();
     readonly disabled: _angular_core.InputSignalWithTransform<boolean, unknown>;
     readonly element: HTMLElement;
-    readonly _itemPatterns: _angular_core.Signal<_angular_aria_private_public_api.ToolbarWidgetPattern<V>[]>;
+    readonly _itemPatterns: _angular_core.Signal<ToolbarWidgetPattern<V>[]>;
     // (undocumented)
     _onFocus(): void;
     readonly orientation: _angular_core.InputSignal<"vertical" | "horizontal">;
@@ -48,7 +47,7 @@ export class ToolbarWidget<V> implements OnInit, OnDestroy {
     ngOnInit(): void;
     readonly _pattern: ToolbarWidgetPattern<V>;
     readonly selected: () => boolean;
-    readonly _toolbarPattern: _angular_core.Signal<_angular_aria_private_public_api.ToolbarPattern<V>>;
+    readonly _toolbarPattern: _angular_core.Signal<ToolbarPattern<V>>;
     readonly value: _angular_core.InputSignal<V>;
     // (undocumented)
     static ɵdir: _angular_core.ɵɵDirectiveDeclaration<ToolbarWidget<any>, "[ngToolbarWidget]", ["ngToolbarWidget"], { "id": { "alias": "id"; "required": false; "isSignal": true; }; "disabled": { "alias": "disabled"; "required": false; "isSignal": true; }; "value": { "alias": "value"; "required": true; "isSignal": true; }; }, {}, never, never, true, never>;

src/aria/grid/grid-row.ts

@@ -15,7 +15,7 @@ import {
   input,
   Signal,
 } from '@angular/core';
-import {GridRowPattern} from '../private';
+import {GridPattern, GridRowPattern} from '../private';
 import {Grid} from './grid';
 import {GRID_CELL, GRID_ROW} from './grid-tokens';
 
@@ -60,7 +60,7 @@ export class GridRow {
   private readonly _grid = inject(Grid);
 
   /** The parent grid UI pattern. */
-  readonly _gridPattern = computed(() => this._grid._pattern);
+  readonly _gridPattern = computed<GridPattern>(() => this._grid._pattern);
 
   /** The index of this row within the grid. */
   readonly rowIndex = input<number>();

src/aria/listbox/listbox.ts

@@ -21,7 +21,7 @@ import {
 } from '@angular/core';
 import {Directionality} from '@angular/cdk/bidi';
 import {_IdGenerator} from '@angular/cdk/a11y';
-import {ComboboxListboxPattern, ListboxPattern} from '../private';
+import {ComboboxListboxPattern, ListboxPattern, OptionPattern} from '../private';
 import {ComboboxPopup} from '../combobox';
 import {Option} from './option';
 import {LISTBOX} from './tokens';
@@ -91,7 +91,9 @@ export class Listbox<V> {
   protected textDirection = inject(Directionality).valueSignal.asReadonly();
 
   /** The Option UIPatterns of the child Options. */
-  protected items = computed(() => this._options().map(option => option._pattern));
+  protected items = computed<OptionPattern<V>[]>(() =>
+    this._options().map(option => option._pattern),
+  );
 
   /** Whether the list is vertically or horizontally oriented. */
   orientation = input<'vertical' | 'horizontal'>('vertical');

src/aria/tabs/tab-list.ts

@@ -20,7 +20,7 @@ import {
   OnInit,
   OnDestroy,
 } from '@angular/core';
-import {TabListPattern} from '../private';
+import {TabListPattern, TabPattern} from '../private';
 import {sortDirectives, TABS} from './utils';
 import type {Tab} from './tab';
 
@@ -73,7 +73,7 @@ export class TabList implements OnInit, OnDestroy {
   readonly textDirection = inject(Directionality).valueSignal;
 
   /** The Tab UIPatterns of the child Tabs. */
-  readonly _tabPatterns = computed(() =>
+  readonly _tabPatterns = computed<TabPattern[]>(() =>
     [...this._unorderedTabs()].sort(sortDirectives).map(tab => tab._pattern),
   );
 

src/aria/tabs/tabs.ts

@@ -10,6 +10,7 @@ import {computed, Directive, ElementRef, inject, signal} from '@angular/core';
 import {TabList} from './tab-list';
 import {TabPanel} from './tab-panel';
 import {TABS} from './utils';
+import {TabPanelPattern, TabPattern} from '../private';
 
 /**
  * A Tabs container.
@@ -61,10 +62,10 @@ export class Tabs {
   private readonly _unorderedPanels = signal(new Set<TabPanel>());
 
   /** The Tab UIPattern of the child Tabs. */
-  readonly _tabPatterns = computed(() => this._tablist()?._tabPatterns());
+  readonly _tabPatterns = computed<TabPattern[] | undefined>(() => this._tablist()?._tabPatterns());
 
   /** The TabPanel UIPattern of the child TabPanels. */
-  readonly _unorderedTabpanelPatterns = computed(() =>
+  readonly _unorderedTabpanelPatterns = computed<TabPanelPattern[]>(() =>
     [...this._unorderedPanels()].map(tabpanel => tabpanel._pattern),
   );
 

src/aria/toolbar/toolbar-widget.ts

@@ -16,7 +16,12 @@ import {
   OnInit,
   OnDestroy,
 } from '@angular/core';
-import {ToolbarWidgetPattern, ToolbarWidgetGroupPattern, SignalLike} from '../private';
+import {
+  ToolbarWidgetPattern,
+  ToolbarWidgetGroupPattern,
+  SignalLike,
+  ToolbarPattern,
+} from '../private';
 import {_IdGenerator} from '@angular/cdk/a11y';
 import {Toolbar} from './toolbar';
 import {TOOLBAR_WIDGET_GROUP} from './utils';
@@ -65,7 +70,7 @@ export class ToolbarWidget<V> implements OnInit, OnDestroy {
   readonly id = input(inject(_IdGenerator).getId('ng-toolbar-widget-', true));
 
   /** The parent Toolbar UIPattern. */
-  readonly _toolbarPattern = computed(() => this._toolbar._pattern);
+  readonly _toolbarPattern = computed<ToolbarPattern<V>>(() => this._toolbar._pattern);
 
   /** Whether the widget is disabled. */
   readonly disabled = input(false, {transform: booleanAttribute});

src/aria/toolbar/toolbar.ts

@@ -17,7 +17,7 @@ import {
   signal,
   model,
 } from '@angular/core';
-import {ToolbarPattern} from '../private';
+import {ToolbarPattern, ToolbarWidgetPattern} from '../private';
 import {Directionality} from '@angular/cdk/bidi';
 import type {ToolbarWidget} from './toolbar-widget';
 import {sortDirectives} from './utils';
@@ -72,7 +72,7 @@ export class Toolbar<V> {
   readonly textDirection = inject(Directionality).valueSignal;
 
   /** Sorted UIPatterns of the child widgets */
-  readonly _itemPatterns = computed(() =>
+  readonly _itemPatterns = computed<ToolbarWidgetPattern<V>[]>(() =>
     [...this._widgets()].sort(sortDirectives).map(widget => widget._pattern),
   );