🤖 Merge PR DefinitelyTyped#73346 Update @types/koa to match koa version 3 by @AaronMoat

Author: AaronMoat

types/koa/index.d.ts

@@ -23,6 +23,7 @@ import * as compose from "koa-compose";
 import { ListenOptions, Socket } from "net";
 import { ParsedUrlQuery } from "querystring";
 import * as url from "url";
+import type httpErrors = require("http-errors");
 
 declare interface ContextDelegatedRequest {
     /**
@@ -324,6 +325,18 @@ declare interface ContextDelegatedResponse {
      */
     vary(field: string | string[]): void;
 
+    /**
+     * Perform a special-cased "back" to provide Referrer support.
+     * When Referrer is not present, `alt` or "/" is used.
+     *
+     * Examples:
+     *
+     *    ctx.back()
+     *    ctx.back('/index.html')
+     */
+
+    back(alt?: string): void;
+
     /**
      * Perform a 302 redirect to `url`.
      *
@@ -333,12 +346,10 @@ declare interface ContextDelegatedResponse {
      *
      * Examples:
      *
-     *    this.redirect('back');
-     *    this.redirect('back', '/index.html');
      *    this.redirect('/login');
      *    this.redirect('http://google.com');
      */
-    redirect(url: string, alt?: string): void;
+    redirect(url: string): void;
 
     /**
      * Set Content-Disposition to "attachment" to signal the client to prompt for download.
@@ -683,9 +694,8 @@ declare namespace Application {
          *
          * See: https://github.com/jshttp/http-errors
          */
-        throw(message: string, code?: number, properties?: {}): never;
-        throw(status: number): never;
-        throw(...properties: Array<number | string | {}>): never;
+        throw(status: number, ...args: httpErrors.UnknownError[]): never;
+        throw(...args: httpErrors.UnknownError[]): never;
 
         /**
          * Default error handling.

types/koa/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@types/koa",
-    "version": "2.15.9999",
+    "version": "3.0.9999",
     "projects": [
         "http://koajs.com"
     ],
@@ -10,7 +10,7 @@
         "@types/content-disposition": "*",
         "@types/cookies": "*",
         "@types/http-assert": "*",
-        "@types/http-errors": "*",
+        "@types/http-errors": "^2",
         "@types/keygrip": "*",
         "@types/koa-compose": "*",
         "@types/node": "*"

types/koa/test/index.ts

@@ -20,7 +20,15 @@ app.context.db = () => {};
 
 app.use(async ctx => {
     if (ctx.errors) {
-        ctx.throw(ctx.errors[0], 400);
+        ctx.throw(400, ctx.errors[0]);
+        ctx.throw(400);
+        ctx.throw(400, "name required");
+        ctx.throw(400, "name required", { user: { id: 7 } });
+        ctx.throw(403);
+        ctx.throw(400, "name required");
+        ctx.throw("something exploded");
+        ctx.throw(new Error("invalid"));
+        ctx.throw(400, new Error("invalid"));
     }
 });