From 3e29b6e832466a72e5fc91a34ca405294e9acfa8 Mon Sep 17 00:00:00 2001 From: rafaelsouzaf Date: Wed, 13 Dec 2017 22:32:26 -0300 Subject: [PATCH] Move v17 definitions and tests to "types/hapi" root folder and delete v17 temp folder. --- .../definitions/plugin/plugin-registered.d.ts | 0 .../{v17 => }/definitions/plugin/plugin.d.ts | 0 .../definitions/request/request-auth.d.ts | 0 .../definitions/request/request-events.d.ts | 0 .../definitions/request/request-info.d.ts | 0 .../definitions/request/request-route.d.ts | 0 .../definitions/request/request.d.ts | 0 .../definitions/response/response-events.d.ts | 0 .../definitions/response/response-object.d.ts | 0 .../response/response-settings.d.ts | 0 .../response/response-toolkit.d.ts | 0 .../route/route-options-access-scope.d.ts | 0 .../route/route-options-access.d.ts | 0 .../route/route-options-cache.d.ts | 0 .../definitions/route/route-options-cors.d.ts | 0 .../route/route-options-payload.d.ts | 0 .../definitions/route/route-options-pre.d.ts | 0 .../route/route-options-response.d.ts | 0 .../route/route-options-secure.d.ts | 0 .../route/route-options-validate.d.ts | 0 .../definitions/route/route-options.d.ts | 0 .../server/server-auth-scheme.d.ts | 0 .../definitions/server/server-auth.d.ts | 0 .../definitions/server/server-cache.d.ts | 0 .../definitions/server/server-events.d.ts | 0 .../definitions/server/server-ext.d.ts | 0 .../definitions/server/server-info.d.ts | 0 .../definitions/server/server-inject.d.ts | 0 .../definitions/server/server-method.d.ts | 0 .../server/server-options-cache.d.ts | 0 .../definitions/server/server-options.d.ts | 0 .../definitions/server/server-realm.d.ts | 0 .../definitions/server/server-register.d.ts | 0 .../definitions/server/server-route.d.ts | 0 .../server/server-state-options.d.ts | 0 .../definitions/server/server-state.d.ts | 0 .../{v17 => }/definitions/server/server.d.ts | 0 .../hapi/{v17 => }/definitions/util/json.d.ts | 0 .../{v17 => }/definitions/util/lifecycle.d.ts | 0 .../hapi/{v17 => }/definitions/util/util.d.ts | 0 .../hapi/{v17 => }/test/request/catch-all.ts | 0 .../hapi/{v17 => }/test/request/parameters.ts | 0 types/hapi/test/request/query.ts | 27 +++++-- .../hapi/{v17 => }/test/response/continue.ts | 0 .../hapi/{v17 => }/test/response/redirect.ts | 0 .../test/response/response-events.ts | 0 .../hapi/{v17 => }/test/response/response.ts | 0 .../{v17 => }/test/route/adding-routes.ts | 0 types/hapi/test/route/handler.ts | 13 ++-- .../{v17 => }/test/route/route-options-pre.ts | 0 .../{v17 => }/test/route/route-options.ts | 0 .../hapi/{v17 => }/test/server/server-app.ts | 0 .../{v17 => }/test/server/server-auth-api.ts | 0 .../test/server/server-auth-default.ts | 0 .../{v17 => }/test/server/server-auth-test.ts | 0 .../hapi/{v17 => }/test/server/server-bind.ts | 0 .../test/server/server-cache-provision.ts | 0 .../{v17 => }/test/server/server-cache.ts | 0 .../{v17 => }/test/server/server-decoder.ts | 0 .../test/server/server-decorations.ts | 0 .../{v17 => }/test/server/server-encoder.ts | 0 .../test/server/server-events-once.ts | 0 .../{v17 => }/test/server/server-events.ts | 0 .../{v17 => }/test/server/server-expose.ts | 0 .../hapi/{v17 => }/test/server/server-info.ts | 0 .../{v17 => }/test/server/server-inject.ts | 0 .../{v17 => }/test/server/server-listener.ts | 0 .../hapi/{v17 => }/test/server/server-load.ts | 0 .../{v17 => }/test/server/server-lookup.ts | 0 .../{v17 => }/test/server/server-match.ts | 0 .../{v17 => }/test/server/server-method.ts | 0 .../{v17 => }/test/server/server-methods.ts | 0 .../hapi/{v17 => }/test/server/server-mime.ts | 0 .../{v17 => }/test/server/server-options.ts | 0 .../hapi/{v17 => }/test/server/server-path.ts | 0 .../{v17 => }/test/server/server-plugins.ts | 0 .../{v17 => }/test/server/server-settings.ts | 0 .../{v17 => }/test/server/server-start.ts | 0 .../{v17 => }/test/server/server-state.ts | 0 .../hapi/{v17 => }/test/server/server-stop.ts | 0 .../{v17 => }/test/server/server-table.ts | 0 .../{v17 => }/test/server/server-version.ts | 0 types/hapi/v17/index.d.ts | 61 --------------- types/hapi/v17/test/request/event-types.ts | 76 ------------------- types/hapi/v17/test/request/get-log.ts | 29 ------- types/hapi/v17/test/request/query.ts | 27 ------- types/hapi/v17/test/response/error.ts | 31 -------- types/hapi/v17/test/route/config.ts | 52 ------------- types/hapi/v17/test/route/handler.ts | 9 --- types/hapi/v17/tsconfig.json | 73 ------------------ 90 files changed, 26 insertions(+), 372 deletions(-) rename types/hapi/{v17 => }/definitions/plugin/plugin-registered.d.ts (100%) rename types/hapi/{v17 => }/definitions/plugin/plugin.d.ts (100%) rename types/hapi/{v17 => }/definitions/request/request-auth.d.ts (100%) rename types/hapi/{v17 => }/definitions/request/request-events.d.ts (100%) rename types/hapi/{v17 => }/definitions/request/request-info.d.ts (100%) rename types/hapi/{v17 => }/definitions/request/request-route.d.ts (100%) rename types/hapi/{v17 => }/definitions/request/request.d.ts (100%) rename types/hapi/{v17 => }/definitions/response/response-events.d.ts (100%) rename types/hapi/{v17 => }/definitions/response/response-object.d.ts (100%) rename types/hapi/{v17 => }/definitions/response/response-settings.d.ts (100%) rename types/hapi/{v17 => }/definitions/response/response-toolkit.d.ts (100%) rename types/hapi/{v17 => }/definitions/route/route-options-access-scope.d.ts (100%) rename types/hapi/{v17 => }/definitions/route/route-options-access.d.ts (100%) rename types/hapi/{v17 => }/definitions/route/route-options-cache.d.ts (100%) rename types/hapi/{v17 => }/definitions/route/route-options-cors.d.ts (100%) rename types/hapi/{v17 => }/definitions/route/route-options-payload.d.ts (100%) rename types/hapi/{v17 => }/definitions/route/route-options-pre.d.ts (100%) rename types/hapi/{v17 => }/definitions/route/route-options-response.d.ts (100%) rename types/hapi/{v17 => }/definitions/route/route-options-secure.d.ts (100%) rename types/hapi/{v17 => }/definitions/route/route-options-validate.d.ts (100%) rename types/hapi/{v17 => }/definitions/route/route-options.d.ts (100%) rename types/hapi/{v17 => }/definitions/server/server-auth-scheme.d.ts (100%) rename types/hapi/{v17 => }/definitions/server/server-auth.d.ts (100%) rename types/hapi/{v17 => }/definitions/server/server-cache.d.ts (100%) rename types/hapi/{v17 => }/definitions/server/server-events.d.ts (100%) rename types/hapi/{v17 => }/definitions/server/server-ext.d.ts (100%) rename types/hapi/{v17 => }/definitions/server/server-info.d.ts (100%) rename types/hapi/{v17 => }/definitions/server/server-inject.d.ts (100%) rename types/hapi/{v17 => }/definitions/server/server-method.d.ts (100%) rename types/hapi/{v17 => }/definitions/server/server-options-cache.d.ts (100%) rename types/hapi/{v17 => }/definitions/server/server-options.d.ts (100%) rename types/hapi/{v17 => }/definitions/server/server-realm.d.ts (100%) rename types/hapi/{v17 => }/definitions/server/server-register.d.ts (100%) rename types/hapi/{v17 => }/definitions/server/server-route.d.ts (100%) rename types/hapi/{v17 => }/definitions/server/server-state-options.d.ts (100%) rename types/hapi/{v17 => }/definitions/server/server-state.d.ts (100%) rename types/hapi/{v17 => }/definitions/server/server.d.ts (100%) rename types/hapi/{v17 => }/definitions/util/json.d.ts (100%) rename types/hapi/{v17 => }/definitions/util/lifecycle.d.ts (100%) rename types/hapi/{v17 => }/definitions/util/util.d.ts (100%) rename types/hapi/{v17 => }/test/request/catch-all.ts (100%) rename types/hapi/{v17 => }/test/request/parameters.ts (100%) rename types/hapi/{v17 => }/test/response/continue.ts (100%) rename types/hapi/{v17 => }/test/response/redirect.ts (100%) rename types/hapi/{v17 => }/test/response/response-events.ts (100%) rename types/hapi/{v17 => }/test/response/response.ts (100%) rename types/hapi/{v17 => }/test/route/adding-routes.ts (100%) rename types/hapi/{v17 => }/test/route/route-options-pre.ts (100%) rename types/hapi/{v17 => }/test/route/route-options.ts (100%) rename types/hapi/{v17 => }/test/server/server-app.ts (100%) rename types/hapi/{v17 => }/test/server/server-auth-api.ts (100%) rename types/hapi/{v17 => }/test/server/server-auth-default.ts (100%) rename types/hapi/{v17 => }/test/server/server-auth-test.ts (100%) rename types/hapi/{v17 => }/test/server/server-bind.ts (100%) rename types/hapi/{v17 => }/test/server/server-cache-provision.ts (100%) rename types/hapi/{v17 => }/test/server/server-cache.ts (100%) rename types/hapi/{v17 => }/test/server/server-decoder.ts (100%) rename types/hapi/{v17 => }/test/server/server-decorations.ts (100%) rename types/hapi/{v17 => }/test/server/server-encoder.ts (100%) rename types/hapi/{v17 => }/test/server/server-events-once.ts (100%) rename types/hapi/{v17 => }/test/server/server-events.ts (100%) rename types/hapi/{v17 => }/test/server/server-expose.ts (100%) rename types/hapi/{v17 => }/test/server/server-info.ts (100%) rename types/hapi/{v17 => }/test/server/server-inject.ts (100%) rename types/hapi/{v17 => }/test/server/server-listener.ts (100%) rename types/hapi/{v17 => }/test/server/server-load.ts (100%) rename types/hapi/{v17 => }/test/server/server-lookup.ts (100%) rename types/hapi/{v17 => }/test/server/server-match.ts (100%) rename types/hapi/{v17 => }/test/server/server-method.ts (100%) rename types/hapi/{v17 => }/test/server/server-methods.ts (100%) rename types/hapi/{v17 => }/test/server/server-mime.ts (100%) rename types/hapi/{v17 => }/test/server/server-options.ts (100%) rename types/hapi/{v17 => }/test/server/server-path.ts (100%) rename types/hapi/{v17 => }/test/server/server-plugins.ts (100%) rename types/hapi/{v17 => }/test/server/server-settings.ts (100%) rename types/hapi/{v17 => }/test/server/server-start.ts (100%) rename types/hapi/{v17 => }/test/server/server-state.ts (100%) rename types/hapi/{v17 => }/test/server/server-stop.ts (100%) rename types/hapi/{v17 => }/test/server/server-table.ts (100%) rename types/hapi/{v17 => }/test/server/server-version.ts (100%) delete mode 100644 types/hapi/v17/index.d.ts delete mode 100644 types/hapi/v17/test/request/event-types.ts delete mode 100644 types/hapi/v17/test/request/get-log.ts delete mode 100644 types/hapi/v17/test/request/query.ts delete mode 100644 types/hapi/v17/test/response/error.ts delete mode 100644 types/hapi/v17/test/route/config.ts delete mode 100644 types/hapi/v17/test/route/handler.ts delete mode 100644 types/hapi/v17/tsconfig.json diff --git a/types/hapi/v17/definitions/plugin/plugin-registered.d.ts b/types/hapi/definitions/plugin/plugin-registered.d.ts similarity index 100% rename from types/hapi/v17/definitions/plugin/plugin-registered.d.ts rename to types/hapi/definitions/plugin/plugin-registered.d.ts diff --git a/types/hapi/v17/definitions/plugin/plugin.d.ts b/types/hapi/definitions/plugin/plugin.d.ts similarity index 100% rename from types/hapi/v17/definitions/plugin/plugin.d.ts rename to types/hapi/definitions/plugin/plugin.d.ts diff --git a/types/hapi/v17/definitions/request/request-auth.d.ts b/types/hapi/definitions/request/request-auth.d.ts similarity index 100% rename from types/hapi/v17/definitions/request/request-auth.d.ts rename to types/hapi/definitions/request/request-auth.d.ts diff --git a/types/hapi/v17/definitions/request/request-events.d.ts b/types/hapi/definitions/request/request-events.d.ts similarity index 100% rename from types/hapi/v17/definitions/request/request-events.d.ts rename to types/hapi/definitions/request/request-events.d.ts diff --git a/types/hapi/v17/definitions/request/request-info.d.ts b/types/hapi/definitions/request/request-info.d.ts similarity index 100% rename from types/hapi/v17/definitions/request/request-info.d.ts rename to types/hapi/definitions/request/request-info.d.ts diff --git a/types/hapi/v17/definitions/request/request-route.d.ts b/types/hapi/definitions/request/request-route.d.ts similarity index 100% rename from types/hapi/v17/definitions/request/request-route.d.ts rename to types/hapi/definitions/request/request-route.d.ts diff --git a/types/hapi/v17/definitions/request/request.d.ts b/types/hapi/definitions/request/request.d.ts similarity index 100% rename from types/hapi/v17/definitions/request/request.d.ts rename to types/hapi/definitions/request/request.d.ts diff --git a/types/hapi/v17/definitions/response/response-events.d.ts b/types/hapi/definitions/response/response-events.d.ts similarity index 100% rename from types/hapi/v17/definitions/response/response-events.d.ts rename to types/hapi/definitions/response/response-events.d.ts diff --git a/types/hapi/v17/definitions/response/response-object.d.ts b/types/hapi/definitions/response/response-object.d.ts similarity index 100% rename from types/hapi/v17/definitions/response/response-object.d.ts rename to types/hapi/definitions/response/response-object.d.ts diff --git a/types/hapi/v17/definitions/response/response-settings.d.ts b/types/hapi/definitions/response/response-settings.d.ts similarity index 100% rename from types/hapi/v17/definitions/response/response-settings.d.ts rename to types/hapi/definitions/response/response-settings.d.ts diff --git a/types/hapi/v17/definitions/response/response-toolkit.d.ts b/types/hapi/definitions/response/response-toolkit.d.ts similarity index 100% rename from types/hapi/v17/definitions/response/response-toolkit.d.ts rename to types/hapi/definitions/response/response-toolkit.d.ts diff --git a/types/hapi/v17/definitions/route/route-options-access-scope.d.ts b/types/hapi/definitions/route/route-options-access-scope.d.ts similarity index 100% rename from types/hapi/v17/definitions/route/route-options-access-scope.d.ts rename to types/hapi/definitions/route/route-options-access-scope.d.ts diff --git a/types/hapi/v17/definitions/route/route-options-access.d.ts b/types/hapi/definitions/route/route-options-access.d.ts similarity index 100% rename from types/hapi/v17/definitions/route/route-options-access.d.ts rename to types/hapi/definitions/route/route-options-access.d.ts diff --git a/types/hapi/v17/definitions/route/route-options-cache.d.ts b/types/hapi/definitions/route/route-options-cache.d.ts similarity index 100% rename from types/hapi/v17/definitions/route/route-options-cache.d.ts rename to types/hapi/definitions/route/route-options-cache.d.ts diff --git a/types/hapi/v17/definitions/route/route-options-cors.d.ts b/types/hapi/definitions/route/route-options-cors.d.ts similarity index 100% rename from types/hapi/v17/definitions/route/route-options-cors.d.ts rename to types/hapi/definitions/route/route-options-cors.d.ts diff --git a/types/hapi/v17/definitions/route/route-options-payload.d.ts b/types/hapi/definitions/route/route-options-payload.d.ts similarity index 100% rename from types/hapi/v17/definitions/route/route-options-payload.d.ts rename to types/hapi/definitions/route/route-options-payload.d.ts diff --git a/types/hapi/v17/definitions/route/route-options-pre.d.ts b/types/hapi/definitions/route/route-options-pre.d.ts similarity index 100% rename from types/hapi/v17/definitions/route/route-options-pre.d.ts rename to types/hapi/definitions/route/route-options-pre.d.ts diff --git a/types/hapi/v17/definitions/route/route-options-response.d.ts b/types/hapi/definitions/route/route-options-response.d.ts similarity index 100% rename from types/hapi/v17/definitions/route/route-options-response.d.ts rename to types/hapi/definitions/route/route-options-response.d.ts diff --git a/types/hapi/v17/definitions/route/route-options-secure.d.ts b/types/hapi/definitions/route/route-options-secure.d.ts similarity index 100% rename from types/hapi/v17/definitions/route/route-options-secure.d.ts rename to types/hapi/definitions/route/route-options-secure.d.ts diff --git a/types/hapi/v17/definitions/route/route-options-validate.d.ts b/types/hapi/definitions/route/route-options-validate.d.ts similarity index 100% rename from types/hapi/v17/definitions/route/route-options-validate.d.ts rename to types/hapi/definitions/route/route-options-validate.d.ts diff --git a/types/hapi/v17/definitions/route/route-options.d.ts b/types/hapi/definitions/route/route-options.d.ts similarity index 100% rename from types/hapi/v17/definitions/route/route-options.d.ts rename to types/hapi/definitions/route/route-options.d.ts diff --git a/types/hapi/v17/definitions/server/server-auth-scheme.d.ts b/types/hapi/definitions/server/server-auth-scheme.d.ts similarity index 100% rename from types/hapi/v17/definitions/server/server-auth-scheme.d.ts rename to types/hapi/definitions/server/server-auth-scheme.d.ts diff --git a/types/hapi/v17/definitions/server/server-auth.d.ts b/types/hapi/definitions/server/server-auth.d.ts similarity index 100% rename from types/hapi/v17/definitions/server/server-auth.d.ts rename to types/hapi/definitions/server/server-auth.d.ts diff --git a/types/hapi/v17/definitions/server/server-cache.d.ts b/types/hapi/definitions/server/server-cache.d.ts similarity index 100% rename from types/hapi/v17/definitions/server/server-cache.d.ts rename to types/hapi/definitions/server/server-cache.d.ts diff --git a/types/hapi/v17/definitions/server/server-events.d.ts b/types/hapi/definitions/server/server-events.d.ts similarity index 100% rename from types/hapi/v17/definitions/server/server-events.d.ts rename to types/hapi/definitions/server/server-events.d.ts diff --git a/types/hapi/v17/definitions/server/server-ext.d.ts b/types/hapi/definitions/server/server-ext.d.ts similarity index 100% rename from types/hapi/v17/definitions/server/server-ext.d.ts rename to types/hapi/definitions/server/server-ext.d.ts diff --git a/types/hapi/v17/definitions/server/server-info.d.ts b/types/hapi/definitions/server/server-info.d.ts similarity index 100% rename from types/hapi/v17/definitions/server/server-info.d.ts rename to types/hapi/definitions/server/server-info.d.ts diff --git a/types/hapi/v17/definitions/server/server-inject.d.ts b/types/hapi/definitions/server/server-inject.d.ts similarity index 100% rename from types/hapi/v17/definitions/server/server-inject.d.ts rename to types/hapi/definitions/server/server-inject.d.ts diff --git a/types/hapi/v17/definitions/server/server-method.d.ts b/types/hapi/definitions/server/server-method.d.ts similarity index 100% rename from types/hapi/v17/definitions/server/server-method.d.ts rename to types/hapi/definitions/server/server-method.d.ts diff --git a/types/hapi/v17/definitions/server/server-options-cache.d.ts b/types/hapi/definitions/server/server-options-cache.d.ts similarity index 100% rename from types/hapi/v17/definitions/server/server-options-cache.d.ts rename to types/hapi/definitions/server/server-options-cache.d.ts diff --git a/types/hapi/v17/definitions/server/server-options.d.ts b/types/hapi/definitions/server/server-options.d.ts similarity index 100% rename from types/hapi/v17/definitions/server/server-options.d.ts rename to types/hapi/definitions/server/server-options.d.ts diff --git a/types/hapi/v17/definitions/server/server-realm.d.ts b/types/hapi/definitions/server/server-realm.d.ts similarity index 100% rename from types/hapi/v17/definitions/server/server-realm.d.ts rename to types/hapi/definitions/server/server-realm.d.ts diff --git a/types/hapi/v17/definitions/server/server-register.d.ts b/types/hapi/definitions/server/server-register.d.ts similarity index 100% rename from types/hapi/v17/definitions/server/server-register.d.ts rename to types/hapi/definitions/server/server-register.d.ts diff --git a/types/hapi/v17/definitions/server/server-route.d.ts b/types/hapi/definitions/server/server-route.d.ts similarity index 100% rename from types/hapi/v17/definitions/server/server-route.d.ts rename to types/hapi/definitions/server/server-route.d.ts diff --git a/types/hapi/v17/definitions/server/server-state-options.d.ts b/types/hapi/definitions/server/server-state-options.d.ts similarity index 100% rename from types/hapi/v17/definitions/server/server-state-options.d.ts rename to types/hapi/definitions/server/server-state-options.d.ts diff --git a/types/hapi/v17/definitions/server/server-state.d.ts b/types/hapi/definitions/server/server-state.d.ts similarity index 100% rename from types/hapi/v17/definitions/server/server-state.d.ts rename to types/hapi/definitions/server/server-state.d.ts diff --git a/types/hapi/v17/definitions/server/server.d.ts b/types/hapi/definitions/server/server.d.ts similarity index 100% rename from types/hapi/v17/definitions/server/server.d.ts rename to types/hapi/definitions/server/server.d.ts diff --git a/types/hapi/v17/definitions/util/json.d.ts b/types/hapi/definitions/util/json.d.ts similarity index 100% rename from types/hapi/v17/definitions/util/json.d.ts rename to types/hapi/definitions/util/json.d.ts diff --git a/types/hapi/v17/definitions/util/lifecycle.d.ts b/types/hapi/definitions/util/lifecycle.d.ts similarity index 100% rename from types/hapi/v17/definitions/util/lifecycle.d.ts rename to types/hapi/definitions/util/lifecycle.d.ts diff --git a/types/hapi/v17/definitions/util/util.d.ts b/types/hapi/definitions/util/util.d.ts similarity index 100% rename from types/hapi/v17/definitions/util/util.d.ts rename to types/hapi/definitions/util/util.d.ts diff --git a/types/hapi/v17/test/request/catch-all.ts b/types/hapi/test/request/catch-all.ts similarity index 100% rename from types/hapi/v17/test/request/catch-all.ts rename to types/hapi/test/request/catch-all.ts diff --git a/types/hapi/v17/test/request/parameters.ts b/types/hapi/test/request/parameters.ts similarity index 100% rename from types/hapi/v17/test/request/parameters.ts rename to types/hapi/test/request/parameters.ts diff --git a/types/hapi/test/request/query.ts b/types/hapi/test/request/query.ts index c6507c2da0..b5a950e2ad 100644 --- a/types/hapi/test/request/query.ts +++ b/types/hapi/test/request/query.ts @@ -1,14 +1,27 @@ // Added test in addition to docs, for request.query +import {Lifecycle, Request, ResponseToolkit, Server, ServerOptions, ServerRoute} from "hapi"; -import * as Hapi from 'hapi'; +const options: ServerOptions = { + port: 8000, +}; + +const handler: Lifecycle.Method = (request: Request, h: ResponseToolkit) => { + const query = request.query as GetThingQuery; + // http://localhost:8000/?name=test + return `You asked for ${query.name}` +}; + +const serverRoute: ServerRoute = { + path: '/', + method: 'GET', + handler: handler +}; interface GetThingQuery { name: string; } -const handler: Hapi.RouteHandler = function (request, reply) { - - const query = request.query as GetThingQuery; - - return reply(`You asked for ${query.name}`); -}; +const server = new Server(options); +server.route(serverRoute); +server.start(); +console.log('Server started at: ' + server.info.uri); diff --git a/types/hapi/v17/test/response/continue.ts b/types/hapi/test/response/continue.ts similarity index 100% rename from types/hapi/v17/test/response/continue.ts rename to types/hapi/test/response/continue.ts diff --git a/types/hapi/v17/test/response/redirect.ts b/types/hapi/test/response/redirect.ts similarity index 100% rename from types/hapi/v17/test/response/redirect.ts rename to types/hapi/test/response/redirect.ts diff --git a/types/hapi/v17/test/response/response-events.ts b/types/hapi/test/response/response-events.ts similarity index 100% rename from types/hapi/v17/test/response/response-events.ts rename to types/hapi/test/response/response-events.ts diff --git a/types/hapi/v17/test/response/response.ts b/types/hapi/test/response/response.ts similarity index 100% rename from types/hapi/v17/test/response/response.ts rename to types/hapi/test/response/response.ts diff --git a/types/hapi/v17/test/route/adding-routes.ts b/types/hapi/test/route/adding-routes.ts similarity index 100% rename from types/hapi/v17/test/route/adding-routes.ts rename to types/hapi/test/route/adding-routes.ts diff --git a/types/hapi/test/route/handler.ts b/types/hapi/test/route/handler.ts index c66d17018e..e3bea54939 100644 --- a/types/hapi/test/route/handler.ts +++ b/types/hapi/test/route/handler.ts @@ -1,10 +1,9 @@ -'use strict'; +import {Lifecycle, Request, ResponseToolkit} from "hapi"; -import * as Hapi from 'hapi'; +const handler: Lifecycle.Method = (request: Request, h: ResponseToolkit) => { + return 'success'; +} -var handler: Hapi.RouteHandler = function(request, reply) { - reply('success'); -} -var strictHandler: Hapi.RouteHandler = function(request, reply) { - reply(123); +const strictHandler: Lifecycle.Method = (request: Request, h: ResponseToolkit) => { + return 123; } diff --git a/types/hapi/v17/test/route/route-options-pre.ts b/types/hapi/test/route/route-options-pre.ts similarity index 100% rename from types/hapi/v17/test/route/route-options-pre.ts rename to types/hapi/test/route/route-options-pre.ts diff --git a/types/hapi/v17/test/route/route-options.ts b/types/hapi/test/route/route-options.ts similarity index 100% rename from types/hapi/v17/test/route/route-options.ts rename to types/hapi/test/route/route-options.ts diff --git a/types/hapi/v17/test/server/server-app.ts b/types/hapi/test/server/server-app.ts similarity index 100% rename from types/hapi/v17/test/server/server-app.ts rename to types/hapi/test/server/server-app.ts diff --git a/types/hapi/v17/test/server/server-auth-api.ts b/types/hapi/test/server/server-auth-api.ts similarity index 100% rename from types/hapi/v17/test/server/server-auth-api.ts rename to types/hapi/test/server/server-auth-api.ts diff --git a/types/hapi/v17/test/server/server-auth-default.ts b/types/hapi/test/server/server-auth-default.ts similarity index 100% rename from types/hapi/v17/test/server/server-auth-default.ts rename to types/hapi/test/server/server-auth-default.ts diff --git a/types/hapi/v17/test/server/server-auth-test.ts b/types/hapi/test/server/server-auth-test.ts similarity index 100% rename from types/hapi/v17/test/server/server-auth-test.ts rename to types/hapi/test/server/server-auth-test.ts diff --git a/types/hapi/v17/test/server/server-bind.ts b/types/hapi/test/server/server-bind.ts similarity index 100% rename from types/hapi/v17/test/server/server-bind.ts rename to types/hapi/test/server/server-bind.ts diff --git a/types/hapi/v17/test/server/server-cache-provision.ts b/types/hapi/test/server/server-cache-provision.ts similarity index 100% rename from types/hapi/v17/test/server/server-cache-provision.ts rename to types/hapi/test/server/server-cache-provision.ts diff --git a/types/hapi/v17/test/server/server-cache.ts b/types/hapi/test/server/server-cache.ts similarity index 100% rename from types/hapi/v17/test/server/server-cache.ts rename to types/hapi/test/server/server-cache.ts diff --git a/types/hapi/v17/test/server/server-decoder.ts b/types/hapi/test/server/server-decoder.ts similarity index 100% rename from types/hapi/v17/test/server/server-decoder.ts rename to types/hapi/test/server/server-decoder.ts diff --git a/types/hapi/v17/test/server/server-decorations.ts b/types/hapi/test/server/server-decorations.ts similarity index 100% rename from types/hapi/v17/test/server/server-decorations.ts rename to types/hapi/test/server/server-decorations.ts diff --git a/types/hapi/v17/test/server/server-encoder.ts b/types/hapi/test/server/server-encoder.ts similarity index 100% rename from types/hapi/v17/test/server/server-encoder.ts rename to types/hapi/test/server/server-encoder.ts diff --git a/types/hapi/v17/test/server/server-events-once.ts b/types/hapi/test/server/server-events-once.ts similarity index 100% rename from types/hapi/v17/test/server/server-events-once.ts rename to types/hapi/test/server/server-events-once.ts diff --git a/types/hapi/v17/test/server/server-events.ts b/types/hapi/test/server/server-events.ts similarity index 100% rename from types/hapi/v17/test/server/server-events.ts rename to types/hapi/test/server/server-events.ts diff --git a/types/hapi/v17/test/server/server-expose.ts b/types/hapi/test/server/server-expose.ts similarity index 100% rename from types/hapi/v17/test/server/server-expose.ts rename to types/hapi/test/server/server-expose.ts diff --git a/types/hapi/v17/test/server/server-info.ts b/types/hapi/test/server/server-info.ts similarity index 100% rename from types/hapi/v17/test/server/server-info.ts rename to types/hapi/test/server/server-info.ts diff --git a/types/hapi/v17/test/server/server-inject.ts b/types/hapi/test/server/server-inject.ts similarity index 100% rename from types/hapi/v17/test/server/server-inject.ts rename to types/hapi/test/server/server-inject.ts diff --git a/types/hapi/v17/test/server/server-listener.ts b/types/hapi/test/server/server-listener.ts similarity index 100% rename from types/hapi/v17/test/server/server-listener.ts rename to types/hapi/test/server/server-listener.ts diff --git a/types/hapi/v17/test/server/server-load.ts b/types/hapi/test/server/server-load.ts similarity index 100% rename from types/hapi/v17/test/server/server-load.ts rename to types/hapi/test/server/server-load.ts diff --git a/types/hapi/v17/test/server/server-lookup.ts b/types/hapi/test/server/server-lookup.ts similarity index 100% rename from types/hapi/v17/test/server/server-lookup.ts rename to types/hapi/test/server/server-lookup.ts diff --git a/types/hapi/v17/test/server/server-match.ts b/types/hapi/test/server/server-match.ts similarity index 100% rename from types/hapi/v17/test/server/server-match.ts rename to types/hapi/test/server/server-match.ts diff --git a/types/hapi/v17/test/server/server-method.ts b/types/hapi/test/server/server-method.ts similarity index 100% rename from types/hapi/v17/test/server/server-method.ts rename to types/hapi/test/server/server-method.ts diff --git a/types/hapi/v17/test/server/server-methods.ts b/types/hapi/test/server/server-methods.ts similarity index 100% rename from types/hapi/v17/test/server/server-methods.ts rename to types/hapi/test/server/server-methods.ts diff --git a/types/hapi/v17/test/server/server-mime.ts b/types/hapi/test/server/server-mime.ts similarity index 100% rename from types/hapi/v17/test/server/server-mime.ts rename to types/hapi/test/server/server-mime.ts diff --git a/types/hapi/v17/test/server/server-options.ts b/types/hapi/test/server/server-options.ts similarity index 100% rename from types/hapi/v17/test/server/server-options.ts rename to types/hapi/test/server/server-options.ts diff --git a/types/hapi/v17/test/server/server-path.ts b/types/hapi/test/server/server-path.ts similarity index 100% rename from types/hapi/v17/test/server/server-path.ts rename to types/hapi/test/server/server-path.ts diff --git a/types/hapi/v17/test/server/server-plugins.ts b/types/hapi/test/server/server-plugins.ts similarity index 100% rename from types/hapi/v17/test/server/server-plugins.ts rename to types/hapi/test/server/server-plugins.ts diff --git a/types/hapi/v17/test/server/server-settings.ts b/types/hapi/test/server/server-settings.ts similarity index 100% rename from types/hapi/v17/test/server/server-settings.ts rename to types/hapi/test/server/server-settings.ts diff --git a/types/hapi/v17/test/server/server-start.ts b/types/hapi/test/server/server-start.ts similarity index 100% rename from types/hapi/v17/test/server/server-start.ts rename to types/hapi/test/server/server-start.ts diff --git a/types/hapi/v17/test/server/server-state.ts b/types/hapi/test/server/server-state.ts similarity index 100% rename from types/hapi/v17/test/server/server-state.ts rename to types/hapi/test/server/server-state.ts diff --git a/types/hapi/v17/test/server/server-stop.ts b/types/hapi/test/server/server-stop.ts similarity index 100% rename from types/hapi/v17/test/server/server-stop.ts rename to types/hapi/test/server/server-stop.ts diff --git a/types/hapi/v17/test/server/server-table.ts b/types/hapi/test/server/server-table.ts similarity index 100% rename from types/hapi/v17/test/server/server-table.ts rename to types/hapi/test/server/server-table.ts diff --git a/types/hapi/v17/test/server/server-version.ts b/types/hapi/test/server/server-version.ts similarity index 100% rename from types/hapi/v17/test/server/server-version.ts rename to types/hapi/test/server/server-version.ts diff --git a/types/hapi/v17/index.d.ts b/types/hapi/v17/index.d.ts deleted file mode 100644 index 5b941c2b2c..0000000000 --- a/types/hapi/v17/index.d.ts +++ /dev/null @@ -1,61 +0,0 @@ -// Type definitions for hapi 17.0 -// Project: https://github.com/hapijs/hapi -// Definitions by: Marc Bornträger -// Rafael Souza Fijalkowski -// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped - -// Note/Disclaimer: None. - -/// - -/** PLUGIN */ -export * from './definitions/plugin/plugin' -export * from './definitions/plugin/plugin-registered' - -/** REQUEST */ -export * from './definitions/request/request' -export * from './definitions/request/request-auth' -export * from './definitions/request/request-events' -export * from './definitions/request/request-info' -export * from './definitions/request/request-route' - -/** RESPONSE */ -export * from './definitions/response/response-events' -export * from './definitions/response/response-object' -export * from './definitions/response/response-settings' -export * from './definitions/response/response-toolkit' - -/** ROUTE */ -export * from './definitions/route/route-options' -export * from './definitions/route/route-options-access' -export * from './definitions/route/route-options-access-scope' -export * from './definitions/route/route-options-cache' -export * from './definitions/route/route-options-cors' -export * from './definitions/route/route-options-payload' -export * from './definitions/route/route-options-pre' -export * from './definitions/route/route-options-response' -export * from './definitions/route/route-options-secure' -export * from './definitions/route/route-options-validate' - -/** SERVER */ -export * from './definitions/server/server' -export * from './definitions/server/server-auth' -export * from './definitions/server/server-auth-scheme' -export * from './definitions/server/server-cache' -export * from './definitions/server/server-events' -export * from './definitions/server/server-ext' -export * from './definitions/server/server-info' -export * from './definitions/server/server-inject' -export * from './definitions/server/server-method' -export * from './definitions/server/server-options' -export * from './definitions/server/server-options-cache' -export * from './definitions/server/server-realm' -export * from './definitions/server/server-register' -export * from './definitions/server/server-route' -export * from './definitions/server/server-state' -export * from './definitions/server/server-state-options' - -/** UTIL */ -export * from './definitions/util/json' -export * from './definitions/util/lifecycle' -export * from './definitions/util/util' diff --git a/types/hapi/v17/test/request/event-types.ts b/types/hapi/v17/test/request/event-types.ts deleted file mode 100644 index 894e4dcf39..0000000000 --- a/types/hapi/v17/test/request/event-types.ts +++ /dev/null @@ -1,76 +0,0 @@ -// https://github.com/hapijs/hapi/blob/master/API.md#-servereventevents -// https://github.com/hapijs/hapi/blob/master/API.md#-requestevents -import { - Lifecycle, - Request, - ResponseToolkit, - RouteOptions, - Server, - ServerOptions, - ServerRoute -} from "hapi"; -import * as Crypto from 'crypto'; - -const options: ServerOptions = { - port: 8000, -}; - -const serverRoute: ServerRoute = { - path: '/', - method: 'GET', - handler: (request: Request, h: ResponseToolkit) => { - return 'ok: ' + request.path; - } -}; - -const onRequest: Lifecycle.Method = (request: Request, h: ResponseToolkit) => { - - /* - * Server events - */ - request.server.events.on('request', (request: Request, event: any, tags: any) => { - console.log(request.paramsArray); - console.log(event); - console.log(tags); - }); - - request.server.events.on('response', (request: Request) => { - console.log('Response sent for request: ' + request.path); - }); - - request.server.events.on('start', (route: RouteOptions) => { - console.log('Server started'); - }); - - request.server.events.once('stop', (route: RouteOptions) => { - console.log('Server stoped'); - }); - - /* - * Request events - */ - const hash = Crypto.createHash('sha1'); - - request.events.on("peek", (chunk: any) => { - hash.update(chunk); - }); - - request.events.once("finish", () => { - console.log(hash.digest('hex')); - }); - - request.events.once("disconnect", () => { - console.error('request aborted'); - }); - - return h.continue; - -}; - -const server = new Server(options); -server.route(serverRoute); -server.ext('onRequest', onRequest); - -server.start(); -console.log('Server started at: ' + server.info.uri); - diff --git a/types/hapi/v17/test/request/get-log.ts b/types/hapi/v17/test/request/get-log.ts deleted file mode 100644 index 007d396fe5..0000000000 --- a/types/hapi/v17/test/request/get-log.ts +++ /dev/null @@ -1,29 +0,0 @@ -// https://github.com/hapijs/hapi/blob/master/API.md#-requestlogtags-data -import {Lifecycle, Request, ResponseToolkit, Server, ServerOptions, ServerRoute} from "hapi"; - -const options: ServerOptions = { - port: 8000, -}; - -const handler: Lifecycle.Method = (request: Request, h: ResponseToolkit) => { - request.log(['test', 'error'], 'Test event'); - return 'path: ' + request.path; -}; - -const serverRoute: ServerRoute = { - path: '/', - method: 'GET', - handler: handler -}; - -const server = new Server(options); -server.route(serverRoute); -server.start(); -console.log('Server started at: ' + server.info.uri); - -server.events.on('request', (request: Request, event: any, tags: any) => { - console.log(tags); - if (tags.error) { - console.log(event); - } -}); diff --git a/types/hapi/v17/test/request/query.ts b/types/hapi/v17/test/request/query.ts deleted file mode 100644 index b5a950e2ad..0000000000 --- a/types/hapi/v17/test/request/query.ts +++ /dev/null @@ -1,27 +0,0 @@ -// Added test in addition to docs, for request.query -import {Lifecycle, Request, ResponseToolkit, Server, ServerOptions, ServerRoute} from "hapi"; - -const options: ServerOptions = { - port: 8000, -}; - -const handler: Lifecycle.Method = (request: Request, h: ResponseToolkit) => { - const query = request.query as GetThingQuery; - // http://localhost:8000/?name=test - return `You asked for ${query.name}` -}; - -const serverRoute: ServerRoute = { - path: '/', - method: 'GET', - handler: handler -}; - -interface GetThingQuery { - name: string; -} - -const server = new Server(options); -server.route(serverRoute); -server.start(); -console.log('Server started at: ' + server.info.uri); diff --git a/types/hapi/v17/test/response/error.ts b/types/hapi/v17/test/response/error.ts deleted file mode 100644 index 6cc92acbdb..0000000000 --- a/types/hapi/v17/test/response/error.ts +++ /dev/null @@ -1,31 +0,0 @@ -// https://github.com/hapijs/hapi/blob/master/API.md#errors -import {Request, ResponseToolkit, Server, ServerOptions, ServerRoute} from "hapi"; -import * as Boom from "boom"; - -const options: ServerOptions = { - port: 8000, -}; - -const serverRoutes: ServerRoute[] = [ - { - path: '/badRequest', - method: 'GET', - handler: (request: Request, h: ResponseToolkit) => { - throw Boom.badRequest('Unsupported parameter'); - } - }, - { - path: '/internal', - method: 'GET', - handler: (request: Request, h: ResponseToolkit) => { - throw new Error('unexpect error'); - } - }, -]; - - -const server = new Server(options); -server.route(serverRoutes); - -server.start(); -console.log('Server started at: ' + server.info.uri); diff --git a/types/hapi/v17/test/route/config.ts b/types/hapi/v17/test/route/config.ts deleted file mode 100644 index 1f36cd51b3..0000000000 --- a/types/hapi/v17/test/route/config.ts +++ /dev/null @@ -1,52 +0,0 @@ -import {Request, ResponseToolkit, RouteOptions, Server, ServerOptions, ServerRoute} from "hapi"; - -const options: ServerOptions = { - port: 8000, -}; - -// different methods -var routeConfig: ServerRoute = { - path: '/signin', - method: 'PUT', - vhost: 'site.coms', -}; -var routeConfig: ServerRoute = { - path: '/signin', - method: '*' -}; -var routeConfig: ServerRoute = { - path: '/signin', - method: ['OPTIONS', '*'] -}; - -// different handlers -var routeConfig: ServerRoute = { - path: '/signin', - method: 'PUT', - handler: (request: Request, h: ResponseToolkit) => { - return 'ok'; - } -}; -var routeConfig: ServerRoute = { - path: '/signin', - method: 'PUT', - handler: (request: Request, h: ResponseToolkit) => { - return 'ok'; - } -}; - -const server = new Server(options); -server.route(routeConfig); - -// Handler in config -const user: RouteOptions = { - cache: { expiresIn: 5000 }, - handler: (request: Request, h: ResponseToolkit) => { - return { name: 'John' }; - } -}; - -server.route({method: 'GET', path: '/user', options: user }); - -server.start(); -console.log('Server started at: ' + server.info.uri); diff --git a/types/hapi/v17/test/route/handler.ts b/types/hapi/v17/test/route/handler.ts deleted file mode 100644 index e3bea54939..0000000000 --- a/types/hapi/v17/test/route/handler.ts +++ /dev/null @@ -1,9 +0,0 @@ -import {Lifecycle, Request, ResponseToolkit} from "hapi"; - -const handler: Lifecycle.Method = (request: Request, h: ResponseToolkit) => { - return 'success'; -} - -const strictHandler: Lifecycle.Method = (request: Request, h: ResponseToolkit) => { - return 123; -} diff --git a/types/hapi/v17/tsconfig.json b/types/hapi/v17/tsconfig.json deleted file mode 100644 index 0134ca5ae1..0000000000 --- a/types/hapi/v17/tsconfig.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "compilerOptions": { - "module": "commonjs", - "lib": [ - "es6" - ], - "noImplicitAny": true, - "noImplicitThis": true, - "strictNullChecks": false, - "strictFunctionTypes": false, - "baseUrl": "../../", - "typeRoots": [ - "../../" - ], - "types": [], - "paths": { - "hapi": [ - "hapi/v17" - ] - }, - "noEmit": true, - "forceConsistentCasingInFileNames": true - }, - "files": [ - "index.d.ts", - "test/request/catch-all.ts", - "test/request/event-types.ts", - "test/request/get-log.ts", - "test/request/parameters.ts", - "test/request/query.ts", - "test/response/continue.ts", - "test/response/error.ts", - "test/response/redirect.ts", - "test/response/response.ts", - "test/response/response-events.ts", - "test/route/adding-routes.ts", - "test/route/config.ts", - "test/route/handler.ts", - "test/route/route-options.ts", - "test/route/route-options-pre.ts", - "test/server/server-app.ts", - "test/server/server-auth-api.ts", - "test/server/server-auth-default.ts", - "test/server/server-auth-test.ts", - "test/server/server-bind.ts", - "test/server/server-cache.ts", - "test/server/server-cache-provision.ts", - "test/server/server-decoder.ts", - "test/server/server-decorations.ts", - "test/server/server-encoder.ts", - "test/server/server-events.ts", - "test/server/server-events-once.ts", - "test/server/server-expose.ts", - "test/server/server-info.ts", - "test/server/server-inject.ts", - "test/server/server-listener.ts", - "test/server/server-load.ts", - "test/server/server-lookup.ts", - "test/server/server-match.ts", - "test/server/server-method.ts", - "test/server/server-methods.ts", - "test/server/server-mime.ts", - "test/server/server-options.ts", - "test/server/server-path.ts", - "test/server/server-plugins.ts", - "test/server/server-settings.ts", - "test/server/server-start.ts", - "test/server/server-state.ts", - "test/server/server-stop.ts", - "test/server/server-table.ts", - "test/server/server-version.ts" - ] -}