@cfworker/web 1.12.0 → 1.12.3

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/router.d.ts

@@ -36,5 +36,5 @@ export declare class Router {
     all(pathname: string, ...middleware: Middleware[]): this;
     middleware: Middleware;
     compose(conditions: RouteCondition[], ...middleware: Middleware[]): this;
-    private resolve;
+    resolve(ctx: Context): Route | undefined;
 }

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.12.0",
+  "version": "1.12.3",
   "description": "Web framework for Cloudflare Workers and service workers, inspired by Koa and fastify",
   "keywords": [
     "middleware",
@@ -34,27 +34,26 @@
     "test": "cfworker test test/**/*.spec.ts --nocheck"
   },
   "dependencies": {
-    "@cfworker/json-schema": "^1.12.0",
-    "@cfworker/worker-types": "^1.12.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.31",
     "@types/statuses": "^2.0.0",
-    "cookie": "^0.4.1",
+    "cookie": "^0.4.2",
     "html-escaper": "^3.0.3",
-    "negotiator": "^0.6.2",
+    "negotiator": "^0.6.3",
     "path-to-regexp": "^6.2.0",
     "secure-json-parse": "^2.4.0",
     "statuses": "^2.0.1"
   },
   "devDependencies": {
-    "@cfworker/dev": "^1.12.0",
-    "@types/chai": "^4.2.22",
-    "@types/mocha": "^9.0.0",
-    "chai": "^4.3.4",
-    "json-pointer": "^0.6.1",
-    "mocha": "^9.1.3",
-    "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/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/router.ts

@@ -117,7 +117,7 @@ export class Router {
     return this;
   }
 
-  private resolve(ctx: Context) {
+  public resolve(ctx: Context) {
     return this.routes.find(
       ({ conditions }) =>
         conditions.length === 0 || conditions.every(c => c(ctx))

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 as RequestParser,
+  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/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;
-}