@andrewcaires/express 1.2.1 → 1.2.3

package/dist/index.cjs.js

@@ -1,7 +1,7 @@
 /*!
- * @andrewcaires/express v1.2.1
+ * @andrewcaires/express v1.2.3
  * Decorators for express 
- * (c) 2024 Andrew Caires
+ * (c) 2025 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"),E=require("net"),u=require("path"),d=require("request-ip"),_=require("multer");function c(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 l=c(p),T=c(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 R{}R.CONTINUE=100,R.SWITCHING_PROTOCOLS=101,R.PROCESSING=102,R.OK=200,R.CREATED=201,R.ACCEPTED=202,R.NON_AUTHORITATIVE_INFORMATION=203,R.NO_CONTENT=204,R.RESET_CONTENT=205,R.PARTIAL_CONTENT=206,R.MULTI_STATUS=207,R.ALREADY_REPORTED=208,R.IM_USED=226,R.MULTIPLE_CHOICES=300,R.MOVED_PERMANENTLY=301,R.FOUND=302,R.SEE_OTHER=303,R.NOT_MODIFIED=304,R.USE_PROXY=305,R.TEMPORARY_REDIRECT=307,R.PERMANENT_REDIRECT=308,R.BAD_REQUEST=400,R.UNAUTHORIZED=401,R.PAYMENT_REQUIRED=402,R.FORBIDDEN=403,R.NOT_FOUND=404,R.METHOD_NOT_ALLOWED=405,R.NOT_ACCEPTABLE=406,R.PROXY_AUTHENTICATION_REQUIRED=407,R.REQUEST_TIMEOUT=408,R.CONFLICT=409,R.GONE=410,R.LENGTH_REQUIRED=411,R.PRECONDITION_FAILED=412,R.PAYLOAD_TOO_LARGE=413,R.REQUEST_URI_TOO_LONG=414,R.UNSUPPORTED_MEDIA_TYPE=415,R.REQUESTED_RANGE_NOT_SATISFIABLE=416,R.EXPECTATION_FAILED=417,R.IM_A_TEAPOT=418,R.MISDIRECTED_REQUEST=421,R.UNPROCESSABLE_ENTITY=422,R.LOCKED=423,R.FAILED_DEPENDENCY=424,R.UPGRADE_REQUIRED=426,R.PRECONDITION_REQUIRED=428,R.TOO_MANY_REQUESTS=429,R.REQUEST_HEADER_FIELDS_TOO_LARGE=431,R.CONNECTION_CLOSED_WITHOUT_RESPONSE=444,R.UNAVAILABLE_FOR_LEGAL_REASONS=451,R.CLIENT_CLOSED_REQUEST=499,R.INTERNAL_SERVER_ERROR=500,R.NOT_IMPLEMENTED=501,R.BAD_GATEWAY=502,R.SERVICE_UNAVAILABLE=503,R.GATEWAY_TIMEOUT=504,R.HTTP_VERSION_NOT_SUPPORTED=505,R.VARIANT_ALSO_NEGOCIATES=506,R.INSUFFICIENT_STORAGE=507,R.LOOP_DETECTED=508,R.NOT_EXTENDED=510,R.NETWORK_AUTHENTICATION_REQUIRED=511,R.NETWORK_CONNECTION_TIMEOUT_ERROR=599;class N{constructor(e,t,s,r){this.req=e,this.res=t,this.next=s,this.controller=r}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(R.INTERNAL_SERVER_ERROR,{message:e})}file(e){this.res.headersSent||(this.status(R.OK),this.res.sendFile(u.resolve(e)))}ip(){return d.getClientIp(this.req)||"0.0.0.0"}json(e){this.send(R.OK,e)}notFound(e){this.send(R.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(R.OK,{message:e})}unauthorized(e){this.send(R.UNAUTHORIZED,{message:e})}validation(e){this.send(R.BAD_REQUEST,{message:e})}}class A{static extends(t){return e.Metadata(A.EXTENDS,t,[])}static middleware(t){return e.Metadata(A.MIDDLEWARE,t,[])}static parameters(t){return e.Metadata(A.PARAMETERS,t,[])}static path(t,s){return e.Metadata(A.PATH,t,s)}static routers(t){return e.Metadata(A.ROUTERS,t,[])}}A.EXTENDS=Symbol(),A.MIDDLEWARE=Symbol(),A.PARAMETERS=Symbol(),A.PATH=Symbol(),A.ROUTERS=Symbol();class x extends t.EventEmitter{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._router=i.Router(),this._controllers=i.Router(),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 E=this._options.cookie;this._app.use(s()),this._app.use(r(null==E?void 0:E.secret,null==E?void 0:E.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._controllers),this._app.all(d+"/*",((e,t)=>{this._options.redirect?t.redirect(this._options.redirect):(t.status(R.NOT_FOUND),t.json({message:"Invalid API"}))})),this._options.public){const e=u.resolve(this._options.public);a.existsSync(e)&&this._app.use(i.static(e)),this._app.get("*",((t,s)=>{a.existsSync(e)?s.sendFile(e+"/index.html"):this._options.notfound?s.redirect(this._options.notfound):(s.status(R.NOT_FOUND),s.json({message:'File "index.html" not found'}))}))}else this._app.all("*",((e,t)=>{this._options.redirect?t.redirect(this._options.redirect):(t.status(R.NOT_FOUND),t.json({message:"Invalid API"}))}));e.forEach((e=>{const s=i.Router(),r=this._middlewares(e),o=A.parameters(e);this._extends(e).forEach((e=>{r.push(...this._middlewares(e)),o.push(...A.parameters(e))})),A.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 N(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=>{A.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 N(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._controllers.use(A.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(t.isFunction(e[s.method])){const r=this._indexes(s.method,o);return(o,i,n)=>O(this,void 0,void 0,(function*(){const a=new N(o,i,n,e),p=t.isFunction(s.argument)?s.argument(a):s.argument,h=yield e[s.method](...this._args(a,r,p));(t.isArray(h)||t.isObject(h))&&a.close(h)}))}this._notFound(s.method)})).filter(t.isFunction)}_extends(e){return A.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[...A.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=l.createServer(this._app),this._server.listen(this._options.port,(()=>this.log(this._port(this._options.port),"express")))),!this._server){const e=l.createServer(((e,t)=>{const s=80==this._options.port?":80":"";t.writeHead(R.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 E.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 I;exports.Methods=void 0,(I=exports.Methods||(exports.Methods={})).ALL="all",I.GET="get",I.POST="post",I.PUT="put",I.HEAD="head",I.DELETE="delete",I.OPTIONS="options",I.PATCH="patch";const S=e=>t=>(s,r)=>{A.routers(s).push({method:e,path:(null==t?void 0:t.length)?t:"/",propertyKey:r})},m=S(exports.Methods.ALL),D=S(exports.Methods.DELETE),f=S(exports.Methods.GET),y=S(exports.Methods.HEAD),v=S(exports.Methods.OPTIONS),g=S(exports.Methods.PATCH),U=S(exports.Methods.POST),P=S(exports.Methods.PUT),L=e=>t=>(s,r,o)=>{A.parameters(s).push({callback:e,key:t,propertyKey:r,parameterIndex:o})},C=L((({app:e})=>e)),M=L((({argument:e})=>e)),F=(e,s)=>t.isUndefined(s)?e:e[s],b=L((({ctx:e,key:t})=>F(e.req.body,t))),q=L((({ctx:e,key:t})=>F(e.req.cookies,t))),j=L((({ctx:e})=>e)),k=L((({ctx:e})=>t.toArray(e.req.files))),w=L((({ctx:e,key:t})=>F(e.req.headers,t))),H=L((({ctx:e,key:t})=>F(e.req.params,t))),G=L((({ctx:e,key:t})=>F(e.req.query,t))),Q=L((({ctx:e})=>e.req.session));class K{static file(e,s){const r=t.uuidv4()+"."+s;return a.existsSync(u.join(e,r))?K.file(e,s):r}static middleware(e,t){const s=K._cache(t);s.upload||(s.upload=K.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=_.diskStorage({destination:(e,s,r)=>r(null,t),filename:(e,s,r)=>O(this,void 0,void 0,(function*(){return r(null,K.file(t,s.originalname.split(".").pop()||"bin"))}))}),r=(null==e?void 0:e.types)||[];return _({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)}}K._cache=t.cache(),exports.All=m,exports.App=C,exports.Application=x,exports.Argument=M,exports.Body=b,exports.Context=N,exports.Controller=e=>t=>{A.path(t,(null==e?void 0:e.length)?e:"/")},exports.Cookies=q,exports.Ctx=j,exports.Delete=D,exports.Extends=e=>t=>{A.extends(t).push(e)},exports.Files=k,exports.Get=f,exports.Head=y,exports.Headers=w,exports.Metadata=A,exports.Middleware=(e,t)=>(s,r)=>{A.middleware(s).push({method:e,argument:t,propertyKey:r})},exports.Options=v,exports.Params=H,exports.Patch=g,exports.Post=U,exports.Put=P,exports.Query=G,exports.Session=Q,exports.Status=R,exports.Upload=K,exports.methodFactory=S,exports.parameterFactory=L;
+"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"),d=require("multer");function l(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 _=l(p),T=l(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 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._router=i.Router(),this._controllers=i.Router(),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._controllers),this._app.all(E+"/*",((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("*",((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("*",((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._controllers.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=d.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 d({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;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 /*!
- * @andrewcaires/express v1.2.1
+ * @andrewcaires/express v1.2.3
  * Decorators for express 
- * (c) 2024 Andrew Caires
+ * (c) 2025 Andrew Caires
  * @license: MIT
  */
 import { TypeObjectAny, TypeCallbackFunction, EventEmitter } from '@andrewcaires/utils.js';
