@tramvai/test-helpers 2.70.1 → 2.72.0

package/lib/index.es.js

@@ -1,96 +1,4 @@
-import { parse } from 'node-html-parser';
-import prettier from 'prettier';
-import supertest from 'supertest';
-import { walkOfModules, getModuleParameters } from '@tramvai/core';
-import { createMockDi } from '@tramvai/test-mocks';
-
-const parseHtml = (html, parserOptions = {
-    blockTextElements: { script: false, style: false },
-}) => {
-    var _a, _b, _c;
-    if (!html) {
-        return null;
-    }
-    const prettyHtml = prettier.format(html, { parser: 'html', printWidth: 120 });
-    const parsed = parse(prettyHtml, parserOptions);
-    return {
-        parsed,
-        body: (_a = parsed.querySelector('body')) === null || _a === void 0 ? void 0 : _a.innerHTML,
-        head: (_b = parsed.querySelector('head')) === null || _b === void 0 ? void 0 : _b.innerHTML,
-        application: (_c = parsed.querySelector('.application')) === null || _c === void 0 ? void 0 : _c.innerHTML,
-    };
-};
-
-const renderFactory = (request, { replaceDynamicStrings = {}, } = {}) => async (path, { method = 'get', parserOptions, } = {}) => {
-    const response = await request(path, { method });
-    let { text } = response;
-    for (const key in replaceDynamicStrings) {
-        text = text.replace(new RegExp(key, 'g'), replaceDynamicStrings[key]);
-    }
-    const parsed = parseHtml(text, parserOptions);
-    if (!parsed) {
-        throw new Error(`Cannot parse response
-  got response:
-    status: ${response.statusCode}
-    content: ${response.text}`);
-    }
-    return {
-        ...parsed,
-        get initialState() {
-            var _a, _b, _c;
-            const parsedWithScripts = (_a = parseHtml(response.text, {})) === null || _a === void 0 ? void 0 : _a.parsed;
-            if (!parsedWithScripts) {
-                return;
-            }
-            return JSON.parse((_c = (_b = parsedWithScripts.querySelector('#__TRAMVAI_STATE__')) === null || _b === void 0 ? void 0 : _b.textContent) !== null && _c !== void 0 ? _c : 'null');
-        },
-    };
-};
-
-const requestFactory = (appOrUrl) => {
-    let server = appOrUrl;
-    if (typeof appOrUrl === 'object' && 'ready' in appOrUrl) {
-        appOrUrl.ready();
-        server = appOrUrl.server;
-    }
-    const request = supertest(server);
-    return (path, { method = 'get', body, contentType, headers = {}, } = {}) => {
-        const instance = request[method](path);
-        if (contentType) {
-            instance.type(contentType);
-        }
-        for (const header in headers) {
-            instance.set(header, headers[header]);
-        }
-        if (body) {
-            return instance.send(body);
-        }
-        return instance;
-    };
-};
-
-const getDiWrapper = ({ providers = [], modules = [], di = createMockDi(), } = {}) => {
-    const resolvedModules = walkOfModules(modules);
-    resolvedModules.forEach((mod) => {
-        const moduleParameters = getModuleParameters(mod);
-        moduleParameters.providers.forEach((provider) => {
-            di.register(provider);
-        });
-    });
-    if (providers) {
-        providers.forEach((provider) => di.register(provider));
-    }
-    return {
-        di,
-        /**
-         * @description Run specific command line
-         * @param line one of the commandLineListTokens
-         */
-        runLine: (line) => {
-            const handlers = di.get({ token: line, multi: true });
-            return Promise.all(handlers.map((handler) => handler()));
-        },
-    };
-};
-
-export { getDiWrapper, parseHtml, renderFactory, requestFactory };
+export { parseHtml } from './parseHtml.es.js';
+export { renderFactory } from './render.es.js';
+export { requestFactory } from './request.es.js';
+export { getDiWrapper } from './wrapDi.es.js';

package/lib/index.js

