fixes #70

Author: RobinBuschmann

lib/services/scopes.ts

@@ -46,9 +46,14 @@ export function getScopeOptions(target: any): IScopeOptions | undefined {
 /**
  * Resolves scope
  */
-function resolveScope(scopeName: string, model: typeof Model, options: IScopeFindOptions | undefined): void {
+function resolveScope(scopeName: string, model: typeof Model, options: IScopeFindOptions | Function | undefined): void {
   resolveModelGetter(options);
-  options = inferAlias(options, model);
+  if (typeof options === 'function') {
+    const fn: Function = options;
+    options = (...args: any[]) => inferAlias(fn(...args), model);
+  } else {
+    options = inferAlias(options, model);
+  }
   model.addScope(scopeName, options as IFindOptions, {override: true});
 }
 

test/models/ShoeWithScopes.ts

@@ -22,6 +22,11 @@ export const SHOE_SCOPES = {
   primaryColor: primaryColor => ({
       where: {primaryColor}
     }
+  ),
+  primaryColorWithManufacturer: primaryColor => ({
+      include: [Manufacturer],
+      where: {primaryColor},
+    }
   )
 };
 

test/specs/scopes.spec.ts

@@ -198,18 +198,28 @@ describe('scopes', () => {
 
     });
 
-    // describe('with scope function', () => {
-    //
-    //   it('should consider nested scope', () =>
-    //     ShoeWithScopes
-    //       .scope({method: ['primaryColor', 'yellow']})
-    //       .findOne()
-    //       .then(shoe => {
-    //         expect(shoe).to.have.property('primaryColor', 'yellow');
-    //       })
-    //   );
-    //
-    // });
+    describe('with scope function', () => {
+
+      it('should find appropriate shoe due to correctly passed scope function param', () =>
+        ShoeWithScopes
+          .scope({method: ['primaryColor', 'red']})
+          .findOne()
+          .then(shoe => {
+            expect(shoe).to.have.property('primaryColor', 'red');
+          })
+      );
+
+      it('should find appropriate shoe due to correctly passed scope function param including associated model', () =>
+        ShoeWithScopes
+          .scope({method: ['primaryColorWithManufacturer', 'red']})
+          .findOne()
+          .then(shoe => {
+            expect(shoe).to.have.property('primaryColor', 'red');
+            expect(shoe).to.have.property('manufacturer').that.is.an('object');
+          })
+      );
+
+    });
 
   });