@andrewcaires/express 1.2.6 → 1.2.7

package/dist/index.cjs.js

@@ -1,7 +1,7 @@
 /*!
- * @andrewcaires/express v1.2.6
+ * @andrewcaires/express v1.2.7
  * Decorators for express 
- * (c) 2025 Andrew Caires
+ * (c) 2026 Andrew Caires
  * @license: MIT
  */
-"use strict";var e=require("@andrewcaires/node"),t=require("@andrewcaires/utils.js"),s=require("compression"),r=require("cookie-parser"),o=require("cors"),i=require("express"),n=require("express-session"),a=require("fs"),p=require("http"),h=require("https"),u=require("net"),c=require("path"),E=require("request-ip"),l=require("multer");function d(e){var t=Object.create(null);return e&&Object.keys(e).forEach(function(s){if("default"!==s){var r=Object.getOwnPropertyDescriptor(e,s);Object.defineProperty(t,s,r.get?r:{enumerable:!0,get:function(){return e[s]}})}}),t.default=e,Object.freeze(t)}var _=d(p),T=d(h);function O(e,t,s,r){return new(s||(s=Promise))(function(o,i){function n(e){try{p(r.next(e))}catch(e){i(e)}}function a(e){try{p(r.throw(e))}catch(e){i(e)}}function p(e){var t;e.done?o(e.value):(t=e.value,t instanceof s?t:new s(function(e){e(t)})).then(n,a)}p((r=r.apply(e,t||[])).next())})}"function"==typeof SuppressedError&&SuppressedError;class x{}x.CONTINUE=100,x.SWITCHING_PROTOCOLS=101,x.PROCESSING=102,x.OK=200,x.CREATED=201,x.ACCEPTED=202,x.NON_AUTHORITATIVE_INFORMATION=203,x.NO_CONTENT=204,x.RESET_CONTENT=205,x.PARTIAL_CONTENT=206,x.MULTI_STATUS=207,x.ALREADY_REPORTED=208,x.IM_USED=226,x.MULTIPLE_CHOICES=300,x.MOVED_PERMANENTLY=301,x.FOUND=302,x.SEE_OTHER=303,x.NOT_MODIFIED=304,x.USE_PROXY=305,x.TEMPORARY_REDIRECT=307,x.PERMANENT_REDIRECT=308,x.BAD_REQUEST=400,x.UNAUTHORIZED=401,x.PAYMENT_REQUIRED=402,x.FORBIDDEN=403,x.NOT_FOUND=404,x.METHOD_NOT_ALLOWED=405,x.NOT_ACCEPTABLE=406,x.PROXY_AUTHENTICATION_REQUIRED=407,x.REQUEST_TIMEOUT=408,x.CONFLICT=409,x.GONE=410,x.LENGTH_REQUIRED=411,x.PRECONDITION_FAILED=412,x.PAYLOAD_TOO_LARGE=413,x.REQUEST_URI_TOO_LONG=414,x.UNSUPPORTED_MEDIA_TYPE=415,x.REQUESTED_RANGE_NOT_SATISFIABLE=416,x.EXPECTATION_FAILED=417,x.IM_A_TEAPOT=418,x.MISDIRECTED_REQUEST=421,x.UNPROCESSABLE_ENTITY=422,x.LOCKED=423,x.FAILED_DEPENDENCY=424,x.UPGRADE_REQUIRED=426,x.PRECONDITION_REQUIRED=428,x.TOO_MANY_REQUESTS=429,x.REQUEST_HEADER_FIELDS_TOO_LARGE=431,x.CONNECTION_CLOSED_WITHOUT_RESPONSE=444,x.UNAVAILABLE_FOR_LEGAL_REASONS=451,x.CLIENT_CLOSED_REQUEST=499,x.INTERNAL_SERVER_ERROR=500,x.NOT_IMPLEMENTED=501,x.BAD_GATEWAY=502,x.SERVICE_UNAVAILABLE=503,x.GATEWAY_TIMEOUT=504,x.HTTP_VERSION_NOT_SUPPORTED=505,x.VARIANT_ALSO_NEGOCIATES=506,x.INSUFFICIENT_STORAGE=507,x.LOOP_DETECTED=508,x.NOT_EXTENDED=510,x.NETWORK_AUTHENTICATION_REQUIRED=511,x.NETWORK_CONNECTION_TIMEOUT_ERROR=599;class R{constructor(e,t,s,r){this.req=e,this.res=t,this.next=s,this.controller=r}cache(e){const s=[];e.private?s.push("private"):e.public&&s.push("public"),e.noStore&&(e.noCache=!0,s.push("no-store")),e.noCache&&(e.maxAge=0,delete e.sMaxAge,s.push("no-cache")),e.noTransform&&s.push("no-transform"),e.proxyRevalidate&&s.push("proxy-revalidate"),e.mustRevalidate?s.push("must-revalidate"):e.noCache||(t.isNumber(e.staleIfError)&&s.push(`stale-if-error=${e.staleIfError}`),t.isNumber(e.staleWhileRevalidate)&&s.push(`stale-while-revalidate=${e.staleWhileRevalidate}`)),t.isNumber(e.maxAge)&&s.push(`max-age=${e.maxAge}`),t.isNumber(e.sMaxAge)&&s.push(`s-maxage=${e.sMaxAge}`),s.length&&(this.res.setHeader("Cache-Control",s.join(",")),e.noCache&&t.forEachKey({"Surrogate-Control":"no-store",Pragma:"no-cache",ETag:"false",Expires:"0"},(e,t)=>this.res.setHeader(t,e)))}close(e){this.res.headersSent||this.res.json(e||this.storage)}destroy(e){var t;e&&this.error(e.message),null===(t=this.res.socket)||void 0===t||t.destroy(e)}error(e){this.send(x.INTERNAL_SERVER_ERROR,{message:e})}file(e){this.res.headersSent||(this.status(x.OK),this.res.sendFile(c.resolve(e)))}ip(){return E.getClientIp(this.req)||"0.0.0.0"}json(e){this.send(x.OK,e)}notFound(e){this.send(x.NOT_FOUND,{message:e})}prepare(e,t){this.res.headersSent||(this.status(e),this.storage=t)}send(e,t){this.res.headersSent||(this.status(e),this.res.json(t))}status(e){return e&&this.res.status(e),this.res.statusCode}success(e){this.send(x.OK,{message:e})}unauthorized(e){this.send(x.UNAUTHORIZED,{message:e})}validation(e){this.send(x.BAD_REQUEST,{message:e})}}class N{static extends(t){return e.Metadata(N.EXTENDS,t,[])}static middleware(t){return e.Metadata(N.MIDDLEWARE,t,[])}static parameters(t){return e.Metadata(N.PARAMETERS,t,[])}static path(t,s){return e.Metadata(N.PATH,t,s)}static routers(t){return e.Metadata(N.ROUTERS,t,[])}}N.EXTENDS=Symbol(),N.MIDDLEWARE=Symbol(),N.PARAMETERS=Symbol(),N.PATH=Symbol(),N.ROUTERS=Symbol();class A extends t.EventEmitter{get controllers(){return this._controllers}get instance(){return this._app}get router(){return this._router}get server(){return this._server}constructor(e,p){var h;super(),this._app=i(),this._options={},this._default={cross:!1,hybrid:!1,path:"/",port:3e3,session:{secret:"yoursecret",resave:!0,saveUninitialized:!1,cookie:{maxAge:864e5}}},this._base=i.Router(),this._router=i.Router(),this._controllers=[],this._controllers.push(...e),this._options=t.merge(Object.assign({},this._default),Object.assign({},p)),this._app.use(i.json(this._options.json)),this._app.disable("x-powered-by"),this._app.use(i.urlencoded({extended:!0})),this._options.cross&&this._app.use(o(t.isObject(this._options.cross)?this._options.cross:{}));const u=this._options.cookie;this._app.use(s()),this._app.use(r(null==u?void 0:u.secret,null==u?void 0:u.options)),this._app.use(n(this._options.session)),this.init(),this._app.use(this._router);const E=(null===(h=this._options.path)||void 0===h?void 0:h.length)?this._options.path:"/";if(this._app.use(E,this._base),this._app.all(E+"/*path",(e,t)=>{this._options.redirect?t.redirect(this._options.redirect):(t.status(x.NOT_FOUND),t.json({message:"INVALID API"}))}),this._options.public){const e=c.resolve(this._options.public);a.existsSync(e)&&this._app.use(i.static(e)),this._app.get("*path",(t,s)=>{a.existsSync(e)?s.sendFile(e+"/index.html"):this._options.notfound?s.redirect(this._options.notfound):(s.status(x.NOT_FOUND),s.json({message:'FILE "index.html" NOT FOUND'}))})}else this._app.all("*path",(e,t)=>{this._options.redirect?t.redirect(this._options.redirect):(t.status(x.NOT_FOUND),t.json({message:"INVALID API"}))});e.forEach(e=>{const s=i.Router(),r=this._middlewares(e),o=N.parameters(e);this._extends(e).forEach(e=>{r.push(...this._middlewares(e)),o.push(...N.parameters(e))}),N.routers(e).forEach(i=>{const n=i.propertyKey.toString();if(t.isFunction(e[n])){if(!t.isFunction(s[i.method]))return this._notFound(i.method);const a=this._handles(e,n,r,o);return s[i.method](i.path,...a,(s,r,i)=>O(this,void 0,void 0,function*(){const a=new R(s,r,i,e),p=this._args(a,this._indexes(n,o)),h=yield e[n](...p);a.close(t.isArray(h)||t.isObject(h)?h:void 0)}))}this._notFound(`${e.name}.${n}`)}),this._extends(e).forEach(i=>{N.routers(i).forEach(i=>{const n=i.propertyKey.toString();if(t.isFunction(e[n])){if(!t.isFunction(s[i.method]))return this._notFound(i.method);const a=this._handles(e,n,r,o);return s[i.method](i.path,...a,(s,r,i)=>O(this,void 0,void 0,function*(){const a=new R(s,r,i,e),p=this._args(a,this._indexes(n,o)),h=yield e[n](...p);a.close(t.isArray(h)||t.isObject(h)?h:void 0)}))}this._notFound(`${e.constructor.name}.${n}`)})}),this._base.use(N.path(e,"/"),s)})}init(){}error(t,s){e.Log.error(t)}log(t,s){e.Log.info(t)}_args(e,t,s){const r=[],o={ctx:e,key:"",app:this,argument:s};return t.forEach(e=>{r[e.parameterIndex]=e.callback(Object.assign(Object.assign({},o),{key:e.key}))}),r}_handles(e,s,r,o){return r.filter(e=>e.propertyKey==s).map(s=>{if(s.callback!=t.noop){const r=this._indexes(s.method,o);return(o,i,n)=>O(this,void 0,void 0,function*(){const a=new R(o,i,n,e),p=t.isFunction(s.argument)?s.argument(a):s.argument,h=yield s.callback.call(e,...this._args(a,r,p));(t.isArray(h)||t.isObject(h))&&a.close(h)})}this._notFound(s.method)}).filter(t.isFunction)}_extends(e){return N.extends(e).reduce((e,t)=>(e.push(t,...this._extends(t)),e),[]).filter((e,t,s)=>s.indexOf(e)===t)}_indexes(e,t){return t.filter(t=>t.propertyKey==e)}_middlewares(e){return[...N.middleware(e)].reverse()}_notFound(e){this.error(new Error(`Router "${e}" not found`),"express")}_port(e){return`Server listening on port ${e}`}listen(){return O(this,void 0,void 0,function*(){if(this._options.cert&&this._options.key||(this._server=_.createServer(this._app),this._server.listen(this._options.port,()=>this.log(this._port(this._options.port),"express"))),!this._server){const e=_.createServer((e,t)=>{const s=80==this._options.port?":80":"";t.writeHead(x.MOVED_PERMANENTLY,{Location:`https://${e.headers.host}${s}${e.url}`}),t.end()}),t=T.createServer({key:this._options.key,cert:this._options.cert},this._app);if(this._options.hybrid){new u.Server(s=>{s.once("data",r=>{s.pause(),s.unshift(r),(22===r[0]?t:e).emit("connection",s),process.nextTick(()=>s.resume())})}).listen(this._options.port,()=>this.log(this._port(this._options.port),"express")),this._server=t}this._server||(443==this._options.port&&e.listen(80,()=>this.log(this._port(80),"express")),t.listen(this._options.port,()=>this.log(this._port(this._options.port),"express")),this._server=t)}})}}var m;exports.Methods=void 0,(m=exports.Methods||(exports.Methods={})).ALL="all",m.GET="get",m.POST="post",m.PUT="put",m.HEAD="head",m.DELETE="delete",m.OPTIONS="options",m.PATCH="patch";const I=e=>t=>(s,r)=>{N.routers(s).push({method:e,path:(null==t?void 0:t.length)?t:"/",propertyKey:r})},S=I(exports.Methods.ALL),f=e=>t=>(s,r,o)=>{N.parameters(s).push({callback:e,key:t,propertyKey:r,parameterIndex:o})},D=f(({app:e})=>e),g=f(({argument:e})=>e),y=(e,s)=>t.isUndefined(s)?e:e[s],v=f(({ctx:e,key:t})=>y(e.req.body,t)),U=f(({ctx:e,key:t})=>y(e.req.cookies,t)),C=f(({ctx:e})=>e),P=f(({ctx:e})=>t.toArray(e.req.files)),L=f(({ctx:e,key:t})=>y(e.req.headers,t)),M=f(({ctx:e,key:t})=>y(e.req.params,t)),b=f(({ctx:e,key:t})=>y(e.req.query,t)),F=f(({ctx:e})=>e.req.session),k=(e,s)=>(r,o)=>{const i=t.uniqueID();C()(r,i,0),N.middleware(r).push({method:i,argument:s,propertyKey:o,callback:e})},q=I(exports.Methods.DELETE),j=I(exports.Methods.GET),w=I(exports.Methods.HEAD),H=I(exports.Methods.OPTIONS),G=I(exports.Methods.PATCH),K=I(exports.Methods.POST),Q=I(exports.Methods.PUT);class Y{static file(e,s){const r=t.uuidv4()+"."+s;return a.existsSync(c.join(e,r))?Y.file(e,s):r}static middleware(e,t){const s=Y._cache(t);s.upload||(s.upload=Y.multer(t)),s.upload(e.req,e.res,t=>{if(t)return e.destroy(t);e.next()})}static multer(e){const t=(null==e?void 0:e.path)||"./",s=l.diskStorage({destination:(e,s,r)=>r(null,t),filename:(e,s,r)=>O(this,void 0,void 0,function*(){return r(null,Y.file(t,s.originalname.split(".").pop()||"bin"))})}),r=(null==e?void 0:e.types)||[];return l({storage:s,fileFilter(e,t,s){return O(this,void 0,void 0,function*(){if(r.length){const e=t.originalname.split(".").pop()||"bin";return-1!=r.indexOf(t.mimetype)||-1!=r.indexOf(e)?s(null,!0):s(new Error("File not allowed"))}return s(null,!0)})},limits:{fileSize:1e6*((null==e?void 0:e.size)||5)}}).array((null==e?void 0:e.field)||"field",(null==e?void 0:e.count)||1)}}Y._cache=t.cache(),exports.All=S,exports.App=D,exports.Application=A,exports.Argument=g,exports.Body=v,exports.Cache=e=>(t,s,r)=>{k(t=>{t.cache(Object.assign({},e)),t.next()})(t,s,r)},exports.Context=R,exports.Controller=e=>t=>{N.path(t,(null==e?void 0:e.length)?e:"/")},exports.Cookies=U,exports.Ctx=C,exports.Delete=q,exports.Extends=e=>t=>{N.extends(t).push(e)},exports.Files=P,exports.Get=j,exports.Head=w,exports.Headers=L,exports.Metadata=N,exports.Middleware=(e,s)=>(r,o)=>{let i=t.noop;if(t.isString(o)){const s=r;t.isFunction(s[e])&&(i=s[e])}N.middleware(r).push({method:e,argument:s,propertyKey:o,callback:i})},exports.Options=H,exports.Params=M,exports.Patch=G,exports.Post=K,exports.Put=Q,exports.Query=b,exports.Session=F,exports.Status=x,exports.Upload=Y,exports.Use=k,exports.methodFactory=I,exports.parameterFactory=f;
+"use strict";var e=require("@andrewcaires/node"),t=require("@andrewcaires/utils.js"),s=require("compression"),r=require("cookie-parser"),o=require("cors"),i=require("express"),n=require("express-session"),a=require("fs"),p=require("http"),h=require("https"),u=require("net"),l=require("path"),d=require("request-ip"),E=require("@andrewcaires/decorator"),c=require("multer");function _(e){var t=Object.create(null);return e&&Object.keys(e).forEach(function(s){if("default"!==s){var r=Object.getOwnPropertyDescriptor(e,s);Object.defineProperty(t,s,r.get?r:{enumerable:!0,get:function(){return e[s]}})}}),t.default=e,Object.freeze(t)}var T=_(p),O=_(h);function R(e,t,s,r){return new(s||(s=Promise))(function(o,i){function n(e){try{p(r.next(e))}catch(e){i(e)}}function a(e){try{p(r.throw(e))}catch(e){i(e)}}function p(e){var t;e.done?o(e.value):(t=e.value,t instanceof s?t:new s(function(e){e(t)})).then(n,a)}p((r=r.apply(e,t||[])).next())})}"function"==typeof SuppressedError&&SuppressedError;class x{}x.CONTINUE=100,x.SWITCHING_PROTOCOLS=101,x.PROCESSING=102,x.OK=200,x.CREATED=201,x.ACCEPTED=202,x.NON_AUTHORITATIVE_INFORMATION=203,x.NO_CONTENT=204,x.RESET_CONTENT=205,x.PARTIAL_CONTENT=206,x.MULTI_STATUS=207,x.ALREADY_REPORTED=208,x.IM_USED=226,x.MULTIPLE_CHOICES=300,x.MOVED_PERMANENTLY=301,x.FOUND=302,x.SEE_OTHER=303,x.NOT_MODIFIED=304,x.USE_PROXY=305,x.TEMPORARY_REDIRECT=307,x.PERMANENT_REDIRECT=308,x.BAD_REQUEST=400,x.UNAUTHORIZED=401,x.PAYMENT_REQUIRED=402,x.FORBIDDEN=403,x.NOT_FOUND=404,x.METHOD_NOT_ALLOWED=405,x.NOT_ACCEPTABLE=406,x.PROXY_AUTHENTICATION_REQUIRED=407,x.REQUEST_TIMEOUT=408,x.CONFLICT=409,x.GONE=410,x.LENGTH_REQUIRED=411,x.PRECONDITION_FAILED=412,x.PAYLOAD_TOO_LARGE=413,x.REQUEST_URI_TOO_LONG=414,x.UNSUPPORTED_MEDIA_TYPE=415,x.REQUESTED_RANGE_NOT_SATISFIABLE=416,x.EXPECTATION_FAILED=417,x.IM_A_TEAPOT=418,x.MISDIRECTED_REQUEST=421,x.UNPROCESSABLE_ENTITY=422,x.LOCKED=423,x.FAILED_DEPENDENCY=424,x.UPGRADE_REQUIRED=426,x.PRECONDITION_REQUIRED=428,x.TOO_MANY_REQUESTS=429,x.REQUEST_HEADER_FIELDS_TOO_LARGE=431,x.CONNECTION_CLOSED_WITHOUT_RESPONSE=444,x.UNAVAILABLE_FOR_LEGAL_REASONS=451,x.CLIENT_CLOSED_REQUEST=499,x.INTERNAL_SERVER_ERROR=500,x.NOT_IMPLEMENTED=501,x.BAD_GATEWAY=502,x.SERVICE_UNAVAILABLE=503,x.GATEWAY_TIMEOUT=504,x.HTTP_VERSION_NOT_SUPPORTED=505,x.VARIANT_ALSO_NEGOCIATES=506,x.INSUFFICIENT_STORAGE=507,x.LOOP_DETECTED=508,x.NOT_EXTENDED=510,x.NETWORK_AUTHENTICATION_REQUIRED=511,x.NETWORK_CONNECTION_TIMEOUT_ERROR=599;class A{constructor(e,t,s,r){this.req=e,this.res=t,this.next=s,this.controller=r}cache(e){const s=[];e.private?s.push("private"):e.public&&s.push("public"),e.noStore&&(e.noCache=!0,s.push("no-store")),e.noCache&&(e.maxAge=0,delete e.sMaxAge,s.push("no-cache")),e.noTransform&&s.push("no-transform"),e.proxyRevalidate&&s.push("proxy-revalidate"),e.mustRevalidate?s.push("must-revalidate"):e.noCache||(t.isNumber(e.staleIfError)&&s.push(`stale-if-error=${e.staleIfError}`),t.isNumber(e.staleWhileRevalidate)&&s.push(`stale-while-revalidate=${e.staleWhileRevalidate}`)),t.isNumber(e.maxAge)&&s.push(`max-age=${e.maxAge}`),t.isNumber(e.sMaxAge)&&s.push(`s-maxage=${e.sMaxAge}`),s.length&&(this.res.setHeader("Cache-Control",s.join(",")),e.noCache&&t.forEachKey({"Surrogate-Control":"no-store",Pragma:"no-cache",ETag:"false",Expires:"0"},(e,t)=>this.res.setHeader(t,e)))}close(e){this.res.headersSent||this.res.json(e||this.storage)}destroy(e){var t;e&&this.error(e.message),null===(t=this.res.socket)||void 0===t||t.destroy(e)}error(e){this.send(x.INTERNAL_SERVER_ERROR,{message:e})}file(e){this.res.headersSent||(this.status(x.OK),this.res.sendFile(l.resolve(e)))}getIp(){return d.getClientIp(this.req)||"0.0.0.0"}json(e){this.send(x.OK,e)}notFound(e){this.send(x.NOT_FOUND,{message:e})}prepare(e,t){this.res.headersSent||(this.status(e),this.storage=t)}send(e,t){this.res.headersSent||(this.status(e),this.res.json(t))}status(e){return e&&this.res.status(e),this.res.statusCode}success(e){this.send(x.OK,{message:e})}unauthorized(e){this.send(x.UNAUTHORIZED,{message:e})}validation(e){this.send(x.BAD_REQUEST,{message:e})}}class N{static extends(e){return E.metadata(N.EXTENDS,e,[])}static middleware(e){return E.metadata(N.MIDDLEWARE,e,[])}static parameters(e){return E.metadata(N.PARAMETERS,e,[])}static path(e,t){return E.metadata(N.PATH,e,t)}static routers(e){return E.metadata(N.ROUTERS,e,[])}}N.EXTENDS=Symbol("EXTENDS"),N.MIDDLEWARE=Symbol("MIDDLEWARE"),N.PARAMETERS=Symbol("PARAMETERS"),N.PATH=Symbol("PATH"),N.ROUTERS=Symbol("ROUTERS");class v extends t.EventEmitter{get controllers(){return this._controllers}get instance(){return this._app}get router(){return this._router}get server(){return this._server}constructor(e,p){var h;super(),this._app=i(),this._options={},this._default={cross:!1,hybrid:!1,path:"/",port:3e3,session:{secret:"yoursecret",resave:!0,saveUninitialized:!1,cookie:{maxAge:864e5}}},this._base=i.Router(),this._router=i.Router(),this._controllers=[],this._controllers.push(...e),this._options=t.merge({},this._default,null!=p?p:{}),this._app.use(i.json(this._options.json)),this._app.disable("x-powered-by"),this._app.use(i.urlencoded({extended:!0})),this._options.cross&&this._app.use(o(t.isObject(this._options.cross)?this._options.cross:{}));const u=this._options.cookie;this._app.use(s()),this._app.use(r(null==u?void 0:u.secret,null==u?void 0:u.options)),this._app.use(n(this._options.session)),this.init(),this._app.use(this._router);const d=(null===(h=this._options.path)||void 0===h?void 0:h.length)?this._options.path:"/";if(this._app.use(d,this._base),this._app.all(d+"/*path",(e,t)=>{this._options.redirect?t.redirect(this._options.redirect):(t.status(x.NOT_FOUND),t.json({message:"INVALID API"}))}),this._options.public){const e=l.resolve(this._options.public);a.existsSync(e)&&this._app.use(i.static(e)),this._app.get("*path",(t,s)=>{a.existsSync(e)?s.sendFile(e+"/index.html"):this._options.notfound?s.redirect(this._options.notfound):(s.status(x.NOT_FOUND),s.json({message:'FILE "index.html" NOT FOUND'}))})}else this._app.all("*path",(e,t)=>{this._options.redirect?t.redirect(this._options.redirect):(t.status(x.NOT_FOUND),t.json({message:"INVALID API"}))});e.forEach(e=>{const s=i.Router(),r=this._middlewares(e),o=N.parameters(e);this._extends(e).forEach(e=>{r.push(...this._middlewares(e)),o.push(...N.parameters(e))}),N.routers(e).forEach(i=>{const n=i.propertyKey.toString();if(t.isFunction(e[n])){if(!t.isFunction(s[i.method]))return this._notFound(i.method);const a=this._handles(e,n,r,o);return s[i.method](i.path,...a,(s,r,i)=>R(this,void 0,void 0,function*(){const a=new A(s,r,i,e),p=this._args(a,this._indexes(n,o)),h=yield e[n](...p);a.close(t.isArray(h)||t.isObject(h)?h:void 0)}))}this._notFound(`${e.name}.${n}`)}),this._extends(e).forEach(i=>{N.routers(i).forEach(i=>{const n=i.propertyKey.toString();if(t.isFunction(e[n])){if(!t.isFunction(s[i.method]))return this._notFound(i.method);const a=this._handles(e,n,r,o);return s[i.method](i.path,...a,(s,r,i)=>R(this,void 0,void 0,function*(){const a=new A(s,r,i,e),p=this._args(a,this._indexes(n,o)),h=yield e[n](...p);a.close(t.isArray(h)||t.isObject(h)?h:void 0)}))}this._notFound(`${e.constructor.name}.${n}`)})}),this._base.use(N.path(e,"/"),s)})}init(){}error(t,s){e.Log.error(t)}log(t,s){e.Log.info(t)}_args(e,t,s){const r=[],o={ctx:e,key:"",app:this,argument:s};return t.forEach(e=>{r[e.parameterIndex]=e.callback(Object.assign(Object.assign({},o),{key:e.key}))}),r}_handles(e,s,r,o){return r.filter(e=>e.propertyKey==s).map(s=>{if(s.callback!=t.noop){const r=this._indexes(s.method,o);return(o,i,n)=>R(this,void 0,void 0,function*(){const a=new A(o,i,n,e),p=t.isFunction(s.argument)?s.argument(a):s.argument,h=yield s.callback.call(e,...this._args(a,r,p));(t.isArray(h)||t.isObject(h))&&a.close(h)})}this._notFound(s.method)}).filter(t.isFunction)}_extends(e){return N.extends(e).reduce((e,t)=>(e.push(t,...this._extends(t)),e),[]).filter((e,t,s)=>s.indexOf(e)===t)}_indexes(e,t){return t.filter(t=>t.propertyKey==e)}_middlewares(e){return[...N.middleware(e)].reverse()}_notFound(e){this.error(new Error(`Router "${e}" not found`),"express")}_port(e){return`Server listening on port ${e}`}listen(){return R(this,void 0,void 0,function*(){if(this._options.cert&&this._options.key||(this._server=T.createServer(this._app),this._server.listen(this._options.port,()=>this.log(this._port(this._options.port),"express"))),!this._server){const e=T.createServer((e,t)=>{const s=80==this._options.port?":80":"";t.writeHead(x.MOVED_PERMANENTLY,{Location:`https://${e.headers.host}${s}${e.url}`}),t.end()}),t=O.createServer({key:this._options.key,cert:this._options.cert},this._app);if(this._options.hybrid){new u.Server(s=>{s.once("data",r=>{s.pause(),s.unshift(r),(22===r[0]?t:e).emit("connection",s),process.nextTick(()=>s.resume())})}).listen(this._options.port,()=>this.log(this._port(this._options.port),"express")),this._server=t}this._server||(443==this._options.port&&e.listen(80,()=>this.log(this._port(80),"express")),t.listen(this._options.port,()=>this.log(this._port(this._options.port),"express")),this._server=t)}})}}var m;exports.Methods=void 0,(m=exports.Methods||(exports.Methods={})).ALL="all",m.GET="get",m.POST="post",m.PUT="put",m.HEAD="head",m.DELETE="delete",m.OPTIONS="options",m.PATCH="patch";const I=e=>t=>(s,r)=>{N.routers(s).push({method:e,path:(null==t?void 0:t.length)?t:"/",propertyKey:r})},S=I(exports.Methods.ALL),D=I(exports.Methods.DELETE),f=I(exports.Methods.GET),g=I(exports.Methods.HEAD),y=I(exports.Methods.OPTIONS),U=I(exports.Methods.PATCH),P=I(exports.Methods.POST),C=I(exports.Methods.PUT),L=e=>t=>(s,r,o)=>{N.parameters(s).push({callback:e,key:t,propertyKey:r,parameterIndex:o})},M=L(({app:e})=>e),b=L(({argument:e})=>e),F=(e,s)=>t.isUndefined(s)?e:e[s],q=L(({ctx:e,key:t})=>{var s,r;return F(null!==(r=null===(s=e.req)||void 0===s?void 0:s.body)&&void 0!==r?r:{},t)}),k=L(({ctx:e,key:t})=>{var s,r;return F(null!==(r=null===(s=e.req)||void 0===s?void 0:s.cookies)&&void 0!==r?r:{},t)}),w=L(({ctx:e})=>e),H=L(({ctx:e})=>{var s,r;return t.toArray(null!==(r=null===(s=e.req)||void 0===s?void 0:s.files)&&void 0!==r?r:[])}),j=L(({ctx:e,key:t})=>{var s,r;return F(null!==(r=null===(s=e.req)||void 0===s?void 0:s.headers)&&void 0!==r?r:{},t)}),G=L(({ctx:e,key:t})=>{var s,r;return F(null!==(r=null===(s=e.req)||void 0===s?void 0:s.params)&&void 0!==r?r:{},t)}),K=L(({ctx:e,key:t})=>{var s,r,o;return String(null!==(o=F(null!==(r=null===(s=e.req)||void 0===s?void 0:s.query)&&void 0!==r?r:{},t))&&void 0!==o?o:"")}),Q=L(({ctx:e})=>{var t;return null===(t=e.req)||void 0===t?void 0:t.session}),Y=(e,s)=>(r,o)=>{const i=t.uniqueID();w()(r,i,0),N.middleware(r).push({method:i,argument:s,propertyKey:o,callback:e})};class ${static file(e,s){const r=t.uuidv7()+"."+s;return a.existsSync(l.join(e,r))?$.file(e,s):r}static middleware(e,t){const s=$._cache(t);s.upload||(s.upload=$.multer(t)),s.upload(e.req,e.res,t=>{if(t)return e.destroy(t);e.next()})}static multer(e){const t=(null==e?void 0:e.path)||"./",s=c.diskStorage({destination:(e,s,r)=>r(null,t),filename:(e,s,r)=>R(this,void 0,void 0,function*(){return r(null,$.file(t,s.originalname.split(".").pop()||"bin"))})}),r=(null==e?void 0:e.types)||[];return c({storage:s,fileFilter(e,t,s){return R(this,void 0,void 0,function*(){if(r.length){const e=t.originalname.split(".").pop()||"bin";return-1!=r.indexOf(t.mimetype)||-1!=r.indexOf(e)?s(null,!0):s(new Error("File not allowed"))}return s(null,!0)})},limits:{fileSize:1e6*((null==e?void 0:e.size)||5)}}).array((null==e?void 0:e.field)||"field",(null==e?void 0:e.count)||1)}}$._cache=t.cache(),exports.All=S,exports.App=M,exports.Application=v,exports.Argument=b,exports.Body=q,exports.Cache=e=>(t,s,r)=>{Y(t=>{t.cache(Object.assign({},e)),t.next()})(t,s,r)},exports.Context=A,exports.Controller=e=>t=>{N.path(t,(null==e?void 0:e.length)?e:"/")},exports.Cookies=k,exports.Ctx=w,exports.Delete=D,exports.Extends=e=>t=>{N.extends(t).push(e)},exports.Files=H,exports.Get=f,exports.Head=g,exports.Headers=j,exports.Metadata=N,exports.Middleware=(e,s)=>(r,o)=>{let i=t.noop;if(t.isString(o)){const s=r;t.isFunction(s[e])&&(i=s[e])}N.middleware(r).push({method:e,argument:s,propertyKey:o,callback:i})},exports.Options=y,exports.Params=G,exports.Patch=U,exports.Post=P,exports.Put=C,exports.Query=K,exports.Session=Q,exports.Status=x,exports.Upload=$,exports.Use=Y,exports.methodFactory=I,exports.parameterFactory=L;

