@autofleet/node-common 4.0.0 → 4.0.2

package/dist/index.cjs

@@ -1,2 +1,2 @@
-'use strict';var express=require('express'),i=require('@autofleet/logger');function _interopDefault(e){return e&&e.__esModule?e:{default:e}}var i__default=/*#__PURE__*/_interopDefault(i);var R=["all","get","post","put","delete","patch","options","head"],f=(n,s)=>async(r,o,e)=>{try{await s(r,o,e);}catch(a){let t=a;if(n.error(t.message),t.statusCode&&t.statusCode<500){o.status(400).json({error:t.message,status:"ERROR"});return}e(t);}},u=({logger:n=i__default.default(),...s})=>{let r=express.Router({mergeParams:true,...s});return R.forEach(e=>{let a=r[e].bind(r),t=(...p)=>a(...p.map(o));r[e]=t;}),r;function o(e){return Array.isArray(e)?e.map(o):typeof e=="function"?f(n,e):e}};var m=Object.freeze({ok:"OK",error:"ERROR",fail:"FAIL"});var x=u;exports.AfRouter=u;exports.Router=x;exports.consts=m;//# sourceMappingURL=index.cjs.map
+'use strict';var express=require('express');var i=["all","get","post","put","delete","patch","options","head"],R=(n,s)=>async(r,o,e)=>{try{await s(r,o,e);}catch(a){let t=a;if(n.error(t.message),t.statusCode&&t.statusCode<500){o.status(400).json({error:t.message,status:"ERROR"});return}e(t);}},u=({logger:n,...s})=>{let r=express.Router({mergeParams:true,...s});return i.forEach(e=>{let a=r[e].bind(r),t=(...p)=>a(...p.map(o));r[e]=t;}),r;function o(e){return Array.isArray(e)?e.map(o):typeof e=="function"?R(n,e):e}};var f=Object.freeze({ok:"OK",error:"ERROR",fail:"FAIL"});var l=u;exports.AfRouter=u;exports.Router=l;exports.consts=f;//# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/router/index.ts","../src/consts/index.ts","../src/index.ts"],"names":["METHODS","AfEntryPoint","logger","func","req","res","next","err","e","AfRouter","Logger","options","myRouter","Router","method","internalMethod","newMethodHandler","args","argMapper","consts"],"mappings":"2LAKaA,IAAAA,CAAAA,CAAU,CACrB,KAAA,CACA,MACA,MACA,CAAA,KAAA,CACA,QACA,CAAA,OAAA,CACA,UACA,MACF,CAAA,CAEMC,CAAe,CAAA,CAACC,EAA+BC,CAAmG,GAAA,MAAOC,CAAKC,CAAAA,CAAAA,CAAKC,IAAS,CAChL,GAAI,CACF,MAAMH,EAAKC,CAAKC,CAAAA,CAAAA,CAAKC,CAAI,EAC3B,CAAA,MAASC,EAAK,CACZ,IAAMC,CAAID,CAAAA,CAAAA,CAEV,GADAL,CAAO,CAAA,KAAA,CAAMM,CAAE,CAAA,OAAO,EAClBA,CAAE,CAAA,UAAA,EAAcA,CAAE,CAAA,UAAA,CAAa,IAAK,CACtCH,CAAAA,CAAI,MAAO,CAAA,GAAG,EAAE,IAAK,CAAA,CAAE,KAAOG,CAAAA,CAAAA,CAAE,QAAS,MAAQ,CAAA,OAAQ,CAAC,CAAA,CAC1D,MACF,CACAF,CAAAA,CAAKE,CAAC,EACR,CACF,CAGaC,CAAAA,CAAAA,CAAW,CAAC,CAAE,MAAA,CAAAP,EAASQ,kBAAO,EAAA,CAAG,GAAGC,CAAQ,IAAiE,CACxH,IAAMC,CAAWC,CAAAA,cAAAA,CAAO,CAAE,WAAa,CAAA,IAAA,CAAM,GAAGF,CAAQ,CAAC,CACzD,CAAA,OAAAX,CAAQ,CAAA,OAAA,CAASc,GAAW,CAC1B,IAAMC,CAAiBH,CAAAA,CAAAA,CAASE,CAAM,CAAE,CAAA,IAAA,CAAKF,CAAQ,CAAA,CAC/CI,EAA2C,CAAIC,GAAAA,CAAAA,GAAyBF,CAAe,CAAA,GAAGE,EAAK,GAAIC,CAAAA,CAAS,CAAa,CAC/HN,CAAAA,CAAAA,CAASE,CAAM,CAAIE,CAAAA,EACrB,CAAC,CAAA,CACMJ,EAEP,SAASM,CAAAA,CAAUD,CAAwB,CAAA,CACzC,OAAI,KAAM,CAAA,OAAA,CAAQA,CAAI,CAAA,CAAUA,EAAK,GAAIC,CAAAA,CAAS,EAC3C,OAAOD,CAAAA,EAAS,WAAahB,CAAaC,CAAAA,CAAAA,CAAQe,CAAe,CAAA,CAAIA,CAC9E,CACF,EC5CaE,IAAAA,CAAAA,CAAS,OAAO,MAAO,CAAA,CAClC,EAAI,CAAA,IAAA,CACJ,MAAO,OACP,CAAA,IAAA,CAAM,MACR,CAAC,MCCYN,CAASJ,CAAAA","file":"index.cjs","sourcesContent":["import {\n  Router, type Request, type Response, type NextFunction, type Handler, type RouterOptions, type IRouterMatcher,\n} from 'express';\nimport Logger, { type LoggerInstanceManager } from '@autofleet/logger';\n\nexport const METHODS = [\n  'all',\n  'get',\n  'post',\n  'put',\n  'delete',\n  'patch',\n  'options',\n  'head',\n] as const;\n\nconst AfEntryPoint = (logger: LoggerInstanceManager, func: (req: Request, res: Response, nextFn: NextFunction) => void | PromiseLike<void>): Handler => async (req, res, next) => {\n  try {\n    await func(req, res, next);\n  } catch (err) {\n    const e = err as Error & { statusCode?: number };\n    logger.error(e.message);\n    if (e.statusCode && e.statusCode < 500) {\n      res.status(400).json({ error: e.message, status: 'ERROR' });\n      return;\n    }\n    next(e);\n  }\n};\n\n/** @returns a monkey-patched express router that will handle async routes (and force a 400 status for codes <500) */\nexport const AfRouter = ({ logger = Logger(), ...options }: RouterOptions & { logger: LoggerInstanceManager }): Router => {\n  const myRouter = Router({ mergeParams: true, ...options });\n  METHODS.forEach((method) => {\n    const internalMethod = myRouter[method].bind(myRouter);\n    const newMethodHandler: IRouterMatcher<Router> = (...args: [...unknown[]]) => internalMethod(...args.map(argMapper) as [string]);\n    myRouter[method] = newMethodHandler;\n  });\n  return myRouter;\n\n  function argMapper(args: unknown): unknown {\n    if (Array.isArray(args)) return args.map(argMapper);\n    return typeof args === 'function' ? AfEntryPoint(logger, args as Handler) : args;\n  }\n};\n","export const consts = Object.freeze({\n  ok: 'OK',\n  error: 'ERROR',\n  fail: 'FAIL',\n});\n","import { AfRouter } from './router';\n\nexport { AfRouter } from './router';\nexport { consts } from './consts';\n\nexport const Router = AfRouter;\n"]}
+{"version":3,"sources":["../src/router/index.ts","../src/consts/index.ts","../src/index.ts"],"names":["METHODS","AfEntryPoint","logger","func","req","res","next","err","e","AfRouter","options","myRouter","Router","method","internalMethod","newMethodHandler","args","argMapper","consts"],"mappings":"4CAKaA,IAAAA,CAAAA,CAAU,CACrB,KACA,CAAA,KAAA,CACA,MACA,CAAA,KAAA,CACA,SACA,OACA,CAAA,SAAA,CACA,MACF,CAAA,CAEMC,EAAe,CAACC,CAAAA,CAA+BC,CAAmG,GAAA,MAAOC,EAAKC,CAAKC,CAAAA,CAAAA,GAAS,CAChL,GAAI,CACF,MAAMH,CAAAA,CAAKC,CAAKC,CAAAA,CAAAA,CAAKC,CAAI,EAC3B,CAAA,MAASC,CAAK,CAAA,CACZ,IAAMC,CAAID,CAAAA,CAAAA,CAEV,GADAL,CAAAA,CAAO,MAAMM,CAAE,CAAA,OAAO,CAClBA,CAAAA,CAAAA,CAAE,YAAcA,CAAE,CAAA,UAAA,CAAa,GAAK,CAAA,CACtCH,EAAI,MAAO,CAAA,GAAG,CAAE,CAAA,IAAA,CAAK,CAAE,KAAOG,CAAAA,CAAAA,CAAE,OAAS,CAAA,MAAA,CAAQ,OAAQ,CAAC,CAAA,CAC1D,MACF,CACAF,EAAKE,CAAC,EACR,CACF,CAAA,CAGaC,EAAW,CAAC,CAAE,MAAAP,CAAAA,CAAAA,CAAQ,GAAGQ,CAAQ,CAAA,GAAiE,CAC7G,IAAMC,EAAWC,cAAO,CAAA,CAAE,WAAa,CAAA,IAAA,CAAM,GAAGF,CAAQ,CAAC,CACzD,CAAA,OAAAV,EAAQ,OAASa,CAAAA,CAAAA,EAAW,CAC1B,IAAMC,EAAiBH,CAASE,CAAAA,CAAM,CAAE,CAAA,IAAA,CAAKF,CAAQ,CAC/CI,CAAAA,CAAAA,CAA2C,CAAIC,GAAAA,CAAAA,GAAyBF,EAAe,GAAGE,CAAAA,CAAK,GAAIC,CAAAA,CAAS,CAAa,CAC/HN,CAAAA,CAAAA,CAASE,CAAM,CAAA,CAAIE,EACrB,CAAC,CAAA,CACMJ,CAEP,CAAA,SAASM,EAAUD,CAAwB,CAAA,CACzC,OAAI,KAAA,CAAM,QAAQA,CAAI,CAAA,CAAUA,CAAK,CAAA,GAAA,CAAIC,CAAS,CAC3C,CAAA,OAAOD,CAAS,EAAA,UAAA,CAAaf,EAAaC,CAAQc,CAAAA,CAAe,CAAIA,CAAAA,CAC9E,CACF,EC5CO,IAAME,CAAS,CAAA,MAAA,CAAO,OAAO,CAClC,EAAA,CAAI,IACJ,CAAA,KAAA,CAAO,QACP,IAAM,CAAA,MACR,CAAC,MCCYN,CAASH,CAAAA","file":"index.cjs","sourcesContent":["import {\n  Router, type Request, type Response, type NextFunction, type Handler, type RouterOptions, type IRouterMatcher,\n} from 'express';\nimport type { LoggerInstanceManager } from '@autofleet/logger';\n\nexport const METHODS = [\n  'all',\n  'get',\n  'post',\n  'put',\n  'delete',\n  'patch',\n  'options',\n  'head',\n] as const;\n\nconst AfEntryPoint = (logger: LoggerInstanceManager, func: (req: Request, res: Response, nextFn: NextFunction) => void | PromiseLike<void>): Handler => async (req, res, next) => {\n  try {\n    await func(req, res, next);\n  } catch (err) {\n    const e = err as Error & { statusCode?: number };\n    logger.error(e.message);\n    if (e.statusCode && e.statusCode < 500) {\n      res.status(400).json({ error: e.message, status: 'ERROR' });\n      return;\n    }\n    next(e);\n  }\n};\n\n/** @returns a monkey-patched express router that will handle async routes (and force a 400 status for codes <500) */\nexport const AfRouter = ({ logger, ...options }: RouterOptions & { logger: LoggerInstanceManager }): Router => {\n  const myRouter = Router({ mergeParams: true, ...options });\n  METHODS.forEach((method) => {\n    const internalMethod = myRouter[method].bind(myRouter);\n    const newMethodHandler: IRouterMatcher<Router> = (...args: [...unknown[]]) => internalMethod(...args.map(argMapper) as [string]);\n    myRouter[method] = newMethodHandler;\n  });\n  return myRouter;\n\n  function argMapper(args: unknown): unknown {\n    if (Array.isArray(args)) return args.map(argMapper);\n    return typeof args === 'function' ? AfEntryPoint(logger, args as Handler) : args;\n  }\n};\n","export const consts = Object.freeze({\n  ok: 'OK',\n  error: 'ERROR',\n  fail: 'FAIL',\n});\n","import { AfRouter } from './router';\n\nexport { AfRouter } from './router';\nexport { consts } from './consts';\n\nexport const Router = AfRouter;\n"]}

