diff --git a/acl/acl.d.ts b/acl/acl.d.ts
index 57e85d9d5..66fee09d1 100644
--- a/acl/acl.d.ts
+++ b/acl/acl.d.ts
@@ -7,7 +7,7 @@
///
///
-///
+///
declare module "acl" {
import http = require('http');
diff --git a/angular-wizard/angular-wizard-tests.ts b/angular-wizard/angular-wizard-tests.ts
index 61ad7a484..05a5d574f 100644
--- a/angular-wizard/angular-wizard-tests.ts
+++ b/angular-wizard/angular-wizard-tests.ts
@@ -1,68 +1,114 @@
///
///
+///
///
// test file taken from https://github.com/mgonto/angular-wizard
-interface WizardScope extends ng.IScope {
- referenceCurrentStep:string;
- stepValidation:()=>void;
- finishedWizard:()=>void;
- enterValidation:()=>void;
+interface IWizardScope extends ng.IScope {
+ referenceCurrentStep: string;
+ stepValidation: () => void;
+ finishedWizard: () => void;
+ enterValidation: () => void;
+ exitValidation: boolean;
+ dynamicStepDisabled: string;
}
describe('AngularWizard', function () {
- var $compile:ng.ICompileService,
- $rootScope:ng.IRootScopeService, WizardHandler:angular.mgoAngularWizard.WizardHandler, scope:WizardScope;
+ var $compile: ng.ICompileService,
+ $q: ng.IQService,
+ $rootScope: ng.IRootScopeService,
+ $timeout: ng.ITimeoutService,
+ WizardHandler: angular.mgoAngularWizard.WizardHandler;
+
+ beforeEach(() => angular.module('mgo-angular-wizard'));
+
+ beforeEach(inject(function (_$compile_: ng.ICompileService,
+ _$q_: ng.IQService,
+ _$rootScope_: ng.IRootScopeService,
+ _$timeout_: ng.ITimeoutService,
+ _WizardHandler_: angular.mgoAngularWizard.WizardHandler) {
+ $compile = _$compile_;
+ $q = _$q_;
+ $rootScope = _$rootScope_;
+ $timeout = _$timeout_;
+ WizardHandler = _WizardHandler_;
+ }));
/**
- * Create the view with wizard to test
+ * Create the generic view with wizard to test
* @param {Scope} scope A scope to bind to
* @return {[DOM element]} A DOM element compiled
*/
- function createView(scope:WizardScope) {
+ function createGenericView(scope: IWizardScope) {
scope.referenceCurrentStep = null;
var element = angular.element(''
- + ' '
- + ' This is the first step
'
- + ' Here you can use whatever you want. You can use other directives, binding, etc.
'
- + ' '
- + ' '
- + ' '
- + ' Continuing
'
- + ' You have continued here!
'
- + ' '
- + ' '
- + ' '
- + ' Even more steps!!
'
- + ' '
- + ' '
- + '');
+ + ' '
+ + ' This is the first step
'
+ + ' Here you can use whatever you want. You can use other directives, binding, etc.
'
+ + ' '
+ + ' '
+ + ' '
+ + ' Dynamic {{dynamicStepDisabled}}
'
+ + ' You have continued here!
'
+ + ' '
+ + ' '
+ + ' '
+ + ' Continuing
'
+ + ' You have continued here!
'
+ + ' '
+ + ' '
+ + ' '
+ + ' Even more steps!!
'
+ + ' '
+ + ' '
+ + '');
var elementCompiled = $compile(element)(scope);
$rootScope.$digest();
return elementCompiled;
}
it("should correctly create the wizard", function () {
- var view = createView(scope);
+ var scope = $rootScope.$new();
+ var view = createGenericView(scope);
expect(WizardHandler).toBeTruthy();
- expect(view.find('section').length).toEqual(3);
+ expect(view.find('section').length).toEqual(4);
// expect the correct step to be desirable one
expect(scope.referenceCurrentStep).toEqual('Starting');
});
-
it("should go to the next step", function () {
- var view = createView(scope);
+ var scope = $rootScope.$new();
+ var view = createGenericView(scope);
+ expect(scope.referenceCurrentStep).toEqual('Starting');
+ WizardHandler.wizard().next();
+ $rootScope.$digest();
+ expect(scope.referenceCurrentStep).toEqual('Dynamic');
+ });
+ it("should render only those steps which are enabled", function () {
+ var scope =$rootScope.$new();
+ scope.dynamicStepDisabled = 'Y';
+ var view = createGenericView(scope);
expect(scope.referenceCurrentStep).toEqual('Starting');
WizardHandler.wizard().next();
$rootScope.$digest();
expect(scope.referenceCurrentStep).toEqual('Continuing');
});
+ it("should enable or disable dynamic steps based on conditions", function () {
+ var scope = $rootScope.$new();
+ var view = createGenericView(scope);
+ expect(scope.referenceCurrentStep).toEqual('Starting');
+ scope.dynamicStepDisabled = 'Y';
+ $rootScope.$digest();
+ WizardHandler.wizard().goTo(2);
+ $rootScope.$digest();
+ expect(scope.referenceCurrentStep).toEqual('More steps');
+ });
it("should return to a previous step", function () {
-
- var view = createView(scope);
+ var scope = $rootScope.$new();
+ scope.dynamicStepDisabled = 'Y';
+ var view = createGenericView(scope);
expect(scope.referenceCurrentStep).toEqual('Starting');
WizardHandler.wizard().next();
$rootScope.$digest();
@@ -72,24 +118,27 @@ describe('AngularWizard', function () {
expect(scope.referenceCurrentStep).toEqual('Starting');
});
it("should go to a step specified by name", function () {
-
- var view = createView(scope);
+ var scope = $rootScope.$new();
+ scope.dynamicStepDisabled = 'Y';
+ var view = createGenericView(scope);
expect(scope.referenceCurrentStep).toEqual('Starting');
WizardHandler.wizard().goTo('More steps');
$rootScope.$digest();
expect(scope.referenceCurrentStep).toEqual('More steps');
});
it("should go to a step specified by index", function () {
-
- var view = createView(scope);
+ var scope = $rootScope.$new();
+ scope.dynamicStepDisabled = 'Y';
+ var view = createGenericView(scope);
expect(scope.referenceCurrentStep).toEqual('Starting');
WizardHandler.wizard().goTo(2);
$rootScope.$digest();
expect(scope.referenceCurrentStep).toEqual('More steps');
});
it("should go to next step becasue callback is truthy", function () {
-
- var view = createView(scope);
+ var scope = $rootScope.$new();
+ scope.dynamicStepDisabled = 'Y';
+ var view = createGenericView(scope);
expect(scope.referenceCurrentStep).toEqual('Starting');
WizardHandler.wizard().next(function () {
return true
@@ -98,8 +147,9 @@ describe('AngularWizard', function () {
expect(scope.referenceCurrentStep).toEqual('Continuing');
});
it("should NOT go to next step because callback is falsey", function () {
-
- var view = createView(scope);
+ var scope = $rootScope.$new();
+ scope.dynamicStepDisabled = 'Y';
+ var view = createGenericView(scope);
expect(scope.referenceCurrentStep).toEqual('Starting');
WizardHandler.wizard().next(function () {
return false
@@ -108,16 +158,18 @@ describe('AngularWizard', function () {
expect(scope.referenceCurrentStep).toEqual('Starting');
});
it("should go to next step because CANEXIT is UNDEFINED", function () {
-
- var view = createView(scope);
+ var scope = $rootScope.$new();
+ scope.dynamicStepDisabled = 'Y';
+ var view = createGenericView(scope);
expect(scope.referenceCurrentStep).toEqual('Starting');
WizardHandler.wizard().next();
$rootScope.$digest();
expect(scope.referenceCurrentStep).toEqual('Continuing');
});
it("should go to next step because CANEXIT is TRUE", function () {
-
- var view = createView(scope);
+ var scope = $rootScope.$new();
+ scope.dynamicStepDisabled = 'Y';
+ var view = createGenericView(scope);
scope.stepValidation = function () {
return true;
};
@@ -130,8 +182,9 @@ describe('AngularWizard', function () {
expect(scope.referenceCurrentStep).toEqual('More steps');
});
it("should NOT go to next step because CANEXIT is FALSE", function () {
-
- var view = createView(scope);
+ var scope = $rootScope.$new();
+ scope.dynamicStepDisabled = 'Y';
+ var view = createGenericView(scope);
scope.stepValidation = function () {
return false;
};
@@ -144,8 +197,9 @@ describe('AngularWizard', function () {
expect(scope.referenceCurrentStep).toEqual('Continuing');
});
it("should go to next step because CANENTER is TRUE", function () {
-
- var view = createView(scope);
+ var scope = $rootScope.$new();
+ scope.dynamicStepDisabled = 'Y';
+ var view = createGenericView(scope);
scope.enterValidation = function () {
return true;
};
@@ -158,8 +212,9 @@ describe('AngularWizard', function () {
expect(scope.referenceCurrentStep).toEqual('More steps');
});
it("should NOT go to next step because CANENTER is FALSE", function () {
-
- var view = createView(scope);
+ var scope = $rootScope.$new();
+ scope.dynamicStepDisabled = 'Y';
+ var view = createGenericView(scope);
scope.enterValidation = function () {
return false;
};
@@ -172,8 +227,9 @@ describe('AngularWizard', function () {
expect(scope.referenceCurrentStep).toEqual('Continuing');
});
it("should NOT return to a previous step. Although CANEXIT is false and we are heading to a previous state, the can enter validation is false", function () {
-
- var view = createView(scope);
+ var scope = $rootScope.$new();
+ scope.dynamicStepDisabled = 'Y';
+ var view = createGenericView(scope);
scope.stepValidation = function () {
return false;
};
@@ -189,8 +245,9 @@ describe('AngularWizard', function () {
expect(scope.referenceCurrentStep).toEqual('Continuing');
});
it("should return to a previous step even though CANEXIT is false", function () {
-
- var view = createView(scope);
+ var scope = $rootScope.$new();
+ scope.dynamicStepDisabled = 'Y';
+ var view = createGenericView(scope);
scope.stepValidation = function () {
return false;
};
@@ -202,17 +259,66 @@ describe('AngularWizard', function () {
$rootScope.$digest();
expect(scope.referenceCurrentStep).toEqual('Starting');
});
- it("should finish", function () {
-
- var flag = false;
- scope.finishedWizard = function () {
- flag = true;
+ it("should go to the next step because the promise that CANENTER returns resolves to true", function (done) {
+ var scope = $rootScope.$new();
+ scope.dynamicStepDisabled = 'Y';
+ var view = createGenericView(scope);
+ scope.enterValidation = function () {
+ var deferred = $q.defer();
+ $timeout(function () {
+ deferred.resolve(true);
+ done();
+ });
+ return deferred.promise;
};
- var view = createView(scope);
+ expect(scope.referenceCurrentStep).toEqual('Starting');
+ WizardHandler.wizard().next();
+ $rootScope.$digest();
+ expect(scope.referenceCurrentStep).toEqual('Continuing');
+ WizardHandler.wizard().next();
+ $timeout.flush();
+ expect(scope.referenceCurrentStep).toEqual('More steps');
+ });
+ it("should go to the next step because CANEXIT is set to true", function () {
+ var scope = $rootScope.$new();
+ scope.dynamicStepDisabled = 'Y';
+ var view = createGenericView(scope);
+ scope.exitValidation = true;
+ expect(scope.referenceCurrentStep).toEqual('Starting');
+ WizardHandler.wizard().next();
+ $rootScope.$digest();
+ expect(scope.referenceCurrentStep).toEqual('Continuing');
+ WizardHandler.wizard().next();
+ $rootScope.$digest();
+ expect(scope.referenceCurrentStep).toEqual('More steps');
+ });
+ it("should finish", function () {
+ var scope = $rootScope.$new();
+ scope.dynamicStepDisabled = 'Y';
+ var flag = false;
+ scope.finishedWizard = function () { flag = true; };
+ var view = createGenericView(scope);
expect(scope.referenceCurrentStep).toEqual('Starting');
WizardHandler.wizard().finish();
expect(flag).toBeTruthy();
$rootScope.$digest();
});
+ it("should go to first step when reset is called", function () {
+ var scope = $rootScope.$new();
+ scope.dynamicStepDisabled = 'Y';
+ var view = createGenericView(scope);
+ expect(scope.referenceCurrentStep).toEqual('Starting');
+ WizardHandler.wizard().goTo(2);
+ $rootScope.$digest();
+ expect(scope.referenceCurrentStep).toEqual('More steps');
+ WizardHandler.wizard().reset();
+ $rootScope.$digest();
+ expect(scope.referenceCurrentStep).toEqual('Starting');
+ });
+ it("step description should be accessible", function () {
+ var scope = $rootScope.$new();
+ scope.dynamicStepDisabled = 'Y';
+ var view = createGenericView(scope);
+ expect((view.isolateScope()).steps[0].description).toEqual('Step description');
+ });
});
-
diff --git a/angular-wizard/angular-wizard.d.ts b/angular-wizard/angular-wizard.d.ts
index f079a46c2..a854f94a0 100644
--- a/angular-wizard/angular-wizard.d.ts
+++ b/angular-wizard/angular-wizard.d.ts
@@ -1,21 +1,38 @@
-// Type definitions for Angular Wizard 0.4.2
+// Type definitions for Angular Wizard 0.6.1
// Project: https://github.com/mgonto/angular-wizard
-// Definitions by: Marko Jurisic
+// Definitions by: Marko Jurisic , Ronald Wildenberg
// Definitions: https://github.com/borisyankov/DefinitelyTyped
declare module angular.mgoAngularWizard {
interface WizardHandler {
- wizard(name?:string): Wizard;
- addWizard(name:string, wizard:Wizard):void;
- removeWizard(name:string):void;
+ wizard(name?: string): Wizard;
+ addWizard(name: string, wizard: Wizard): void;
+ removeWizard(name: string): void;
}
interface Wizard {
- next(nextHandler?:Function):void;
- previous():void;
- goTo(step:number):void;
- goTo(step:string):void;
- finish():void;
- currentStepNumber():number;
+ next(nextHandler?: () => boolean): void;
+ previous(): void;
+ cancel: () => void;
+ goTo(step: number | string): void;
+ finish(): void;
+ reset: () => void;
+
+ addStep: (step: WzStep) => void;
+ currentStep: () => WzStep;
+ currentStepNumber(): number;
+ currentStepDescription: () => string;
+ currentStepTitle: () => string;
+ getEnabledSteps(): WzStep[];
+ }
+
+ interface WzStep {
+ canenter: (...args: any[]) => boolean;
+ canexit: (...args: any[]) => boolean;
+ description: string;
+ selected: boolean;
+ title: string;
+ wzData: any;
+ wzTitle: string;
}
}
diff --git a/cordova-plugin-qrscanner/cordova-plugin-qrscanner-tests.ts b/cordova-plugin-qrscanner/cordova-plugin-qrscanner-tests.ts
index 63deacc98..630bfd09c 100644
--- a/cordova-plugin-qrscanner/cordova-plugin-qrscanner-tests.ts
+++ b/cordova-plugin-qrscanner/cordova-plugin-qrscanner-tests.ts
@@ -1,37 +1,44 @@
///
var QRScanner: QRScanner = window.QRScanner;
-QRScanner.prepare()
-QRScanner.prepare((err, status) => { var error: Error = err; var obj: QRScannerStatus = status; })
-QRScanner.scan((err, results) => { var error: Error = err; var contents: String = results; })
-QRScanner.cancelScan()
-QRScanner.cancelScan((status) => {var obj: QRScannerStatus = status; })
-QRScanner.show()
-QRScanner.show((status) => {var obj: QRScannerStatus = status; })
-QRScanner.hide()
-QRScanner.hide((status) => {var obj: QRScannerStatus = status; })
-QRScanner.enableLight()
-QRScanner.enableLight((err, status) => { var error: Error = err; var obj: QRScannerStatus = status; })
-QRScanner.disableLight()
-QRScanner.disableLight((err, status) => { var error: Error = err; var obj: QRScannerStatus = status; })
-QRScanner.useCamera(1)
-QRScanner.useCamera(1, (err, status) => { var error: Error = err; var obj: QRScannerStatus = status; })
-QRScanner.useFrontCamera()
-QRScanner.useFrontCamera((err, status) => { var error: Error = err; var obj: QRScannerStatus = status; })
-QRScanner.useBackCamera()
-QRScanner.useBackCamera((err, status) => { var error: Error = err; var obj: QRScannerStatus = status; })
-QRScanner.pausePreview()
-QRScanner.pausePreview((status) => {var obj: QRScannerStatus = status; })
-QRScanner.resumePreview()
-QRScanner.resumePreview((status) => {var obj: QRScannerStatus = status; })
-QRScanner.openSettings()
-QRScanner.openSettings((err, status) => { var error: Error = err; var obj: QRScannerStatus = status; })
-QRScanner.destroy()
-QRScanner.destroy((status) => {var obj: QRScannerStatus = status; })
+QRScanner.prepare();
+QRScanner.prepare((err, status) => { var error: QRScannerError = err; var obj: QRScannerStatus = status; });
+QRScanner.scan((err, results) => { var error: QRScannerError = err; var contents: String = results; });
+QRScanner.cancelScan();
+QRScanner.cancelScan((status) => {var obj: QRScannerStatus = status; });
+QRScanner.show();
+QRScanner.show((status) => {var obj: QRScannerStatus = status; });
+QRScanner.hide();
+QRScanner.hide((status) => {var obj: QRScannerStatus = status; });
+QRScanner.enableLight();
+QRScanner.enableLight((err, status) => { var error: QRScannerError = err; var obj: QRScannerStatus = status; });
+QRScanner.disableLight();
+QRScanner.disableLight((err, status) => { var error: QRScannerError = err; var obj: QRScannerStatus = status; });
+QRScanner.useCamera(1);
+QRScanner.useCamera(1, (err, status) => { var error: QRScannerError = err; var obj: QRScannerStatus = status; });
+QRScanner.useFrontCamera();
+QRScanner.useFrontCamera((err, status) => { var error: QRScannerError = err; var obj: QRScannerStatus = status; });
+QRScanner.useBackCamera();
+QRScanner.useBackCamera((err, status) => { var error: QRScannerError = err; var obj: QRScannerStatus = status; });
+QRScanner.pausePreview();
+QRScanner.pausePreview((status) => {var obj: QRScannerStatus = status; });
+QRScanner.resumePreview();
+QRScanner.resumePreview((status) => {var obj: QRScannerStatus = status; });
+QRScanner.openSettings();
+QRScanner.openSettings((err, status) => { var error: QRScannerError = err; var obj: QRScannerStatus = status; });
+QRScanner.destroy();
+QRScanner.destroy((status) => {var obj: QRScannerStatus = status; });
+
+QRScanner.prepare((err, status) => {
+ var error: QRScannerError = err;
+ var num: Number = error.code;
+ var str: String = error.name;
+ str = error._message;
-QRScanner.getStatus((status) => {
var obj: QRScannerStatus = status;
var bool: Boolean = status.authorized;
+ bool = status.denied;
+ bool = status.restricted;
bool = status.prepared;
bool = status.scanning;
bool = status.previewing;
@@ -40,4 +47,4 @@ QRScanner.getStatus((status) => {
bool = status.canOpenSettings;
bool = status.canEnableLight;
var num: Number = status.currentCamera;
-})
+});
diff --git a/cordova-plugin-qrscanner/cordova-plugin-qrscanner.d.ts b/cordova-plugin-qrscanner/cordova-plugin-qrscanner.d.ts
index 31f141188..ed5f72f26 100644
--- a/cordova-plugin-qrscanner/cordova-plugin-qrscanner.d.ts
+++ b/cordova-plugin-qrscanner/cordova-plugin-qrscanner.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for cordova-plugin-qrscanner
+// Type definitions for cordova-plugin-qrscanner v1.0.0
// Project: https://github.com/bitpay/cordova-plugin-qrscanner
// Definitions by: Jason Dreyzehner
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -22,20 +22,21 @@ interface QRScanner {
* only be visible if `QRScanner.show()` has already made the webview transparent.
* @param {function} [callback] Callback that gets an error or the QRScannerStatus object.
*/
- prepare: (callback?: (error: Error, status: QRScannerStatus) => any) => void;
+ prepare: (callback?: (error: QRScannerError, status: QRScannerStatus) => any) => void;
/**
* Sets QRScanner to "watch" for valid QR codes. Once a valid code is
* detected, it's contents are passed to the callback, and scanning is
* toggled off. If `QRScanner.prepare()` has not been called,
- * `QRScanner.scan()` performs that setup as well. The video preview does
+ * this method performs that setup as well. The video preview does
* not need to be visible for scanning to function.
* @param {function} callback Callback that gets an error or the results string.
*/
- scan: (callback: (error: Error, result: String) => any) => void;
+ scan: (callback: (error: QRScannerError, result: String) => any) => void;
/**
- * Cancels the current scan. The current scan() callback will not return.
+ * Cancels the current scan. If `QRScanner.prepare()` has not been called,
+ * this method performs that setup as well.
* @param {function} [callback] Callback that gets the QRScannerStatus object.
*/
cancelScan: (callback?: (status: QRScannerStatus) => any) => void;
@@ -44,6 +45,7 @@ interface QRScanner {
* Configures the native webview to have a transparent background, then sets
* the background of the `` and parent elements to transparent,
* allowing the webview to re-render with the transparent background.
+ *
* To see the video preview, your application background must be transparent
* in the areas through which it should show.
* @param {function} [callback] Callback that gets the QRScannerStatus object.
@@ -59,36 +61,42 @@ interface QRScanner {
/**
- * Enable the device's light (for scanning in low-light environments).
+ * Enable the device's light (for scanning in low-light environments). If
+ * `QRScanner.prepare()` has not been called, this method performs that setup
+ * as well.
* @param {function} [callback] Callback that gets an error or the QRScannerStatus object.
*/
- enableLight: (callback?: (error: Error, status: QRScannerStatus) => any) => void;
+ enableLight: (callback?: (error: QRScannerError, status: QRScannerStatus) => any) => void;
/**
- * Disable the device's light.
+ * Disable the device's light. If `QRScanner.prepare()` has not been called,
+ * this method performs that setup as well.
* @param {function} [callback] Callback that gets an error or the QRScannerStatus object.
*/
- disableLight: (callback?: (error: Error, status: QRScannerStatus) => any) => void;
+ disableLight: (callback?: (error: QRScannerError, status: QRScannerStatus) => any) => void;
/**
* Switch video capture to the `index` camera. Camera `0` is the back camera,
- * camera `1` is front camera.
+ * camera `1` is front camera. If `QRScanner.prepare()` has not been called,
+ * this method performs that setup as well.
* @param {number} index A number representing the index of the camera to use.
* @param {function} [callback] Callback that gets an error or the QRScannerStatus object.
*/
- useCamera: (index: Number, callback?: (error: Error, status: QRScannerStatus) => any) => void;
+ useCamera: (index: Number, callback?: (error: QRScannerError, status: QRScannerStatus) => any) => void;
/**
- * Switch video capture to the device's front camera.
+ * Switch video capture to the device's front camera. If `QRScanner.prepare()`
+ * has not been called, this method performs that setup as well.
* @param {function} [callback] Callback that gets an error or the QRScannerStatus object.
*/
- useFrontCamera: (callback?: (error: Error, status: QRScannerStatus) => any) => void;
+ useFrontCamera: (callback?: (error: QRScannerError, status: QRScannerStatus) => any) => void;
/**
- * Switch video capture to the device's back camera.
+ * Switch video capture to the device's back camera. If `QRScanner.prepare()`
+ * has not been called, this method performs that setup as well.
* @param {function} [callback] Callback that gets an error or the QRScannerStatus object.
*/
- useBackCamera: (callback?: (error: Error, status: QRScannerStatus) => any) => void;
+ useBackCamera: (callback?: (error: QRScannerError, status: QRScannerStatus) => any) => void;
/**
* Pauses the video preview on the current frame (as if a snapshot was taken).
@@ -105,9 +113,13 @@ interface QRScanner {
/**
* Open the app-specific permission settings in the user's device settings.
* Here the user can enable/disable camera (and other) access for your app.
+ *
+ * Note: iOS immediately kills all apps affected by permissions changes. If
+ * the user changes a permission settings, your app will stop and only
+ * restart when they return.
* @param {function} [callback] Callback that gets the QRScannerStatus object.
*/
- openSettings: (callback?: (error: Error, status: QRScannerStatus) => any) => void;
+ openSettings: (callback?: (error: QRScannerError, status: QRScannerStatus) => any) => void;
/**
* Retrieve the status of QRScanner and provide it to the callback function.
@@ -116,9 +128,9 @@ interface QRScanner {
getStatus: (callback: (status: QRScannerStatus) => any) => void;
/**
- * Stops scanning, video capture, and the preview, and deallocates as much as
- * possible. (E.g. to improve performance/battery life when the scanner is
- * not likely to be used for a while.)
+ * Runs hide(), stops scanning, video capture, and the preview, and
+ * deallocates as much as possible. (E.g. to improve performance/battery life
+ * when the scanner is not likely to be used for a while.)
* Basically reverts the plugin to it's startup-state.
* @param {function} [callback] Callback that gets the QRScannerStatus object.
*/
@@ -132,16 +144,29 @@ interface QRScanner {
interface QRScannerStatus {
/**
- * On iOS, camera access is granted to an app by the user (by clicking "Allow"
- * at the dialog). The `authorized` property is a boolean value which is true
- * only when the user has allowed camera access to your app
- * (`AVAuthorizationStatus.Authorized`). The `NotDetermined`, `Restricted`
- * (e.g.: parental controls), and `Denied` AVAuthorizationStatus states all
- * cause this value to be false. If the user has denied access to your app,
- * consider asking nicely and offering a link via `QRScanner.openSettings()`.
+ * On iOS and Android 6.0+, camera access is granted at runtime by the user (by
+ * clicking "Allow" at the dialog). The `authorized` property is a boolean
+ * value which is true only when the user has allowed camera access to your app
+ * (`AVAuthorizationStatus.Authorized`). On platforms with permissions granted
+ * at install (Android pre-6.0, Windows Phone) this property is always true.
*/
authorized: Boolean,
+ /**
+ * A boolean value which is true if the user permenantly denied camera access
+ * to the app (`AVAuthorizationStatus.Denied`). Once denied, camera access can
+ * only be gained by requesting the user change their decision (consider
+ * offering a link to the setting via `openSettings()`).
+ */
+ denied: Boolean,
+
+ /**
+ * A boolean value which is true if the user is unable to grant permissions due
+ * to parental controls, organization security configuration profiles, or
+ * similar reasons.
+ */
+ restricted: Boolean,
+
/**
* A boolean value which is true if QRScanner is prepared to capture video and
* render it to the view.
@@ -188,4 +213,46 @@ interface QRScannerStatus {
currentCamera: Number
}
+/**
+* An object representing an error issued by QRScanner.
+*
+* Many QRScanner functions accept a callback with an `error` parameter. When
+* QRScanner experiences errors, this parameter contains a QRScannerError object
+* with properties `name` (_String_), `code` (_Number_), and `_message`
+* (_String_). When handling errors, rely only on the `name` or `code` parameter,
+*as the specific content of `_message` is not considered part of the plugin's
+* stable API.
+*
+* # Possible Error Types
+*
+* Code | Name | Description
+* ---: | :-------------------------- | :----------------------------------------
+* 0 | `UNEXPECTED_ERROR` | An unexpected error. Returned only by bugs in QRScanner.
+* 1 | `CAMERA_ACCESS_DENIED` | The user denied camera access.
+* 2 | `CAMERA_ACCESS_RESTRICTED` | Camera access is restricted (due to parental controls, organization security configuration profiles, or similar reasons).
+* 3 | `BACK_CAMERA_UNAVAILABLE` | The back camera is unavailable.
+* 4 | `FRONT_CAMERA_UNAVAILABLE` | The front camera is unavailable.
+* 5 | `CAMERA_UNAVAILABLE` | The camera is unavailable because it doesn't exist or is otherwise unable to be configured. (Returned if QRScanner cannot return one of the more specific `BACK_CAMERA_UNAVAILABLE` or `FRONT_CAMERA_UNAVAILABLE` errors.)
+* 6 | `SCAN_CANCELED` | Scan was canceled by the `cancelScan()` method. (Returned exclusively to the `QRScanner.scan()` method.)
+* 7 | `LIGHT_UNAVAILABLE` | The device light is unavailable because it doesn't exist or is otherwise unable to be configured.
+* 8 | `OPEN_SETTINGS_UNAVAILABLE` | The device is unable to open settings.
+*/
+interface QRScannerError {
+
+ /**
+ * The standard string identifying the type of this QRScannerError.
+ */
+ name: String,
+
+ /**
+ * The standard number identifying the type of this QRScannerError.
+ */
+ code: Number,
+
+ /**
+ * A simple message describing this QRScannerError.
+ */
+ _message: String
+}
+
declare var QRScanner: QRScanner;
diff --git a/github-electron/github-electron-main-tests.ts b/github-electron/github-electron-main-tests.ts
index cf0bee0ec..2d6385d63 100644
--- a/github-electron/github-electron-main-tests.ts
+++ b/github-electron/github-electron-main-tests.ts
@@ -26,9 +26,6 @@ import path = require('path');
// Quick start
// https://github.com/atom/electron/blob/master/docs/tutorial/quick-start.md
-// Report crashes to our server.
-require('crash-reporter').start();
-
// Keep a global reference of the window object, if you don't, the window will
// be closed automatically when the javascript object is GCed.
var mainWindow: Electron.BrowserWindow = null;
@@ -501,7 +498,10 @@ crashReporter.start({
productName: 'YourName',
companyName: 'YourCompany',
submitURL: 'https://your-domain.com/url-to-submit',
- autoSubmit: true
+ autoSubmit: true,
+ extra: {
+ someKey: "value"
+ }
});
// nativeImage
diff --git a/github-electron/github-electron.d.ts b/github-electron/github-electron.d.ts
index a02a1edb6..a945ea847 100644
--- a/github-electron/github-electron.d.ts
+++ b/github-electron/github-electron.d.ts
@@ -1369,15 +1369,11 @@ declare module Electron {
* Default: Electron
*/
productName?: string;
- /**
- * Default: GitHub, Inc.
- */
- companyName?: string;
+ companyName: string;
/**
* URL that crash reports would be sent to as POST.
- * Default: http://54.249.141.255:1127/post
*/
- submitURL?: string;
+ submitURL: string;
/**
* Send the crash report without user interaction.
* Default: true.
@@ -1392,7 +1388,7 @@ declare module Electron {
* Only string properties are send correctly.
* Nested objects are not supported.
*/
- extra?: {};
+ extra?: {[prop: string]: string};
}
interface CrashReporterPayload extends Object {
@@ -1436,7 +1432,7 @@ declare module Electron {
}
interface CrashReporter {
- start(options?: CrashReporterStartOptions): void;
+ start(options: CrashReporterStartOptions): void;
/**
* @returns The date and ID of the last crash report. When there was no crash report
diff --git a/gulp-install/gulp-install-tests.ts b/gulp-install/gulp-install-tests.ts
new file mode 100644
index 000000000..0b9b5da0c
--- /dev/null
+++ b/gulp-install/gulp-install-tests.ts
@@ -0,0 +1,25 @@
+///
+///
+
+import * as gulp from 'gulp';
+import * as install from 'gulp-install';
+
+// Examples taken from https://www.npmjs.com/package/gulp-install
+
+// Usage in a gulp stream
+gulp.src('src')
+ .pipe(install());
+
+// Options
+install({
+ production: true,
+ ignoreScripts: true,
+ noOptional: true,
+ allowRoot: true,
+ args: ['one', 'two', 'three']
+});
+
+// Options: args only as a string
+install({
+ args: 'one'
+});
\ No newline at end of file
diff --git a/gulp-install/gulp-install.d.ts b/gulp-install/gulp-install.d.ts
new file mode 100644
index 000000000..3d332548c
--- /dev/null
+++ b/gulp-install/gulp-install.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for gulp-install v0.6.0
+// Project: https://www.npmjs.com/package/gulp-install
+// Definitions by: Peter Juras
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+///
+
+declare module "gulp-install" {
+ interface Options {
+ production?: boolean;
+ ignoreScripts?: boolean;
+ noOptional?: boolean;
+ allowRoot?: boolean;
+ args?: string | string[];
+ }
+
+ interface Install {
+ (options?: Options) : NodeJS.ReadWriteStream;
+ }
+
+ const install : Install;
+ export = install;
+}
diff --git a/gulp-json-editor/gulp-json-editor-tests.ts b/gulp-json-editor/gulp-json-editor-tests.ts
new file mode 100644
index 000000000..a6acbb836
--- /dev/null
+++ b/gulp-json-editor/gulp-json-editor-tests.ts
@@ -0,0 +1,40 @@
+///
+///
+
+import * as gulp from 'gulp';
+import * as jeditor from 'gulp-json-editor';
+
+// Samples taken from https://www.npmjs.com/package/gulp-json-editor
+
+/*
+ edit JSON object by merging with user specific object
+*/
+gulp.src("./manifest.json")
+ .pipe(jeditor({
+ 'version': '1.2.3'
+ }))
+ .pipe(gulp.dest("./dest"));
+
+/*
+ edit JSON object by using user specific function
+*/
+gulp.src("./manifest.json")
+ .pipe(jeditor(function(json : any) {
+ json.version = "1.2.3";
+ return json; // must return JSON object.
+ }))
+ .pipe(gulp.dest("./dest"));
+
+/*
+ specify js-beautify option
+*/
+gulp.src("./manifest.json")
+ .pipe(jeditor({
+ 'version': '1.2.3'
+ },
+ // the second argument is passed to js-beautify as its option
+ {
+ 'indent_char': '\t',
+ 'indent_size': 1
+ }))
+ .pipe(gulp.dest("./dest"));
diff --git a/gulp-json-editor/gulp-json-editor.d.ts b/gulp-json-editor/gulp-json-editor.d.ts
new file mode 100644
index 000000000..55a49f5b2
--- /dev/null
+++ b/gulp-json-editor/gulp-json-editor.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for gulp-json-editor v2.2.1
+// Project: https://www.npmjs.com/package/gulp-json-editor
+// Definitions by: Peter Juras
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+///
+///
+
+declare module "gulp-json-editor" {
+
+ interface JEditor {
+ (mergeWith: any | ((json : any) => any ),
+ jsBeautifyOptions? : JsBeautifyOptions ) : NodeJS.ReadWriteStream;
+ }
+
+ const jeditor : JEditor;
+ export = jeditor;
+}
diff --git a/gulp-typescript/gulp-typescript.d.ts b/gulp-typescript/gulp-typescript.d.ts
index d51a3122e..690f20c30 100644
--- a/gulp-typescript/gulp-typescript.d.ts
+++ b/gulp-typescript/gulp-typescript.d.ts
@@ -30,6 +30,7 @@ declare module "gulp-typescript" {
jsx?: string;
declaration?: boolean;
emitDecoratorMetadata?: boolean;
+ experimentalDecorators?: boolean;
experimentalAsyncFunctions?: boolean;
moduleResolution?: string;
noEmitHelpers?: boolean;
diff --git a/highcharts/highcharts.d.ts b/highcharts/highcharts.d.ts
index e86d4b86c..b5ed1d662 100644
--- a/highcharts/highcharts.d.ts
+++ b/highcharts/highcharts.d.ts
@@ -4432,6 +4432,12 @@ interface HighchartsLineChart extends HighchartsSeriesChart {
* @since 1.2.5
*/
step?: boolean|string;
+
+ /**
+ * The line cap used for line ends and line joins on the graph.
+ * @default 'round'
+ */
+ linecap?: string;
}
/**
diff --git a/jqueryui/jqueryui.d.ts b/jqueryui/jqueryui.d.ts
index b3edd5954..a5df2c834 100644
--- a/jqueryui/jqueryui.d.ts
+++ b/jqueryui/jqueryui.d.ts
@@ -77,6 +77,7 @@ declare module JQueryUI {
interface Autocomplete extends Widget, AutocompleteOptions {
escapeRegex: (value: string) => string;
+ filter: (array: any, term: string) => any;
}
@@ -363,7 +364,7 @@ declare module JQueryUI {
title?: string;
width?: any; // number or string
zIndex?: number;
-
+
open?: DialogEvent;
close?: DialogEvent;
}
diff --git a/js-beautify/js-beautify.d.ts b/js-beautify/js-beautify.d.ts
index fc581ea90..41f1a41ff 100644
--- a/js-beautify/js-beautify.d.ts
+++ b/js-beautify/js-beautify.d.ts
@@ -2,28 +2,34 @@
// Project: https://github.com/beautify-web/js-beautify/
// Definitions by: Josh Goldberg
// Definitions: https://github.com/borisyankov/DefinitelyTyped
+// Type definitions for js_beautify
+// Project: https://github.com/beautify-web/js-beautify/
+// Definitions by: Josh Goldberg
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+interface JsBeautifyOptions {
+ indent_size?: number;
+ indent_char?: string;
+ eol?: string;
+ indent_level?: number;
+ indent_with_tabs?: boolean;
+ preserve_newlines?: boolean;
+ max_preserve_newlines?: number;
+ jslint_happy?: boolean;
+ space_after_anon_function?: boolean;
+ brace_style?: string;
+ keep_array_indentation?: boolean;
+ keep_function_indentation?: boolean;
+ space_before_conditional?: boolean;
+ break_chained_methods?: boolean;
+ eval_code?: boolean;
+ unescape_strings?: boolean;
+ wrap_line_length?: number;
+ wrap_attributes?: string;
+ wrap_attributes_indent_size?: number;
+ end_with_newline?: boolean;
+}
declare var js_beautify: {
- (js_source_text: string, options?: {
- indent_size?: number;
- indent_char?: string;
- eol?: string;
- indent_level?: number;
- indent_with_tabs?: boolean;
- preserve_newlines?: boolean;
- max_preserve_newlines?: number;
- jslint_happy: boolean;
- space_after_anon_function: boolean;
- brace_style: string;
- keep_array_indentation: boolean;
- keep_function_indentation: boolean;
- space_before_conditional: boolean;
- break_chained_methods: boolean;
- eval_code: boolean;
- unescape_strings: boolean;
- wrap_line_length: number;
- wrap_attributes: string;
- wrap_attributes_indent_size: number;
- end_with_newline: boolean;
- }): string;
+ (js_source_text: string, options?: JsBeautifyOptions): string;
};
diff --git a/koa/koa-1.1.2-tests.ts b/koa/koa-1.1.2-tests.ts
new file mode 100644
index 000000000..da65e5a5d
--- /dev/null
+++ b/koa/koa-1.1.2-tests.ts
@@ -0,0 +1,26 @@
+///
+
+import * as Koa from 'koa';
+var app = new Koa();
+
+// logger
+
+app.use(function *(next: Function) {
+ // at present, we can not typing 'this' in function
+ // but there is a proposal: https://github.com/Microsoft/TypeScript/issues/3694
+ var ctx: Koa.Context = this;
+
+ var start = new Date;
+ yield next;
+ var ms = new Date - start;
+ console.log('%s %s - %s', ctx.method, ctx.url, ms);
+});
+
+// response
+
+app.use(function *(): Iterable {
+ var ctx: Koa.Context = this;
+ ctx.body = 'Hello World';
+});
+
+app.listen(3000);
diff --git a/koa/koa-1.1.2-tests.ts.tscparams b/koa/koa-1.1.2-tests.ts.tscparams
new file mode 100644
index 000000000..4a863174b
--- /dev/null
+++ b/koa/koa-1.1.2-tests.ts.tscparams
@@ -0,0 +1 @@
+--noImplicitAny --module commonjs --target es6
\ No newline at end of file
diff --git a/koa/koa-1.1.2.d.ts b/koa/koa-1.1.2.d.ts
new file mode 100644
index 000000000..2520f8fae
--- /dev/null
+++ b/koa/koa-1.1.2.d.ts
@@ -0,0 +1,605 @@
+// Type definitions for koa v1.1.2
+// Project: https://github.com/koajs/koa
+// Definitions by: jKey Lu
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+ import * as Koa from 'koa;
+ var app = new Koa();
+
+ =============================================== */
+
+///
+///
+
+declare module "koa" {
+ import * as net from 'net';
+ import * as http from 'http';
+ import * as events from 'events';
+ import * as Cookies from 'cookies';
+
+ interface IRequest {
+ /**
+ * Return request header.
+ *
+ * @readonly
+ */
+ header: any;
+ /**
+ * Return request header, alias as request.header
+ *
+ * @readonly
+ */
+ headers: any;
+ /**
+ * Get/Set request URL.
+ */
+ url: string;
+ /**
+ * Get origin of URL.
+ */
+ origin: string;
+ /**
+ * Get full request URL.
+ *
+ * @readonly
+ */
+ href: string;
+ /**
+ * Get/Set request method.
+ */
+ method: string;
+ /**
+ * Get request pathname.
+ * Set pathname, retaining the query-string when present.
+ */
+ path: string;
+ /**
+ * Get parsed query-string.
+ * Set query-string as an object.
+ */
+ query: any;
+ /**
+ * Get/Set query string.
+ */
+ querystring: string;
+ /**
+ * Get the search string. Same as the querystring except it includes the leading ?.
+ * Set the search string. Same as response.querystring= but included for ubiquity.
+ */
+ search: string;
+ /**
+ * Parse the "Host" header field host and support X-Forwarded-Host when a proxy is enabled.
+ *
+ * @readonly
+ */
+ host: string;
+ /**
+ * Parse the "Host" header field hostname and support X-Forwarded-Host when a proxy is enabled.
+ *
+ * @readonly
+ */
+ hostname: string;
+ /**
+ * Check if the request is fresh, aka
+ * Last-Modified and/or the ETag
+ * still match.
+ *
+ * @readonly
+ */
+ fresh: boolean;
+ /**
+ * Check if the request is stale, aka
+ * "Last-Modified" and / or the "ETag" for the
+ * resource has changed.
+ *
+ * @readonly
+ */
+ stale: boolean;
+ /**
+ * Check if the request is idempotent.
+ *
+ * @readonly
+ */
+ idempotent: boolean;
+ /**
+ * Return the request socket.
+ *
+ * @readonly
+ */
+ socket: net.Socket;
+ /**
+ * Return the protocol string "http" or "https"
+ * when requested with TLS. When the proxy setting
+ * is enabled the "X-Forwarded-Proto" header
+ * field will be trusted. If you're running behind
+ * a reverse proxy that supplies https for you this
+ * may be enabled.
+ *
+ * @readonly
+ */
+ protocol: string;
+ /**
+ * Short-hand for:
+ *
+ * this.protocol == 'https'
+ *
+ * @readonly
+ */
+ secure: boolean;
+ /**
+ * Return the remote address, or when
+ * `app.proxy` is `true` return
+ * the upstream addr.
+ *
+ * @readonly
+ */
+ ip: string;
+ /**
+ * When `app.proxy` is `true`, parse
+ * the "X-Forwarded-For" ip address list.
+ *
+ * For example if the value were "client, proxy1, proxy2"
+ * you would receive the array `["client", "proxy1", "proxy2"]`
+ * where "proxy2" is the furthest down-stream.
+ *
+ * @readonly
+ */
+ ips: string[];
+ /**
+ * Return subdomains as an array.
+ *
+ * Subdomains are the dot-separated parts of the host before the main domain of
+ * the app. By default, the domain of the app is assumed to be the last two
+ * parts of the host. This can be changed by setting `app.subdomainOffset`.
+ *
+ * For example, if the domain is "tobi.ferrets.example.com":
+ * If `app.subdomainOffset` is not set, this.subdomains is `["ferrets", "tobi"]`.
+ * If `app.subdomainOffset` is 3, this.subdomains is `["tobi"]`.
+ *
+ * @readonly
+ */
+ subdomains: string[];
+ /**
+ * Check if the given `type(s)` is acceptable, returning
+ * the best match when true, otherwise `undefined`, in which
+ * case you should respond with 406 "Not Acceptable".
+ *
+ * The `type` value may be a single mime type string
+ * such as "application/json", the extension name
+ * such as "json" or an array `["json", "html", "text/plain"]`. When a list
+ * or array is given the _best_ match, if any is returned.
+ *
+ * Examples:
+ *
+ * // Accept: text/html
+ * this.accepts('html');
+ * // => "html"
+ *
+ * // Accept: text/*, application/json
+ * this.accepts('html');
+ * // => "html"
+ * this.accepts('text/html');
+ * // => "text/html"
+ * this.accepts('json', 'text');
+ * // => "json"
+ * this.accepts('application/json');
+ * // => "application/json"
+ *
+ * // Accept: text/*, application/json
+ * this.accepts('image/png');
+ * this.accepts('png');
+ * // => undefined
+ *
+ * // Accept: text/*;q=.5, application/json
+ * this.accepts(['html', 'json']);
+ * this.accepts('html', 'json');
+ * // => "json"
+ */
+ accepts(...types: string[]): string|boolean|string[];
+ accepts(types: string[]): string|boolean|string[];
+ /**
+ * Return accepted encodings or best fit based on `encodings`.
+ *
+ * Given `Accept-Encoding: gzip, deflate`
+ * an array sorted by quality is returned:
+ *
+ * ['gzip', 'deflate']
+ */
+ acceptsEncodings(...encodings: string[]): string|string[];
+ acceptsEncodings(encodings: string[]): string|string[];
+ /**
+ * Return accepted charsets or best fit based on `charsets`.
+ *
+ * Given `Accept-Charset: utf-8, iso-8859-1;q=0.2, utf-7;q=0.5`
+ * an array sorted by quality is returned:
+ *
+ * ['utf-8', 'utf-7', 'iso-8859-1']
+ */
+ acceptsCharsets(...charsets: string[]): string|string[];
+ acceptsCharsets(charsets: string[]): string|string[];
+ /**
+ * Return accepted languages or best fit based on `langs`.
+ *
+ * Given `Accept-Language: en;q=0.8, es, pt`
+ * an array sorted by quality is returned:
+ *
+ * ['es', 'pt', 'en']
+ */
+ acceptsLanguages(...langs: string[]): string|string[];
+ acceptsLanguages(langs: string[]): string|string[];
+ /**
+ * Check if the incoming request contains the "Content-Type"
+ * header field, and it contains any of the give mime `type`s.
+ * If there is no request body, `null` is returned.
+ * If there is no content type, `false` is returned.
+ * Otherwise, it returns the first `type` that matches.
+ *
+ * Examples:
+ *
+ * // With Content-Type: text/html; charset=utf-8
+ * this.is('html'); // => 'html'
+ * this.is('text/html'); // => 'text/html'
+ * this.is('text/*', 'application/json'); // => 'text/html'
+ *
+ * // When Content-Type is application/json
+ * this.is('json', 'urlencoded'); // => 'json'
+ * this.is('application/json'); // => 'application/json'
+ * this.is('html', 'application/*'); // => 'application/json'
+ *
+ * this.is('html'); // => false
+ */
+ is(type: string): string|boolean;
+ is(types: string[]): string|boolean;
+ /**
+ * Return request header.
+ *
+ * The `Referrer` header field is special-cased,
+ * both `Referrer` and `Referer` are interchangeable.
+ *
+ * Examples:
+ *
+ * this.get('Content-Type');
+ * // => "text/plain"
+ *
+ * this.get('content-type');
+ * // => "text/plain"
+ *
+ * this.get('Something');
+ * // => undefined
+ */
+ get(field: string): string;
+ }
+
+ interface IResponse {
+ /**
+ * Get/Set response status code.
+ */
+ status: number;
+ /**
+ * Get/Set response status message
+ */
+ message: string;
+ /**
+ * Get/Set response body.
+ */
+ body: any;
+ /**
+ * Return parsed response Content-Length when present.
+ * Set Content-Length field to `n`.
+ */
+ length: number;
+ /**
+ * Check if a header has been written to the socket.
+ *
+ * @readonly
+ */
+ headerSent: boolean;
+ /**
+ * Vary on `field`.
+ */
+ vary(field: string): void;
+ /**
+ * Perform a 302 redirect to `url`.
+ *
+ * The string "back" is special-cased
+ * to provide Referrer support, when Referrer
+ * is not present `alt` or "/" is used.
+ *
+ * Examples:
+ *
+ * this.redirect('back');
+ * this.redirect('back', '/index.html');
+ * this.redirect('/login');
+ * this.redirect('http://google.com');
+ */
+ redirect(url: string): void;
+ redirect(url: string, alt: string): void;
+ /**
+ * Set Content-Disposition header to "attachment" with optional `filename`.
+ */
+ attachment(filename: string): void;
+ /**
+ * Return the response mime type void of
+ * parameters such as "charset".
+ *
+ * Set Content-Type response header with `type` through `mime.lookup()`
+ * when it does not contain a charset.
+ *
+ * Examples:
+ *
+ * this.type = '.html';
+ * this.type = 'html';
+ * this.type = 'json';
+ * this.type = 'application/json';
+ * this.type = 'png';
+ */
+ type: string;
+ /**
+ * Get the Last-Modified date in Date form, if it exists.
+ * Set the Last-Modified date using a string or a Date.
+ *
+ * this.response.lastModified = new Date();
+ * this.response.lastModified = '2013-09-13';
+ */
+ lastModified: Date;
+ /**
+ * Get the ETag of a response.
+ * Set the ETag of a response.
+ * This will normalize the quotes if necessary.
+ *
+ * this.response.etag = 'md5hashsum';
+ * this.response.etag = '"md5hashsum"';
+ * this.response.etag = 'W/"123456789"';
+ */
+ etag: string;
+ /**
+ * Set header `field` to `val`, or pass
+ * an object of header fields.
+ *
+ * Examples:
+ *
+ * this.set('Foo', ['bar', 'baz']);
+ * this.set('Accept', 'application/json');
+ * this.set({ Accept: 'text/plain', 'X-API-Key': 'tobi' });
+ */
+ set(field: any): void;
+ set(field: string, val: string): void;
+ set(field: string, val: any[]): void;
+ /**
+ * Append additional header `field` with value `val`.
+ *
+ * Examples:
+ *
+ * this.append('Link', ['', '']);
+ * this.append('Set-Cookie', 'foo=bar; Path=/; HttpOnly');
+ * this.append('Warning', '199 Miscellaneous warning');
+ */
+ append(field: string, val: string): void;
+ append(field: string, val: any[]): void;
+ /**
+ * Remove header `field`.
+ */
+ remove(field: string): void;
+ /**
+ * Checks if the request is writable.
+ * Tests for the existence of the socket
+ * as node sometimes does not set it.
+ *
+ * @readonly
+ * @private
+ */
+ writable: boolean;
+ }
+
+ module koa {
+ interface BaseRequest extends IRequest {
+ /**
+ * Get the charset when present or undefined.
+ *
+ * @readonly
+ */
+ charset: string;
+ /**
+ * Return parsed Content-Length when present.
+ *
+ * @readonly
+ */
+ length: number;
+ /**
+ * Return the request mime type void of
+ * parameters such as "charset".
+ *
+ * @readonly
+ */
+ type: string;
+ /**
+ * Inspect implementation.
+ */
+ inspect(): any;
+ /**
+ * Return JSON representation.
+ */
+ toJSON(): any;
+ }
+
+ interface BaseResponse extends IResponse {
+ /**
+ * Return the request socket.
+ *
+ * @readonly
+ */
+ socket: net.Socket;
+ /**
+ * Return response header.
+ *
+ * @readonly
+ */
+ header: any;
+ /**
+ * Return response header, alias as response.header
+ */
+ headers: any;
+ /**
+ * Check whether the response is one of the listed types.
+ * Pretty much the same as `this.request.is()`.
+ */
+ is(type: string): string|boolean;
+ is(types: string[]): string|boolean;
+ /**
+ * Return response header.
+ *
+ * Examples:
+ *
+ * this.get('Content-Type');
+ * // => "text/plain"
+ *
+ * this.get('content-type');
+ * // => "text/plain"
+ */
+ get(field: string): string;
+ /**
+ * Inspect implementation.
+ */
+ inspect(): any;
+ /**
+ * Return JSON representation.
+ */
+ toJSON(): any;
+ }
+
+ interface BaseContext extends IRequest, IResponse {
+ /**
+ * util.inspect() implementation, which
+ * just returns the JSON output.
+ */
+ inspect(): any;
+ /**
+ * Return JSON representation.
+ *
+ * Here we explicitly invoke .toJSON() on each
+ * object, as iteration will otherwise fail due
+ * to the getters and cause utilities such as
+ * clone() to fail.
+ */
+ toJSON(): any;
+ /**
+ * Similar to .throw(), adds assertion.
+ *
+ * this.assert(this.user, 401, 'Please login!');
+ *
+ * See: https://github.com/jshttp/http-assert
+ */
+ assert(test: any, status: number, message: string): void;
+ /**
+ * Throw an error with `msg` and optional `status`
+ * defaulting to 500. Note that these are user-level
+ * errors, and the message may be exposed to the client.
+ *
+ * this.throw(403)
+ * this.throw('name required', 400)
+ * this.throw(400, 'name required')
+ * this.throw('something exploded')
+ * this.throw(new Error('invalid'), 400);
+ * this.throw(400, new Error('invalid'));
+ *
+ * See: https://github.com/jshttp/http-errors
+ */
+ throw(...args: any[]): void;
+ /**
+ * Default error handling.
+ *
+ * @private
+ */
+ onerror(err: Error): void;
+ }
+
+ interface Request extends BaseRequest {
+ app: Application;
+ ctx: Context;
+ response: Response;
+ req: http.IncomingMessage;
+ res: http.ServerResponse;
+ }
+
+ interface Response extends BaseResponse {
+ app: Application;
+ ctx: Context;
+ request: Request;
+ req: http.IncomingMessage;
+ res: http.ServerResponse;
+ }
+
+ interface Context extends BaseContext {
+ request: Request;
+ response: Response;
+ app: Application;
+ req: http.IncomingMessage;
+ res: http.ServerResponse;
+ originalUrl: string;
+ cookies: Cookies.ICookies;
+ accept: any;
+ state: any;
+ }
+
+ interface Application extends events.EventEmitter {
+ env: string;
+ subdomainOffset: number;
+ middleware: any[];
+ proxy: boolean;
+ context: BaseContext;
+ request: BaseRequest;
+ response: BaseResponse;
+ /**
+ * Shorthand for:
+ *
+ * http.createServer(app.callback()).listen(...)
+ */
+ listen(port: number, hostname?: string, backlog?: number, callback?: Function): http.Server;
+ listen(port: number, hostname?: string, callback?: Function): http.Server;
+ listen(path: string, callback?: Function): http.Server;
+ listen(handle: any, listeningListener?: Function): http.Server;
+ /**
+ * Return JSON representation.
+ * We only bother showing settings.
+ */
+ inspect(): any;
+ /**
+ * Return JSON representation.
+ * We only bother showing settings.
+ */
+ toJSON(): any;
+ /**
+ * Use the given middleware `fn`.
+ */
+ use(fn: Function): Application;
+ /**
+ * Return a request handler callback
+ * for node's native http server.
+ */
+ callback(): (req: http.IncomingMessage, res: http.ServerResponse) => void;
+ /**
+ * Initialize a new context.
+ *
+ * @private
+ */
+ createContext(req: http.IncomingMessage, res: http.ServerResponse): Context;
+ /**
+ * Default error handler.
+ *
+ * @private
+ */
+ onerror(err: Error): void;
+ }
+ }
+
+ interface KoaStatic {
+ new (): koa.Application;
+ (): koa.Application;
+ }
+
+ var koa: KoaStatic;
+
+ export = koa;
+}
\ No newline at end of file
diff --git a/koa/koa.d.ts b/koa/koa.d.ts
index 450134278..6d9fcd279 100644
--- a/koa/koa.d.ts
+++ b/koa/koa.d.ts
@@ -8,6 +8,10 @@
import * as Koa from "koa"
const app = new Koa()
+ async function (ctx: Koa.Context, next: Function) {
+ // ...
+ }
+
=============================================== */
///
@@ -16,99 +20,101 @@ declare module "koa" {
import * as http from "http";
import * as net from "net";
- interface IContext extends IRequest, IResponse {
- body?: any;
- request?: IRequest;
- response?: IResponse;
- originalUrl?: string;
- state?: any;
- name?: string;
- cookies?: any;
- writable?: Boolean;
- respond?: Boolean;
- app?: Koa;
- req?: http.IncomingMessage;
- res?: http.ServerResponse;
- onerror(err: any): void;
- toJSON(): any;
- inspect(): any;
- throw(): void;
- assert(): void;
- }
+ module Koa {
+ export interface Context extends Request, Response {
+ body?: any;
+ request?: Request;
+ response?: Response;
+ originalUrl?: string;
+ state?: any;
+ name?: string;
+ cookies?: any;
+ writable?: Boolean;
+ respond?: Boolean;
+ app?: Koa;
+ req?: http.IncomingMessage;
+ res?: http.ServerResponse;
+ onerror(err: any): void;
+ toJSON(): any;
+ inspect(): any;
+ throw(code?: any, message?: any): void;
+ assert(): void;
+ }
- interface IRequest {
- _querycache?: string;
- app?: Koa;
- req?: http.IncomingMessage;
- res?: http.ServerResponse;
- response?: IResponse;
- ctx?: IContext;
- headers?: any;
- header?: any;
- method?: string;
- length?: any;
- url?: string;
- origin?: string;
- originalUrl?: string;
- href?: string;
- path?: string;
- querystring?: string;
- query?: any;
- search?: string;
- idempotent?: Boolean;
- socket?: net.Socket;
- protocol?: string;
- host?: string;
- hostname?: string;
- fresh?: Boolean;
- stale?: Boolean;
- charset?: string;
- secure?: Boolean;
- ips?: Array;
- ip?: string;
- subdomains?: Array;
- accept?: any;
- type?: string;
- accepts?: () => any;
- acceptsEncodings?: () => any;
- acceptsCharsets?: () => any;
- acceptsLanguages?: () => any;
- is?: (types: any) => any;
- toJSON?: () => any;
- inspect?: () => any;
- get?: (field: string) => string;
- }
+ export interface Request {
+ _querycache?: string;
+ app?: Koa;
+ req?: http.IncomingMessage;
+ res?: http.ServerResponse;
+ response?: Response;
+ ctx?: Context;
+ headers?: any;
+ header?: any;
+ method?: string;
+ length?: any;
+ url?: string;
+ origin?: string;
+ originalUrl?: string;
+ href?: string;
+ path?: string;
+ querystring?: string;
+ query?: any;
+ search?: string;
+ idempotent?: Boolean;
+ socket?: net.Socket;
+ protocol?: string;
+ host?: string;
+ hostname?: string;
+ fresh?: Boolean;
+ stale?: Boolean;
+ charset?: string;
+ secure?: Boolean;
+ ips?: Array;
+ ip?: string;
+ subdomains?: Array;
+ accept?: any;
+ type?: string;
+ accepts?: () => any;
+ acceptsEncodings?: () => any;
+ acceptsCharsets?: () => any;
+ acceptsLanguages?: () => any;
+ is?: (types: any) => any;
+ toJSON?: () => any;
+ inspect?: () => any;
+ get?: (field: string) => string;
+ }
- interface IResponse {
- _body?: any;
- _explicitStatus?: Boolean;
- app?: Koa;
- res?: http.ServerResponse;
- req?: http.IncomingMessage;
- ctx?: IContext;
- request?: IRequest;
- socket?: net.Socket;
- header?: any;
- headers?: any;
- status?: number;
- message?: string;
- type?: string;
- body?: any;
- length?: any;
- headerSent?: Boolean;
- lastModified?: Date;
- etag?: string;
- writable?: Boolean;
- is?: (types: any) => any;
- redirect?: (url: string, alt: string) => void;
- attachment?: (filename?: string) => void;
- vary?: (field: string) => void;
- get?: (field: string) => string;
- set?: (field: any, val: any) => void;
- remove?: (field: string) => void;
- append?: (field: string, val: any) => void;
- toJSON?: () => any;
- inspect?: () => any;
+ export interface Response {
+ _body?: any;
+ _explicitStatus?: Boolean;
+ app?: Koa;
+ res?: http.ServerResponse;
+ req?: http.IncomingMessage;
+ ctx?: Context;
+ request?: Request;
+ socket?: net.Socket;
+ header?: any;
+ headers?: any;
+ status?: number;
+ message?: string;
+ type?: string;
+ body?: any;
+ length?: any;
+ headerSent?: Boolean;
+ lastModified?: Date;
+ etag?: string;
+ writable?: Boolean;
+ is?: (types: any) => any;
+ redirect?: (url: string, alt: string) => void;
+ attachment?: (filename?: string) => void;
+ vary?: (field: string) => void;
+ get?: (field: string) => string;
+ set?: (field: any, val: any) => void;
+ remove?: (field: string) => void;
+ append?: (field: string, val: any) => void;
+ toJSON?: () => any;
+ inspect?: () => any;
+ }
}
class Koa extends EventEmitter {
@@ -117,12 +123,12 @@ declare module "koa" {
proxy: Boolean;
server: http.Server;
env: string;
- context: IContext;
- request: IRequest;
- response: IResponse;
+ context: Koa.Context;
+ request: Koa.Request;
+ response: Koa.Response;
silent: Boolean;
constructor();
- use(middleware: (ctx: IContext, next: Function) => any): Koa;
+ use(middleware: (ctx: Koa.Context, next: Function) => any): Koa;
callback(): (req: http.IncomingMessage, res: http.ServerResponse) => void;
listen(port: number, callback?: Function): http.Server;
toJSON(): any;
@@ -131,6 +137,5 @@ declare module "koa" {
}
namespace Koa {}
-
export = Koa;
}
diff --git a/leaflet-draw/leaflet-draw-tests.ts b/leaflet-draw/leaflet-draw-tests.ts
new file mode 100644
index 000000000..9a1ed0930
--- /dev/null
+++ b/leaflet-draw/leaflet-draw-tests.ts
@@ -0,0 +1,47 @@
+///
+///
+
+
+var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+ osmAttrib = '© OpenStreetMap contributors',
+ osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib}),
+ map = new L.Map('map', {layers: [osm], center: new L.LatLng(-37.7772, 175.2756), zoom: 15 });
+
+var drawnItems = new L.FeatureGroup();
+map.addLayer(drawnItems);
+
+var drawControl = new L.Control.Draw({
+ position: 'topleft' ,
+ draw: {
+ polygon: {
+ allowIntersection: false,
+ drawError: {
+ color: '#b00b00',
+ timeout: 1000
+ },
+ shapeOptions: {
+ color: '#bada55'
+ },
+ showArea: true
+ },
+ polyline: {
+ metric: false
+ },
+ circle: {
+ shapeOptions: {
+ color: '#662d91'
+ }
+ }
+ },
+ edit: {
+ featureGroup: drawnItems
+ }
+});
+map.addControl(drawControl);
+
+map.on('draw:created', function (e: L.DrawEvents.Created) {
+ var type = e.layerType,
+ layer = e.layer;
+
+ drawnItems.addLayer(layer);
+});
\ No newline at end of file
diff --git a/leaflet-draw/leaflet-draw.d.ts b/leaflet-draw/leaflet-draw.d.ts
new file mode 100644
index 000000000..c6182a4d6
--- /dev/null
+++ b/leaflet-draw/leaflet-draw.d.ts
@@ -0,0 +1,333 @@
+// Type definitions for leaflet-draw 0.2.4
+// Project: https://github.com/Leaflet/Leaflet.draw
+// Definitions by: Matt Guest
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+///
+
+declare module L {
+ export interface MapOptions {
+ drawControl?: boolean;
+ }
+
+ export interface ControlStatic {
+ Draw: Control.DrawStatic;
+ }
+
+ module Control {
+
+ export interface DrawStatic {
+ new (options?: IDrawConstructorOptions): Draw;
+ }
+
+ export interface IDrawConstructorOptions {
+
+ /**
+ * The initial position of the control (one of the map corners).
+ *
+ * Default value: 'topleft'
+ */
+ position?: string;
+
+ /**
+ * The options used to configure the draw toolbar.
+ *
+ * Default value: {}
+ */
+ draw?: DrawOptions;
+
+ /**
+ * The options used to configure the edit toolbar.
+ *
+ * Default value: false
+ */
+ edit: EditOptions;
+
+ }
+
+ export interface DrawOptions {
+
+ /**
+ * Polyline draw handler options. Set to false to disable handler.
+ *
+ * Default value: {}
+ */
+ polyline?: DrawOptions.PolylineOptions;
+
+ /**
+ * Polygon draw handler options. Set to false to disable handler.
+ *
+ * Default value: {}
+ */
+ polygon?: DrawOptions.PolygonOptions;
+
+ /**
+ * Rectangle draw handler options. Set to false to disable handler.
+ *
+ * Default value: {}
+ */
+ rectangle?: DrawOptions.RectangleOptions;
+
+ /**
+ * Circle draw handler options. Set to false to disable handler.
+ *
+ * Default value: {}
+ */
+ circle?: DrawOptions.CircleOptions;
+
+ /**
+ * Marker draw handler options. Set to false to disable handler.
+ *
+ * Default value: {}
+ */
+ marker?: DrawOptions.MarkerOptions;
+ }
+
+ export interface EditOptions {
+
+ /**
+ * This is the FeatureGroup that stores all editable shapes.
+ * THIS IS REQUIRED FOR THE EDIT TOOLBAR TO WORK
+ *
+ * Default value: null
+ */
+ featureGroup: FeatureGroup;
+
+ /**
+ * Edit handler options. Set to false to disable handler.
+ *
+ * Default value: null
+ */
+ edit?: DrawOptions.EditHandlerOptions;
+
+ /**
+ * Delete handler options. Set to false to disable handler.
+ *
+ * Default value: null
+ */
+ remove?: DrawOptions.DeleteHandlerOptions;
+ }
+
+ export interface Draw extends IControl {
+
+ }
+ }
+
+
+ module DrawOptions {
+
+ export interface PolylineOptions {
+
+ /**
+ * Determines if line segments can cross.
+ *
+ * Default value: true
+ */
+ allowIntersection?: boolean;
+
+ /**
+ * Configuration options for the error that displays if an intersection is detected.
+ *
+ * Default value: See code
+ */
+ drawError?: any;
+
+ /**
+ * Distance in pixels between each guide dash.
+ *
+ * Default value: 20
+ */
+ guidelineDistance?: number;
+
+ /**
+ * The options used when drawing the polyline/polygon on the map.
+ *
+ * Default value: See code
+ */
+ shapeOptions?: L.PolylineOptions;
+
+ /**
+ * Determines which measurement system (metric or imperial) is used.
+ *
+ * Default value: true
+ */
+ metric?: boolean;
+
+ /**
+ * This should be a high number to ensure that you can draw over all other layers on the map.
+ *
+ * Default value: 2000
+ */
+ zIndexOffset?: number;
+
+ /**
+ * Determines if the draw tool remains enabled after drawing a shape.
+ *
+ * Default value: false
+ */
+ repeatMode?: boolean;
+ }
+
+ export interface PolygonOptions extends PolylineOptions {
+
+ /**
+ * Show the area of the drawn polygon in m², ha or km².
+ * The area is only approximate and become less accurate the larger the polygon is.
+ *
+ * Default value: false
+ */
+ showArea?: boolean;
+ }
+
+ export interface RectangleOptions {
+
+ /**
+ * The options used when drawing the rectangle on the map.
+ *
+ * Default value: See code
+ */
+ shapeOptions?: L.PathOptions;
+
+ /**
+ * Determines if the draw tool remains enabled after drawing a shape.
+ *
+ * Default value: false
+ */
+ repeatMode?: boolean;
+ }
+
+ export interface CircleOptions {
+
+ /**
+ * The options used when drawing the circle on the map.
+ *
+ * Default value: See code
+ */
+ shapeOptions?: L.PathOptions;
+
+ /**
+ * Determines if the draw tool remains enabled after drawing a shape.
+ *
+ * Default value: false
+ */
+ repeatMode?: boolean;
+ }
+
+ export interface MarkerOptions {
+
+ /**
+ * TThe icon displayed when drawing a marker.
+ *
+ * Default value: L.Icon.Default()
+ */
+ icon?: L.Icon;
+
+ /**
+ * This should be a high number to ensure that you can draw over all other layers on the map.
+ *
+ * Default value: 2000
+ */
+ zIndexOffset?: number;
+
+ /**
+ * Determines if the draw tool remains enabled after drawing a shape.
+ *
+ * Default value: false
+ */
+ repeatMode?: boolean;
+ }
+
+ export interface EditHandlerOptions {
+ /**
+ * The path options for how the layers will look while in edit mode.
+ * If this is set to null the editable path options will not be set.
+ *
+ * Default value: See code
+ */
+ selectedPathOptions?: L.PathOptions;
+ }
+
+ export interface DeleteHandlerOptions {
+ }
+
+ }
+
+ module DrawEvents {
+
+ export interface Created {
+
+ /**
+ * Layer that was just created.
+ */
+ layer: ILayer;
+
+ /**
+ * The type of layer this is. One of: polyline, polygon, rectangle, circle, marker.
+ */
+ layerType: string;
+ }
+
+ export interface Edited {
+
+ /**
+ * List of all layers just edited on the map.
+ */
+ layers: LayerGroup;
+ }
+
+ /**
+ * Triggered when layers have been removed (and saved) from the FeatureGroup.
+ */
+ export interface Deleted {
+
+ /**
+ * List of all layers just removed from the map.
+ */
+ layers: LayerGroup;
+ }
+
+ export interface DrawStart {
+
+ /**
+ * The type of layer this is. One of: polyline, polygon, rectangle, circle, marker
+ */
+ layerType: string;
+ }
+
+ export interface DrawStop {
+
+ /**
+ * The type of layer this is. One of: polyline, polygon, rectangle, circle, marker
+ */
+ layerType: string;
+ }
+
+ export interface EditStart {
+ /**
+ * The type of edit this is. One of: edit
+ */
+ handler: string;
+ }
+
+ export interface EditStop {
+ /**
+ * The type of edit this is. One of: edit
+ */
+ handler: string;
+ }
+
+ export interface DeleteStart {
+ /**
+ * The type of edit this is. One of: remove
+ */
+ handler: string;
+ }
+
+ export interface DeleteStop {
+ /**
+ * The type of edit this is. One of: remove
+ */
+ handler: string;
+ }
+ }
+}
\ No newline at end of file
diff --git a/lodash/lodash-3.10.d.ts b/lodash/lodash-3.10.d.ts
index c570cc11c..00f15d254 100644
--- a/lodash/lodash-3.10.d.ts
+++ b/lodash/lodash-3.10.d.ts
@@ -230,7 +230,6 @@ declare module _ {
interface LoDashExplicitObjectWrapper extends LoDashExplicitWrapperBase> { }
interface LoDashImplicitArrayWrapper extends LoDashImplicitWrapperBase> {
- join(seperator?: string): string;
pop(): T;
push(...items: T[]): LoDashImplicitArrayWrapper;
shift(): T;
@@ -246,6 +245,49 @@ declare module _ {
interface LoDashExplicitNumberArrayWrapper extends LoDashExplicitArrayWrapper { }
+ // join (exists only in wrappers)
+ interface LoDashImplicitWrapper {
+ /**
+ * @see _.join
+ */
+ join(separator?: string): string;
+ }
+
+ interface LoDashImplicitArrayWrapper {
+ /**
+ * @see _.join
+ */
+ join(separator?: string): string;
+ }
+
+ interface LoDashImplicitObjectWrapper {
+ /**
+ * @see _.join
+ */
+ join(separator?: string): string;
+ }
+
+ interface LoDashExplicitWrapper {
+ /**
+ * @see _.join
+ */
+ join(separator?: string): LoDashExplicitWrapper;
+ }
+
+ interface LoDashExplicitArrayWrapper {
+ /**
+ * @see _.join
+ */
+ join(separator?: string): LoDashExplicitWrapper;
+ }
+
+ interface LoDashExplicitObjectWrapper {
+ /**
+ * @see _.join
+ */
+ join(separator?: string): LoDashExplicitWrapper;
+ }
+
/*********
* Array *
*********/
@@ -10432,19 +10474,27 @@ declare module _ {
/**
* Checks if value is empty. A value is considered empty unless it’s an arguments object, array, string, or
* jQuery-like collection with a length greater than 0 or an object with own enumerable properties.
+ *
* @param value The value to inspect.
* @return Returns true if value is empty, else false.
- **/
- isEmpty(value?: any[]|Dictionary|string|any): boolean;
+ */
+ isEmpty(value?: any): boolean;
}
- interface LoDashImplicitWrapperBase {
+ interface LoDashImplicitWrapperBase {
/**
* @see _.isEmpty
*/
isEmpty(): boolean;
}
+ interface LoDashExplicitWrapperBase {
+ /**
+ * @see _.isEmpty
+ */
+ isEmpty(): LoDashExplicitWrapper;
+ }
+
//_.isEqual
interface IsEqualCustomizer {
(value: any, other: any, indexOrKey?: number|string): boolean;
@@ -14183,21 +14233,21 @@ declare module _ {
* @param func The function to attempt.
* @return Returns the func result or error object.
*/
- attempt(func: (...args: any[]) => TResult): TResult|Error;
+ attempt(func: (...args: any[]) => TResult, ...args: any[]): TResult|Error;
}
interface LoDashImplicitObjectWrapper {
/**
* @see _.attempt
*/
- attempt(): TResult|Error;
+ attempt(...args: any[]): TResult|Error;
}
interface LoDashExplicitObjectWrapper {
/**
* @see _.attempt
*/
- attempt(): LoDashExplicitObjectWrapper;
+ attempt(...args: any[]): LoDashExplicitObjectWrapper;
}
//_.callback
diff --git a/lodash/lodash-tests-3.10.ts b/lodash/lodash-tests-3.10.ts
index efe2e1b3e..59f246172 100644
--- a/lodash/lodash-tests-3.10.ts
+++ b/lodash/lodash-tests-3.10.ts
@@ -133,7 +133,6 @@ module TestWrapper {
}
//Wrapped array shortcut methods
-result = _([1, 2, 3, 4]).join(',');
result = _([1, 2, 3, 4]).pop();
result = <_.LoDashImplicitArrayWrapper>_([1, 2, 3, 4]).push(5, 6, 7);
result = _([1, 2, 3, 4]).shift();
@@ -142,6 +141,34 @@ result = <_.LoDashImplicitArrayWrapper>_([1, 2, 3, 4]).splice(1);
result = <_.LoDashImplicitArrayWrapper>_([1, 2, 3, 4]).splice(1, 2, 5, 6);
result = <_.LoDashImplicitArrayWrapper>_([1, 2, 3, 4]).unshift(5, 6);
+// join (exists only in wrappers)
+namespace TestJoin {
+ let array = [1, 2];
+ let list = {0: 1, 1: 2, length: 2};
+
+ {
+ let result: string;
+
+ result = _('abc').join();
+ result = _('abc').join('_');
+ result = _(array).join();
+ result = _(array).join('_');
+ result = _(list).join();
+ result = _(list).join('_');
+ }
+
+ {
+ let result: _.LoDashExplicitWrapper;
+
+ result = _('abc').chain().join();
+ result = _('abc').chain().join('_');
+ result = _(array).chain().join();
+ result = _(array).chain().join('_');
+ result = _(list).chain().join();
+ result = _(list).chain().join('_');
+ }
+}
+
/*********
* Array *
*********/
@@ -6574,12 +6601,26 @@ module TestIsElement {
}
// _.isEmpty
-result = _.isEmpty([1, 2, 3]);
-result = _.isEmpty({});
-result = _.isEmpty('');
-result = _([1, 2, 3]).isEmpty();
-result = _({}).isEmpty();
-result = _('').isEmpty();
+module TestIsEmpty {
+ {
+ let result: boolean;
+
+ result = _.isEmpty(any);
+ result = _(1).isEmpty();
+ result = _('').isEmpty();
+ result = _([]).isEmpty();
+ result = _({}).isEmpty();
+ }
+
+ {
+ let result: _.LoDashExplicitWrapper;
+
+ result = _(1).chain().isEmpty();
+ result = _('').chain().isEmpty();
+ result = _([]).chain().isEmpty();
+ result = _({}).chain().isEmpty();
+ }
+}
// _.isEqual
module TestIsEqual {
@@ -9239,13 +9280,16 @@ module TestAttempt {
let result: {a: string}|Error;
result = _.attempt<{a: string}>(func);
+ result = _.attempt<{a: string}>(func, 'foo', 'bar', 'baz');
result = _(func).attempt<{a: string}>();
+ result = _(func).attempt<{a: string}>('foo', 'bar', 'baz');
}
{
let result: _.LoDashExplicitObjectWrapper<{a: string}|Error>;
result = _(func).chain().attempt<{a: string}>();
+ result = _(func).chain().attempt<{a: string}>('foo', 'bar', 'baz');
}
}
diff --git a/lodash/lodash-tests.ts b/lodash/lodash-tests.ts
index af33b66ac..a7d3a72b8 100644
--- a/lodash/lodash-tests.ts
+++ b/lodash/lodash-tests.ts
@@ -133,7 +133,6 @@ module TestWrapper {
}
//Wrapped array shortcut methods
-result = _([1, 2, 3, 4]).join(',');
result = _([1, 2, 3, 4]).pop();
result = <_.LoDashImplicitArrayWrapper>_([1, 2, 3, 4]).push(5, 6, 7);
result = _([1, 2, 3, 4]).shift();
@@ -941,6 +940,41 @@ module TestIntersection {
}
}
+// _.join
+namespace TestJoin {
+ let array = [1, 2];
+ let list = {0: 1, 1: 2, length: 2};
+
+ {
+ let result: string;
+
+ result = _.join('abc');
+ result = _.join('abc', '_');
+ result = _.join(array);
+ result = _.join(array, '_');
+ result = _.join(list);
+ result = _.join(list, '_');
+
+ result = _('abc').join();
+ result = _('abc').join('_');
+ result = _(array).join();
+ result = _(array).join('_');
+ result = _(list).join();
+ result = _(list).join('_');
+ }
+
+ {
+ let result: _.LoDashExplicitWrapper;
+
+ result = _('abc').chain().join();
+ result = _('abc').chain().join('_');
+ result = _(array).chain().join();
+ result = _(array).chain().join('_');
+ result = _(list).chain().join();
+ result = _(list).chain().join('_');
+ }
+}
+
// _.last
module TestLast {
let array: TResult[];
@@ -5894,12 +5928,26 @@ module TestIsElement {
}
// _.isEmpty
-result = _.isEmpty([1, 2, 3]);
-result = _.isEmpty({});
-result = _.isEmpty('');
-result = _([1, 2, 3]).isEmpty();
-result = _({}).isEmpty();
-result = _('').isEmpty();
+module TestIsEmpty {
+ {
+ let result: boolean;
+
+ result = _.isEmpty(any);
+ result = _(1).isEmpty();
+ result = _('').isEmpty();
+ result = _([]).isEmpty();
+ result = _({}).isEmpty();
+ }
+
+ {
+ let result: _.LoDashExplicitWrapper;
+
+ result = _(1).chain().isEmpty();
+ result = _('').chain().isEmpty();
+ result = _([]).chain().isEmpty();
+ result = _({}).chain().isEmpty();
+ }
+}
// _.isEqual
module TestIsEqual {
@@ -9396,13 +9444,16 @@ module TestAttempt {
let result: {a: string}|Error;
result = _.attempt<{a: string}>(func);
+ result = _.attempt<{a: string}>(func, 'foo', 'bar', 'baz');
result = _(func).attempt<{a: string}>();
+ result = _(func).attempt<{a: string}>('foo', 'bar', 'baz');
}
{
let result: _.LoDashExplicitObjectWrapper<{a: string}|Error>;
result = _(func).chain().attempt<{a: string}>();
+ result = _(func).chain().attempt<{a: string}>('foo', 'bar', 'baz');
}
}
@@ -9830,6 +9881,36 @@ module TestNoop {
}
}
+// _.over
+namespace TestOver {
+ {
+ let result: (...args: any[]) => number[];
+
+ result = _.over(Math.max);
+ result = _.over(Math.max, Math.min);
+ result = _.over([Math.max]);
+ result = _.over([Math.max], [Math.min]);
+ }
+
+ {
+ let result: _.LoDashImplicitObjectWrapper<(...args: any[]) => number[]>;
+
+ result = _(Math.max).over();
+ result = _(Math.max).over(Math.min);
+ result = _([Math.max]).over();
+ result = _([Math.max]).over([Math.min]);
+ }
+
+ {
+ let result: _.LoDashExplicitObjectWrapper<(...args: any[]) => number[]>;
+
+ result = _(Math.max).chain().over();
+ result = _(Math.max).chain().over(Math.min);
+ result = _([Math.max]).chain().over();
+ result = _([Math.max]).chain().over([Math.min]);
+ }
+}
+
// _.property
module TestProperty {
interface SampleObject {
diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts
index f9249d16b..e5f938b54 100644
--- a/lodash/lodash.d.ts
+++ b/lodash/lodash.d.ts
@@ -256,7 +256,7 @@ declare module _ {
* keyBy, initial, intersection, invert, invoke, keys, map, max, memoize, merge, min,
* object, omit, once, pairs, partial, partialRight, pick, pluck, pull, push, range, reject,
* remove, rest, reverse, sample, shuffle, slice, sort, sortBy, splice, tap, throttle, times,
- * toArray, transform, union, uniq, unshift, unzip, values, where, without, wrap, and zip
+ * toArray, transform, union, uniq, unset, unshift, unzip, values, where, without, wrap, and zip
*
* The non-chainable wrapper functions are:
* clone, cloneDeep, contains, escape, every, find, findIndex, findKey, findLast,
@@ -375,7 +375,6 @@ declare module _ {
interface LoDashExplicitObjectWrapper extends LoDashExplicitWrapperBase> { }
interface LoDashImplicitArrayWrapper extends LoDashImplicitWrapperBase> {
- join(seperator?: string): string;
pop(): T;
push(...items: T[]): LoDashImplicitArrayWrapper;
shift(): T;
@@ -1676,26 +1675,61 @@ declare module _ {
): any[];
}
- //_.join DUMMY
+ //_.join
interface LoDashStatic {
/**
* Converts all elements in `array` into a string separated by `separator`.
*
- * @static
- * @memberOf _
- * @category Array
- * @param {Array} array The array to convert.
- * @param {string} [separator=','] The element separator.
- * @returns {string} Returns the joined string.
- * @example
- *
- * _.join(['a', 'b', 'c'], '~');
- * // => 'a~b~c'
+ * @param array The array to convert.
+ * @param separator The element separator.
+ * @returns Returns the joined string.
*/
join(
- array: any[]|List,
- ...values: any[]
- ): any[];
+ array: List,
+ separator?: string
+ ): string;
+ }
+
+ interface LoDashImplicitWrapper {
+ /**
+ * @see _.join
+ */
+ join(separator?: string): string;
+ }
+
+ interface LoDashImplicitArrayWrapper {
+ /**
+ * @see _.join
+ */
+ join(separator?: string): string;
+ }
+
+ interface LoDashImplicitObjectWrapper {
+ /**
+ * @see _.join
+ */
+ join(separator?: string): string;
+ }
+
+ interface LoDashExplicitWrapper {
+ /**
+ * @see _.join
+ */
+ join(separator?: string): LoDashExplicitWrapper;
+ }
+
+ interface LoDashExplicitArrayWrapper {
+ /**
+ * @see _.join
+ */
+ join(separator?: string): LoDashExplicitWrapper;
+ }
+
+ interface LoDashExplicitObjectWrapper {
+ /**
+ * @see _.join
+ */
+ join(separator?: string): LoDashExplicitWrapper;
}
//_.pullAll DUMMY
@@ -4236,6 +4270,21 @@ declare module _ {
): any[];
}
+ //_.unset
+ interface LoDashStatic {
+ /**
+ * Removes the property at path of object.
+ *
+ * @param object The object to modify.
+ * @param path The path of the property to unset.
+ * @return Returns true if the property is deleted, else false.
+ */
+ unset(
+ object: T,
+ path: StringRepresentable | StringRepresentable[]
+ ): boolean;
+ }
+
//_.unzip
interface LoDashStatic {
/**
@@ -10009,19 +10058,27 @@ declare module _ {
/**
* Checks if value is empty. A value is considered empty unless it’s an arguments object, array, string, or
* jQuery-like collection with a length greater than 0 or an object with own enumerable properties.
+ *
* @param value The value to inspect.
* @return Returns true if value is empty, else false.
- **/
- isEmpty(value?: any[]|Dictionary|string|any): boolean;
+ */
+ isEmpty(value?: any): boolean;
}
- interface LoDashImplicitWrapperBase {
+ interface LoDashImplicitWrapperBase {
/**
* @see _.isEmpty
*/
isEmpty(): boolean;
}
+ interface LoDashExplicitWrapperBase {
+ /**
+ * @see _.isEmpty
+ */
+ isEmpty(): LoDashExplicitWrapper;
+ }
+
//_.isEqual
interface LoDashStatic {
/**
@@ -15653,21 +15710,21 @@ declare module _ {
* @param func The function to attempt.
* @return Returns the func result or error object.
*/
- attempt(func: (...args: any[]) => TResult): TResult|Error;
+ attempt(func: (...args: any[]) => TResult, ...args: any[]): TResult|Error;
}
interface LoDashImplicitObjectWrapper {
/**
* @see _.attempt
*/
- attempt(): TResult|Error;
+ attempt(...args: any[]): TResult|Error;
}
interface LoDashExplicitObjectWrapper {
/**
* @see _.attempt
*/
- attempt(): LoDashExplicitObjectWrapper;
+ attempt(...args: any[]): LoDashExplicitObjectWrapper;
}
//_.constant
@@ -16138,6 +16195,46 @@ declare module _ {
noop(...args: any[]): _.LoDashExplicitWrapper;
}
+ //_.over
+ interface LoDashStatic {
+ /**
+ * Creates a function that invokes iteratees with the arguments provided to the created function and returns
+ * their results.
+ *
+ * @param iteratees The iteratees to invoke.
+ * @return Returns the new function.
+ */
+ over(...iteratees: (Function|Function[])[]): (...args: any[]) => TResult[];
+ }
+
+ interface LoDashImplicitArrayWrapper {
+ /**
+ * @see _.over
+ */
+ over(...iteratees: (Function|Function[])[]): LoDashImplicitObjectWrapper<(...args: any[]) => TResult[]>;
+ }
+
+ interface LoDashImplicitObjectWrapper {
+ /**
+ * @see _.over
+ */
+ over(...iteratees: (Function|Function[])[]): LoDashImplicitObjectWrapper<(...args: any[]) => TResult[]>;
+ }
+
+ interface LoDashExplicitArrayWrapper {
+ /**
+ * @see _.over
+ */
+ over(...iteratees: (Function|Function[])[]): LoDashExplicitObjectWrapper<(...args: any[]) => TResult[]>;
+ }
+
+ interface LoDashExplicitObjectWrapper {
+ /**
+ * @see _.over
+ */
+ over(...iteratees: (Function|Function[])[]): LoDashExplicitObjectWrapper<(...args: any[]) => TResult[]>;
+ }
+
//_.property
interface LoDashStatic {
/**
diff --git a/moment-timezone/moment-timezone-tests.ts b/moment-timezone/moment-timezone-tests.ts
index d2cee664d..d01ea027c 100644
--- a/moment-timezone/moment-timezone-tests.ts
+++ b/moment-timezone/moment-timezone-tests.ts
@@ -77,3 +77,5 @@ moment.tz.load({
moment.tz.names();
moment.tz.setDefault('America/Los_Angeles');
+
+moment.tz.guess();
diff --git a/moment-timezone/moment-timezone.d.ts b/moment-timezone/moment-timezone.d.ts
index 5e1ea09be..407f99d5d 100644
--- a/moment-timezone/moment-timezone.d.ts
+++ b/moment-timezone/moment-timezone.d.ts
@@ -68,6 +68,7 @@ interface MomentTimezone {
}): void;
names(): string[];
+ guess(): MomentZone;
setDefault(timezone: string): void;
}
diff --git a/mongodb/mongodb-1.4.9-tests.ts b/mongodb/mongodb-1.4.9-tests.ts
new file mode 100644
index 000000000..3f3efbb55
--- /dev/null
+++ b/mongodb/mongodb-1.4.9-tests.ts
@@ -0,0 +1,30 @@
+///
+
+// Test source : https://github.com/mongodb/node-mongodb-native
+import mongodb = require('mongodb');
+var MongoClient = mongodb.MongoClient;
+
+var format = require('util').format;
+MongoClient.connect('mongodb://127.0.0.1:27017/test', function (err, db) {
+ if (err) throw err;
+
+ var collection = db.collection('test_insert');
+ collection.insert({ a: 2 }, function (err, docs) {
+
+ collection.count(function (err, count) {
+ console.log(format("count = %s", count));
+ });
+
+ // Locate all the entries using find
+ collection.find().toArray(function (err, results) {
+ console.dir(results);
+ // Let's close the db
+ db.close();
+ });
+
+ // Get some statistics
+ collection.stats(function (err, stats) {
+ console.log(stats.count + " documents");
+ });
+ });
+})
diff --git a/mongodb/mongodb-1.4.9.d.ts b/mongodb/mongodb-1.4.9.d.ts
new file mode 100644
index 000000000..2458dbdf2
--- /dev/null
+++ b/mongodb/mongodb-1.4.9.d.ts
@@ -0,0 +1,543 @@
+// Type definitions for MongoDB
+// Project: https://github.com/mongodb/node-mongodb-native
+// Definitions by: Boris Yankov
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+// Documentation : http://mongodb.github.io/node-mongodb-native/
+
+///
+
+declare module "mongodb" {
+
+ // Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/mongoclient.html
+ export class MongoClient{
+ constructor(serverConfig: any, options: any);
+
+ static connect(uri: string, callback?: (err: Error, db: Db) => void): void;
+ static connect(uri: string, options: any, callback?: (err: Error, db: Db) => void): void;
+ }
+
+ // Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/server.html
+ export class Server {
+ constructor (host: string, port: number, opts?: ServerOptions);
+
+ public connect(): any;
+ }
+
+ // Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/db.html
+ export class Db {
+ constructor (databaseName: string, serverConfig: Server, dbOptions?: DbCreateOptions);
+
+ public db(dbName: string): Db;
+
+ public open(callback?: (err : Error, db : Db) => void ): void;
+ public close(forceClose?: boolean, callback?: (err: Error, result: any) => void ): void;
+ public admin(callback?: (err: Error, result: any) => void ): any;
+ public collectionsInfo(collectionName: string, callback?: (err: Error, result: any) => void ): void;
+ public collectionNames(collectionName: string, options: any, callback?: (err: Error, result: any) => void ): void;
+
+ public collection(collectionName: string): Collection;
+ public collection(collectionName: string, callback?: (err: Error, collection: Collection) => void ): Collection;
+ public collection(collectionName: string, options: MongoCollectionOptions, callback?: (err: Error, collection: Collection) => void ): Collection;
+
+ public collections(callback?: (err: Error, collections: Collection[]) => void ): void;
+ public eval(code: any, parameters: any[], options?: any, callback?: (err: Error, result: any) => void ): void;
+ //public dereference(dbRef: DbRef, callback?: (err: Error, result: any) => void): void;
+
+ public logout(callback?: (err: Error, result: any) => void ): void;
+ public logout(options: any, callback?: (err: Error, result: any) => void ): void;
+
+ public authenticate(userName: string, password: string, callback?: (err: Error, result: any) => void ): void;
+ public authenticate(userName: string, password: string, options: any, callback?: (err: Error, result: any) => void ): void;
+
+ public addUser(username: string, password: string, callback?: (err: Error, result: any) => void ): void;
+ public addUser(username: string, password: string, options: any, callback?: (err: Error, result: any) => void ): void;
+
+ public removeUser(username: string, callback?: (err: Error, result: any) => void ): void;
+ public removeUser(username: string, options: any, callback?: (err: Error, result: any) => void ): void;
+
+ public createCollection(collectionName: string, callback?: (err: Error, result: Collection) => void ): void;
+ public createCollection(collectionName: string, options: CollectionCreateOptions, callback?: (err: Error, result: any) => void ): void;
+
+ public command(selector: Object, callback?: (err: Error, result: any) => void ): void;
+ public command(selector: Object, options: any, callback?: (err: Error, result: any) => void ): void;
+
+ public dropCollection(collectionName: string, callback?: (err: Error, result: any) => void ): void;
+ public renameCollection(fromCollection: string, toCollection: string, callback?: (err: Error, result: any) => void ): void;
+
+ public lastError(options: Object, connectionOptions: any, callback?: (err: Error, result: any) => void ): void;
+ public previousError(options: Object, callback?: (err: Error, result: any) => void ): void;
+
+ // error = lastError
+ // lastStatus = lastError
+
+ public executeDbCommand(command_hash: any, callback?: (err: Error, result: any) => void ): void;
+ public executeDbCommand(command_hash: any, options: any, callback?: (err: Error, result: any) => void ): void;
+
+ public executeDbAdminCommand(command_hash: any, callback?: (err: Error, result: any) => void ): void;
+ public executeDbAdminCommand(command_hash: any, options: any, callback?: (err: Error, result: any) => void ): void;
+
+ public resetErrorHistory(callback?: (err: Error, result: any) => void ): void;
+ public resetErrorHistory(options: any, callback?: (err: Error, result: any) => void ): void;
+
+ public createIndex(collectionName: any, fieldOrSpec: any, options: IndexOptions, callback?: Function): void;
+ public ensureIndex(collectionName: any, fieldOrSpec: any, options: IndexOptions, callback?: Function): void;
+
+ public cursorInfo(options: any, callback?: Function): void;
+
+ public dropIndex(collectionName: string, indexName: string, callback?: Function): void;
+ public reIndex(collectionName: string, callback?: Function): void;
+ public indexInformation(collectionName: string, options: any, callback?: Function): void;
+ public dropDatabase(callback?: (err: Error, result: any) => void ): void;
+
+ public stats(options: any, callback?: Function): void;
+ public _registerHandler(db_command: any, raw: any, connection: any, exhaust: any, callback?: Function): void;
+ public _reRegisterHandler(newId: any, object: any, callback?: Function): void;
+ public _callHandler(id: any, document: any, err: any): any;
+ public _hasHandler(id: any): any;
+ public _removeHandler(id: any): any;
+ public _findHandler(id: any): { id: string; callback?: Function; };
+ public __executeQueryCommand(self: any, db_command: any, options: any, callback?: any): void;
+
+ public DEFAULT_URL: string;
+
+ public connect(url: string, options: { uri_decode_auth?: boolean; }, callback?: (err: Error, result: any) => void ): void;
+
+ public addListener(event: string, handler:(param: any) => any): any;
+ }
+
+ // Class documentation : http://mongodb.github.io/node-mongodb-native/api-bson-generated/objectid.html
+ // Last update: doc. version 1.3.13 (28.08.2013)
+ export class ObjectID {
+ constructor (s?: string);
+
+ // Returns the ObjectID id as a 24 byte hex string representation
+ public toHexString() : string;
+
+ // Compares the equality of this ObjectID with otherID.
+ public equals(otherID: ObjectID) : boolean;
+
+ // Returns the generation date (accurate up to the second) that this ID was generated.
+ public getTimestamp(): Date;
+
+ // Creates an ObjectID from a second based number, with the rest of the ObjectID zeroed out. Used for comparisons or sorting the ObjectID.
+ // time – an integer number representing a number of seconds.
+ public static createFromTime(time: number): ObjectID;
+
+ // Creates an ObjectID from a hex string representation of an ObjectID.
+ // hexString – create a ObjectID from a passed in 24 byte hexstring.
+ public static createFromHexString(hexString: string): ObjectID;
+
+ // Checks if a value is a valid bson ObjectId
+ // id - Value to be checked
+ public static isValid(id: string): Boolean;
+
+ // Generate a 12 byte id string used in ObjectID's
+ // time - optional parameter allowing to pass in a second based timestamp
+ public generate(time?: number): string;
+ }
+
+ // Class documentation : http://mongodb.github.io/node-mongodb-native/api-bson-generated/binary.html
+ export class Binary {
+ constructor (buffer: Buffer, subType?: number);
+
+ // Updates this binary with byte_value
+ put(byte_value: any): void;
+
+ // Writes a buffer or string to the binary
+ write(buffer: any, offset: number): void;
+
+ // Reads length bytes starting at position.
+ read(position: number, length: number): Buffer;
+
+ // Returns the value of this binary as a string.
+ value(): string;
+
+ // The length of the binary.
+ length(): number;
+ }
+
+ export interface SocketOptions {
+ //= set seconds before connection times out default:0
+ timeout?: number;
+ //= Disables the Nagle algorithm default:true
+ noDelay?: boolean;
+ //= Set if keepAlive is used default:0 , which means no keepAlive, set higher than 0 for keepAlive
+ keepAlive?: number;
+ //= ‘ascii’|’utf8’|’base64’ default:null
+ encoding?: string;
+ }
+
+ export interface ServerOptions {
+ // - to reconnect automatically, default:false
+ auto_reconnect?: boolean;
+ // - specify the number of connections in the pool default:1
+ poolSize?: number;
+ // - a collection of pr socket settings
+ socketOptions?: any;
+ }
+
+ export interface PKFactory {
+ counter: number;
+ createPk: () => number;
+ }
+
+ // See : http://mongodb.github.io/node-mongodb-native/api-generated/db.html
+ // Current definition by documentation version 1.3.13 (28.08.2013)
+ export interface DbCreateOptions {
+ // the write concern for the operation where < 1 is no acknowlegement of write and w >= 1, w = ‘majority’ or tag acknowledges the write.
+ w?: any;
+
+ // set the timeout for waiting for write concern to finish (combines with w option).
+ wtimeout?: number;
+
+ // write waits for fsync before returning. default:false.
+ fsync?: boolean;
+
+ // write waits for journal sync before returning. default:false.
+ journal?: boolean;
+
+ // the prefered read preference. use 'ReadPreference' class.
+ readPreference?: string;
+
+ // use c++ bson parser. default:false.
+ native_parser?: boolean;
+
+ // force server to create _id fields instead of client. default:false.
+ forceServerObjectId?: boolean;
+
+ // custom primary key factory to generate _id values (see Custom primary keys).
+ pkFactory?: PKFactory;
+
+ // serialize functions. default:false.
+ serializeFunctions?: boolean;
+
+ // peform operations using raw bson buffers. default:false.
+ raw?: boolean;
+
+ // record query statistics during execution. default:false.
+ recordQueryStats?: boolean;
+
+ // number of miliseconds between retries. default:5000.
+ retryMiliSeconds?: number;
+
+ // number of retries off connection. default:5.
+ numberOfRetries?: number;
+
+ // an object representing a logger that you want to use, needs to support functions debug, log, error. default:null.
+ logger?: Object
+
+ // force setting of SlaveOk flag on queries (only use when explicitly connecting to a secondary server). default:null.
+ slaveOk?: number;
+
+ // when deserializing a Long will fit it into a Number if it’s smaller than 53 bits. default:true.
+ promoteLongs?: boolean;
+ }
+
+ export class ReadPreference {
+ public static PRIMARY: string;
+ public static PRIMARY_PREFERRED: string;
+ public static SECONDARY: string;
+ public static SECONDARY_PREFERRED: string;
+ public static NEAREST: string;
+ }
+
+ // See : http://mongodb.github.io/node-mongodb-native/api-generated/collection.html
+ // Current definition by documentation version 1.3.13 (28.08.2013)
+ export interface CollectionCreateOptions {
+ // the prefered read preference. use 'ReadPreference' class.
+ readPreference?: string;
+
+ // Allow reads from secondaries. default:false.
+ slaveOk?: boolean;
+
+ // serialize functions on the document. default:false.
+ serializeFunctions?: boolean;
+
+ // perform all operations using raw bson objects. default:false.
+ raw?: boolean;
+
+ // object overriding the basic ObjectID primary key generation.
+ pkFactory?: PKFactory;
+ }
+
+ // Documentation: http://docs.mongodb.org/manual/reference/command/collStats/
+ export interface CollStats {
+ // Namespace.
+ ns: string;
+
+ // Number of documents.
+ count: number;
+
+ // Collection size in bytes.
+ size: number;
+
+ // Average object size in bytes.
+ avgObjSize: number;
+
+ // (Pre)allocated space for the collection in bytes.
+ storageSize: number;
+
+ // Number of extents (contiguously allocated chunks of datafile space).
+ numExtents: number;
+
+ // Number of indexes.
+ nindexes: number;
+
+ // Size of the most recently created extent in bytes.
+ lastExtentSize: number;
+
+ // Padding can speed up updates if documents grow.
+ paddingFactor: number;
+ flags: number;
+
+ // Total index size in bytes.
+ totalIndexSize: number;
+
+ // Size of specific indexes in bytes.
+ indexSizes: {
+ _id_: number;
+ username: number;
+ };
+ }
+
+ // Documentation : http://mongodb.github.io/node-mongodb-native/api-generated/collection.html
+ export interface Collection {
+ new (db: Db, collectionName: string, pkFactory?: Object, options?: CollectionCreateOptions): Collection; // is this right?
+ /**
+ * @deprecated use insertOne or insertMany
+ * Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#insert
+ */
+ insert(query: any, callback?: (err: Error, result: any) => void): void;
+ insert(query: any, options: { safe?: any; continueOnError?: boolean; keepGoing?: boolean; serializeFunctions?: boolean; }, callback?: (err: Error, result: any) => void): void;
+
+ // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#insertOne
+ insertOne(doc:any, callback?: (err: Error, result: any) => void) :void;
+ insertOne(doc: any, options: { w?: any; wtimeout?: number; j?: boolean; serializeFunctions?: boolean; forceServerObjectId?: boolean }, callback?: (err: Error, result: any) => void): void;
+
+ // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#insertMany
+ insertMany(docs: any, callback?: (err: Error, result: any) => void): void;
+ insertMany(docs: any, options: { w?: any; wtimeout?: number; j?: boolean; serializeFunctions?: boolean; forceServerObjectId?: boolean }, callback?: (err: Error, result: any) => void): void;
+ /**
+ * @deprecated use deleteOne or deleteMany
+ * Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#remove
+ */
+ remove(selector: Object, callback?: (err: Error, result: any) => void): void;
+ remove(selector: Object, options: { safe?: any; single?: boolean; }, callback?: (err: Error, result: any) => void): void;
+
+ // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#deleteOne
+ deleteOne(filter: any, callback?: (err: Error, result: any) => void): void;
+ deleteOne(filter: any, options: { w?: any; wtimeout?: number; j?: boolean;}, callback?: (err: Error, result: any) => void): void;
+
+ // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#deleteMany
+ deleteMany(filter: any, callback?: (err: Error, result: any) => void): void;
+ deleteMany(filter: any, options: { w?: any; wtimeout?: number; j?: boolean;}, callback?: (err: Error, result: any) => void): void;
+
+ rename(newName: String, callback?: (err: Error, result: any) => void): void;
+
+ save(doc: any, callback : (err: Error, result: any) => void): void;
+ save(doc: any, options: { w?: any; wtimeout?: number; j?: boolean;}, callback : (err: Error, result: any) => void): void;
+ /**
+ * @deprecated use updateOne or updateMany
+ * Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#update
+ */
+ update(selector: Object, document: any, callback?: (err: Error, result: any) => void): void;
+ update(selector: Object, document: any, options: { safe?: boolean; upsert?: any; multi?: boolean; serializeFunctions?: boolean; }, callback?: (err: Error, result: any) => void): void;
+
+ // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#updateOne
+ updateOne(filter: Object, update: any, callback?: (err: Error, result: any) => void): void;
+ updateOne(filter: Object, update: any, options: { upsert?: boolean; w?: any; wtimeout?: number; j?: boolean;}, callback?: (err: Error, result: any) => void): void;
+
+ // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#updateMany
+ updateMany(filter: Object, update: any, callback?: (err: Error, result: any) => void): void;
+ updateMany(filter: Object, update: any, options: { upsert?: boolean; w?: any; wtimeout?: number; j?: boolean;}, callback?: (err: Error, result: any) => void): void;
+
+ distinct(key: string, query: Object, callback?: (err: Error, result: any) => void): void;
+ distinct(key: string, query: Object, options: { readPreference: string; }, callback?: (err: Error, result: any) => void): void;
+
+ count(callback?: (err: Error, result: any) => void): void;
+ count(query: Object, callback?: (err: Error, result: any) => void): void;
+ count(query: Object, options: { readPreference: string; }, callback?: (err: Error, result: any) => void): void;
+
+ drop(callback?: (err: Error, result: any) => void): void;
+ /**
+ * @deprecated use findOneAndUpdate, findOneAndReplace or findOneAndDelete
+ * Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findAndModify
+ */
+ findAndModify(query: Object, sort: any[], doc: Object, callback?: (err: Error, result: any) => void): void;
+ findAndModify(query: Object, sort: any[], doc: Object, options: { safe?: any; remove?: boolean; upsert?: boolean; new?: boolean; }, callback?: (err: Error, result: any) => void): void;
+ /**
+ * @deprecated use findOneAndDelete
+ * Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findAndRemove
+ */
+ findAndRemove(query : Object, sort? : any[], callback?: (err: Error, result: any) => void): void;
+ findAndRemove(query : Object, sort? : any[], options?: { safe: any; }, callback?: (err: Error, result: any) => void): void;
+
+ // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findOneAndDelete
+ findOneAndDelete(filter: any, callback?: (err: Error, result: any) => void): void;
+ findOneAndDelete(filter: any, options: { projection?: any; sort?: any; maxTimeMS?: number; }, callback?: (err: Error, result: any) => void): void;
+
+ // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findOneAndReplace
+ findOneAndReplace(filter: any, replacement: any, callback?: (err: Error, result: any) => void): void;
+ findOneAndReplace(filter: any, replacement: any, options: { projection?: any; sort?: any; maxTimeMS?: number; upsert?: boolean; returnOriginal?: boolean }, callback?: (err: Error, result: any) => void): void;
+
+ // Documentation : http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findOneAndUpdate
+ findOneAndUpdate(filter: any, update: any, callback?: (err: Error, result: any) => void): void;
+ findOneAndUpdate(filter: any, update: any, options: { projection?: any; sort?: any; maxTimeMS?: number; upsert?: boolean; returnOriginal?: boolean }, callback?: (err: Error, result: any) => void): void;
+
+ find(callback?: (err: Error, result: Cursor) => void): Cursor;
+ find(selector: Object, callback?: (err: Error, result: Cursor) => void): Cursor;
+ find(selector: Object, fields: any, callback?: (err: Error, result: Cursor) => void): Cursor;
+ find(selector: Object, options: CollectionFindOptions, callback?: (err: Error, result: Cursor) => void): Cursor;
+ find(selector: Object, fields: any, options: CollectionFindOptions, callback?: (err: Error, result: Cursor) => void): Cursor;
+ find(selector: Object, fields: any, skip: number, limit: number, callback?: (err: Error, result: Cursor) => void): Cursor;
+ find(selector: Object, fields: any, skip: number, limit: number, timeout: number, callback?: (err: Error, result: Cursor) => void): Cursor;
+
+ findOne(callback?: (err: Error, result: any) => void): Cursor;
+ findOne(selector: Object, callback?: (err: Error, result: any) => void): Cursor;
+ findOne(selector: Object, fields: any, callback?: (err: Error, result: any) => void): Cursor;
+ findOne(selector: Object, options: CollectionFindOptions, callback?: (err: Error, result: any) => void): Cursor;
+ findOne(selector: Object, fields: any, options: CollectionFindOptions, callback?: (err: Error, result: any) => void): Cursor;
+ findOne(selector: Object, fields: any, skip: number, limit: number, callback?: (err: Error, result: any) => void): Cursor;
+ findOne(selector: Object, fields: any, skip: number, limit: number, timeout: number, callback?: (err: Error, result: any) => void): Cursor;
+
+ createIndex(fieldOrSpec: any, callback?: (err: Error, indexName: string) => void): void;
+ createIndex(fieldOrSpec: any, options: IndexOptions, callback?: (err: Error, indexName: string) => void): void;
+
+ ensureIndex(fieldOrSpec: any, callback?: (err: Error, indexName: string) => void): void;
+ ensureIndex(fieldOrSpec: any, options: IndexOptions, callback?: (err: Error, indexName: string) => void): void;
+
+ indexInformation(options: any, callback?: Function): void;
+ dropIndex(name: string, callback?: Function): void;
+ dropAllIndexes(callback?: Function): void;
+ // dropIndexes = dropAllIndexes
+
+ reIndex(callback?: Function): void;
+ mapReduce(map: Function, reduce: Function, options: MapReduceOptions, callback?: Function): void;
+ group(keys: Object, condition: Object, initial: Object, reduce: Function, finalize: Function, command: boolean, options: {readPreference: string}, callback?: Function): void;
+ options(callback?: Function): void;
+ isCapped(callback?: Function): void;
+ indexExists(indexes: string, callback?: Function): void;
+ geoNear(x: number, y: number, callback?: Function): void;
+ geoNear(x: number, y: number, options: Object, callback?: Function): void;
+ geoHaystackSearch(x: number, y: number, callback?: Function): void;
+ geoHaystackSearch(x: number, y: number, options: Object, callback?: Function): void;
+ indexes(callback?: Function): void;
+ aggregate(pipeline: any[], callback?: (err: Error, results: any) => void): void;
+ aggregate(pipeline: any[], options: {readPreference: string}, callback?: (err: Error, results: any) => void): void;
+ stats(callback?: (err: Error, results: CollStats) => void): void;
+ stats(options: {readPreference: string; scale: number}, callback?: (err: Error, results: CollStats) => void): void;
+
+ hint: any;
+ }
+
+ export interface MapReduceOptions {
+ out?: Object;
+ query?: Object;
+ sort?: Object;
+ limit?: number;
+ keeptemp?: boolean;
+ finalize?: any;
+ scope?: Object;
+ jsMode?: boolean;
+ verbose?: boolean;
+ readPreference?: string;
+ }
+
+ export interface IndexOptions {
+ w?: any;
+ wtimeout?: number;
+ fsync?: boolean;
+ journal?: boolean;
+ unique?: boolean;
+ sparse?: boolean;
+ background?: boolean;
+ dropDups?: boolean;
+ min?: number;
+ max?: number;
+ v?: number;
+ expireAfterSeconds?: number;
+ name?: string;
+ }
+
+ // Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/cursor.html
+ // Last update: doc. version 1.3.13 (29.08.2013)
+ export class Cursor {
+ // INTERNAL TYPE
+ // constructor (db: Db, collection: Collection, selector, fields, skip, limit, sort, hint, explain, snapshot, timeout, tailable, batchSize, slaveOk, raw, read, returnKey, maxScan, min, max, showDiskLoc, comment, awaitdata, numberOfRetries, dbName, tailableRetryInterval, exhaust, partial);
+ // constructor(db: Db, collection: Collection, selector, fields, options);
+
+ rewind() : Cursor;
+ toArray(callback?: (err: Error, results: any[]) => any) : void;
+ each(callback?: (err: Error, item: any) => void) : void;
+ count(applySkipLimit: boolean, callback?: (err: Error, count: number) => void) : void;
+
+ sort(keyOrList: any, callback? : (err: Error, result: any) => void): Cursor;
+
+ // this determines how the results are sorted. "asc", "ascending" or 1 for asceding order while "desc", "desceding or -1 for descending order. Note that the strings are case insensitive.
+ sort(keyOrList: String, direction : string, callback : (err: Error, result: any) => void): Cursor;
+ limit(limit: number, callback?: (err: Error, result: any) => void): Cursor;
+ setReadPreference(preference: string, callback?: Function): Cursor;
+ skip(skip: number, callback?: (err: Error, result: any) => void): Cursor;
+ batchSize(batchSize: number, callback?: (err: Error, result: any) => void): Cursor;
+
+ nextObject(callback?: (err: Error, doc: any) => void) : void;
+ explain(callback?: (err: Error, result: any) => void) : void;
+
+ stream(): CursorStream;
+
+ close(callback?: (err: Error, result: any) => void) : void;
+ isClosed(): boolean;
+
+ public static INIT: number;
+ public static OPEN: number;
+ public static CLOSED: number;
+ public static GET_MORE: number;
+ }
+
+ // Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/cursorstream.html
+ // Last update: doc. version 1.3.13 (29.08.2013)
+ export class CursorStream {
+ constructor(cursor: Cursor);
+
+ public pause(): any;
+ public resume(): any;
+ public destroy(): any;
+ }
+
+ export interface CollectionFindOptions {
+ limit?: number;
+ sort?: any;
+ fields?: Object;
+ skip?: number;
+ hint?: Object;
+ explain?: boolean;
+ snapshot?: boolean;
+ timeout?: boolean;
+ tailtable?: boolean;
+ tailableRetryInterval?: number;
+ numberOfRetries?: number;
+ awaitdata?: boolean;
+ oplogReplay?: boolean;
+ exhaust?: boolean;
+ batchSize?: number;
+ returnKey?: boolean;
+ maxScan?: number;
+ min?: number;
+ max?: number;
+ showDiskLoc?: boolean;
+ comment?: String;
+ raw?: boolean;
+ readPreference?: String;
+ partial?: boolean;
+ }
+
+ export interface MongoCollectionOptions {
+ safe?: any;
+ serializeFunctions?: any;
+ strict?: boolean;
+ raw?: boolean;
+ pkFactory?: any;
+ readPreference?: string;
+ }
+}
diff --git a/mongodb/mongodb-tests.ts b/mongodb/mongodb-tests.ts
index 9cd73d073..72589a470 100644
--- a/mongodb/mongodb-tests.ts
+++ b/mongodb/mongodb-tests.ts
@@ -5,25 +5,25 @@ import mongodb = require('mongodb');
var MongoClient = mongodb.MongoClient;
var format = require('util').format;
-MongoClient.connect('mongodb://127.0.0.1:27017/test', function (err, db) {
+MongoClient.connect('mongodb://127.0.0.1:27017/test', function(err: mongodb.MongoError, db: mongodb.Db) {
if (err) throw err;
var collection = db.collection('test_insert');
- collection.insert({ a: 2 }, function (err, docs) {
+ collection.insertOne({ a: 2 }, function(err: mongodb.MongoError, docs: any) {
- collection.count(function (err, count) {
+ collection.count(function(err: mongodb.MongoError, count: any) {
console.log(format("count = %s", count));
});
// Locate all the entries using find
- collection.find().toArray(function (err, results) {
+ collection.find({}).toArray(function(err: mongodb.MongoError, results: any) {
console.dir(results);
// Let's close the db
db.close();
});
// Get some statistics
- collection.stats(function (err, stats) {
+ collection.stats(function(err: mongodb.MongoError, stats: any) {
console.log(stats.count + " documents");
});
});
diff --git a/mongodb/mongodb.d.ts b/mongodb/mongodb.d.ts
index 2458dbdf2..b96c43522 100644
--- a/mongodb/mongodb.d.ts
+++ b/mongodb/mongodb.d.ts
@@ -1,543 +1,1269 @@
-// Type definitions for MongoDB
-// Project: https://github.com/mongodb/node-mongodb-native
-// Definitions by: Boris Yankov
+// Type definitions for MongoDB v2.1
+// Project: https://github.com/mongodb/node-mongodb-native/tree/2.1
+// Definitions by: Federico Caselli
// Definitions: https://github.com/borisyankov/DefinitelyTyped
-// Documentation : http://mongodb.github.io/node-mongodb-native/
+// Documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/
///
+///
declare module "mongodb" {
+ import {EventEmitter} from 'events';
+
+ // Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/MongoClient.html
+ export class MongoClient {
+ constructor();
- // Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/mongoclient.html
- export class MongoClient{
- constructor(serverConfig: any, options: any);
+ static connect(uri: string, callback: MongoCallback): void;
+ static connect(uri: string, options?: MongoClientOptions): Promise;
+ static connect(uri: string, options: MongoClientOptions, callback: MongoCallback): void;
- static connect(uri: string, callback?: (err: Error, db: Db) => void): void;
- static connect(uri: string, options: any, callback?: (err: Error, db: Db) => void): void;
+ connect(uri: string, callback: MongoCallback): void;
+ connect(uri: string, options?: MongoClientOptions): Promise;
+ connect(uri: string, options: MongoClientOptions, callback: MongoCallback): void;
}
- // Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/server.html
- export class Server {
- constructor (host: string, port: number, opts?: ServerOptions);
-
- public connect(): any;
+ export interface MongoCallback {
+ (error: MongoError, result: T): void;
+ }
+
+ // http://mongodb.github.io/node-mongodb-native/2.1/api/MongoError.html
+ export class MongoError extends Error {
+ constructor(message: string);
+ static create(options: Object): MongoError;
+ }
+
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/MongoClient.html#.connect
+ export interface MongoClientOptions {
+ uri_decode_auth?: boolean;
+ db?: DbCreateOptions;
+ server?: ServerOptions;
+ replSet?: ReplSetOptions;
+ mongos?: MongosOptions;
+ promiseLibrary?: Object;
+ }
+
+ // See : http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html
+ export interface DbCreateOptions {
+ authSource?: string;
+ // the write concern for the operation where < 1 is no acknowlegement of write and w >= 1, w = ‘majority’ or tag acknowledges the write.
+ w?: number | string;
+ // set the timeout for waiting for write concern to finish (combines with w option).
+ wtimeout?: number;
+ j?: boolean;
+ // use c++ bson parser. default:false.
+ native_parser?: boolean;
+ // force server to create _id fields instead of client. default:false.
+ forceServerObjectId?: boolean;
+ serializeFunctions?: boolean;
+ ignoreUndefined?: boolean;
+ // peform operations using raw bson buffers. default:false.
+ raw?: boolean;
+ // when deserializing a Long will fit it into a Number if it’s smaller than 53 bits. default:true.
+ promoteLongs?: boolean;
+ bufferMaxEntries?: number;
+ // the prefered read preference. use 'ReadPreference' class.
+ readPreference?: ReadPreference | string;
+ // custom primary key factory to generate _id values (see Custom primary keys).
+ pkFactory?: Object;
+ promiseLibrary?: Object;
+ readConcern?: { level?: Object };
}
+ // See http://mongodb.github.io/node-mongodb-native/2.1/api/ReadPreference.html
+ export class ReadPreference {
+ constructor(mode: string, tags: Object);
+ mode: string;
+ tags: any;
+ static PRIMARY: string;
+ static PRIMARY_PREFERRED: string;
+ static SECONDARY: string;
+ static SECONDARY_PREFERRED: string;
+ static NEAREST: string;
+ isValid(mode: string): boolean;
+ static isValid(mode: string): boolean;
+ }
+
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Server.html
+ export interface SocketOptions {
+ // Reconnect on error. default:false
+ autoReconnect?: boolean;
+ // TCP Socket NoDelay option. default:true
+ noDelay?: boolean;
+ // TCP KeepAlive on the socket with a X ms delay before start. default:0
+ keepAlive?: number;
+ // TCP Connection timeout setting. default 0
+ connectTimeoutMS?: number;
+ // TCP Socket timeout setting. default 0
+ socketTimeoutMS?: number;
+ }
+
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Server.html
+ export interface ServerOptions {
+ // - specify the number of connections in the pool default:5
+ poolSize?: number;
+ ssl?: boolean;
+ sslValidate?: Object;
+ checkServerIdentity?: boolean | Function;
+ sslCA?: Array;
+ sslCert?: Buffer | string;
+ sslKey?: Buffer | string;
+ sslPass?: Buffer | string;
+ socketOptions?: SocketOptions;
+ reconnectTries?: number;
+ reconnectInterval?: number;
+ }
+
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/ReplSet.html
+ export interface ReplSetOptions {
+ ha?: boolean;
+ haInterval?: number;
+ replicaSet?: string;
+ secondaryAcceptableLatencyMS?: number;
+ connectWithNoPrimary?: boolean;
+ // - specify the number of connections in the pool default:5
+ poolSize?: number;
+ ssl?: boolean;
+ sslValidate?: Object;
+ checkServerIdentity?: boolean | Function;
+ sslCA?: Array;
+ sslCert?: Buffer | string;
+ sslKey?: Buffer | string;
+ sslPass?: Buffer | string;
+ socketOptions?: SocketOptions;
+ }
+
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Mongos.html
+ export interface MongosOptions {
+ ha?: boolean;
+ haInterval?: number;
+ // - specify the number of connections in the pool default:5
+ poolSize?: number;
+ ssl?: boolean;
+ sslValidate?: Object;
+ checkServerIdentity?: boolean | Function;
+ sslCA?: Array;
+ sslCert?: Buffer | string;
+ sslKey?: Buffer | string;
+ sslPass?: Buffer | string;
+ socketOptions?: SocketOptions;
+ }
+
// Class documentation : http://mongodb.github.io/node-mongodb-native/api-generated/db.html
- export class Db {
- constructor (databaseName: string, serverConfig: Server, dbOptions?: DbCreateOptions);
+ export class Db extends EventEmitter {
+ constructor(databaseName: string, serverConfig: Server | ReplSet | Mongos, options?: DbCreateOptions);
- public db(dbName: string): Db;
+ serverConfig: Server | ReplSet | Mongos;
+ bufferMaxEntries: number;
+ databaseName: string;
+ options: any;
+ native_parser: boolean;
+ slaveOk: boolean;
+ writeConcern: any;
- public open(callback?: (err : Error, db : Db) => void ): void;
- public close(forceClose?: boolean, callback?: (err: Error, result: any) => void ): void;
- public admin(callback?: (err: Error, result: any) => void ): any;
- public collectionsInfo(collectionName: string, callback?: (err: Error, result: any) => void ): void;
- public collectionNames(collectionName: string, options: any, callback?: (err: Error, result: any) => void ): void;
+ // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#addUser
+ addUser(username: string, password: string, callback: MongoCallback): void;
+ addUser(username: string, password: string, options?: { w?: number | string, wtimeout?: number, j?: boolean, customData?: Object, roles?: Object[] }): Promise;
+ addUser(username: string, password: string, options: { w?: number | string, wtimeout?: number, j?: boolean, customData?: Object, roles?: Object[] }, callback: MongoCallback): void;
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#admin
+ admin(): Admin;
+ // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#authenticate
+ authenticate(userName: string, password: string, callback: MongoCallback): void;
+ authenticate(userName: string, password: string, options?: { authMechanism: string }): Promise;
+ authenticate(userName: string, password: string, options: { authMechanism: string }, callback: MongoCallback): void;
+ // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#close
+ close(callback: MongoCallback): void;
+ close(forceClose?: boolean): Promise;
+ close(forceClose: boolean, callback: MongoCallback): void;
+ // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#collection
+ collection(name: string): Collection;
+ collection(name: string, callback: MongoCallback): Collection;
+ collection(name: string, options: DbCollectionOptions, callback: MongoCallback): Collection;
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#collections
+ collections(): Promise;
+ collections(callback: MongoCallback): void;
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#command
+ command(command: Object, callback?: MongoCallback): void;
+ command(command: Object, options?: { readPreference: ReadPreference | string }): Promise;
+ command(command: Object, options: { readPreference: ReadPreference | string }, callback: MongoCallback): void;
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createCollection
+ createCollection(name: string, callback: MongoCallback): void;
+ createCollection(name: string, options?: CollectionCreateOptions): Promise;
+ createCollection(name: string, options: CollectionCreateOptions, callback: MongoCallback): void;
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createIndex
+ createIndex(name: string, fieldOrSpec: string | Object, callback: MongoCallback): void;
+ createIndex(name: string, fieldOrSpec: string | Object, options?: IndexOptions): Promise;
+ createIndex(name: string, fieldOrSpec: string | Object, options: IndexOptions, callback: MongoCallback): void;
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#db
+ db(dbName: string): Db;
+ db(dbName: string, options: { noListener?: boolean, returnNonCachedInstance?: boolean }): Db;
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#dropCollection
+ dropCollection(name: string): Promise;
+ dropCollection(name: string, callback: MongoCallback): void;
+ // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#dropDatabase
+ dropDatabase(): Promise;
+ dropDatabase(callback: MongoCallback): void;
+
+ //deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#ensureIndex
+ // ensureIndex(collectionName: any, fieldOrSpec: any, options: IndexOptions, callback: Function): void;
+ //deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#eval
+ // eval(code: any, parameters: any[], options?: any, callback?: MongoCallback): void;
+
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#executeDbAdminCommand
+ executeDbAdminCommand(command: Object, callback: MongoCallback): void;
+ executeDbAdminCommand(command: Object, options?: { readPreference?: ReadPreference | string, maxTimeMS?: number }): Promise;
+ executeDbAdminCommand(command: Object, options: { readPreference?: ReadPreference | string, maxTimeMS?: number }, callback: MongoCallback): void;
+ // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#indexInformation
+ indexInformation(name: string, callback: MongoCallback): void;
+ indexInformation(name: string, options?: { full?: boolean, readPreference?: ReadPreference | string }): Promise;
+ indexInformation(name: string, options: { full?: boolean, readPreference?: ReadPreference | string }, callback: MongoCallback): void;
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#listCollections
+ listCollections(filter: Object, options?: { batchSize?: number, readPreference?: ReadPreference | string }): CommandCursor;
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#logout
+ logout(callback: MongoCallback): void;
+ logout(options?: { dbName?: string }): Promise;
+ logout(options: { dbName?: string }, callback: MongoCallback): void;
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#open
+ open(): Promise;
+ open(callback: MongoCallback): void;
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#removeUser
+ removeUser(username: string, callback: MongoCallback): void;
+ removeUser(username: string, options?: { w?: number | string, wtimeout?: number, j?: boolean }): Promise;
+ removeUser(username: string, options: { w?: number | string, wtimeout?: number, j?: boolean }, callback: MongoCallback): void;
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#renameCollection
+ renameCollection(fromCollection: string, toCollection: string, callback: MongoCallback): void;
+ renameCollection(fromCollection: string, toCollection: string, options?: { dropTarget?: boolean }): Promise;
+ renameCollection(fromCollection: string, toCollection: string, options: { dropTarget?: boolean }, callback: MongoCallback): void;
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#stats
+ stats(callback: MongoCallback): void;
+ stats(options?: { scale?: number }): Promise;;
+ stats(options: { scale?: number }, callback: MongoCallback): void;
+ }
+
+ // Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/Server.html
+ export class Server extends EventEmitter {
+ constructor(host: string, port: number, options?: ServerOptions);
- public collection(collectionName: string): Collection;
- public collection(collectionName: string, callback?: (err: Error, collection: Collection) => void ): Collection;
- public collection(collectionName: string, options: MongoCollectionOptions, callback?: (err: Error, collection: Collection) => void ): Collection;
+ connections(): Array;
+ }
+
+ // Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/ReplSet.html
+ export class ReplSet extends EventEmitter {
+ constructor(servers: Array, options?: ReplSetOptions);
- public collections(callback?: (err: Error, collections: Collection[]) => void ): void;
- public eval(code: any, parameters: any[], options?: any, callback?: (err: Error, result: any) => void ): void;
- //public dereference(dbRef: DbRef, callback?: (err: Error, result: any) => void): void;
+ connections(): Array;
+ }
+
+ // Deprecated http://mongodb.github.io/node-mongodb-native/2.1/api/ReplSet.html
+ export class Mongos extends EventEmitter {
+ constructor(servers: Array, options?: MongosOptions);
- public logout(callback?: (err: Error, result: any) => void ): void;
- public logout(options: any, callback?: (err: Error, result: any) => void ): void;
-
- public authenticate(userName: string, password: string, callback?: (err: Error, result: any) => void ): void;
- public authenticate(userName: string, password: string, options: any, callback?: (err: Error, result: any) => void ): void;
-
- public addUser(username: string, password: string, callback?: (err: Error, result: any) => void ): void;
- public addUser(username: string, password: string, options: any, callback?: (err: Error, result: any) => void ): void;
-
- public removeUser(username: string, callback?: (err: Error, result: any) => void ): void;
- public removeUser(username: string, options: any, callback?: (err: Error, result: any) => void ): void;
-
- public createCollection(collectionName: string, callback?: (err: Error, result: Collection) => void ): void;
- public createCollection(collectionName: string, options: CollectionCreateOptions, callback?: (err: Error, result: any) => void ): void;
-
- public command(selector: Object, callback?: (err: Error, result: any) => void ): void;
- public command(selector: Object, options: any, callback?: (err: Error, result: any) => void ): void;
-
- public dropCollection(collectionName: string, callback?: (err: Error, result: any) => void ): void;
- public renameCollection(fromCollection: string, toCollection: string, callback?: (err: Error, result: any) => void ): void;
-
- public lastError(options: Object, connectionOptions: any, callback?: (err: Error, result: any) => void ): void;
- public previousError(options: Object, callback?: (err: Error, result: any) => void ): void;
-
- // error = lastError
- // lastStatus = lastError
-
- public executeDbCommand(command_hash: any, callback?: (err: Error, result: any) => void ): void;
- public executeDbCommand(command_hash: any, options: any, callback?: (err: Error, result: any) => void ): void;
-
- public executeDbAdminCommand(command_hash: any, callback?: (err: Error, result: any) => void ): void;
- public executeDbAdminCommand(command_hash: any, options: any, callback?: (err: Error, result: any) => void ): void;
-
- public resetErrorHistory(callback?: (err: Error, result: any) => void ): void;
- public resetErrorHistory(options: any, callback?: (err: Error, result: any) => void ): void;
-
- public createIndex(collectionName: any, fieldOrSpec: any, options: IndexOptions, callback?: Function): void;
- public ensureIndex(collectionName: any, fieldOrSpec: any, options: IndexOptions, callback?: Function): void;
-
- public cursorInfo(options: any, callback?: Function): void;
-
- public dropIndex(collectionName: string, indexName: string, callback?: Function): void;
- public reIndex(collectionName: string, callback?: Function): void;
- public indexInformation(collectionName: string, options: any, callback?: Function): void;
- public dropDatabase(callback?: (err: Error, result: any) => void ): void;
-
- public stats(options: any, callback?: Function): void;
- public _registerHandler(db_command: any, raw: any, connection: any, exhaust: any, callback?: Function): void;
- public _reRegisterHandler(newId: any, object: any, callback?: Function): void;
- public _callHandler(id: any, document: any, err: any): any;
- public _hasHandler(id: any): any;
- public _removeHandler(id: any): any;
- public _findHandler(id: any): { id: string; callback?: Function; };
- public __executeQueryCommand(self: any, db_command: any, options: any, callback?: any): void;
-
- public DEFAULT_URL: string;
-
- public connect(url: string, options: { uri_decode_auth?: boolean; }, callback?: (err: Error, result: any) => void ): void;
-
- public addListener(event: string, handler:(param: any) => any): any;
+ connections(): Array;
}
- // Class documentation : http://mongodb.github.io/node-mongodb-native/api-bson-generated/objectid.html
- // Last update: doc. version 1.3.13 (28.08.2013)
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createCollection
+ export interface CollectionCreateOptions {
+ w?: number | string;
+ wtimeout?: number;
+ j?: boolean;
+ raw?: boolean;
+ pkFactory?: Object;
+ readPreference?: ReadPreference | string;
+ serializeFunctions?: boolean;
+ strict?: boolean;
+ capped?: boolean;
+ size?: number;
+ max?: number;
+ autoIndexId?: boolean;
+ }
+
+ // http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#collection
+ export interface DbCollectionOptions {
+ w?: number | string;
+ wtimeout?: number;
+ j?: boolean;
+ raw?: boolean;
+ pkFactory?: Object;
+ readPreference?: ReadPreference | string;
+ serializeFunctions?: boolean;
+ strict?: boolean;
+ readConcern?: { level: Object };
+ }
+
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Db.html#createIndex
+ export interface IndexOptions {
+ // The write concern.
+ w?: number | string;
+ // The write concern timeout.
+ wtimeout?: number;
+ // Specify a journal write concern.
+ j?: boolean;
+ // Creates an unique index.
+ unique?: boolean;
+ // Creates a sparse index.
+ sparse?: boolean;
+ // Creates the index in the background, yielding whenever possible.
+ background?: boolean;
+ // A unique index cannot be created on a key that has pre-existing duplicate values.
+ // If you would like to create the index anyway, keeping the first document the database indexes and
+ // deleting all subsequent documents that have duplicate value
+ dropDups?: boolean;
+ // For geo spatial indexes set the lower bound for the co-ordinates.
+ min?: number;
+ // For geo spatial indexes set the high bound for the co-ordinates.
+ max?: number;
+ // Specify the format version of the indexes.
+ v?: number;
+ // Allows you to expire data on indexes applied to a data (MongoDB 2.2 or higher)
+ expireAfterSeconds?: number;
+ // Override the auto generated index name (useful if the resulting name is larger than 128 bytes)
+ name?: string;
+ }
+
+ // http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html
+ export class Admin {
+ // http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#addUser
+ addUser(username: string, password: string, callback: MongoCallback): void;
+ addUser(username: string, password: string, options?: AddUserOptions): Promise;
+ addUser(username: string, password: string, options: AddUserOptions, callback: MongoCallback): void;
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#authenticate
+ authenticate(username: string, callback: MongoCallback): void;
+ authenticate(username: string, password?: string): Promise;
+ authenticate(username: string, password: string, callback: MongoCallback): void;
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#buildInfo
+ buildInfo(): Promise;
+ buildInfo(callback: MongoCallback): void
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#command
+ command(command: Object, callback: MongoCallback): void;
+ command(command: Object, options?: { readPreference?: ReadPreference | string, maxTimeMS?: number }): Promise;
+ command(command: Object, options: { readPreference?: ReadPreference | string, maxTimeMS?: number }, callback: MongoCallback): void;
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#listDatabases
+ listDatabases(): Promise;
+ listDatabases(callback: MongoCallback): void
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#logout
+ logout(): Promise;
+ logout(callback: MongoCallback): void
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#ping
+ ping(): Promise;
+ ping(callback: MongoCallback): void
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#profilingInfo
+ profilingInfo(): Promise;
+ profilingInfo(callback: MongoCallback): void
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#profilingLevel
+ profilingLevel(): Promise;
+ profilingLevel(callback: MongoCallback): void
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#removeUser
+ removeUser(username: string, callback: MongoCallback): void;
+ removeUser(username: string, options?: FSyncOptions): Promise;
+ removeUser(username: string, options: FSyncOptions, callback: MongoCallback): void;
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#replSetGetStatus
+ replSetGetStatus(): Promise;
+ replSetGetStatus(callback: MongoCallback): void
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#serverInfo
+ serverInfo(): Promise;
+ serverInfo(callback: MongoCallback): void
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#serverStatus
+ serverStatus(): Promise;
+ serverStatus(callback: MongoCallback): void
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#setProfilingLevel
+ setProfilingLevel(level: string): Promise;
+ setProfilingLevel(level: string, callback: MongoCallback): void
+ // http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#validateCollection
+ validateCollection(collectionNme: string, callback: MongoCallback): void;
+ validateCollection(collectionNme: string, options?: Object): Promise;
+ validateCollection(collectionNme: string, options: Object, callback: MongoCallback): void;
+ }
+
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#addUser
+ export interface AddUserOptions {
+ w?: number | string;
+ wtimeout?: number;
+ j?: boolean;
+ fsync: boolean;
+ customData?: Object;
+ roles?: Object[]
+ }
+
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Admin.html#removeUser
+ export interface FSyncOptions {
+ w?: number | string;
+ wtimeout?: number;
+ j?: boolean;
+ fsync?: boolean
+ }
+
+ // Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/ObjectID.html
export class ObjectID {
- constructor (s?: string);
-
- // Returns the ObjectID id as a 24 byte hex string representation
- public toHexString() : string;
-
- // Compares the equality of this ObjectID with otherID.
- public equals(otherID: ObjectID) : boolean;
-
- // Returns the generation date (accurate up to the second) that this ID was generated.
- public getTimestamp(): Date;
-
- // Creates an ObjectID from a second based number, with the rest of the ObjectID zeroed out. Used for comparisons or sorting the ObjectID.
- // time – an integer number representing a number of seconds.
- public static createFromTime(time: number): ObjectID;
+ constructor(s?: string | number);
+ generationTime: number;
+
// Creates an ObjectID from a hex string representation of an ObjectID.
// hexString – create a ObjectID from a passed in 24 byte hexstring.
- public static createFromHexString(hexString: string): ObjectID;
-
+ static createFromHexString(hexString: string): ObjectID;
+ // Creates an ObjectID from a second based number, with the rest of the ObjectID zeroed out. Used for comparisons or sorting the ObjectID.
+ // time – an integer number representing a number of seconds.
+ static createFromTime(time: number): ObjectID;
// Checks if a value is a valid bson ObjectId
// id - Value to be checked
- public static isValid(id: string): Boolean;
-
+ static isValid(id: string | number): boolean;
+ //Compares the equality of this ObjectID with otherID.
+ equals(otherID: ObjectID): boolean;
// Generate a 12 byte id string used in ObjectID's
// time - optional parameter allowing to pass in a second based timestamp
- public generate(time?: number): string;
+ generate(time?: number): string;
+ // Returns the generation date (accurate up to the second) that this ID was generated.
+ getTimestamp(): Date;
+ // Returns the ObjectID id as a 24 byte hex string representation
+ toHexString(): string;
}
- // Class documentation : http://mongodb.github.io/node-mongodb-native/api-bson-generated/binary.html
+ // Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/Binary.html
export class Binary {
- constructor (buffer: Buffer, subType?: number);
+ constructor(buffer: Buffer, subType?: number);
- // Updates this binary with byte_value
- put(byte_value: any): void;
-
- // Writes a buffer or string to the binary
- write(buffer: any, offset: number): void;
-
- // Reads length bytes starting at position.
- read(position: number, length: number): Buffer;
-
- // Returns the value of this binary as a string.
- value(): string;
+ static SUBTYPE_BYTE_ARRAY: number;
+ static SUBTYPE_DEFAULT: number;
+ static SUBTYPE_FUNCTION: number;
+ static SUBTYPE_MD5: number;
+ static SUBTYPE_USER_DEFINED: number;
+ static SUBTYPE_UUID: number;
+ static SUBTYPE_UUID_OLD: number;
// The length of the binary.
length(): number;
+ // Updates this binary with byte_value
+ put(byte_value: number | string): void;
+ // Reads length bytes starting at position.
+ read(position: number, length: number): Buffer;
+ // Returns the value of this binary as a string.
+ value(): string;
+ // Writes a buffer or string to the binary
+ write(buffer: Buffer | string, offset: number): void;
+ }
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Double.html
+ export class Double {
+ constructor(value: number);
+
+ valueOf(): number;
+ }
+
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Long.html
+ export class Long {
+ constructor(low: number, high: number);
+
+ static MAX_VALUE: Long;
+ static MIN_VALUE: Long;
+ static NEG_ONE: Long;
+ static ONE: Long;
+ static ZERO: Long;
+
+ static fromBits(lowBits: number, highBits: number): Long;
+ static fromInt(value: number): Long;
+ static fromNumber(value: number): Long;
+ static fromString(str: string, radix?: number): Long;
+
+ add(other: Long): Long;
+ and(other: Long): Long;
+ compare(other: Long): number;
+ div(other: Long): Long;
+ equals(other: Long): boolean;
+ getHighBits(): number;
+ getLowBits(): number;
+ getLowBitsUnsigned(): number;
+ getNumBitsAbs(): number;
+ greaterThan(other: Long): number;
+ greaterThanOrEqual(other: Long): number;
+ isNegative(): boolean;
+ isOdd(): boolean;
+ isZero(): boolean;
+ lessThan(other: Long): boolean;
+ lessThanOrEqual(other: Long): boolean;
+ modulo(other: Long): Long;
+ multiply(other: Long): Long;
+ negate(): Long;
+ not(): Long;
+ notEquals(other: Long): boolean;
+ or(other: Long): Long;
+ shiftLeft(other: number): Long;
+ shiftRight(other: number): Long;
+ shiftRightUnsigned(other: number): Long;
+ subtract(other: Long): Long;
+ toInt(): number;
+ toJSON(): string;
+ toNumber(): number;
+ toString(radix?: number): string;
+ xor(other: Long): Long;
+ }
+
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/MaxKey.html
+ export class MaxKey { }
+
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/MinKey.html
+ export class MinKey { }
+
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Timestamp.html
+ export class Timestamp {
+ constructor(low: number, high: number);
+
+ static MAX_VALUE: Timestamp;
+ static MIN_VALUE: Timestamp;
+ static NEG_ONE: Timestamp;
+ static ONE: Timestamp;
+ static ZERO: Timestamp;
+
+ static fromBits(lowBits: number, highBits: number): Timestamp;
+ static fromInt(value: number): Timestamp;
+ static fromNumber(value: number): Timestamp;
+ static fromString(str: string, radix?: number): Timestamp;
+
+ add(other: Timestamp): Timestamp;
+ and(other: Timestamp): Timestamp;
+ compare(other: Timestamp): number;
+ div(other: Timestamp): Timestamp;
+ equals(other: Timestamp): boolean;
+ getHighBits(): number;
+ getLowBits(): number;
+ getLowBitsUnsigned(): number;
+ getNumBitsAbs(): number;
+ greaterThan(other: Timestamp): number;
+ greaterThanOrEqual(other: Timestamp): number;
+ isNegative(): boolean;
+ isOdd(): boolean;
+ isZero(): boolean;
+ lessThan(other: Timestamp): boolean;
+ lessThanOrEqual(other: Timestamp): boolean;
+ modulo(other: Timestamp): Timestamp;
+ multiply(other: Timestamp): Timestamp;
+ negate(): Timestamp;
+ not(): Timestamp;
+ notEquals(other: Timestamp): boolean;
+ or(other: Timestamp): Timestamp;
+ shiftLeft(other: number): Timestamp;
+ shiftRight(other: number): Timestamp;
+ shiftRightUnsigned(other: number): Timestamp;
+ subtract(other: Timestamp): Timestamp;
+ toInt(): number;
+ toJSON(): string;
+ toNumber(): number;
+ toString(radix?: number): string;
+ xor(other: Timestamp): Timestamp;
}
- export interface SocketOptions {
- //= set seconds before connection times out default:0
- timeout?: number;
- //= Disables the Nagle algorithm default:true
- noDelay?: boolean;
- //= Set if keepAlive is used default:0 , which means no keepAlive, set higher than 0 for keepAlive
- keepAlive?: number;
- //= ‘ascii’|’utf8’|’base64’ default:null
- encoding?: string;
+ // Documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html
+ export class Collection {
+ // Get the collection name.
+ collectionName: string;
+ // Get the full collection namespace.
+ namespace: string;
+ // The current write concern values.
+ writeConcern: any;
+ // The current read concern values.
+ readConcern: any;
+ // Get current index hint for collection.
+ hint: any;
+ //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#aggregate
+ aggregate(pipeline: Object[], callback: MongoCallback