Add where to or/and operators (#132)

eseliger · web-flow · commit 6149b2dea8be · 2017-09-26T15:18:21.000-07:00
diff --git a/lib/model.d.ts b/lib/model.d.ts
@@ -202,12 +202,12 @@ export interface WhereOperators {
 
 /** Example: `$or: [{a: 5}, {a: 6}]` becomes `(a = 5 OR a = 6)` */
 export interface OrOperator {
-  $or: WhereOperators | WhereAttributeHash | Array<Array<string> | Array<number> | WhereOperators | WhereAttributeHash>;
+  $or: WhereOperators | WhereAttributeHash | Array<Array<string> | Array<number> | WhereOperators | WhereAttributeHash | Where | AndOperator>;
 }
 
 /** Example: `$and: {a: 5}` becomes `AND (a = 5)` */
 export interface AndOperator {
-  $and: WhereOperators | WhereAttributeHash | Array<Array<string> | Array<number> | WhereOperators | WhereAttributeHash>;
+  $and: WhereOperators | WhereAttributeHash | Array<Array<string> | Array<number> | WhereOperators | WhereAttributeHash | Where | OrOperator>;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -202,12 +202,12 @@ export interface WhereOperators {`
`202`	`202`
`203`	`203`	/** Example: `$or: [{a: 5}, {a: 6}]` becomes `(a = 5 OR a = 6)` */
`204`	`204`	`export interface OrOperator {`
`205`		`- $or: WhereOperators \| WhereAttributeHash \| Array<Array<string> \| Array<number> \| WhereOperators \| WhereAttributeHash>;`
	`205`	`+ $or: WhereOperators \| WhereAttributeHash \| Array<Array<string> \| Array<number> \| WhereOperators \| WhereAttributeHash \| Where \| AndOperator>;`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	/** Example: `$and: {a: 5}` becomes `AND (a = 5)` */
`209`	`209`	`export interface AndOperator {`
`210`		`- $and: WhereOperators \| WhereAttributeHash \| Array<Array<string> \| Array<number> \| WhereOperators \| WhereAttributeHash>;`
	`210`	`+ $and: WhereOperators \| WhereAttributeHash \| Array<Array<string> \| Array<number> \| WhereOperators \| WhereAttributeHash \| Where \| OrOperator>;`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`/**`