package/dist/index.d.ts

@@ -1,10 +1,10 @@
 /*!
- * @andrewcaires/express v1.2.6
+ * @andrewcaires/express v1.2.7
  * Decorators for express 
- * (c) 2025 Andrew Caires
+ * (c) 2026 Andrew Caires
  * @license: MIT
  */
-import { TypeObjectAny, TypeCallbackFunction, EventEmitter } from '@andrewcaires/utils.js';
+import { TypeAnyObject, TypeCallbackFunction, TypeObjectAny, EventEmitter, TypeAnyFunction } from '@andrewcaires/utils.js';
 import { Request, Response, NextFunction, Express, Router } from 'express';
 import * as http from 'http';
 import * as https from 'https';
@@ -21,15 +21,15 @@ declare class Context<T = any> {
     private storage?;
     constructor(req: Request, res: Response, next: NextFunction, controller: T);
     cache(options: ICache): void;
-    close(value?: TypeObjectAny): void;
+    close(value?: TypeAnyObject): void;
     destroy(error?: Error): void;
     error(message: string): void;
     file(path: string): void;
-    ip(): string;
-    json(value?: TypeObjectAny | Array<TypeObjectAny>): void;
+    getIp(): string;
+    json(value?: TypeAnyObject | Array<TypeAnyObject>): void;
     notFound(message: string): void;
-    prepare(status: number, value: TypeObjectAny | Array<TypeObjectAny>): void;
-    send(status: number, value?: TypeObjectAny | Array<TypeObjectAny>): void;
+    prepare(status: number, value: TypeAnyObject | Array<TypeAnyObject>): void;
+    send(status: number, value?: TypeAnyObject | Array<TypeAnyObject>): void;
     status(value?: number): number;
     success(message: string): void;
     unauthorized(message: string): void;
@@ -158,8 +158,8 @@ declare class Application extends EventEmitter {
     get server(): http.Server | https.Server | undefined;
     constructor(controllers: Array<object>, options?: IOptions);
     init(): void;
-    error(message: any, source?: string): void;
-    log(message: string, source?: string): void;
+    error(message: any, _source?: string): void;
+    log(message: string, _source?: string): void;
     private _args;
     private _handles;
     private _extends;
@@ -176,8 +176,6 @@ declare const Extends: (type: any) => ClassDecorator;
 
 declare const All: (path?: string) => MethodDecorator;
 
-declare const Cache: (options: ICache) => MethodDecorator;
-
 declare const Delete: (path?: string) => MethodDecorator;
 
 declare const Get: (path?: string) => MethodDecorator;
@@ -186,8 +184,6 @@ declare const Head: (path?: string) => MethodDecorator;
 
 declare const methodFactory: (method: Methods) => (path?: string) => MethodDecorator;
 
-declare const Middleware: (method: string, argument?: any) => MethodDecorator;
-
 declare const Options: (path?: string) => MethodDecorator;
 
 declare const Patch: (path?: string) => MethodDecorator;
@@ -196,6 +192,10 @@ declare const Post: (path?: string) => MethodDecorator;
 
 declare const Put: (path?: string) => MethodDecorator;
 
+declare const Cache: (options: ICache) => MethodDecorator;
+
+declare const Middleware: (method: string, argument?: any) => MethodDecorator;
+
 declare const Use: (callback: IHandler, argument?: any) => MethodDecorator;
 
 declare const App: (key?: string) => ParameterDecorator;
@@ -212,7 +212,7 @@ declare const Files: (key?: string) => ParameterDecorator;
 
 declare const Headers: (key?: string) => ParameterDecorator;
 
-declare const parameterFactory: (callback: TypeCallbackFunction) => (key?: string) => ParameterDecorator;
+declare const parameterFactory: (callback: TypeAnyFunction) => (key?: string) => ParameterDecorator;
 
 declare const Params: (key?: string) => ParameterDecorator;
 

package/dist/index.esm.js

@@ -1,7 +1,7 @@
 /*!
- * @andrewcaires/express v1.2.6
+ * @andrewcaires/express v1.2.7
  * Decorators for express 
- * (c) 2025 Andrew Caires
+ * (c) 2026 Andrew Caires
  * @license: MIT
  */
-import{Metadata as t,Log as e}from"@andrewcaires/node";import{isNumber as s,forEachKey as r,EventEmitter as i,merge as o,isObject as n,isFunction as a,noop as h,isArray as p,isUndefined as E,toArray as _,uniqueID as l,isString as c,cache as u,uuidv4 as d}from"@andrewcaires/utils.js";import T from"compression";import O from"cookie-parser";import m from"cors";import R,{Router as N,json as A,urlencoded as I}from"express";import f from"express-session";import{existsSync as S}from"fs";import*as D from"http";import*as g from"https";import{Server as v}from"net";import{resolve as x,join as y}from"path";import{getClientIp as U}from"request-ip";import L from"multer";function C(t,e,s,r){return new(s||(s=Promise))(function(i,o){function n(t){try{h(r.next(t))}catch(t){o(t)}}function a(t){try{h(r.throw(t))}catch(t){o(t)}}function h(t){var e;t.done?i(t.value):(e=t.value,e instanceof s?e:new s(function(t){t(e)})).then(n,a)}h((r=r.apply(t,e||[])).next())})}"function"==typeof SuppressedError&&SuppressedError;class P{}P.CONTINUE=100,P.SWITCHING_PROTOCOLS=101,P.PROCESSING=102,P.OK=200,P.CREATED=201,P.ACCEPTED=202,P.NON_AUTHORITATIVE_INFORMATION=203,P.NO_CONTENT=204,P.RESET_CONTENT=205,P.PARTIAL_CONTENT=206,P.MULTI_STATUS=207,P.ALREADY_REPORTED=208,P.IM_USED=226,P.MULTIPLE_CHOICES=300,P.MOVED_PERMANENTLY=301,P.FOUND=302,P.SEE_OTHER=303,P.NOT_MODIFIED=304,P.USE_PROXY=305,P.TEMPORARY_REDIRECT=307,P.PERMANENT_REDIRECT=308,P.BAD_REQUEST=400,P.UNAUTHORIZED=401,P.PAYMENT_REQUIRED=402,P.FORBIDDEN=403,P.NOT_FOUND=404,P.METHOD_NOT_ALLOWED=405,P.NOT_ACCEPTABLE=406,P.PROXY_AUTHENTICATION_REQUIRED=407,P.REQUEST_TIMEOUT=408,P.CONFLICT=409,P.GONE=410,P.LENGTH_REQUIRED=411,P.PRECONDITION_FAILED=412,P.PAYLOAD_TOO_LARGE=413,P.REQUEST_URI_TOO_LONG=414,P.UNSUPPORTED_MEDIA_TYPE=415,P.REQUESTED_RANGE_NOT_SATISFIABLE=416,P.EXPECTATION_FAILED=417,P.IM_A_TEAPOT=418,P.MISDIRECTED_REQUEST=421,P.UNPROCESSABLE_ENTITY=422,P.LOCKED=423,P.FAILED_DEPENDENCY=424,P.UPGRADE_REQUIRED=426,P.PRECONDITION_REQUIRED=428,P.TOO_MANY_REQUESTS=429,P.REQUEST_HEADER_FIELDS_TOO_LARGE=431,P.CONNECTION_CLOSED_WITHOUT_RESPONSE=444,P.UNAVAILABLE_FOR_LEGAL_REASONS=451,P.CLIENT_CLOSED_REQUEST=499,P.INTERNAL_SERVER_ERROR=500,P.NOT_IMPLEMENTED=501,P.BAD_GATEWAY=502,P.SERVICE_UNAVAILABLE=503,P.GATEWAY_TIMEOUT=504,P.HTTP_VERSION_NOT_SUPPORTED=505,P.VARIANT_ALSO_NEGOCIATES=506,P.INSUFFICIENT_STORAGE=507,P.LOOP_DETECTED=508,P.NOT_EXTENDED=510,P.NETWORK_AUTHENTICATION_REQUIRED=511,P.NETWORK_CONNECTION_TIMEOUT_ERROR=599;class F{constructor(t,e,s,r){this.req=t,this.res=e,this.next=s,this.controller=r}cache(t){const e=[];t.private?e.push("private"):t.public&&e.push("public"),t.noStore&&(t.noCache=!0,e.push("no-store")),t.noCache&&(t.maxAge=0,delete t.sMaxAge,e.push("no-cache")),t.noTransform&&e.push("no-transform"),t.proxyRevalidate&&e.push("proxy-revalidate"),t.mustRevalidate?e.push("must-revalidate"):t.noCache||(s(t.staleIfError)&&e.push(`stale-if-error=${t.staleIfError}`),s(t.staleWhileRevalidate)&&e.push(`stale-while-revalidate=${t.staleWhileRevalidate}`)),s(t.maxAge)&&e.push(`max-age=${t.maxAge}`),s(t.sMaxAge)&&e.push(`s-maxage=${t.sMaxAge}`),e.length&&(this.res.setHeader("Cache-Control",e.join(",")),t.noCache&&r({"Surrogate-Control":"no-store",Pragma:"no-cache",ETag:"false",Expires:"0"},(t,e)=>this.res.setHeader(e,t)))}close(t){this.res.headersSent||this.res.json(t||this.storage)}destroy(t){var e;t&&this.error(t.message),null===(e=this.res.socket)||void 0===e||e.destroy(t)}error(t){this.send(P.INTERNAL_SERVER_ERROR,{message:t})}file(t){this.res.headersSent||(this.status(P.OK),this.res.sendFile(x(t)))}ip(){return U(this.req)||"0.0.0.0"}json(t){this.send(P.OK,t)}notFound(t){this.send(P.NOT_FOUND,{message:t})}prepare(t,e){this.res.headersSent||(this.status(t),this.storage=e)}send(t,e){this.res.headersSent||(this.status(t),this.res.json(e))}status(t){return t&&this.res.status(t),this.res.statusCode}success(t){this.send(P.OK,{message:t})}unauthorized(t){this.send(P.UNAUTHORIZED,{message:t})}validation(t){this.send(P.BAD_REQUEST,{message:t})}}class b{static extends(e){return t(b.EXTENDS,e,[])}static middleware(e){return t(b.MIDDLEWARE,e,[])}static parameters(e){return t(b.PARAMETERS,e,[])}static path(e,s){return t(b.PATH,e,s)}static routers(e){return t(b.ROUTERS,e,[])}}b.EXTENDS=Symbol(),b.MIDDLEWARE=Symbol(),b.PARAMETERS=Symbol(),b.PATH=Symbol(),b.ROUTERS=Symbol();class M extends i{get controllers(){return this._controllers}get instance(){return this._app}get router(){return this._router}get server(){return this._server}constructor(t,e){var s;super(),this._app=R(),this._options={},this._default={cross:!1,hybrid:!1,path:"/",port:3e3,session:{secret:"yoursecret",resave:!0,saveUninitialized:!1,cookie:{maxAge:864e5}}},this._base=N(),this._router=N(),this._controllers=[],this._controllers.push(...t),this._options=o(Object.assign({},this._default),Object.assign({},e)),this._app.use(A(this._options.json)),this._app.disable("x-powered-by"),this._app.use(I({extended:!0})),this._options.cross&&this._app.use(m(n(this._options.cross)?this._options.cross:{}));const r=this._options.cookie;this._app.use(T()),this._app.use(O(null==r?void 0:r.secret,null==r?void 0:r.options)),this._app.use(f(this._options.session)),this.init(),this._app.use(this._router);const i=(null===(s=this._options.path)||void 0===s?void 0:s.length)?this._options.path:"/";if(this._app.use(i,this._base),this._app.all(i+"/*path",(t,e)=>{this._options.redirect?e.redirect(this._options.redirect):(e.status(P.NOT_FOUND),e.json({message:"INVALID API"}))}),this._options.public){const t=x(this._options.public);S(t)&&this._app.use(R.static(t)),this._app.get("*path",(e,s)=>{S(t)?s.sendFile(t+"/index.html"):this._options.notfound?s.redirect(this._options.notfound):(s.status(P.NOT_FOUND),s.json({message:'FILE "index.html" NOT FOUND'}))})}else this._app.all("*path",(t,e)=>{this._options.redirect?e.redirect(this._options.redirect):(e.status(P.NOT_FOUND),e.json({message:"INVALID API"}))});t.forEach(t=>{const e=N(),s=this._middlewares(t),r=b.parameters(t);this._extends(t).forEach(t=>{s.push(...this._middlewares(t)),r.push(...b.parameters(t))}),b.routers(t).forEach(i=>{const o=i.propertyKey.toString();if(a(t[o])){if(!a(e[i.method]))return this._notFound(i.method);const h=this._handles(t,o,s,r);return e[i.method](i.path,...h,(e,s,i)=>C(this,void 0,void 0,function*(){const a=new F(e,s,i,t),h=this._args(a,this._indexes(o,r)),E=yield t[o](...h);a.close(p(E)||n(E)?E:void 0)}))}this._notFound(`${t.name}.${o}`)}),this._extends(t).forEach(i=>{b.routers(i).forEach(i=>{const o=i.propertyKey.toString();if(a(t[o])){if(!a(e[i.method]))return this._notFound(i.method);const h=this._handles(t,o,s,r);return e[i.method](i.path,...h,(e,s,i)=>C(this,void 0,void 0,function*(){const a=new F(e,s,i,t),h=this._args(a,this._indexes(o,r)),E=yield t[o](...h);a.close(p(E)||n(E)?E:void 0)}))}this._notFound(`${t.constructor.name}.${o}`)})}),this._base.use(b.path(t,"/"),e)})}init(){}error(t,s){e.error(t)}log(t,s){e.info(t)}_args(t,e,s){const r=[],i={ctx:t,key:"",app:this,argument:s};return e.forEach(t=>{r[t.parameterIndex]=t.callback(Object.assign(Object.assign({},i),{key:t.key}))}),r}_handles(t,e,s,r){return s.filter(t=>t.propertyKey==e).map(e=>{if(e.callback!=h){const s=this._indexes(e.method,r);return(r,i,o)=>C(this,void 0,void 0,function*(){const h=new F(r,i,o,t),E=a(e.argument)?e.argument(h):e.argument,_=yield e.callback.call(t,...this._args(h,s,E));(p(_)||n(_))&&h.close(_)})}this._notFound(e.method)}).filter(a)}_extends(t){return b.extends(t).reduce((t,e)=>(t.push(e,...this._extends(e)),t),[]).filter((t,e,s)=>s.indexOf(t)===e)}_indexes(t,e){return e.filter(e=>e.propertyKey==t)}_middlewares(t){return[...b.middleware(t)].reverse()}_notFound(t){this.error(new Error(`Router "${t}" not found`),"express")}_port(t){return`Server listening on port ${t}`}listen(){return C(this,void 0,void 0,function*(){if(this._options.cert&&this._options.key||(this._server=D.createServer(this._app),this._server.listen(this._options.port,()=>this.log(this._port(this._options.port),"express"))),!this._server){const t=D.createServer((t,e)=>{const s=80==this._options.port?":80":"";e.writeHead(P.MOVED_PERMANENTLY,{Location:`https://${t.headers.host}${s}${t.url}`}),e.end()}),e=g.createServer({key:this._options.key,cert:this._options.cert},this._app);if(this._options.hybrid){new v(s=>{s.once("data",r=>{s.pause(),s.unshift(r),(22===r[0]?e:t).emit("connection",s),process.nextTick(()=>s.resume())})}).listen(this._options.port,()=>this.log(this._port(this._options.port),"express")),this._server=e}this._server||(443==this._options.port&&t.listen(80,()=>this.log(this._port(80),"express")),e.listen(this._options.port,()=>this.log(this._port(this._options.port),"express")),this._server=e)}})}}const k=t=>e=>{b.path(e,(null==t?void 0:t.length)?t:"/")},w=t=>e=>{b.extends(e).push(t)};var H;!function(t){t.ALL="all",t.GET="get",t.POST="post",t.PUT="put",t.HEAD="head",t.DELETE="delete",t.OPTIONS="options",t.PATCH="patch"}(H||(H={}));const G=t=>e=>(s,r)=>{b.routers(s).push({method:t,path:(null==e?void 0:e.length)?e:"/",propertyKey:r})},K=G(H.ALL),Q=t=>e=>(s,r,i)=>{b.parameters(s).push({callback:t,key:e,propertyKey:r,parameterIndex:i})},j=Q(({app:t})=>t),Y=Q(({argument:t})=>t),$=(t,e)=>E(e)?t:t[e],q=Q(({ctx:t,key:e})=>$(t.req.body,e)),V=Q(({ctx:t,key:e})=>$(t.req.cookies,e)),W=Q(({ctx:t})=>t),B=Q(({ctx:t})=>_(t.req.files)),X=Q(({ctx:t,key:e})=>$(t.req.headers,e)),z=Q(({ctx:t,key:e})=>$(t.req.params,e)),Z=Q(({ctx:t,key:e})=>$(t.req.query,e)),J=Q(({ctx:t})=>t.req.session),tt=(t,e)=>(s,r)=>{const i=l();W()(s,i,0),b.middleware(s).push({method:i,argument:e,propertyKey:r,callback:t})},et=t=>(e,s,r)=>{tt(e=>{e.cache(Object.assign({},t)),e.next()})(e,s,r)},st=G(H.DELETE),rt=G(H.GET),it=G(H.HEAD),ot=(t,e)=>(s,r)=>{let i=h;if(c(r)){const e=s;a(e[t])&&(i=e[t])}b.middleware(s).push({method:t,argument:e,propertyKey:r,callback:i})},nt=G(H.OPTIONS),at=G(H.PATCH),ht=G(H.POST),pt=G(H.PUT);class Et{static file(t,e){const s=d()+"."+e;return S(y(t,s))?Et.file(t,e):s}static middleware(t,e){const s=Et._cache(e);s.upload||(s.upload=Et.multer(e)),s.upload(t.req,t.res,e=>{if(e)return t.destroy(e);t.next()})}static multer(t){const e=(null==t?void 0:t.path)||"./",s=L.diskStorage({destination:(t,s,r)=>r(null,e),filename:(t,s,r)=>C(this,void 0,void 0,function*(){return r(null,Et.file(e,s.originalname.split(".").pop()||"bin"))})}),r=(null==t?void 0:t.types)||[];return L({storage:s,fileFilter(t,e,s){return C(this,void 0,void 0,function*(){if(r.length){const t=e.originalname.split(".").pop()||"bin";return-1!=r.indexOf(e.mimetype)||-1!=r.indexOf(t)?s(null,!0):s(new Error("File not allowed"))}return s(null,!0)})},limits:{fileSize:1e6*((null==t?void 0:t.size)||5)}}).array((null==t?void 0:t.field)||"field",(null==t?void 0:t.count)||1)}}Et._cache=u();export{K as All,j as App,M as Application,Y as Argument,q as Body,et as Cache,F as Context,k as Controller,V as Cookies,W as Ctx,st as Delete,w as Extends,B as Files,rt as Get,it as Head,X as Headers,b as Metadata,H as Methods,ot as Middleware,nt as Options,z as Params,at as Patch,ht as Post,pt as Put,Z as Query,J as Session,P as Status,Et as Upload,tt as Use,G as methodFactory,Q as parameterFactory};
+import{Log as t}from"@andrewcaires/node";import{isNumber as e,forEachKey as s,EventEmitter as r,merge as i,isObject as o,isFunction as n,noop as a,isArray as h,isUndefined as p,toArray as l,uniqueID as E,isString as u,cache as _,uuidv7 as d}from"@andrewcaires/utils.js";import c from"compression";import T from"cookie-parser";import O from"cors";import m,{Router as R,json as N,urlencoded as A}from"express";import v from"express-session";import{existsSync as I}from"fs";import*as f from"http";import*as S from"https";import{Server as D}from"net";import{resolve as g,join as x}from"path";import{getClientIp as y}from"request-ip";import{metadata as U}from"@andrewcaires/decorator";import L from"multer";function P(t,e,s,r){return new(s||(s=Promise))(function(i,o){function n(t){try{h(r.next(t))}catch(t){o(t)}}function a(t){try{h(r.throw(t))}catch(t){o(t)}}function h(t){var e;t.done?i(t.value):(e=t.value,e instanceof s?e:new s(function(t){t(e)})).then(n,a)}h((r=r.apply(t,e||[])).next())})}"function"==typeof SuppressedError&&SuppressedError;class C{}C.CONTINUE=100,C.SWITCHING_PROTOCOLS=101,C.PROCESSING=102,C.OK=200,C.CREATED=201,C.ACCEPTED=202,C.NON_AUTHORITATIVE_INFORMATION=203,C.NO_CONTENT=204,C.RESET_CONTENT=205,C.PARTIAL_CONTENT=206,C.MULTI_STATUS=207,C.ALREADY_REPORTED=208,C.IM_USED=226,C.MULTIPLE_CHOICES=300,C.MOVED_PERMANENTLY=301,C.FOUND=302,C.SEE_OTHER=303,C.NOT_MODIFIED=304,C.USE_PROXY=305,C.TEMPORARY_REDIRECT=307,C.PERMANENT_REDIRECT=308,C.BAD_REQUEST=400,C.UNAUTHORIZED=401,C.PAYMENT_REQUIRED=402,C.FORBIDDEN=403,C.NOT_FOUND=404,C.METHOD_NOT_ALLOWED=405,C.NOT_ACCEPTABLE=406,C.PROXY_AUTHENTICATION_REQUIRED=407,C.REQUEST_TIMEOUT=408,C.CONFLICT=409,C.GONE=410,C.LENGTH_REQUIRED=411,C.PRECONDITION_FAILED=412,C.PAYLOAD_TOO_LARGE=413,C.REQUEST_URI_TOO_LONG=414,C.UNSUPPORTED_MEDIA_TYPE=415,C.REQUESTED_RANGE_NOT_SATISFIABLE=416,C.EXPECTATION_FAILED=417,C.IM_A_TEAPOT=418,C.MISDIRECTED_REQUEST=421,C.UNPROCESSABLE_ENTITY=422,C.LOCKED=423,C.FAILED_DEPENDENCY=424,C.UPGRADE_REQUIRED=426,C.PRECONDITION_REQUIRED=428,C.TOO_MANY_REQUESTS=429,C.REQUEST_HEADER_FIELDS_TOO_LARGE=431,C.CONNECTION_CLOSED_WITHOUT_RESPONSE=444,C.UNAVAILABLE_FOR_LEGAL_REASONS=451,C.CLIENT_CLOSED_REQUEST=499,C.INTERNAL_SERVER_ERROR=500,C.NOT_IMPLEMENTED=501,C.BAD_GATEWAY=502,C.SERVICE_UNAVAILABLE=503,C.GATEWAY_TIMEOUT=504,C.HTTP_VERSION_NOT_SUPPORTED=505,C.VARIANT_ALSO_NEGOCIATES=506,C.INSUFFICIENT_STORAGE=507,C.LOOP_DETECTED=508,C.NOT_EXTENDED=510,C.NETWORK_AUTHENTICATION_REQUIRED=511,C.NETWORK_CONNECTION_TIMEOUT_ERROR=599;class F{constructor(t,e,s,r){this.req=t,this.res=e,this.next=s,this.controller=r}cache(t){const r=[];t.private?r.push("private"):t.public&&r.push("public"),t.noStore&&(t.noCache=!0,r.push("no-store")),t.noCache&&(t.maxAge=0,delete t.sMaxAge,r.push("no-cache")),t.noTransform&&r.push("no-transform"),t.proxyRevalidate&&r.push("proxy-revalidate"),t.mustRevalidate?r.push("must-revalidate"):t.noCache||(e(t.staleIfError)&&r.push(`stale-if-error=${t.staleIfError}`),e(t.staleWhileRevalidate)&&r.push(`stale-while-revalidate=${t.staleWhileRevalidate}`)),e(t.maxAge)&&r.push(`max-age=${t.maxAge}`),e(t.sMaxAge)&&r.push(`s-maxage=${t.sMaxAge}`),r.length&&(this.res.setHeader("Cache-Control",r.join(",")),t.noCache&&s({"Surrogate-Control":"no-store",Pragma:"no-cache",ETag:"false",Expires:"0"},(t,e)=>this.res.setHeader(e,t)))}close(t){this.res.headersSent||this.res.json(t||this.storage)}destroy(t){var e;t&&this.error(t.message),null===(e=this.res.socket)||void 0===e||e.destroy(t)}error(t){this.send(C.INTERNAL_SERVER_ERROR,{message:t})}file(t){this.res.headersSent||(this.status(C.OK),this.res.sendFile(g(t)))}getIp(){return y(this.req)||"0.0.0.0"}json(t){this.send(C.OK,t)}notFound(t){this.send(C.NOT_FOUND,{message:t})}prepare(t,e){this.res.headersSent||(this.status(t),this.storage=e)}send(t,e){this.res.headersSent||(this.status(t),this.res.json(e))}status(t){return t&&this.res.status(t),this.res.statusCode}success(t){this.send(C.OK,{message:t})}unauthorized(t){this.send(C.UNAUTHORIZED,{message:t})}validation(t){this.send(C.BAD_REQUEST,{message:t})}}class M{static extends(t){return U(M.EXTENDS,t,[])}static middleware(t){return U(M.MIDDLEWARE,t,[])}static parameters(t){return U(M.PARAMETERS,t,[])}static path(t,e){return U(M.PATH,t,e)}static routers(t){return U(M.ROUTERS,t,[])}}M.EXTENDS=Symbol("EXTENDS"),M.MIDDLEWARE=Symbol("MIDDLEWARE"),M.PARAMETERS=Symbol("PARAMETERS"),M.PATH=Symbol("PATH"),M.ROUTERS=Symbol("ROUTERS");class b extends r{get controllers(){return this._controllers}get instance(){return this._app}get router(){return this._router}get server(){return this._server}constructor(t,e){var s;super(),this._app=m(),this._options={},this._default={cross:!1,hybrid:!1,path:"/",port:3e3,session:{secret:"yoursecret",resave:!0,saveUninitialized:!1,cookie:{maxAge:864e5}}},this._base=R(),this._router=R(),this._controllers=[],this._controllers.push(...t),this._options=i({},this._default,null!=e?e:{}),this._app.use(N(this._options.json)),this._app.disable("x-powered-by"),this._app.use(A({extended:!0})),this._options.cross&&this._app.use(O(o(this._options.cross)?this._options.cross:{}));const r=this._options.cookie;this._app.use(c()),this._app.use(T(null==r?void 0:r.secret,null==r?void 0:r.options)),this._app.use(v(this._options.session)),this.init(),this._app.use(this._router);const a=(null===(s=this._options.path)||void 0===s?void 0:s.length)?this._options.path:"/";if(this._app.use(a,this._base),this._app.all(a+"/*path",(t,e)=>{this._options.redirect?e.redirect(this._options.redirect):(e.status(C.NOT_FOUND),e.json({message:"INVALID API"}))}),this._options.public){const t=g(this._options.public);I(t)&&this._app.use(m.static(t)),this._app.get("*path",(e,s)=>{I(t)?s.sendFile(t+"/index.html"):this._options.notfound?s.redirect(this._options.notfound):(s.status(C.NOT_FOUND),s.json({message:'FILE "index.html" NOT FOUND'}))})}else this._app.all("*path",(t,e)=>{this._options.redirect?e.redirect(this._options.redirect):(e.status(C.NOT_FOUND),e.json({message:"INVALID API"}))});t.forEach(t=>{const e=R(),s=this._middlewares(t),r=M.parameters(t);this._extends(t).forEach(t=>{s.push(...this._middlewares(t)),r.push(...M.parameters(t))}),M.routers(t).forEach(i=>{const a=i.propertyKey.toString();if(n(t[a])){if(!n(e[i.method]))return this._notFound(i.method);const p=this._handles(t,a,s,r);return e[i.method](i.path,...p,(e,s,i)=>P(this,void 0,void 0,function*(){const n=new F(e,s,i,t),p=this._args(n,this._indexes(a,r)),l=yield t[a](...p);n.close(h(l)||o(l)?l:void 0)}))}this._notFound(`${t.name}.${a}`)}),this._extends(t).forEach(i=>{M.routers(i).forEach(i=>{const a=i.propertyKey.toString();if(n(t[a])){if(!n(e[i.method]))return this._notFound(i.method);const p=this._handles(t,a,s,r);return e[i.method](i.path,...p,(e,s,i)=>P(this,void 0,void 0,function*(){const n=new F(e,s,i,t),p=this._args(n,this._indexes(a,r)),l=yield t[a](...p);n.close(h(l)||o(l)?l:void 0)}))}this._notFound(`${t.constructor.name}.${a}`)})}),this._base.use(M.path(t,"/"),e)})}init(){}error(e,s){t.error(e)}log(e,s){t.info(e)}_args(t,e,s){const r=[],i={ctx:t,key:"",app:this,argument:s};return e.forEach(t=>{r[t.parameterIndex]=t.callback(Object.assign(Object.assign({},i),{key:t.key}))}),r}_handles(t,e,s,r){return s.filter(t=>t.propertyKey==e).map(e=>{if(e.callback!=a){const s=this._indexes(e.method,r);return(r,i,a)=>P(this,void 0,void 0,function*(){const p=new F(r,i,a,t),l=n(e.argument)?e.argument(p):e.argument,E=yield e.callback.call(t,...this._args(p,s,l));(h(E)||o(E))&&p.close(E)})}this._notFound(e.method)}).filter(n)}_extends(t){return M.extends(t).reduce((t,e)=>(t.push(e,...this._extends(e)),t),[]).filter((t,e,s)=>s.indexOf(t)===e)}_indexes(t,e){return e.filter(e=>e.propertyKey==t)}_middlewares(t){return[...M.middleware(t)].reverse()}_notFound(t){this.error(new Error(`Router "${t}" not found`),"express")}_port(t){return`Server listening on port ${t}`}listen(){return P(this,void 0,void 0,function*(){if(this._options.cert&&this._options.key||(this._server=f.createServer(this._app),this._server.listen(this._options.port,()=>this.log(this._port(this._options.port),"express"))),!this._server){const t=f.createServer((t,e)=>{const s=80==this._options.port?":80":"";e.writeHead(C.MOVED_PERMANENTLY,{Location:`https://${t.headers.host}${s}${t.url}`}),e.end()}),e=S.createServer({key:this._options.key,cert:this._options.cert},this._app);if(this._options.hybrid){new D(s=>{s.once("data",r=>{s.pause(),s.unshift(r),(22===r[0]?e:t).emit("connection",s),process.nextTick(()=>s.resume())})}).listen(this._options.port,()=>this.log(this._port(this._options.port),"express")),this._server=e}this._server||(443==this._options.port&&t.listen(80,()=>this.log(this._port(80),"express")),e.listen(this._options.port,()=>this.log(this._port(this._options.port),"express")),this._server=e)}})}}const k=t=>e=>{M.path(e,(null==t?void 0:t.length)?t:"/")},w=t=>e=>{M.extends(e).push(t)};var H;!function(t){t.ALL="all",t.GET="get",t.POST="post",t.PUT="put",t.HEAD="head",t.DELETE="delete",t.OPTIONS="options",t.PATCH="patch"}(H||(H={}));const G=t=>e=>(s,r)=>{M.routers(s).push({method:t,path:(null==e?void 0:e.length)?e:"/",propertyKey:r})},K=G(H.ALL),Q=G(H.DELETE),Y=G(H.GET),$=G(H.HEAD),j=G(H.OPTIONS),q=G(H.PATCH),V=G(H.POST),W=G(H.PUT),B=t=>e=>(s,r,i)=>{M.parameters(s).push({callback:t,key:e,propertyKey:r,parameterIndex:i})},X=B(({app:t})=>t),z=B(({argument:t})=>t),Z=(t,e)=>p(e)?t:t[e],J=B(({ctx:t,key:e})=>{var s,r;return Z(null!==(r=null===(s=t.req)||void 0===s?void 0:s.body)&&void 0!==r?r:{},e)}),tt=B(({ctx:t,key:e})=>{var s,r;return Z(null!==(r=null===(s=t.req)||void 0===s?void 0:s.cookies)&&void 0!==r?r:{},e)}),et=B(({ctx:t})=>t),st=B(({ctx:t})=>{var e,s;return l(null!==(s=null===(e=t.req)||void 0===e?void 0:e.files)&&void 0!==s?s:[])}),rt=B(({ctx:t,key:e})=>{var s,r;return Z(null!==(r=null===(s=t.req)||void 0===s?void 0:s.headers)&&void 0!==r?r:{},e)}),it=B(({ctx:t,key:e})=>{var s,r;return Z(null!==(r=null===(s=t.req)||void 0===s?void 0:s.params)&&void 0!==r?r:{},e)}),ot=B(({ctx:t,key:e})=>{var s,r,i;return String(null!==(i=Z(null!==(r=null===(s=t.req)||void 0===s?void 0:s.query)&&void 0!==r?r:{},e))&&void 0!==i?i:"")}),nt=B(({ctx:t})=>{var e;return null===(e=t.req)||void 0===e?void 0:e.session}),at=(t,e)=>(s,r)=>{const i=E();et()(s,i,0),M.middleware(s).push({method:i,argument:e,propertyKey:r,callback:t})},ht=t=>(e,s,r)=>{at(e=>{e.cache(Object.assign({},t)),e.next()})(e,s,r)},pt=(t,e)=>(s,r)=>{let i=a;if(u(r)){const e=s;n(e[t])&&(i=e[t])}M.middleware(s).push({method:t,argument:e,propertyKey:r,callback:i})};class lt{static file(t,e){const s=d()+"."+e;return I(x(t,s))?lt.file(t,e):s}static middleware(t,e){const s=lt._cache(e);s.upload||(s.upload=lt.multer(e)),s.upload(t.req,t.res,e=>{if(e)return t.destroy(e);t.next()})}static multer(t){const e=(null==t?void 0:t.path)||"./",s=L.diskStorage({destination:(t,s,r)=>r(null,e),filename:(t,s,r)=>P(this,void 0,void 0,function*(){return r(null,lt.file(e,s.originalname.split(".").pop()||"bin"))})}),r=(null==t?void 0:t.types)||[];return L({storage:s,fileFilter(t,e,s){return P(this,void 0,void 0,function*(){if(r.length){const t=e.originalname.split(".").pop()||"bin";return-1!=r.indexOf(e.mimetype)||-1!=r.indexOf(t)?s(null,!0):s(new Error("File not allowed"))}return s(null,!0)})},limits:{fileSize:1e6*((null==t?void 0:t.size)||5)}}).array((null==t?void 0:t.field)||"field",(null==t?void 0:t.count)||1)}}lt._cache=_();export{K as All,X as App,b as Application,z as Argument,J as Body,ht as Cache,F as Context,k as Controller,tt as Cookies,et as Ctx,Q as Delete,w as Extends,st as Files,Y as Get,$ as Head,rt as Headers,M as Metadata,H as Methods,pt as Middleware,j as Options,it as Params,q as Patch,V as Post,W as Put,ot as Query,nt as Session,C as Status,lt as Upload,at as Use,G as methodFactory,B as parameterFactory};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andrewcaires/express",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "description": "Decorators for express",
   "type": "module",
   "main": "./dist/index.cjs.js",
@@ -36,31 +36,35 @@
   },
   "homepage": "https://github.com/andrewcaires/npm/tree/main/api#readme",
   "dependencies": {
-    "@andrewcaires/node": "^1.2.5",
-    "@andrewcaires/utils.js": "^0.4.9",
-    "compression": "^1.8.0",
+    "@andrewcaires/decorator": "^1.0.2",
+    "@andrewcaires/node": "^1.2.9",
+    "@andrewcaires/utils.js": "^0.4.20",
+    "compression": "^1.8.1",
     "cookie-parser": "^1.4.7",
     "cors": "^2.8.5",
-    "express": "^5.1.0",
-    "express-session": "^1.18.1",
-    "multer": "^2.0.1",
+    "express": "^5.2.1",
+    "express-session": "^1.18.2",
+    "multer": "^2.0.2",
     "request-ip": "^3.3.0"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^28.0.6",
+    "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-terser": "^0.4.4",
-    "@rollup/plugin-typescript": "^12.1.4",
+    "@rollup/plugin-typescript": "^12.3.0",
+    "@rollup/rollup-darwin-arm64": "^4.55.1",
     "@types/compression": "^1.8.1",
-    "@types/cookie-parser": "^1.4.9",
+    "@types/cookie-parser": "^1.4.10",
     "@types/cors": "^2.8.19",
-    "@types/express": "^5.0.3",
+    "@types/express": "^5.0.6",
     "@types/express-session": "^1.18.2",
     "@types/multer": "^2.0.0",
-    "@types/node": "^24.0.10",
+    "@types/node": "^25.0.7",
     "@types/request-ip": "^0.0.41",
-    "eslint": "^9.30.1",
-    "rollup-plugin-dts": "^6.2.1",
+    "@types/swagger-ui-express": "^4.1.8",
+    "eslint": "^9.39.2",
+    "rollup-plugin-dts": "^6.3.0",
+    "swagger-ui-express": "^5.0.1",
     "tslib": "^2.8.1",
-    "typescript-eslint": "^8.35.1"
+    "typescript-eslint": "^8.53.0"
   }
 }