From 9426f5677a424de81629d86447d447135a33eedb Mon Sep 17 00:00:00 2001
From: Sean Clark Hess <seanhess@gmail.com>
Date: Thu, 23 Jan 2014 10:19:31 -0700
Subject: [PATCH] 0.9.5 changes to lodash, rethinkdb, and svgjs

---
 lodash/lodash.d.ts       |  4 ++++
 rethinkdb/rethinkdb.d.ts | 18 +++++++++++-------
 svgjs/svgjs.d.ts         |  5 +++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts
index 68ee4f8df..97aeab757 100644
--- a/lodash/lodash.d.ts
+++ b/lodash/lodash.d.ts
@@ -3825,3 +3825,7 @@ declare module _ {
 		[index: string]: T;
 	}
 }
+
+declare module "lodash" {
+	export = _;
+}
diff --git a/rethinkdb/rethinkdb.d.ts b/rethinkdb/rethinkdb.d.ts
index 002ee824c..2c65a7cf4 100644
--- a/rethinkdb/rethinkdb.d.ts
+++ b/rethinkdb/rethinkdb.d.ts
@@ -104,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;
@@ -126,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):Sequence;
+    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>;
 
@@ -139,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 {
diff --git a/svgjs/svgjs.d.ts b/svgjs/svgjs.d.ts
index 8a3af1d68..5ff8303ff 100644
--- a/svgjs/svgjs.d.ts
+++ b/svgjs/svgjs.d.ts
@@ -77,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;