@@ -20,6 +20,7 @@ declare class Context<T = any> {
     readonly controller: T;
     private storage?;
     constructor(req: Request, res: Response, next: NextFunction, controller: T);
+    cache(options: ICache): void;
     close(value?: TypeObjectAny): void;
     destroy(error?: Error): void;
     error(message: string): void;
@@ -42,6 +43,20 @@ interface IArgs {
     argument: any;
 }
 
+interface ICache {
+    maxAge?: number;
+    sMaxAge?: number;
+    noCache?: boolean;
+    noStore?: boolean;
+    noTransform?: boolean;
+    mustRevalidate?: boolean;
+    proxyRevalidate?: boolean;
+    staleIfError?: number;
+    staleWhileRevalidate?: number;
+    private?: boolean;
+    public?: boolean;
+}
+
 interface ICookie {
     secret?: string | Array<string>;
     options?: CookieParseOptions;
@@ -58,10 +73,13 @@ interface IFile {
     size: number;
 }
 
+type IHandler = (ctx: Context) => any;
+
 interface IMiddlewares {
     method: string;
     argument: any;
     propertyKey: string | symbol;
+    callback: TypeCallbackFunction;
 }
 
 interface IOptions {
@@ -121,6 +139,11 @@ interface IUpload {
     types?: Array<string>;
 }
 
+interface IUse {
+    middleware: IHandler;
+    propertyKey: string | symbol;
+}
+
 declare class Application extends EventEmitter {
     private readonly _app;
     private _server?;
@@ -151,6 +174,8 @@ 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;
@@ -169,6 +194,8 @@ declare const Post: (path?: string) => MethodDecorator;
 
 declare const Put: (path?: string) => MethodDecorator;
 
+declare const Use: (callback: IHandler, argument?: any) => MethodDecorator;
+
 declare const App: (key?: string) => ParameterDecorator;
 
 declare const Argument: (key?: string) => ParameterDecorator;
@@ -277,4 +304,4 @@ declare class Upload {
     private static multer;
 }
 
-export { All, App, Application, Argument, Body, Context, Controller, Cookies, Ctx, Delete, Extends, Files, Get, Head, Headers, type IArgs, type ICookie, type IFile, type IMiddlewares, type IOptions, type IParameter, type IRouter, type IStore, type IUpload, Metadata, Methods, Middleware, Options, Params, Patch, Post, Put, Query, Session, Status, Upload, methodFactory, parameterFactory };
+export { All, App, Application, Argument, Body, Cache, Context, Controller, Cookies, Ctx, Delete, Extends, Files, Get, Head, Headers, type IArgs, type ICache, type ICookie, type IFile, type IHandler, type IMiddlewares, type IOptions, type IParameter, type IRouter, type IStore, type IUpload, type IUse, Metadata, Methods, Middleware, Options, Params, Patch, Post, Put, Query, Session, Status, Upload, Use, methodFactory, parameterFactory };

package/dist/index.esm.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andrewcaires/express",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "Decorators for express",
   "type": "module",
   "main": "./dist/index.cjs.js",
@@ -36,31 +36,31 @@
   },
   "homepage": "https://github.com/andrewcaires/npm/tree/main/api#readme",
   "dependencies": {
-    "@andrewcaires/node": "^1.2.0",
-    "@andrewcaires/utils.js": "^0.4.0",
-    "compression": "^1.7.4",
+    "@andrewcaires/node": "^1.2.4",
+    "@andrewcaires/utils.js": "^0.4.3",
+    "compression": "^1.7.5",
     "cookie-parser": "^1.4.7",
     "cors": "^2.8.5",
-    "express": "^4.21.1",
+    "express": "^4.21.2",
     "express-session": "^1.18.1",
     "multer": "^1.4.5-lts.1",
     "request-ip": "^3.3.0"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^28.0.0",
+    "@rollup/plugin-commonjs": "^28.0.2",
     "@rollup/plugin-terser": "^0.4.4",
-    "@rollup/plugin-typescript": "^12.1.0",
+    "@rollup/plugin-typescript": "^12.1.2",
     "@types/compression": "^1.7.5",
-    "@types/cookie-parser": "^1.4.7",
+    "@types/cookie-parser": "^1.4.8",
     "@types/cors": "^2.8.17",
     "@types/express": "^5.0.0",
-    "@types/express-session": "^1.18.0",
+    "@types/express-session": "^1.18.1",
     "@types/multer": "^1.4.12",
-    "@types/node": "^22.7.5",
+    "@types/node": "^22.10.9",
     "@types/request-ip": "^0.0.41",
-    "eslint": "^9.12.0",
+    "eslint": "^9.18.0",
     "rollup-plugin-dts": "^6.1.1",
-    "tslib": "^2.7.0",
-    "typescript-eslint": "^8.9.0"
+    "tslib": "^2.8.1",
+    "typescript-eslint": "^8.21.0"
   }
 }