merge acl-mongodbBackend.d.ts and acl-redisBackend.d.ts into acl.d.ts

CMTEST080 · Apr 29, 2015 · 6d64be2 · 6d64be2
1 parent 7faade2
commit 6d64be2
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 46 deletions.
diff --git a/acl/acl-mongodbBackend-tests.ts b/acl/acl-mongodbBackend-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path='acl-mongodbBackend.d.ts'/>
+/// <reference path='acl.d.ts'/>
 
 // https://github.com/OptimalBits/node_acl/blob/master/Readme.md
 import Acl = require('acl');
@@ -14,4 +14,3 @@ acl.allow('guest', 'blogs', 'view');
 
 // allow function accepts arrays as any parameter
 acl.allow('member', 'blogs', ['edit','view', 'delete']);
-
diff --git a/acl/acl-mongodbBackend.d.ts b/acl/acl-mongodbBackend.d.ts
diff --git a/acl/acl-redisBackend-test.ts b/acl/acl-redisBackend-test.ts
@@ -1,4 +1,4 @@
-/// <reference path='acl-redisBackend.d.ts'/>
+/// <reference path='acl.d.ts'/>
 
 // https://github.com/OptimalBits/node_acl/blob/master/Readme.md
 import Acl = require('acl');

diff --git a/acl/acl-redisBackend.d.ts b/acl/acl-redisBackend.d.ts
diff --git a/acl/acl.d.ts b/acl/acl.d.ts
@@ -6,6 +6,9 @@
 /// <reference path="../bluebird/bluebird.d.ts" />
 /// <reference path='../node/node.d.ts'/>
 
+/// <reference path='../redis/redis.d.ts'/>
+/// <reference path="../mongodb/mongodb.d.ts" />
+
 declare module "acl" {
   import http = require('http');
   import Promise = require("bluebird");
@@ -115,6 +118,33 @@ declare module "acl" {
     end: () => void;
   }
 
+  // for redis backend
+  import redis = require('redis');
+
+  interface AclStatic {
+    redisBackend: RedisBackendStatic;
+  }
+
+  interface RedisBackend extends Backend<redis.RedisClient> { }
+  interface RedisBackendStatic {
+    new(redis: redis.RedisClient, prefix: string): RedisBackend;
+    new(redis: redis.RedisClient): RedisBackend;
+  }
+
+  // for mongodb backend
+  import mongo = require('mongodb');
+
+  interface AclStatic {
+    mongodbBackend: MongodbBackendStatic;
+  }
+
+  interface MongodbBackend extends Backend<Callback> { }
+  interface MongodbBackendStatic {
+    new(db: mongo.Db, prefix: string, useSingle: boolean): MongodbBackend;
+    new(db: mongo.Db, prefix: string): MongodbBackend;
+    new(db: mongo.Db): MongodbBackend;
+  }
+
   var _: AclStatic;
   export = _;
 }