Merge branch 'main' into sebringrose-patch-1

README.md

@@ -67,7 +67,8 @@
 <h2>Getting started</h2>
 
 ```js
-import * as Peko from "https://deno.land/x/peko/mod.ts"; // or "../server.ts" for super featherweight 
+import * as Peko from "https://deno.land/x/peko/mod.ts"; 
+// import from ".../peko/lib/Server.ts" for featherweight mode
 
 const server = new Peko.Server();
 

lib/handlers/ssr.ts

@@ -1,4 +1,4 @@
-import { RequestContext } from "../server.ts"
+import { RequestContext } from "../Server.ts"
 import { Handler, HandlerOptions } from "../types.ts"
 import { Crypto } from "../utils/Crypto.ts"
 import { mergeHeaders } from "../utils/helpers.ts"

lib/handlers/static.ts

@@ -1,6 +1,6 @@
 import { contentType } from "https://deno.land/[email protected]/media_types/mod.ts";
 import { fromFileUrl } from "https://deno.land/[email protected]/path/mod.ts"
-import { RequestContext } from "../server.ts"
+import { RequestContext } from "../Server.ts"
 import { Handler, HandlerOptions } from "../types.ts"
 import { Crypto } from "../utils/Crypto.ts"
 import { mergeHeaders } from "../utils/helpers.ts"

lib/middleware/cacher.ts

@@ -1,4 +1,4 @@
-import type { RequestContext } from "../server.ts";
+import type { RequestContext } from "../Server.ts";
 import { Middleware } from "../types.ts";
 import { ResponseCache } from "../utils/ResponseCache.ts";
 

lib/types.ts

@@ -1,4 +1,4 @@
-import { RequestContext } from "./server.ts"
+import { RequestContext } from "./Server.ts"
 
 export interface Route { 
   path: `/${string}`

lib/utils/Cascade.ts

@@ -1,4 +1,4 @@
-import { RequestContext } from "../server.ts"
+import { RequestContext } from "../Server.ts"
 import { Middleware, Result, Next, Route } from "../types.ts"
 
 export type PromiseMiddleware = (ctx: RequestContext, next: Next) => Promise<Result>

lib/utils/Profiler.ts

@@ -1,4 +1,4 @@
-import { Server } from "../server.ts"
+import { Server } from "../Server.ts"
 import { Route } from "../types.ts"
 
 type ProfileConfig = {

lib/utils/helpers.ts

@@ -1,4 +1,3 @@
-// import { Server } from "../server.ts"
 import { Middleware, Route } from "../types.ts"
 import { staticHandler } from "../handlers/static.ts"
 

mod.ts

@@ -3,7 +3,7 @@
  */
 
 // Core classes, functions & types
-export * from "./lib/server.ts"
+export * from "./lib/Server.ts"
 export * from "./lib/types.ts"
 
 // Handlers
@@ -23,5 +23,5 @@ export * from "./lib/utils/ResponseCache.ts"
 export * from "./lib/utils/Crypto.ts"
 export * from "./lib/utils/helpers.ts"
 
-import { Server } from "./lib/server.ts"
+import { Server } from "./lib/Server.ts"
 export default Server

tests/handlers/sse_test.ts

@@ -1,5 +1,5 @@
 import { assert } from "https://deno.land/[email protected]/testing/asserts.ts"
-import { Server, RequestContext } from "../../lib/server.ts"
+import { Server, RequestContext } from "../../lib/Server.ts"
 import { sseHandler } from "../../lib/handlers/sse.ts"
 
 Deno.test("HANDLER: Server-sent events", async (t) => {

tests/handlers/ssr_test.ts

@@ -1,5 +1,5 @@
 import { assert } from "https://deno.land/[email protected]/testing/asserts.ts"
-import { Server, RequestContext } from "../../lib/server.ts"
+import { Server, RequestContext } from "../../lib/Server.ts"
 import { ssrHandler } from "../../lib/handlers/ssr.ts"
 
 Deno.test("HANDLER: Server-side render", async (t) => {

tests/handlers/static_test.ts

@@ -1,5 +1,5 @@
 import { assert } from "https://deno.land/[email protected]/testing/asserts.ts"
-import { Server, RequestContext } from "../../lib/server.ts"
+import { Server, RequestContext } from "../../lib/Server.ts"
 import { staticHandler } from "../../lib/handlers/static.ts"
 
 Deno.test("HANDLER: Static", async (t) => {

tests/handlers/ws_test.ts

@@ -1,5 +1,5 @@
 import { assert } from "https://deno.land/[email protected]/testing/asserts.ts"
-import { Server } from "../../lib/server.ts"
+import { Server } from "../../lib/Server.ts"
 import { wsHandler } from "../../lib/handlers/ws.ts"
 
 Deno.test("HANDLER: WebSocket", async (t) => {

tests/middleware/authenticator_test.ts

@@ -1,5 +1,5 @@
 import { assert } from "https://deno.land/[email protected]/testing/asserts.ts"
-import { Server, RequestContext } from "../../lib/server.ts"
+import { Server, RequestContext } from "../../lib/Server.ts"
 import { authenticator } from "../../lib/middleware/authenticator.ts"
 import { Crypto } from "../../lib/utils/Crypto.ts"
 

tests/middleware/cacher_test.ts

@@ -1,5 +1,5 @@
 import { assert } from "https://deno.land/[email protected]/testing/asserts.ts"
-import { Server, RequestContext } from "../../lib/server.ts"
+import { Server, RequestContext } from "../../lib/Server.ts"
 import { cacher } from "../../lib/middleware/cacher.ts"
 import { testHandler } from "../mocks/middleware.ts"
 import { ResponseCache } from "../../lib/utils/ResponseCache.ts"

tests/middleware/logger_test.ts

@@ -1,5 +1,5 @@
 import { assert } from "https://deno.land/[email protected]/testing/asserts.ts"
-import { Server, RequestContext } from "../../lib/server.ts"
+import { Server, RequestContext } from "../../lib/Server.ts"
 import { logger } from "../../lib/middleware/logger.ts"
 
 Deno.test("MIDDLEWARE: Logger", async (t) => {

tests/scripts/profile.ts

@@ -1,4 +1,4 @@
-import { Server } from "../../lib/server.ts"
+import { Server } from "../../lib/Server.ts"
 import {
   testMiddleware2,
   testMiddleware3,

tests/server_test.ts

@@ -1,4 +1,4 @@
-import { Server } from "../lib/server.ts"
+import { Server } from "../lib/Server.ts"
 import {
   testMiddleware2,
   testMiddleware3,

tests/utils/Cascade_test.ts

@@ -1,5 +1,5 @@
 import { assert } from "https://deno.land/[email protected]/testing/asserts.ts"
-import { Server, RequestContext } from "../../lib/server.ts"
+import { Server, RequestContext } from "../../lib/Server.ts"
 import { Cascade } from "../../lib/utils/Cascade.ts"
 import { 
   testMiddleware1,

tests/utils/Profiler_test.ts

@@ -1,5 +1,5 @@
 import { assert } from "https://deno.land/[email protected]/testing/asserts.ts"
-import { Server } from "../../lib/server.ts"
+import { Server } from "../../lib/Server.ts"
 import Profiler from "../../lib/utils/Profiler.ts"
 
 Deno.test("UTIL: Profiler", async (t) => {

tests/router_test.ts → tests/utils/Router_test.ts

@@ -1,10 +1,10 @@
 import { assert } from "https://deno.land/[email protected]/testing/asserts.ts"
-import { Server } from "../lib/server.ts"
-import { Router } from "../lib/utils/Router.ts"
+import { Server } from "../../lib/Server.ts"
+import { Router } from "../../lib/utils/Router.ts"
 import {
   testMiddleware1,
   testHandler,
-} from "./mocks/middleware.ts"
+} from "../mocks/middleware.ts"
 
 Deno.test("SERVER", async (t) => {
   const router = new Router()

tests/utils/helpers_test.ts

@@ -1,5 +1,5 @@
 import { assert } from "https://deno.land/[email protected]/testing/asserts.ts"
-import { Server } from "../../lib/server.ts"
+import { Server } from "../../lib/Server.ts"
 import {
   mergeHeaders,
   staticDir