From c60d8a62d901b6dbcfc4f35760e07955c282468e Mon Sep 17 00:00:00 2001
From: lifeart <lifeart92@gmail.com>
Date: Sun, 24 Jun 2018 00:45:02 +0300
Subject: [PATCH 1/4] queryParam types

---
 types/ember/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index 2c9c3c8b7e..bb1a84b8c1 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -111,6 +111,7 @@ declare module 'ember' {
         | 'render'
         | 'afterRender'
         | 'destroy';
+    type QueryParamTypes = 'boolean' | 'number' | 'array' | 'string';
 
     type ObserverMethod<Target, Sender> =
         | (keyof Target)
@@ -738,7 +739,7 @@ declare module 'ember' {
             replaceRoute(name: string, ...args: any[]): void;
             transitionToRoute(name: string, ...args: any[]): void;
             model: any;
-            queryParams: string[] | Array<{ [key: string]: { type: string } }>;
+            queryParams: string[] | Array<{ [key: string]: { type: QueryParamTypes } }>;
             target: Object;
         }
         const ControllerMixin: Ember.Mixin<ControllerMixin>;

From b5029250d5649e9934fed1b0a3508c77cbb090ad Mon Sep 17 00:00:00 2001
From: lifeart <lifeart92@gmail.com>
Date: Mon, 25 Jun 2018 21:05:47 +0300
Subject: [PATCH 2/4] updates from pr

---
 types/ember/index.d.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index bb1a84b8c1..c664b5fce0 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -739,7 +739,11 @@ declare module 'ember' {
             replaceRoute(name: string, ...args: any[]): void;
             transitionToRoute(name: string, ...args: any[]): void;
             model: any;
-            queryParams: string[] | Array<{ [key: string]: { type: QueryParamTypes } }>;
+            queryParams: string | string[] | Array<{ [key: string]: { 
+                type?: QueryParamTypes,
+                scope?: string,
+                as?: string
+            }}>;
             target: Object;
         }
         const ControllerMixin: Ember.Mixin<ControllerMixin>;

From 098f425b7c3ddc7dfe8139431923751bfa5a8715 Mon Sep 17 00:00:00 2001
From: lifeart <lifeart92@gmail.com>
Date: Mon, 25 Jun 2018 21:27:33 +0300
Subject: [PATCH 3/4] Extended scope types

https://github.com/emberjs/ember.js/blob/4790fb207c13bdb259451bd5236d572950040ca7/packages/ember-routing/lib/system/route.js#L200
---
 types/ember/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index c664b5fce0..0fb4d446fc 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -112,6 +112,7 @@ declare module 'ember' {
         | 'afterRender'
         | 'destroy';
     type QueryParamTypes = 'boolean' | 'number' | 'array' | 'string';
+    type QueryParamScopeTypes = 'controller' | 'model';
 
     type ObserverMethod<Target, Sender> =
         | (keyof Target)
@@ -741,7 +742,7 @@ declare module 'ember' {
             model: any;
             queryParams: string | string[] | Array<{ [key: string]: { 
                 type?: QueryParamTypes,
-                scope?: string,
+                scope?: QueryParamScopeTypes,
                 as?: string
             }}>;
             target: Object;

From d2b9ad9204c5bc2f76512432b4c9a6c04cc68c2d Mon Sep 17 00:00:00 2001
From: lifeart <lifeart92@gmail.com>
Date: Mon, 25 Jun 2018 21:44:49 +0300
Subject: [PATCH 4/4] linter fix

---
 types/ember/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index 0fb4d446fc..29940fc201 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -740,7 +740,7 @@ declare module 'ember' {
             replaceRoute(name: string, ...args: any[]): void;
             transitionToRoute(name: string, ...args: any[]): void;
             model: any;
-            queryParams: string | string[] | Array<{ [key: string]: { 
+            queryParams: string | string[] | Array<{ [key: string]: {
                 type?: QueryParamTypes,
                 scope?: QueryParamScopeTypes,
                 as?: string