From 75ffb8e47dfe51b8d4c1c33410e542f433c557c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksandar=20Rodi=C4=87?= <alec.rodic@gmail.com>
Date: Sat, 11 Mar 2017 00:09:55 +0100
Subject: [PATCH] Changing 'scope' definition (#14810)

current definition
```ts
scope(options?: string | string[] | ScopeOptions | WhereOptions): this;
```
doesn't allow are valid calls. example from [documentation](http://docs.sequelizejs.com/en/latest/docs/scopes/):
```ts
Project.scope('random', { method: ['accessLevel', 19]}).findAll();
```
changing it to
```ts
scope(options?: string | ScopeOptions | WhereOptions | Array<string|ScopeOptions|WhereOptions>): this;
```
should fix the issue since, according to the docs
```ts
// These two are equivalent
Project.scope('deleted', 'activeUsers').findAll();
Project.scope(['deleted', 'activeUsers']).findAll();
```
---
 sequelize/index.d.ts            | 2 +-
 sequelize/sequelize-tests.ts    | 5 ++++-
 sequelize/v3/index.d.ts         | 2 +-
 sequelize/v3/sequelize-tests.ts | 5 ++++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sequelize/index.d.ts b/sequelize/index.d.ts
index ec41863261..c3dd68ec98 100644
--- a/sequelize/index.d.ts
+++ b/sequelize/index.d.ts
@@ -3671,7 +3671,7 @@ declare namespace sequelize {
  * @return Model A reference to the model, with the scope(s) applied. Calling scope again on the returned
  *     model will clear the previous scope.
  */
-        scope(options?: string | string[] | ScopeOptions | WhereOptions): this;
+        scope(options?: string | ScopeOptions | WhereOptions | Array<string | ScopeOptions | WhereOptions>): this;
 
         /**
          * Search for multiple instances.
diff --git a/sequelize/sequelize-tests.ts b/sequelize/sequelize-tests.ts
index 71e6203a82..ceff709a6b 100644
--- a/sequelize/sequelize-tests.ts
+++ b/sequelize/sequelize-tests.ts
@@ -853,11 +853,14 @@ User.schema( 'special' ).create( { age : 3 }, { logging : function(  ) {} } );
 User.getTableName();
 
 User.addScope('lowAccess', { where : { parent_id : 2 } });
-User.addScope('lowAccess', function() { } );
 User.addScope('lowAccess', { where : { parent_id : 2 } }, { override: true });
+User.addScope('lowAccessWithParam', function(id: number) {
+  return { where : { parent_id : id } }
+} );
 
 User.scope( 'lowAccess' ).count();
 User.scope( { where : { parent_id : 2 } } );
+User.scope( [ 'lowAccess', { method: ['lowAccessWithParam', 2] }, { where : { parent_id : 2 } } ] )
 
 User.findAll();
 User.findAll( { where : { data : { employment : null } } } );
diff --git a/sequelize/v3/index.d.ts b/sequelize/v3/index.d.ts
index fb73cd94bf..edb1bb2a6d 100644
--- a/sequelize/v3/index.d.ts
+++ b/sequelize/v3/index.d.ts
@@ -3648,7 +3648,7 @@ declare namespace sequelize {
  * @return Model A reference to the model, with the scope(s) applied. Calling scope again on the returned
  *     model will clear the previous scope.
  */
-        scope(options?: string | string[] | ScopeOptions | WhereOptions): this;
+        scope(options?: string | ScopeOptions | WhereOptions | Array<string | ScopeOptions | WhereOptions>): this;
 
         /**
          * Search for multiple instances.
diff --git a/sequelize/v3/sequelize-tests.ts b/sequelize/v3/sequelize-tests.ts
index ef90600e91..83c4536a71 100644
--- a/sequelize/v3/sequelize-tests.ts
+++ b/sequelize/v3/sequelize-tests.ts
@@ -840,11 +840,14 @@ User.schema( 'special' ).create( { age : 3 }, { logging : function(  ) {} } );
 User.getTableName();
 
 User.addScope('lowAccess', { where : { parent_id : 2 } });
-User.addScope('lowAccess', function() { } );
 User.addScope('lowAccess', { where : { parent_id : 2 } }, { override: true });
+User.addScope('lowAccessWithParam', function(id: number) {
+  return { where : { parent_id : id } }
+} );
 
 User.scope( 'lowAccess' ).count();
 User.scope( { where : { parent_id : 2 } } );
+User.scope( [ 'lowAccess', { method: ['lowAccessWithParam', 2] }, { where : { parent_id : 2 } } ] )
 
 User.findAll();
 User.findAll( { where : { data : { employment : null } } } );