@tramvai/module-http-client 5.41.2 → 5.45.2

package/lib/papi/papiService.d.ts

@@ -11,6 +11,6 @@ export declare class PapiService extends BaseHttpClient {
     papi: Deps['papi'];
     di: Deps['di'];
     constructor({ papi, di }: Deps);
-    request<R = any>({ path, query, body }: HttpClientRequest): Promise<HttpClientResponse<R>>;
+    request<R = any>({ path, query, body, headers, }: HttpClientRequest): Promise<HttpClientResponse<R>>;
 }
 //# sourceMappingURL=papiService.d.ts.map

package/lib/papi/papiService.es.js

@@ -4,6 +4,10 @@ import { BaseHttpClient } from '@tramvai/http-client';
 import { createChildContainer } from '@tinkoff/dippy';
 import { getPapiParameters } from '@tramvai/papi';
 import { FASTIFY_REQUEST, FASTIFY_RESPONSE, PAPI_EXECUTOR } from '@tramvai/tokens-server-private';
+import '@tinkoff/utils/function/identity';
+import '@tinkoff/utils/object/pick';
+import { comparePathWithPattern } from '../utils/comparePathWithPattern.es.js';
+import { getPathParams } from '../utils/getPathParams.es.js';
 
 class PapiService extends BaseHttpClient {
     constructor({ papi, di }) {
@@ -11,12 +15,19 @@ class PapiService extends BaseHttpClient {
         this.papi = flatten(papi || []);
         this.di = di;
     }
-    async request({ path, query, body }) {
-        const papiRoute = find((papi) => getPapiParameters(papi).path === `/${path}`, this.papi ?? []);
+    async request({ path, query, body, headers, }) {
+        const pathWithLeadingSlash = path?.startsWith('/') ? path : `/${path}`;
+        const papiRoute = find((papi) => comparePathWithPattern(pathWithLeadingSlash, getPapiParameters(papi).path), this.papi ?? []);
         if (!papiRoute) {
             throw new Error(`papi handler '${path}' not found`);
         }
-        const req = { headers: { host: 'localhost' }, cookies: {}, query, body };
+        const req = {
+            headers: { ...headers, host: 'localhost' },
+            cookies: {},
+            query,
+            body,
+            params: getPathParams(pathWithLeadingSlash, getPapiParameters(papiRoute).path),
+        };
         const res = {};
         const childDi = createChildContainer(this.di, [
             {

package/lib/papi/papiService.js

@@ -8,6 +8,10 @@ var httpClient = require('@tramvai/http-client');
 var dippy = require('@tinkoff/dippy');
 var papi = require('@tramvai/papi');
 var tokensServerPrivate = require('@tramvai/tokens-server-private');
+require('@tinkoff/utils/function/identity');
+require('@tinkoff/utils/object/pick');
+var comparePathWithPattern = require('../utils/comparePathWithPattern.js');
+var getPathParams = require('../utils/getPathParams.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -20,12 +24,19 @@ class PapiService extends httpClient.BaseHttpClient {
         this.papi = flatten__default["default"](papi || []);
         this.di = di;
     }
-    async request({ path, query, body }) {
-        const papiRoute = find__default["default"]((papi$1) => papi.getPapiParameters(papi$1).path === `/${path}`, this.papi ?? []);
+    async request({ path, query, body, headers, }) {
+        const pathWithLeadingSlash = path?.startsWith('/') ? path : `/${path}`;
+        const papiRoute = find__default["default"]((papi$1) => comparePathWithPattern.comparePathWithPattern(pathWithLeadingSlash, papi.getPapiParameters(papi$1).path), this.papi ?? []);
         if (!papiRoute) {
             throw new Error(`papi handler '${path}' not found`);
         }
-        const req = { headers: { host: 'localhost' }, cookies: {}, query, body };
+        const req = {
+            headers: { ...headers, host: 'localhost' },
+            cookies: {},
+            query,
+            body,
+            params: getPathParams.getPathParams(pathWithLeadingSlash, papi.getPapiParameters(papiRoute).path),
+        };
         const res = {};
         const childDi = dippy.createChildContainer(this.di, [
             {

package/lib/utils/comparePathWithPattern.d.ts

@@ -0,0 +1,5 @@
+/** Compares real path with pattern path
+ * @example comparePathWithPattern('/example/mock/12345', '/example/:type/:id') => true
+ */
+export declare const comparePathWithPattern: (path: string, pattern: string) => boolean;
+//# sourceMappingURL=comparePathWithPattern.d.ts.map

package/lib/utils/comparePathWithPattern.es.js

@@ -0,0 +1,6 @@
+/** Compares real path with pattern path
+ * @example comparePathWithPattern('/example/mock/12345', '/example/:type/:id') => true
+ */
+const comparePathWithPattern = (path, pattern) => new RegExp(`^${pattern.replace(/:(\w+)/g, '([^\\/]+)')}$`).test(path);
+
+export { comparePathWithPattern };

package/lib/utils/comparePathWithPattern.js

@@ -0,0 +1,10 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/** Compares real path with pattern path
+ * @example comparePathWithPattern('/example/mock/12345', '/example/:type/:id') => true
+ */
+const comparePathWithPattern = (path, pattern) => new RegExp(`^${pattern.replace(/:(\w+)/g, '([^\\/]+)')}$`).test(path);
+
+exports.comparePathWithPattern = comparePathWithPattern;

package/lib/utils/getPathParams.d.ts

@@ -0,0 +1,4 @@
+export declare const getPathParams: (path: string, pattern: string) => {
+    [key: string]: string;
+};
+//# sourceMappingURL=getPathParams.d.ts.map

package/lib/utils/getPathParams.es.js

@@ -0,0 +1,3 @@
+const getPathParams = (path, pattern) => path.match(new RegExp(`^${pattern.replace(/:(\w+)/g, '(?<$1>[^\\/]+)')}$`))?.groups ?? {};
+
+export { getPathParams };

package/lib/utils/getPathParams.js

@@ -0,0 +1,7 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const getPathParams = (path, pattern) => path.match(new RegExp(`^${pattern.replace(/:(\w+)/g, '(?<$1>[^\\/]+)')}$`))?.groups ?? {};
+
+exports.getPathParams = getPathParams;

package/lib/utils/index.d.ts

@@ -1,2 +1,4 @@
 export * from './fillHeaders';
+export * from './comparePathWithPattern';
+export * from './getPathParams';
 //# sourceMappingURL=index.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-http-client",
-  "version": "5.41.2",
+  "version": "5.45.2",
   "initialVersion": "0.58.99",
   "description": "",
   "main": "lib/index.js",
@@ -25,12 +25,12 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@tramvai/http-client": "0.5.3",
-    "@tramvai/tinkoff-request-http-client-adapter": "0.12.99",
-    "@tramvai/tokens-http-client": "5.41.2",
-    "@tramvai/tokens-common": "5.41.2",
-    "@tramvai/tokens-server": "5.41.2",
-    "@tramvai/tokens-server-private": "5.41.2"
+    "@tramvai/http-client": "0.5.4",
+    "@tramvai/tinkoff-request-http-client-adapter": "0.12.108",
+    "@tramvai/tokens-http-client": "5.45.2",
+    "@tramvai/tokens-common": "5.45.2",
+    "@tramvai/tokens-server": "5.45.2",
+    "@tramvai/tokens-server-private": "5.45.2"
   },
   "devDependencies": {
     "@tinkoff/request-core": "^0.10.0",
@@ -39,12 +39,12 @@
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "5.41.2",
-    "@tramvai/module-common": "5.41.2",
-    "@tramvai/papi": "5.41.2",
-    "@tramvai/test-helpers": "5.41.2",
-    "@tramvai/test-unit": "5.41.2",
-    "@tramvai/test-mocks": "5.41.2",
+    "@tramvai/core": "5.45.2",
+    "@tramvai/module-common": "5.45.2",
+    "@tramvai/papi": "5.45.2",
+    "@tramvai/test-helpers": "5.45.2",
+    "@tramvai/test-unit": "5.45.2",
+    "@tramvai/test-mocks": "5.45.2",
     "@tinkoff/dippy": "0.11.4",
     "node-fetch": "^2.6.1",
     "tslib": "^2.4.0"

package/tests.js

@@ -61,6 +61,13 @@ const fillHeaders = ({ requestManager, headersList, }) => {
     };
 };
 
+/** Compares real path with pattern path
+ * @example comparePathWithPattern('/example/mock/12345', '/example/:type/:id') => true
+ */
+const comparePathWithPattern = (path, pattern) => new RegExp(`^${pattern.replace(/:(\w+)/g, '([^\\/]+)')}$`).test(path);
+
+const getPathParams = (path, pattern) => path.match(new RegExp(`^${pattern.replace(/:(\w+)/g, '(?<$1>[^\\/]+)')}$`))?.groups ?? {};
+
 const createUserAgent = ({ appInfo, envManager, }) => {
     const { appName } = appInfo;
     const appVersion = envManager.get('APP_VERSION');
@@ -151,12 +158,19 @@ class PapiService extends httpClient.BaseHttpClient {
         this.papi = flatten__default["default"](papi || []);
         this.di = di;
     }
-    async request({ path, query, body }) {
-        const papiRoute = find__default["default"]((papi$1) => papi.getPapiParameters(papi$1).path === `/${path}`, this.papi ?? []);
+    async request({ path, query, body, headers, }) {
+        const pathWithLeadingSlash = path?.startsWith('/') ? path : `/${path}`;
+        const papiRoute = find__default["default"]((papi$1) => comparePathWithPattern(pathWithLeadingSlash, papi.getPapiParameters(papi$1).path), this.papi ?? []);
         if (!papiRoute) {
             throw new Error(`papi handler '${path}' not found`);
         }
-        const req = { headers: { host: 'localhost' }, cookies: {}, query, body };
+        const req = {
+            headers: { ...headers, host: 'localhost' },
+            cookies: {},
+            query,
+            body,
+            params: getPathParams(pathWithLeadingSlash, papi.getPapiParameters(papiRoute).path),
+        };
         const res = {};
         const childDi = dippy.createChildContainer(this.di, [
             {