ember-source 5.3.0-alpha.3 → 5.3.0-alpha.5

package/dist/header/license.js

@@ -5,5 +5,5 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   5.3.0-alpha.3
+ * @version   5.3.0-alpha.5
  */

package/dist/packages/@ember/routing/route.js

@@ -16,7 +16,7 @@ import { ActionHandler } from '@ember/-internals/runtime';
 import { isEmpty, typeOf } from '@ember/utils';
 import { isProxy, lookupDescriptor } from '@ember/-internals/utils';
 import Controller from '@ember/controller';
-import { assert, info, isTesting } from '@ember/debug';
+import { assert, deprecate, info, isTesting } from '@ember/debug';
 import EngineInstance from '@ember/engine/instance';
 import { dependentKeyCompat } from '@ember/object/compat';
 import { once } from '@ember/runloop';
@@ -25,6 +25,9 @@ import { PARAMS_SYMBOL, STATE_SYMBOL } from 'router_js';
 import EmberRouter from '@ember/routing/router';
 import { generateController } from '@ember/routing/-internals';
 import { calculateCacheKey, normalizeControllerQueryParams, prefixRouteNameArg, stashParamNames } from './lib/utils';
+function isStoreLike(store) {
+  return typeof store === 'object' && store !== null && typeof store.find === 'function';
+}
 export const ROUTE_CONNECTIONS = new WeakMap();
 const RENDER = Symbol('render');
 class Route extends EmberObject.extend(ActionHandler, Evented) {
@@ -508,12 +511,6 @@ class Route extends EmberObject.extend(ActionHandler, Evented) {
     });
        export default Router;
     ```
-       The model for the `post` route is `store.findRecord('post', params.post_id)`.
-       By default, if your route has a dynamic segment ending in `_id`:
-       * The model class is determined from the segment (`post_id`'s
-      class is `App.Post`)
-    * The find method is called on the model class with the value of
-      the dynamic segment.
        Note that for routes with dynamic segments, this hook is not always
     executed. If the route is entered through a transition (e.g. when
     using the `link-to` Handlebars helper or the `transitionTo` method
@@ -539,11 +536,18 @@ class Route extends EmberObject.extend(ActionHandler, Evented) {
     described in the documentation for `beforeModel`. In particular,
     if a promise returned from `model` fails, the error will be
     handled by the `error` hook on `Route`.
+       Note that the legacy behavior of automatically defining a model
+    hook when a dynamic segment ending in `_id` is present is
+    [deprecated](https://deprecations.emberjs.com/v5.x#toc_deprecate-implicit-route-model).
+    You should explicitly define a model hook whenever any segments are
+    present.
        Example
        ```app/routes/post.js
     import Route from '@ember/routing/route';
+    import { service } from '@ember/service';
        export default class PostRoute extends Route {
-      model(params) {
+      @service store;
+         model(params) {
         return this.store.findRecord('post', params.post_id);
       }
     }
@@ -604,14 +608,19 @@ class Route extends EmberObject.extend(ActionHandler, Evented) {
     @param {Object} value the value passed to find
     @private
   */
-  findModel(...args) {
-    // SAFETY: it's all absurd lies; there is no explicit contract for `store`
-    // and we allow people to register *anything* here and we call it: GLHF! The
-    // fallback path here means we correctly handle the case where there is no
-    // explicit store injection on the route subclass.
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    let store = 'store' in this ? this.store : get(this, '_store');
-    return store.find(...args);
+  findModel(type, value) {
+    deprecate(`The implicit model loading behavior for routes is deprecated. ` + `Please define an explicit model hook for ${this.fullRouteName}.`, false, {
+      id: 'deprecate-implicit-route-model',
+      for: 'ember-source',
+      since: {
+        available: '5.3.0'
+      },
+      until: '6.0.0'
+    });
+    const store = 'store' in this ? this.store : get(this, '_store');
+    assert('Expected route to have a store with a find method', isStoreLike(store));
+    // SAFETY: We don't actually know it will return this, but this code path is also deprecated.
+    return store.find(type, value);
   }
   /**
     A hook you can use to setup the controller for the current route.
@@ -625,8 +634,10 @@ class Route extends EmberObject.extend(ActionHandler, Evented) {
     `super`:
        ```app/routes/photos.js
     import Route from '@ember/routing/route';
+    import { service } from '@ember/service';
        export default class PhotosRoute extends Route {
-      model() {
+      @service store;
+         model() {
         return this.store.findAll('photo');
       }
          setupController(controller, model) {
@@ -806,16 +817,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) {
     }
     return params;
   }
-  /**
-    Store property provides a hook for data persistence libraries to inject themselves.
-       By default, this store property provides the exact same functionality previously
-    in the model hook.
-       Currently, the required interface is:
-       `store.find(modelName, findArguments)`
-       @property store
-    @type {Object}
-    @private
-  */
+  /** @deprecated Manually define your own store, such as with `@service store` */
   get _store() {
     const owner = getOwner(this);
     assert('Route is unexpectedly missing an owner', owner);

package/dist/packages/ember/version.js

@@ -1 +1 @@
-export default "5.3.0-alpha.3";
+export default "5.3.0-alpha.5";