@@ -2,107 +2,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var nodeHtmlParser = require('node-html-parser');
-var prettier = require('prettier');
-var supertest = require('supertest');
-var core = require('@tramvai/core');
-var testMocks = require('@tramvai/test-mocks');
+var parseHtml = require('./parseHtml.js');
+var render = require('./render.js');
+var request = require('./request.js');
+var wrapDi = require('./wrapDi.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var prettier__default = /*#__PURE__*/_interopDefaultLegacy(prettier);
-var supertest__default = /*#__PURE__*/_interopDefaultLegacy(supertest);
 
-const parseHtml = (html, parserOptions = {
-    blockTextElements: { script: false, style: false },
-}) => {
-    var _a, _b, _c;
-    if (!html) {
-        return null;
-    }
-    const prettyHtml = prettier__default["default"].format(html, { parser: 'html', printWidth: 120 });
-    const parsed = nodeHtmlParser.parse(prettyHtml, parserOptions);
-    return {
-        parsed,
-        body: (_a = parsed.querySelector('body')) === null || _a === void 0 ? void 0 : _a.innerHTML,
-        head: (_b = parsed.querySelector('head')) === null || _b === void 0 ? void 0 : _b.innerHTML,
-        application: (_c = parsed.querySelector('.application')) === null || _c === void 0 ? void 0 : _c.innerHTML,
-    };
-};
-
-const renderFactory = (request, { replaceDynamicStrings = {}, } = {}) => async (path, { method = 'get', parserOptions, } = {}) => {
-    const response = await request(path, { method });
-    let { text } = response;
-    for (const key in replaceDynamicStrings) {
-        text = text.replace(new RegExp(key, 'g'), replaceDynamicStrings[key]);
-    }
-    const parsed = parseHtml(text, parserOptions);
-    if (!parsed) {
-        throw new Error(`Cannot parse response
-  got response:
-    status: ${response.statusCode}
-    content: ${response.text}`);
-    }
-    return {
-        ...parsed,
-        get initialState() {
-            var _a, _b, _c;
-            const parsedWithScripts = (_a = parseHtml(response.text, {})) === null || _a === void 0 ? void 0 : _a.parsed;
-            if (!parsedWithScripts) {
-                return;
-            }
-            return JSON.parse((_c = (_b = parsedWithScripts.querySelector('#__TRAMVAI_STATE__')) === null || _b === void 0 ? void 0 : _b.textContent) !== null && _c !== void 0 ? _c : 'null');
-        },
-    };
-};
-
-const requestFactory = (appOrUrl) => {
-    let server = appOrUrl;
-    if (typeof appOrUrl === 'object' && 'ready' in appOrUrl) {
-        appOrUrl.ready();
-        server = appOrUrl.server;
-    }
-    const request = supertest__default["default"](server);
-    return (path, { method = 'get', body, contentType, headers = {}, } = {}) => {
-        const instance = request[method](path);
-        if (contentType) {
-            instance.type(contentType);
-        }
-        for (const header in headers) {
-            instance.set(header, headers[header]);
-        }
-        if (body) {
-            return instance.send(body);
-        }
-        return instance;
-    };
-};
-
-const getDiWrapper = ({ providers = [], modules = [], di = testMocks.createMockDi(), } = {}) => {
-    const resolvedModules = core.walkOfModules(modules);
-    resolvedModules.forEach((mod) => {
-        const moduleParameters = core.getModuleParameters(mod);
-        moduleParameters.providers.forEach((provider) => {
-            di.register(provider);
-        });
-    });
-    if (providers) {
-        providers.forEach((provider) => di.register(provider));
-    }
-    return {
-        di,
-        /**
-         * @description Run specific command line
-         * @param line one of the commandLineListTokens
-         */
-        runLine: (line) => {
-            const handlers = di.get({ token: line, multi: true });
-            return Promise.all(handlers.map((handler) => handler()));
-        },
-    };
-};
-
-exports.getDiWrapper = getDiWrapper;
-exports.parseHtml = parseHtml;
-exports.renderFactory = renderFactory;
-exports.requestFactory = requestFactory;
+exports.parseHtml = parseHtml.parseHtml;
+exports.renderFactory = render.renderFactory;
+exports.requestFactory = request.requestFactory;
+exports.getDiWrapper = wrapDi.getDiWrapper;

package/lib/parseHtml.es.js

@@ -0,0 +1,21 @@
+import { parse } from 'node-html-parser';
+import prettier from 'prettier';
+
+const parseHtml = (html, parserOptions = {
+    blockTextElements: { script: false, style: false },
+}) => {
+    var _a, _b, _c;
+    if (!html) {
+        return null;
+    }
+    const prettyHtml = prettier.format(html, { parser: 'html', printWidth: 120 });
+    const parsed = parse(prettyHtml, parserOptions);
+    return {
+        parsed,
+        body: (_a = parsed.querySelector('body')) === null || _a === void 0 ? void 0 : _a.innerHTML,
+        head: (_b = parsed.querySelector('head')) === null || _b === void 0 ? void 0 : _b.innerHTML,
+        application: (_c = parsed.querySelector('.application')) === null || _c === void 0 ? void 0 : _c.innerHTML,
+    };
+};
+
+export { parseHtml };

package/lib/parseHtml.js

@@ -0,0 +1,29 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var nodeHtmlParser = require('node-html-parser');
+var prettier = require('prettier');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var prettier__default = /*#__PURE__*/_interopDefaultLegacy(prettier);
+
+const parseHtml = (html, parserOptions = {
+    blockTextElements: { script: false, style: false },
+}) => {
+    var _a, _b, _c;
+    if (!html) {
+        return null;
+    }
+    const prettyHtml = prettier__default["default"].format(html, { parser: 'html', printWidth: 120 });
+    const parsed = nodeHtmlParser.parse(prettyHtml, parserOptions);
+    return {
+        parsed,
+        body: (_a = parsed.querySelector('body')) === null || _a === void 0 ? void 0 : _a.innerHTML,
+        head: (_b = parsed.querySelector('head')) === null || _b === void 0 ? void 0 : _b.innerHTML,
+        application: (_c = parsed.querySelector('.application')) === null || _c === void 0 ? void 0 : _c.innerHTML,
+    };
+};
+
+exports.parseHtml = parseHtml;

package/lib/render.es.js

@@ -0,0 +1,29 @@
+import { parseHtml } from './parseHtml.es.js';
+
+const renderFactory = (request, { replaceDynamicStrings = {}, } = {}) => async (path, { method = 'get', parserOptions, } = {}) => {
+    const response = await request(path, { method });
+    let { text } = response;
+    for (const key in replaceDynamicStrings) {
+        text = text.replace(new RegExp(key, 'g'), replaceDynamicStrings[key]);
+    }
+    const parsed = parseHtml(text, parserOptions);
+    if (!parsed) {
+        throw new Error(`Cannot parse response
+  got response:
+    status: ${response.statusCode}
+    content: ${response.text}`);
+    }
+    return {
+        ...parsed,
+        get initialState() {
+            var _a, _b, _c;
+            const parsedWithScripts = (_a = parseHtml(response.text, {})) === null || _a === void 0 ? void 0 : _a.parsed;
+            if (!parsedWithScripts) {
+                return;
+            }
+            return JSON.parse((_c = (_b = parsedWithScripts.querySelector('#__TRAMVAI_STATE__')) === null || _b === void 0 ? void 0 : _b.textContent) !== null && _c !== void 0 ? _c : 'null');
+        },
+    };
+};
+
+export { renderFactory };

package/lib/render.js

@@ -0,0 +1,33 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var parseHtml = require('./parseHtml.js');
+
+const renderFactory = (request, { replaceDynamicStrings = {}, } = {}) => async (path, { method = 'get', parserOptions, } = {}) => {
+    const response = await request(path, { method });
+    let { text } = response;
+    for (const key in replaceDynamicStrings) {
+        text = text.replace(new RegExp(key, 'g'), replaceDynamicStrings[key]);
+    }
+    const parsed = parseHtml.parseHtml(text, parserOptions);
+    if (!parsed) {
+        throw new Error(`Cannot parse response
+  got response:
+    status: ${response.statusCode}
+    content: ${response.text}`);
+    }
+    return {
+        ...parsed,
+        get initialState() {
+            var _a, _b, _c;
+            const parsedWithScripts = (_a = parseHtml.parseHtml(response.text, {})) === null || _a === void 0 ? void 0 : _a.parsed;
+            if (!parsedWithScripts) {
+                return;
+            }
+            return JSON.parse((_c = (_b = parsedWithScripts.querySelector('#__TRAMVAI_STATE__')) === null || _b === void 0 ? void 0 : _b.textContent) !== null && _c !== void 0 ? _c : 'null');
+        },
+    };
+};
+
+exports.renderFactory = renderFactory;

package/lib/request.es.js

@@ -0,0 +1,25 @@
+import supertest from 'supertest';
+
+const requestFactory = (appOrUrl) => {
+    let server = appOrUrl;
+    if (typeof appOrUrl === 'object' && 'ready' in appOrUrl) {
+        appOrUrl.ready();
+        server = appOrUrl.server;
+    }
+    const request = supertest(server);
+    return (path, { method = 'get', body, contentType, headers = {}, } = {}) => {
+        const instance = request[method](path);
+        if (contentType) {
+            instance.type(contentType);
+        }
+        for (const header in headers) {
+            instance.set(header, headers[header]);
+        }
+        if (body) {
+            return instance.send(body);
+        }
+        return instance;
+    };
+};
+
+export { requestFactory };

package/lib/request.js

@@ -0,0 +1,33 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var supertest = require('supertest');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var supertest__default = /*#__PURE__*/_interopDefaultLegacy(supertest);
+
+const requestFactory = (appOrUrl) => {
+    let server = appOrUrl;
+    if (typeof appOrUrl === 'object' && 'ready' in appOrUrl) {
+        appOrUrl.ready();
+        server = appOrUrl.server;
+    }
+    const request = supertest__default["default"](server);
+    return (path, { method = 'get', body, contentType, headers = {}, } = {}) => {
+        const instance = request[method](path);
+        if (contentType) {
+            instance.type(contentType);
+        }
+        for (const header in headers) {
+            instance.set(header, headers[header]);
+        }
+        if (body) {
+            return instance.send(body);
+        }
+        return instance;
+    };
+};
+
+exports.requestFactory = requestFactory;

package/lib/wrapDi.es.js

@@ -0,0 +1,28 @@
+import { walkOfModules, getModuleParameters } from '@tramvai/core';
+import { createMockDi } from '@tramvai/test-mocks';
+
+const getDiWrapper = ({ providers = [], modules = [], di = createMockDi(), } = {}) => {
+    const resolvedModules = walkOfModules(modules);
+    resolvedModules.forEach((mod) => {
+        const moduleParameters = getModuleParameters(mod);
+        moduleParameters.providers.forEach((provider) => {
+            di.register(provider);
+        });
+    });
+    if (providers) {
+        providers.forEach((provider) => di.register(provider));
+    }
+    return {
+        di,
+        /**
+         * @description Run specific command line
+         * @param line one of the commandLineListTokens
+         */
+        runLine: (line) => {
+            const handlers = di.get({ token: line, multi: true });
+            return Promise.all(handlers.map((handler) => handler()));
+        },
+    };
+};
+
+export { getDiWrapper };

package/lib/wrapDi.js

@@ -0,0 +1,32 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var core = require('@tramvai/core');
+var testMocks = require('@tramvai/test-mocks');
+
+const getDiWrapper = ({ providers = [], modules = [], di = testMocks.createMockDi(), } = {}) => {
+    const resolvedModules = core.walkOfModules(modules);
+    resolvedModules.forEach((mod) => {
+        const moduleParameters = core.getModuleParameters(mod);
+        moduleParameters.providers.forEach((provider) => {
+            di.register(provider);
+        });
+    });
+    if (providers) {
+        providers.forEach((provider) => di.register(provider));
+    }
+    return {
+        di,
+        /**
+         * @description Run specific command line
+         * @param line one of the commandLineListTokens
+         */
+        runLine: (line) => {
+            const handlers = di.get({ token: line, multi: true });
+            return Promise.all(handlers.map((handler) => handler()));
+        },
+    };
+};
+
+exports.getDiWrapper = getDiWrapper;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/test-helpers",
-  "version": "2.70.1",
+  "version": "2.72.0",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -13,13 +13,12 @@
     "url": "git@github.com:Tinkoff/tramvai.git"
   },
   "scripts": {
-    "build": "tramvai-build --for-publish",
-    "watch": "tsc -w",
-    "build-for-publish": "true"
+    "build": "tramvai-build --forPublish --preserveModules",
+    "watch": "tsc -w"
   },
   "dependencies": {
-    "@tramvai/core": "2.70.1",
-    "@tramvai/test-mocks": "2.70.1",
+    "@tramvai/core": "2.72.0",
+    "@tramvai/test-mocks": "2.72.0",
     "@types/express": "^4.17.1",
     "@types/supertest": "^2.0.11",
     "fastify": "^4.6.0",
@@ -28,7 +27,7 @@
     "supertest": "^6.1.3"
   },
   "peerDependencies": {
-    "@tinkoff/dippy": "0.8.12",
+    "@tinkoff/dippy": "0.8.13",
     "tslib": "^2.4.0"
   },
   "devDependencies": {},