feat: Assert "Cannot pass QPs object in @models and @query at same time

Alonski · Oct 4, 2019 · fc7cb2d · fc7cb2d
1 parent 4dc4c53
commit fc7cb2d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -3,6 +3,7 @@
 */
 
 import { alias, computed } from '@ember/-internals/metal';
+import { isQueryParams } from '@ember/-internals/routing/lib/system/query_params';
 import { isSimpleClick } from '@ember/-internals/views';
 import { assert, warn } from '@ember/debug';
 import { flaggedInstrument } from '@ember/instrumentation';
@@ -838,14 +839,21 @@ const LinkComponent = EmberComponent.extend({
         )
       );
 
-      let { _models: models } = this;
-      if (models.length > 0) {
-        let lastModel = models[models.length - 1];
+      if (this.query === UNDEFINED) {
+        let { _models: models } = this;
+        if (models.length > 0) {
+          let lastModel = models[models.length - 1];
 
-        if (typeof lastModel === 'object' && lastModel !== null && lastModel.isQueryParams) {
-          this.query = lastModel.values;
-          models.pop();
+          if (typeof lastModel === 'object' && lastModel !== null && lastModel.isQueryParams) {
+            this.query = lastModel.values;
+            models.pop();
+          }
         }
+      } else {
+        assert(
+          'Cannot pass a QueryParams object in @models and @query at the same time',
+          !(this.models.length === 0 || isQueryParams(this.models[this.models.length - 1]))
+        );
       }
 
       return;

diff --git a/packages/@ember/-internals/routing/lib/system/query_params.ts b/packages/@ember/-internals/routing/lib/system/query_params.ts
@@ -1,7 +1,13 @@
+import { Option } from '@glimmer/interfaces';
+
 export default class QueryParams {
   values: null | object;
   isQueryParams = true;
-  constructor(values = null) {
+  constructor(values: Option<object> = null) {
     this.values = values;
   }
 }
+
+export function isQueryParams(obj: unknown): obj is QueryParams {
+  return typeof obj === 'object' && obj !== null && obj['isQueryParams'] === true;
+}