Fix types for ember v5.6

Author: gossi

ember-link/package.json

@@ -62,7 +62,7 @@
     "@babel/plugin-proposal-decorators": "^7.22.5",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.5",
-    "@ember/test-helpers": "^3.1.0",
+    "@ember/test-helpers": "^3.2.1",
     "@embroider/addon-dev": "^3.1.1",
     "@glint/template": "^1.0.2",
     "@gossi/config-eslint": "^0.4.0",
@@ -73,7 +73,7 @@
     "@typescript-eslint/eslint-plugin": "^5.60.0",
     "@typescript-eslint/parser": "^5.60.0",
     "concurrently": "^8.2.0",
-    "ember-source": "^4.12.0",
+    "ember-source": "^5.6.0",
     "eslint": "^8.43.0",
     "eslint-plugin-ember": "^11.8.0",
     "eslint-plugin-storybook": "^0.6.12",

ember-link/src/helpers/link.ts

@@ -75,13 +75,14 @@ export default class LinkHelper extends Helper<LinkSignature> {
 
     const namedQueryParameters = named.query ?? {};
     const positionalQueryParameters =
-      positional.length > 0 && isQueryParams(positional[positional.length - 1])
+      positional.length > 0 &&
+      isQueryParams(positional?.[positional.length - 1] as PositionalParams)
         ? (positional[positional.length - 1] as QueryParams)
         : undefined;
 
     assert(
       `Query parameters either need to be specified as the last positional parameter or as the named 'query' parameter.`,
-      !positional.slice(0, -1).some((argument) => isQueryParams(argument))
+      !positional.slice(0, -1).some((argument) => isQueryParams(argument as PositionalParams))
     );
 
     assert(
@@ -95,7 +96,7 @@ export default class LinkHelper extends Helper<LinkSignature> {
       `Either specify models as positional parameters, as the named 'models' parameter, or as the named 'model' parameter as a short hand for a single model.`,
       !(
         positional.length > 1 &&
-        !isQueryParams(positional[positional.length - 1]) &&
+        !isQueryParams(positional?.[positional.length - 1] as PositionalParams) &&
         (named.models || named.model)
       )
     );

ember-link/src/services/link-manager.ts

@@ -8,11 +8,13 @@ import { BEHAVIOR, prevent } from '../-behavior';
 import { getOwner } from '../-owner';
 import Link from '../link';
 
+import type { RouteModel } from '../-models';
 import type { Behavior } from '../-behavior';
 import type { LinkParams } from '../-params';
 import type RouteInfo from '@ember/routing/route-info';
 import type RouterService from '@ember/routing/router-service';
 import type Transition from '@ember/routing/transition';
+import Owner from '@ember/owner';
 
 interface RouterServiceWithRecognize extends RouterService {
   recognize(url: string): RouteInfo;
@@ -95,8 +97,7 @@ export default class LinkManagerService extends Service {
    * Converts a `RouteInfo` object into `LinkParams`.
    */
   static getLinkParamsFromRouteInfo(routeInfo: RouteInfo): LinkParams {
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const models = routeInfo.paramNames.map((name) => routeInfo.params[name]!);
+    const models = routeInfo.paramNames.map((name) => routeInfo.params?.[name]) as RouteModel[];
 
     return {
       route: routeInfo.name,
@@ -105,9 +106,8 @@ export default class LinkManagerService extends Service {
     };
   }
 
-  // eslint-disable-next-line @typescript-eslint/ban-types
-  constructor(properties?: object) {
-    super(properties);
+  constructor(owner?: Owner) {
+    super(owner);
 
     // Ignore `Argument of type '"routeWillChange"' is not assignable to parameter of type ...`
 

ember-link/src/test-support/setup-link.ts

@@ -12,11 +12,11 @@ export default function setupLink(hooks: Hooks /* NestedHooks */) {
   hooks.beforeEach(function (this: TestContext) {
     assert(
       'ember-link.setupLink: You have already called `setupLink` once',
-      !this.owner.hasRegistration('service:link-manager') ||
-        !(this.owner.lookup('service:link-manager') instanceof TestInstrumentedLinkManagerService)
+      // !this.owner.hasRegistration('service:link-manager') ||
+      !(this.owner.lookup('service:link-manager') instanceof TestInstrumentedLinkManagerService)
     );
 
-    this.owner.unregister('service:link-manager');
+    // this.owner.unregister('service:link-manager');
     this.owner.register('service:link-manager', TestInstrumentedLinkManagerService);
   });
 }