Update Version

CHANGELOG.md

@@ -12,6 +12,12 @@
 
 ---
 
+## [v0.2.0](https://github.com/foxifyjs/odin/releases/tag/v0.2.0) - *(2018-11-14)*
+
+- :zap: Added more advanced filtering ability to queries and joins
+- :zap: Added `numeral` to `String` schema type
+- :zap: Added `enum` to `String` schema type
+
 ## [v0.1.0](https://github.com/foxifyjs/odin/releases/tag/v0.1.0) - *(2018-10-20)*
 
 - :zap: Added model hook `created`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foxify/odin",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "Active Record Model",
   "author": "Ardalan Amini <ardalanamini22@gmail.com> [https://github.com/ardalanamini]",
   "contributors": [
@@ -43,10 +43,10 @@
     "@types/graphql": "^0.13.4",
     "@types/graphql-iso-date": "^3.3.1",
     "@types/mongodb": "^3.1.14",
-    "@types/node": "^10.12.3",
+    "@types/node": "^10.12.7",
     "async": "^2.6.1",
     "caller-id": "^0.1.0",
-    "deasync": "^0.1.13",
+    "deasync": "^0.1.14",
     "graphql": "^0.13.2",
     "graphql-iso-date": "^3.6.1",
     "mongodb": "^3.1.9",
@@ -63,7 +63,7 @@
     "dotenv": "^6.1.0",
     "fs-readdir-recursive": "^1.1.0",
     "jest": "^23.6.0",
-    "mongodb-memory-server": "^2.7.0",
+    "mongodb-memory-server": "^2.7.2",
     "rimraf": "^2.6.2",
     "ts-jest": "^23.10.4",
     "tslint": "^5.11.0",

src/DB.ts

@@ -56,6 +56,7 @@ class DB<T = any, D extends Driver<T> = any, A = undefined> {
 
   /******************************* Where Clauses ******************************/
 
+  public where(query: Driver.FilterQuery): this;
   public where(field: string, value: any): this;
   public where(field: string, operator: Driver.Operator, value: any): this;
   public where() {
@@ -66,6 +67,7 @@ class DB<T = any, D extends Driver<T> = any, A = undefined> {
     return this;
   }
 
+  public orWhere(query: Driver.FilterQuery): this;
   public orWhere(field: string, value: any): this;
   public orWhere(field: string, operator: Driver.Operator, value: any): this;
   public orWhere() {

src/Model.ts

@@ -20,7 +20,6 @@ class Model<T extends object = {}> extends Base<T>
   implements QueryBuilder<T>, Relational, GraphQLInstance {
   public static DB = DB;
   public static GraphQL = GraphQL;
-  public static Types = Types;
   public static connections = connections;
 
   public static connection: Odin.Connection = "default";
@@ -44,9 +43,8 @@ class Model<T extends object = {}> extends Base<T>
   }
 
   private static get _schema() {
-    // TODO: id
     const schema: Odin.Schema = {
-      id: this.Types.ObjectId,
+      id: this.Types.Id,
       ...this.schema,
     };
 
@@ -61,6 +59,10 @@ class Model<T extends object = {}> extends Base<T>
     return schema;
   }
 
+  public static get Types() {
+    return new Types(this.driver);
+  }
+
   public static get driver() {
     return getConnection(this.connection).driver;
   }

src/base/QueryBuilder.ts

@@ -29,7 +29,7 @@ class QueryBuilder<T extends object = {}> extends Base<T> {
       throw new TypeError("Expected at least one 'relation', got none");
 
     return this.query(relations.map((name) => {
-      let query = (this.prototype as any)[name] as any;
+      let query = (this.prototype as any)[name] as Relation;
 
       if (!utils.function.isFunction(query))
         throw new Error(`Relation '${name}' does not exist on '${this.name}' Model`);
@@ -53,10 +53,11 @@ class QueryBuilder<T extends object = {}> extends Base<T> {
 
   /******************************* Where Clauses ******************************/
 
+  public static where<T extends object>(query: Driver.FilterQuery): Query<T>;
   public static where<T extends object>(field: string, value: any): Query<T>;
   public static where<T extends object>(
     field: string, operator: Driver.Operator, value: any): Query<T>;
-  public static where(field: string, operator: Driver.Operator | any, value?: any) {
+  public static where(field: any, operator?: Driver.Operator | any, value?: any) {
     return this.query().where(field, operator, value);
   }
 

src/drivers/Driver.ts

@@ -1,28 +1,53 @@
-import * as mongodb from "mongodb";
 import * as connections from "../connections";
 
-module Driver {
+namespace Driver {
   export type Callback<T = any> = (error: Error, result: T) => void;
 
   export type Operator = "<" | "<=" | "=" | "<>" | ">=" | ">";
 
   export type Order = "asc" | "desc";
 
-  export type Id = number | mongodb.ObjectId;
+  export type Id = number | string;
 
-  export interface GroupQueryObject<T = any> {
-    having: (field: string, operator: Operator | any, value?: any) => GroupQueryObject<T>;
+  export interface Filter {
+    where(query: FilterQuery): this;
+    where(field: string, value: any): this;
+    where(field: string, operator: Driver.Operator, value: any): this;
+
+    orWhere(query: FilterQuery): this;
+    orWhere(field: string, value: any): this;
+    orWhere(field: string, operator: Driver.Operator, value: any): this;
+
+    whereLike(field: string, value: any): this;
+
+    whereNotLike(field: string, value: any): this;
+
+    whereIn(field: string, values: any[]): this;
+
+    whereNotIn(field: string, values: any[]): this;
+
+    whereBetween(field: string, start: any, end: any): this;
+
+    whereNotBetween(field: string, start: any, end: any): this;
+
+    whereNull(field: string): this;
+
+    whereNotNull(field: string): this;
   }
 
-  export type GroupQuery<T = any> = (query: GroupQueryObject<T>) => void;
+  export type FilterQuery = (query: Filter) => Filter;
 
-  export interface JoinQueryObject<T = any> {
-    on: (field: string, operator: Operator | any, value?: any) => JoinQueryObject<T>;
+  export interface Join<T = any> extends Filter {
+    join(table: string, query?: Driver.JoinQuery<T>, as?: string): this;
   }
 
-  export type JoinQuery<T = any> = (query: JoinQueryObject<T>) => void;
+  export type JoinQuery<T = any> = (query: Join<T>) => Join<T>;
+
+  export interface GroupQueryObject<T = any> {
+    having: (field: string, operator: Operator | any, value?: any) => GroupQueryObject<T>;
+  }
 
-  export type WhereQuery<T = any> = (query: Driver<T>) => Driver<T>;
+  export type GroupQuery<T = any> = (query: GroupQueryObject<T>) => void;
 
   export type Mapper<T = any> = (item: T, index: number, items: T[]) => any;
 }
@@ -44,11 +69,11 @@ abstract class Driver<T = any> {
 
   /******************************* Where Clauses ******************************/
 
-  // abstract where(query: Driver.WhereQuery): this;
+  public abstract where(query: Driver.FilterQuery): this;
   public abstract where(field: string, value: any): this;
   public abstract where(field: string, operator: Driver.Operator, value: any): this;
 
-  // abstract orWhere(query: Driver.WhereQuery): this;
+  public abstract orWhere(query: Driver.FilterQuery): this;
   public abstract orWhere(field: string, value: any): this;
   public abstract orWhere(field: string, operator: Driver.Operator, value: any): this;