package/dist/index.js

@@ -1,2 +1,2 @@
-import {Router}from'express';import i from'@autofleet/logger';var R=["all","get","post","put","delete","patch","options","head"],f=(n,s)=>async(r,o,e)=>{try{await s(r,o,e);}catch(a){let t=a;if(n.error(t.message),t.statusCode&&t.statusCode<500){o.status(400).json({error:t.message,status:"ERROR"});return}e(t);}},u=({logger:n=i(),...s})=>{let r=Router({mergeParams:true,...s});return R.forEach(e=>{let a=r[e].bind(r),t=(...p)=>a(...p.map(o));r[e]=t;}),r;function o(e){return Array.isArray(e)?e.map(o):typeof e=="function"?f(n,e):e}};var m=Object.freeze({ok:"OK",error:"ERROR",fail:"FAIL"});var x=u;export{u as AfRouter,x as Router,m as consts};//# sourceMappingURL=index.js.map
+import {Router}from'express';var i=["all","get","post","put","delete","patch","options","head"],R=(n,s)=>async(r,o,e)=>{try{await s(r,o,e);}catch(a){let t=a;if(n.error(t.message),t.statusCode&&t.statusCode<500){o.status(400).json({error:t.message,status:"ERROR"});return}e(t);}},u=({logger:n,...s})=>{let r=Router({mergeParams:true,...s});return i.forEach(e=>{let a=r[e].bind(r),t=(...p)=>a(...p.map(o));r[e]=t;}),r;function o(e){return Array.isArray(e)?e.map(o):typeof e=="function"?R(n,e):e}};var f=Object.freeze({ok:"OK",error:"ERROR",fail:"FAIL"});var l=u;export{u as AfRouter,l as Router,f as consts};//# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/router/index.ts","../src/consts/index.ts","../src/index.ts"],"names":["METHODS","AfEntryPoint","logger","func","req","res","next","err","e","AfRouter","Logger","options","myRouter","Router","method","internalMethod","newMethodHandler","args","argMapper","consts"],"mappings":"8DAKaA,IAAAA,CAAAA,CAAU,CACrB,KAAA,CACA,MACA,MACA,CAAA,KAAA,CACA,QACA,CAAA,OAAA,CACA,UACA,MACF,CAAA,CAEMC,CAAe,CAAA,CAACC,EAA+BC,CAAmG,GAAA,MAAOC,CAAKC,CAAAA,CAAAA,CAAKC,IAAS,CAChL,GAAI,CACF,MAAMH,EAAKC,CAAKC,CAAAA,CAAAA,CAAKC,CAAI,EAC3B,CAAA,MAASC,EAAK,CACZ,IAAMC,CAAID,CAAAA,CAAAA,CAEV,GADAL,CAAO,CAAA,KAAA,CAAMM,CAAE,CAAA,OAAO,EAClBA,CAAE,CAAA,UAAA,EAAcA,CAAE,CAAA,UAAA,CAAa,IAAK,CACtCH,CAAAA,CAAI,MAAO,CAAA,GAAG,EAAE,IAAK,CAAA,CAAE,KAAOG,CAAAA,CAAAA,CAAE,QAAS,MAAQ,CAAA,OAAQ,CAAC,CAAA,CAC1D,MACF,CACAF,CAAAA,CAAKE,CAAC,EACR,CACF,CAGaC,CAAAA,CAAAA,CAAW,CAAC,CAAE,MAAA,CAAAP,EAASQ,CAAO,EAAA,CAAG,GAAGC,CAAQ,IAAiE,CACxH,IAAMC,CAAWC,CAAAA,MAAAA,CAAO,CAAE,WAAa,CAAA,IAAA,CAAM,GAAGF,CAAQ,CAAC,CACzD,CAAA,OAAAX,CAAQ,CAAA,OAAA,CAASc,GAAW,CAC1B,IAAMC,CAAiBH,CAAAA,CAAAA,CAASE,CAAM,CAAE,CAAA,IAAA,CAAKF,CAAQ,CAAA,CAC/CI,EAA2C,CAAIC,GAAAA,CAAAA,GAAyBF,CAAe,CAAA,GAAGE,EAAK,GAAIC,CAAAA,CAAS,CAAa,CAC/HN,CAAAA,CAAAA,CAASE,CAAM,CAAIE,CAAAA,EACrB,CAAC,CAAA,CACMJ,EAEP,SAASM,CAAAA,CAAUD,CAAwB,CAAA,CACzC,OAAI,KAAM,CAAA,OAAA,CAAQA,CAAI,CAAA,CAAUA,EAAK,GAAIC,CAAAA,CAAS,EAC3C,OAAOD,CAAAA,EAAS,WAAahB,CAAaC,CAAAA,CAAAA,CAAQe,CAAe,CAAA,CAAIA,CAC9E,CACF,EC5CaE,IAAAA,CAAAA,CAAS,OAAO,MAAO,CAAA,CAClC,EAAI,CAAA,IAAA,CACJ,MAAO,OACP,CAAA,IAAA,CAAM,MACR,CAAC,MCCYN,CAASJ,CAAAA","file":"index.js","sourcesContent":["import {\n  Router, type Request, type Response, type NextFunction, type Handler, type RouterOptions, type IRouterMatcher,\n} from 'express';\nimport Logger, { type LoggerInstanceManager } from '@autofleet/logger';\n\nexport const METHODS = [\n  'all',\n  'get',\n  'post',\n  'put',\n  'delete',\n  'patch',\n  'options',\n  'head',\n] as const;\n\nconst AfEntryPoint = (logger: LoggerInstanceManager, func: (req: Request, res: Response, nextFn: NextFunction) => void | PromiseLike<void>): Handler => async (req, res, next) => {\n  try {\n    await func(req, res, next);\n  } catch (err) {\n    const e = err as Error & { statusCode?: number };\n    logger.error(e.message);\n    if (e.statusCode && e.statusCode < 500) {\n      res.status(400).json({ error: e.message, status: 'ERROR' });\n      return;\n    }\n    next(e);\n  }\n};\n\n/** @returns a monkey-patched express router that will handle async routes (and force a 400 status for codes <500) */\nexport const AfRouter = ({ logger = Logger(), ...options }: RouterOptions & { logger: LoggerInstanceManager }): Router => {\n  const myRouter = Router({ mergeParams: true, ...options });\n  METHODS.forEach((method) => {\n    const internalMethod = myRouter[method].bind(myRouter);\n    const newMethodHandler: IRouterMatcher<Router> = (...args: [...unknown[]]) => internalMethod(...args.map(argMapper) as [string]);\n    myRouter[method] = newMethodHandler;\n  });\n  return myRouter;\n\n  function argMapper(args: unknown): unknown {\n    if (Array.isArray(args)) return args.map(argMapper);\n    return typeof args === 'function' ? AfEntryPoint(logger, args as Handler) : args;\n  }\n};\n","export const consts = Object.freeze({\n  ok: 'OK',\n  error: 'ERROR',\n  fail: 'FAIL',\n});\n","import { AfRouter } from './router';\n\nexport { AfRouter } from './router';\nexport { consts } from './consts';\n\nexport const Router = AfRouter;\n"]}
+{"version":3,"sources":["../src/router/index.ts","../src/consts/index.ts","../src/index.ts"],"names":["METHODS","AfEntryPoint","logger","func","req","res","next","err","e","AfRouter","options","myRouter","Router","method","internalMethod","newMethodHandler","args","argMapper","consts"],"mappings":"6BAKaA,IAAAA,CAAAA,CAAU,CACrB,KACA,CAAA,KAAA,CACA,MACA,CAAA,KAAA,CACA,SACA,OACA,CAAA,SAAA,CACA,MACF,CAAA,CAEMC,EAAe,CAACC,CAAAA,CAA+BC,CAAmG,GAAA,MAAOC,EAAKC,CAAKC,CAAAA,CAAAA,GAAS,CAChL,GAAI,CACF,MAAMH,CAAAA,CAAKC,CAAKC,CAAAA,CAAAA,CAAKC,CAAI,EAC3B,CAAA,MAASC,CAAK,CAAA,CACZ,IAAMC,CAAID,CAAAA,CAAAA,CAEV,GADAL,CAAAA,CAAO,MAAMM,CAAE,CAAA,OAAO,CAClBA,CAAAA,CAAAA,CAAE,YAAcA,CAAE,CAAA,UAAA,CAAa,GAAK,CAAA,CACtCH,EAAI,MAAO,CAAA,GAAG,CAAE,CAAA,IAAA,CAAK,CAAE,KAAOG,CAAAA,CAAAA,CAAE,OAAS,CAAA,MAAA,CAAQ,OAAQ,CAAC,CAAA,CAC1D,MACF,CACAF,EAAKE,CAAC,EACR,CACF,CAAA,CAGaC,EAAW,CAAC,CAAE,MAAAP,CAAAA,CAAAA,CAAQ,GAAGQ,CAAQ,CAAA,GAAiE,CAC7G,IAAMC,EAAWC,MAAO,CAAA,CAAE,WAAa,CAAA,IAAA,CAAM,GAAGF,CAAQ,CAAC,CACzD,CAAA,OAAAV,EAAQ,OAASa,CAAAA,CAAAA,EAAW,CAC1B,IAAMC,EAAiBH,CAASE,CAAAA,CAAM,CAAE,CAAA,IAAA,CAAKF,CAAQ,CAC/CI,CAAAA,CAAAA,CAA2C,CAAIC,GAAAA,CAAAA,GAAyBF,EAAe,GAAGE,CAAAA,CAAK,GAAIC,CAAAA,CAAS,CAAa,CAC/HN,CAAAA,CAAAA,CAASE,CAAM,CAAA,CAAIE,EACrB,CAAC,CAAA,CACMJ,CAEP,CAAA,SAASM,EAAUD,CAAwB,CAAA,CACzC,OAAI,KAAA,CAAM,QAAQA,CAAI,CAAA,CAAUA,CAAK,CAAA,GAAA,CAAIC,CAAS,CAC3C,CAAA,OAAOD,CAAS,EAAA,UAAA,CAAaf,EAAaC,CAAQc,CAAAA,CAAe,CAAIA,CAAAA,CAC9E,CACF,EC5CO,IAAME,CAAS,CAAA,MAAA,CAAO,OAAO,CAClC,EAAA,CAAI,IACJ,CAAA,KAAA,CAAO,QACP,IAAM,CAAA,MACR,CAAC,MCCYN,CAASH,CAAAA","file":"index.js","sourcesContent":["import {\n  Router, type Request, type Response, type NextFunction, type Handler, type RouterOptions, type IRouterMatcher,\n} from 'express';\nimport type { LoggerInstanceManager } from '@autofleet/logger';\n\nexport const METHODS = [\n  'all',\n  'get',\n  'post',\n  'put',\n  'delete',\n  'patch',\n  'options',\n  'head',\n] as const;\n\nconst AfEntryPoint = (logger: LoggerInstanceManager, func: (req: Request, res: Response, nextFn: NextFunction) => void | PromiseLike<void>): Handler => async (req, res, next) => {\n  try {\n    await func(req, res, next);\n  } catch (err) {\n    const e = err as Error & { statusCode?: number };\n    logger.error(e.message);\n    if (e.statusCode && e.statusCode < 500) {\n      res.status(400).json({ error: e.message, status: 'ERROR' });\n      return;\n    }\n    next(e);\n  }\n};\n\n/** @returns a monkey-patched express router that will handle async routes (and force a 400 status for codes <500) */\nexport const AfRouter = ({ logger, ...options }: RouterOptions & { logger: LoggerInstanceManager }): Router => {\n  const myRouter = Router({ mergeParams: true, ...options });\n  METHODS.forEach((method) => {\n    const internalMethod = myRouter[method].bind(myRouter);\n    const newMethodHandler: IRouterMatcher<Router> = (...args: [...unknown[]]) => internalMethod(...args.map(argMapper) as [string]);\n    myRouter[method] = newMethodHandler;\n  });\n  return myRouter;\n\n  function argMapper(args: unknown): unknown {\n    if (Array.isArray(args)) return args.map(argMapper);\n    return typeof args === 'function' ? AfEntryPoint(logger, args as Handler) : args;\n  }\n};\n","export const consts = Object.freeze({\n  ok: 'OK',\n  error: 'ERROR',\n  fail: 'FAIL',\n});\n","import { AfRouter } from './router';\n\nexport { AfRouter } from './router';\nexport { consts } from './consts';\n\nexport const Router = AfRouter;\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/node-common",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -8,14 +8,17 @@
   "types": "dist/index.d.ts",
   "exports": {
     "import": {
-      "default": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     },
     "require": {
-      "default": "./dist/index.cjs",
-      "types": "./dist/index.d.cts"
+      "types": "./dist/index.d.cts",
+      "default": "./dist/index.cjs"
     }
   },
+  "files": [
+    "dist"
+  ],
   "scripts": {
     "coverage": "vitest --coverage",
     "test": "vitest",
@@ -32,7 +35,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@gitlab.com/AutoFleet/node-common.git"
+    "url": "git+ssh://git@github.com/Autofleet/node-common.git"
   },
   "author": "",
   "license": "ISC",

package/.nvmrc

@@ -1 +0,0 @@
-22.9.0

package/src/consts/index.test.ts

@@ -1,26 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { consts } from '.';
-
-describe('consts', () => {
-  it('should be an object', () => {
-    expect(typeof consts).toBe('object');
-  });
-
-  it('should have ok', () => {
-    expect('ok' in consts).toBeTruthy();
-    expect(typeof consts.ok).toBe('string');
-    expect(consts.ok).toBe('OK');
-  });
-
-  it('should have error', () => {
-    expect('error' in consts).toBeTruthy();
-    expect(typeof consts.error).toBe('string');
-    expect(consts.error).toBe('ERROR');
-  });
-
-  it('should have fail', () => {
-    expect('fail' in consts).toBeTruthy();
-    expect(typeof consts.fail).toBe('string');
-    expect(consts.fail).toBe('FAIL');
-  });
-});

package/src/consts/index.ts

@@ -1,5 +0,0 @@
-export const consts = Object.freeze({
-  ok: 'OK',
-  error: 'ERROR',
-  fail: 'FAIL',
-});

package/src/index.test.ts

@@ -1,18 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import * as nodeCommon from '.';
-import { consts } from './consts';
-import { AfRouter } from './router';
-
-describe('node-common', () => {
-  it('exports consts', () => {
-    expect(nodeCommon.consts).toBe(consts);
-  });
-
-  it('exports AfRouter', () => {
-    expect(nodeCommon.AfRouter).toBe(AfRouter);
-  });
-
-  it('exports AFRouter aliased as Router', () => {
-    expect(nodeCommon.Router).toBe(AfRouter);
-  });
-});

package/src/index.ts

@@ -1,6 +0,0 @@
-import { AfRouter } from './router';
-
-export { AfRouter } from './router';
-export { consts } from './consts';
-
-export const Router = AfRouter;

package/src/router/index.test.ts

@@ -1,149 +0,0 @@
-import Logger from '@autofleet/logger';
-import type { Request, Response, NextFunction } from 'express';
-import {
-  describe, expect, it, vi,
-} from 'vitest';
-import { AfRouter, METHODS } from '.';
-
-const logger = Logger();
-const noop = () => null;
-
-describe('Router', () => {
-  it('is a function', () => {
-    expect(typeof AfRouter).toBe('function');
-    expect(AfRouter.length).toBe(1);
-  });
-
-  it('returns a Router instance', () => {
-    const router = AfRouter({ logger });
-    expect(typeof router).toBe('function');
-    expect(typeof router.use).toBe('function');
-    expect(typeof router.get).toBe('function');
-    expect(typeof router.post).toBe('function');
-    expect(typeof router.put).toBe('function');
-    expect(typeof router.delete).toBe('function');
-    expect(typeof router.patch).toBe('function');
-    expect(typeof router.options).toBe('function');
-    expect(typeof router.head).toBe('function');
-  });
-
-  describe.each(METHODS)('Route method %s', { timeout: 1000 }, (method) => {
-    it('handles sync routes', async () => {
-      const router = AfRouter({ logger });
-      router[method]('/test', (_req, res) => {
-        res.send('ok');
-      });
-      const { promise, resolve } = Promise.withResolvers<string>();
-      const req = { method, url: '/test', baseUrl: '' };
-      const res = { send: (data: string) => resolve(data) };
-      // @ts-expect-error handle is not typed for an unclear reason.
-      router.handle(req, res, noop);
-      expect(await promise).toBe('ok');
-    });
-
-    it('handles async routes', async () => {
-      const router = AfRouter({ logger });
-      router[method]('/test', async (req, res) => {
-        res.send('ok');
-      });
-      const { promise, resolve } = Promise.withResolvers<string>();
-      const req = { method, url: '/test', baseUrl: '' };
-      const res = { send: (data: string) => resolve(data) };
-      // @ts-expect-error handle is not typed for an unclear reason.
-      router.handle(req, res, noop);
-      expect(await promise).toBe('ok');
-    });
-
-    it('handles arrays of handlers', async () => {
-      const router = AfRouter({ logger });
-      router[method]('/test', [
-        (_req: Request, _res: Response, next: NextFunction) => next(),
-        (_req: Request, res: Response) => res.send('ok'),
-      ]);
-      const { promise, resolve } = Promise.withResolvers<string>();
-      const req = { method, url: '/test', baseUrl: '' };
-      const res = { send: (data: string) => resolve(data) };
-      // @ts-expect-error handle is not typed for an unclear reason.
-      router.handle(req, res, noop);
-      expect(await promise).toBe('ok');
-    });
-
-    it('handles errors', async () => {
-      const router = AfRouter({ logger });
-      const error = new Error('test error');
-      router[method]('/test', () => {
-        throw error;
-      });
-      const { promise, resolve } = Promise.withResolvers();
-      const next = vi.fn(resolve);
-      const req = { method, url: '/test', baseUrl: '' };
-      const res = {};
-      // @ts-expect-error handle is not typed for an unclear reason.
-      router.handle(req, res, next);
-      await promise;
-      expect(next).toHaveBeenCalledExactlyOnceWith(error);
-    });
-
-    it('handles rejections', async () => {
-      const router = AfRouter({ logger });
-      const error = new Error('test error');
-      router[method]('/test', () => Promise.reject(error));
-      const { promise, resolve } = Promise.withResolvers();
-      const next = vi.fn(resolve);
-      const req = { method, url: '/test', baseUrl: '' };
-      const res = {};
-      // @ts-expect-error handle is not typed for an unclear reason.
-      router.handle(req, res, next);
-      await promise;
-      // expect(await promise).toBe({ error: 'test error', status: "ERROR" });
-      expect(next).toHaveBeenCalledExactlyOnceWith(error);
-    });
-
-    it('forces errors with status code 400 if not 500', async () => {
-      const router = AfRouter({ logger });
-      const error = Object.assign(new Error('test error'), { statusCode: 418 });
-      router[method]('/test', () => Promise.reject(error));
-      const { promise, resolve } = Promise.withResolvers();
-      const status = vi.fn(() => ({ json: resolve }));
-      const req = { method, url: '/test', baseUrl: '' };
-      const res = { status };
-      // @ts-expect-error handle is not typed for an unclear reason.
-      router.handle(req, res, noop);
-      await promise;
-      expect(await promise).toEqual({ error: 'test error', status: 'ERROR' });
-      expect(status).toHaveBeenCalledExactlyOnceWith(400);
-    });
-
-    it('keeps original errors when status code is 500', async () => {
-      const router = AfRouter({ logger });
-      const error = Object.assign(new Error('test error'), { statusCode: 500 });
-      router[method]('/test', () => Promise.reject(error));
-      const { promise, resolve } = Promise.withResolvers();
-      const next = vi.fn(resolve);
-      const req = { method, url: '/test', baseUrl: '' };
-      const res = {};
-      // @ts-expect-error handle is not typed for an unclear reason.
-      router.handle(req, res, next);
-      await promise;
-      expect(next).toHaveBeenCalledExactlyOnceWith(error);
-    });
-
-    it('defaults to mergeParams true', async () => {
-      const router = AfRouter({ mergeParams: false, logger });
-      const childRouter = AfRouter({ logger });
-      router.use('/:parentParam', childRouter);
-      childRouter[method]<{ parentParam: string; param: string; }>('/:param', (req, res) => res.send({ param: req.params.param, parentParam: req.params.parentParam }));
-
-      const { promise, resolve } = Promise.withResolvers<string>();
-      const req = { method, url: '/foo/bar', baseUrl: '' };
-      const res = { send: (data: string) => resolve(data) };
-      // @ts-expect-error handle is not typed for an unclear reason.
-      router.handle(req, res, noop);
-      expect(await promise).toEqual({ parentParam: 'foo', param: 'bar' });
-      // @ts-expect-error mergeParams is a private field
-      expect(router.mergeParams).toBeFalsy();
-      // @ts-expect-error mergeParams is a private field
-      expect(childRouter.mergeParams).toBeTruthy();
-    });
-  });
-});

package/src/router/index.ts

@@ -1,45 +0,0 @@
-import {
-  Router, type Request, type Response, type NextFunction, type Handler, type RouterOptions, type IRouterMatcher,
-} from 'express';
-import Logger, { type LoggerInstanceManager } from '@autofleet/logger';
-
-export const METHODS = [
-  'all',
-  'get',
-  'post',
-  'put',
-  'delete',
-  'patch',
-  'options',
-  'head',
-] as const;
-
-const AfEntryPoint = (logger: LoggerInstanceManager, func: (req: Request, res: Response, nextFn: NextFunction) => void | PromiseLike<void>): Handler => async (req, res, next) => {
-  try {
-    await func(req, res, next);
-  } catch (err) {
-    const e = err as Error & { statusCode?: number };
-    logger.error(e.message);
-    if (e.statusCode && e.statusCode < 500) {
-      res.status(400).json({ error: e.message, status: 'ERROR' });
-      return;
-    }
-    next(e);
-  }
-};
-
-/** @returns a monkey-patched express router that will handle async routes (and force a 400 status for codes <500) */
-export const AfRouter = ({ logger = Logger(), ...options }: RouterOptions & { logger: LoggerInstanceManager }): Router => {
-  const myRouter = Router({ mergeParams: true, ...options });
-  METHODS.forEach((method) => {
-    const internalMethod = myRouter[method].bind(myRouter);
-    const newMethodHandler: IRouterMatcher<Router> = (...args: [...unknown[]]) => internalMethod(...args.map(argMapper) as [string]);
-    myRouter[method] = newMethodHandler;
-  });
-  return myRouter;
-
-  function argMapper(args: unknown): unknown {
-    if (Array.isArray(args)) return args.map(argMapper);
-    return typeof args === 'function' ? AfEntryPoint(logger, args as Handler) : args;
-  }
-};

package/tsconfig.json

@@ -1,15 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2020",
-    "module": "commonjs",
-    "declaration": true,
-    "outDir": "./dist",
-    "strict": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "lib": [
-      "ESNext"
-    ]
-  },
-  "include": ["src", "tsup.config.ts", "vitest.config.ts"],
-}

package/tsup.config.ts

@@ -1,13 +0,0 @@
-import { defineConfig } from 'tsup';
-
-export default defineConfig((options) => ({
-  entry: ['src/index.ts'],
-  target: 'node18.0',
-  dts: true,
-  format: ['esm', 'cjs'],
-  clean: !options.watch,
-  minify: !options.watch,
-  removeNodeProtocol: false,
-  treeshake: true,
-  sourcemap: true,
-}));

package/vitest.config.ts

@@ -1,14 +0,0 @@
-// eslint-disable-next-line import/no-unresolved
-import { defineConfig } from 'vitest/config';
-
-export default defineConfig({
-  test: {
-    coverage: {
-      provider: 'v8',
-      reporter: ['text'],
-      thresholds: {
-        lines: 80,
-      },
-    },
-  },
-});