moves the route manager types up a level to avoid the nonsense the type test causes

Author: evoactivity

packages/@ember/-internals/routing/route-managers/api.ts

@@ -31,7 +31,7 @@ import type { RouteManager, RouteStateBucket } from '@ember/-internals/routing/r
 import { hasClassicInterop } from '@ember/-internals/routing/route-managers/api';
 import type { InternalRouteInfo, Route as IRoute, Transition, TransitionState } from 'router_js';
 import { PARAMS_SYMBOL, STATE_SYMBOL } from 'router_js';
-import type { QueryParam, default as EmberRouter } from '@ember/routing/router';
+import type { default as EmberRouter } from '@ember/routing/router';
 import { default as generateController } from './lib/generate_controller';
 import type { ExpandedControllerQueryParam, NamedRouteArgs } from './lib/utils';
 import {
@@ -45,6 +45,23 @@ export interface ExtendedInternalRouteInfo<R extends Route> extends InternalRout
   _names?: unknown[];
 }
 
+export interface QueryParam {
+  prop: string;
+  urlKey: string;
+  type: string;
+  route: Route;
+  parts?: string[];
+  // eslint-disable-next-line @typescript-eslint/no-empty-object-type
+  values: {} | null;
+  scopedPropertyName: string;
+  scope: string;
+  defaultValue: unknown;
+  undecoratedDefaultValue: unknown;
+  serializedValue: string | null | undefined;
+  serializedDefaultValue: string | null | undefined;
+  controllerName: string;
+}
+
 export type QueryParamMeta = {
   qps: QueryParam[];
   map: Record<string, QueryParam>;

packages/@ember/routing/route.ts

@@ -44,6 +44,7 @@ import { Promise as RSVPPromise } from 'rsvp';
 import { DEBUG } from '@glimmer/env';
 import {
   type default as Route,
+  type QueryParam,
   type QueryParamMeta,
   defaultSerialize,
   getFullQueryParams,
@@ -119,22 +120,10 @@ if (DEBUG) {
   };
 }
 
-export interface QueryParam {
-  prop: string;
-  urlKey: string;
-  type: string;
-  route: Route;
-  parts?: string[];
-  // eslint-disable-next-line @typescript-eslint/no-empty-object-type
-  values: {} | null;
-  scopedPropertyName: string;
-  scope: string;
-  defaultValue: unknown;
-  undecoratedDefaultValue: unknown;
-  serializedValue: string | null | undefined;
-  serializedDefaultValue: string | null | undefined;
-  controllerName: string;
-}
+// `QueryParam` now lives in `@ember/routing/route`. It was historically
+// exported from `@ember/routing/router`, so re-export it here to preserve that
+// published deep-import path.
+export type { QueryParam };
 
 function K(this: Router<Route>) {
   return this;
@@ -1497,7 +1486,9 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     if (!hasClassicInterop(manager)) {
       return undefined;
     }
-    return manager.qp(route.bucket);
+    // The manager contract types `qp()` as `unknown`. Having
+    // confirmed classic interop, narrow it to the concrete type.
+    return manager.qp(route.bucket) as QueryParamMeta;
   }
 
   /**

packages/@ember/routing/router.ts

@@ -23,3 +23,23 @@ export {
   isTransitionAborted,
   type TransitionAbortedError,
 } from './lib/transition-aborted-error';
+
+export { routeCapabilities, hasClassicInterop } from './lib/route-manager';
+export type {
+  RouteManager,
+  RouteManagerWithClassicInterop,
+  RouteStateBucket,
+  RouteCapabilities,
+  RouteCapabilitiesVersions,
+  NavigationState,
+  NavigationActions,
+  AsyncNavigationState,
+  ClassicInteropArgs,
+  WillEnterState,
+  EnterState,
+  DidEnterState,
+  WillExitState,
+  ExitState,
+  DidExitState,
+  CreateRouteArgs,
+} from './lib/route-manager';

packages/router_js/index.ts

@@ -8,13 +8,8 @@ import type InternalTransition from './transition';
 import { isTransition, PARAMS_SYMBOL, QUERY_PARAMS_SYMBOL, STATE_SYMBOL } from './transition';
 import { isParam, isPromise, merge } from './utils';
 import { throwIfAborted } from './transition-aborted-error';
-import type {
-  EnterState,
-  RouteManager,
-  RouteStateBucket,
-  WillEnterState,
-} from '@ember/-internals/routing/route-managers/api';
-import { hasClassicInterop } from '@ember/-internals/routing/route-managers/api';
+import type { EnterState, RouteManager, RouteStateBucket, WillEnterState } from './route-manager';
+import { hasClassicInterop } from './route-manager';
 
 export type IModel = {} & {
   id?: string | number;