@mapl/web 0.1.13 → 0.1.16

package/core/handler.d.ts

@@ -1,6 +1,7 @@
 import type { Err } from "@safe-std/error";
 import type { Context } from "./context.js";
 import type { RouterTag } from "./index.js";
+import type { RequestMethod } from "./utils.js";
 export type ErrorHandler<E extends Err = Err> = (err: E, c: Context) => any;
 export type Handler<
 	Params extends string[] = string[],
@@ -51,7 +52,7 @@ export declare const error: <const E extends Err>(r: RouterTag<E>, f: ErrorHandl
 export declare const route: <
 	P extends string,
 	S = {}
->(method: string, path: P, handler: Handler<InferPath<P>, Required<S>>, ...dat: HandlerData[]) => HandlerTag<S>;
+>(method: RequestMethod, path: P, handler: Handler<InferPath<P>, Required<S>>, ...dat: HandlerData[]) => HandlerTag<S>;
 export declare const any: DefineHandler;
 export declare const get: DefineHandler;
 export declare const post: DefineHandler;

package/core/index.d.ts

@@ -1,17 +1,12 @@
 import type { HandlerTag } from "./handler.js";
 import type { AnyMiddlewareTypes } from "./middleware.js";
 import type { UnionToIntersection } from "./utils.js";
-declare const routerTag: unique symbol;
+declare const _: unique symbol;
 export interface RouterTag<E = any> {
-	[routerTag]: E;
+	[_]: E;
 }
-export type InferError<
-	T extends AnyMiddlewareTypes[],
-	S extends Record<string, RouterTag>
-> = S[keyof S][typeof routerTag] | T[number][0];
-export type InferHandler<T extends AnyMiddlewareTypes[]> = HandlerTag<T extends [] ? {} : UnionToIntersection<T[number][1]>>;
 declare const _default: <
 	const T extends AnyMiddlewareTypes[],
 	const S extends Record<string, RouterTag> = {}
->(middlewares: T, handlers: InferHandler<T>[], children?: S) => RouterTag<InferError<T, S>>;
+>(middlewares: T, handlers: HandlerTag<T extends [] ? {} : UnionToIntersection<T[number][1]>>[], children?: S) => RouterTag<S[keyof S][typeof _] | T[number][0]>;
 export default _default;

package/core/middleware.d.ts

@@ -1,4 +1,4 @@
-import type { InferErr } from "@safe-std/error";
+import type { InferErr, InferResult } from "@safe-std/error";
 import type { AwaitedReturn } from "./utils.js";
 import type { Context } from "./context.js";
 export type MiddlewareHandler = (c: Context) => any;
@@ -16,4 +16,4 @@ export declare const validate: <const T extends MiddlewareHandler>(f: T) => Midd
 export declare const parse: <
 	Prop extends string,
 	const T extends MiddlewareHandler
->(prop: Prop, f: T) => MiddlewareTypes<InferErr<AwaitedReturn<T>>, Record<Prop, AwaitedReturn<T>>>;
+>(prop: Prop, f: T) => MiddlewareTypes<InferErr<AwaitedReturn<T>>, Record<Prop, InferResult<AwaitedReturn<T>>>>;

package/core/utils.d.ts

@@ -1,2 +1,3 @@
 export type UnionToIntersection<U> = (U extends any ? (x: U) => void : never) extends (x: infer I) => void ? I : never;
 export type AwaitedReturn<U extends (...a: any[]) => any> = Awaited<ReturnType<U>>;
+export type RequestMethod = "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS" | "TRACE" | (string & {});

package/package.json

@@ -1,8 +1,8 @@
 {
 "name": "@mapl/web",
-"version": "0.1.13",
+"version": "0.1.16",
 "description": "A compiled web framework for all runtimes",
-"keywords": [],
+"keywords": ["fast", "lightweight", "cross-runtime", "framework", "web", "backend"],
 "repository": {
 "type": "git",
 "url": "git+https://github.com/mapljs/web.git"
@@ -12,19 +12,23 @@
 "main": "./index.js",
 "types": "./index.d.ts",
 "dependencies": {
-"@mapl/framework": "^0.2.7",
-"@mapl/router": "^0.6.0",
-"@safe-std/error": "^1.0.0"
+"@mapl/framework": "^0.2.8",
+"@mapl/router": "^0.6.2",
+"@safe-std/error": "^1.0.1"
+},
+"optionalDependencies": {
+"secure-headers": "^0.0.6"
 },
 "exports": {
 "./constants": "./constants.js",
-".": "./index.js",
 "./core/compile": "./core/compile.js",
-"./core/context": "./core/context.js",
-"./core": "./core/index.js",
 "./core/utils": "./core/utils.js",
-"./utils/cors": "./utils/cors.js",
+"./utils/secure-headers": "./utils/secure-headers.js",
+"./utils/headers": "./utils/headers.js",
+"./core": "./core/index.js",
 "./core/middleware": "./core/middleware.js",
+"./core/context": "./core/context.js",
+"./utils/cors": "./utils/cors.js",
 "./core/handler": "./core/handler.js"
 }
 }

package/utils/cors.d.ts

@@ -1,17 +1,17 @@
 import { type MiddlewareTypes } from "../core/middleware.js";
-type HeaderValue = "*" | (string & {}) | [string, string, ...string[]];
-declare const header: unique symbol;
-interface Header {
-	[header]: 0;
-}
-declare const preflight: unique symbol;
-interface PreflightHeader {
-	[preflight]: 0;
-}
-export declare const allowMethods: (v: HeaderValue) => PreflightHeader;
-export declare const allowHeaders: (v: HeaderValue) => PreflightHeader;
+import type { RequestMethod } from "../core/utils.js";
+export type HeaderValue = "*" | (string & {}) | [string, string, ...string[]];
+declare const _: unique symbol;
+export type Header = [string, string] & {
+	[_]: 0
+};
+export type PreflightHeader = Header & {
+	[_]: 1
+};
+export declare const allowMethods: (v: RequestMethod[] | RequestMethod) => PreflightHeader;
+export declare const allowHeaders: (v: string[] | string) => PreflightHeader;
 export declare const maxAge: (v: number) => PreflightHeader;
 export declare const allowCredentials: Header;
-export declare const exposeHeaders: (v: HeaderValue) => Header;
+export declare const exposeHeaders: (v: string[] | string) => Header;
 export declare const init: (origins: HeaderValue, preflightHeaders?: PreflightHeader[], headers?: Header[]) => MiddlewareTypes<never, {}>;
 export {};

package/utils/cors.js

@@ -1 +1 @@
-import{tap}from"../core/middleware.js";export let allowMethods=v=>[`Access-Control-Allow-Methods`,``+v];export let allowHeaders=v=>[`Access-Control-Allow-Headers`,``+v];export let maxAge=v=>[`Access-Control-Max-Age`,``+v];export let allowCredentials=[`Access-Control-Allow-Credentials`,`true`];export let exposeHeaders=v=>[`Access-Control-Expose-Headers`,``+v];export let init=(origins,preflightHeaders=[],headers=[])=>{if(origins!==`*`){headers.push([`Vary`,`Origin`]);if(Array.isArray(origins))return tap(c=>{let origin=c.req.headers.get(`Origin`);let headers=c.headers;headers.push([`Access-Control-Allow-Origin`,typeof origin===`string`&&origins.includes(origin)?origin:origins[0]]);headers.push(...headers);c.req.method===`OPTIONS`&&headers.push(...preflightHeaders)})}headers.push([`Access-Control-Allow-Origin`,origins]);return tap(c=>{c.headers.push(...headers);c.req.method===`OPTIONS`&&c.headers.push(...preflightHeaders)})};
+import{tap}from"../core/middleware.js";export let allowMethods=v=>[`Access-Control-Allow-Methods`,v];export let allowHeaders=v=>[`Access-Control-Allow-Headers`,``+v];export let maxAge=v=>[`Access-Control-Max-Age`,``+v];export let allowCredentials=[`Access-Control-Allow-Credentials`,`true`];export let exposeHeaders=v=>[`Access-Control-Expose-Headers`,``+v];export let init=(origins,preflightHeaders=[],headers=[])=>{if(origins!==`*`){headers.push([`Vary`,`Origin`]);if(Array.isArray(origins))return tap(c=>{let origin=c.req.headers.get(`Origin`);c.headers.push([`Access-Control-Allow-Origin`,typeof origin===`string`&&origins.includes(origin)?origin:origins[0]],...headers);c.req.method===`OPTIONS`&&c.headers.push(...preflightHeaders)})}headers.push([`Access-Control-Allow-Origin`,origins]);return tap(c=>{c.headers.push(...headers);c.req.method===`OPTIONS`&&c.headers.push(...preflightHeaders)})};

package/utils/headers.d.ts

@@ -0,0 +1,4 @@
+import type { Header } from "../core/context.js";
+import { type MiddlewareTypes } from "../core/middleware.js";
+declare const _default: (headers: Headers | Header[] | Record<string, any>) => MiddlewareTypes<never, {}>;
+export default _default;

package/utils/headers.js

@@ -0,0 +1 @@
+import{tap}from"../core/middleware.js";export default headers=>(headers=Array.isArray(headers)?headers:headers instanceof Headers?headers.entries().toArray():Object.entries(headers),tap(c=>{c.headers.push(...headers)}));

package/utils/secure-headers.d.ts

@@ -0,0 +1,4 @@
+import { type Options } from "secure-headers";
+import { type MiddlewareTypes } from "../core/middleware.js";
+declare const _default: (headers: Options) => MiddlewareTypes<never, {}>;
+export default _default;

package/utils/secure-headers.js

@@ -0,0 +1 @@
+import secureHeaders from"secure-headers";import{tap}from"../core/middleware.js";export default headers=>(headers=Object.entries(secureHeaders(headers)),tap(c=>{c.headers.push(...headers)}));

package/index.d.ts

@@ -1,6 +0,0 @@
-export { default as router } from "./core/index.js";
-export type * from "./core/index.js";
-export * as handle from "./core/handler.js";
-export * as layer from "./core/middleware.js";
-export { default as compile } from "./core/compile.js";
-export * as cors from "./utils/cors.js";

package/index.js

@@ -1 +0,0 @@
-export{default as router}from"./core/index.js";export*as handle from"./core/handler.js";export*as layer from"./core/middleware.js";export{default as compile}from"./core/compile.js";export*as cors from"./utils/cors.js";