From 3aae128161027bfb8dced69bc95d9c85929c09fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20D=C3=BC=C3=BCna?= Date: Thu, 16 Jul 2015 19:33:38 +0300 Subject: [PATCH 1/5] easy-xapi --- easy-xapi/easy-xapi-tests.ts | 32 ++++++++++++++++++++++++++ easy-xapi/easy-xapi.d.ts | 44 ++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 easy-xapi/easy-xapi-tests.ts create mode 100644 easy-xapi/easy-xapi.d.ts diff --git a/easy-xapi/easy-xapi-tests.ts b/easy-xapi/easy-xapi-tests.ts new file mode 100644 index 000000000..70c5351d4 --- /dev/null +++ b/easy-xapi/easy-xapi-tests.ts @@ -0,0 +1,32 @@ +/** + * Created by karl on 14/07/15. + */ + +/// +/// + +import express = require('express'); +import eXapi = require('easy-xapi'); + +eXapi.init({ + jSend: { + partial: true + } +}); + +var xApi = eXapi.create({ + root: __dirname, + log: { + name: 'Log', + level: 'info' + }, + port: 3000, + name: 'test', + mount: function (app) { + app.get('/', function (req, res) { + res.send('ok'); + }); + } +}); + +xApi.listen(); diff --git a/easy-xapi/easy-xapi.d.ts b/easy-xapi/easy-xapi.d.ts new file mode 100644 index 000000000..612dd51d5 --- /dev/null +++ b/easy-xapi/easy-xapi.d.ts @@ -0,0 +1,44 @@ +// Type definitions for easy-xapi +// Project: https://github.com/DeadAlready/easy-xapi +// Definitions by: Karl Düüna +// Definitions: https://github.com/borisyankov/DefinitelyTyped + +/// +/// + +declare module Express { + export interface Request { + log: any; + info: any; + } +} + +declare module "easy-xapi" { + import express = require('express'); + import http = require('http'); + + interface InitConfig { + jSend?: {partial: boolean}; + } + + interface Config { + root: string; + port: number; + name: string; + log: { + name: string; + level: string + } + mount: (app: express.Application) => void + } + + interface Result { + express: any; + app: express.Application; + server: http.Server; + listen: () => void; + } + + export function init(conf: InitConfig): void; + export function create(conf: Config): Result; +} From 98440df4412a47e844039acf50025b98709d616d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20D=C3=BC=C3=BCna?= Date: Thu, 16 Jul 2015 20:19:32 +0300 Subject: [PATCH 2/5] Add xHeaderDefaults --- easy-xapi/easy-xapi.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/easy-xapi/easy-xapi.d.ts b/easy-xapi/easy-xapi.d.ts index 612dd51d5..4afe5b44c 100644 --- a/easy-xapi/easy-xapi.d.ts +++ b/easy-xapi/easy-xapi.d.ts @@ -25,6 +25,7 @@ declare module "easy-xapi" { root: string; port: number; name: string; + xHeaderDefaults: Object; log: { name: string; level: string From 09e37c0f4069b986237c4fa8506d28b243e88aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20D=C3=BC=C3=BCna?= Date: Thu, 16 Jul 2015 20:19:53 +0300 Subject: [PATCH 3/5] Fix typo --- easy-xapi/easy-xapi.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easy-xapi/easy-xapi.d.ts b/easy-xapi/easy-xapi.d.ts index 4afe5b44c..7e59a14b5 100644 --- a/easy-xapi/easy-xapi.d.ts +++ b/easy-xapi/easy-xapi.d.ts @@ -25,7 +25,7 @@ declare module "easy-xapi" { root: string; port: number; name: string; - xHeaderDefaults: Object; + xHeaderDefaults?: Object; log: { name: string; level: string From 4b055bdf5ab9c2cbd6bd3721460b53ba38ff01ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20D=C3=BC=C3=BCna?= Date: Thu, 16 Jul 2015 20:58:44 +0300 Subject: [PATCH 4/5] Updates for easy- definitions --- easy-jsend/easy-jsend.d.ts | 4 ++-- easy-x-headers/easy-x-headers.d.ts | 2 +- easy-xapi/easy-xapi.d.ts | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/easy-jsend/easy-jsend.d.ts b/easy-jsend/easy-jsend.d.ts index 21a9bc11e..b45fbdac7 100644 --- a/easy-jsend/easy-jsend.d.ts +++ b/easy-jsend/easy-jsend.d.ts @@ -27,7 +27,7 @@ declare module Express { export interface Response { success (data?: any, status?: number): void; fail (data: any, status?: number): void; - error (err: any): void; + error (err: any, status?: number): void; partial? (data: PartialInput, status?: number): void; makePartial? (data: MakePartialInput): void; } @@ -35,4 +35,4 @@ declare module Express { declare module "easy-jsend" { export function init(conf?:{partial:boolean}): void; -} \ No newline at end of file +} diff --git a/easy-x-headers/easy-x-headers.d.ts b/easy-x-headers/easy-x-headers.d.ts index c0a13d1a8..4158654ed 100644 --- a/easy-x-headers/easy-x-headers.d.ts +++ b/easy-x-headers/easy-x-headers.d.ts @@ -14,5 +14,5 @@ declare module Express { declare module "easy-x-headers" { import express = require('express'); - export function getMiddleware(): express.RequestHandler; + export function getMiddleware(defaults?: Object): express.RequestHandler; } diff --git a/easy-xapi/easy-xapi.d.ts b/easy-xapi/easy-xapi.d.ts index 7e59a14b5..2468cb8b6 100644 --- a/easy-xapi/easy-xapi.d.ts +++ b/easy-xapi/easy-xapi.d.ts @@ -9,7 +9,6 @@ declare module Express { export interface Request { log: any; - info: any; } } From 91df93db208c4b3cf79fd49f6e8b3d72413f4305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20D=C3=BC=C3=BCna?= Date: Thu, 16 Jul 2015 22:45:02 +0300 Subject: [PATCH 5/5] Update easy-xapi output --- easy-xapi/easy-xapi.d.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/easy-xapi/easy-xapi.d.ts b/easy-xapi/easy-xapi.d.ts index 2468cb8b6..25d95b432 100644 --- a/easy-xapi/easy-xapi.d.ts +++ b/easy-xapi/easy-xapi.d.ts @@ -5,6 +5,7 @@ /// /// +/// declare module Express { export interface Request { @@ -15,6 +16,7 @@ declare module Express { declare module "easy-xapi" { import express = require('express'); import http = require('http'); + import bunyan = require('bunyan'); interface InitConfig { jSend?: {partial: boolean}; @@ -36,6 +38,7 @@ declare module "easy-xapi" { express: any; app: express.Application; server: http.Server; + log: bunyan.Logger; listen: () => void; }