ember-source 4.3.0-alpha.4 → 4.3.0-beta.1

package/dist/ember.debug.js

@@ -6,7 +6,7 @@
  *            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-alpha.4
+ * @version   4.3.0-beta.1
  */
 /* eslint-disable no-var */
 
@@ -272,7 +272,7 @@ define("@ember/-internals/container/index", ["exports", "@ember/-internals/owner
 
     lookup(fullName, options) {
       if (this.isDestroyed) {
-        throw new Error(`Can not call \`.lookup\` after the owner has been destroyed`);
+        throw new Error(`Cannot call \`.lookup\` after the owner has been destroyed`);
       }
 
       (true && !(this.registry.isValidFullName(fullName)) && (0, _debug.assert)('fullName must be a proper full name', this.registry.isValidFullName(fullName)));
@@ -343,7 +343,7 @@ define("@ember/-internals/container/index", ["exports", "@ember/-internals/owner
 
     factoryFor(fullName) {
       if (this.isDestroyed) {
-        throw new Error(`Can not call \`.factoryFor\` after the owner has been destroyed`);
+        throw new Error(`Cannot call \`.factoryFor\` after the owner has been destroyed`);
       }
 
       var normalizedName = this.registry.normalize(fullName);
@@ -516,9 +516,9 @@ define("@ember/-internals/container/index", ["exports", "@ember/-internals/owner
     var cache = container.cache;
     var keys = Object.keys(cache);
 
-    for (var i = 0; i < keys.length; i++) {
-      var key = keys[i];
+    for (var key of keys) {
       var value = cache[key];
+      (true && !(value) && (0, _debug.assert)('has cached value', value));
 
       if (value.destroy) {
         value.destroy();
@@ -585,7 +585,7 @@ define("@ember/-internals/container/index", ["exports", "@ember/-internals/owner
       } = this;
 
       if (container.isDestroyed) {
-        throw new Error(`Can not create new instances after the owner has been destroyed (you attempted to create ${this.fullName})`);
+        throw new Error(`Cannot create new instances after the owner has been destroyed (you attempted to create ${this.fullName})`);
       }
 
       var props = {};
@@ -959,6 +959,8 @@ define("@ember/-internals/container/index", ["exports", "@ember/-internals/owner
       }
 
       var type = fullName.split(':')[0];
+      (true && !(type) && (0, _debug.assert)('has type', type)); // split always will have at least one value
+
       options = this._typeOptions[type];
 
       if (options && options[optionName] !== undefined) {
@@ -1005,8 +1007,7 @@ define("@ember/-internals/container/index", ["exports", "@ember/-internals/owner
       var localKnown = (0, _utils.dictionary)(null);
       var registeredNames = Object.keys(this.registrations);
 
-      for (var index = 0; index < registeredNames.length; index++) {
-        var fullName = registeredNames[index];
+      for (var fullName of registeredNames) {
         var itemType = fullName.split(':')[0];
 
         if (itemType === type) {
@@ -1045,9 +1046,11 @@ define("@ember/-internals/container/index", ["exports", "@ember/-internals/owner
 
       for (var key in hash) {
         if (Object.prototype.hasOwnProperty.call(hash, key)) {
+          var value = hash[key];
+          (true && !(value) && (0, _debug.assert)('has value', value));
           var {
             specifier
-          } = hash[key];
+          } = value;
           (true && !(this.isValidFullName(specifier)) && (0, _debug.assert)(`Expected a proper full name, given '${specifier}'`, this.isValidFullName(specifier)));
           injections.push({
             property: key,
@@ -1064,10 +1067,10 @@ define("@ember/-internals/container/index", ["exports", "@ember/-internals/owner
         return;
       }
 
-      for (var i = 0; i < injections.length; i++) {
+      for (var injection of injections) {
         var {
           specifier
-        } = injections[i];
+        } = injection;
         (true && !(this.has(specifier)) && (0, _debug.assert)(`Attempting to inject an unknown injection: '${specifier}'`, this.has(specifier)));
       }
     };
@@ -1113,6 +1116,7 @@ define("@ember/-internals/container/index", ["exports", "@ember/-internals/owner
 
   function privatize(_ref5) {
     var [fullName] = _ref5;
+    (true && !(arguments.length === 1 && fullName) && (0, _debug.assert)('has a single string argument', arguments.length === 1 && fullName));
     var name = privateNames[fullName];
 
     if (name) {
@@ -3692,19 +3696,25 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
   }
 
   function createClassNameBindingRef(rootRef, microsyntax, operations) {
-    var [prop, truthy, falsy] = microsyntax.split(':');
+    var parts = microsyntax.split(':');
+    var [prop, truthy, falsy] = parts; // NOTE: This could be an empty string
+
+    (true && !(prop !== undefined) && (0, _debug.assert)('has prop', prop !== undefined)); // Will always have at least one part
+
     var isStatic = prop === '';
 
     if (isStatic) {
       operations.setAttribute('class', (0, _reference.createPrimitiveRef)(truthy), true, null);
     } else {
       var isPath = prop.indexOf('.') > -1;
-      var parts = isPath ? prop.split('.') : [];
-      var value = isPath ? referenceForParts(rootRef, parts) : (0, _reference.childRefFor)(rootRef, prop);
+
+      var _parts = isPath ? prop.split('.') : [];
+
+      var value = isPath ? referenceForParts(rootRef, _parts) : (0, _reference.childRefFor)(rootRef, prop);
       var ref;
 
       if (truthy === undefined) {
-        ref = createSimpleClassNameBindingRef(value, isPath ? parts[parts.length - 1] : prop);
+        ref = createSimpleClassNameBindingRef(value, isPath ? _parts[_parts.length - 1] : prop);
       } else {
         ref = createColonClassNameBindingRef(value, truthy, falsy);
       }
@@ -4079,9 +4089,10 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
     // Anything else is an action argument.
 
     var [context, action$$1, ...restArgs] = positional;
+    (true && !(context && action$$1) && (0, _debug.assert)('hash position arguments', context && action$$1));
     var debugKey = action$$1.debugLabel;
-    var target = 'target' in named ? named.target : context;
-    var processArgs = makeArgsProcessor('value' in named && named.value, restArgs);
+    var target = 'target' in named && named.target ? named.target : context;
+    var processArgs = makeArgsProcessor('value' in named && named.value || false, restArgs);
     var fn$$1;
 
     if ((0, _reference.isInvokableRef)(action$$1)) {
@@ -4196,6 +4207,7 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
 
     for (var name in namedArgs) {
       var ref = namedArgs[name];
+      (true && !(ref) && (0, _debug.assert)('expected ref', ref));
       var value = (0, _reference.valueForRef)(ref);
       var isAction = typeof value === 'function' && ACTIONS.has(value);
 
@@ -4263,6 +4275,7 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
 
     while (i !== -1) {
       var binding = attributeBindings[i];
+      (true && !(binding) && (0, _debug.assert)('has binding', binding));
       var parsed = parseAttributeBinding(binding);
       var attribute = parsed[1];
 
@@ -4343,8 +4356,9 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
             {
           __ARGS__
         } = _b,
-            rest = __rest(_b, ["__ARGS__"]); // does this need to be untracked?
+            rest = __rest(_b, ["__ARGS__"]);
 
+        (true && !(__ARGS__) && (0, _debug.assert)('[BUG] unexpectedly missing __ARGS__ after check', __ARGS__)); // does this need to be untracked?
 
         var __args__ = (0, _reference.valueForRef)(__ARGS__);
 
@@ -4378,14 +4392,8 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
         Object.assign(named, args.named.capture());
 
         for (var i = 0; i < count; i++) {
-          // As of TS 3.7, tsc is giving us the following error on this line without the type annotation
-          //
-          //   TS7022: 'name' implicitly has type 'any' because it does not have a type annotation and is
-          //   referenced directly or indirectly in its own initializer.
-          //
-          // This is almost certainly a TypeScript bug, feel free to try and remove the annotation after
-          // upgrading if it is not needed anymore.
           var name = positionalParams[i];
+          (true && !(name) && (0, _debug.assert)('Expected at least one positional param', name));
           (true && !(!args.named.has(name)) && (0, _debug.assert)(`You cannot specify both a positional param (at position ${i}) and the hash argument \`${name}\`.`, !args.named.has(name)));
           named[name] = args.positional.at(i);
         }
@@ -4667,9 +4675,7 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
         classNameBindings
       } = component;
 
-      for (var i = 0; i < classNameBindings.length; i++) {
-        var binding = classNameBindings[i];
-
+      for (var binding of classNameBindings) {
         if (binding.split(' ').length > 1) {
           return false;
         }
@@ -4681,9 +4687,7 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
         classNameBindings
       } = component;
 
-      for (var i = 0; i < classNameBindings.length; i++) {
-        var binding = classNameBindings[i];
-
+      for (var binding of classNameBindings) {
         if (binding.split(' ').length > 1) {
           return false;
         }
@@ -6416,6 +6420,7 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
       positional
     } = _ref11;
     var inner = positional[0];
+    (true && !(inner) && (0, _debug.assert)('expected at least one positional arg', inner));
     return (0, _reference.createComputeRef)(() => {
       var iterable = (0, _reference.valueForRef)(inner);
       (0, _validator.consumeTag)((0, _metal.tagForObject)(iterable));
@@ -6554,18 +6559,14 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
 
     static fromIndexable(obj) {
       var keys = Object.keys(obj);
-      var {
-        length
-      } = keys;
 
-      if (length === 0) {
+      if (keys.length === 0) {
         return null;
       } else {
         var values = [];
 
-        for (var i = 0; i < length; i++) {
+        for (var key of keys) {
           var value = void 0;
-          var key = keys[i];
           value = obj[key]; // Add the tag of the returned value if it is an array, since arrays
           // should always cause updates if they are consumed and then changed
 
@@ -6832,14 +6833,14 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
       positional,
       named
     } = _ref12;
-    (true && !(positional.length === 1) && (0, _debug.assert)(`[BUG] wrong number of positional arguments, expecting 1, got ${positional.length}`, positional.length === 1));
     var nameOrValueRef = positional[0];
-    (true && !('type' in named) && (0, _debug.assert)(`[BUG] expecting \`type\` named argument`, 'type' in named));
-    (true && !('loc' in named) && (0, _debug.assert)(`[BUG] expecting \`loc\` named argument`, 'loc' in named));
-    (true && !('original' in named) && (0, _debug.assert)(`[BUG] expecting \`original\` named argument`, 'original' in named));
+    (true && !(positional.length === 1 && nameOrValueRef) && (0, _debug.assert)(`[BUG] wrong number of positional arguments, expecting 1, got ${positional.length}`, positional.length === 1 && nameOrValueRef));
     var typeRef = named.type;
     var locRef = named.loc;
-    var originalRef = named.original; // Bug: why do these fail?
+    var originalRef = named.original;
+    (true && !(typeRef) && (0, _debug.assert)(`[BUG] expecting \`type\` named argument`, typeRef));
+    (true && !(locRef) && (0, _debug.assert)(`[BUG] expecting \`loc\` named argument`, locRef));
+    (true && !(originalRef) && (0, _debug.assert)(`[BUG] expecting \`original\` named argument`, originalRef)); // Bug: why do these fail?
     // assert('[BUG] expecting a string literal for the `type` argument', isConstRef(typeRef));
     // assert('[BUG] expecting a string literal for the `loc` argument', isConstRef(locRef));
     // assert('[BUG] expecting a string literal for the `original` argument', isConstRef(originalRef));
@@ -6863,6 +6864,7 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
   ) {
     helper$1 = args => {
       var inner = args.positional[0];
+      (true && !(inner) && (0, _debug.assert)('expected at least one positional arg', inner));
       return (0, _reference.createComputeRef)(() => {
         var value = (0, _reference.valueForRef)(inner);
         (true && !(value !== null && value !== undefined) && (0, _debug.assert)('You cannot pass a null or undefined destination element to in-element', value !== null && value !== undefined));
@@ -6870,7 +6872,11 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
       });
     };
   } else {
-    helper$1 = args => args.positional[0];
+    helper$1 = args => {
+      var arg = args.positional[0];
+      (true && !(arg) && (0, _debug.assert)('expected at least one positional arg', arg));
+      return arg;
+    };
   }
 
   var inElementNullCheckHelper = internalHelper(helper$1);
@@ -6879,9 +6885,14 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
       positional
     } = _ref13;
     return (0, _reference.createComputeRef)(() => {
-      var classNameParts = (0, _reference.valueForRef)(positional[0]).split('.');
+      var classNameArg = positional[0];
+      var valueArg = positional[1];
+      (true && !(classNameArg && valueArg) && (0, _debug.assert)('expected at least two positional args', classNameArg && valueArg));
+      var classNameParts = (0, _reference.valueForRef)(classNameArg).split('.');
       var className = classNameParts[classNameParts.length - 1];
-      var value = (0, _reference.valueForRef)(positional[1]);
+      (true && !(className) && (0, _debug.assert)('has className', className)); // Always at least one split result
+
+      var value = (0, _reference.valueForRef)(valueArg);
 
       if (value === true) {
         return (0, _string.dasherize)(className);
@@ -6903,7 +6914,7 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
     (true && !(owner) && (0, _debug.assert)('[BUG] missing owner', owner));
     (true && !(positional.length === 1) && (0, _debug.assert)(`[BUG] wrong number of positional arguments, expecting 1, got ${positional.length}`, positional.length === 1));
     var fullNameRef = positional[0];
-    (true && !((0, _reference.isConstRef)(fullNameRef)) && (0, _debug.assert)('[BUG] expecting a string literal as argument', (0, _reference.isConstRef)(fullNameRef)));
+    (true && !(fullNameRef && (0, _reference.isConstRef)(fullNameRef)) && (0, _debug.assert)('[BUG] expecting a string literal as argument', fullNameRef && (0, _reference.isConstRef)(fullNameRef)));
     var fullName = (0, _reference.valueForRef)(fullNameRef);
     (true && !(typeof fullName === 'string') && (0, _debug.assert)('[BUG] expecting a string literal as argument', typeof fullName === 'string'));
     (true && !(fullName.split(':').length === 2) && (0, _debug.assert)('[BUG] expecting a valid full name', fullName.split(':').length === 2));
@@ -6932,6 +6943,7 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
       positional
     } = _ref15;
     var inner = positional[0];
+    (true && !(inner) && (0, _debug.assert)('expected at least one positional arg', inner));
     return (0, _reference.createComputeRef)(() => {
       var iterable = (0, _reference.valueForRef)(inner);
 
@@ -7024,7 +7036,8 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
     var {
       positional
     } = _ref16;
-    var ref = positional[0]; // TODO: Improve this error message. This covers at least two distinct
+    var ref = positional[0];
+    (true && !(ref) && (0, _debug.assert)('expected at least one positional arg', ref)); // TODO: Improve this error message. This covers at least two distinct
     // cases:
     //
     // 1. (mut "not a path") – passing a literal, result from a helper
@@ -7160,7 +7173,9 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
     var {
       positional
     } = _ref17;
-    return (0, _reference.createReadOnlyRef)(positional[0]);
+    var firstArg = positional[0];
+    (true && !(firstArg) && (0, _debug.assert)('has first arg', firstArg));
+    return (0, _reference.createReadOnlyRef)(firstArg);
   });
   /**
   @module ember
@@ -7200,7 +7215,7 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
       named
     } = _ref18;
     (true && !(positional.length === 1 && Object.keys(named).length === 0) && (0, _debug.assert)('unbound helper cannot be called with multiple params or hash params', positional.length === 1 && Object.keys(named).length === 0));
-    return (0, _reference.createUnboundRef)((0, _reference.valueForRef)(positional[0]), '(resurt of an `unbound` helper)');
+    return (0, _reference.createUnboundRef)((0, _reference.valueForRef)(positional[0]), '(result of an `unbound` helper)');
   });
   var MODIFIERS = ['alt', 'shift', 'meta', 'ctrl'];
   var POINTER_EVENT_TYPE_REGEX = /^click|mouse|touch/;
@@ -7422,6 +7437,7 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
         positional
       } = actionState;
       var actionNameRef = positional[1];
+      (true && !(actionNameRef) && (0, _debug.assert)('Expected at least one positional arg', actionNameRef));
 
       if (!(0, _reference.isInvokableRef)(actionNameRef)) {
         actionState.actionName = (0, _reference.valueForRef)(actionNameRef);
@@ -7719,7 +7735,9 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
     if (args.positional.length === 0) {
       nameRef = (0, _reference.createPrimitiveRef)('main');
     } else {
-      nameRef = args.positional[0];
+      var maybeNameRef = args.positional[0];
+      (true && !(maybeNameRef) && (0, _debug.assert)('Expected at least one positional arg', maybeNameRef));
+      nameRef = maybeNameRef;
     }
 
     var outletRef = (0, _reference.createComputeRef)(() => {
@@ -8172,8 +8190,8 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
   }
 
   function loopBegin() {
-    for (var i = 0; i < renderers.length; i++) {
-      renderers[i]._scheduleRevalidate();
+    for (var renderer of renderers) {
+      renderer._scheduleRevalidate();
     }
   }
 
@@ -8218,12 +8236,12 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
   var loops = 0;
 
   function loopEnd() {
-    for (var i = 0; i < renderers.length; i++) {
-      if (!renderers[i]._isValid()) {
+    for (var renderer of renderers) {
+      if (!renderer._isValid()) {
         if (loops > _environment2.ENV._RERENDER_LOOP_LIMIT) {
           loops = 0; // TODO: do something better
 
-          renderers[i].destroy();
+          renderer.destroy();
           throw new Error('infinite rendering invalidation detected');
         }
 
@@ -8350,6 +8368,7 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
 
       while (i--) {
         var root = roots[i];
+        (true && !(root) && (0, _debug.assert)('has root', root));
 
         if (root.isFor(view)) {
           root.destroy();
@@ -8421,6 +8440,7 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
           // each root is processed
           for (var i = 0; i < roots.length; i++) {
             var root = roots[i];
+            (true && !(root) && (0, _debug.assert)('has root', root));
 
             if (root.destroyed) {
               // add to the list of roots to be removed
@@ -8483,8 +8503,7 @@ define("@ember/-internals/glimmer/index", ["exports", "@glimmer/opcode-compiler"
     _clearAllRoots() {
       var roots = this._roots;
 
-      for (var i = 0; i < roots.length; i++) {
-        var root = roots[i];
+      for (var root of roots) {
         root.destroy();
       }
 
@@ -9205,7 +9224,8 @@ define("@ember/-internals/meta/lib/meta", ["exports", "@ember/-internals/utils",
           sync
         });
       } else {
-        var listener = listeners[i]; // If the listener is our own listener and we are trying to remove it, we
+        var listener = listeners[i];
+        (true && !(listener) && (0, _debug.assert)('has listener', listener)); // If the listener is our own listener and we are trying to remove it, we
         // want to splice it out entirely so we don't hold onto a reference.
 
         if (kind === 2
@@ -9304,8 +9324,7 @@ define("@ember/-internals/meta/lib/meta", ["exports", "@ember/-internals/utils",
                 this._inheritedEnd = 0;
               }
 
-              for (var i = 0; i < parentListeners.length; i++) {
-                var listener = parentListeners[i];
+              for (var listener of parentListeners) {
                 var index = indexOfListener(listeners, listener.event, listener.target, listener.method);
 
                 if (index === -1) {
@@ -9342,10 +9361,9 @@ define("@ember/-internals/meta/lib/meta", ["exports", "@ember/-internals/utils",
       }
 
       if (listeners !== undefined) {
-        for (var index = 0; index < listeners.length; index++) {
-          var listener = listeners[index]; // REMOVE listeners are placeholders that tell us not to
+        for (var listener of listeners) {
+          // REMOVE listeners are placeholders that tell us not to
           // inherit, so they never match. Only ADD and ONCE can match.
-
           if (listener.event === eventName && (listener.kind === 0
           /* ADD */
           || listener.kind === 1
@@ -9380,10 +9398,9 @@ define("@ember/-internals/meta/lib/meta", ["exports", "@ember/-internals/utils",
       }
 
       if (listeners !== undefined) {
-        for (var index = 0; index < listeners.length; index++) {
-          var listener = listeners[index]; // REMOVE listeners are placeholders that tell us not to
+        for (var listener of listeners) {
+          // REMOVE listeners are placeholders that tell us not to
           // inherit, so they never match. Only ADD and ONCE can match.
-
           if ((listener.kind === 0
           /* ADD */
           || listener.kind === 1
@@ -9520,6 +9537,7 @@ define("@ember/-internals/meta/lib/meta", ["exports", "@ember/-internals/utils",
   function indexOfListener(listeners, event, target, method) {
     for (var i = listeners.length - 1; i >= 0; i--) {
       var listener = listeners[i];
+      (true && !(listener) && (0, _debug.assert)('has listener', listener));
 
       if (listener.event === event && listener.target === target && listener.method === method) {
         return i;
@@ -10366,8 +10384,7 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
     }
 
     if ((0, _utils.isObject)(value)) {
-      for (var i = 0; i < lazyTags.length; i++) {
-        var [tag, deps] = lazyTags[i];
+      for (var [tag, deps] of lazyTags) {
         (0, _validator.updateTag)(tag, getChainTagsForKey(value, deps, (0, _validator.tagMetaFor)(value), (0, _meta2.peekMeta)(value)));
       }
     }
@@ -10378,8 +10395,8 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
   function getChainTagsForKeys(obj, keys, tagMeta, meta$$1) {
     var tags = [];
 
-    for (var i = 0; i < keys.length; i++) {
-      getChainTags(tags, obj, keys[i], tagMeta, meta$$1);
+    for (var key of keys) {
+      getChainTags(tags, obj, key, tagMeta, meta$$1);
     }
 
     return (0, _validator.combine)(tags);
@@ -11012,8 +11029,12 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
         args.push(property);
       }
 
-      for (var i = 0; i < arguments.length; i++) {
-        expandProperties(i < 0 || arguments.length <= i ? undefined : arguments[i], addArg);
+      for (var _len2 = arguments.length, passedArgs = new Array(_len2), _key3 = 0; _key3 < _len2; _key3++) {
+        passedArgs[_key3] = arguments[_key3];
+      }
+
+      for (var arg of passedArgs) {
+        expandProperties(arg, addArg);
       }
 
       this._dependentKeys = args;
@@ -11305,25 +11326,28 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
   }
 
   function computed() {
-    for (var _len2 = arguments.length, args = new Array(_len2), _key3 = 0; _key3 < _len2; _key3++) {
-      args[_key3] = arguments[_key3];
+    for (var _len3 = arguments.length, args = new Array(_len3), _key4 = 0; _key4 < _len3; _key4++) {
+      args[_key4] = arguments[_key4];
     }
 
     (true && !(!(isElementDescriptor(args.slice(0, 3)) && args.length === 5 && args[4] === true)) && (0, _debug.assert)(`@computed can only be used directly as a native decorator. If you're using tracked in classic classes, add parenthesis to call it like a function: computed()`, !(isElementDescriptor(args.slice(0, 3)) && args.length === 5 && args[4] === true)));
 
     if (isElementDescriptor(args)) {
+      // SAFETY: We passed in the impl for this class
       var decorator = makeComputedDecorator(new ComputedProperty([]), ComputedDecoratorImpl);
       return decorator(args[0], args[1], args[2]);
-    }
+    } // SAFETY: We passed in the impl for this class
+
 
     return makeComputedDecorator(new ComputedProperty(args), ComputedDecoratorImpl);
   }
 
   function autoComputed() {
-    for (var _len3 = arguments.length, config = new Array(_len3), _key4 = 0; _key4 < _len3; _key4++) {
-      config[_key4] = arguments[_key4];
+    for (var _len4 = arguments.length, config = new Array(_len4), _key5 = 0; _key5 < _len4; _key5++) {
+      config[_key5] = arguments[_key5];
     }
 
+    // SAFETY: We passed in the impl for this class
     return makeComputedDecorator(new AutoComputedProperty(config), ComputedDecoratorImpl);
   }
   /**
@@ -11551,12 +11575,12 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
     var obj = root;
     var parts = typeof path === 'string' ? path.split('.') : path;
 
-    for (var i = 0; i < parts.length; i++) {
+    for (var part of parts) {
       if (obj === undefined || obj === null || obj.isDestroyed) {
         return undefined;
       }
 
-      obj = _getProp(obj, parts[i]);
+      obj = _getProp(obj, part);
     }
 
     return obj;
@@ -11713,7 +11737,8 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
   }
 
   function alias(altKey) {
-    (true && !(!isElementDescriptor(Array.prototype.slice.call(arguments))) && (0, _debug.assert)('You attempted to use @alias as a decorator directly, but it requires a `altKey` parameter', !isElementDescriptor(Array.prototype.slice.call(arguments))));
+    (true && !(!isElementDescriptor(Array.prototype.slice.call(arguments))) && (0, _debug.assert)('You attempted to use @alias as a decorator directly, but it requires a `altKey` parameter', !isElementDescriptor(Array.prototype.slice.call(arguments)))); // SAFETY: We passed in the impl for this class
+
     return makeComputedDecorator(new AliasedProperty(altKey), AliasDecoratorImpl);
   } // TODO: This class can be svelted once `meta` has been deprecated
 
@@ -12057,11 +12082,10 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
 
     _getLibraryByName(name) {
       var libs = this._registry;
-      var count = libs.length;
 
-      for (var i = 0; i < count; i++) {
-        if (libs[i].name === name) {
-          return libs[i];
+      for (var lib of libs) {
+        if (lib.name === name) {
+          return lib;
         }
       }
 
@@ -12117,8 +12141,7 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
       var maxNameLength = Math.max.apply(null, nameLengths);
       (0, _debug.debug)('-------------------------------');
 
-      for (var i = 0; i < libs.length; i++) {
-        var lib = libs[i];
+      for (var lib of libs) {
         var spaces = new Array(maxNameLength - lib.name.length + 1).join(' ');
         (0, _debug.debug)([lib.name, spaces, ' : ', lib.version].join(''));
       }
@@ -12184,10 +12207,8 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
 
     changeProperties(() => {
       var props = Object.keys(properties);
-      var propertyName;
 
-      for (var i = 0; i < props.length; i++) {
-        propertyName = props[i];
+      for (var propertyName of props) {
         set(obj, propertyName, properties[propertyName]);
       }
     });
@@ -12239,9 +12260,8 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
     var lookup = _environment.context.lookup;
     var keys = Object.keys(lookup);
 
-    for (var i = 0; i < keys.length; i++) {
-      var key = keys[i]; // Only process entities that start with uppercase A-Z
-
+    for (var key of keys) {
+      // Only process entities that start with uppercase A-Z
       if (!isUppercase(key.charCodeAt(0))) {
         continue;
       }
@@ -12277,8 +12297,8 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
     if (unprocessedNamespaces || unprocessedMixins) {
       var namespaces = NAMESPACES;
 
-      for (var i = 0; i < namespaces.length; i++) {
-        processNamespace(namespaces[i]);
+      for (var namespace of namespaces) {
+        processNamespace(namespace);
       }
 
       unprocessedMixins = false;
@@ -12358,10 +12378,7 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
 
   function extractAccessors(properties) {
     if (properties !== undefined) {
-      var keys = Object.keys(properties);
-
-      for (var i = 0; i < keys.length; i++) {
-        var key = keys[i];
+      for (var key of Object.keys(properties)) {
         var desc = Object.getOwnPropertyDescriptor(properties, key);
 
         if (desc.get !== undefined || desc.set !== undefined) {
@@ -12443,7 +12460,8 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
       }]);
       newProperty._readOnly = property._readOnly;
       newProperty._meta = property._meta;
-      newProperty.enumerable = property.enumerable;
+      newProperty.enumerable = property.enumerable; // SAFETY: We passed in the impl for this class
+
       return makeComputedDecorator(newProperty, ComputedProperty);
     }
 
@@ -12496,8 +12514,7 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
     var hasFunction = false;
     var props = Object.keys(value);
 
-    for (var i = 0; i < props.length; i++) {
-      var prop = props[i];
+    for (var prop of props) {
       var propValue = value[prop];
 
       if (typeof propValue === 'function') {
@@ -12560,8 +12577,7 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
     var mergings = concatenatedMixinProperties('mergedProperties', props, values, base);
     var propKeys = Object.keys(props);
 
-    for (var i = 0; i < propKeys.length; i++) {
-      var key = propKeys[i];
+    for (var key of propKeys) {
       var value = props[key];
       if (value === undefined) continue;
 
@@ -12624,16 +12640,16 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
     if (observers !== undefined) {
       var updateObserver = add ? addObserver : removeObserver;
 
-      for (var i = 0; i < observers.paths.length; i++) {
-        updateObserver(obj, observers.paths[i], null, key, observers.sync);
+      for (var path of observers.paths) {
+        updateObserver(obj, path, null, key, observers.sync);
       }
     }
 
     if (listeners !== undefined) {
       var updateListener = add ? addListener : removeListener;
 
-      for (var _i = 0; _i < listeners.length; _i++) {
-        updateListener(obj, listeners[_i], null, key);
+      for (var listener of listeners) {
+        updateListener(obj, listener, null, key);
       }
     }
   }
@@ -12658,8 +12674,7 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
 
     mergeMixins(mixins, meta$$1, descs, values, obj, keys, keysWithSuper);
 
-    for (var i = 0; i < keys.length; i++) {
-      var key = keys[i];
+    for (var key of keys) {
       var value = values[key];
       var desc = descs[key];
 
@@ -12690,8 +12705,8 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
 
 
   function mixin(obj) {
-    for (var _len4 = arguments.length, args = new Array(_len4 > 1 ? _len4 - 1 : 0), _key5 = 1; _key5 < _len4; _key5++) {
-      args[_key5 - 1] = arguments[_key5];
+    for (var _len5 = arguments.length, args = new Array(_len5 > 1 ? _len5 - 1 : 0), _key6 = 1; _key6 < _len5; _key6++) {
+      args[_key6 - 1] = arguments[_key6];
     }
 
     applyMixin(obj, args);
@@ -12823,8 +12838,8 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
       setUnprocessedMixins();
       var M = this;
 
-      for (var _len5 = arguments.length, args = new Array(_len5), _key6 = 0; _key6 < _len5; _key6++) {
-        args[_key6] = arguments[_key6];
+      for (var _len6 = arguments.length, args = new Array(_len6), _key7 = 0; _key7 < _len6; _key7++) {
+        args[_key7] = arguments[_key7];
       }
 
       return new M(args, undefined);
@@ -12859,8 +12874,8 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
 
 
     reopen() {
-      for (var _len6 = arguments.length, args = new Array(_len6), _key7 = 0; _key7 < _len6; _key7++) {
-        args[_key7] = arguments[_key7];
+      for (var _len7 = arguments.length, args = new Array(_len7), _key8 = 0; _key8 < _len7; _key8++) {
+        args[_key8] = arguments[_key8];
       }
 
       if (args.length === 0) {
@@ -12937,8 +12952,8 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
     without() {
       var ret = new Mixin([this]);
 
-      for (var _len7 = arguments.length, args = new Array(_len7), _key8 = 0; _key8 < _len7; _key8++) {
-        args[_key8] = arguments[_key8];
+      for (var _len8 = arguments.length, args = new Array(_len8), _key9 = 0; _key9 < _len8; _key9++) {
+        args[_key9] = arguments[_key9];
       }
 
       ret._without = args;
@@ -13079,8 +13094,8 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
 
 
   function observer() {
-    for (var _len8 = arguments.length, args = new Array(_len8), _key9 = 0; _key9 < _len8; _key9++) {
-      args[_key9] = arguments[_key9];
+    for (var _len9 = arguments.length, args = new Array(_len9), _key10 = 0; _key10 < _len9; _key10++) {
+      args[_key10] = arguments[_key10];
     }
 
     var funcOrDef = args.pop();
@@ -13104,8 +13119,8 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
     (true && !(typeof sync === 'boolean') && (0, _debug.assert)('observer called without sync', typeof sync === 'boolean'));
     var paths = [];
 
-    for (var i = 0; i < dependentKeys.length; ++i) {
-      expandProperties(dependentKeys[i], path => paths.push(path));
+    for (var dependentKey of dependentKeys) {
+      expandProperties(dependentKey, path => paths.push(path));
     }
 
     (0, _utils.setObservers)(func, {
@@ -13126,13 +13141,18 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
 
   function inject(type) {
     (true && !(typeof type === 'string') && (0, _debug.assert)('a string type must be provided to inject', typeof type === 'string'));
+    var elementDescriptor;
+    var name;
 
-    for (var _len9 = arguments.length, args = new Array(_len9 > 1 ? _len9 - 1 : 0), _key10 = 1; _key10 < _len9; _key10++) {
-      args[_key10 - 1] = arguments[_key10];
+    for (var _len10 = arguments.length, args = new Array(_len10 > 1 ? _len10 - 1 : 0), _key11 = 1; _key11 < _len10; _key11++) {
+      args[_key11 - 1] = arguments[_key11];
     }
 
-    var calledAsDecorator = isElementDescriptor(args);
-    var name = calledAsDecorator ? undefined : args[0];
+    if (isElementDescriptor(args)) {
+      elementDescriptor = args;
+    } else if (typeof args[0] === 'string') {
+      name = args[0];
+    }
 
     var getInjection = function (propertyName) {
       var owner = (0, _owner.getOwner)(this) || this.container; // fallback to `container` for backwards compat
@@ -13159,16 +13179,16 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
 
     });
 
-    if (calledAsDecorator) {
-      return decorator(args[0], args[1], args[2]);
+    if (elementDescriptor) {
+      return decorator(elementDescriptor[0], elementDescriptor[1], elementDescriptor[2]);
     } else {
       return decorator;
     }
   }
 
   function tracked() {
-    for (var _len10 = arguments.length, args = new Array(_len10), _key11 = 0; _key11 < _len10; _key11++) {
-      args[_key11] = arguments[_key11];
+    for (var _len11 = arguments.length, args = new Array(_len11), _key12 = 0; _key12 < _len11; _key12++) {
+      args[_key12] = arguments[_key12];
     }
 
     (true && !(!(isElementDescriptor(args.slice(0, 3)) && args.length === 5 && args[4] === true)) && (0, _debug.assert)(`@tracked can only be used directly as a native decorator. If you're using tracked in classic classes, add parenthesis to call it like a function: tracked()`, !(isElementDescriptor(args.slice(0, 3)) && args.length === 5 && args[4] === true)));
@@ -13269,8 +13289,8 @@ define("@ember/-internals/metal/index", ["exports", "@ember/-internals/meta", "@
 
   var cached = function () {
     {
-      for (var _len11 = arguments.length, args = new Array(_len11), _key12 = 0; _key12 < _len11; _key12++) {
-        args[_key12] = arguments[_key12];
+      for (var _len12 = arguments.length, args = new Array(_len12), _key13 = 0; _key13 < _len12; _key13++) {
+        args[_key13] = arguments[_key13];
       }
 
       var [target, key, descriptor] = args; // Error on `@cached()`, `@cached(...args)`, and `@cached propName = value;`
@@ -13767,16 +13787,16 @@ define("@ember/-internals/routing/lib/ext/controller", ["exports", "@ember/-inte
       aController.transitionToRoute({ queryParams: { sort: 'date' } });
       ```
          See also [replaceRoute](/ember/release/classes/Ember.ControllerMixin/methods/replaceRoute?anchor=replaceRoute).
-         @param {String} name the name of the route or a URL
+         @for Ember.ControllerMixin
+      @method transitionToRoute
+      @deprecated Use transitionTo from the Router service instead.
+      @param {String} [name] the name of the route or a URL
       @param {...Object} models the model(s) or identifier(s) to be used
         while transitioning to the route.
       @param {Object} [options] optional hash with a queryParams property
         containing a mapping of query parameters
-      @for Ember.ControllerMixin
-      @method transitionToRoute
       @return {Transition} the transition object associated with this
         attempted transition
-      @deprecated Use transitionTo from the Router service instead.
       @public
     */
     transitionToRoute() {
@@ -13836,14 +13856,16 @@ define("@ember/-internals/routing/lib/ext/controller", ["exports", "@ember/-inte
       aController.replaceRoute('/');
       aController.replaceRoute('/blog/post/1/comment/13');
       ```
-         @param {String} name the name of the route or a URL
+         @for Ember.ControllerMixin
+      @method replaceRoute
+      @deprecated Use replaceWith from the Router service instead.
+      @param {String} [name] the name of the route or a URL
       @param {...Object} models the model(s) or identifier(s) to be used
       while transitioning to the route.
-      @for Ember.ControllerMixin
-      @method replaceRoute
+      @param {Object} [options] optional hash with a queryParams property
+      containing a mapping of query parameters
       @return {Transition} the transition object associated with this
         attempted transition
-      @deprecated Use replaceWith from the Router service instead.
       @public
     */
     replaceRoute() {
@@ -14970,6 +14992,17 @@ define("@ember/-internals/routing/lib/services/router", ["exports", "@ember/-int
     value: true
   });
   _exports.default = void 0;
+
+  var __decorate = void 0 && (void 0).__decorate || function (decorators, target, key, desc) {
+    var c = arguments.length,
+        r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
+        d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) {
+      if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    }
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+  };
+
   var ROUTER = (0, _utils.symbol)('ROUTER');
 
   function cleanURL(url, rootURL) {
@@ -14979,40 +15012,106 @@ define("@ember/-internals/routing/lib/services/router", ["exports", "@ember/-int
 
     return url.substr(rootURL.length, url.length);
   }
-  /**
-     The Router service is the public API that provides access to the router.
-  
-     The immediate benefit of the Router service is that you can inject it into components,
-     giving them a friendly way to initiate transitions and ask questions about the current
-     global router state.
-  
-     In this example, the Router service is injected into a component to initiate a transition
-     to a dedicated route:
-  
-     ```app/components/example.js
-     import Component from '@glimmer/component';
-     import { action } from '@ember/object';
-     import { service } from '@ember/service';
-  
-     export default class ExampleComponent extends Component {
-       @service router;
-  
-       @action
-       next() {
-         this.router.transitionTo('other.route');
-       }
-     }
-     ```
-  
-     Like any service, it can also be injected into helpers, routes, etc.
-  
-     @public
-     @extends Service
-     @class RouterService
-   */
 
+  class RouterService extends _service.default.extend(_runtime.Evented) {
+    constructor() {
+      super(...arguments);
+      /**
+        The `routeWillChange` event is fired at the beginning of any
+        attempted transition with a `Transition` object as the sole
+        argument. This action can be used for aborting, redirecting,
+        or decorating the transition from the currently active routes.
+               A good example is preventing navigation when a form is
+        half-filled out:
+               ```app/routes/contact-form.js
+        import Route from '@ember/routing';
+        import { service } from '@ember/service';
+               export default class extends Route {
+          @service router;
+                 constructor() {
+            super(...arguments);
+                   this.router.on('routeWillChange', (transition) => {
+              if (!transition.to.find(route => route.name === this.routeName)) {
+                alert("Please save or cancel your changes.");
+                transition.abort();
+              }
+            })
+          }
+        }
+        ```
+               The `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.
+               @event routeWillChange
+        @param {Transition} transition
+        @public
+      */
+
+      /**
+        The `routeDidChange` event only fires once a transition has settled.
+        This includes aborts and error substates. Like the `routeWillChange` event
+        it receives a Transition as the sole argument.
+               A good example is sending some analytics when the route has transitioned:
+               ```app/routes/contact-form.js
+        import Route from '@ember/routing';
+        import { service } from '@ember/service';
+               export default class extends Route {
+          @service router;
+                 constructor() {
+            super(...arguments);
+                   this.router.on('routeDidChange', (transition) => {
+              ga.send('pageView', {
+                current: transition.to.name,
+                from: transition.from.name
+              });
+            })
+          }
+        }
+        ```
+               `routeDidChange` will be called after any `Route`'s
+        [didTransition](/ember/release/classes/Route/events/didTransition?anchor=didTransition)
+        action has been fired.
+        The updates of properties
+        [currentURL](/ember/release/classes/RouterService/properties/currentURL?anchor=currentURL),
+        [currentRouteName](/ember/release/classes/RouterService/properties/currentURL?anchor=currentRouteName)
+        and
+        [currentRoute](/ember/release/classes/RouterService/properties/currentURL?anchor=currentRoute)
+        are completed at the time `routeDidChange` is called.
+               @event routeDidChange
+        @param {Transition} transition
+        @public
+      */
+      // Canary features
+
+      /**
+       * Refreshes all currently active routes, doing a full transition.
+       * If a route name is provided and refers to a currently active route,
+       * it will refresh only that route and its descendents.
+       * Returns a promise that will be resolved once the refresh is complete.
+       * All resetController, beforeModel, model, afterModel, redirect, and setupController
+       * hooks will be called again. You will get new data from the model hook.
+       *
+       * @method refresh
+       * @param {String} [routeName] the route to refresh (along with all child routes)
+       * @return Transition
+       * @category EMBER_ROUTING_ROUTER_SERVICE_REFRESH
+       * @public
+       */
+
+      this.refresh = true
+      /* EMBER_ROUTING_ROUTER_SERVICE_REFRESH */
+      ? function (pivotRouteName) {
+        if (!pivotRouteName) {
+          return this._router._routerMicrolib.refresh();
+        }
+
+        (true && !(this._router.hasRoute(pivotRouteName)) && (0, _debug.assert)(`The route "${pivotRouteName}" was not found`, this._router.hasRoute(pivotRouteName)));
+        (true && !(this.isActive(pivotRouteName)) && (0, _debug.assert)(`The route "${pivotRouteName}" is currently not active`, this.isActive(pivotRouteName)));
+        var owner = (0, _owner.getOwner)(this);
+        (true && !(owner) && (0, _debug.assert)('RouterService is unexpectedly missing an owner', owner));
+        var pivotRoute = owner.lookup(`route:${pivotRouteName}`);
+        return this._router._routerMicrolib.refresh(pivotRoute);
+      } : undefined;
+    }
 
-  class RouterService extends _service.default {
     get _router() {
       var router = this[ROUTER];
 
@@ -15027,9 +15126,48 @@ define("@ember/-internals/routing/lib/services/router", ["exports", "@ember/-int
     }
 
     willDestroy() {
-      super.willDestroy(...arguments);
+      super.willDestroy();
       this[ROUTER] = null;
     }
+    /**
+       Transition the application into another route. The route may
+       be either a single route or route path:
+          Calling `transitionTo` from the Router service will cause default query parameter values to be included in the URL.
+       This behavior is different from calling `transitionTo` on a route or `transitionToRoute` on a controller.
+       See the [Router Service RFC](https://github.com/emberjs/rfcs/blob/master/text/0095-router-service.md#query-parameter-semantics) for more info.
+          In the following example we use the Router service to navigate to a route with a
+       specific model from a Component in the first action, and in the second we trigger
+       a query-params only transition.
+          ```app/components/example.js
+       import Component from '@glimmer/component';
+       import { action } from '@ember/object';
+       import { service } from '@ember/service';
+          export default class extends Component {
+         @service router;
+            @action
+         goToComments(post) {
+           this.router.transitionTo('comments', post);
+         }
+            @action
+         fetchMoreComments(latestComment) {
+           this.router.transitionTo({
+             queryParams: { commentsAfter: latestComment }
+           });
+         }
+       }
+       ```
+          @method transitionTo
+       @param {String} [routeNameOrUrl] the name of the route or a URL
+       @param {...Object} [models] the model(s) or identifier(s) to be used while
+         transitioning to the route.
+       @param {Object} [options] optional hash with a queryParams property
+         containing a mapping of query parameters. May be supplied as the only
+        parameter to trigger a query-parameter-only transition.
+       @return {Transition} the transition object associated with this
+         attempted transition
+       @public
+     */
+
 
     transitionTo() {
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -15059,7 +15197,6 @@ define("@ember/-internals/routing/lib/services/router", ["exports", "@ember/-int
        When the user clicks the "back" button in the browser, there will be fewer steps.
        This is most commonly used to manage redirects in a way that does not cause confusing additions
        to the user's browsing history.
-          See [replaceWith](/ember/release/classes/Route/methods/replaceWith?anchor=replaceWith) for more info.
           Calling `replaceWith` from the Router service will cause default query parameter values to be included in the URL.
        This behavior is different from calling `replaceWith` on a route.
        See the [Router Service RFC](https://github.com/emberjs/rfcs/blob/master/text/0095-router-service.md#query-parameter-semantics) for more info.
@@ -15140,8 +15277,7 @@ define("@ember/-internals/routing/lib/services/router", ["exports", "@ember/-int
       ```
           @method urlFor
        @param {String} routeName the name of the route
-       @param {...Object} models the model(s) or identifier(s) to be used while
-         transitioning to the route.
+       @param {...Object} models the model(s) for the route.
        @param {Object} [options] optional hash with a queryParams property
          containing a mapping of query parameters
        @return {String} the string representing the generated URL
@@ -15270,6 +15406,7 @@ define("@ember/-internals/routing/lib/services/router", ["exports", "@ember/-int
        ```
            @method recognize
         @param {String} url
+        @return {RouteInfo | null}
         @public
       */
 
@@ -15290,6 +15427,7 @@ define("@ember/-internals/routing/lib/services/router", ["exports", "@ember/-int
       the browser including the app's `rootURL`.
            @method recognizeAndLoad
         @param {String} url
+        @return {RouteInfo}
         @public
      */
 
@@ -15307,168 +15445,15 @@ define("@ember/-internals/routing/lib/services/router", ["exports", "@ember/-int
 
   _exports.default = RouterService;
 
-  if (true
-  /* EMBER_ROUTING_ROUTER_SERVICE_REFRESH */
-  ) {
-    RouterService.reopen({
-      /**
-       * Refreshes all currently active routes, doing a full transition.
-       * If a route name is provided and refers to a currently active route,
-       * it will refresh only that route and its descendents.
-       * Returns a promise that will be resolved once the refresh is complete.
-       * All resetController, beforeModel, model, afterModel, redirect, and setupController
-       * hooks will be called again. You will get new data from the model hook.
-       *
-       * @method refresh
-       * @param {String} [routeName] the route to refresh (along with all child routes)
-       * @return Transition
-       * @category EMBER_ROUTING_ROUTER_SERVICE_REFRESH
-       * @public
-       */
-      refresh(pivotRouteName) {
-        if (!pivotRouteName) {
-          return this._router._routerMicrolib.refresh();
-        }
+  __decorate([(0, _computed.readOnly)('_router.currentRouteName')], RouterService.prototype, "currentRouteName", void 0);
 
-        (true && !(this._router.hasRoute(pivotRouteName)) && (0, _debug.assert)(`The route "${pivotRouteName}" was not found`, this._router.hasRoute(pivotRouteName)));
-        (true && !(this.isActive(pivotRouteName)) && (0, _debug.assert)(`The route "${pivotRouteName}" is currently not active`, this.isActive(pivotRouteName)));
-        var owner = (0, _owner.getOwner)(this);
-        (true && !(owner) && (0, _debug.assert)('RouterService is unexpectedly missing an owner', owner));
-        var pivotRoute = owner.lookup(`route:${pivotRouteName}`);
-        return this._router._routerMicrolib.refresh(pivotRoute);
-      }
+  __decorate([(0, _computed.readOnly)('_router.currentURL')], RouterService.prototype, "currentURL", void 0);
 
-    });
-  }
+  __decorate([(0, _computed.readOnly)('_router.location')], RouterService.prototype, "location", void 0);
 
-  RouterService.reopen(_runtime.Evented, {
-    /**
-       Name of the current route.
-          This property represents the logical name of the route,
-       which is comma separated.
-       For the following router:
-          ```app/router.js
-       Router.map(function() {
-         this.route('about');
-         this.route('blog', function () {
-           this.route('post', { path: ':post_id' });
-         });
-       });
-       ```
-          It will return:
-          * `index` when you visit `/`
-       * `about` when you visit `/about`
-       * `blog.index` when you visit `/blog`
-       * `blog.post` when you visit `/blog/some-post-id`
-          @property currentRouteName
-       @type String
-       @public
-     */
-    currentRouteName: (0, _computed.readOnly)('_router.currentRouteName'),
-
-    /**
-       Current URL for the application.
-         This property represents the URL path for this route.
-      For the following router:
-          ```app/router.js
-       Router.map(function() {
-         this.route('about');
-         this.route('blog', function () {
-           this.route('post', { path: ':post_id' });
-         });
-       });
-       ```
-          It will return:
-          * `/` when you visit `/`
-       * `/about` when you visit `/about`
-       * `/blog` when you visit `/blog`
-       * `/blog/some-post-id` when you visit `/blog/some-post-id`
-          @property currentURL
-       @type String
-       @public
-     */
-    currentURL: (0, _computed.readOnly)('_router.currentURL'),
-
-    /**
-      The `location` property returns what implementation of the `location` API
-      your application is using, which determines what type of URL is being used.
-         See [Location](/ember/release/classes/Location) for more information.
-         To force a particular `location` API implementation to be used in your
-      application you can set a location type on your `config/environment`.
-      For example, to set the `history` type:
-         ```config/environment.js
-      'use strict';
-         module.exports = function(environment) {
-        let ENV = {
-          modulePrefix: 'router-service',
-          environment,
-          rootURL: '/',
-          locationType: 'history',
-          ...
-        }
-      }
-      ```
-         The following location types are available by default:
-      `auto`, `hash`, `history`, `none`.
-         See [HashLocation](/ember/release/classes/HashLocation).
-      See [HistoryLocation](/ember/release/classes/HistoryLocation).
-      See [NoneLocation](/ember/release/classes/NoneLocation).
-      See [AutoLocation](/ember/release/classes/AutoLocation).
-         @property location
-      @default 'hash'
-      @see {Location}
-      @public
-    */
-    location: (0, _computed.readOnly)('_router.location'),
-
-    /**
-      The `rootURL` property represents the URL of the root of
-      the application, '/' by default.
-      This prefix is assumed on all routes defined on this app.
-         If you change the `rootURL` in your environment configuration
-      like so:
-         ```config/environment.js
-      'use strict';
-         module.exports = function(environment) {
-        let ENV = {
-          modulePrefix: 'router-service',
-          environment,
-          rootURL: '/my-root',
-        …
-        }
-      ]
-      ```
-         This property will return `/my-root`.
-         @property rootURL
-      @default '/'
-      @public
-    */
-    rootURL: (0, _computed.readOnly)('_router.rootURL'),
+  __decorate([(0, _computed.readOnly)('_router.rootURL')], RouterService.prototype, "rootURL", void 0);
 
-    /**
-      The `currentRoute` property contains metadata about the current leaf route.
-      It returns a `RouteInfo` object that has information like the route name,
-      params, query params and more.
-         See [RouteInfo](/ember/release/classes/RouteInfo) for more info.
-         This property is guaranteed to change whenever a route transition
-      happens (even when that transition only changes parameters
-      and doesn't change the active route).
-         Usage example:
-      ```app/components/header.js
-        import Component from '@glimmer/component';
-        import { service } from '@ember/service';
-        import { notEmpty } from '@ember/object/computed';
-           export default class extends Component {
-          @service router;
-             @notEmpty('router.currentRoute.child') isChildRoute;
-        });
-      ```
-          @property currentRoute
-       @type RouteInfo
-       @public
-     */
-    currentRoute: (0, _computed.readOnly)('_router.currentRoute')
-  });
+  __decorate([(0, _computed.readOnly)('_router.currentRoute')], RouterService.prototype, "currentRoute", void 0);
 });
 define("@ember/-internals/routing/lib/services/routing", ["exports", "@ember/-internals/owner", "@ember/-internals/utils", "@ember/debug", "@ember/object/computed", "@ember/service"], function (_exports, _owner, _utils, _debug, _computed, _service) {
   "use strict";
@@ -16010,232 +15995,12 @@ define("@ember/-internals/routing/lib/system/query_params", ["exports"], functio
 
   _exports.default = QueryParams;
 });
-define("@ember/-internals/routing/lib/system/route-info", [], function () {
+define("@ember/-internals/routing/lib/system/route-info", ["exports"], function (_exports) {
   "use strict";
-  /**
-    A `RouteInfoWithAttributes` is an object that contains
-    metadata, including the resolved value from the routes
-    `model` hook. Like `RouteInfo`, a `RouteInfoWithAttributes`
-    represents a specific route within a Transition.
-    It is read-only and internally immutable. It is also not
-    observable, because a Transition instance is never
-    changed after creation.
-  
-    @class RouteInfoWithAttributes
-    @public
-  */
-
-  /**
-    The dot-separated, fully-qualified name of the
-    route, like "people.index".
-    @property {String} name
-    @public
-  */
-
-  /**
-    The final segment of the fully-qualified name of
-    the route, like "index"
-    @property {String} localName
-    @public
-  */
 
-  /**
-    The values of the route's parameters. These are the
-    same params that are received as arguments to the
-    route's model hook. Contains only the parameters
-    valid for this route, if any (params for parent or
-    child routes are not merged).
-    @property {Object} params
-    @public
-  */
-
-  /**
-    The ordered list of the names of the params
-    required for this route. It will contain the same
-    strings as `Object.keys(params)`, but here the order
-    is significant. This allows users to correctly pass
-    params into routes programmatically.
-    @property {Array} paramNames
-    @public
-  */
-
-  /**
-    The values of any queryParams on this route.
-    @property {Object} queryParams
-    @public
-  */
-
-  /**
-    This is the resolved return value from the
-    route's model hook.
-    @property {Object|Array|String} attributes
-    @public
-  */
-
-  /**
-    Will contain the result `Route#buildRouteInfoMetadata`
-    for the corresponding Route.
-    @property {Any} metadata
-    @public
-  */
-
-  /**
-    A reference to the parent route's RouteInfo.
-    This can be used to traverse upward to the topmost
-    `RouteInfo`.
-    @property {RouteInfo|null} parent
-    @public
-  */
-
-  /**
-    A reference to the child route's RouteInfo.
-    This can be used to traverse downward to the
-    leafmost `RouteInfo`.
-    @property {RouteInfo|null} child
-    @public
-  */
-
-  /**
-    Allows you to traverse through the linked list
-    of `RouteInfo`s from the topmost to leafmost.
-    Returns the first `RouteInfo` in the linked list
-    for which the callback returns true.
-  
-      This method is similar to the `find()` method
-      defined in ECMAScript 2015.
-  
-      The callback method you provide should have the
-      following signature (all parameters are optional):
-  
-      ```javascript
-      function(item, index, array);
-      ```
-  
-      - `item` is the current item in the iteration.
-      - `index` is the current index in the iteration.
-      - `array` is the array itself.
-  
-      It should return the `true` to include the item in
-      the results, `false` otherwise.
-  
-      Note that in addition to a callback, you can also
-      pass an optional target object that will be set as
-      `this` on the context.
-  
-    @method find
-    @param {Function} callback the callback to execute
-    @param {Object} [target*] optional target to use
-    @returns {Object} Found item or undefined
-    @public
-  */
-
-  /**
-    A RouteInfo is an object that contains metadata
-    about a specific route within a Transition. It is
-    read-only and internally immutable. It is also not
-    observable, because a Transition instance is never
-    changed after creation.
-  
-    @class RouteInfo
-    @public
-  */
-
-  /**
-    The dot-separated, fully-qualified name of the
-    route, like "people.index".
-    @property {String} name
-    @public
-  */
-
-  /**
-    The final segment of the fully-qualified name of
-    the route, like "index"
-    @property {String} localName
-    @public
-  */
-
-  /**
-    The values of the route's parameters. These are the
-    same params that are received as arguments to the
-    route's `model` hook. Contains only the parameters
-    valid for this route, if any (params for parent or
-    child routes are not merged).
-    @property {Object} params
-    @public
-  */
-
-  /**
-    The ordered list of the names of the params
-    required for this route. It will contain the same
-    strings as Object.keys(params), but here the order
-    is significant. This allows users to correctly pass
-    params into routes programmatically.
-    @property {Array} paramNames
-    @public
-  */
-
-  /**
-    The values of any queryParams on this route.
-    @property {Object} queryParams
-    @public
-  */
-
-  /**
-    Will contain the result `Route#buildRouteInfoMetadata`
-    for the corresponding Route.
-    @property {Any} metadata
-    @public
-  */
-
-  /**
-    A reference to the parent route's `RouteInfo`.
-    This can be used to traverse upward to the topmost
-    `RouteInfo`.
-    @property {RouteInfo|null} parent
-    @public
-  */
-
-  /**
-    A reference to the child route's `RouteInfo`.
-    This can be used to traverse downward to the
-    leafmost `RouteInfo`.
-    @property {RouteInfo|null} child
-    @public
-  */
-
-  /**
-    Allows you to traverse through the linked list
-    of `RouteInfo`s from the topmost to leafmost.
-    Returns the first `RouteInfo` in the linked list
-    for which the callback returns true.
-  
-      This method is similar to the `find()` method
-      defined in ECMAScript 2015.
-  
-      The callback method you provide should have the
-      following signature (all parameters are optional):
-  
-      ```javascript
-      function(item, index, array);
-      ```
-  
-      - `item` is the current item in the iteration.
-      - `index` is the current index in the iteration.
-      - `array` is the array itself.
-  
-      It should return the `true` to include the item in
-      the results, `false` otherwise.
-  
-      Note that in addition to a callback, you can also
-      pass an optional target object that will be set as
-      `this` on the context.
-  
-    @method find
-    @param {Function} callback the callback to execute
-    @param {Object} [target*] optional target to use
-    @returns {Object} Found item or undefined
-    @public
-  */
+  Object.defineProperty(_exports, "__esModule", {
+    value: true
+  });
 });
 define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-internals/container", "@ember/-internals/metal", "@ember/-internals/owner", "@ember/-internals/runtime", "@ember/-internals/utils", "@ember/debug", "@ember/object/compat", "@ember/runloop", "router_js", "@ember/-internals/routing/lib/utils", "@ember/-internals/routing/lib/system/generate_controller"], function (_exports, _container, _metal, _owner, _runtime, _utils, _debug, _compat, _runloop, _router_js, _utils2, _generate_controller) {
   "use strict";
@@ -16243,8 +16008,7 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
   Object.defineProperty(_exports, "__esModule", {
     value: true
   });
-  _exports.default = _exports.ROUTE_CONNECTIONS = void 0;
-  _exports.defaultSerialize = defaultSerialize;
+  _exports.defaultSerialize = _exports.default = _exports.ROUTE_CONNECTIONS = void 0;
   _exports.getFullQueryParams = getFullQueryParams;
   _exports.hasDefaultSerialize = hasDefaultSerialize;
 
@@ -16262,50 +16026,6 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
   _exports.ROUTE_CONNECTIONS = ROUTE_CONNECTIONS;
   var RENDER = (0, _utils.symbol)('render');
 
-  function defaultSerialize(model, params) {
-    if (params.length < 1 || !model) {
-      return;
-    }
-
-    var object = {};
-
-    if (params.length === 1) {
-      var [name] = params;
-
-      if (name in model) {
-        object[name] = (0, _metal.get)(model, name);
-      } else if (/_id$/.test(name)) {
-        object[name] = (0, _metal.get)(model, 'id');
-      } else if ((0, _utils.isProxy)(model)) {
-        object[name] = (0, _metal.get)(model, name);
-      }
-    } else {
-      object = (0, _metal.getProperties)(model, params);
-    }
-
-    return object;
-  }
-
-  function hasDefaultSerialize(route) {
-    return route.serialize === defaultSerialize;
-  }
-  /**
-  @module @ember/routing
-  */
-
-  /**
-    The `Route` class is used to define individual routes. Refer to
-    the [routing guide](https://guides.emberjs.com/release/routing/) for documentation.
-  
-    @class Route
-    @extends EmberObject
-    @uses ActionHandler
-    @uses Evented
-    @since 1.0.0
-    @public
-  */
-
-
   class Route extends _runtime.Object.extend(_runtime.ActionHandler, _runtime.Evented) {
     constructor(owner) {
       super(...arguments);
@@ -16321,6 +16041,68 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
         this._environment = owner.lookup('-environment:main');
       }
     }
+    /**
+      A hook you can implement to convert the route's model into parameters
+      for the URL.
+         ```app/router.js
+      // ...
+         Router.map(function() {
+        this.route('post', { path: '/posts/:post_id' });
+      });
+         ```
+         ```app/routes/post.js
+      import Route from '@ember/routing/route';
+         export default class PostRoute extends Route {
+        model({ post_id }) {
+          // the server returns `{ id: 12 }`
+          return fetch(`/posts/${post_id}`;
+        }
+           serialize(model) {
+          // this will make the URL `/posts/12`
+          return { post_id: model.id };
+        }
+      }
+      ```
+         The default `serialize` method will insert the model's `id` into the
+      route's dynamic segment (in this case, `:post_id`) if the segment contains '_id'.
+      If the route has multiple dynamic segments or does not contain '_id', `serialize`
+      will return `getProperties(model, params)`
+         This method is called when `transitionTo` is called with a context
+      in order to populate the URL.
+         @method serialize
+      @param {Object} model the routes model
+      @param {Array} params an Array of parameter names for the current
+        route (in the example, `['post_id']`.
+      @return {Object} the serialized parameters
+      @since 1.0.0
+      @public
+    */
+
+
+    serialize(model, params) {
+      if (params.length < 1 || !model) {
+        return;
+      }
+
+      var object = {};
+
+      if (params.length === 1) {
+        var [name] = params;
+        (true && !(name) && (0, _debug.assert)('has name', name));
+
+        if (name in model) {
+          object[name] = (0, _metal.get)(model, name);
+        } else if (/_id$/.test(name)) {
+          object[name] = (0, _metal.get)(model, 'id');
+        } else if ((0, _utils.isProxy)(model)) {
+          object[name] = (0, _metal.get)(model, name);
+        }
+      } else {
+        object = (0, _metal.getProperties)(model, params);
+      }
+
+      return object;
+    }
     /**
       Sets the name for this route, including a fully resolved name for routes
       inside engines.
@@ -16362,9 +16144,7 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
         namePaths[a] = `${routeInfo.name}.${names[a]}`;
       }
 
-      for (var i = 0; i < qps.length; ++i) {
-        var qp = qps[i];
-
+      for (var qp of qps) {
         if (qp.scope === 'model') {
           qp.parts = namePaths;
         }
@@ -16447,9 +16227,10 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
       var fullName = route.fullRouteName;
       var params = Object.assign({}, state.params[fullName]);
       var queryParams = getQueryParamsFor(route, state);
-      return Object.keys(queryParams).reduce((params, key) => {
+      return Object.entries(queryParams).reduce((params, _ref) => {
+        var [key, value] = _ref;
         (true && !(!params[key]) && (0, _debug.assert)(`The route '${this.routeName}' has both a dynamic segment and query param with name '${key}'. Please rename one to avoid collisions.`, !params[key]));
-        params[key] = queryParams[key];
+        params[key] = value;
         return params;
       }, params);
     }
@@ -16566,148 +16347,6 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
       this.activate(transition);
       this.trigger('activate', transition);
     }
-    /**
-      The `willTransition` action is fired at the beginning of any
-      attempted transition with a `Transition` object as the sole
-      argument. This action can be used for aborting, redirecting,
-      or decorating the transition from the currently active routes.
-         A good example is preventing navigation when a form is
-      half-filled out:
-         ```app/routes/contact-form.js
-      import Route from '@ember/routing/route';
-      import { action } from '@ember/object';
-         export default class ContactFormRoute extends Route {
-        @action
-        willTransition(transition) {
-          if (this.controller.get('userHasEnteredData')) {
-            this.controller.displayNavigationConfirm();
-            transition.abort();
-          }
-        }
-      }
-      ```
-         You can also redirect elsewhere by calling
-      `this.transitionTo('elsewhere')` from within `willTransition`.
-      Note that `willTransition` will not be fired for the
-      redirecting `transitionTo`, since `willTransition` doesn't
-      fire when there is already a transition underway. If you want
-      subsequent `willTransition` actions to fire for the redirecting
-      transition, you must first explicitly call
-      `transition.abort()`.
-         To allow the `willTransition` event to continue bubbling to the parent
-      route, use `return true;`. When the `willTransition` method has a
-      return value of `true` then the parent route's `willTransition` method
-      will be fired, enabling "bubbling" behavior for the event.
-         @event willTransition
-      @param {Transition} transition
-      @since 1.0.0
-      @public
-    */
-
-    /**
-      The `didTransition` action is fired after a transition has
-      successfully been completed. This occurs after the normal model
-      hooks (`beforeModel`, `model`, `afterModel`, `setupController`)
-      have resolved. The `didTransition` action has no arguments,
-      however, it can be useful for tracking page views or resetting
-      state on the controller.
-         ```app/routes/login.js
-      import Route from '@ember/routing/route';
-      import { action } from '@ember/object';
-         export default class LoginRoute extends Route {
-        @action
-        didTransition() {
-          this.controller.get('errors.base').clear();
-          return true; // Bubble the didTransition event
-        }
-      }
-      ```
-         @event didTransition
-      @since 1.2.0
-      @public
-    */
-
-    /**
-      The `loading` action is fired on the route when a route's `model`
-      hook returns a promise that is not already resolved. The current
-      `Transition` object is the first parameter and the route that
-      triggered the loading event is the second parameter.
-         ```app/routes/application.js
-      import Route from '@ember/routing/route';
-      import { action } from '@ember/object';
-         export default class ApplicationRoute extends Route {
-        @action
-        loading(transition, route) {
-          let controller = this.controllerFor('foo');
-             // The controller may not be instantiated when initially loading
-          if (controller) {
-            controller.currentlyLoading = true;
-               transition.finally(function() {
-              controller.currentlyLoading = false;
-            });
-          }
-        }
-      }
-      ```
-         @event loading
-      @param {Transition} transition
-      @param {Route} route The route that triggered the loading event
-      @since 1.2.0
-      @public
-    */
-
-    /**
-      When attempting to transition into a route, any of the hooks
-      may return a promise that rejects, at which point an `error`
-      action will be fired on the partially-entered routes, allowing
-      for per-route error handling logic, or shared error handling
-      logic defined on a parent route.
-         Here is an example of an error handler that will be invoked
-      for rejected promises from the various hooks on the route,
-      as well as any unhandled errors from child routes:
-         ```app/routes/admin.js
-      import { reject } from 'rsvp';
-      import Route from '@ember/routing/route';
-      import { action } from '@ember/object';
-         export default class AdminRoute extends Route {
-        beforeModel() {
-          return reject('bad things!');
-        }
-           @action
-        error(error, transition) {
-          // Assuming we got here due to the error in `beforeModel`,
-          // we can expect that error === "bad things!",
-          // but a promise model rejecting would also
-          // call this hook, as would any errors encountered
-          // in `afterModel`.
-             // The `error` hook is also provided the failed
-          // `transition`, which can be stored and later
-          // `.retry()`d if desired.
-             this.transitionTo('login');
-        }
-      }
-      ```
-         `error` actions that bubble up all the way to `ApplicationRoute`
-      will fire a default error handler that logs the error. You can
-      specify your own global default error handler by overriding the
-      `error` handler on `ApplicationRoute`:
-         ```app/routes/application.js
-      import Route from '@ember/routing/route';
-      import { action } from '@ember/object';
-         export default class ApplicationRoute extends Route {
-        @action
-        error(error, transition) {
-          this.controllerFor('banner').displayError(error.message);
-        }
-      }
-      ```
-      @event error
-      @param {Error} error
-      @param {Transition} transition
-      @since 1.0.0
-      @public
-    */
-
     /**
       This event is triggered when the router enters the route. It is
       not executed when the model for the route changes.
@@ -17032,14 +16671,7 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
     setup(context, transition) {
       var controllerName = this.controllerName || this.routeName;
       var definedController = this.controllerFor(controllerName, true);
-      var controller;
-
-      if (definedController) {
-        controller = definedController;
-      } else {
-        controller = this.generateController(controllerName);
-      } // SAFETY: Since `_qp` is protected we can't infer the type
-
+      var controller = definedController !== null && definedController !== void 0 ? definedController : this.generateController(controllerName); // SAFETY: Since `_qp` is protected we can't infer the type
 
       var queryParams = (0, _metal.get)(this, '_qp'); // Assign the route's controller so that it can more easily be
       // referenced in action handlers. Side effects. Side effects everywhere.
@@ -17061,6 +16693,7 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
         var allParams = queryParams.propertyNames;
         allParams.forEach(prop => {
           var aQp = queryParams.map[prop];
+          (true && !(aQp) && (0, _debug.assert)('expected aQp', aQp));
           aQp.values = params;
           var cacheKey = (0, _utils2.calculateCacheKey)(aQp.route.fullRouteName, aQp.parts, aQp.values);
           var value = cache.lookup(cacheKey, prop, aQp.undecoratedDefaultValue);
@@ -17097,71 +16730,10 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
       var cacheKey = (0, _utils2.calculateCacheKey)(qp.route.fullRouteName, qp.parts, qp.values);
       cache.stash(cacheKey, prop, value);
     }
-    /**
-      This hook is the first of the route entry validation hooks
-      called when an attempt is made to transition into a route
-      or one of its children. It is called before `model` and
-      `afterModel`, and is appropriate for cases when:
-         1) A decision can be made to redirect elsewhere without
-         needing to resolve the model first.
-      2) Any async operations need to occur first before the
-         model is attempted to be resolved.
-         This hook is provided the current `transition` attempt
-      as a parameter, which can be used to `.abort()` the transition,
-      save it for a later `.retry()`, or retrieve values set
-      on it from a previous hook. You can also just call
-      `this.transitionTo` to another route to implicitly
-      abort the `transition`.
-         You can return a promise from this hook to pause the
-      transition until the promise resolves (or rejects). This could
-      be useful, for instance, for retrieving async code from
-      the server that is required to enter a route.
-         @method beforeModel
-      @param {Transition} transition
-      @return {any | Promise<any>} if the value returned from this hook is
-        a promise, the transition will pause until the transition
-        resolves. Otherwise, non-promise return values are not
-        utilized in any way.
-      @since 1.0.0
-      @public
-    */
 
+    beforeModel(_transition) {}
 
-    beforeModel() {}
-    /**
-      This hook is called after this route's model has resolved.
-      It follows identical async/promise semantics to `beforeModel`
-      but is provided the route's resolved model in addition to
-      the `transition`, and is therefore suited to performing
-      logic that can only take place after the model has already
-      resolved.
-         ```app/routes/posts.js
-      import Route from '@ember/routing/route';
-         export default class PostsRoute extends Route {
-        afterModel(posts, transition) {
-          if (posts.get('length') === 1) {
-            this.transitionTo('post.show', posts.get('firstObject'));
-          }
-        }
-      }
-      ```
-         Refer to documentation for `beforeModel` for a description
-      of transition-pausing semantics when a promise is returned
-      from this hook.
-         @method afterModel
-      @param {Object} resolvedModel the value returned from `model`,
-        or its resolved value if it was a promise
-      @param {Transition} transition
-      @return {any | Promise<any>} if the value returned from this hook is
-        a promise, the transition will pause until the transition
-        resolves. Otherwise, non-promise return values are not
-        utilized in any way.
-      @since 1.0.0
-      @public
-     */
-
-
-    afterModel() {}
+    afterModel(_resolvedModel, _transition) {}
     /**
       A hook you can implement to optionally redirect to another route.
          Calling `this.transitionTo` from inside of the `redirect` hook will
@@ -17184,7 +16756,7 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
     */
 
 
-    redirect() {}
+    redirect(_model, _transition) {}
     /**
       Called when the context is changed by router.js.
          @private
@@ -17279,11 +16851,14 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
 
       if (!name) {
         if (sawParams) {
+          // SAFETY: This should be equivalent
           return Object.assign({}, params);
         } else {
           if (transition.resolveIndex < 1) {
             return;
-          }
+          } // SAFETY: These return types should be equivalent but router.js doesn't have enough
+          // generics to infer it.
+
 
           return transition[_router_js.STATE_SYMBOL].routeInfos[transition.resolveIndex - 1].context;
         }
@@ -17374,29 +16949,12 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
         (0, _metal.set)(controller, 'model', context);
       }
     }
-    /**
-      Returns the controller of the current route, or a parent (or any ancestor)
-      route in a route hierarchy.
-         The controller instance must already have been created, either through entering the
-      associated route or using `generateController`.
-         ```app/routes/post.js
-      import Route from '@ember/routing/route';
-         export default class PostRoute extends Route {
-        setupController(controller, post) {
-          super.setupController(controller, post);
-             this.controllerFor('posts').set('currentPost', post);
-        }
-      }
-      ```
-         @method controllerFor
-      @param {String} name the name of the route or controller
-      @return {Controller}
-      @since 1.0.0
-      @public
-    */
-
 
     controllerFor(name, _skipAssert) {
+      if (_skipAssert === void 0) {
+        _skipAssert = false;
+      }
+
       var owner = (0, _owner.getOwner)(this);
       (true && !(owner) && (0, _debug.assert)('Route is unexpectedly missing an owner', owner));
       var route = owner.lookup(`route:${name}`);
@@ -17495,7 +17053,7 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
         }
       }
 
-      return route && route.currentModel;
+      return route === null || route === void 0 ? void 0 : route.currentModel;
     }
     /**
       `this[RENDER]` is used to render a template into a region of another template
@@ -17538,39 +17096,6 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
         (0, _runloop.once)(this._router, '_setOutlets');
       }
     }
-    /**
-      Allows you to produce custom metadata for the route.
-      The return value of this method will be attached to
-      its corresponding RouteInfoWithAttributes object.
-         Example
-         ```app/routes/posts/index.js
-      import Route from '@ember/routing/route';
-         export default class PostsIndexRoute extends Route {
-        buildRouteInfoMetadata() {
-          return { title: 'Posts Page' }
-        }
-      }
-      ```
-         ```app/routes/application.js
-      import Route from '@ember/routing/route';
-      import { service } from '@ember/service';
-         export default class ApplicationRoute extends Route {
-        @service router
-           constructor() {
-          super(...arguments);
-             this.router.on('routeDidChange', transition => {
-            document.title = transition.to.metadata.title;
-            // would update document's title to "Posts Page"
-          });
-        }
-      }
-      ```
-      @method buildRouteInfoMetadata
-      @return any
-      @since 3.10.0
-      @public
-     */
-
 
     buildRouteInfoMetadata() {}
 
@@ -17639,7 +17164,7 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
         // this route find its query params and normalize their object shape them
         // merge in the query params for the route. As a mergedProperty,
         // Route#queryParams is always at least `{}`
-        var controllerDefinedQueryParameterConfiguration = (0, _metal.get)(controller, 'queryParams') || {};
+        var controllerDefinedQueryParameterConfiguration = (0, _metal.get)(controller, 'queryParams') || [];
         var normalizedControllerQueryParameterConfiguration = (0, _utils2.normalizeControllerQueryParams)(controllerDefinedQueryParameterConfiguration);
         combinedQueryParameterConfiguration = mergeEachQueryParams(normalizedControllerQueryParameterConfiguration, queryParameterConfiguraton);
       } else if (hasRouterDefinedQueryParams) {
@@ -17711,6 +17236,7 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
           */
           inactive: (prop, value) => {
             var qp = map[prop];
+            (true && !(qp) && (0, _debug.assert)('expected inactive callback to only be called for registered qps', qp));
 
             this._qpChanged(prop, value, qp);
           },
@@ -17722,6 +17248,7 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
           */
           active: (prop, value) => {
             var qp = map[prop];
+            (true && !(qp) && (0, _debug.assert)('expected active callback to only be called for registered qps', qp));
 
             this._qpChanged(prop, value, qp);
 
@@ -17734,6 +17261,7 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
           */
           allowOverrides: (prop, value) => {
             var qp = map[prop];
+            (true && !(qp) && (0, _debug.assert)('expected allowOverrides callback to only be called for registered qps', qp));
 
             this._qpChanged(prop, value, qp);
 
@@ -17768,7 +17296,9 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
     var current;
 
     for (var i = 0; i < routeInfos.length; i++) {
-      current = routeInfos[i].route;
+      var routeInfo = routeInfos[i];
+      (true && !(routeInfo) && (0, _debug.assert)('has current routeInfo', routeInfo));
+      current = routeInfo.route;
 
       if (current === route) {
         return routeInfos[i + offset];
@@ -17892,9 +17422,10 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
   function getQueryParamsFor(route, state) {
     state.queryParamsFor = state.queryParamsFor || {};
     var name = route.fullRouteName;
+    var existing = state.queryParamsFor[name];
 
-    if (state.queryParamsFor[name]) {
-      return state.queryParamsFor[name];
+    if (existing) {
+      return existing;
     }
 
     var fullQueryParams = getFullQueryParams(route._router, state);
@@ -17903,9 +17434,8 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
 
     var qps = (0, _metal.get)(route, '_qp').qps;
 
-    for (var i = 0; i < qps.length; ++i) {
+    for (var qp of qps) {
       // Put deserialized qp on params hash.
-      var qp = qps[i];
       var qpValueWasPassedIn = (qp.prop in fullQueryParams);
       params[qp.prop] = qpValueWasPassedIn ? fullQueryParams[qp.prop] : copyDefaultValue(qp.defaultValue);
     }
@@ -17996,54 +17526,14 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
 
     return routeName;
   }
-  /**
-      A hook you can implement to convert the route's model into parameters
-      for the URL.
-  
-      ```app/router.js
-      // ...
-  
-      Router.map(function() {
-        this.route('post', { path: '/posts/:post_id' });
-      });
-  
-      ```
-  
-      ```app/routes/post.js
-      import Route from '@ember/routing/route';
-  
-      export default class PostRoute extends Route {
-        model({ post_id }) {
-          // the server returns `{ id: 12 }`
-          return fetch(`/posts/${post_id}`;
-        }
-  
-        serialize(model) {
-          // this will make the URL `/posts/12`
-          return { post_id: model.id };
-        }
-      }
-      ```
-  
-      The default `serialize` method will insert the model's `id` into the
-      route's dynamic segment (in this case, `:post_id`) if the segment contains '_id'.
-      If the route has multiple dynamic segments or does not contain '_id', `serialize`
-      will return `getProperties(model, params)`
-  
-      This method is called when `transitionTo` is called with a context
-      in order to populate the URL.
-  
-      @method serialize
-      @param {Object} model the routes model
-      @param {Array} params an Array of parameter names for the current
-        route (in the example, `['post_id']`.
-      @return {Object} the serialized parameters
-      @since 1.0.0
-      @public
-    */
 
+  var defaultSerialize = Route.prototype.serialize;
+  _exports.defaultSerialize = defaultSerialize;
+
+  function hasDefaultSerialize(route) {
+    return route.serialize === defaultSerialize;
+  } // Set these here so they can be overridden with extend
 
-  Route.prototype.serialize = defaultSerialize; // Set these here so they can be overridden with extend
 
   Route.reopen({
     mergedProperties: ['queryParams'],
@@ -18110,8 +17600,8 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
         var qpMap = (0, _metal.get)(this, '_qp').map;
         var totalChanged = Object.keys(changed).concat(Object.keys(removed));
 
-        for (var i = 0; i < totalChanged.length; ++i) {
-          var qp = qpMap[totalChanged[i]];
+        for (var change of totalChanged) {
+          var qp = qpMap[change];
 
           if (qp) {
             var options = this._optionsForQueryParam(qp);
@@ -18148,8 +17638,7 @@ define("@ember/-internals/routing/lib/system/route", ["exports", "@ember/-intern
         var replaceUrl;
         (0, _utils2.stashParamNames)(router, routeInfos);
 
-        for (var i = 0; i < qpMeta.qps.length; ++i) {
-          var qp = qpMeta.qps[i];
+        for (var qp of qpMeta.qps) {
           var route = qp.route;
           var controller = route.controller;
           var presentKey = qp.urlKey in params && qp.urlKey; // Do a reverse lookup to see if the changed query
@@ -18248,6 +17737,9 @@ define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-inter
   _exports.default = void 0;
   _exports.triggerEvent = triggerEvent;
 
+  /**
+  @module @ember/routing
+  */
   function defaultDidTransition(infos) {
     updatePaths(this);
 
@@ -18407,7 +17899,9 @@ define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-inter
       var name, nameParts, oldNameParts;
 
       for (var i = 1; i < routeInfos.length; i++) {
-        name = routeInfos[i].name;
+        var routeInfo = routeInfos[i];
+        (true && !(routeInfo) && (0, _debug.assert)('has routeInfo', routeInfo));
+        name = routeInfo.name;
         nameParts = name.split('.');
         oldNameParts = slice.call(path);
 
@@ -18721,8 +18215,8 @@ define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-inter
       var defaultParentState;
       var liveRoutes = null;
 
-      for (var i = 0; i < routeInfos.length; i++) {
-        var route = routeInfos[i].route;
+      for (var routeInfo of routeInfos) {
+        var route = routeInfo.route;
 
         var connections = _route.ROUTE_CONNECTIONS.get(route);
 
@@ -18800,9 +18294,8 @@ define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-inter
     /**
       Transition the application into another route. The route may
       be either a single route or route path:
-         See [transitionTo](/ember/release/classes/Route/methods/transitionTo?anchor=transitionTo) for more info.
          @method transitionTo
-      @param {String} name the name of the route or a URL
+      @param {String} [name] the name of the route or a URL
       @param {...Object} models the model(s) or identifier(s) to be used while
         transitioning to the route.
       @param {Object} [options] optional hash with a queryParams property
@@ -18853,6 +18346,23 @@ define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-inter
         }
       }
     }
+    /**
+      Similar to `transitionTo`, but instead of adding the destination to the browser's URL history,
+      it replaces the entry for the current route.
+      When the user clicks the "back" button in the browser, there will be fewer steps.
+      This is most commonly used to manage redirects in a way that does not cause confusing additions
+      to the user's browsing history.
+         @method replaceWith
+      @param {String} [name] the name of the route or a URL
+      @param {...Object} models the model(s) or identifier(s) to be used while
+        transitioning to the route.
+      @param {Object} [options] optional hash with a queryParams property
+        containing a mapping of query parameters
+      @return {Transition} the transition object associated with this
+        attempted transition
+      @public
+    */
+
 
     replaceWith() {
       return this.transitionTo(...arguments).method('replace');
@@ -18946,8 +18456,11 @@ define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-inter
       var instances = this._engineInstances;
 
       for (var name in instances) {
-        for (var id in instances[name]) {
-          (0, _runloop.run)(instances[name][id], 'destroy');
+        var instance = instances[name];
+        (true && !(instance) && (0, _debug.assert)('has instance', instance));
+
+        for (var id in instance) {
+          (0, _runloop.run)(instance[id], 'destroy');
         }
       }
     }
@@ -19271,12 +18784,11 @@ define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-inter
       /* DEBUG */
       ? {} : null;
       var qpMeta;
-      var qp;
       var urlKey;
       var qpOther;
 
-      for (var i = 0; i < routeInfoLength; ++i) {
-        qpMeta = this._getQPMeta(routeInfos[i]);
+      for (var routeInfo of routeInfos) {
+        qpMeta = this._getQPMeta(routeInfo);
 
         if (!qpMeta) {
           shouldCache = false;
@@ -19284,9 +18796,7 @@ define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-inter
         } // Loop over each QP to make sure we don't have any collisions by urlKey
 
 
-        for (var _i = 0; _i < qpMeta.qps.length; _i++) {
-          qp = qpMeta.qps[_i];
-
+        for (var qp of qpMeta.qps) {
           if (true
           /* DEBUG */
           ) {
@@ -19334,19 +18844,15 @@ define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-inter
       var routeInfos = state.routeInfos;
       var qpMeta;
 
-      for (var i = 0, len = routeInfos.length; i < len; ++i) {
-        qpMeta = this._getQPMeta(routeInfos[i]);
+      for (var routeInfo of routeInfos) {
+        qpMeta = this._getQPMeta(routeInfo);
 
         if (!qpMeta) {
           continue;
         }
 
-        var qp = void 0;
-        var presentProp = void 0;
-
-        for (var j = 0, qpLen = qpMeta.qps.length; j < qpLen; ++j) {
-          qp = qpMeta.qps[j];
-          presentProp = qp.prop in queryParams && qp.prop || qp.scopedPropertyName in queryParams && qp.scopedPropertyName || qp.urlKey in queryParams && qp.urlKey;
+        for (var qp of qpMeta.qps) {
+          var presentProp = qp.prop in queryParams && qp.prop || qp.scopedPropertyName in queryParams && qp.scopedPropertyName || qp.urlKey in queryParams && qp.urlKey;
 
           if (presentProp) {
             if (presentProp !== qp.scopedPropertyName) {
@@ -19376,15 +18882,17 @@ define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-inter
       var qp;
       var presentProp;
 
-      for (var i = 0; i < routeInfos.length; ++i) {
-        qpMeta = this._getQPMeta(routeInfos[i]);
+      for (var routeInfo of routeInfos) {
+        qpMeta = this._getQPMeta(routeInfo);
 
         if (!qpMeta) {
           continue;
-        }
+        } // Needs to stay for index loop to avoid throwIfClosureRequired
+
 
         for (var j = 0, qpLen = qpMeta.qps.length; j < qpLen; ++j) {
           qp = qpMeta.qps[j];
+          (true && !(qp) && (0, _debug.assert)('expected qp', qp));
           presentProp = qp.prop in queryParams && qp.prop || qp.scopedPropertyName in queryParams && qp.scopedPropertyName || qp.urlKey in queryParams && qp.urlKey;
           (true && !(function () {
             if (qp.urlKey === presentProp || qp.scopedPropertyName === presentProp) {
@@ -19472,12 +18980,16 @@ define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-inter
         mountPoint
       } = _ref;
       var engineInstances = this._engineInstances;
+      var namedInstances = engineInstances[name];
+
+      if (!namedInstances) {
+        namedInstances = Object.create(null);
+        engineInstances[name] = namedInstances;
+      } // We just set these!
 
-      if (!engineInstances[name]) {
-        engineInstances[name] = Object.create(null);
-      }
 
-      var engineInstance = engineInstances[name][instanceId];
+      (true && !(namedInstances) && (0, _debug.assert)('has namedInstances', namedInstances));
+      var engineInstance = namedInstances[instanceId];
 
       if (!engineInstance) {
         var owner = (0, _owner.getOwner)(this);
@@ -19488,7 +19000,7 @@ define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-inter
           mountPoint
         });
         engineInstance.boot();
-        engineInstances[name][instanceId] = engineInstance;
+        namedInstances[instanceId] = engineInstance;
       }
 
       return engineInstance;
@@ -19515,6 +19027,7 @@ define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-inter
   function forEachRouteAbove(routeInfos, callback) {
     for (var i = routeInfos.length - 1; i >= 0; --i) {
       var routeInfo = routeInfos[i];
+      (true && !(routeInfo) && (0, _debug.assert)('has routeInfo', routeInfo));
       var route = routeInfo.route; // routeInfo.handler being `undefined` generally means either:
       //
       // 1. an error occurred during creation of the route in question
@@ -19717,6 +19230,7 @@ define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-inter
 
     for (var i = routeInfos.length - 1; i >= 0; i--) {
       routeInfo = routeInfos[i];
+      (true && !(routeInfo) && (0, _debug.assert)('has routeInfo', routeInfo));
       handler = routeInfo.route;
       actionHandler = handler && handler.actions && handler.actions[name];
 
@@ -19754,9 +19268,8 @@ define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-inter
       params
     } = state;
 
-    for (var i = 0; i < routeInfos.length; ++i) {
-      var routeInfo = routeInfos[i]; // If the routeInfo is not resolved, we serialize the context into params
-
+    for (var routeInfo of routeInfos) {
+      // If the routeInfo is not resolved, we serialize the context into params
       if (!routeInfo.isResolved) {
         params[routeInfo.name] = routeInfo.serialize(routeInfo.context);
       } else {
@@ -19776,7 +19289,9 @@ define("@ember/-internals/routing/lib/system/router", ["exports", "@ember/-inter
 
     var path = EmberRouter._routePath(infos);
 
-    var currentRouteName = infos[infos.length - 1].name;
+    var info = infos[infos.length - 1];
+    (true && !(info) && (0, _debug.assert)('expected info', info));
+    var currentRouteName = info.name;
     var location = router.location;
     (true && !(typeof location !== 'string') && (0, _debug.assert)('expected location to not be a string', typeof location !== 'string'));
     var currentURL = location.getURL();
@@ -20174,22 +19689,28 @@ define("@ember/-internals/routing/lib/utils", ["exports", "@ember/-internals/met
   var ALL_PERIODS_REGEX = /\./g;
 
   function extractRouteArgs(args) {
+    // SAFETY: This should just be the same thing
     args = args.slice();
-    var possibleQueryParams = args.pop();
+    var possibleOptions = args[args.length - 1];
     var queryParams;
 
-    if (hasQueryParams(possibleQueryParams)) {
-      queryParams = possibleQueryParams.queryParams;
+    if (isRouteOptions(possibleOptions)) {
+      args.pop(); // Remove options
+
+      queryParams = possibleOptions.queryParams;
     } else {
-      // Not query params so return to the array
-      args.push(possibleQueryParams);
       queryParams = {};
-    } // UNSAFE: these are simply assumed as the existing behavior of the system.
-    // However, this could break if upstream refactors change it, and the types
-    // here would not be able to tell us; we would lie to everything downstream.
+    }
+
+    var routeName;
+
+    if (typeof args[0] === 'string') {
+      routeName = args.shift(); // We just checked this!
+
+      (true && !(typeof routeName === 'string') && (0, _debug.assert)('routeName is a string', typeof routeName === 'string'));
+    } // SAFTEY: We removed the name and options if they existed, only models left.
 
 
-    var routeName = args.shift();
     var models = args;
     return {
       routeName,
@@ -20200,7 +19721,9 @@ define("@ember/-internals/routing/lib/utils", ["exports", "@ember/-internals/met
 
   function getActiveTargetName(router) {
     var routeInfos = router.activeTransition ? router.activeTransition[_router_js.STATE_SYMBOL].routeInfos : router.state.routeInfos;
-    return routeInfos[routeInfos.length - 1].name;
+    var lastRouteInfo = routeInfos[routeInfos.length - 1];
+    (true && !(lastRouteInfo) && (0, _debug.assert)('has last route info', lastRouteInfo));
+    return lastRouteInfo.name;
   }
 
   function stashParamNames(router, routeInfos) {
@@ -20212,24 +19735,27 @@ define("@ember/-internals/routing/lib/utils", ["exports", "@ember/-internals/met
     // Hopefully we can remove this in the future.
 
 
-    var targetRouteName = routeInfos[routeInfos.length - 1].name;
+    var routeInfo = routeInfos[routeInfos.length - 1];
+    (true && !(routeInfo) && (0, _debug.assert)('has route info', routeInfo));
+    var targetRouteName = routeInfo.name;
 
     var recogHandlers = router._routerMicrolib.recognizer.handlersFor(targetRouteName);
 
     var dynamicParent;
 
     for (var i = 0; i < routeInfos.length; ++i) {
-      var routeInfo = routeInfos[i];
+      var _routeInfo = routeInfos[i];
+      (true && !(_routeInfo) && (0, _debug.assert)('has route info', _routeInfo));
       var names = recogHandlers[i].names;
 
       if (names.length) {
-        dynamicParent = routeInfo;
+        dynamicParent = _routeInfo;
       }
 
-      routeInfo['_names'] = names;
-      var route = routeInfo.route;
+      _routeInfo['_names'] = names;
+      var route = _routeInfo.route; // SAFETY: This cast should be idential. I don't understand why it is needed.
 
-      route._stashNames(routeInfo, dynamicParent);
+      route._stashNames(_routeInfo, dynamicParent);
     }
 
     routeInfos['_namesStashed'] = true;
@@ -20269,9 +19795,7 @@ define("@ember/-internals/routing/lib/utils", ["exports", "@ember/-internals/met
 
     var suffixes = '';
 
-    for (var i = 0; i < parts.length; ++i) {
-      var part = parts[i];
-
+    for (var part of parts) {
       var cacheValuePrefix = _calculateCacheValuePrefix(prefix, part);
 
       var value = void 0;
@@ -20327,8 +19851,8 @@ define("@ember/-internals/routing/lib/utils", ["exports", "@ember/-internals/met
   function normalizeControllerQueryParams(queryParams) {
     var qpMap = {};
 
-    for (var i = 0; i < queryParams.length; ++i) {
-      accumulateQueryParamDescriptors(queryParams[i], qpMap);
+    for (var queryParam of queryParams) {
+      accumulateQueryParamDescriptors(queryParam, qpMap);
     }
 
     return qpMap;
@@ -20385,12 +19909,14 @@ define("@ember/-internals/routing/lib/utils", ["exports", "@ember/-internals/met
 
 
   function prefixRouteNameArg(route, args) {
-    var routeName = args[0];
+    var routeName;
     var owner = (0, _owner.getOwner)(route);
     (true && !(owner) && (0, _debug.assert)('Route is unexpectedly missing an owner', owner));
     var prefix = owner.mountPoint; // only alter the routeName if it's actually referencing a route.
 
-    if (owner.routable && typeof routeName === 'string') {
+    if (owner.routable && typeof args[0] === 'string') {
+      routeName = args[0];
+
       if (resemblesURL(routeName)) {
         throw new _error.default('Programmatic transitions by URL cannot be used within an Engine. Please use the route name instead.');
       } else {
@@ -20439,7 +19965,7 @@ define("@ember/-internals/routing/lib/utils", ["exports", "@ember/-internals/met
     }));
   }
 
-  function hasQueryParams(value) {
+  function isRouteOptions(value) {
     if (value && typeof value === 'object') {
       var qps = value.queryParams;
 
@@ -21074,16 +20600,16 @@ define("@ember/-internals/runtime/lib/mixins/action_handler", ["exports", "@embe
     /**
       The collection of functions, keyed by name, available on this
       `ActionHandler` as action targets.
-         These functions will be invoked when a matching `{{action}}` is triggered
+       These functions will be invoked when a matching `{{action}}` is triggered
       from within a template and the application's current route is this route.
-         Actions can also be invoked from other parts of your application
+       Actions can also be invoked from other parts of your application
       via `ActionHandler#send`.
-         The `actions` hash will inherit action handlers from
+       The `actions` hash will inherit action handlers from
       the `actions` hash defined on extended parent classes
       or mixins rather than just replace the entire hash, e.g.:
-         ```app/mixins/can-display-banner.js
+       ```app/mixins/can-display-banner.js
       import Mixin from '@ember/mixin';
-         export default Mixin.create({
+       export default Mixin.create({
         actions: {
           displayBanner(msg) {
             // ...
@@ -21091,28 +20617,28 @@ define("@ember/-internals/runtime/lib/mixins/action_handler", ["exports", "@embe
         }
       });
       ```
-         ```app/routes/welcome.js
+       ```app/routes/welcome.js
       import Route from '@ember/routing/route';
       import CanDisplayBanner from '../mixins/can-display-banner';
-         export default Route.extend(CanDisplayBanner, {
+       export default Route.extend(CanDisplayBanner, {
         actions: {
           playMusic() {
             // ...
           }
         }
       });
-         // `WelcomeRoute`, when active, will be able to respond
+       // `WelcomeRoute`, when active, will be able to respond
       // to both actions, since the actions hash is merged rather
       // then replaced when extending mixins / parent classes.
       this.send('displayBanner');
       this.send('playMusic');
       ```
-         Within a Controller, Route or Component's action handler,
+       Within a Controller, Route or Component's action handler,
       the value of the `this` context is the Controller, Route or
       Component object:
-         ```app/routes/song.js
+       ```app/routes/song.js
       import Route from '@ember/routing/route';
-         export default Route.extend({
+       export default Route.extend({
         actions: {
           myAction() {
             this.controllerFor("song");
@@ -21122,13 +20648,13 @@ define("@ember/-internals/runtime/lib/mixins/action_handler", ["exports", "@embe
         }
       });
       ```
-         It is also possible to call `this._super(...arguments)` from within an
+       It is also possible to call `this._super(...arguments)` from within an
       action handler if it overrides a handler defined on a parent
       class or mixin:
-         Take for example the following routes:
-         ```app/mixins/debug-route.js
+       Take for example the following routes:
+       ```app/mixins/debug-route.js
       import Mixin from '@ember/mixin';
-         export default Mixin.create({
+       export default Mixin.create({
         actions: {
           debugRouteInformation() {
             console.debug("It's a-me, console.debug!");
@@ -21136,54 +20662,54 @@ define("@ember/-internals/runtime/lib/mixins/action_handler", ["exports", "@embe
         }
       });
       ```
-         ```app/routes/annoying-debug.js
+       ```app/routes/annoying-debug.js
       import Route from '@ember/routing/route';
       import DebugRoute from '../mixins/debug-route';
-         export default Route.extend(DebugRoute, {
+       export default Route.extend(DebugRoute, {
         actions: {
           debugRouteInformation() {
             // also call the debugRouteInformation of mixed in DebugRoute
             this._super(...arguments);
-               // show additional annoyance
+             // show additional annoyance
             window.alert(...);
           }
         }
       });
       ```
-         ## Bubbling
-         By default, an action will stop bubbling once a handler defined
+       ## Bubbling
+       By default, an action will stop bubbling once a handler defined
       on the `actions` hash handles it. To continue bubbling the action,
       you must return `true` from the handler:
-         ```app/router.js
+       ```app/router.js
       Router.map(function() {
         this.route("album", function() {
           this.route("song");
         });
       });
       ```
-         ```app/routes/album.js
+       ```app/routes/album.js
       import Route from '@ember/routing/route';
-         export default Route.extend({
+       export default Route.extend({
         actions: {
           startPlaying: function() {
           }
         }
       });
       ```
-         ```app/routes/album-song.js
+       ```app/routes/album-song.js
       import Route from '@ember/routing/route';
-         export default Route.extend({
+       export default Route.extend({
         actions: {
           startPlaying() {
             // ...
-               if (actionShouldAlsoBeTriggeredOnParentRoute) {
+             if (actionShouldAlsoBeTriggeredOnParentRoute) {
               return true;
             }
           }
         }
       });
       ```
-         @property actions
+       @property actions
       @type Object
       @default null
       @public
@@ -21193,14 +20719,14 @@ define("@ember/-internals/runtime/lib/mixins/action_handler", ["exports", "@embe
       Triggers a named action on the `ActionHandler`. Any parameters
       supplied after the `actionName` string will be passed as arguments
       to the action target function.
-         If the `ActionHandler` has its `target` property set, actions may
+       If the `ActionHandler` has its `target` property set, actions may
       bubble to the `target`. Bubbling happens when an `actionName` can
       not be found in the `ActionHandler`'s `actions` hash or if the
       action target function returns `true`.
-         Example
-         ```app/routes/welcome.js
+       Example
+       ```app/routes/welcome.js
       import Route from '@ember/routing/route';
-         export default Route.extend({
+       export default Route.extend({
         actions: {
           playTheme() {
             this.send('playMusic', 'theme.mp3');
@@ -21211,7 +20737,7 @@ define("@ember/-internals/runtime/lib/mixins/action_handler", ["exports", "@embe
         }
       });
       ```
-         @method send
+       @method send
       @param {String} actionName The action to trigger
       @param {*} context a context to send with the action
       @public
@@ -26486,6 +26012,8 @@ define("@ember/-internals/utils/index", ["exports", "@glimmer/util", "@ember/deb
       }
 
       var key = keys[i];
+      (true && !(key) && (0, _debug.assert)('has key', key)); // Looping over array
+
       s += `${inspectKey(key)}: ${inspectValue(obj[key], depth, seen)}`;
     }
 
@@ -28020,6 +27548,7 @@ define("@ember/-internals/views/lib/system/utils", ["exports", "@ember/-internal
     var rootViews = [];
     Object.keys(registry).forEach(id => {
       var view = registry[id];
+      (true && !(view) && (0, _debug.assert)('expected view', view));
 
       if (view.parentView === null) {
         rootViews.push(view);
@@ -30132,8 +29661,8 @@ define("@ember/canary-features/index", ["exports", "@ember/-internals/environmen
     @public
   */
   var DEFAULT_FEATURES = {
-    EMBER_LIBRARIES_ISREGISTERED: null,
-    EMBER_IMPROVED_INSTRUMENTATION: null,
+    EMBER_LIBRARIES_ISREGISTERED: false,
+    EMBER_IMPROVED_INSTRUMENTATION: false,
     EMBER_NAMED_BLOCKS: true,
     EMBER_GLIMMER_HELPER_MANAGER: true,
     EMBER_GLIMMER_INVOKE_HELPER: true,
@@ -30301,62 +29830,14 @@ define("@ember/controller/index", ["exports", "@ember/-internals/runtime", "@emb
   _exports.default = void 0;
   _exports.inject = inject;
 
-  /**
-  @module @ember/controller
-  */
+  class Controller extends _runtime.FrameworkObject.extend(_controller_mixin.default) {}
 
-  /**
-    @class Controller
-    @extends EmberObject
-    @uses Ember.ControllerMixin
-    @public
-  */
-  var Controller = _runtime.FrameworkObject.extend(_controller_mixin.default);
-  /**
-    Creates a property that lazily looks up another controller in the container.
-    Can only be used when defining another controller.
-  
-    Example:
-  
-    ```app/controllers/post.js
-    import Controller, {
-      inject as controller
-    } from '@ember/controller';
-  
-    export default class PostController extends Controller {
-      @controller posts;
+  function inject() {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
     }
-    ```
-  
-    Classic Class Example:
-  
-    ```app/controllers/post.js
-    import Controller, {
-      inject as controller
-    } from '@ember/controller';
-  
-    export default Controller.extend({
-      posts: controller()
-    });
-    ```
-  
-    This example will create a `posts` property on the `post` controller that
-    looks up the `posts` controller in the container, making it easy to reference
-    other controllers.
-  
-    @method inject
-    @static
-    @for @ember/controller
-    @since 1.10.0
-    @param {String} name (optional) name of the controller to inject, defaults to
-           the property's name
-    @return {ComputedDecorator} injection decorator instance
-    @public
-  */
-
 
-  function inject() {
-    return (0, _metal.inject)('controller', ...arguments);
+    return (0, _metal.inject)('controller', ...args);
   }
 
   var _default = Controller;
@@ -32245,7 +31726,7 @@ define("@ember/helper/index", ["exports", "@glimmer/manager", "@glimmer/runtime"
     }
   });
 });
-define("@ember/instrumentation/index", ["exports", "@ember/-internals/environment"], function (_exports, _environment) {
+define("@ember/instrumentation/index", ["exports", "@ember/-internals/environment", "@ember/debug"], function (_exports, _environment, _debug) {
   "use strict";
 
   Object.defineProperty(_exports, "__esModule", {
@@ -32324,11 +31805,8 @@ define("@ember/instrumentation/index", ["exports", "@ember/-internals/environmen
 
   function populateListeners(name) {
     var listeners = [];
-    var subscriber;
-
-    for (var i = 0; i < subscribers.length; i++) {
-      subscriber = subscribers[i];
 
+    for (var subscriber of subscribers) {
       if (subscriber.regex.test(name)) {
         listeners.push(subscriber.object);
       }
@@ -32433,19 +31911,20 @@ define("@ember/instrumentation/index", ["exports", "@ember/-internals/environmen
     var beforeValues = [];
     var timestamp = time();
 
-    for (var i = 0; i < listeners.length; i++) {
-      var listener = listeners[i];
+    for (var listener of listeners) {
       beforeValues.push(listener.before(name, timestamp, payload));
     }
 
+    var constListeners = listeners;
     return function _instrumentEnd() {
       var timestamp = time();
 
-      for (var _i = 0; _i < listeners.length; _i++) {
-        var _listener = listeners[_i];
+      for (var i = 0; i < constListeners.length; i++) {
+        var _listener = constListeners[i];
+        (true && !(_listener) && (0, _debug.assert)('has listener', _listener)); // Iterating over values
 
         if (typeof _listener.after === 'function') {
-          _listener.after(name, timestamp, payload, beforeValues[_i]);
+          _listener.after(name, timestamp, payload, beforeValues[i]);
         }
       }
 
@@ -32471,12 +31950,9 @@ define("@ember/instrumentation/index", ["exports", "@ember/-internals/environmen
 
   function subscribe(pattern, object) {
     var paths = pattern.split('.');
-    var path;
     var regexes = [];
 
-    for (var i = 0; i < paths.length; i++) {
-      path = paths[i];
-
+    for (var path of paths) {
       if (path === '*') {
         regexes.push('[^\\.]*');
       } else {
@@ -35305,6 +34781,19 @@ define("@ember/routing/route", ["exports", "@ember/-internals/routing"], functio
     }
   });
 });
+define("@ember/routing/router-service", ["exports", "@ember/-internals/routing"], function (_exports, _routing) {
+  "use strict";
+
+  Object.defineProperty(_exports, "__esModule", {
+    value: true
+  });
+  Object.defineProperty(_exports, "default", {
+    enumerable: true,
+    get: function () {
+      return _routing.RouterService;
+    }
+  });
+});
 define("@ember/routing/router", ["exports", "@ember/-internals/routing"], function (_exports, _routing) {
   "use strict";
 
@@ -36130,75 +35619,20 @@ define("@ember/service/index", ["exports", "@ember/-internals/runtime", "@ember/
   _exports.inject = inject;
   _exports.service = service;
 
-  /**
-   @module @ember/service
-   @public
-   */
-
-  /**
-    @method inject
-    @static
-    @since 1.10.0
-    @for @ember/service
-    @param {String} name (optional) name of the service to inject, defaults to
-           the property's name
-    @return {ComputedDecorator} injection decorator instance
-    @public
-  */
   function inject() {
-    return (0, _metal.inject)('service', ...arguments);
-  }
-  /**
-    Creates a property that lazily looks up a service in the container. There are
-    no restrictions as to what objects a service can be injected into.
-  
-    Example:
-  
-    ```app/routes/application.js
-    import Route from '@ember/routing/route';
-    import { service } from '@ember/service';
-  
-    export default class ApplicationRoute extends Route {
-      @service('auth') authManager;
-  
-      model() {
-        return this.authManager.findCurrentUser();
-      }
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
     }
-    ```
-  
-    Classic Class Example:
-  
-    ```app/routes/application.js
-    import Route from '@ember/routing/route';
-    import { service } from '@ember/service';
-  
-    export default Route.extend({
-      authManager: service('auth'),
-  
-      model() {
-        return this.get('authManager').findCurrentUser();
-      }
-    });
-    ```
-  
-    This example will create an `authManager` property on the application route
-    that looks up the `auth` service in the container, making it easily accessible
-    in the `model` hook.
-  
-    @method service
-    @static
-    @since 4.1.0
-    @for @ember/service
-    @param {String} name (optional) name of the service to inject, defaults to
-           the property's name
-    @return {ComputedDecorator} injection decorator instance
-    @public
-  */
 
+    return (0, _metal.inject)('service', ...args);
+  }
 
   function service() {
-    return (0, _metal.inject)('service', ...arguments);
+    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+      args[_key2] = arguments[_key2];
+    }
+
+    return (0, _metal.inject)('service', ...args);
   }
   /**
     @class Service
@@ -36208,13 +35642,10 @@ define("@ember/service/index", ["exports", "@ember/-internals/runtime", "@ember/
   */
 
 
-  var Service = _runtime.FrameworkObject.extend();
+  class Service extends _runtime.FrameworkObject {}
 
-  Service.reopenClass({
-    isServiceFactory: true
-  });
-  var _default = Service;
-  _exports.default = _default;
+  _exports.default = Service;
+  Service.isServiceFactory = true;
 });
 define("@ember/string/index", ["exports", "@ember/string/lib/string_registry", "@ember/-internals/utils", "@ember/debug", "@ember/-internals/glimmer"], function (_exports, _string_registry, _utils, _debug, _glimmer) {
   "use strict";
@@ -56220,7 +55651,7 @@ define("ember/version", ["exports"], function (_exports) {
     value: true
   });
   _exports.default = void 0;
-  var _default = "4.3.0-alpha.4";
+  var _default = "4.3.0-beta.1";
   _exports.default = _default;
 });
 define("route-recognizer", ["exports"], function (_exports) {
@@ -57187,18 +56618,25 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
     if (len && len > 0) {
       var obj = array[len - 1];
 
-      if (isQueryParams(obj)) {
+      if (isQueryParamsContainer(obj)) {
         queryParams = obj.queryParams;
         head = slice.call(array, 0, len - 1);
         return [head, queryParams];
       }
-    }
+    } // SAFETY: We confirmed that the last item isn't a QP container
+
 
     return [array, null];
-  }
+  } // TODO: Actually check that Dict is QueryParams
+
 
-  function isQueryParams(obj) {
-    return obj && hasOwnProperty.call(obj, 'queryParams');
+  function isQueryParamsContainer(obj) {
+    if (obj && typeof obj === 'object') {
+      var cast = obj;
+      return 'queryParams' in cast && Object.keys(cast.queryParams).every(k => typeof k === 'string');
+    }
+
+    return false;
   }
   /**
     @private
@@ -57717,14 +57155,16 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
         paramNames,
         context,
         route
-      } = info;
+      } = info; // SAFETY: This should be safe since it is just for use as a key
+
+      var key = info;
 
-      if (ROUTE_INFOS.has(info) && includeAttributes) {
-        var _routeInfo = ROUTE_INFOS.get(info);
+      if (ROUTE_INFOS.has(key) && includeAttributes) {
+        var _routeInfo = ROUTE_INFOS.get(key);
 
         _routeInfo = attachMetadata(route, _routeInfo);
         var routeInfoWithAttribute = createRouteInfoWithAttributes(_routeInfo, context);
-        ROUTE_INFOS.set(info, routeInfoWithAttribute);
+        ROUTE_INFOS.set(key, routeInfoWithAttribute);
         return routeInfoWithAttribute;
       }
 
@@ -57734,10 +57174,12 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
           var arr = [];
 
           if (predicate.length === 3) {
-            arr = routeInfos.map(info => ROUTE_INFOS.get(info));
+            arr = routeInfos.map( // SAFETY: This should be safe since it is just for use as a key
+            info => ROUTE_INFOS.get(info));
           }
 
           for (var _i = 0; routeInfos.length > _i; _i++) {
+            // SAFETY: This should be safe since it is just for use as a key
             publicInfo = ROUTE_INFOS.get(routeInfos[_i]);
 
             if (predicate.call(thisArg, publicInfo, _i, arr)) {
@@ -57765,7 +57207,8 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
 
           if (parent === undefined) {
             return null;
-          }
+          } // SAFETY: This should be safe since it is just for use as a key
+
 
           return ROUTE_INFOS.get(parent);
         },
@@ -57775,7 +57218,8 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
 
           if (child === undefined) {
             return null;
-          }
+          } // SAFETY: This should be safe since it is just for use as a key
+
 
           return ROUTE_INFOS.get(child);
         },
@@ -57797,7 +57241,8 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
 
       if (includeAttributes) {
         routeInfo = createRouteInfoWithAttributes(routeInfo, context);
-      }
+      } // SAFETY: This should be safe since it is just for use as a key
+
 
       ROUTE_INFOS.set(info, routeInfo);
       return routeInfo;
@@ -57889,13 +57334,15 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
 
       if ('context' in this || !contextsMatch) {
         context = resolvedContext;
-      }
+      } // SAFETY: Since this is just for lookup, it should be safe
+
 
       var cached = ROUTE_INFOS.get(this);
       var resolved = new ResolvedRouteInfo(this.router, this.name, this.paramNames, params, this.route, context);
 
       if (cached !== undefined) {
-        ROUTE_INFOS.set(resolved, cached);
+        // SAFETY: This is potentially a bit risker, but for what we're doing, it should be ok.
+        ROUTE_INFOS.set(this, cached);
       }
 
       return resolved;
@@ -57993,12 +57440,14 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
         // Ignore the fulfilled value returned from afterModel.
         // Return the value stashed in resolvedModels, which
         // might have been swapped out in afterModel.
+        // SAFTEY: We expect this to be of type T, though typing it as such is challenging.
         return transition.resolvedModels[name];
       });
     }
 
     stashResolvedModel(transition, resolvedModel) {
-      transition.resolvedModels = transition.resolvedModels || {};
+      transition.resolvedModels = transition.resolvedModels || {}; // SAFETY: It's unfortunate that we have to do this cast. It should be safe though.
+
       transition.resolvedModels[this.name] = resolvedModel;
     }
 
@@ -58052,7 +57501,10 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
     constructor(router, name, paramNames, params, route) {
       super(router, name, paramNames, route);
       this.params = {};
-      this.params = params;
+
+      if (params) {
+        this.params = params;
+      }
     }
 
     getModel(transition) {
@@ -58065,7 +57517,7 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
       }
 
       var route = this.route;
-      var result;
+      var result; // FIXME: Review these casts
 
       if (route.deserialize) {
         result = route.deserialize(fullParams, transition);
@@ -58112,6 +57564,8 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
       } = this;
 
       if (!model) {
+        // SAFETY: By the time we serialize, we expect to be resolved.
+        // This may not be an entirely safe assumption though no tests fail.
         model = context;
       }
 
@@ -58139,6 +57593,7 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
       var name = paramNames[0];
 
       if (/_id$/.test(name)) {
+        // SAFETY: Model is supposed to extend IModel already
         object[name] = model.id;
       } else {
         object[name] = model;
@@ -58150,14 +57605,14 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
   }
 
   function paramsMatch(a, b) {
-    if (!a !== !b) {
-      // Only one is null.
-      return false;
+    if (a === b) {
+      // Both are identical, may both be undefined
+      return true;
     }
 
-    if (!a) {
-      // Both must be null.
-      return true;
+    if (!a || !b) {
+      // Only one is undefined, already checked they aren't identical
+      return false;
     } // Note: this assumes that both params have the same
     // number of keys, but since we're comparing the
     // same routes, they should.
@@ -58201,7 +57656,8 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
     }
 
     var routeInfo = currentState.routeInfos[transition.resolveIndex];
-    return routeInfo.resolve(transition).then(proceed.bind(null, currentState, transition), null, currentState.promiseLabel('Proceed'));
+    var callback = proceed.bind(null, currentState, transition);
+    return routeInfo.resolve(transition).then(callback, null, currentState.promiseLabel('Proceed'));
   }
 
   function proceed(currentState, transition, resolvedRouteInfo) {
@@ -58260,9 +57716,11 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
         params[routeInfo.name] = routeInfo.params || {};
         return true;
       });
-      transition.resolveIndex = 0; // The prelude RSVP.resolve() async moves us into the promise land.
+      transition.resolveIndex = 0;
+      var callback = resolveOneRouteInfo.bind(null, this, transition);
+      var errorHandler = handleError.bind(null, this, transition); // The prelude RSVP.resolve() async moves us into the promise land.
 
-      return _rsvp.Promise.resolve(null, this.promiseLabel('Start transition')).then(resolveOneRouteInfo.bind(null, this, transition), null, this.promiseLabel('Resolve route')).catch(handleError.bind(null, this, transition), this.promiseLabel('Handle error')).then(() => this);
+      return _rsvp.Promise.resolve(null, this.promiseLabel('Start transition')).then(callback, null, this.promiseLabel('Resolve route')).catch(errorHandler, this.promiseLabel('Handle error')).then(() => this);
     }
 
   }
@@ -58300,10 +57758,7 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
     }
 
     applyToState(oldState, isIntermediate) {
-      // TODO: WTF fix me
-      var partitionedArgs = extractQueryParams([this.name].concat(this.contexts)),
-          pureArgs = partitionedArgs[0],
-          handlers = this.router.recognizer.handlersFor(pureArgs[0]);
+      var handlers = this.router.recognizer.handlersFor(this.name);
       var targetRouteName = handlers[handlers.length - 1].handler;
       return this.applyToHandlers(oldState, handlers, targetRouteName, isIntermediate, false);
     }
@@ -58347,7 +57802,8 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
           // If we're performing an isActive check, we want to
           // serialize URL params with the provided context, but
           // ignore mismatches between old and new context.
-          newHandlerInfo = newHandlerInfo.becomeResolved(null, newHandlerInfo.context);
+          newHandlerInfo = newHandlerInfo.becomeResolved(null, // SAFETY: This seems to imply that it would be resolved, but it's unclear if that's actually the case.
+          newHandlerInfo.context);
           var oldContext = oldHandlerInfo && oldHandlerInfo.context;
 
           if (result.names.length > 0 && oldHandlerInfo.context !== undefined && newHandlerInfo.context === oldContext) {
@@ -58368,7 +57824,8 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
         }
 
         if (isIntermediate && !checkingIfActive) {
-          handlerToUse = handlerToUse.becomeResolved(null, handlerToUse.context);
+          handlerToUse = handlerToUse.becomeResolved(null, // SAFETY: This seems to imply that it would be resolved, but it's unclear if that's actually the case.
+          handlerToUse.context);
         }
 
         newState.routeInfos.unshift(handlerToUse);
@@ -58425,7 +57882,7 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
       } else {
         if (this.preTransitionState) {
           var preTransitionHandlerInfo = this.preTransitionState.routeInfos[i];
-          objectToUse = preTransitionHandlerInfo && preTransitionHandlerInfo.context;
+          objectToUse = preTransitionHandlerInfo === null || preTransitionHandlerInfo === void 0 ? void 0 : preTransitionHandlerInfo.context;
         } else {
           // Ideally we should throw this error to provide maximal
           // information to the user that not enough context objects
@@ -58690,7 +58147,8 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
         if (queryParamChangelist) {
           var _newTransition = this.queryParamsTransition(queryParamChangelist, wasTransitioning, oldState, newState);
 
-          _newTransition.queryParamsOnly = true;
+          _newTransition.queryParamsOnly = true; // SAFETY: The returned OpaqueTransition should actually be this.
+
           return _newTransition;
         } // No-op. No need to create a new transition.
 
@@ -58760,6 +58218,8 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
       var queryParams = {};
 
       if (lastArg !== undefined && lastArg.hasOwnProperty('queryParams')) {
+        // We just checked this.
+        // TODO: Use an assertion?
         queryParams = modelsArray.pop().queryParams;
       }
 
@@ -58778,7 +58238,8 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
         intent = new URLTransitionIntent(this, name);
       } else {
         log(this, 'Attempting transition to ' + name);
-        intent = new NamedTransitionIntent(this, name, undefined, modelsArray, queryParams);
+        intent = new NamedTransitionIntent(this, name, undefined, // SAFETY: We know this to be the case since we removed the last item if it was QPs
+        modelsArray, queryParams);
       }
 
       return this.transitionByIntent(intent, isIntermediate);
@@ -59400,8 +58861,8 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
         args[_key6 - 1] = arguments[_key6];
       }
 
-      var partitionedArgs = extractQueryParams(args);
-      return this.isActiveIntent(routeName, partitionedArgs[0], partitionedArgs[1]);
+      var [contexts, queryParams] = extractQueryParams(args);
+      return this.isActiveIntent(routeName, contexts, queryParams);
     }
 
     trigger(name) {
@@ -59420,6 +58881,7 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
     }
 
     for (var i = 0, len = routeInfos.length; i < len; ++i) {
+      // SAFETY: Just casting for comparison
       if (routeInfos[i] !== otherRouteInfos[i]) {
         return false;
       }
@@ -59447,10 +58909,13 @@ define("router_js", ["exports", "rsvp", "route-recognizer"], function (_exports,
   }
 
   function paramsEqual(params, otherParams) {
-    if (!params && !otherParams) {
+    if (params === otherParams) {
+      // Both identical or both undefined
       return true;
-    } else if (!params && !!otherParams || !!params && !otherParams) {
-      // one is falsy but other is not;
+    }
+
+    if (!params || !otherParams) {
+      // One is falsy but other is not
       return false;
     }