ember-source 5.0.0 → 5.1.0-alpha.2

package/types/stable/@ember/object/mixin.d.ts

@@ -128,7 +128,7 @@ declare module '@ember/object/mixin' {
           @param arguments*
           @public
         */
-    static create(...args: any[]): Mixin;
+    static create<M extends typeof Mixin>(...args: any[]): InstanceType<M>;
     /** @internal */
     static mixins(obj: object): Mixin[];
     /**
@@ -137,7 +137,7 @@ declare module '@ember/object/mixin' {
           @private
           @internal
         */
-    reopen(...args: any[]): this | undefined;
+    reopen(...args: Array<Mixin | Record<string, unknown>>): this;
     /**
           @method apply
           @param obj

package/types/stable/@ember/object/observable.d.ts

@@ -118,6 +118,7 @@ declare module '@ember/object/observable' {
           @return {Object} The property value or undefined.
           @public
         */
+    get<K extends keyof this>(key: K): this[K];
     get(key: string): unknown;
     /**
           To get the values of multiple properties at once, call `getProperties`
@@ -140,6 +141,16 @@ declare module '@ember/object/observable' {
           @return {Object}
           @public
         */
+    getProperties<L extends Array<keyof this>>(
+      list: L
+    ): {
+      [Key in L[number]]: this[Key];
+    };
+    getProperties<L extends Array<keyof this>>(
+      ...list: L
+    ): {
+      [Key in L[number]]: this[Key];
+    };
     getProperties<L extends string[]>(
       list: L
     ): {
@@ -194,6 +205,7 @@ declare module '@ember/object/observable' {
           @return {Object} The passed value
           @public
         */
+    set<K extends keyof this, T extends this[K]>(key: K, value: T): T;
     set<T>(key: string, value: T): T;
     /**
           Sets a list of properties at once. These properties are set inside
@@ -209,7 +221,15 @@ declare module '@ember/object/observable' {
           @return {Object} The passed in hash
           @public
         */
-    setProperties<T extends Record<string, any>>(hash: T): T;
+    setProperties<
+      K extends keyof this,
+      P extends {
+        [Key in K]: this[Key];
+      }
+    >(
+      hash: P
+    ): P;
+    setProperties<T extends Record<string, unknown>>(hash: T): T;
     /**
           Convenience method to call `propertyWillChange` and `propertyDidChange` in
           succession.

package/types/stable/@ember/object/proxy.d.ts

@@ -80,7 +80,31 @@ declare module '@ember/object/proxy' {
       @uses Ember.ProxyMixin
       @public
     */
-  interface ObjectProxy extends _ProxyMixin {}
-  class ObjectProxy extends FrameworkObject {}
+  interface ObjectProxy<Content = unknown> extends _ProxyMixin<Content> {
+    get<K extends keyof Content>(keyName: K): Content[K];
+    get<K extends keyof this>(keyname: K): this[K];
+    get(keyName: string): unknown;
+    set<K extends keyof Content>(keyName: K, value: Content[K]): Content[K];
+    set<K extends keyof this>(keyName: K, value: this[K]): this[K];
+    set(keyName: string): unknown;
+    getProperties<K extends keyof Content | keyof this>(
+      list: K[]
+    ): Pick<Content, Exclude<K, keyof this>> & Pick<this, Exclude<K, keyof Content>>;
+    getProperties<K extends keyof Content | keyof this>(
+      ...list: K[]
+    ): Pick<Content, Exclude<K, keyof this>> & Pick<this, Exclude<K, keyof Content>>;
+    getProperties<K extends string>(list: K[]): Record<K, unknown>;
+    getProperties<K extends string>(...list: K[]): Record<K, unknown>;
+    setProperties<
+      K extends keyof Content | keyof this,
+      Hash extends Partial<
+        Pick<Content, Exclude<K, keyof this>> & Pick<this, Exclude<K, keyof Content>>
+      >
+    >(
+      hash: Hash
+    ): Hash;
+    setProperties<T extends Record<string, unknown>>(hash: T): T;
+  }
+  class ObjectProxy<Content = unknown> extends FrameworkObject {}
   export default ObjectProxy;
 }

package/types/stable/@ember/routing/hash-location.d.ts

@@ -110,9 +110,3 @@ declare module '@ember/routing/hash-location' {
     _removeEventListener(): void;
   }
 }
-
-declare module '@ember/routing/location' {
-  interface Registry {
-    hash: HashLocation;
-  }
-}

package/types/stable/@ember/routing/history-location.d.ts

@@ -140,9 +140,3 @@ declare module '@ember/routing/history-location' {
     _removeEventListener(): void;
   }
 }
