middleware-async
Advanced tools
Comparing version 1.3.4 to 1.3.5
@@ -1,3 +0,5 @@ | ||
import type { NextFunction, Request, RequestHandler, Response } from 'express'; | ||
export declare const asyncMiddleware: <P, ResBody, ReqBody, ReqQuery, Locals>(middleware: (req: Request<P, ResBody, ReqBody, ReqQuery, Locals>, res: Response<ResBody, Locals>, next: NextFunction) => Promise<any> | any) => (req: Request<P, ResBody, ReqBody, ReqQuery, Locals>, res: Response<ResBody, Locals>, next: NextFunction) => void | Promise<void>; | ||
/// <reference types="qs" /> | ||
import type { NextFunction, Request, RequestHandler, Response } from 'express/ts4.0'; | ||
import type * as core from 'express-serve-static-core'; | ||
export declare const asyncMiddleware: <P = core.ParamsDictionary, ResBody = any, ReqBody = any, ReqQuery = import("qs").ParsedQs, Locals extends Record<string, any> = Record<string, any>>(middleware: (req: Request<P, ResBody, ReqBody, ReqQuery, Locals>, res: Response<ResBody, Locals>, next: NextFunction) => Promise<any> | any) => (req: Request<P, ResBody, ReqBody, ReqQuery, Locals>, res: Response<ResBody, Locals>, next: NextFunction) => void | Promise<void>; | ||
/** | ||
@@ -20,3 +22,3 @@ * wrap async function to connect-like middleware | ||
*/ | ||
export declare const combineMiddlewares: <P, ResBody, ReqBody, ReqQuery, Locals>(first?: IRequestHandler<P, ResBody, ReqBody, ReqQuery, Locals>, ...middlewares: readonly IRequestHandler<P, ResBody, ReqBody, ReqQuery, Locals>[]) => (req: Request<P, ResBody, ReqBody, ReqQuery, Locals>, res: Response<ResBody, Locals>, next: NextFunction) => void; | ||
export declare const combineMiddlewares: <P = core.ParamsDictionary, ResBody = any, ReqBody = any, ReqQuery = import("qs").ParsedQs, Locals extends Record<string, any> = Record<string, any>>(first?: IRequestHandler<P, ResBody, ReqBody, ReqQuery, Locals>, ...middlewares: readonly IRequestHandler<P, ResBody, ReqBody, ReqQuery, Locals>[]) => (req: Request<P, ResBody, ReqBody, ReqQuery, Locals>, res: Response<ResBody, Locals>, next: NextFunction) => void; | ||
export declare const mockExpressMajorVersion: (v: number) => number; | ||
@@ -29,3 +31,3 @@ /** | ||
*/ | ||
export declare const middlewareToPromise: <P, ResBody, ReqBody, ReqQuery, Locals>(middleware: RequestHandler<P, ResBody, ReqBody, ReqQuery, Locals>) => (req: Request<P, ResBody, ReqBody, ReqQuery, Locals>, res: Response<ResBody, Locals>) => Promise<void>; | ||
export declare const middlewareToPromise: <P = core.ParamsDictionary, ResBody = any, ReqBody = any, ReqQuery = import("qs").ParsedQs, Locals extends Record<string, any> = Record<string, any>>(middleware: RequestHandler<P, ResBody, ReqBody, ReqQuery, Locals>) => (req: Request<P, ResBody, ReqBody, ReqQuery, Locals>, res: Response<ResBody, Locals>) => Promise<void>; | ||
/** | ||
@@ -35,2 +37,2 @@ * extended version of middlewareToPromise which allows one or more middleware / array of middlewares | ||
*/ | ||
export declare const combineToAsync: <P, ResBody, ReqBody, ReqQuery, Locals>(...args: IRequestHandlerArray<P, ResBody, ReqBody, ReqQuery, Locals>) => (req: Request<P, ResBody, ReqBody, ReqQuery, Locals>, res: Response<ResBody, Locals>) => Promise<void>; | ||
export declare const combineToAsync: <P = core.ParamsDictionary, ResBody = any, ReqBody = any, ReqQuery = import("qs").ParsedQs, Locals extends Record<string, any> = Record<string, any>>(...args: IRequestHandlerArray<P, ResBody, ReqBody, ReqQuery, Locals>) => (req: Request<P, ResBody, ReqBody, ReqQuery, Locals>, res: Response<ResBody, Locals>) => Promise<void>; |
19
index.js
@@ -38,6 +38,10 @@ "use strict"; | ||
}; | ||
var __spreadArray = (this && this.__spreadArray) || function (to, from) { | ||
for (var i = 0, il = from.length, j = to.length; i < il; i++, j++) | ||
to[j] = from[i]; | ||
return to; | ||
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { | ||
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { | ||
if (ar || !(i in from)) { | ||
if (!ar) ar = Array.prototype.slice.call(from, 0, i); | ||
ar[i] = from[i]; | ||
} | ||
} | ||
return to.concat(ar || Array.prototype.slice.call(from)); | ||
}; | ||
@@ -110,3 +114,3 @@ Object.defineProperty(exports, "__esModule", { value: true }); | ||
while (Array.isArray(first)) | ||
_a = __spreadArray(__spreadArray([], first), middlewares), first = _a[0], middlewares = _a.slice(1); | ||
_a = __spreadArray(__spreadArray([], first, true), middlewares, true), first = _a[0], middlewares = _a.slice(1); | ||
return function (req, res, next) { return first | ||
@@ -142,3 +146,4 @@ ? first(req, res, function (err) { return err | ||
catch (err) { | ||
return [2 /*return*/, reject(err)]; | ||
reject(err); | ||
return [2 /*return*/]; | ||
} | ||
@@ -173,4 +178,4 @@ if (!isPromise(maybePromise)) return [3 /*break*/, 4]; | ||
} | ||
return exports.middlewareToPromise(exports.combineMiddlewares.apply(void 0, args)); | ||
return (0, exports.middlewareToPromise)(exports.combineMiddlewares.apply(void 0, args)); | ||
}; | ||
exports.combineToAsync = combineToAsync; |
{ | ||
"name": "middleware-async", | ||
"version": "1.3.4", | ||
"version": "1.3.5", | ||
"description": "A handy tool to work with async/promise express middleware", | ||
@@ -17,4 +17,4 @@ "main": "./index.js", | ||
"build": "yarn build:es && yarn build:commonjs", | ||
"build:es": "yarn tsc -d --target es5 --moduleResolution node --module es6 --outDir es index.ts && mv es/index.js index.mjs && rm -rf es", | ||
"build:commonjs": "yarn tsc -d --target es5 --moduleResolution node --module commonjs --outDir . index.ts", | ||
"build:es": "yarn tsc -d --skipLibCheck --target es5 --moduleResolution node --module es6 --outDir es index.ts && mv es/index.js index.mjs && rm -rf es", | ||
"build:commonjs": "yarn tsc -d --skipLibCheck --target es5 --moduleResolution node --module commonjs --outDir . index.ts", | ||
"test": "yarn jest", | ||
@@ -42,25 +42,25 @@ "coverage": "yarn jest --coverage", | ||
"devDependencies": { | ||
"@babel/core": "^7.14.3", | ||
"@babel/core": "^7.18.5", | ||
"@babel/plugin-syntax-object-rest-spread": "^7.8.3", | ||
"@babel/plugin-transform-runtime": "^7.14.3", | ||
"@babel/preset-env": "^7.14.2", | ||
"@babel/preset-typescript": "^7.13.0", | ||
"@babel/runtime": "^7.14.0", | ||
"@types/express": "^4.17.11", | ||
"@types/jest": "^26.0.23", | ||
"@types/node": "^15.6.1", | ||
"@typescript-eslint/eslint-plugin": "^4.25.0", | ||
"@typescript-eslint/parser": "^4.25.0", | ||
"@babel/plugin-transform-runtime": "^7.18.5", | ||
"@babel/preset-env": "^7.18.2", | ||
"@babel/preset-typescript": "^7.17.12", | ||
"@babel/runtime": "^7.18.3", | ||
"@types/express": "^4.17.13", | ||
"@types/jest": "^28.1.3", | ||
"@types/node": "^18.0.0", | ||
"@typescript-eslint/eslint-plugin": "^5.29.0", | ||
"@typescript-eslint/parser": "^5.29.0", | ||
"babel-eslint": "^10.1.0", | ||
"babel-jest": "^26.6.3", | ||
"eslint": "^7.27.0", | ||
"eslint-config-airbnb-base": "^14.2.1", | ||
"babel-jest": "^28.1.1", | ||
"eslint": "^8.18.0", | ||
"eslint-config-airbnb-base": "^15.0.0", | ||
"eslint-plugin-babel": "^5.3.1", | ||
"eslint-plugin-import": "^2.23.3", | ||
"eslint-plugin-jest": "^24.3.6", | ||
"eslint-plugin-import": "^2.26.0", | ||
"eslint-plugin-jest": "^26.5.3", | ||
"flip-promise": "^1.0.4", | ||
"jest": "^26.6.3", | ||
"typescript": "^4.2.4" | ||
"jest": "^28.1.1", | ||
"typescript": "^4.7.4" | ||
}, | ||
"dependencies": {} | ||
} |
Sorry, the diff of this file is not supported yet
25538
385