From 649db1059c49b25bb1c2bb7ec16c5a5c9b2974c7 Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Sun, 9 Oct 2022 18:52:49 +0200 Subject: [PATCH] fix(core): update --- npmextra.json | 2 +- ts/00_commitinfo_data.ts | 2 +- ts/typedrequest.classes.typedrouter.ts | 18 ++++++++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/npmextra.json b/npmextra.json index ab6e593..aa32057 100644 --- a/npmextra.json +++ b/npmextra.json @@ -5,7 +5,7 @@ "githost": "gitlab.com", "gitscope": "apiglobal", "gitrepo": "typedrequest", - "shortDescription": "make typed requests towards apis", + "description": "make typed requests towards apis", "npmPackagename": "@apiglobal/typedrequest", "license": "MIT", "projectDomain": "api.global" diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index 8d61b94..98f9b47 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@apiglobal/typedrequest', - version: '2.0.10', + version: '2.0.11', description: 'make typed requests towards apis' } diff --git a/ts/typedrequest.classes.typedrouter.ts b/ts/typedrequest.classes.typedrouter.ts index f4d2013..176ec73 100644 --- a/ts/typedrequest.classes.typedrouter.ts +++ b/ts/typedrequest.classes.typedrouter.ts @@ -23,7 +23,7 @@ export class TypedRouter { * adds the handler to the routing map * @param typedHandlerArg */ - public addTypedHandler ( + public addTypedHandler( typedHandlerArg: TypedHandler ) { // lets check for deduplication @@ -41,15 +41,15 @@ export class TypedRouter { * adds another sub typedRouter * @param typedRequest */ - public addTypedRouter (typedRouterArg: TypedRouter) { - const routerExists = this.routerMap.findSync(routerArg => routerArg === typedRouterArg) + public addTypedRouter(typedRouterArg: TypedRouter) { + const routerExists = this.routerMap.findSync((routerArg) => routerArg === typedRouterArg); if (!routerExists) { this.routerMap.add(typedRouterArg); typedRouterArg.addTypedRouter(this); } } - public checkForTypedHandler (methodArg: string): boolean { + public checkForTypedHandler(methodArg: string): boolean { return !!this.getTypedHandlerForMethod(methodArg); } @@ -58,7 +58,7 @@ export class TypedRouter { * @param methodArg * @param checkUpstreamRouter */ - public getTypedHandlerForMethod ( + public getTypedHandlerForMethod( methodArg: string, checkedRouters: TypedRouter[] = [] ): TypedHandler { @@ -86,8 +86,10 @@ export class TypedRouter { * if typedrequest object has correlation.phase === 'response' -> routes a typed request object to request fire event * @param typedRequestArg */ - public async routeAndAddResponse (typedRequestArg: T): Promise { - if (typedRequestArg?.correlation?.phase === 'request') { + public async routeAndAddResponse< + T extends plugins.typedRequestInterfaces.ITypedRequest = plugins.typedRequestInterfaces.ITypedRequest + >(typedRequestArg: T, localRequestArg = false): Promise { + if (typedRequestArg?.correlation?.phase === 'request' || localRequestArg) { const typedHandler = this.getTypedHandlerForMethod(typedRequestArg.method); if (!typedHandler) { @@ -110,7 +112,7 @@ export class TypedRouter { } else { console.log('received weirdly shaped request'); console.log(typedRequestArg); - return null + return null; } } }