@cfworker/web 1.10.2 → 1.12.2

package/dist/application.js

@@ -33,7 +33,7 @@ export class Application {
                 return err.toResponse();
             }
             const status = 500;
-            const statusText = statuses[500];
+            const statusText = statuses.message[500];
             const headers = { 'content-type': 'text/plain' };
             return new Response(statusText, { status, statusText, headers });
         }

package/dist/http-error.js

@@ -1,7 +1,7 @@
 import statuses from 'statuses';
 export class HttpError extends Error {
     constructor(status, body) {
-        const statusText = statuses[statuses(status)];
+        const statusText = statuses.message[status];
         super(statusText);
         this.name = this.constructor.name;
         if (typeof Error.captureStackTrace === 'function') {

package/dist/index.d.ts

@@ -9,5 +9,4 @@ export * from './normalize-pathname.js';
 export * from './req.js';
 export * from './response-builder.js';
 export * from './router.js';
-export * from './to-object.js';
 export * from './validate.js';

package/dist/index.js

@@ -9,5 +9,4 @@ export * from './normalize-pathname.js';
 export * from './req.js';
 export * from './response-builder.js';
 export * from './router.js';
-export * from './to-object.js';
 export * from './validate.js';

package/dist/middleware.d.ts

@@ -1,4 +1,3 @@
-import compose, { Middleware as GenericMiddleware } from 'koa-compose';
 import { Context } from './context.js';
-export declare type Middleware = GenericMiddleware<Context>;
-export declare const composeMiddleware: typeof compose;
+export declare type Middleware = (context: Context, next: () => Promise<void>) => Promise<void> | void;
+export declare function composeMiddleware(middleware: Middleware[]): Middleware;

package/dist/middleware.js

@@ -1,2 +1,28 @@
-import compose from 'koa-compose';
-export const composeMiddleware = compose;
+export function composeMiddleware(middleware) {
+    if (!Array.isArray(middleware))
+        throw new TypeError('Middleware stack must be an array!');
+    for (const fn of middleware) {
+        if (typeof fn !== 'function')
+            throw new TypeError('Middleware must be composed of functions!');
+    }
+    return function (context, next) {
+        let index = -1;
+        return dispatch(0);
+        function dispatch(i) {
+            if (i <= index)
+                return Promise.reject(new Error('next() called multiple times'));
+            index = i;
+            let fn = middleware[i];
+            if (i === middleware.length)
+                fn = next;
+            if (!fn)
+                return Promise.resolve();
+            try {
+                return Promise.resolve(fn(context, dispatch.bind(null, i + 1)));
+            }
+            catch (err) {
+                return Promise.reject(err);
+            }
+        }
+    };
+}

package/dist/req.d.ts

@@ -1,4 +1,4 @@
-import { Reviver } from 'secure-json-parse';
+import { Reviver } from 'secure-json-parse/index.js';
 import { Accepts } from './accepts.js';
 export declare class Req {
     readonly raw: Request;

package/dist/req.js

@@ -1,4 +1,4 @@
-import { safeParse } from 'secure-json-parse';
+import { safeParse } from 'secure-json-parse/index.js';
 import { Accepts } from './accepts.js';
 export class Req {
     constructor(request) {

package/dist/response-builder.js

@@ -19,7 +19,7 @@ export class ResponseBuilder {
         }
     }
     get statusText() {
-        return statuses[this._status];
+        return statuses.message[this._status];
     }
     get body() {
         return this._body;
@@ -131,5 +131,3 @@ export class ResponseBuilder {
         return new Response(body, { status, statusText, headers });
     }
 }
-const Blob = self.Blob || class {
-};

package/dist/validate.js

@@ -1,6 +1,5 @@
 import { dereference, validate as schemaValidate } from '@cfworker/json-schema';
 import { HttpError } from './http-error.js';
-import { toObject } from './to-object.js';
 const draft = '2019-09';
 const hasBody = {
     POST: true,
@@ -8,7 +7,7 @@ const hasBody = {
     DELETE: true,
     PATCH: true
 };
-function middlewareFactory(schemas, parser = toObject, lookup = Object.create(null)) {
+function middlewareFactory(schemas, parser = Object.fromEntries, lookup = Object.create(null)) {
     const { headers: $headers, search: $search, params: $params, body: $body } = schemas;
     if ($headers) {
         dereference($headers, { ...lookup });
@@ -27,7 +26,7 @@ function middlewareFactory(schemas, parser = toObject, lookup = Object.create(nu
             validateRequestPart('params', req.params, $params, lookup);
         }
         if ($headers) {
-            const headers = toObject(req.headers);
+            const headers = Object.fromEntries(req.headers);
             validateRequestPart('headers', headers, $headers, lookup);
         }
         if ($search) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cfworker/web",
-  "version": "1.10.2",
+  "version": "1.12.2",
   "description": "Web framework for Cloudflare Workers and service workers, inspired by Koa and fastify",
   "keywords": [
     "middleware",
@@ -34,30 +34,26 @@
     "test": "cfworker test test/**/*.spec.ts --nocheck"
   },
   "dependencies": {
-    "@cfworker/json-schema": "^1.10.2",
-    "@cfworker/worker-types": "^1.10.2",
-    "@cloudflare/workers-types": "^2.1.0",
-    "@types/cookie": "^0.4.0",
+    "@cfworker/json-schema": "^1.12.2",
+    "@cfworker/worker-types": "^1.12.1",
+    "@cloudflare/workers-types": "^2.2.2",
+    "@types/cookie": "^0.4.1",
     "@types/html-escaper": "^3.0.0",
-    "@types/json-pointer": "^1.0.30",
-    "@types/koa-compose": "^3.2.5",
-    "@types/secure-json-parse": "^1.0.2",
-    "@types/statuses": "^1.5.0",
-    "cookie": "^0.4.1",
+    "@types/statuses": "^2.0.0",
+    "cookie": "^0.4.2",
     "html-escaper": "^3.0.3",
-    "koa-compose": "^4.1.0",
-    "negotiator": "^0.6.2",
+    "negotiator": "^0.6.3",
     "path-to-regexp": "^6.2.0",
-    "secure-json-parse": "^2.3.2",
-    "statuses": "^1.5.0"
+    "secure-json-parse": "^2.4.0",
+    "statuses": "^2.0.1"
   },
   "devDependencies": {
-    "@cfworker/dev": "^1.10.2",
-    "@types/chai": "^4.2.16",
-    "@types/mocha": "^8.2.2",
-    "chai": "^4.3.4",
-    "json-pointer": "^0.6.1",
-    "mocha": "^8.3.2",
-    "typescript": "^4.5.2"
+    "@cfworker/dev": "^1.14.0",
+    "@types/chai": "^4.3.0",
+    "@types/mocha": "^9.1.0",
+    "chai": "^4.3.6",
+    "jsonpointer": "^5.0.0",
+    "mocha": "^9.2.1",
+    "typescript": "^4.5.5"
   }
 }

package/src/application.ts

@@ -40,7 +40,7 @@ export class Application {
       }
 
       const status = 500;
-      const statusText = statuses[500];
+      const statusText = statuses.message[500];
       const headers = { 'content-type': 'text/plain' };
       return new Response(statusText, { status, statusText, headers });
     }

package/src/declarations.d.ts

@@ -0,0 +1,2 @@
+// secure-json-parse's types rely on node's Buffer
+type Buffer = never;

package/src/http-error.ts

@@ -6,7 +6,7 @@ export class HttpError extends Error {
   public readonly body: string | object;
 
   constructor(status: number, body: string | object) {
-    const statusText = statuses[statuses(status)]!;
+    const statusText = statuses.message[status]!;
 
     super(statusText);
 

package/src/index.ts

@@ -9,5 +9,4 @@ export * from './normalize-pathname.js';
 export * from './req.js';
 export * from './response-builder.js';
 export * from './router.js';
-export * from './to-object.js';
 export * from './validate.js';

package/src/middleware.ts

@@ -1,6 +1,34 @@
-import compose, { Middleware as GenericMiddleware } from 'koa-compose';
 import { Context } from './context.js';
 
-export type Middleware = GenericMiddleware<Context>;
+export type Middleware = (
+  context: Context,
+  next: () => Promise<void>
+) => Promise<void> | void;
 
-export const composeMiddleware = compose;
+export function composeMiddleware(middleware: Middleware[]): Middleware {
+  if (!Array.isArray(middleware))
+    throw new TypeError('Middleware stack must be an array!');
+  for (const fn of middleware) {
+    if (typeof fn !== 'function')
+      throw new TypeError('Middleware must be composed of functions!');
+  }
+
+  return function (context, next) {
+    // last called middleware #
+    let index = -1;
+    return dispatch(0);
+    function dispatch(i: number): Promise<void> {
+      if (i <= index)
+        return Promise.reject(new Error('next() called multiple times'));
+      index = i;
+      let fn = middleware[i];
+      if (i === middleware.length) fn = next;
+      if (!fn) return Promise.resolve();
+      try {
+        return Promise.resolve(fn(context, dispatch.bind(null, i + 1)));
+      } catch (err) {
+        return Promise.reject(err);
+      }
+    }
+  };
+}

package/src/req.ts

@@ -1,4 +1,4 @@
-import { Reviver, safeParse } from 'secure-json-parse';
+import { Reviver, safeParse } from 'secure-json-parse/index.js';
 import { Accepts } from './accepts.js';
 
 export class Req {

package/src/response-builder.ts

@@ -28,7 +28,7 @@ export class ResponseBuilder {
   }
 
   get statusText() {
-    return statuses[this._status]!;
+    return statuses.message[this._status]!;
   }
 
   get body() {
@@ -156,6 +156,3 @@ export class ResponseBuilder {
     return new Response(body, { status, statusText, headers });
   }
 }
-
-// Cloudflare workers do not define the Blob class.
-const Blob = self.Blob || ((class {} as any) as Blob);

package/src/validate.ts

@@ -6,7 +6,6 @@ import {
 } from '@cfworker/json-schema';
 import { HttpError } from './http-error.js';
 import { Middleware } from './middleware.js';
-import { toObject } from './to-object.js';
 
 export interface RequestSchemas {
   body?: Schema;
@@ -30,7 +29,7 @@ const hasBody: Record<string, true> = {
 
 function middlewareFactory(
   schemas: RequestSchemas,
-  parser: RequestParser = toObject,
+  parser: RequestParser = Object.fromEntries,
   lookup = Object.create(null)
 ): Middleware {
   const {
@@ -58,7 +57,7 @@ function middlewareFactory(
       validateRequestPart('params', req.params, $params, lookup);
     }
     if ($headers) {
-      const headers = toObject(req.headers);
+      const headers = Object.fromEntries(req.headers);
       validateRequestPart('headers', headers, $headers, lookup);
     }
     if ($search) {

package/tsconfig.json

@@ -2,11 +2,17 @@
   "extends": "../../tsconfig-base",
   "compilerOptions": {
     "target": "ES2021",
-    "lib": ["esnext", "webworker"],
-    "types": ["@cfworker/worker-types", "@cloudflare/workers-types"],
+    "lib": ["ESNext", "WebWorker", "Webworker.Iterable"],
+    "types": [
+      "chai",
+      "mocha",
+      "@cfworker/worker-types",
+      "@cloudflare/workers-types"
+    ],
     "outDir": "dist",
     "rootDir": "./src"
   },
+
   "include": ["src"],
   "references": [{ "path": "../json-schema" }]
 }

package/dist/to-object.d.ts

@@ -1,3 +0,0 @@
-export declare function toObject<TKey extends string | number | symbol, TValue>(iterable: {
-    [Symbol.iterator](): IterableIterator<[TKey, TValue]>;
-}): Record<TKey, TValue>;

package/dist/to-object.js

@@ -1,7 +0,0 @@
-export function toObject(iterable) {
-    const obj = Object.create(null);
-    for (const [key, value] of iterable) {
-        obj[key] = value;
-    }
-    return obj;
-}

package/src/to-object.ts

@@ -1,15 +0,0 @@
-/**
- * Convert an iterable to an object.
- */
-export function toObject<
-  TKey extends string | number | symbol,
-  TValue
->(iterable: {
-  [Symbol.iterator](): IterableIterator<[TKey, TValue]>;
-}): Record<TKey, TValue> {
-  const obj = Object.create(null) as Record<TKey, TValue>;
-  for (const [key, value] of iterable) {
-    obj[key] = value;
-  }
-  return obj;
-}