-
-declare module '@ember/routing/location' {
-  interface Registry {
-    history: HistoryLocation;
-  }
-}

package/types/stable/@ember/routing/lib/controller_for.d.ts

@@ -1,5 +1,6 @@
 declare module '@ember/routing/lib/controller_for' {
   import type { Container } from '@ember/-internals/container';
+  import type { FactoryClass, InternalFactory } from '@ember/-internals/owner';
   import type { RegisterOptions } from '@ember/owner';
   /**
       @module ember/routing
@@ -15,11 +16,5 @@ declare module '@ember/routing/lib/controller_for' {
     container: Container,
     controllerName: string,
     lookupOptions: RegisterOptions
-  ):
-    | object
-    | import('@ember/routing/-internals/owner').InternalFactory<
-        object,
-        import('@ember/routing/-internals/owner').FactoryClass
-      >
-    | undefined;
+  ): InternalFactory<object, FactoryClass> | object | undefined;
 }

package/types/stable/@ember/routing/lib/router_state.d.ts

@@ -3,14 +3,18 @@ declare module '@ember/routing/lib/router_state' {
   import type Router from 'router_js';
   import type Route from '@ember/routing/route';
   import type EmberRouter from '@ember/routing/router';
-  export default class RouterState<R extends Route> {
-    router: Router<R>;
-    emberRouter: EmberRouter<R>;
-    routerJsState: TransitionState<R>;
-    constructor(emberRouter: EmberRouter<R>, router: Router<R>, routerJsState: TransitionState<R>);
+  export default class RouterState {
+    router: Router<Route>;
+    emberRouter: EmberRouter;
+    routerJsState: TransitionState<Route>;
+    constructor(
+      emberRouter: EmberRouter,
+      router: Router<Route>,
+      routerJsState: TransitionState<Route>
+    );
     isActiveIntent(
       routeName: string,
-      models: ModelFor<R>[],
+      models: ModelFor<Route>[],
       queryParams?: Record<string, unknown>
     ): boolean;
   }

package/types/stable/@ember/routing/lib/routing-service.d.ts

@@ -23,8 +23,8 @@ declare module '@ember/routing/lib/routing-service' {
     currentState: EmberRouter['currentState'];
     currentRouteName: EmberRouter['currentRouteName'];
     currentPath: EmberRouter['currentPath'];
-    [ROUTER]?: EmberRouter<R>;
-    get router(): EmberRouter<R>;
+    [ROUTER]?: EmberRouter;
+    get router(): EmberRouter;
     hasRoute(routeName: string): boolean;
     transitionTo(
       routeName: string,
@@ -51,7 +51,7 @@ declare module '@ember/routing/lib/routing-service' {
       contexts: ModelFor<R>[],
       queryParams: Record<string, unknown> | undefined,
       routeName: string,
-      routerState: RouterState<R>
+      routerState: RouterState
     ): boolean;
   }
 }

package/types/stable/@ember/routing/lib/utils.d.ts

@@ -1,6 +1,5 @@
 declare module '@ember/routing/lib/utils' {
   import type { ControllerQueryParam, ControllerQueryParamType } from '@ember/controller';
-  import type { ModelFor } from 'router_js';
   import type Router from 'router_js';
   import type { ExtendedInternalRouteInfo } from '@ember/routing/route';
   import type Route from '@ember/routing/route';
@@ -10,27 +9,27 @@ declare module '@ember/routing/lib/utils' {
     scope: string;
     type?: ControllerQueryParamType;
   };
-  export type NamedRouteArgs<R extends Route> =
-    | [routeNameOrUrl: string, ...modelsAndOptions: [...ModelFor<R>[], RouteOptions]]
-    | [routeNameOrUrl: string, ...models: ModelFor<R>[]];
-  export type UnnamedRouteArgs<R extends Route> =
-    | [...modelsAndOptions: [...ModelFor<R>[], RouteOptions]]
-    | [...models: ModelFor<R>[]]
+  export type NamedRouteArgs =
+    | [routeNameOrUrl: string, ...modelsAndOptions: [...unknown[], RouteOptions]]
+    | [routeNameOrUrl: string, ...models: unknown[]];
+  export type UnnamedRouteArgs =
+    | [...modelsAndOptions: [...unknown[], RouteOptions]]
+    | [...models: unknown[]]
     | [options: RouteOptions];
-  export type RouteArgs<R extends Route> = NamedRouteArgs<R> | UnnamedRouteArgs<R>;
-  type ExtractedArgs<R extends Route> = {
+  export type RouteArgs = NamedRouteArgs | UnnamedRouteArgs;
+  type ExtractedArgs = {
     routeName: string | undefined;
-    models: ModelFor<R>[];
+    models: unknown[];
     queryParams: Record<string, unknown>;
   };
   export type RouteOptions = {
     queryParams: Record<string, unknown>;
   };
-  export function extractRouteArgs<R extends Route>(args: RouteArgs<R>): ExtractedArgs<R>;
+  export function extractRouteArgs(args: RouteArgs): ExtractedArgs;
   export function getActiveTargetName(router: Router<Route>): string;
-  export function stashParamNames<R extends Route>(
-    router: EmberRouter<R>,
-    routeInfos: Array<ExtendedInternalRouteInfo<R>> & {
+  export function stashParamNames(
+    router: EmberRouter,
+    routeInfos: Array<ExtendedInternalRouteInfo<Route>> & {
       _namesStashed?: boolean;
     }
   ): void;
@@ -43,7 +42,7 @@ declare module '@ember/routing/lib/utils' {
     queryParams: Readonly<ControllerQueryParam[]>
   ): Record<string, ExpandedControllerQueryParam>;
   export function resemblesURL(str: unknown): str is string;
-  export function prefixRouteNameArg<T extends NamedRouteArgs<Route> | UnnamedRouteArgs<Route>>(
+  export function prefixRouteNameArg<T extends NamedRouteArgs | UnnamedRouteArgs>(
     route: Route,
     args: T
   ): T;

package/types/stable/@ember/routing/location-ext.d.ts

@@ -0,0 +1,18 @@
+// This module provides an 'extension' to the `@ember/routing/location` module
+// from the `@ember/routing` package, so that users can rely on
+// `owner.lookup('location:hash')` type checking and returning `HashLocation`
+// (and the same for other location types). Our type publishing infrastructure
+// will pass it through unchanged, so end users will get this extension.
+
+import '@ember/routing/location';
+import type HashLocation from '@ember/routing/hash-location';
+import type HistoryLocation from '@ember/routing/history-location';
+import type NoneLocation from '@ember/routing/none-location';
+
+declare module '@ember/routing/location' {
+  interface Registry {
+    hash: HashLocation;
+    history: HistoryLocation;
+    none: NoneLocation;
+  }
+}

package/types/stable/@ember/routing/location.d.ts

@@ -115,9 +115,3 @@ declare module '@ember/routing/location' {
   export type UpdateCallback = (url: string) => void;
   export interface Registry extends Record<string, Location | undefined> {}
 }
-
-declare module '@ember/owner' {
-  interface DIRegistry {
-    location: Registry;
-  }
-}

package/types/stable/@ember/routing/none-location.d.ts

@@ -80,9 +80,3 @@ declare module '@ember/routing/none-location' {
     formatURL(url: string): string;
   }
 }
-
-declare module '@ember/routing/location' {
-  interface Registry {
-    none: NoneLocation;
-  }
-}

package/types/stable/@ember/routing/owner-ext.d.ts

@@ -0,0 +1,11 @@
+// This module provides an 'extension' to the `@ember/owner` module from the
+// `@ember/routing/location` module. Our type publishing infrastructure will
+// pass it through unchanged, so end users will get this extension.
+
+import type { Registry } from '@ember/routing/location';
+
+declare module '@ember/owner' {
+  export interface DIRegistry {
+    location: Registry;
+  }
+}

package/types/stable/@ember/routing/route.d.ts

@@ -3,6 +3,7 @@ declare module '@ember/routing/route' {
   import { BucketCache } from '@ember/routing/-internals';
   import EmberObject from '@ember/object';
   import Evented from '@ember/object/evented';
+  import { ActionHandler } from '@ember/-internals/runtime';
   import type { AnyFn } from '@ember/-internals/utility-types';
   import Controller from '@ember/controller';
   import type { Template } from '@glimmer/interfaces';
@@ -23,7 +24,7 @@ declare module '@ember/routing/route' {
       allowOverrides(prop: string, value: unknown): any;
     };
   };
-  type RouteTransitionState<R extends Route> = TransitionState<R> & {
+  type RouteTransitionState = TransitionState<Route> & {
     fullQueryParams?: Record<string, unknown>;
     queryParamsFor?: Record<string, Record<string, unknown>>;
   };
@@ -45,7 +46,7 @@ declare module '@ember/routing/route' {
       @since 1.0.0
       @public
     */
-  interface Route<T = unknown> extends IRoute<T> {
+  interface Route<Model = unknown> extends IRoute<Model>, ActionHandler, Evented {
     /**
           The `willTransition` action is fired at the beginning of any
           attempted transition with a `Transition` object as the sole
@@ -212,23 +213,24 @@ declare module '@ember/routing/route' {
         */
     error?(error: Error, transition: Transition): boolean | void;
   }
-  const Route_base: Readonly<typeof EmberObject> & (new (owner?: Owner | undefined) => EmberObject);
-  class Route<T = unknown> extends Route_base implements IRoute, Evented {
+  const Route_base: Readonly<typeof EmberObject> &
+    (new (owner?: Owner | undefined) => EmberObject) &
+    import('@ember/object/mixin').default;
+  class Route<Model = unknown> extends Route_base implements IRoute {
     static isRouteFactory: boolean;
-    context: T;
-    currentModel: T;
+    /** @internal */
+    context: Model;
+    /** @internal */
+    currentModel: Model;
+    /** @internal */
     _bucketCache: BucketCache;
+    /** @internal */
     _internalName: string;
     private _names;
     _router: EmberRouter;
     _topLevelViewTemplate: any;
     _environment: any;
-    constructor(owner: Owner);
-    on: (name: string, method: ((...args: any[]) => void) | string) => this;
-    one: (name: string, method: string | ((...args: any[]) => void)) => this;
-    trigger: (name: string, ...args: any[]) => any;
-    off: (name: string, method: string | ((...args: any[]) => void)) => this;
-    has: (name: string) => boolean;
+    constructor(owner?: Owner);
     /**
           A hook you can implement to convert the route's model into parameters
           for the URL.
@@ -275,7 +277,7 @@ declare module '@ember/routing/route' {
           @public
         */
     serialize(
-      model: T | undefined,
+      model: Model | undefined,
       params: string[]
     ):
       | {
@@ -592,7 +594,7 @@ declare module '@ember/routing/route' {
           @since 1.7.0
           @public
         */
-    resetController(_controller: Controller, _isExiting: boolean, _transition: Transition): this;
+    resetController(_controller: Controller, _isExiting: boolean, _transition: Transition): void;
     /**
           @private
       
@@ -687,7 +689,7 @@ declare module '@ember/routing/route' {
           @since 1.2.0
           @public
          */
-    intermediateTransitionTo(...args: NamedRouteArgs<this>): void;
+    intermediateTransitionTo(...args: NamedRouteArgs): void;
     /**
           Refresh the model on this route and any child routes, firing the
           `beforeModel`, `model`, and `afterModel` hooks in a similar fashion
@@ -717,7 +719,7 @@ declare module '@ember/routing/route' {
           @private
           @method setup
         */
-    setup(context: T | undefined, transition: Transition): void;
+    setup(context: Model | undefined, transition: Transition): void;
     _qpChanged(prop: string, value: unknown, qp: QueryParam): void;
     /**
           This hook is the first of the route entry validation hooks
@@ -787,7 +789,10 @@ declare module '@ember/routing/route' {
           @since 1.0.0
           @public
          */
-    afterModel(_resolvedModel: T | undefined, _transition: Transition): unknown | Promise<unknown>;
+    afterModel(
+      _resolvedModel: Model | undefined,
+      _transition: Transition
+    ): unknown | Promise<unknown>;
     /**
           A hook you can implement to optionally redirect to another route.
       
@@ -811,7 +816,7 @@ declare module '@ember/routing/route' {
           @since 1.0.0
           @public
         */
-    redirect(_model: T, _transition: Transition): void;
+    redirect(_model: Model, _transition: Transition): void;
     /**
           Called when the context is changed by router.js.
       
@@ -897,7 +902,10 @@ declare module '@ember/routing/route' {
           @since 1.0.0
           @public
         */
-    model(params: Record<string, unknown>, transition: Transition): T | PromiseLike<T> | undefined;
+    model(
+      params: Record<string, unknown>,
+      transition: Transition
+    ): Model | PromiseLike<Model> | undefined;
     /**
           @private
           @method deserialize
@@ -907,7 +915,10 @@ declare module '@ember/routing/route' {
       
           Router.js hook.
          */
-    deserialize(_params: {}, transition: Transition): T | PromiseLike<T> | undefined;
+    deserialize(
+      _params: Record<string, unknown>,
+      transition: Transition
+    ): Model | PromiseLike<Model> | undefined;
     /**
       
           @method findModel
@@ -986,7 +997,11 @@ declare module '@ember/routing/route' {
           @since 1.0.0
           @public
         */
-    setupController(controller: Controller, context: T | undefined, _transition?: Transition): void;
+    setupController(
+      controller: Controller,
+      context: Model | undefined,
+      _transition?: Transition
+    ): void;
     /**
           Returns the controller of the current route, or a parent (or any ancestor)
           route in a route hierarchy.
@@ -1240,9 +1255,9 @@ declare module '@ember/routing/route' {
   type PartialRenderOptions = Partial<
     Pick<RenderOptions, 'into' | 'outlet' | 'controller' | 'model'>
   >;
-  export function getFullQueryParams<R extends Route>(
-    router: EmberRouter<R>,
-    state: RouteTransitionState<R>
+  export function getFullQueryParams(
+    router: EmberRouter,
+    state: RouteTransitionState
   ): Record<string, unknown>;
   const defaultSerialize: (
     model: any,

package/types/stable/@ember/routing/router-service.d.ts

@@ -38,12 +38,18 @@ declare module '@ember/routing/router-service' {
        @extends Service
        @class RouterService
      */
-  interface RouterService<R extends Route> extends Evented {}
+  interface RouterService extends Evented {
+    on(
+      eventName: 'routeWillChange' | 'routeDidChange',
+      callback: (transition: Transition) => void
+    ): this;
+  }
   const RouterService_base: Readonly<typeof Service> &
-    (new (owner?: import('@ember/-internals/owner').default | undefined) => Service);
-  class RouterService<R extends Route> extends RouterService_base {
-    [ROUTER]?: EmberRouter<R>;
-    get _router(): EmberRouter<R>;
+    (new (owner?: import('@ember/-internals/owner').default | undefined) => Service) &
+    import('@ember/object/mixin').default;
+  class RouterService extends RouterService_base {
+    [ROUTER]?: EmberRouter;
+    get _router(): EmberRouter;
     willDestroy(): void;
     /**
            Transition the application into another route. The route may
@@ -90,7 +96,7 @@ declare module '@ember/routing/router-service' {
              attempted transition
            @public
          */
-    transitionTo(...args: RouteArgs<R>): Transition;
+    transitionTo(...args: RouteArgs): Transition;
     /**
            Similar to `transitionTo`, but instead of adding the destination to the browser's URL history,
            it replaces the entry for the current route.
@@ -128,7 +134,7 @@ declare module '@ember/routing/router-service' {
              attempted transition
            @public
          */
-    replaceWith(...args: RouteArgs<R>): Transition;
+    replaceWith(...args: RouteArgs): Transition;
     /**
           Generate a URL based on the supplied route name and optionally a model. The
           URL is returned as a string that can be used for any purpose.
@@ -197,7 +203,10 @@ declare module '@ember/routing/router-service' {
            @return {String} the string representing the generated URL
            @public
          */
-    urlFor(routeName: string, ...args: ModelFor<R>[] | [...ModelFor<R>[], RouteOptions]): string;
+    urlFor<R extends Route>(
+      routeName: string,
+      ...args: ModelFor<R>[] | [...ModelFor<R>[], RouteOptions]
+    ): string;
     /**
            Returns `true` if `routeName/models/queryParams` is the active route, where `models` and `queryParams` are optional.
            See [model](api/ember/release/classes/Route/methods/model?anchor=model) and
@@ -245,7 +254,7 @@ declare module '@ember/routing/router-service' {
            @return {boolean} true if the provided routeName/models/queryParams are active
            @public
          */
-    isActive(...args: RouteArgs<R>): boolean;
+    isActive(...args: RouteArgs): boolean;
     /**
            Takes a string URL and returns a `RouteInfo` for the leafmost route represented
            by the URL. Returns `null` if the URL is not recognized. This method expects to
@@ -587,9 +596,3 @@ declare module '@ember/routing/router-service' {
   }
   export { RouterService as default, RouteInfo, RouteInfoWithAttributes };
 }
-
-declare module '@ember/service' {
-  interface Registry {
-    router: RouterService<Route>;
-  }
-}