Move v17 definitions and tests to "types/hapi" root folder and delete v17 temp folder.

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);

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;
 }

types/hapi/v17/index.d.ts

@@ -1,61 +0,0 @@
-// Type definitions for hapi 17.0
-// Project: https://github.com/hapijs/hapi
-// Definitions by: Marc Bornträger <https://github.com/BorntraegerMarc>
-//                 Rafael Souza Fijalkowski <https://github.com/rafaelsouzaf>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Note/Disclaimer: None.
-
-/// <reference types="node" />
-
-/** 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'

types/hapi/v17/test/request/event-types.ts

@@ -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);
-

types/hapi/v17/test/request/get-log.ts

@@ -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);
-    }
-});

types/hapi/v17/test/request/query.ts

@@ -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);

types/hapi/v17/test/response/error.ts

@@ -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);

types/hapi/v17/test/route/config.ts

@@ -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);

types/hapi/v17/test/route/handler.ts

@@ -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;
-}

types/hapi/v17/tsconfig.json

@@ -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"
-    ]
-}