ember-source 4.3.0-beta.1 → 4.3.0-beta.2

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   4.3.0-beta.1
+ * @version   4.3.0-beta.2
  */

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

@@ -195,7 +195,6 @@ class RouterService extends Service.extend(Evented) {
 
     let transition = this._router._doTransition(routeName, models, queryParams, true);
 
-    transition['_keepDefaultQueryParamValues'] = true;
     return transition;
   }
   /**
@@ -366,19 +365,26 @@ class RouterService extends Service.extend(Evented) {
     let hasQueryParams = Object.keys(queryParams).length > 0;
 
     if (hasQueryParams) {
-      queryParams = Object.assign({}, queryParams);
-
-      this._router._prepareQueryParams( // UNSAFE: casting `routeName as string` here encodes the existing
+      // UNSAFE: casting `routeName as string` here encodes the existing
       // assumption but may be wrong: `extractRouteArgs` correctly returns it
       // as `string | undefined`. There may be bugs if `_prepareQueryParams`
       // does not correctly account for `undefined` values for `routeName`.
       //  Spoilers: under the hood this currently uses router.js APIs which
       // *do not* account for this being `undefined`.
-      routeName, models, queryParams, true
+      let targetRouteName = routeName;
+      queryParams = Object.assign({}, queryParams);
+
+      this._router._prepareQueryParams(targetRouteName, models, queryParams, true
+      /* fromRouterService */
+      );
+
+      let currentQueryParams = Object.assign({}, routerMicrolib.state.queryParams);
+
+      this._router._prepareQueryParams(targetRouteName, models, currentQueryParams, true
       /* fromRouterService */
       );
 
-      return shallowEqual(queryParams, routerMicrolib.state.queryParams);
+      return shallowEqual(queryParams, currentQueryParams);
     }
 
     return true;

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

