feat: add chainable query interface

feat: add #includes() to query class

refactor: move repeatable logic to built in middleware and simplify controller actions

feat: add chainable query interface

refactor: remove half-baked polymorphism

.babelrc

@@ -5,8 +5,6 @@
   "plugins": [
     "syntax-flow",
     "syntax-trailing-function-commas",
-    "transform-decorators-legacy",
-    "transform-flow-strip-types",
-    "transform-decorators"
+    "transform-flow-strip-types"
   ]
 }

.eslintrc.json

@@ -10,6 +10,7 @@
 		"Map": true,
 		"Set": true,
 		"Promise": true,
+    "Proxy": true,
 		"Symbol": true,
 		"WeakMap": true,
     "Iterable": true,

README.md

@@ -96,7 +96,7 @@ With Lux your code from before can now look like this:
 ```javascript
 class PostsController extends Controller {
   index(req, res) {
-    return Post.findAll();
+    return Post.all();
   }
 }
 ```

decl/http.js

@@ -6,6 +6,8 @@ import {
 
 import { Model } from '../src/packages/database';
 
+import type Route from '../src/packages/route';
+
 type params = {
   data?: {
     id: number | string | Buffer;
@@ -17,18 +19,20 @@ type params = {
   fields: Object;
   filter: Object;
   id?: number | string | Buffer;
-  include: Array<string>;
+  include: Array<string> | Object;
   limit: number;
   page: number;
-  sort: string;
+  sort: string | [string, string];
 };
 
 declare module 'http' {
   declare class Server extends http$Server {}
 
   declare class IncomingMessage extends http$IncomingMessage {
+    route?: Route;
     params: params;
     record?: Model;
+    method: string;
 
     parsedURL: {
       protocol?: string;

examples/social-network/.babelrc

@@ -1,10 +1,3 @@
 {
-  "presets": [
-    "es2015",
-    "stage-1"
-  ],
-  "plugins": [
-    "transform-runtime",
-    "transform-decorators-legacy"
-  ]
-}
+  "presets": ["lux"]
+}

examples/social-network/app/controllers/application.js

@@ -1,11 +1,7 @@
 import { Controller } from 'lux-framework';
 
-import authenticate from '../middleware/authenticate';
-
 class ApplicationController extends Controller {
-  beforeAction = [
-    authenticate
-  ];
+
 }
 
 export default ApplicationController;

examples/social-network/app/controllers/comments.js

@@ -1,16 +1,10 @@
 import { Controller } from 'lux-framework';
 
-import setUser from '../middleware/set-user';
-
 class CommentsController extends Controller {
   params = [
     'message',
     'edited'
   ];
-
-  beforeAction = [
-    setUser
-  ];
 }
 
 export default CommentsController;

examples/social-network/app/controllers/posts.js

@@ -1,17 +1,11 @@
 import { Controller } from 'lux-framework';
 
-import setUser from '../middleware/set-user';
-
 class PostsController extends Controller {
   params = [
     'body',
     'title',
     'isPublic'
   ];
-
-  beforeAction = [
-    setUser
-  ];
 }
 
 export default PostsController;

examples/social-network/app/controllers/reactions.js

@@ -1,15 +1,9 @@
 import { Controller } from 'lux-framework';
 
-import setUser from '../middleware/set-user';
-
 class ReactionsController extends Controller {
   params = [
     'type'
   ];
-
-  beforeAction = [
-    setUser
-  ];
 }
 
 export default ReactionsController;

examples/social-network/app/controllers/users.js

@@ -1,56 +1,11 @@
-import { Controller, action } from 'lux-framework';
-
-import User from '../models/user';
+import { Controller } from 'lux-framework';
 
 class UsersController extends Controller {
   params = [
     'name',
     'email',
     'password'
   ];
-
-  @action
-  async login(req, res) {
-    const {
-      session,
-
-      params: {
-        data: {
-          attributes: {
-            email,
-            password
-          }
-        }
-      }
-    } = req;
-
-    const user = await User.authenticate(email, password);
-
-    if (user) {
-      session.set('currentUserId', user.id);
-    }
-
-    return {
-      data: user
-    };
-  }
-
-  @action
-  logout(req, res) {
-    const {
-      session,
-
-      session: {
-        isAuthenticated
-      }
-    } = req;
-
-    if (isAuthenticated) {
-      session.delete('currentUserId');
-    }
-
-    return isAuthenticated;
-  }
 }
 
 export default UsersController;

examples/social-network/app/index.js

@@ -1,6 +1,6 @@
-import Lux from 'lux-framework';
+import { Application } from 'lux-framework';
 
-class SocialNetwork extends Lux {
+class SocialNetwork extends Application {
 
 }
 

examples/social-network/app/models/comment.js

@@ -14,6 +14,10 @@ class Comment extends Model {
   };
 
   static hasMany = {
+    actions: {
+      inverse: 'trackable'
+    },
+
     reactions: {
       inverse: 'comment'
     }

examples/social-network/app/routes.js

@@ -1,20 +1,10 @@
-export default (route, resource) => {
+export default function routes(route, resource) {
   resource('comments');
   resource('friendships');
   resource('posts');
   resource('reactions');
   resource('users');
 
-  route('users/login', {
-    method: 'POST',
-    action: 'login'
-  });
-
-  route('users/logout', {
-    method: 'DELETE',
-    action: 'logout'
-  });
-
   route('actions', {
     method: 'GET',
     action: 'index'
@@ -34,4 +24,4 @@ export default (route, resource) => {
     method: 'GET',
     action: 'show'
   });
-};
+}

examples/social-network/app/serializers/actions.js

@@ -1,10 +1,7 @@
 import { Serializer } from 'lux-framework';
 
 class ActionsSerializer extends Serializer {
-  attributes = [
-    'trackableId',
-    'trackableType'
-  ];
+
 }
 
 export default ActionsSerializer;

examples/social-network/config/environments/development.js

@@ -1,6 +1,3 @@
 export default {
-  log: true,
-  domain: 'http://localhost:4000',
-  sessionKey: 'social-network::development::session',
-  sessionSecret: 'a6d027382e6c6405674d951fe4e39d50c567020dee231938de063524d339c758'
+  log: true
 };

examples/social-network/config/environments/production.js

@@ -1,6 +1,3 @@
 export default {
-  log: false,
-  domain: 'http://localhost:4000',
-  sessionKey: 'social-network::session',
-  sessionSecret: 'd54dc706d6b7f4f88ddefab178ec8e4370d3ba12d977d8aaff36b782402c207c'
-};
+  log: false
+};

examples/social-network/config/environments/test.js

@@ -1,6 +1,3 @@
 export default {
-  log: true,
-  domain: 'http://localhost:4000',
-  sessionKey: 'social-network::test::session',
-  sessionSecret: 'a893efc5d2677a5aa8dc5adb599f4eee2ea660b426b6c053123eaab28c01ebff'
-};
+  log: false
+};

examples/social-network/db/seed.js

@@ -4,6 +4,7 @@ import Comment from '../app/models/comment';
 import Post from '../app/models/post';
 import Reaction from '../app/models/reaction';
 import User from '../app/models/user';
+import Friendship from '../app/models/friendship';
 
 import range from '../app/utils/range';
 
@@ -18,7 +19,7 @@ const {
   }
 } = faker;
 
-export default async () => {
+export default async function seed() {
   await Promise.all(
     [...range(1, 100)].map(() => {
       return User.create({
@@ -29,6 +30,15 @@ export default async () => {
     })
   );
 
+  await Promise.all(
+    [...range(1, 100)].map(() => {
+      return Friendship.create({
+        userId: randomize([...range(1, 100)]),
+        friendId: randomize([...range(1, 100)])
+      });
+    })
+  );
+
   await Promise.all(
     [...range(1, 100)].map(() => {
       return Post.create({