ember-source 3.28.5 → 4.0.0-beta.10

package/dist/packages/@ember/-internals/routing/lib/system/router.js

@@ -1,17 +1,15 @@
 import { privatize as P } from '@ember/-internals/container';
-import { computed, get, notifyPropertyChange, set } from '@ember/-internals/metal';
+import { computed, get, set } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
 import { A as emberA, Evented, Object as EmberObject, typeOf } from '@ember/-internals/runtime';
-import { assert, deprecate, info } from '@ember/debug';
-import { APP_CTRL_ROUTER_PROPS, ROUTER_EVENTS } from '@ember/deprecated-features';
+import { assert, info } from '@ember/debug';
 import EmberError from '@ember/error';
-import { assign } from '@ember/polyfills';
 import { cancel, once, run, scheduleOnce } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import EmberLocation from '../location/api';
 import { calculateCacheKey, extractRouteArgs, getActiveTargetName, resemblesURL } from '../utils';
 import DSL from './dsl';
-import { defaultSerialize, getFullQueryParams, hasDefaultSerialize, ROUTE_CONNECTIONS, ROUTER_EVENT_DEPRECATIONS } from './route';
+import { defaultSerialize, getFullQueryParams, hasDefaultSerialize, ROUTE_CONNECTIONS } from './route';
 import RouterState from './router_state';
 import Router, { logAbort, STATE_SYMBOL } from 'router_js';
 
