diff --git a/angular-ui-bootstrap/angular-ui-bootstrap.d.ts b/angular-ui-bootstrap/angular-ui-bootstrap.d.ts index c9bf91c01..d7e65c77c 100644 --- a/angular-ui-bootstrap/angular-ui-bootstrap.d.ts +++ b/angular-ui-bootstrap/angular-ui-bootstrap.d.ts @@ -190,15 +190,15 @@ declare module angular.ui.bootstrap { /** * a promise that is resolved when a modal is closed and rejected when a modal is dismissed */ - result: ng.IPromise; + result: angular.IPromise; /** * a promise that is resolved when a modal gets opened after downloading content's template and resolving all variables */ - opened: ng.IPromise; + opened: angular.IPromise; } - interface IModalScope extends ng.IScope { + interface IModalScope extends angular.IScope { /** * Those methods make it easy to close a modal window without a need to create a dedicated controller */ @@ -623,7 +623,7 @@ declare module angular.ui.bootstrap { * * @return A promise that is resolved when the transition finishes. */ - (element: ng.IAugmentedJQuery, trigger: any, options?: ITransitionServiceOptions): ng.IPromise; + (element: angular.IAugmentedJQuery, trigger: any, options?: ITransitionServiceOptions): angular.IPromise; } interface ITransitionServiceOptions { diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts index 9f7efea89..191aa7692 100755 --- a/angularjs/angular.d.ts +++ b/angularjs/angular.d.ts @@ -452,9 +452,9 @@ declare module angular { $invalid: boolean; $submitted: boolean; $error: any; - $addControl(control: ng.INgModelController): void; - $removeControl(control: ng.INgModelController): void; - $setValidity(validationErrorKey: string, isValid: boolean, control: ng.INgModelController): void; + $addControl(control: INgModelController): void; + $removeControl(control: INgModelController): void; + $setValidity(validationErrorKey: string, isValid: boolean, control: INgModelController): void; $setDirty(): void; $setPristine(): void; $commitViewValue(): void; @@ -509,7 +509,7 @@ declare module angular { } interface IAsyncModelValidators { - [index: string]: (...args: any[]) => ng.IPromise; + [index: string]: (...args: any[]) => IPromise; } interface IModelParser { @@ -931,11 +931,19 @@ declare module angular { /** * Combines multiple promises into a single promise that is resolved when all of the input promises are resolved. * - * Returns a single promise that will be resolved with an array/hash of values, each value corresponding to the promise at the same index/key in the promises array/hash. If any of the promises is resolved with a rejection, this resulting promise will be rejected with the same rejection value. + * Returns a single promise that will be resolved with an array of values, each value corresponding to the promise at the same index in the promises array. If any of the promises is resolved with a rejection, this resulting promise will be rejected with the same rejection value. * - * @param promises An array or hash of promises. + * @param promises An array of promises. */ - all(promises: IPromise[]|{ [id: string]: IPromise; }): IPromise; + all(promises: IPromise[]): IPromise; + /** + * Combines multiple promises into a single promise that is resolved when all of the input promises are resolved. + * + * Returns a single promise that will be resolved with a hash of values, each value corresponding to the promise at the same key in the promises hash. If any of the promises is resolved with a rejection, this resulting promise will be rejected with the same rejection value. + * + * @param promises A hash of promises. + */ + all(promises: { [id: string]: IPromise; }): IPromise<{ [id: string]: any; }>; /** * Creates a Deferred object which represents a task which will finish in the future. */ @@ -1573,12 +1581,12 @@ declare module angular { * $delegate - The original service instance, which can be monkey patched, configured, decorated or delegated to. */ decorator(name: string, inlineAnnotatedFunction: any[]): void; - factory(name: string, serviceFactoryFunction: Function): ng.IServiceProvider; - factory(name: string, inlineAnnotatedFunction: any[]): ng.IServiceProvider; - provider(name: string, provider: ng.IServiceProvider): ng.IServiceProvider; - provider(name: string, serviceProviderConstructor: Function): ng.IServiceProvider; - service(name: string, constructor: Function): ng.IServiceProvider; - value(name: string, value: any): ng.IServiceProvider; + factory(name: string, serviceFactoryFunction: Function): IServiceProvider; + factory(name: string, inlineAnnotatedFunction: any[]): IServiceProvider; + provider(name: string, provider: IServiceProvider): IServiceProvider; + provider(name: string, serviceProviderConstructor: Function): IServiceProvider; + service(name: string, constructor: Function): IServiceProvider; + value(name: string, value: any): IServiceProvider; } } diff --git a/errorhandler/errorhandler.d.ts b/errorhandler/errorhandler.d.ts index 31bf44ce1..40f845d09 100644 --- a/errorhandler/errorhandler.d.ts +++ b/errorhandler/errorhandler.d.ts @@ -7,6 +7,6 @@ declare module "errorhandler" { import express = require('express'); - function e(): express.ErrorRequestHandler; + function e(options?: {log?: any}): express.ErrorRequestHandler; export = e; -} \ No newline at end of file +} diff --git a/knex/knex.d.ts b/knex/knex.d.ts index d3216acf9..c9a6ada4b 100644 --- a/knex/knex.d.ts +++ b/knex/knex.d.ts @@ -307,13 +307,13 @@ declare module "knex" { } interface SchemaBuilder { - createTable(tableName: string, callback: (tableBuilder: CreateTableBuilder) => any): void; - renameTable(oldTableName: string, newTableName: string): void; - dropTable(tableName: string): void; + createTable(tableName: string, callback: (tableBuilder: CreateTableBuilder) => any): Promise; + renameTable(oldTableName: string, newTableName: string): Promise; + dropTable(tableName: string): Promise; hasTable(tableName: string): Promise; hasColumn(tableName: string, columnName: string): Promise; - table(tableName: string, callback: (tableBuilder: AlterTableBuilder) => any): void; - dropTableIfExists(tableName: string): void; + table(tableName: string, callback: (tableBuilder: AlterTableBuilder) => any): Promise; + dropTableIfExists(tableName: string): Promise; raw(statement: string): SchemaBuilder; } diff --git a/mariasql/mariasql-tests.ts b/mariasql/mariasql-tests.ts index 554d3d4a7..c9173058c 100644 --- a/mariasql/mariasql-tests.ts +++ b/mariasql/mariasql-tests.ts @@ -7,7 +7,7 @@ import util = require('util'); import Client = require('mariasql'); -var c:Client = new Client(), +var c:mariasql.MariaClient = new Client(), inspect = util.inspect; c.connect({ diff --git a/mariasql/mariasql.d.ts b/mariasql/mariasql.d.ts index 2c375a173..05d7fa062 100644 --- a/mariasql/mariasql.d.ts +++ b/mariasql/mariasql.d.ts @@ -3,95 +3,100 @@ // Definitions by: MichaelBennett // Definitions: https://github.com/borisyankov/DefinitelyTyped +declare module mariasql { + export interface MariaCallBackError { + (error:Error):void + } -/** - */ -interface MariaCallBackError { - (error:Error):void -} + export interface MariaCallBackResult { + (result:MariaResult):void + } -interface MariaCallBackResult { - (result:MariaResult):void -} + export interface MariaCallBackRow { + (result:Array):void + } -interface MariaCallBackRow { - (result:Array):void -} + export interface MariaCallBackBoolean { + (result:boolean):void + } -interface MariaCallBackBoolean { - (result:boolean):void -} + export interface MariaCallBackObject { + (result:Object):void + } -interface MariaCallBackObject { - (result:Object):void -} + export interface MariaCallBackVoid { + ():void + } -interface MariaCallBackVoid { - ():void -} + export interface Dictionary { + [index: string]: any; + } -interface Dictionary { - [index: string]: any; -} + export interface MariaPreparedQuery { + (values:Dictionary):string; + (values:Array):string; + } -interface MariaPreparedQuery { - (values:Dictionary):string; - (values:Array):string; -} + export interface ClientConfig { + host: string; + user: string; + password: string; + db?: string; + port?: number; + unixSocket?: string; + keepQueries?: boolean; + multiStatements?: boolean; + connTimeout?: number; + pingInterval?: number; + secureAuth?: boolean; + compress?: boolean; + ssl?:any; + local_infile?: boolean; + read_default_group?: string; + charset?: string; + } -interface ClientConfig { - host: string; - user: string; - password: string; - db?: string; - port?: number; - unixSocket?: string; - keepQueries?: boolean; - multiStatements?: boolean; - connTimeout?: number; - pingInterval?: number; - secureAuth?: boolean; - compress?: boolean; - ssl?:any; - local_infile?: boolean; - read_default_group?: string; - charset?: string; -} + export interface MariaResult { + on(signal:string, cb:MariaCallBackObject):MariaResult; // signal 'end' + on(signal:string, cb:MariaCallBackError):MariaResult; // signal 'error' + on(signal:string, cb:MariaCallBackRow):MariaResult; // signal 'row' + on(signal:string, cb:MariaCallBackVoid):MariaResult; // signal 'abort' + abort():void; + } -declare class MariaResult { - on(signal:string, cb:MariaCallBackObject):MariaResult; // signal 'end' - on(signal:string, cb:MariaCallBackError):MariaResult; // signal 'error' - on(signal:string, cb:MariaCallBackRow):MariaResult; // signal 'row' - on(signal:string, cb:MariaCallBackVoid):MariaResult; // signal 'abort' - abort():void; -} + export interface MariaQuery { + on(signal:string, cb:MariaCallBackResult):MariaQuery; // signal 'result' + on(signal:string, cb:MariaCallBackVoid):MariaQuery; // signal 'end' + on(signal:string, cb:MariaCallBackVoid):MariaQuery; // signal 'abort' + on(signal:string, cb:MariaCallBackError):MariaQuery; // signal 'error' + abort():void; + } -declare class MariaQuery { - on(signal:string, cb:MariaCallBackResult):MariaQuery; // signal 'result' - on(signal:string, cb:MariaCallBackVoid):MariaQuery; // signal 'end' - on(signal:string, cb:MariaCallBackVoid):MariaQuery; // signal 'abort' - on(signal:string, cb:MariaCallBackError):MariaQuery; // signal 'error' - abort():void; -} + export interface MariaClient { + connect(config:ClientConfig):void; + end():void; + destroy():void; + escape(query:string):string; + query(q:string, placeHolders?:Dictionary, useArray?:boolean):MariaQuery; + query(q:string, placeHolders?:Array, useArray?:boolean):MariaQuery; + query(q:string, useArray?:boolean):MariaQuery; + prepare(query:string): MariaPreparedQuery; + isMariaDB():boolean; + on(signal:string, cb:MariaCallBackError): MariaClient; // signal 'error' + on(signal:string, cb:MariaCallBackObject): MariaClient; // signal 'close' + on(signal:string, cb:MariaCallBackVoid): MariaClient; // signal 'connect' + connected: boolean; + threadId: string; + } -declare class MariaClient { - connect(config:ClientConfig):void; - end():void; - destroy():void; - escape(query:string):string; - query(q:string, placeHolders?:Dictionary, useArray?:boolean):MariaQuery; - query(q:string, placeHolders?:Array, useArray?:boolean):MariaQuery; - query(q:string, useArray?:boolean):MariaQuery; - prepare(query:string): MariaPreparedQuery; - isMariaDB():boolean; - on(signal:string, cb:MariaCallBackError): MariaClient; // signal 'error' - on(signal:string, cb:MariaCallBackObject): MariaClient; // signal 'close' - on(signal:string, cb:MariaCallBackVoid): MariaClient; // signal 'connect' - connected: boolean; - threadId: string; -} - -declare module 'mariasql' { - export = MariaClient; + export interface Client { + new ():MariaClient; + ():MariaClient; + prototype: MariaClient; + } } +declare module "mariasql" { + var Client:mariasql.Client; + export = Client; +} \ No newline at end of file diff --git a/node/node.d.ts b/node/node.d.ts index 3838a2952..88745f468 100644 --- a/node/node.d.ts +++ b/node/node.d.ts @@ -1036,6 +1036,36 @@ declare module "path" { export var delimiter: string; export function parse(p: string): ParsedPath; export function format(pP: ParsedPath): string; + + export module posix { + export function normalize(p: string): string; + export function join(...paths: any[]): string; + export function resolve(...pathSegments: any[]): string; + export function isAbsolute(p: string): boolean; + export function relative(from: string, to: string): string; + export function dirname(p: string): string; + export function basename(p: string, ext?: string): string; + export function extname(p: string): string; + export var sep: string; + export var delimiter: string; + export function parse(p: string): ParsedPath; + export function format(pP: ParsedPath): string; + } + + export module win32 { + export function normalize(p: string): string; + export function join(...paths: any[]): string; + export function resolve(...pathSegments: any[]): string; + export function isAbsolute(p: string): boolean; + export function relative(from: string, to: string): string; + export function dirname(p: string): string; + export function basename(p: string, ext?: string): string; + export function extname(p: string): string; + export var sep: string; + export var delimiter: string; + export function parse(p: string): ParsedPath; + export function format(pP: ParsedPath): string; + } } declare module "string_decoder" { diff --git a/qunit/qunit.d.ts b/qunit/qunit.d.ts index dbf5d9c08..ddbf014e4 100644 --- a/qunit/qunit.d.ts +++ b/qunit/qunit.d.ts @@ -170,7 +170,7 @@ interface QUnitAssert { * resolution callback for each async operation. The callback returned from assert.async() * will throw an Error if is invoked more than once. */ - async(): any; + async(): () => void; /** * A deep recursive comparison assertion, working on primitive types, arrays, objects, diff --git a/underscore/underscore.d.ts b/underscore/underscore.d.ts index 9f49bc47a..7ff9aa5eb 100644 --- a/underscore/underscore.d.ts +++ b/underscore/underscore.d.ts @@ -278,7 +278,7 @@ interface UnderscoreStatic { findIndex( list: _.List, iterator: _.ListIterator, - context?: any): T; + context?: any): number; /** diff --git a/vex-js/vex-js.d.ts b/vex-js/vex-js.d.ts new file mode 100644 index 000000000..118c61867 --- /dev/null +++ b/vex-js/vex-js.d.ts @@ -0,0 +1,45 @@ +// Type definitions for Vex v2.3.2 +// Project: https://github.com/HubSpot/vex +// Definitions by: Greg Cohan +// Definitions: https://github.com/borisyankov/DefinitelyTyped + +/// + +declare module vex { + + interface ICSSAttributes { + [property: string]: string | number; + } + + interface IVexOptions { + afterClose?: (() => void); + afterOpen?: ((vexContent: JQuery) => void); + content?: string; + showCloseButton?: boolean; + escapeButtonCloses?: boolean; + overlayClosesOnClick?: boolean; + appendLocation?: HTMLElement | JQuery | string; + className?: string; + css?: ICSSAttributes; + overlayClassName?: string; + overlayCSS?: ICSSAttributes; + contentClassName?: string; + contentCSS?: ICSSAttributes; + closeClassName?: string; + closeCSS?: ICSSAttributes; + } + + interface Vex { + open(options: IVexOptions): JQuery; + close(id?: number): boolean; + closeAll(): boolean; + closeByID(id: number): boolean; + } + +} + +declare module "vex" { + export = vex; +} + +declare var vex: vex.Vex; diff --git a/vex-js/vex-tests.ts b/vex-js/vex-tests.ts new file mode 100644 index 000000000..ea1778d61 --- /dev/null +++ b/vex-js/vex-tests.ts @@ -0,0 +1,26 @@ +/// +/// + +var vexContent = vex.open({ + afterClose: (() => null), + afterOpen: ((vexContent: JQuery) => null), + content: "

Modal

", + showCloseButton: false, + escapeButtonCloses: true, + overlayClosesOnClick: false, + appendLocation: "body", + className: "vex-dialog", + css: {background: "blue"}, + overlayClassName: "vex-overlay", + overlayCSS: {border: 0}, + contentClassName: "vex-content", + contentCSS: {margin: "0 auto"}, + closeClassName: "vex-close", + closeCSS: {margin: 0} +}); + +var id = vexContent.data().vex.id; + +vex.close(id); +vex.closeByID(id); +vex.closeAll(); diff --git a/yamljs/yamljs-tests.ts b/yamljs/yamljs-tests.ts new file mode 100644 index 000000000..9780c504d --- /dev/null +++ b/yamljs/yamljs-tests.ts @@ -0,0 +1,13 @@ +/// + +import yamljs = require('yamljs'); + +yamljs.load('yaml-testfile.yml'); + +yamljs.parse('this_is_no_ymlstring'); + +yamljs.stringify({ a : 'val', b : { ba : 123, bb : 'nothing' }}); + +yamljs.stringify({ a : 'val', b : { ba : 123, bb : 'nothing' }}, 1); + +yamljs.stringify({ a : 'val', b : { ba : 123, bb : 'nothing' }}, 1, 2); \ No newline at end of file diff --git a/yamljs/yamljs.d.ts b/yamljs/yamljs.d.ts new file mode 100644 index 000000000..65d2fd923 --- /dev/null +++ b/yamljs/yamljs.d.ts @@ -0,0 +1,14 @@ +// Type definitions for yamljs 0.2.1 +// Project: https://github.com/jeremyfa/yaml.js +// Definitions by: Tim Jonischkat +// Definitions: https://github.com/borisyankov/DefinitelyTyped + +declare module "yamljs" { + + export function load(path : string) : any; + + export function stringify(nativeObject : any, inline? : number, spaces? : number) : string; + + export function parse(yamlString : string) : any; + +} \ No newline at end of file