@@ -1656,7 +1656,7 @@ Route.reopen({
         qp.serializedValue = svalue;
         let thisQueryParamHasDefaultValue = qp.serializedDefaultValue === svalue;
 
-        if (!thisQueryParamHasDefaultValue || transition._keepDefaultQueryParamValues) {
+        if (!thisQueryParamHasDefaultValue) {
           finalParams.push({
             value: svalue,
             visible: true,

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

@@ -916,7 +916,7 @@ class EmberRouter extends EmberObject.extend(Evented) {
     }
   }
 
-  _doTransition(_targetRouteName, models, _queryParams, _keepDefaultQueryParamValues) {
+  _doTransition(_targetRouteName, models, _queryParams, _fromRouterService) {
     let targetRouteName = _targetRouteName || getActiveTargetName(this._routerMicrolib);
 
     assert(`The route ${targetRouteName} was not found`, Boolean(targetRouteName) && this._routerMicrolib.hasRoute(targetRouteName));
@@ -927,7 +927,7 @@ class EmberRouter extends EmberObject.extend(Evented) {
 
     Object.assign(queryParams, _queryParams);
 
-    this._prepareQueryParams(targetRouteName, models, queryParams, Boolean(_keepDefaultQueryParamValues));
+    this._prepareQueryParams(targetRouteName, models, queryParams, Boolean(_fromRouterService));
 
     let transition = this._routerMicrolib.transitionTo(targetRouteName, ...models, {
       queryParams

package/dist/packages/ember/version.js

@@ -1 +1 @@
-export default "4.3.0-beta.1";
+export default "4.3.0-beta.2";

package/docs/data.json

@@ -3,7 +3,7 @@
     "name": "The Ember API",
     "description": "The Ember API: a framework for building ambitious web applications",
     "url": "https://emberjs.com/",
-    "version": "4.3.0-beta.1"
+    "version": "4.3.0-beta.2"
   },
   "files": {
     "node_modules/rsvp/lib/rsvp/promise/all.js": {
@@ -8579,7 +8579,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/services/router.ts",
-      "line": 137,
+      "line": 136,
       "description": "Similar to `transitionTo`, but instead of adding the destination to the browser's URL history,\nit replaces the entry for the current route.\nWhen the user clicks the \"back\" button in the browser, there will be fewer steps.\nThis is most commonly used to manage redirects in a way that does not cause confusing additions\nto the user's browsing history.\n\nCalling `replaceWith` from the Router service will cause default query parameter values to be included in the URL.\nThis behavior is different from calling `replaceWith` on a route.\nSee the [Router Service RFC](https://github.com/emberjs/rfcs/blob/master/text/0095-router-service.md#query-parameter-semantics) for more info.\n\nUsage example:\n\n```app/routes/application.js\nimport Route from '@ember/routing/route';\n\nexport default class extends Route {\n  beforeModel() {\n    if (!authorized()){\n      this.replaceWith('unauthorized');\n    }\n  }\n});\n```",
       "itemtype": "method",
       "name": "replaceWith",
@@ -8612,7 +8612,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/services/router.ts",
-      "line": 176,
+      "line": 175,
       "description": "Generate a URL based on the supplied route name and optionally a model. The\nURL is returned as a string that can be used for any purpose.\n\nIn this example, the URL for the `author.books` route for a given author\nis copied to the clipboard.\n\n```app/templates/application.hbs\n<CopyLink @author={{hash id=\"tomster\" name=\"Tomster\"}} />\n```\n\n```app/components/copy-link.js\nimport Component from '@glimmer/component';\nimport { service } from '@ember/service';\nimport { action } from '@ember/object';\n\nexport default class CopyLinkComponent extends Component {\n  @service router;\n  @service clipboard;\n\n  @action\n  copyBooksURL() {\n    if (this.author) {\n      const url = this.router.urlFor('author.books', this.args.author);\n      this.clipboard.set(url);\n      // Clipboard now has /author/tomster/books\n    }\n  }\n}\n```\n\nJust like with `transitionTo` and `replaceWith`, `urlFor` can also handle\nquery parameters.\n\n```app/templates/application.hbs\n<CopyLink @author={{hash id=\"tomster\" name=\"Tomster\"}} />\n```\n\n```app/components/copy-link.js\nimport Component from '@glimmer/component';\nimport { service } from '@ember/service';\nimport { action } from '@ember/object';\n\nexport default class CopyLinkComponent extends Component {\n  @service router;\n  @service clipboard;\n\n  @action\n  copyOnlyEmberBooksURL() {\n    if (this.author) {\n      const url = this.router.urlFor('author.books', this.author, {\n        queryParams: { filter: 'emberjs' }\n      });\n      this.clipboard.set(url);\n      // Clipboard now has /author/tomster/books?filter=emberjs\n    }\n  }\n}\n```",
       "itemtype": "method",
       "name": "urlFor",
@@ -8645,7 +8645,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/services/router.ts",
-      "line": 249,
+      "line": 248,
       "description": "Returns `true` if `routeName/models/queryParams` is the active route, where `models` and `queryParams` are optional.\nSee [model](api/ember/release/classes/Route/methods/model?anchor=model) and\n[queryParams](/api/ember/3.7/classes/Route/properties/queryParams?anchor=queryParams) for more information about these arguments.\n\nIn the following example, `isActive` will return `true` if the current route is `/posts`.\n\n```app/components/posts.js\nimport Component from '@glimmer/component';\nimport { service } from '@ember/service';\n\nexport default class extends Component {\n  @service router;\n\n  displayComments() {\n    return this.router.isActive('posts');\n  }\n});\n```\n\nThe next example includes a dynamic segment, and will return `true` if the current route is `/posts/1`,\nassuming the post has an id of 1:\n\n```app/components/posts.js\nimport Component from '@glimmer/component';\nimport { service } from '@ember/service';\n\nexport default class extends Component {\n  @service router;\n\n  displayComments(post) {\n    return this.router.isActive('posts', post.id);\n  }\n});\n```\n\nWhere `post.id` is the id of a specific post, which is represented in the route as /posts/[post.id].\nIf `post.id` is equal to 1, then isActive will return true if the current route is /posts/1, and false if the route is anything else.",
       "itemtype": "method",
       "name": "isActive",
@@ -8678,7 +8678,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/services/router.ts",
-      "line": 343,
+      "line": 352,
       "description": "Takes a string URL and returns a `RouteInfo` for the leafmost route represented\nby the URL. Returns `null` if the URL is not recognized. This method expects to\nreceive the actual URL as seen by the browser including the app's `rootURL`.\n\nSee [RouteInfo](/ember/release/classes/RouteInfo) for more info.\n\nIn the following example `recognize` is used to verify if a path belongs to our\napplication before transitioning to it.\n\n```\nimport Component from '@ember/component';\nimport { service } from '@ember/service';\n\nexport default class extends Component {\n  @service router;\n  path = '/';\n\n  click() {\n    if (this.router.recognize(this.path)) {\n      this.router.transitionTo(this.path);\n    }\n  }\n}\n```",
       "itemtype": "method",
       "name": "recognize",
@@ -8700,7 +8700,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/services/router.ts",
-      "line": 384,
+      "line": 393,
       "description": "Takes a string URL and returns a promise that resolves to a\n`RouteInfoWithAttributes` for the leafmost route represented by the URL.\nThe promise rejects if the URL is not recognized or an unhandled exception\nis encountered. This method expects to receive the actual URL as seen by\nthe browser including the app's `rootURL`.",
       "itemtype": "method",
       "name": "recognizeAndLoad",
@@ -8722,7 +8722,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/services/router.ts",
-      "line": 406,
+      "line": 415,
       "description": "The `routeWillChange` event is fired at the beginning of any\nattempted transition with a `Transition` object as the sole\nargument. This action can be used for aborting, redirecting,\nor decorating the transition from the currently active routes.\n\nA good example is preventing navigation when a form is\nhalf-filled out:\n\n```app/routes/contact-form.js\nimport Route from '@ember/routing';\nimport { service } from '@ember/service';\n\nexport default class extends Route {\n  @service router;\n\n  constructor() {\n    super(...arguments);\n\n    this.router.on('routeWillChange', (transition) => {\n      if (!transition.to.find(route => route.name === this.routeName)) {\n        alert(\"Please save or cancel your changes.\");\n        transition.abort();\n      }\n    })\n  }\n}\n```\n\nThe `routeWillChange` event fires whenever a new route is chosen as the desired target of a transition. This includes `transitionTo`, `replaceWith`, all redirection for any reason including error handling, and abort. Aborting implies changing the desired target back to where you already were. Once a transition has completed, `routeDidChange` fires.",
       "itemtype": "event",
       "name": "routeWillChange",
@@ -8740,7 +8740,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/services/router.ts",
-      "line": 442,
+      "line": 451,
       "description": "The `routeDidChange` event only fires once a transition has settled.\nThis includes aborts and error substates. Like the `routeWillChange` event\nit receives a Transition as the sole argument.\n\nA good example is sending some analytics when the route has transitioned:\n\n```app/routes/contact-form.js\nimport Route from '@ember/routing';\nimport { service } from '@ember/service';\n\nexport default class extends Route {\n  @service router;\n\n  constructor() {\n    super(...arguments);\n\n    this.router.on('routeDidChange', (transition) => {\n      ga.send('pageView', {\n        current: transition.to.name,\n        from: transition.from.name\n      });\n    })\n  }\n}\n```\n\n`routeDidChange` will be called after any `Route`'s\n[didTransition](/ember/release/classes/Route/events/didTransition?anchor=didTransition)\naction has been fired.\nThe updates of properties\n[currentURL](/ember/release/classes/RouterService/properties/currentURL?anchor=currentURL),\n[currentRouteName](/ember/release/classes/RouterService/properties/currentURL?anchor=currentRouteName)\nand\n[currentRoute](/ember/release/classes/RouterService/properties/currentURL?anchor=currentRoute)\nare completed at the time `routeDidChange` is called.",
       "itemtype": "event",
       "name": "routeDidChange",
@@ -8758,7 +8758,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/services/router.ts",
-      "line": 485,
+      "line": 494,
       "description": "Refreshes all currently active routes, doing a full transition.\nIf a route name is provided and refers to a currently active route,\nit will refresh only that route and its descendents.\nReturns a promise that will be resolved once the refresh is complete.\nAll resetController, beforeModel, model, afterModel, redirect, and setupController\nhooks will be called again. You will get new data from the model hook.",
       "itemtype": "method",
       "name": "refresh",
@@ -8783,7 +8783,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/services/router.ts",
-      "line": 522,
+      "line": 531,
       "description": "Name of the current route.\n\n This property represents the logical name of the route,\n which is comma separated.\n For the following router:\n\n ```app/router.js\n Router.map(function() {\n   this.route('about');\n   this.route('blog', function () {\n     this.route('post', { path: ':post_id' });\n   });\n });\n ```\n\n It will return:\n\n * `index` when you visit `/`\n * `about` when you visit `/about`\n * `blog.index` when you visit `/blog`\n * `blog.post` when you visit `/blog/some-post-id`",
       "itemtype": "property",
       "name": "currentRouteName",
@@ -8795,7 +8795,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/services/router.ts",
-      "line": 552,
+      "line": 561,
       "description": "Current URL for the application.\n\n  This property represents the URL path for this route.\n  For the following router:\n\n ```app/router.js\n Router.map(function() {\n   this.route('about');\n   this.route('blog', function () {\n     this.route('post', { path: ':post_id' });\n   });\n });\n ```\n\n It will return:\n\n * `/` when you visit `/`\n * `/about` when you visit `/about`\n * `/blog` when you visit `/blog`\n * `/blog/some-post-id` when you visit `/blog/some-post-id`",
       "itemtype": "property",
       "name": "currentURL",
@@ -8807,7 +8807,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/services/router.ts",
-      "line": 581,
+      "line": 590,
       "description": "The `location` property returns what implementation of the `location` API\nyour application is using, which determines what type of URL is being used.\n\nSee [Location](/ember/release/classes/Location) for more information.\n\nTo force a particular `location` API implementation to be used in your\napplication you can set a location type on your `config/environment`.\nFor example, to set the `history` type:\n\n```config/environment.js\n'use strict';\n\nmodule.exports = function(environment) {\n  let ENV = {\n    modulePrefix: 'router-service',\n    environment,\n    rootURL: '/',\n    locationType: 'history',\n    ...\n  }\n}\n```\n\nThe following location types are available by default:\n`auto`, `hash`, `history`, `none`.\n\nSee [HashLocation](/ember/release/classes/HashLocation).\nSee [HistoryLocation](/ember/release/classes/HistoryLocation).\nSee [NoneLocation](/ember/release/classes/NoneLocation).\nSee [AutoLocation](/ember/release/classes/AutoLocation).",
       "itemtype": "property",
       "name": "location",
@@ -8822,7 +8822,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/services/router.ts",
-      "line": 621,
+      "line": 630,
       "description": "The `rootURL` property represents the URL of the root of\nthe application, '/' by default.\nThis prefix is assumed on all routes defined on this app.\n\nIf you change the `rootURL` in your environment configuration\nlike so:\n\n```config/environment.js\n'use strict';\n\nmodule.exports = function(environment) {\n  let ENV = {\n    modulePrefix: 'router-service',\n    environment,\n    rootURL: '/my-root',\n  …\n  }\n]\n```\n\nThis property will return `/my-root`.",
       "itemtype": "property",
       "name": "rootURL",
@@ -8834,7 +8834,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/services/router.ts",
-      "line": 651,
+      "line": 660,
       "description": "The `currentRoute` property contains metadata about the current leaf route.\nIt returns a `RouteInfo` object that has information like the route name,\nparams, query params and more.\n\nSee [RouteInfo](/ember/release/classes/RouteInfo) for more info.\n\nThis property is guaranteed to change whenever a route transition\nhappens (even when that transition only changes parameters\nand doesn't change the active route).\n\nUsage example:\n```app/components/header.js\n  import Component from '@glimmer/component';\n  import { service } from '@ember/service';\n  import { notEmpty } from '@ember/object/computed';\n\n  export default class extends Component {\n    @service router;\n\n    @notEmpty('router.currentRoute.child') isChildRoute;\n  });\n```",
       "itemtype": "property",
       "name": "currentRoute",
@@ -10481,7 +10481,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1120,
+      "line": 1115,
       "description": "Prepares the query params for a URL or Transition. Restores any undefined QP\nkeys/values, serializes all values, and then prunes any default values.",
       "access": "private",
       "tagname": "",
@@ -10518,7 +10518,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1147,
+      "line": 1142,
       "description": "Returns the meta information for the query params of a given route. This\nwill be overridden to allow support for lazy routes.",
       "access": "private",
       "tagname": "",
@@ -10540,7 +10540,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1161,
+      "line": 1156,
       "description": "Returns a merged query params meta object for a given set of routeInfos.\nUseful for knowing what query params are available for a given route hierarchy.",
       "access": "private",
       "tagname": "",
@@ -10562,7 +10562,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1223,
+      "line": 1218,
       "description": "Maps all query param keys to their fully scoped property name of the form\n`controllerName:propName`.",
       "access": "private",
       "tagname": "",
@@ -10594,7 +10594,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1261,
+      "line": 1256,
       "description": "Hydrates (adds/restores) any query params that have pre-existing values into\nthe given queryParams hash. This is what allows query params to be \"sticky\"\nand restore their last known values for their scope.",
       "access": "private",
       "tagname": "",
@@ -10621,7 +10621,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1432,
+      "line": 1427,
       "description": "Handles updating the paths and notifying any listeners of the URL\nchange.\n\nTriggers the router level `didTransition` hook.\n\nFor example, to notify google analytics when the route changes,\nyou could use this hook.  (Note: requires also including GA scripts, etc.)\n\n```javascript\nimport config from './config/environment';\nimport EmberRouter from '@ember/routing/router';\nimport { service } from '@ember/service';\n\nlet Router = EmberRouter.extend({\n  location: config.locationType,\n\n  router: service(),\n\n  didTransition: function() {\n    this._super(...arguments);\n\n    ga('send', 'pageview', {\n      page: this.router.currentURL,\n      title: this.router.currentRouteName,\n    });\n  }\n});\n```",
       "itemtype": "method",
       "name": "didTransition",
@@ -10633,7 +10633,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1469,
+      "line": 1464,
       "description": "Handles notifying any listeners of an impending URL\nchange.\n\nTriggers the router level `willTransition` hook.",
       "itemtype": "method",
       "name": "willTransition",
@@ -10645,7 +10645,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1482,
+      "line": 1477,
       "description": "Represents the current URL.",
       "itemtype": "property",
       "name": "url",
@@ -10657,7 +10657,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1640,
+      "line": 1635,
       "description": "Finds the name of the substate route if it exists for the given route. A\nsubstate route is of the form `route_state`, such as `foo_loading`.",
       "access": "private",
       "tagname": "",
@@ -10682,7 +10682,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1661,
+      "line": 1656,
       "description": "Finds the name of the state route if it exists for the given route. A state\nroute is of the form `route.state`, such as `foo.loading`. Properly Handles\n`application` named routes.",
       "access": "private",
       "tagname": "",
@@ -10707,7 +10707,7 @@
     },
     {
       "file": "packages/@ember/-internals/routing/lib/system/router.ts",
-      "line": 1683,
+      "line": 1678,
       "description": "Determines whether or not a route has been defined by checking that the route\nis in the Router's map and the owner has a registration for that route.",
       "access": "private",
       "tagname": "",
@@ -18871,15 +18871,15 @@
     },
     {
       "message": "Missing item type\nFinds the name of the substate route if it exists for the given route. A\nsubstate route is of the form `route_state`, such as `foo_loading`.",
-      "line": " packages/@ember/-internals/routing/lib/system/router.ts:1640"
+      "line": " packages/@ember/-internals/routing/lib/system/router.ts:1635"
     },
     {
       "message": "Missing item type\nFinds the name of the state route if it exists for the given route. A state\nroute is of the form `route.state`, such as `foo.loading`. Properly Handles\n`application` named routes.",
-      "line": " packages/@ember/-internals/routing/lib/system/router.ts:1661"
+      "line": " packages/@ember/-internals/routing/lib/system/router.ts:1656"
     },
     {
       "message": "Missing item type\nDetermines whether or not a route has been defined by checking that the route\nis in the Router's map and the owner has a registration for that route.",
-      "line": " packages/@ember/-internals/routing/lib/system/router.ts:1683"
+      "line": " packages/@ember/-internals/routing/lib/system/router.ts:1678"
     },
     {
       "message": "Missing item type\nThis mixin allows for Ember objects to subscribe to and emit events.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.3.0-beta.1",
+  "version": "4.3.0-beta.2",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"
@@ -156,7 +156,7 @@
   "ember-addon": {
     "after": "ember-cli-legacy-blueprints"
   },
-  "_originalVersion": "4.3.0-beta.1",
+  "_originalVersion": "4.3.0-beta.2",
   "_versionPreviouslyCalculated": true,
   "publishConfig": {
     "tag": "beta"