From 8037f2788aa868f1186183e2de1d5957a0aa6eac Mon Sep 17 00:00:00 2001 From: Gareth Parker Date: Sat, 24 Mar 2018 09:06:24 +0000 Subject: [PATCH 1/6] Moved typings to types folder --- {glue => types/glue}/hapi-glue-test.ts | 0 {glue => types/glue}/index.d.ts | 0 {glue => types/glue}/tsconfig.json | 0 {glue => types/glue}/tslint.json | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {glue => types/glue}/hapi-glue-test.ts (100%) rename {glue => types/glue}/index.d.ts (100%) rename {glue => types/glue}/tsconfig.json (100%) rename {glue => types/glue}/tslint.json (100%) diff --git a/glue/hapi-glue-test.ts b/types/glue/hapi-glue-test.ts similarity index 100% rename from glue/hapi-glue-test.ts rename to types/glue/hapi-glue-test.ts diff --git a/glue/index.d.ts b/types/glue/index.d.ts similarity index 100% rename from glue/index.d.ts rename to types/glue/index.d.ts diff --git a/glue/tsconfig.json b/types/glue/tsconfig.json similarity index 100% rename from glue/tsconfig.json rename to types/glue/tsconfig.json diff --git a/glue/tslint.json b/types/glue/tslint.json similarity index 100% rename from glue/tslint.json rename to types/glue/tslint.json From 95c06982ebea38a2dfcb65a69bed021c817fc42f Mon Sep 17 00:00:00 2001 From: Gareth Parker Date: Sat, 24 Mar 2018 09:57:13 +0000 Subject: [PATCH 2/6] Fixing build --- .../glue/{hapi-glue-test.ts => glue-tests.ts} | 4 +- types/glue/index.d.ts | 54 +++++++++---------- types/glue/tsconfig.json | 2 +- 3 files changed, 28 insertions(+), 32 deletions(-) rename types/glue/{hapi-glue-test.ts => glue-tests.ts} (90%) diff --git a/types/glue/hapi-glue-test.ts b/types/glue/glue-tests.ts similarity index 90% rename from types/glue/hapi-glue-test.ts rename to types/glue/glue-tests.ts index 2d34fdb489..7ac309352c 100644 --- a/types/glue/hapi-glue-test.ts +++ b/types/glue/glue-tests.ts @@ -15,6 +15,6 @@ const manifest: Glue.Manifest = { } ] } -} +}; -Glue.compose(manifest); \ No newline at end of file +Glue.compose(manifest); diff --git a/types/glue/index.d.ts b/types/glue/index.d.ts index 5f40ba924b..e7f12c7a68 100644 --- a/types/glue/index.d.ts +++ b/types/glue/index.d.ts @@ -1,35 +1,31 @@ // Type definitions for glue // Project: https://github.com/hapijs/glue -// Definitions by: Gareth Parker +// Definitions by: Gareth Parker // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 2.7 -declare module "glue" { - - import { Server, ServerOptions } from "hapi"; - - export interface Options { - relativeTo: string; - preConnections?: (Server:Server, next:(err:any)=>void ) => void; - preRegister?: (Server:Server, next:(err:any)=>void ) => void; - } - - interface Plugin { - plugin: string | { - register:string; - options?:any; - }; - options?: any; - routes?: any - } - - interface Manifest { - server: ServerOptions; - register?: { - plugins: Array - } - } - - export function compose(manifest: Manifest, options?: Options): Server; +import { Server, ServerOptions } from "hapi"; +export interface Options { + relativeTo: string; + preConnections?: (Server:Server, next:(err:any)=>void ) => void; + preRegister?: (Server:Server, next:(err:any)=>void ) => void; } + +interface Plugin { + plugin: string | { + register:string; + options?:any; + }; + options?: any; + routes?: any +} + +interface Manifest { + server: ServerOptions; + register?: { + plugins: Array + } +} + +export function compose(manifest: Manifest, options?: Options): Server; + diff --git a/types/glue/tsconfig.json b/types/glue/tsconfig.json index f2d4fcee28..2d9b76b8f7 100644 --- a/types/glue/tsconfig.json +++ b/types/glue/tsconfig.json @@ -21,6 +21,6 @@ }, "files": [ "index.d.ts", - "hapi-glue-test.ts" + "glue-tests.ts" ] } \ No newline at end of file From 23083887e514e10c6be89a42ec8cb27ad7a84d0d Mon Sep 17 00:00:00 2001 From: Gareth Parker Date: Sat, 24 Mar 2018 10:01:39 +0000 Subject: [PATCH 3/6] Added typescript version --- types/glue/index.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/types/glue/index.d.ts b/types/glue/index.d.ts index e7f12c7a68..39b339e575 100644 --- a/types/glue/index.d.ts +++ b/types/glue/index.d.ts @@ -2,6 +2,7 @@ // Project: https://github.com/hapijs/glue // Definitions by: Gareth Parker // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.4 import { Server, ServerOptions } from "hapi"; From 4e49fe797e19118bf7b25a462ac94b99e05e6e0c Mon Sep 17 00:00:00 2001 From: Gareth Parker Date: Sat, 24 Mar 2018 10:16:02 +0000 Subject: [PATCH 4/6] Fixing linting errors --- types/glue/index.d.ts | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/types/glue/index.d.ts b/types/glue/index.d.ts index 39b339e575..e4dfb76e92 100644 --- a/types/glue/index.d.ts +++ b/types/glue/index.d.ts @@ -4,18 +4,22 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.4 +/// + import { Server, ServerOptions } from "hapi"; +// import hapi = require('hapi'); + export interface Options { relativeTo: string; - preConnections?: (Server:Server, next:(err:any)=>void ) => void; - preRegister?: (Server:Server, next:(err:any)=>void ) => void; + preConnections?: (Server: Server, next:( err: any ) => void ) => void; + preRegister?: (Server: Server, next:( err: any ) => void ) => void; } interface Plugin { plugin: string | { - register:string; - options?:any; + register: string; + options?: any; }; options?: any; routes?: any @@ -24,9 +28,8 @@ interface Plugin { interface Manifest { server: ServerOptions; register?: { - plugins: Array - } + plugins: Plugin[] + }; } export function compose(manifest: Manifest, options?: Options): Server; - From aa39b8c5b18661f82b283387d7c643c858e6ff5a Mon Sep 17 00:00:00 2001 From: Gareth Parker Date: Sat, 24 Mar 2018 10:23:18 +0000 Subject: [PATCH 5/6] Fixing linting errors --- types/glue/index.d.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/types/glue/index.d.ts b/types/glue/index.d.ts index e4dfb76e92..47cc987f10 100644 --- a/types/glue/index.d.ts +++ b/types/glue/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for glue +// Type definitions for glue 5.0 // Project: https://github.com/hapijs/glue // Definitions by: Gareth Parker // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped @@ -12,20 +12,20 @@ import { Server, ServerOptions } from "hapi"; export interface Options { relativeTo: string; - preConnections?: (Server: Server, next:( err: any ) => void ) => void; - preRegister?: (Server: Server, next:( err: any ) => void ) => void; + preConnections?: (Server: Server, next: (err: any) => void) => void; + preRegister?: (Server: Server, next: (err: any) => void) => void; } -interface Plugin { +export interface Plugin { plugin: string | { register: string; options?: any; }; options?: any; - routes?: any + routes?: any; } -interface Manifest { +export interface Manifest { server: ServerOptions; register?: { plugins: Plugin[] From 22385d414c3c042f13862853668b0e725ef820e4 Mon Sep 17 00:00:00 2001 From: Gareth Parker Date: Sat, 24 Mar 2018 10:28:15 +0000 Subject: [PATCH 6/6] Removed reference to hapi --- types/glue/index.d.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/types/glue/index.d.ts b/types/glue/index.d.ts index 47cc987f10..8e710d233a 100644 --- a/types/glue/index.d.ts +++ b/types/glue/index.d.ts @@ -4,12 +4,8 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.4 -/// - import { Server, ServerOptions } from "hapi"; -// import hapi = require('hapi'); - export interface Options { relativeTo: string; preConnections?: (Server: Server, next: (err: any) => void) => void;