From 7c0ed32587d0563179f2665bf69beac95be9e7d8 Mon Sep 17 00:00:00 2001 From: rafw87 Date: Sun, 29 Mar 2015 00:48:59 +0100 Subject: [PATCH 01/18] Update angular.d.ts $q.all() - separate overloads for array and hash version --- angularjs/angular.d.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts index bc7fa9de0..f3aadc9f7 100755 --- a/angularjs/angular.d.ts +++ b/angularjs/angular.d.ts @@ -930,11 +930,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. */ From 7dd2af62affa78d6dafa26aee9a529f23334540d Mon Sep 17 00:00:00 2001 From: Greg Cohan Date: Wed, 25 Mar 2015 16:47:48 -0400 Subject: [PATCH 02/18] add vex typings --- vex-js/vex-js.d.ts | 45 +++++++++++++++++++++++++++++++++++++++++++++ vex-js/vex-tests.ts | 26 ++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 vex-js/vex-js.d.ts create mode 100644 vex-js/vex-tests.ts 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(); From ebae8dab2113c87145a3fc8dc4b7e2843b173ea7 Mon Sep 17 00:00:00 2001 From: yortus Date: Mon, 30 Mar 2015 14:15:55 +0800 Subject: [PATCH 03/18] knex.d.ts: All SchemaBulder functions promises --- knex/knex.d.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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; } From f6a35d9ac841fa5b3425d89f81ad9c83dbdbc002 Mon Sep 17 00:00:00 2001 From: Kjartan Ferstl Date: Mon, 30 Mar 2015 13:10:14 +0200 Subject: [PATCH 04/18] underscore _.findIndex now returns the correct type (number instead of the element type) --- underscore/underscore.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; /** From 61deb1c1848f58c2a9b75904a213dfde77ee8bfb Mon Sep 17 00:00:00 2001 From: Tim Jonischkat Date: Mon, 30 Mar 2015 15:51:34 +0200 Subject: [PATCH 05/18] added definition for yamljs module --- yamljs/yamljs.d.ts | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 yamljs/yamljs.d.ts diff --git a/yamljs/yamljs.d.ts b/yamljs/yamljs.d.ts new file mode 100644 index 000000000..1ebd90a07 --- /dev/null +++ b/yamljs/yamljs.d.ts @@ -0,0 +1,5 @@ +declare module "yamljs" { + + export function load(path : string) : any[]; + +} \ No newline at end of file From 275c43c7a63eb7cc9ec3af4c042015e43bbc7b70 Mon Sep 17 00:00:00 2001 From: Tim Jonischkat Date: Mon, 30 Mar 2015 15:54:23 +0200 Subject: [PATCH 06/18] added documentation to yamljs def --- yamljs/yamljs.d.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/yamljs/yamljs.d.ts b/yamljs/yamljs.d.ts index 1ebd90a07..5bdfd60a4 100644 --- a/yamljs/yamljs.d.ts +++ b/yamljs/yamljs.d.ts @@ -1,4 +1,9 @@ -declare module "yamljs" { +// 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[]; From ffd22a1f3e71575f2dc84a168f1d7fb3817f0559 Mon Sep 17 00:00:00 2001 From: Tim Jonischkat Date: Mon, 30 Mar 2015 16:02:48 +0200 Subject: [PATCH 07/18] yamljs tests file --- yamljs/yamljs-tests.ts | 11 +++++++++++ yamljs/yamljs.d.ts | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 yamljs/yamljs-tests.ts diff --git a/yamljs/yamljs-tests.ts b/yamljs/yamljs-tests.ts new file mode 100644 index 000000000..a2453edff --- /dev/null +++ b/yamljs/yamljs-tests.ts @@ -0,0 +1,11 @@ +/// + +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 index 5bdfd60a4..ca287110d 100644 --- a/yamljs/yamljs.d.ts +++ b/yamljs/yamljs.d.ts @@ -5,6 +5,10 @@ declare module yamljs { - export function load(path : string) : any[]; + 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 From d6d74731209dd4dccb2dededffb7302a5b42e0a7 Mon Sep 17 00:00:00 2001 From: Tim Jonischkat Date: Mon, 30 Mar 2015 16:04:49 +0200 Subject: [PATCH 08/18] corrected documentation --- yamljs/yamljs.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yamljs/yamljs.d.ts b/yamljs/yamljs.d.ts index ca287110d..34b5f40dc 100644 --- a/yamljs/yamljs.d.ts +++ b/yamljs/yamljs.d.ts @@ -1,6 +1,6 @@ // Type definitions for yamljs 0.2.1 // Project: https://github.com/jeremyfa/yaml.js -// Definitions by: Tim Jonischkat +// Definitions by: Tim Jonischkat // Definitions: https://github.com/borisyankov/DefinitelyTyped declare module yamljs { From 1bdfd37e924263c8988a40e1aa65806fd266bf59 Mon Sep 17 00:00:00 2001 From: Tim Jonischkat Date: Mon, 30 Mar 2015 16:38:03 +0200 Subject: [PATCH 09/18] corrected module name --- yamljs/yamljs.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yamljs/yamljs.d.ts b/yamljs/yamljs.d.ts index 34b5f40dc..65d2fd923 100644 --- a/yamljs/yamljs.d.ts +++ b/yamljs/yamljs.d.ts @@ -3,7 +3,7 @@ // Definitions by: Tim Jonischkat // Definitions: https://github.com/borisyankov/DefinitelyTyped -declare module yamljs { +declare module "yamljs" { export function load(path : string) : any; From a965499ef65d88c30e4e87bbb36ef908e1a20bde Mon Sep 17 00:00:00 2001 From: Tim Jonischkat Date: Mon, 30 Mar 2015 16:41:03 +0200 Subject: [PATCH 10/18] adapted test to renaming --- yamljs/yamljs-tests.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yamljs/yamljs-tests.ts b/yamljs/yamljs-tests.ts index a2453edff..9780c504d 100644 --- a/yamljs/yamljs-tests.ts +++ b/yamljs/yamljs-tests.ts @@ -1,5 +1,7 @@ /// +import yamljs = require('yamljs'); + yamljs.load('yaml-testfile.yml'); yamljs.parse('this_is_no_ymlstring'); From 1c05872e7811235f43780b8b596bfd26fe8e7760 Mon Sep 17 00:00:00 2001 From: Audrey Date: Mon, 30 Mar 2015 11:53:44 -0400 Subject: [PATCH 11/18] Include padAngle to PieLayout interface Based on line 68 of pie.js https://github.com/mbostock/d3/blob/master/src/layout/pie.js --- d3/d3.d.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/d3/d3.d.ts b/d3/d3.d.ts index 57e817818..f2579b948 100644 --- a/d3/d3.d.ts +++ b/d3/d3.d.ts @@ -1279,6 +1279,13 @@ declare module D3 { (angle: (d : any) => number): PieLayout (angle: (d : any, i: number) => number): PieLayout; }; + padAngle: { + (): number; + (angle: number): PieLayout; + (angle: () => number): PieLayout; + (angle: (d : any) => number): PieLayout + (angle: (d : any, i: number) => number): PieLayout; + }; } export interface ArcDescriptor { From 7acd4688471832500a161e1c0514f919318fc050 Mon Sep 17 00:00:00 2001 From: Peter Grman Date: Mon, 30 Mar 2015 18:03:48 +0200 Subject: [PATCH 12/18] add options object to errorhandler function --- errorhandler/errorhandler.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 +} From c673b469b7d1b5c55433e4bdf5466eff2ef919a2 Mon Sep 17 00:00:00 2001 From: Josh McCullough Date: Mon, 30 Mar 2015 16:24:42 -0400 Subject: [PATCH 13/18] Fixed type of assert.async()`. The function `assert.async` is not of type `any`, it is a parameterless, void function. --- qunit/qunit.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, From cfb41c331e005095dd134b69e176a0e45cdd78b0 Mon Sep 17 00:00:00 2001 From: Ricardo Franco Date: Mon, 30 Mar 2015 18:17:40 -0300 Subject: [PATCH 14/18] fix missing module 'ng' --- angularjs/angular.d.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts index 9f7efea89..90822f603 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 { @@ -1573,12 +1573,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; } } From 4d1663493e4994cdf025d237434b5916719b569d Mon Sep 17 00:00:00 2001 From: Ricardo Franco Date: Mon, 30 Mar 2015 18:22:58 -0300 Subject: [PATCH 15/18] rename module 'ng' to 'angular' --- angular-ui-bootstrap/angular-ui-bootstrap.d.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 { From e30c79d328b268dd3a8d87688b4aeef57b7f243e Mon Sep 17 00:00:00 2001 From: vvakame Date: Thu, 2 Apr 2015 01:58:04 +0900 Subject: [PATCH 16/18] add posix and win32 object to node/path --- node/node.d.ts | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) 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" { From e5d9227b59098c4ea38ce2caea154ac836987eef Mon Sep 17 00:00:00 2001 From: "Michael J. Bennett" Date: Wed, 1 Apr 2015 20:00:42 -0400 Subject: [PATCH 17/18] mariasql definitions are now a ghost module On branch mariasql modified: mariasql/mariasql-tests.ts modified: mariasql/mariasql.d.ts --- mariasql/mariasql-tests.ts | 2 +- mariasql/mariasql.d.ts | 161 +++++++++++++++++++------------------ 2 files changed, 84 insertions(+), 79 deletions(-) diff --git a/mariasql/mariasql-tests.ts b/mariasql/mariasql-tests.ts index 554d3d4a7..6700a0353 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..8b3d5551a 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 From a8ef959e8ae63bc64fde7b7def7e0a621305c652 Mon Sep 17 00:00:00 2001 From: "Michael J. Bennett" Date: Wed, 1 Apr 2015 20:31:18 -0400 Subject: [PATCH 18/18] Cleaned up ghost module so that its name makes sense On branch mariasql modified: mariasql/mariasql-tests.ts modified: mariasql/mariasql.d.ts --- mariasql/mariasql-tests.ts | 2 +- mariasql/mariasql.d.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mariasql/mariasql-tests.ts b/mariasql/mariasql-tests.ts index 6700a0353..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:MARIASQL.MariaClient = 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 8b3d5551a..05d7fa062 100644 --- a/mariasql/mariasql.d.ts +++ b/mariasql/mariasql.d.ts @@ -3,7 +3,7 @@ // Definitions by: MichaelBennett // Definitions: https://github.com/borisyankov/DefinitelyTyped -declare module MARIASQL { +declare module mariasql { export interface MariaCallBackError { (error:Error):void } @@ -97,6 +97,6 @@ declare module MARIASQL { } declare module "mariasql" { - var Client:MARIASQL.Client; + var Client:mariasql.Client; export = Client; } \ No newline at end of file