@@ -21,12 +19,10 @@ function defaultDidTransition(infos) {
   this._cancelSlowTransitionTimer();
 
   this.notifyPropertyChange('url');
-  this.set('currentState', this.targetState); // Put this in the runloop so url will be accurate. Seems
-  // less surprising than didTransition being out of sync.
-
-  once(this, this.trigger, 'didTransition');
+  this.set('currentState', this.targetState);
 
   if (DEBUG) {
+    // @ts-expect-error namespace isn't public
     if (this.namespace.LOG_TRANSITIONS) {
       // eslint-disable-next-line no-console
       console.log(`Transitioned into '${EmberRouter._routePath(infos)}'`);
@@ -34,10 +30,9 @@ function defaultDidTransition(infos) {
   }
 }
 
-function defaultWillTransition(oldInfos, newInfos, transition) {
-  once(this, this.trigger, 'willTransition', transition);
-
+function defaultWillTransition(oldInfos, newInfos) {
   if (DEBUG) {
+    // @ts-expect-error namespace isn't public
     if (this.namespace.LOG_TRANSITIONS) {
       // eslint-disable-next-line no-console
       console.log(`Preparing to transition from '${EmberRouter._routePath(oldInfos)}' to '${EmberRouter._routePath(newInfos)}'`);
@@ -76,7 +71,7 @@ const {
   @public
 */
 
-class EmberRouter extends EmberObject {
+class EmberRouter extends EmberObject.extend(Evented) {
   constructor(owner) {
     super(...arguments);
     this._didSetupRouter = false;
@@ -105,6 +100,88 @@ class EmberRouter extends EmberObject {
     assert('BUG: RouterService should always be present', routerService !== undefined);
     this._routerService = routerService;
   }
+  /**
+    The `Router.map` function allows you to define mappings from URLs to routes
+    in your application. These mappings are defined within the
+    supplied callback function using `this.route`.
+       The first parameter is the name of the route which is used by default as the
+    path name as well.
+       The second parameter is the optional options hash. Available options are:
+         * `path`: allows you to provide your own path as well as mark dynamic
+        segments.
+      * `resetNamespace`: false by default; when nesting routes, ember will
+        combine the route names to form the fully-qualified route name, which is
+        used with `{{link-to}}` or manually transitioning to routes. Setting
+        `resetNamespace: true` will cause the route not to inherit from its
+        parent route's names. This is handy for preventing extremely long route names.
+        Keep in mind that the actual URL path behavior is still retained.
+       The third parameter is a function, which can be used to nest routes.
+    Nested routes, by default, will have the parent route tree's route name and
+    path prepended to it's own.
+       ```app/router.js
+    Router.map(function(){
+      this.route('post', { path: '/post/:post_id' }, function() {
+        this.route('edit');
+        this.route('comments', { resetNamespace: true }, function() {
+          this.route('new');
+        });
+      });
+    });
+    ```
+       @method map
+    @param callback
+    @public
+  */
+
+
+  static map(callback) {
+    if (!this.dslCallbacks) {
+      this.dslCallbacks = []; // FIXME: Can we remove this?
+
+      this.reopenClass({
+        dslCallbacks: this.dslCallbacks
+      });
+    }
+
+    this.dslCallbacks.push(callback);
+    return this;
+  }
+
+  static _routePath(routeInfos) {
+    let path = []; // We have to handle coalescing resource names that
+    // are prefixed with their parent's names, e.g.
+    // ['foo', 'foo.bar.baz'] => 'foo.bar.baz', not 'foo.foo.bar.baz'
+
+    function intersectionMatches(a1, a2) {
+      for (let i = 0; i < a1.length; ++i) {
+        if (a1[i] !== a2[i]) {
+          return false;
+        }
+      }
+
+      return true;
+    }
+
+    let name, nameParts, oldNameParts;
+
+    for (let i = 1; i < routeInfos.length; i++) {
+      name = routeInfos[i].name;
+      nameParts = name.split('.');
+      oldNameParts = slice.call(path);
+
+      while (oldNameParts.length) {
+        if (intersectionMatches(oldNameParts, nameParts)) {
+          break;
+        }
+
+        oldNameParts.shift();
+      }
+
+      path.push(...nameParts.slice(oldNameParts.length));
+    }
+
+    return path.join('.');
+  }
 
   _initRouterJs() {
     let location = get(this, 'location');
@@ -129,6 +206,7 @@ class EmberRouter extends EmberObject {
         let route = routeOwner.lookup(fullRouteName);
 
         if (seen[name]) {
+          assert('seen routes should exist', route);
           return route;
         }
 
@@ -172,42 +250,18 @@ class EmberRouter extends EmberObject {
           location.setURL(path);
           set(router, 'currentURL', path);
         });
-      }
+      } // TODO: merge into routeDidChange
 
-      didTransition(infos) {
-        if (ROUTER_EVENTS) {
-          if (router.didTransition !== defaultDidTransition) {
-            deprecate('You attempted to override the "didTransition" method which is deprecated. Please inject the router service and listen to the "routeDidChange" event.', false, {
-              id: 'deprecate-router-events',
-              until: '4.0.0',
-              url: 'https://deprecations.emberjs.com/v3.x#toc_deprecate-router-events',
-              for: 'ember-source',
-              since: {
-                enabled: '3.11.0'
-              }
-            });
-          }
-        }
 
+      didTransition(infos) {
+        assert('You attempted to override the "didTransition" method which has been deprecated. Please inject the router service and listen to the "routeDidChange" event.', router.didTransition === defaultDidTransition);
         router.didTransition(infos);
-      }
+      } // TODO: merge into routeWillChange
 
-      willTransition(oldInfos, newInfos, transition) {
-        if (ROUTER_EVENTS) {
-          if (router.willTransition !== defaultWillTransition) {
-            deprecate('You attempted to override the "willTransition" method which is deprecated. Please inject the router service and listen to the "routeWillChange" event.', false, {
-              id: 'deprecate-router-events',
-              until: '4.0.0',
-              url: 'https://deprecations.emberjs.com/v3.x#toc_deprecate-router-events',
-              for: 'ember-source',
-              since: {
-                enabled: '3.11.0'
-              }
-            });
-          }
-        }
 
-        router.willTransition(oldInfos, newInfos, transition);
+      willTransition(oldInfos, newInfos) {
+        assert('You attempted to override the "willTransition" method which has been deprecated. Please inject the router service and listen to the "routeWillChange" event.', router.willTransition === defaultWillTransition);
+        router.willTransition(oldInfos, newInfos);
       }
 
       triggerEvent(routeInfos, ignoreFailure, name, args) {
@@ -450,7 +504,14 @@ class EmberRouter extends EmberObject {
     if (!this._toplevelView) {
       let owner = getOwner(this);
       let OutletView = owner.factoryFor('view:-outlet');
-      this._toplevelView = OutletView.create();
+      let application = owner.lookup('application:main');
+      let environment = owner.lookup('-environment:main');
+      let template = owner.lookup('template:-outlet');
+      this._toplevelView = OutletView.create({
+        environment,
+        template,
+        application
+      });
 
       this._toplevelView.setOutletState(liveRoutes);
 
@@ -520,6 +581,7 @@ class EmberRouter extends EmberObject {
 
       if (this.namespace.LOG_TRANSITIONS) {
         // eslint-disable-next-line no-console
+        assert('expected infos to be set', infos);
         console.log(`Intermediate-transitioned into '${EmberRouter._routePath(infos)}'`);
       }
     }
@@ -532,6 +594,7 @@ class EmberRouter extends EmberObject {
   generate(name, ...args) {
     let url = this._routerMicrolib.generate(name, ...args);
 
+    assert('expected non-string location', typeof this.location !== 'string');
     return this.location.formatURL(url);
   }
   /**
@@ -603,8 +666,7 @@ class EmberRouter extends EmberObject {
       this._toplevelView = null;
     }
 
-    this._super(...arguments);
-
+    super.willDestroy();
     this.reset();
     let instances = this._engineInstances;
 
@@ -804,7 +866,7 @@ class EmberRouter extends EmberObject {
 
     this._processActiveTransitionQueryParams(targetRouteName, models, queryParams, _queryParams);
 
-    assign(queryParams, _queryParams);
+    Object.assign(queryParams, _queryParams);
 
     this._prepareQueryParams(targetRouteName, models, queryParams, Boolean(_keepDefaultQueryParamValues));
 
@@ -840,7 +902,7 @@ class EmberRouter extends EmberObject {
 
     this._fullyScopeQueryParams(targetRouteName, models, unchangedQPs);
 
-    assign(queryParams, unchangedQPs);
+    Object.assign(queryParams, unchangedQPs);
   }
   /**
     Prepares the query params for a URL or Transition. Restores any undefined QP
@@ -934,7 +996,7 @@ class EmberRouter extends EmberObject {
         qps.push(qp);
       }
 
-      assign(map, qpMeta.map);
+      Object.assign(map, qpMeta.map);
     }
 
     let finalQPMeta = {
@@ -1323,7 +1385,8 @@ export function triggerEvent(routeInfos, ignoreFailure, name, args) {
   if (!routeInfos) {
     if (ignoreFailure) {
       return;
-    }
+    } // TODO: update?
+
 
     throw new EmberError(`Can't trigger action '${name}' because your app hasn't finished transitioning into its first route. To trigger an action on destination routes during a transition, you can call \`.send()\` on the \`Transition\` object passed to the \`model/beforeModel/afterModel\` hooks.`);
   }
@@ -1393,7 +1456,9 @@ function updatePaths(router) {
   let path = EmberRouter._routePath(infos);
 
   let currentRouteName = infos[infos.length - 1].name;
-  let currentURL = router.get('location').getURL();
+  let location = router.location;
+  assert('expected location to not be a string', typeof location !== 'string');
+  let currentURL = location.getURL();
   set(router, 'currentPath', path);
   set(router, 'currentRouteName', currentRouteName);
   set(router, 'currentURL', currentURL);
@@ -1405,133 +1470,8 @@ function updatePaths(router) {
     // actually been entered at that point.
     return;
   }
-
-  if (APP_CTRL_ROUTER_PROPS) {
-    if (!('currentPath' in appController)) {
-      Object.defineProperty(appController, 'currentPath', {
-        get() {
-          deprecate('Accessing `currentPath` on `controller:application` is deprecated, use the `currentPath` property on `service:router` instead.', false, {
-            id: 'application-controller.router-properties',
-            until: '4.0.0',
-            url: 'https://deprecations.emberjs.com/v3.x#toc_application-controller-router-properties',
-            for: 'ember-source',
-            since: {
-              enabled: '3.10.0-beta.1'
-            }
-          });
-          return get(router, 'currentPath');
-        }
-
-      });
-    }
-
-    notifyPropertyChange(appController, 'currentPath');
-
-    if (!('currentRouteName' in appController)) {
-      Object.defineProperty(appController, 'currentRouteName', {
-        get() {
-          deprecate('Accessing `currentRouteName` on `controller:application` is deprecated, use the `currentRouteName` property on `service:router` instead.', false, {
-            id: 'application-controller.router-properties',
-            until: '4.0.0',
-            url: 'https://deprecations.emberjs.com/v3.x#toc_application-controller-router-properties',
-            for: 'ember-source',
-            since: {
-              enabled: '3.10.0-beta.1'
-            }
-          });
-          return get(router, 'currentRouteName');
-        }
-
-      });
-    }
-
-    notifyPropertyChange(appController, 'currentRouteName');
-  }
 }
 
-EmberRouter.reopenClass({
-  /**
-    The `Router.map` function allows you to define mappings from URLs to routes
-    in your application. These mappings are defined within the
-    supplied callback function using `this.route`.
-       The first parameter is the name of the route which is used by default as the
-    path name as well.
-       The second parameter is the optional options hash. Available options are:
-         * `path`: allows you to provide your own path as well as mark dynamic
-        segments.
-      * `resetNamespace`: false by default; when nesting routes, ember will
-        combine the route names to form the fully-qualified route name, which is
-        used with `{{link-to}}` or manually transitioning to routes. Setting
-        `resetNamespace: true` will cause the route not to inherit from its
-        parent route's names. This is handy for preventing extremely long route names.
-        Keep in mind that the actual URL path behavior is still retained.
-       The third parameter is a function, which can be used to nest routes.
-    Nested routes, by default, will have the parent route tree's route name and
-    path prepended to it's own.
-       ```app/router.js
-    Router.map(function(){
-      this.route('post', { path: '/post/:post_id' }, function() {
-        this.route('edit');
-        this.route('comments', { resetNamespace: true }, function() {
-          this.route('new');
-        });
-      });
-    });
-    ```
-       @method map
-    @param callback
-    @public
-  */
-  map(callback) {
-    if (!this.dslCallbacks) {
-      this.dslCallbacks = [];
-      this.reopenClass({
-        dslCallbacks: this.dslCallbacks
-      });
-    }
-
-    this.dslCallbacks.push(callback);
-    return this;
-  },
-
-  _routePath(routeInfos) {
-    let path = []; // We have to handle coalescing resource names that
-    // are prefixed with their parent's names, e.g.
-    // ['foo', 'foo.bar.baz'] => 'foo.bar.baz', not 'foo.foo.bar.baz'
-
-    function intersectionMatches(a1, a2) {
-      for (let i = 0; i < a1.length; ++i) {
-        if (a1[i] !== a2[i]) {
-          return false;
-        }
-      }
-
-      return true;
-    }
-
-    let name, nameParts, oldNameParts;
-
-    for (let i = 1; i < routeInfos.length; i++) {
-      name = routeInfos[i].name;
-      nameParts = name.split('.');
-      oldNameParts = slice.call(path);
-
-      while (oldNameParts.length) {
-        if (intersectionMatches(oldNameParts, nameParts)) {
-          break;
-        }
-
-        oldNameParts.shift();
-      }
-
-      path.push(...nameParts.slice(oldNameParts.length));
-    }
-
-    return path.join('.');
-  }
-
-});
-
 function didBeginTransition(transition, router) {
   let routerState = new RouterState(router, router._routerMicrolib, transition[STATE_SYMBOL]);
 
@@ -1639,76 +1579,12 @@ function representEmptyRoute(liveRoutes, defaultParentState, {
   }
 }
 
-EmberRouter.reopen(Evented, {
-  /**
-    Handles updating the paths and notifying any listeners of the URL
-    change.
-       Triggers the router level `didTransition` hook.
-       For example, to notify google analytics when the route changes,
-    you could use this hook.  (Note: requires also including GA scripts, etc.)
-       ```javascript
-    import config from './config/environment';
-    import EmberRouter from '@ember/routing/router';
-    import { inject as service } from '@ember/service';
-       let Router = EmberRouter.extend({
-      location: config.locationType,
-         router: service(),
-         didTransition: function() {
-        this._super(...arguments);
-           ga('send', 'pageview', {
-          page: this.router.currentURL,
-          title: this.router.currentRouteName,
-        });
-      }
-    });
-    ```
-       @method didTransition
-    @public
-    @since 1.2.0
-  */
+EmberRouter.reopen({
   didTransition: defaultDidTransition,
-
-  /**
-    Handles notifying any listeners of an impending URL
-    change.
-       Triggers the router level `willTransition` hook.
-       @method willTransition
-    @public
-    @since 1.11.0
-  */
   willTransition: defaultWillTransition,
-
-  /**
-   Represents the URL of the root of the application, often '/'. This prefix is
-   assumed on all routes defined on this router.
-      @property rootURL
-   @default '/'
-   @public
-  */
   rootURL: '/',
-
-  /**
-   The `location` property determines the type of URL's that your
-   application will use.
-      The following location types are currently available:
-      * `history` - use the browser's history API to make the URLs look just like any standard URL
-   * `hash` - use `#` to separate the server part of the URL from the Ember part: `/blog/#/posts/new`
-   * `none` - do not store the Ember URL in the actual browser URL (mainly used for testing)
-   * `auto` - use the best option based on browser capabilities: `history` if possible, then `hash` if possible, otherwise `none`
-      This value is defaulted to `auto` by the `locationType` setting of `/config/environment.js`
-      @property location
-   @default 'hash'
-   @see {Location}
-   @public
-  */
   location: 'hash',
-
-  /**
-   Represents the current URL.
-      @property url
-   @type {String}
-   @private
-  */
+  // FIXME: Does this need to be overrideable via extend?
   url: computed(function () {
     let location = get(this, 'location');
 
@@ -1719,9 +1595,4 @@ EmberRouter.reopen(Evented, {
     return location.getURL();
   })
 });
-
-if (ROUTER_EVENTS) {
-  EmberRouter.reopen(ROUTER_EVENT_DEPRECATIONS);
-}
-
 export default EmberRouter;

package/dist/packages/@ember/-internals/routing/lib/system/router_state.js

@@ -1,4 +1,3 @@
-import { assign } from '@ember/polyfills';
 import { shallowEqual } from '../utils';
 export default class RouterState {
   constructor(emberRouter, router, routerJsState) {
@@ -15,7 +14,7 @@ export default class RouterState {
     }
 
     if (queryParams !== undefined && Object.keys(queryParams).length > 0) {
-      let visibleQueryParams = assign({}, queryParams);
+      let visibleQueryParams = Object.assign({}, queryParams);
 
       this.emberRouter._prepareQueryParams(routeName, models, visibleQueryParams);
 

package/dist/packages/@ember/-internals/routing/lib/utils.js

@@ -2,7 +2,6 @@ import { get } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
 import { deprecate } from '@ember/debug';
 import EmberError from '@ember/error';
-import { assign } from '@ember/polyfills';
 import { STATE_SYMBOL } from 'router_js';
 const ALL_PERIODS_REGEX = /\./g;
 export function extractRouteArgs(args) {
@@ -190,7 +189,7 @@ function accumulateQueryParamDescriptors(_desc, accum) {
       as: null,
       scope: 'model'
     };
-    assign(tmp, singleDesc);
+    Object.assign(tmp, singleDesc);
     accum[key] = tmp;
   }
 }

package/dist/packages/@ember/-internals/runtime/index.js

@@ -1,7 +1,6 @@
 export { default as Object, FrameworkObject } from './lib/system/object';
 export { default as RegistryProxyMixin } from './lib/mixins/registry_proxy';
 export { default as ContainerProxyMixin } from './lib/mixins/container_proxy';
-export { default as copy } from './lib/copy';
 export { default as compare } from './lib/compare';
 export { default as isEqual } from './lib/is-equal';
 export { default as Array, NativeArray, A, MutableArray, removeAt, uniqBy, isArray } from './lib/mixins/array';
@@ -11,7 +10,6 @@ export { default as ArrayProxy } from './lib/system/array_proxy';
 export { default as ObjectProxy } from './lib/system/object_proxy';
 export { default as CoreObject } from './lib/system/core_object';
 export { default as ActionHandler } from './lib/mixins/action_handler';
-export { default as Copyable } from './lib/mixins/copyable';
 export { default as Enumerable } from './lib/mixins/enumerable';
 export { default as _ProxyMixin, contentFor as _contentFor } from './lib/mixins/-proxy';
 export { default as Observable } from './lib/mixins/observable';
@@ -21,5 +19,4 @@ export { default as Evented } from './lib/mixins/evented';
 export { default as PromiseProxyMixin } from './lib/mixins/promise_proxy';
 export { default as RSVP, onerrorDefault } from './lib/ext/rsvp'; // just for side effect of extending Ember.RSVP
 
-export { typeOf } from './lib/type-of';
-import './lib/ext/function'; // just for side effect of extending Function.prototype
+export { typeOf } from './lib/type-of';