Merge 9990b24 into 5e65846

deps.ts

@@ -1,10 +1,12 @@
 export {
   serve,
   serveTLS,
-  HTTPSOptions,
-  HTTPOptions,
   Server,
   ServerRequest,
+} from "https://deno.land/std@0.68.0/http/server.ts";
+export type {
+  HTTPSOptions,
+  HTTPOptions,
   Response,
 } from "https://deno.land/std@0.68.0/http/server.ts";
 export {
@@ -13,9 +15,9 @@ export {
 } from "https://deno.land/std@0.68.0/http/http_status.ts";
 export {
   setCookie,
-  Cookie,
   deleteCookie,
 } from "https://deno.land/std@0.68.0/http/cookie.ts";
+export type { Cookie } from "https://deno.land/std@0.68.0/http/cookie.ts";
 export {
   extname,
   fromFileUrl,

lock.json

@@ -52,6 +52,16 @@
   "https://deno.land/std@0.68.0/path/separator.ts": "9dd15d46ff84a16e13554f56af7fee1f85f8d0f379efbbe60ac066a60561f036",
   "https://deno.land/std@0.68.0/path/win32.ts": "9e200471f24fb560d22e74b238133cb75ebb57bead933de1cc5aefed4cda3346",
   "https://deno.land/std@0.68.0/textproto/mod.ts": "ebd84342f62216af1850279d32581c51d0958e36d477c6c26c961987e6240356",
+  "https://deno.land/std@0.69.0/_util/assert.ts": "e1f76e77c5ccb5a8e0dbbbe6cce3a56d2556c8cb5a9a8802fc9565af72462149",
+  "https://deno.land/std@0.69.0/path/_constants.ts": "aba480c4a2c098b6374fdd5951fea13ecc8aaaf8b8aa4dae1871baa50243d676",
+  "https://deno.land/std@0.69.0/path/_interface.ts": "5876f91d35fd42624893a4aaddaee352144e1f46e719f1dde6511bab7c3c1029",
+  "https://deno.land/std@0.69.0/path/_util.ts": "f0fa012d40ae9b6acbef03908e534eb11e694de6470fb4d78ea4f38829e735ab",
+  "https://deno.land/std@0.69.0/path/common.ts": "e4ec66a7416d56f60331b66e27a8a4f08c7b1cf48e350271cb69754a01cf5c04",
+  "https://deno.land/std@0.69.0/path/glob.ts": "43cc45e8649a35a199c4106dfdf66206f46dfd8e2e626a746512c1a1376fde99",
+  "https://deno.land/std@0.69.0/path/mod.ts": "6de8885c2534757097818e302becd1cefcbc4c28ac022cc279e612ee04e8cfd1",
+  "https://deno.land/std@0.69.0/path/posix.ts": "40c387415fca91b3482214cf74880c415cda90b337bebd2c9d4b62d2097bc146",
+  "https://deno.land/std@0.69.0/path/separator.ts": "9dd15d46ff84a16e13554f56af7fee1f85f8d0f379efbbe60ac066a60561f036",
+  "https://deno.land/std@0.69.0/path/win32.ts": "9e200471f24fb560d22e74b238133cb75ebb57bead933de1cc5aefed4cda3346",
   "https://deno.land/x/accepts@1.0.0/deps.ts": "230c8e4888c7b745a2b6c33cedc53c25f77fadb089c0dddba978418909497aea",
   "https://deno.land/x/accepts@1.0.0/mod.ts": "928576bb8b922e900fc629f80050a13248cd3bae0ee05d70e0dc69243e71fe15",
   "https://deno.land/x/content_type/mod.ts": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
@@ -131,6 +141,9 @@
   "https://deno.land/x/media_types@v2.4.6/db.ts": "56a9deab286b6283e1df021d74ee3319353f27f7827716b6443427fff2fc6e24",
   "https://deno.land/x/media_types@v2.4.6/deps.ts": "6a046ca7e381f95def906fa2188bb56e053251d919a53d25b93964b8ac5fec25",
   "https://deno.land/x/media_types@v2.4.6/mod.ts": "94141d7c415fcdad350fec9d36d77c18334efe25766db6f37d34709c896881ed",
+  "https://deno.land/x/media_types@v2.4.7/db.ts": "56a9deab286b6283e1df021d74ee3319353f27f7827716b6443427fff2fc6e24",
+  "https://deno.land/x/media_types@v2.4.7/deps.ts": "5eb8e569a0c1439f85f4a9888f8f3327b426c8b8f7ba55fdc1124d98d0e17390",
+  "https://deno.land/x/media_types@v2.4.7/mod.ts": "94141d7c415fcdad350fec9d36d77c18334efe25766db6f37d34709c896881ed",
   "https://deno.land/x/negotiator/mod.ts": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
   "https://deno.land/x/negotiator@1.0.0/mod.ts": "d8b28a0a7b2d75c944cebef8f87a58eeb344974d432fe0dea85e2d98e03daf24",
   "https://deno.land/x/negotiator@1.0.0/src/charset.ts": "ee56810906ed4fb5ee52abd4dfd8b57485685939c6b63fb2b5d289b971465f67",

src/application.ts

@@ -15,7 +15,7 @@ import { finalHandler } from "./utils/finalHandler.ts";
 import { compileETag } from "./utils/compileETag.ts";
 import { merge } from "./utils/merge.ts";
 import { View } from "./view.ts";
-import {
+import type {
   Request,
   Response,
   NextFunction,

src/middleware/bodyParser/getCharset.ts

@@ -1,5 +1,5 @@
 import { charset } from "../../../deps.ts";
-import { Request } from "../../types.ts";
+import type { Request } from "../../types.ts";
 
 /**
  * Get the charset of a request.

src/middleware/bodyParser/json.ts

@@ -33,7 +33,7 @@ import { createError, hasBody } from "../../../deps.ts";
 import { read } from "./read.ts";
 import { getCharset } from "./getCharset.ts";
 import { typeChecker } from "./typeChecker.ts";
-import { Request, Response, NextFunction } from "../../types.ts";
+import type { Request, Response, NextFunction } from "../../types.ts";
 
 /**
  * RegExp to match the first non-space in a string.

src/middleware/bodyParser/raw.ts

@@ -30,7 +30,7 @@
  */
 
 import { read } from "./read.ts";
-import { Request, Response, NextFunction } from "../../types.ts";
+import type { Request, Response, NextFunction } from "../../types.ts";
 import { hasBody } from "../../../deps.ts";
 import { typeChecker } from "./typeChecker.ts";
 

src/middleware/bodyParser/read.ts

@@ -29,7 +29,7 @@
  * 
  */
 
-import { Request, Response, NextFunction } from "../../types.ts";
+import type { Request, Response, NextFunction } from "../../types.ts";
 import { createError } from "../../../deps.ts";
 
 const decoder = new TextDecoder();

src/middleware/bodyParser/text.ts

@@ -31,7 +31,7 @@
 
 import { read } from "./read.ts";
 import { getCharset } from "./getCharset.ts";
-import { Request, Response, NextFunction } from "../../types.ts";
+import type { Request, Response, NextFunction } from "../../types.ts";
 import { hasBody } from "../../../deps.ts";
 import { typeChecker } from "./typeChecker.ts";
 

src/middleware/bodyParser/typeChecker.ts

@@ -29,7 +29,7 @@
  * 
  */
 
-import { Request } from "../../types.ts";
+import type { Request } from "../../types.ts";
 import { typeofrequest } from "../../../deps.ts";
 
 /**

src/middleware/bodyParser/urlencoded.ts

@@ -32,7 +32,7 @@
 import { createError } from "../../../deps.ts";
 import { read } from "./read.ts";
 import { getCharset } from "./getCharset.ts";
-import { Request, Response, NextFunction } from "../../types.ts";
+import type { Request, Response, NextFunction } from "../../types.ts";
 import { hasBody } from "../../../deps.ts";
 import { typeChecker } from "./typeChecker.ts";
 

src/middleware/init.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   Request,
   Response,
   NextFunction,

src/middleware/query.ts

@@ -1,6 +1,6 @@
 import { parseUrl } from "../utils/parseUrl.ts";
 import { fromMap } from "../utils/fromMap.ts";
-import { Request, Response, NextFunction, ParsedURL } from "../types.ts";
+import type { Request, Response, NextFunction, ParsedURL } from "../types.ts";
 
 // TODO: back-compat support for Express signature. Namely an
 // `options` parameter allowing for custom query parsers.

src/middleware/serveStatic.ts

@@ -39,7 +39,7 @@ import {
   encodeUrl,
 } from "../../deps.ts";
 import { originalUrl as original, parseUrl } from "../utils/parseUrl.ts";
-import {
+import type {
   Response,
   Request,
   NextFunction,

src/opine.ts

@@ -3,7 +3,7 @@ import { request } from "./request.ts";
 import { Response as ServerResponse } from "./response.ts";
 import { mergeDescriptors } from "./utils/mergeDescriptors.ts";
 import { EventEmitter, getEvent } from "../deps.ts";
-import {
+import type {
   Opine,
   Request,
   Response,

src/request.ts

@@ -2,7 +2,7 @@ import { ServerRequest, Accepts, typeofrequest, isIP } from "../deps.ts";
 import { defineGetter } from "./utils/defineGetter.ts";
 import { fresh } from "./utils/fresh.ts";
 import { parseUrl } from "./utils/parseUrl.ts";
-import { Request, Response } from "../src/types.ts";
+import type { Request, Response } from "../src/types.ts";
 
 /**
  * Request prototype.

src/response.ts

@@ -14,7 +14,7 @@ import {
   encodeUrl,
   fromFileUrl,
 } from "../deps.ts";
-import {
+import type {
   Response as DenoResponse,
   ResponseBody,
   Request,

src/router/index.ts

@@ -4,7 +4,7 @@ import { Layer } from "./layer.ts";
 import { merge } from "../utils/merge.ts";
 import { parseUrl } from "../utils/parseUrl.ts";
 import { methods } from "../methods.ts";
-import {
+import type {
   Response,
   Request,
   NextFunction,

src/router/layer.ts

@@ -1,5 +1,5 @@
 import { pathToRegexp } from "../utils/pathToRegex.ts";
-import { Request, Response, NextFunction } from "../types.ts";
+import type { Request, Response, NextFunction } from "../types.ts";
 
 export const Layer: any = function Layer(
   this: any,

src/router/route.ts

@@ -1,6 +1,6 @@
 import { Layer } from "./layer.ts";
 import { methods } from "../methods.ts";
-import { Request, Response, NextFunction } from "../types.ts";
+import type { Request, Response, NextFunction } from "../types.ts";
 
 /**
  * Initialize `Route` with the given `path`.

src/types.ts

@@ -4,7 +4,7 @@
 // TODO: consider integrating these types into the app files themselves
 // rather than having a separate file.
 
-import {
+import type {
   ServerRequest as DenoServerRequest,
   Response as DenoServerResponse,
   Server,

src/utils/finalHandler.ts

@@ -30,7 +30,7 @@
 
 import { parseUrl } from "./parseUrl.ts";
 import { STATUS_TEXT, Status, escapeHtml } from "../../deps.ts";
-import { Request, Response, NextFunction, ParsedURL } from "../types.ts";
+import type { Request, Response, NextFunction, ParsedURL } from "../types.ts";
 
 const DOUBLE_SPACE_REGEXP = /\x20{2}/g;
 const NEWLINE_REGEXP = /\n/g;

src/utils/parseUrl.ts

@@ -29,7 +29,7 @@
  * 
  */
 
-import { Request, ParsedURL } from "../types.ts";
+import type { Request, ParsedURL } from "../types.ts";
 
 /**
  * Parse the `req` url with memoization.