@arkstack/http 0.12.9 → 0.12.11

package/dist/{index-DM79pxEy.d.ts → index-CwN_oKs8.d.ts}

@@ -1,7 +1,7 @@
 import * as _$clear_router0 from "clear-router";
-import { Request, Response } from "clear-router";
+import { ClearHttpContext, Request, Response } from "clear-router";
 import * as _$kanun from "kanun";
-import { RequestData } from "clear-router/types/basic";
+import { MiddlewareClass, MiddlewareInstance, RequestData } from "clear-router/types/basic";
 
 //#region src/Response.d.ts
 /**
@@ -302,7 +302,7 @@ declare class Session {
 }
 //#endregion
 //#region src/session/plugins.d.ts
-declare const arkstackHttpPlugin: _$clear_router0.ClearRouterPlugin<any, HttpContext>;
+declare const arkstackHttpPlugin: _$clear_router0.ClearRouterPlugin<any, ClearHttpContext>;
 declare const kanunSessionPlugin: _$kanun.ValidatorPlugin;
 //#endregion
 //#region src/session/helpers.d.ts
@@ -396,6 +396,10 @@ declare class FileSessionDriver extends BaseSessionDriver {
 type HeaderValue = string | string[] | number | boolean | null | undefined;
 type HeaderMap = Record<string, string>;
 type HeaderSource = Headers | Record<string, HeaderValue>;
+type FunctionMiddleware = (...args: any[]) => any;
+type ClassMiddleware = new (...args: any[]) => {
+  handle: FunctionMiddleware;
+};
 type RequestSource<TUser = unknown> = {
   headers?: HeaderSource;
   method?: string;
@@ -471,6 +475,13 @@ declare const normalizeHeaders: (headers?: HeaderSource) => HeaderMap;
 declare const normalizeHeaderValue: (value: HeaderValue) => string | undefined;
 declare const isHeaders: (value: unknown) => value is Headers;
 declare const isRecord: (value: unknown) => value is Record<PropertyKey, any>;
+/**
+ * Resolve Middleware
+ *
+ * @param middleware
+ * @returns
+ */
+declare const resolveMiddleware: <T extends FunctionMiddleware | MiddlewareClass | MiddlewareInstance>(middleware: T) => T extends MiddlewareClass<FunctionMiddleware> ? InstanceType<T>["handle"] : T extends MiddlewareInstance ? T["handle"] : T;
 //#endregion
 //#region src/redirect.d.ts
 declare const redirectBackTarget: (fallback?: string) => string;
@@ -485,4 +496,4 @@ declare const webMiddlewareKey: unique symbol;
 declare const web: (...args: any[]) => Promise<any>;
 declare const isWebRequest: (target: unknown) => boolean;
 //#endregion
