Merge pull request #1590 from seanhess/master

RethinkDB and SVGJS tweaks

lodash/lodash.d.ts

@@ -3825,3 +3825,7 @@ declare module _ {
 		[index: string]: T;
 	}
 }
+
+declare module "lodash" {
+	export = _;
+}

rethinkdb/rethinkdb.d.ts

@@ -26,6 +26,12 @@ declare module "rethinkdb" {
   export function row(name:string):Expression<any>;
   export function expr(stuff:any):Expression<any>;
 
+  export function now():Time;
+
+  // Control Structures
+  export function branch(test:Expression<boolean>, trueBranch:Expression<any>, falseBranch:Expression<any>):Expression<any>;
+
+
   export class Cursor {
     hasNext():boolean;
     each(cb:(err:Error, row:any)=>void, done?:()=>void);
@@ -83,9 +89,9 @@ declare module "rethinkdb" {
     insert(obj:any[], options?:InsertOptions):Operation<WriteResult>;
     insert(obj:any, options?:InsertOptions):Operation<WriteResult>;
 
-    get(key:string):Expression<any>; // primary key
-    getAll(key:string, index?:Index):Selection; // without index defaults to primary key
-    getAll(...keys:string[]):Selection;
+    get(key:string):Sequence; // primary key
+    getAll(key:string, index?:Index):Sequence; // without index defaults to primary key
+    getAll(...keys:string[]):Sequence;
   }
 
   interface Sequence extends Operation<Cursor>, Writeable {
@@ -98,8 +104,8 @@ declare module "rethinkdb" {
 
     // Join
     // these return left, right
-    innerJoin(sequence:Sequence, join:ExpressionFunction<boolean>):Sequence;
-    outerJoin(sequence:Sequence, join:ExpressionFunction<boolean>):Sequence;
+    innerJoin(sequence:Sequence, join:JoinFunction<boolean>):Sequence;
+    outerJoin(sequence:Sequence, join:JoinFunction<boolean>):Sequence;
     eqJoin(leftAttribute:string, rightSequence:Sequence, index?:Index):Sequence;
     eqJoin(leftAttribute:ExpressionFunction<any>, rightSequence:Sequence, index?:Index):Sequence;
     zip():Sequence;
@@ -120,10 +126,10 @@ declare module "rethinkdb" {
     sample(n:number):Sequence;
 
     // Aggregate
-    reduce(r:Reduce, base?:any):Expression<any>;
+    reduce(r:ReduceFunction<any>, base?:any):Expression<any>;
     count():Expression<number>;
     distinct():Sequence;
-    groupedMapReduce(group:ExpressionFunction<any>, map:ExpressionFunction<any>, reduce:Reduce, base?:any):Expression<any>;
+    groupedMapReduce(group:ExpressionFunction<any>, map:ExpressionFunction<any>, reduce:ReduceFunction<any>, base?:any):Sequence;
     groupBy(...aggregators:Aggregator[]):Expression<Object>; // TODO: reduction object
     contains(prop:string):Expression<boolean>;
 
@@ -133,11 +139,15 @@ declare module "rethinkdb" {
   }
 
   interface ExpressionFunction<U> {
-    (...docs:Expression<any>[]):Expression<U>; 
+    (doc:Expression<any>):Expression<U>; 
   }
 
-  interface Reduce {
-    (acc:any, val:any):any;
+  interface JoinFunction<U> {
+    (left:Expression<any>, right:Expression<any>):Expression<U>; 
+  }
+
+  interface ReduceFunction<U> {
+    (acc:Expression<any>, val:Expression<any>):Expression<U>;
   }
 
   interface InsertOptions {
@@ -178,8 +188,8 @@ declare module "rethinkdb" {
 
   interface Index {
     index: string;
-    left_bound: string; // 'closed'
-    right_bound: string; // 'open'
+    left_bound?: string; // 'closed'
+    right_bound?: string; // 'open'
   }
 
   interface Expression<T> extends Writeable, Operation<T> {
@@ -204,6 +214,10 @@ declare module "rethinkdb" {
       mul(n:number):Expression<number>;
       div(n:number):Expression<number>;
       mod(n:number):Expression<number>;
+
+      hasFields(...fields:string[]):Expression<boolean>;
+
+      default(value:T):Expression<T>;
   }
 
   interface Operation<T> {
@@ -213,6 +227,8 @@ declare module "rethinkdb" {
   interface Aggregator {}
   interface Sort {}
 
+  interface Time {}
+
 
   // http://www.rethinkdb.com/api/#js
   // TODO control structures

svgjs/svgjs.d.ts

@@ -38,7 +38,36 @@ declare module svgjs {
         mask():Mask;
 
         // TODO gradients
-    }    
+    }
+
+
+    // https://github.com/wout/svg.filter.js
+    export interface Filter {
+        gaussianBlur(values:string):Filter;
+        colorMatrix(name:string, value:number):Filter;
+        colorMatrix(name:string, matrix:number[]):Filter;
+        componentTransfer(components:{rgb?: FilterComponentTransfer; g?: FilterComponentTransfer;}):Filter;
+        offset(x:number, y:number):Filter;
+        blend():Filter;
+        in(source:FilterSource):Filter;
+        sourceAlpha:FilterSource;
+        source:FilterSource;
+    } 
+
+    export interface FilterSource {
+
+    }
+
+
+    export interface FilterComponentTransfer {
+        type: string;
+        tableValues?: string;
+        slope?: number;
+        intercept: number;
+        amplitude: number;
+        exponent: number;
+        offset: number;
+    }
 
     export interface Element extends Text, Parent {
         node:LinkedHTMLElement;
@@ -48,9 +77,10 @@ declare module svgjs {
         animate(duration?:number, ease?:string, delay?:number):Animation;
         animate(info:{ease?:string; duration?:number; delay?:number}):Animation;
 
-        attr(name:string, value:any, namespace?:string):Element;
-        attr(obj:Object):Element;
         attr(name:string):any;
+        attr(obj:Object):Element;
+        attr(name:string, value:any, namespace?:string):Element;
+
         viewbox():Viewbox;
         viewbox(x:number, y:number, w:number, h:number):Element;
         viewbox(obj:Viewbox):Element;
@@ -71,6 +101,7 @@ declare module svgjs {
         remove():void;
 
         each(iterator:(i?:number, children?:Element[])=>void, deep?:boolean):void;
+        filter(adder:(filter:Filter)=>void):Element;        
 
         transform(t:Transform):Element;
         
@@ -204,6 +235,12 @@ declare module svgjs {
 
     export interface RBox extends BBox {}
 
+    export interface Attributes {
+        (name:string, value:any):void;
+        (obj:Object):void;
+        (name:string):any;
+    }
+
     export interface Viewbox {
         x: number;
         y: number;