-export { ErrorBag as $, encodeSessionPayload as A, serializeCookie as B, ResponseSource as C, CookieSessionDriver as D, DatabaseSessionDriver as E, encodeJson as F, getSessionDriver as G, signValue as H, encodeSignedValue as I, getSession as J, attachViewState as K, generateSessionId as L, encryptSessionValue as M, decodeJson as N, BaseSessionDriver as O, decodeSignedValue as P, Session as Q, getCookie as R, RequestSource as S, FileSessionDriver as T, configureSession as U, setCookie as V, createSessionDriver as W, arkstackHttpPlugin as X, registerResponseFlashSweep as Y, kanunSessionPlugin as Z, HeaderValue as _, redirect as a, SessionDriver as at, RequestHelper as b, isHeaders as c, SessionErrorRecord as ct, normalizeHeaderValue as d, SessionInitialState as dt, BaseSessionDriverOptions as et, normalizeHeaders as f, SessionMessageProvider as ft, HeaderSource as g, Response$1 as gt, HeaderMap as h, FlashBag as ht, old as i, SessionConfig as it, decryptSessionValue as j, decodeSessionPayload as k, isRecord as l, SessionErrorSource as lt, Request$1 as m, cookie_options as mt, web as n, HttpContextLike as nt, redirectBackTarget as o, SessionDriverResult as ot, unwrapRequestSource as p, SessionPayload as pt, ensureSession as q, webMiddlewareKey as r, PersistentSessionConfig as rt, resolveRedirectTarget as s, SessionDriverType as st, isWebRequest as t, DatabaseSessionDriverOptions as tt, makeHeaders as u, SessionErrorValue as ut, OldHelper as v, SessionHelper as w, RequestOptions as x, RedirectHelper as y, parseCookies as z };
+export { arkstackHttpPlugin as $, CookieSessionDriver as A, generateSessionId as B, RequestHelper as C, SessionHelper as D, ResponseSource as E, encryptSessionValue as F, signValue as G, parseCookies as H, decodeJson as I, getSessionDriver as J, configureSession as K, decodeSignedValue as L, decodeSessionPayload as M, encodeSessionPayload as N, FileSessionDriver as O, decryptSessionValue as P, registerResponseFlashSweep as Q, encodeJson as R, RedirectHelper as S, RequestSource as T, serializeCookie as U, getCookie as V, setCookie as W, ensureSession as X, attachViewState as Y, getSession as Z, FunctionMiddleware as _, cookie_options as _t, redirect as a, HttpContextLike as at, HeaderValue as b, isHeaders as c, SessionDriver as ct, normalizeHeaderValue as d, SessionErrorRecord as dt, kanunSessionPlugin as et, normalizeHeaders as f, SessionErrorSource as ft, ClassMiddleware as g, SessionPayload as gt, Request$1 as h, SessionMessageProvider as ht, old as i, DatabaseSessionDriverOptions as it, BaseSessionDriver as j, DatabaseSessionDriver as k, isRecord as l, SessionDriverResult as lt, unwrapRequestSource as m, SessionInitialState as mt, web as n, ErrorBag as nt, redirectBackTarget as o, PersistentSessionConfig as ot, resolveMiddleware as p, SessionErrorValue as pt, createSessionDriver as q, webMiddlewareKey as r, BaseSessionDriverOptions as rt, resolveRedirectTarget as s, SessionConfig as st, isWebRequest as t, Session as tt, makeHeaders as u, SessionDriverType as ut, HeaderMap as v, FlashBag as vt, RequestOptions as w, OldHelper as x, HeaderSource as y, Response$1 as yt, encodeSignedValue as z };

package/dist/index.d.ts

@@ -1,3 +1,3 @@
 /// <reference path="./app.d.ts" />
-import { $ as ErrorBag, A as encodeSessionPayload, B as serializeCookie, C as ResponseSource, D as CookieSessionDriver, E as DatabaseSessionDriver, F as encodeJson, G as getSessionDriver, H as signValue, I as encodeSignedValue, J as getSession, K as attachViewState, L as generateSessionId, M as encryptSessionValue, N as decodeJson, O as BaseSessionDriver, P as decodeSignedValue, Q as Session, R as getCookie, S as RequestSource, T as FileSessionDriver, U as configureSession, V as setCookie, W as createSessionDriver, X as arkstackHttpPlugin, Y as registerResponseFlashSweep, Z as kanunSessionPlugin, _ as HeaderValue, a as redirect, at as SessionDriver, b as RequestHelper, c as isHeaders, ct as SessionErrorRecord, d as normalizeHeaderValue, dt as SessionInitialState, et as BaseSessionDriverOptions, f as normalizeHeaders, ft as SessionMessageProvider, g as HeaderSource, gt as Response, h as HeaderMap, ht as FlashBag, i as old, it as SessionConfig, j as decryptSessionValue, k as decodeSessionPayload, l as isRecord, lt as SessionErrorSource, m as Request, mt as cookie_options, n as web, nt as HttpContextLike, o as redirectBackTarget, ot as SessionDriverResult, p as unwrapRequestSource, pt as SessionPayload, q as ensureSession, r as webMiddlewareKey, rt as PersistentSessionConfig, s as resolveRedirectTarget, st as SessionDriverType, t as isWebRequest, tt as DatabaseSessionDriverOptions, u as makeHeaders, ut as SessionErrorValue, v as OldHelper, w as SessionHelper, x as RequestOptions, y as RedirectHelper, z as parseCookies } from "./index-DM79pxEy.js";
-export { BaseSessionDriver, BaseSessionDriverOptions, CookieSessionDriver, DatabaseSessionDriver, DatabaseSessionDriverOptions, ErrorBag, FileSessionDriver, FlashBag, HeaderMap, HeaderSource, HeaderValue, HttpContextLike, OldHelper, PersistentSessionConfig, RedirectHelper, Request, RequestHelper, RequestOptions, RequestSource, Response, ResponseSource, Session, SessionConfig, SessionDriver, SessionDriverResult, SessionDriverType, SessionErrorRecord, SessionErrorSource, SessionErrorValue, SessionHelper, SessionInitialState, SessionMessageProvider, SessionPayload, arkstackHttpPlugin, attachViewState, configureSession, cookie_options, createSessionDriver, decodeJson, decodeSessionPayload, decodeSignedValue, decryptSessionValue, encodeJson, encodeSessionPayload, encodeSignedValue, encryptSessionValue, ensureSession, generateSessionId, getCookie, getSession, getSessionDriver, isHeaders, isRecord, isWebRequest, kanunSessionPlugin, makeHeaders, normalizeHeaderValue, normalizeHeaders, old, parseCookies, redirect, redirectBackTarget, registerResponseFlashSweep, resolveRedirectTarget, serializeCookie, setCookie, signValue, unwrapRequestSource, web, webMiddlewareKey };
+import { $ as arkstackHttpPlugin, A as CookieSessionDriver, B as generateSessionId, C as RequestHelper, D as SessionHelper, E as ResponseSource, F as encryptSessionValue, G as signValue, H as parseCookies, I as decodeJson, J as getSessionDriver, K as configureSession, L as decodeSignedValue, M as decodeSessionPayload, N as encodeSessionPayload, O as FileSessionDriver, P as decryptSessionValue, Q as registerResponseFlashSweep, R as encodeJson, S as RedirectHelper, T as RequestSource, U as serializeCookie, V as getCookie, W as setCookie, X as ensureSession, Y as attachViewState, Z as getSession, _ as FunctionMiddleware, _t as cookie_options, a as redirect, at as HttpContextLike, b as HeaderValue, c as isHeaders, ct as SessionDriver, d as normalizeHeaderValue, dt as SessionErrorRecord, et as kanunSessionPlugin, f as normalizeHeaders, ft as SessionErrorSource, g as ClassMiddleware, gt as SessionPayload, h as Request, ht as SessionMessageProvider, i as old, it as DatabaseSessionDriverOptions, j as BaseSessionDriver, k as DatabaseSessionDriver, l as isRecord, lt as SessionDriverResult, m as unwrapRequestSource, mt as SessionInitialState, n as web, nt as ErrorBag, o as redirectBackTarget, ot as PersistentSessionConfig, p as resolveMiddleware, pt as SessionErrorValue, q as createSessionDriver, r as webMiddlewareKey, rt as BaseSessionDriverOptions, s as resolveRedirectTarget, st as SessionConfig, t as isWebRequest, tt as Session, u as makeHeaders, ut as SessionDriverType, v as HeaderMap, vt as FlashBag, w as RequestOptions, x as OldHelper, y as HeaderSource, yt as Response, z as encodeSignedValue } from "./index-CwN_oKs8.js";
+export { BaseSessionDriver, BaseSessionDriverOptions, ClassMiddleware, CookieSessionDriver, DatabaseSessionDriver, DatabaseSessionDriverOptions, ErrorBag, FileSessionDriver, FlashBag, FunctionMiddleware, HeaderMap, HeaderSource, HeaderValue, HttpContextLike, OldHelper, PersistentSessionConfig, RedirectHelper, Request, RequestHelper, RequestOptions, RequestSource, Response, ResponseSource, Session, SessionConfig, SessionDriver, SessionDriverResult, SessionDriverType, SessionErrorRecord, SessionErrorSource, SessionErrorValue, SessionHelper, SessionInitialState, SessionMessageProvider, SessionPayload, arkstackHttpPlugin, attachViewState, configureSession, cookie_options, createSessionDriver, decodeJson, decodeSessionPayload, decodeSignedValue, decryptSessionValue, encodeJson, encodeSessionPayload, encodeSignedValue, encryptSessionValue, ensureSession, generateSessionId, getCookie, getSession, getSessionDriver, isHeaders, isRecord, isWebRequest, kanunSessionPlugin, makeHeaders, normalizeHeaderValue, normalizeHeaders, old, parseCookies, redirect, redirectBackTarget, registerResponseFlashSweep, resolveMiddleware, resolveRedirectTarget, serializeCookie, setCookie, signValue, unwrapRequestSource, web, webMiddlewareKey };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { A as registerResponseFlashSweep, B as normalizeHeaderValue, C as parseCookies, D as attachViewState, E as signValue, F as Response, H as unwrapRequestSource, I as Request, L as isHeaders, M as Session, N as ErrorBag, O as ensureSession, P as FlashBag, R as isRecord, S as getCookie, T as setCookie, V as normalizeHeaders, _ as decodeJson, a as kanunSessionPlugin, b as encodeSignedValue, c as getSessionDriver, d as CookieSessionDriver, f as BaseSessionDriver, g as encodeSessionPayload, h as decodeSessionPayload, i as arkstackHttpPlugin, j as old, k as getSession, l as FileSessionDriver, m as encryptSessionValue, n as redirectBackTarget, o as configureSession, p as decryptSessionValue, r as resolveRedirectTarget, s as createSessionDriver, t as redirect, u as DatabaseSessionDriver, v as decodeSignedValue, w as serializeCookie, x as generateSessionId, y as encodeJson, z as makeHeaders } from "./redirect-Bt3re8Qq.js";
+import { A as registerResponseFlashSweep, B as normalizeHeaderValue, C as parseCookies, D as attachViewState, E as signValue, F as Response, H as resolveMiddleware, I as Request, L as isHeaders, M as Session, N as ErrorBag, O as ensureSession, P as FlashBag, R as isRecord, S as getCookie, T as setCookie, U as unwrapRequestSource, V as normalizeHeaders, _ as decodeJson, a as kanunSessionPlugin, b as encodeSignedValue, c as getSessionDriver, d as CookieSessionDriver, f as BaseSessionDriver, g as encodeSessionPayload, h as decodeSessionPayload, i as arkstackHttpPlugin, j as old, k as getSession, l as FileSessionDriver, m as encryptSessionValue, n as redirectBackTarget, o as configureSession, p as decryptSessionValue, r as resolveRedirectTarget, s as createSessionDriver, t as redirect, u as DatabaseSessionDriver, v as decodeSignedValue, w as serializeCookie, x as generateSessionId, y as encodeJson, z as makeHeaders } from "./redirect-Bwrh6IHq.js";
 //#region src/middlewares/web.ts
 const webMiddlewareKey = Symbol.for("arkstack:http:web");
 const markWebRequest = (target) => {
@@ -45,4 +45,4 @@ const isWebRequest = (target) => {
 	return target[webMiddlewareKey] === true || target.arkstackWeb === true || isWebRequest(target.context) || isWebRequest(target.req);
 };
 //#endregion
-export { BaseSessionDriver, CookieSessionDriver, DatabaseSessionDriver, ErrorBag, FileSessionDriver, FlashBag, Request, Response, Session, arkstackHttpPlugin, attachViewState, configureSession, createSessionDriver, decodeJson, decodeSessionPayload, decodeSignedValue, decryptSessionValue, encodeJson, encodeSessionPayload, encodeSignedValue, encryptSessionValue, ensureSession, generateSessionId, getCookie, getSession, getSessionDriver, isHeaders, isRecord, isWebRequest, kanunSessionPlugin, makeHeaders, normalizeHeaderValue, normalizeHeaders, old, parseCookies, redirect, redirectBackTarget, registerResponseFlashSweep, resolveRedirectTarget, serializeCookie, setCookie, signValue, unwrapRequestSource, web, webMiddlewareKey };
+export { BaseSessionDriver, CookieSessionDriver, DatabaseSessionDriver, ErrorBag, FileSessionDriver, FlashBag, Request, Response, Session, arkstackHttpPlugin, attachViewState, configureSession, createSessionDriver, decodeJson, decodeSessionPayload, decodeSignedValue, decryptSessionValue, encodeJson, encodeSessionPayload, encodeSignedValue, encryptSessionValue, ensureSession, generateSessionId, getCookie, getSession, getSessionDriver, isHeaders, isRecord, isWebRequest, kanunSessionPlugin, makeHeaders, normalizeHeaderValue, normalizeHeaders, old, parseCookies, redirect, redirectBackTarget, registerResponseFlashSweep, resolveMiddleware, resolveRedirectTarget, serializeCookie, setCookie, signValue, unwrapRequestSource, web, webMiddlewareKey };

package/dist/{redirect-Bt3re8Qq.js → redirect-Bwrh6IHq.js}

@@ -1,3 +1,4 @@
+import { isClass } from "@arkstack/common";
 import { Request, Response } from "clear-router";
 import { definePlugin } from "clear-router/core";
 import { definePlugin as definePlugin$1 } from "kanun";
@@ -40,6 +41,19 @@ const isHeaders = (value) => typeof Headers !== "undefined" && value instanceof
 const isRecord = (value) => {
 	return !!value && typeof value === "object" && !Array.isArray(value);
 };
+/**
+* Resolve Middleware
+* 
+* @param middleware 
+* @returns 
+*/
+const resolveMiddleware = (middleware) => {
+	if (!middleware || typeof middleware === "function" && !isClass(middleware)) return middleware;
+	if (middleware && typeof middleware === "object" && !isClass(middleware) && "handle" in middleware) return middleware.handle.bind(middleware);
+	const instance = isClass(middleware) ? new middleware() : middleware;
+	if (instance && typeof instance.handle === "function") return instance.handle.bind(instance);
+	return middleware;
+};
 //#endregion
 //#region src/Request.ts
 /**
@@ -1241,4 +1255,4 @@ const redirect = (to = "back", status = defaultRedirectStatus) => {
 	return response;
 };
 //#endregion
-export { registerResponseFlashSweep as A, normalizeHeaderValue as B, parseCookies as C, attachViewState as D, signValue as E, Response$1 as F, unwrapRequestSource as H, Request$1 as I, isHeaders as L, Session as M, ErrorBag as N, ensureSession as O, FlashBag as P, isRecord as R, getCookie as S, setCookie as T, normalizeHeaders as V, decodeJson as _, kanunSessionPlugin as a, encodeSignedValue as b, getSessionDriver as c, CookieSessionDriver as d, BaseSessionDriver as f, encodeSessionPayload as g, decodeSessionPayload as h, arkstackHttpPlugin as i, old as j, getSession as k, FileSessionDriver as l, encryptSessionValue as m, redirectBackTarget as n, configureSession as o, decryptSessionValue as p, resolveRedirectTarget as r, createSessionDriver as s, redirect as t, DatabaseSessionDriver as u, decodeSignedValue as v, serializeCookie as w, generateSessionId as x, encodeJson as y, makeHeaders as z };
+export { registerResponseFlashSweep as A, normalizeHeaderValue as B, parseCookies as C, attachViewState as D, signValue as E, Response$1 as F, resolveMiddleware as H, Request$1 as I, isHeaders as L, Session as M, ErrorBag as N, ensureSession as O, FlashBag as P, isRecord as R, getCookie as S, setCookie as T, unwrapRequestSource as U, normalizeHeaders as V, decodeJson as _, kanunSessionPlugin as a, encodeSignedValue as b, getSessionDriver as c, CookieSessionDriver as d, BaseSessionDriver as f, encodeSessionPayload as g, decodeSessionPayload as h, arkstackHttpPlugin as i, old as j, getSession as k, FileSessionDriver as l, encryptSessionValue as m, redirectBackTarget as n, configureSession as o, decryptSessionValue as p, resolveRedirectTarget as r, createSessionDriver as s, redirect as t, DatabaseSessionDriver as u, decodeSignedValue as v, serializeCookie as w, generateSessionId as x, encodeJson as y, makeHeaders as z };

package/dist/setup.d.ts

@@ -1,4 +1,4 @@
-import { b as RequestHelper, gt as Response, v as OldHelper, w as SessionHelper, y as RedirectHelper } from "./index-DM79pxEy.js";
+import { C as RequestHelper, D as SessionHelper, S as RedirectHelper, x as OldHelper, yt as Response } from "./index-CwN_oKs8.js";
 //#region src/setup.d.ts
 declare global {
   var session: SessionHelper;

package/dist/setup.js

@@ -1,4 +1,4 @@
-import { F as Response$1, I as Request$1, a as kanunSessionPlugin, i as arkstackHttpPlugin, j as old, t as redirect } from "./redirect-Bt3re8Qq.js";
+import { F as Response$1, I as Request$1, a as kanunSessionPlugin, i as arkstackHttpPlugin, j as old, t as redirect } from "./redirect-Bwrh6IHq.js";
 import { CoreRouter } from "clear-router";
 import { Validator } from "kanun";
 import "dotenv/config";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkstack/http",
-  "version": "0.12.9",
+  "version": "0.12.11",
   "type": "module",
   "description": "HTTP module for Arkstack, providing framework-agnostic request and response primitives.",
   "homepage": "https://arkstack.toneflix.net/guide/http",
@@ -28,9 +28,10 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "clear-router": "^2.8.5",
+    "clear-router": "^2.8.6",
     "dotenv": "17.3.1",
-    "@arkstack/contract": "^0.12.9"
+    "@arkstack/contract": "^0.12.11",
+    "@arkstack/common": "^0.12.11"
   },
   "peerDependencies": {
     "arkormx": "^2.4.1",