@sima-land/isomorph 11.0.0-alpha.0 → 11.0.0-alpha.11

package/{dist/http-client/utils.d.ts → http-client/sauce/index.d.ts}

@@ -1,5 +1,3 @@
-import type { Request } from 'express';
-import type { BaseConfig } from '../config/types';
 import type { AxiosInstance } from 'axios';
 import type { AxiosInstanceWrapper, MethodName } from 'middleware-axios';
 export declare type SauceResponse<T = any> = {
@@ -27,10 +25,3 @@ export interface Sauce {
  * @return Обертка.
  */
 export declare function sauce(instance: AxiosInstance | AxiosInstanceWrapper): Sauce;
-/**
- * Формирует заголовки для исходящих запросов с сервера по соглашению.
- * @param config Конфиг.
- * @param request Входящий запрос.
- * @return Заголовки для исходящих запросов.
- */
-export declare function getRequestHeaders(config: BaseConfig, request: Request): Record<string, string>;

package/{dist/http-client/utils.js → http-client/sauce/index.js}

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRequestHeaders = exports.sauce = void 0;
-const utils_1 = require("../http-server/utils");
+exports.sauce = void 0;
 /**
  * Оборачивает экземпляр axios. Все методы обертки возвращают promise, который никогда не попадают в состояние rejected.
  * @param instance Экземпляр axios или AxiosInstanceWrapper.
@@ -31,19 +30,4 @@ function sauce(instance) {
     };
 }
 exports.sauce = sauce;
-/**
- * Формирует заголовки для исходящих запросов с сервера по соглашению.
- * @param config Конфиг.
- * @param request Входящий запрос.
- * @return Заголовки для исходящих запросов.
- */
-function getRequestHeaders(config, request) {
-    return {
-        'X-Client-Ip': (0, utils_1.getXClientIp)(request),
-        'User-Agent': `simaland-${config.appName}/${config.appVersion}`,
-        Cookie: request.get('cookie') || '',
-        ...(0, utils_1.getServiceHeaders)(request),
-    };
-}
-exports.getRequestHeaders = getRequestHeaders;
-//# sourceMappingURL=utils.js.map
+//# sourceMappingURL=index.js.map

package/http-client/sauce/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/http-client/sauce/index.ts"],"names":[],"mappings":";;;AA4BA;;;;GAIG;AACH,SAAgB,KAAK,CAAC,QAA8C;IAClE,8DAA8D;IAC9D,SAAS,YAAY,CAAyB,UAAe;QAC3D,OAAO,KAAK,WACV,GAAG,IAAoC;YAEvC,IAAI;gBACF,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,CAAC,GAAI,IAAc,CAAC,CAAC;gBAChE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;aAC1C;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;aAC7B;QACH,CAAC,CAAC;IACJ,CAAC;IAED,OAAO;QACL,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC;QACxB,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC;QAC9B,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;QAC1B,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC;QAChC,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;QAC1B,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC;QACxB,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;KAC7B,CAAC;AACJ,CAAC;AAxBD,sBAwBC"}

package/http-client/utils.d.ts

@@ -0,0 +1,9 @@
+import type { Request } from 'express';
+import type { BaseConfig } from '../config/types';
+/**
+ * Формирует заголовки для исходящих запросов с сервера по соглашению.
+ * @param config Конфиг.
+ * @param request Входящий запрос.
+ * @return Заголовки для исходящих запросов.
+ */
+export declare function getRequestHeaders(config: BaseConfig, request: Request): Record<string, string>;

package/http-client/utils.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRequestHeaders = void 0;
+const utils_1 = require("../http-server/utils");
+/**
+ * Формирует заголовки для исходящих запросов с сервера по соглашению.
+ * @param config Конфиг.
+ * @param request Входящий запрос.
+ * @return Заголовки для исходящих запросов.
+ */
+function getRequestHeaders(config, request) {
+    return {
+        'X-Client-Ip': (0, utils_1.getXClientIp)(request),
+        'User-Agent': `simaland-${config.appName}/${config.appVersion}`,
+        Cookie: request.get('cookie') || '',
+        ...(0, utils_1.getServiceHeaders)(request),
+    };
+}
+exports.getRequestHeaders = getRequestHeaders;
+//# sourceMappingURL=utils.js.map

package/http-client/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/http-client/utils.ts"],"names":[],"mappings":";;;AAAA,gDAAuE;AAIvE;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,MAAkB,EAAE,OAAgB;IACpE,OAAO;QACL,aAAa,EAAE,IAAA,oBAAY,EAAC,OAAO,CAAC;QACpC,YAAY,EAAE,YAAY,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,UAAU,EAAE;QAC/D,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE;QACnC,GAAG,IAAA,yBAAiB,EAAC,OAAO,CAAC;KAC9B,CAAC;AACJ,CAAC;AAPD,8CAOC"}

package/http-server/middleware/tracing.d.ts

@@ -0,0 +1,14 @@
+import { Tracer } from '@opentelemetry/api';
+import type { Request, Handler } from 'express';
+/**
+ * Возвращает новый middleware для трассировки стадий входящего запроса.
+ * @param tracer Tracer.
+ * @return Middleware.
+ */
+export declare function tracingMiddleware(tracer: Tracer): Handler;
+/**
+ * Возвращает набор стандартных атрибутов для спана.
+ * @param req Входящий http-запрос.
+ * @return Атрибуты.
+ */
+export declare function getConventionalRequestAttrs(req: Request): Record<string, string | undefined>;

package/{dist/http-server → http-server}/middleware/tracing.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tracingMiddleware = void 0;
+exports.getConventionalRequestAttrs = exports.tracingMiddleware = void 0;
 const constants_1 = require("../constants");
 const api_1 = require("@opentelemetry/api");
 /**
@@ -10,8 +10,10 @@ const api_1 = require("@opentelemetry/api");
  */
 function tracingMiddleware(tracer) {
     return (req, res, next) => {
-        const rootContext = api_1.propagation.extract(api_1.ROOT_CONTEXT, req.headers);
-        const rootSpan = tracer.startSpan('response', undefined, rootContext);
+        const externalContext = api_1.propagation.extract(api_1.ROOT_CONTEXT, req.headers);
+        const rootSpan = tracer.startSpan('response', undefined, externalContext);
+        rootSpan.setAttributes(getConventionalRequestAttrs(req));
+        const rootContext = api_1.trace.setSpan(externalContext, rootSpan);
         res.locals.tracing = {
             rootSpan,
             rootContext,
@@ -29,4 +31,21 @@ function tracingMiddleware(tracer) {
     };
 }
 exports.tracingMiddleware = tracingMiddleware;
+/**
+ * Возвращает набор стандартных атрибутов для спана.
+ * @param req Входящий http-запрос.
+ * @return Атрибуты.
+ */
+function getConventionalRequestAttrs(req) {
+    const result = {
+        'request.path': req.originalUrl,
+    };
+    for (const headerName in req.headers) {
+        if (headerName.toLowerCase().startsWith('simaland-')) {
+            result[headerName] = req.header(headerName);
+        }
+    }
+    return result;
+}
+exports.getConventionalRequestAttrs = getConventionalRequestAttrs;
 //# sourceMappingURL=tracing.js.map

package/http-server/middleware/tracing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../../src/http-server/middleware/tracing.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAC9C,4CAA8E;AAG9E;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,MAAc;IAC9C,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACxB,MAAM,eAAe,GAAG,iBAAW,CAAC,OAAO,CAAC,kBAAY,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;QAE1E,QAAQ,CAAC,aAAa,CAAC,2BAA2B,CAAC,GAAG,CAAC,CAAC,CAAC;QAEzD,MAAM,WAAW,GAAG,WAAK,CAAC,OAAO,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAE7D,GAAG,CAAC,MAAM,CAAC,OAAO,GAAG;YACnB,QAAQ;YACR,WAAW;SACZ,CAAC;QAEF,GAAG,CAAC,IAAI,CAAC,0BAAc,CAAC,WAAW,EAAE,GAAG,EAAE;YACxC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QACrF,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,IAAI,CAAC,0BAAc,CAAC,YAAY,EAAE,GAAG,EAAE;YACzC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;YACtB,QAAQ,CAAC,GAAG,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC;AA5BD,8CA4BC;AAED;;;;GAIG;AACH,SAAgB,2BAA2B,CAAC,GAAY;IACtD,MAAM,MAAM,GAAuC;QACjD,cAAc,EAAE,GAAG,CAAC,WAAW;KAChC,CAAC;IAEF,KAAK,MAAM,UAAU,IAAI,GAAG,CAAC,OAAO,EAAE;QACpC,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;YACpD,MAAM,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;SAC7C;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAZD,kEAYC"}

package/http-server/template/index.d.ts

@@ -0,0 +1 @@
+export declare const pageTemplate: import("ejs").TemplateFunction;

package/http-server/template/index.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pageTemplate = void 0;
+const ejs_1 = require("ejs");
+exports.pageTemplate = (0, ejs_1.compile)(`
+<!DOCTYPE html>
+<html lang="ru">
+<head>
+  <meta charset="UTF-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title><%= title %></title>
+  <style>
+    * {
+      margin: 0;
+      padding: 0;
+      border: 0;
+      outline: 0;
+      box-sizing: border-box;
+      font: inherit;
+      line-height: inherit;
+    }
+  </style>
+  <% if (assets.css) { %>
+    <link rel="stylesheet" href="<%= assets.css %>">
+  <% } %>
+</head>
+<body>
+  <%- markup %>
+  <% if (assets.js) { %>
+    <script src="<%= assets.js %>"></script>
+  <% } %>
+</body>
+</html>
+`);
+//# sourceMappingURL=index.js.map

package/http-server/template/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/http-server/template/index.ts"],"names":[],"mappings":";;;AAAA,6BAA8B;AAEjB,QAAA,YAAY,GAAG,IAAA,aAAO,EAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8BnC,CAAC,CAAC"}

package/{dist/http-server → http-server}/types.d.ts

@@ -8,6 +8,14 @@ export interface PageAssets {
     js: string;
     css: string;
 }
+export interface PageTemplateData {
+    markup: string;
+    assets: PageAssets;
+    type: 'json' | 'html';
+}
+export interface PageTemplate {
+    (data: PageTemplateData): string;
+}
 export interface ConventionalJson {
     markup: string;
     bundle_js: string;

package/{dist/http-server → http-server}/utils.d.ts

@@ -1,4 +1,5 @@
 import type { Request, Response } from 'express';
+import type { PageTemplate, PageTemplateData } from './types';
 /**
  * Определяет IP входящего запроса.
  * @param req Входящий запрос.
@@ -15,12 +16,15 @@ export declare class PageResponse {
     private type;
     private html;
     private assets;
+    private _template;
     static create(): PageResponse;
     static defineFormat(req: Request): PageResponse['type'];
+    static defaultTemplate({ markup }: PageTemplateData): string;
     constructor();
     markup(html: string): this;
     script(url: string): this;
-    style(url: string): this;
+    styles(url: string): this;
     format(type: PageResponse['type']): this;
+    template(template: PageTemplate): this;
     send(res: Response): void;
 }

package/{dist/http-server → http-server}/utils.js

@@ -33,6 +33,7 @@ class PageResponse {
         this.type = 'html';
         this.html = '';
         this.assets = { js: '', css: '' };
+        this._template = PageResponse.defaultTemplate;
     }
     static create() {
         return new PageResponse();
@@ -44,6 +45,9 @@ class PageResponse {
         }
         return result;
     }
+    static defaultTemplate({ markup }) {
+        return markup;
+    }
     markup(html) {
         this.html = html;
         return this;
@@ -52,7 +56,7 @@ class PageResponse {
         this.assets.js = url;
         return this;
     }
-    style(url) {
+    styles(url) {
         this.assets.css = url;
         return this;
     }
@@ -60,11 +64,20 @@ class PageResponse {
         this.type = type;
         return this;
     }
+    template(template) {
+        this._template = template;
+        return this;
+    }
     send(res) {
+        const templateData = {
+            type: this.type,
+            markup: this.html,
+            assets: this.assets,
+        };
         switch (this.type) {
             case 'json': {
                 const result = {
-                    markup: this.html,
+                    markup: this._template(templateData),
                     bundle_js: this.assets.js,
                     bundle_css: this.assets.css,
                 };
@@ -74,8 +87,7 @@ class PageResponse {
             case 'html': {
                 res.setHeader('simaland-bundle-js', this.assets.js);
                 res.setHeader('simaland-bundle-css', this.assets.css);
-                // @todo dev-шаблон?
-                res.send(this.html);
+                res.send(this._template(templateData));
                 break;
             }
             default:

package/http-server/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/http-server/utils.ts"],"names":[],"mappings":"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"}

package/{dist/logger → logger}/handler/console.d.ts

@@ -1,5 +1,5 @@
 import type { BaseConfig } from '../../config/types';
-import { LoggerEventHandler } from '../types';
+import type { LoggerEventHandler } from '../types';
 /**
  * Возвращает новый handler для logger'а для вывода событий в терминал.
  * @param config Конфиг.

package/{dist/logger → logger}/handler/console.js

@@ -21,11 +21,18 @@ function createConsoleHandler(config) {
             },
         }
         : (0, pino_pretty_1.default)({ colorize: true }));
-    return function (event) {
+    return function handler(event) {
         switch (event.type) {
+            case 'log':
             case 'info':
                 logger.info(event.data);
                 break;
+            case 'warn':
+                logger.warn(event.data);
+                break;
+            case 'debug':
+                logger.debug(event.data);
+                break;
             case 'error':
                 logger.error(event.data);
                 break;

package/logger/handler/console.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../src/logger/handler/console.ts"],"names":[],"mappings":";;;;;;AAEA,gDAAwB;AACxB,8DAAqC;AAErC;;;;GAIG;AACH,SAAgB,oBAAoB,CAAC,MAAkB;IACrD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,KAAK,YAAY,CAAC;IAE3C,MAAM,MAAM,GAAG,IAAA,cAAI,EACjB,MAAM;QACJ,CAAC,CAAC;YACE,UAAU,EAAE;gBACV,0DAA0D;gBAC1D,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;aACnC;SACF;QACH,CAAC,CAAC,IAAA,qBAAU,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CACnC,CAAC;IAEF,OAAO,SAAS,OAAO,CAAC,KAAK;QAC3B,QAAQ,KAAK,CAAC,IAAI,EAAE;YAClB,KAAK,KAAK,CAAC;YACX,KAAK,MAAM;gBACT,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACxB,MAAM;YACR,KAAK,MAAM;gBACT,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACxB,MAAM;YACR,KAAK,OAAO;gBACV,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACzB,MAAM;YACR,KAAK,OAAO;gBACV,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACzB,MAAM;SACT;IACH,CAAC,CAAC;AACJ,CAAC;AA/BD,oDA+BC"}

package/logger/handler/sentry.d.ts

@@ -0,0 +1,8 @@
+import type { LoggerEventHandler } from '../types';
+import type { Hub } from '@sentry/types';
+/**
+ * Возвращает новый handler для logger'а для отправки событий в Sentry.
+ * @param hub Набор данных для работы с Sentry.
+ * @return Handler.
+ */
+export declare function createSentryHandler(hub: Hub): LoggerEventHandler;

package/{dist/logger → logger}/handler/sentry.js

@@ -1,19 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSentryHandler = void 0;
-const utils_1 = require("../../error-tracker/utils");
+const error_tracking_1 = require("../../error-tracking");
 /**
  * Возвращает новый handler для logger'а для отправки событий в Sentry.
- * @param sentry Набор данных для работы с Sentry.
+ * @param hub Набор данных для работы с Sentry.
  * @return Handler.
  */
-function createSentryHandler(sentry) {
+function createSentryHandler(hub) {
     return event => {
+        // error
         if (event.type === 'error') {
             const error = event.data;
-            if (error instanceof utils_1.SentryError) {
+            if (error instanceof error_tracking_1.SentryError) {
                 const { level, context, extra } = error.data;
-                sentry.withScope(scope => {
+                hub.withScope(scope => {
                     if (level) {
                         scope.setLevel(level);
                     }
@@ -23,13 +24,18 @@ function createSentryHandler(sentry) {
                     if (extra) {
                         scope.setExtra(extra.key, extra.data);
                     }
-                    sentry.client.captureException(error);
+                    hub.captureException(error);
                 });
             }
             else {
-                sentry.client.captureException(error);
+                hub.captureException(error);
             }
         }
+        // breadcrumb
+        if (event.data instanceof error_tracking_1.SentryBreadcrumb) {
+            const breadcrumb = event.data.data;
+            hub.addBreadcrumb(breadcrumb);
+        }
     };
 }
 exports.createSentryHandler = createSentryHandler;

package/logger/handler/sentry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sentry.js","sourceRoot":"","sources":["../../../src/logger/handler/sentry.ts"],"names":[],"mappings":";;;AAEA,yDAAqE;AAErE;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,GAAQ;IAC1C,OAAO,KAAK,CAAC,EAAE;QACb,QAAQ;QACR,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;YAC1B,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC;YAEzB,IAAI,KAAK,YAAY,4BAAW,EAAE;gBAChC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC;gBAE7C,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;oBACpB,IAAI,KAAK,EAAE;wBACT,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;qBACvB;oBAED,IAAI,OAAO,EAAE;wBACX,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;qBAC7C;oBAED,IAAI,KAAK,EAAE;wBACT,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;qBACvC;oBAED,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;gBAC9B,CAAC,CAAC,CAAC;aACJ;iBAAM;gBACL,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;aAC7B;SACF;QAED,aAAa;QACb,IAAI,KAAK,CAAC,IAAI,YAAY,iCAAgB,EAAE;YAC1C,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;YAEnC,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;SAC/B;IACH,CAAC,CAAC;AACJ,CAAC;AApCD,kDAoCC"}

package/logger/index.d.ts

@@ -0,0 +1,2 @@
+export { Logger, LoggerEvent, LoggerEventType, LoggerEventHandler } from './types';
+export { createLogger } from './logger';

package/logger/index.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createLogger = void 0;
+var logger_1 = require("./logger");
+Object.defineProperty(exports, "createLogger", { enumerable: true, get: function () { return logger_1.createLogger; } });
+//# sourceMappingURL=index.js.map

package/logger/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/logger/index.ts"],"names":[],"mappings":";;;AACA,mCAAwC;AAA/B,sGAAA,YAAY,OAAA"}

package/{dist/logger/index.js → logger/logger.js}

@@ -28,4 +28,4 @@ function createLogger() {
     };
 }
 exports.createLogger = createLogger;
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=logger.js.map

package/logger/logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger/logger.ts"],"names":[],"mappings":";;;AAEA;;;GAGG;AACH,SAAgB,YAAY;IAC1B,MAAM,QAAQ,GAAyB,EAAE,CAAC;IAE1C,8DAA8D;IAC9D,SAAS,YAAY,CAAC,IAAqB;QACzC,OAAO,UAAU,IAAS;YACxB,MAAM,KAAK,GAAgB,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;YAC1C,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;gBAC9B,OAAO,CAAC,KAAK,CAAC,CAAC;aAChB;QACH,CAAC,CAAC;IACJ,CAAC;IAED,OAAO;QACL,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC;QACxB,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;QAC1B,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;QAC1B,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;QAC5B,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;QAE5B,SAAS,EAAE,OAAO,CAAC,EAAE;YACnB,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzB,CAAC;KACF,CAAC;AACJ,CAAC;AAxBD,oCAwBC"}

package/package.json

@@ -1,23 +1,16 @@
 {
   "name": "@sima-land/isomorph",
-  "version": "11.0.0-alpha.0",
+  "version": "11.0.0-alpha.11",
   "description": "Tiny framework for fast start frontend microservices",
   "author": "www.sima-land.ru team",
   "license": "Apache-2.0",
-  "files": [
-    "src",
-    "dist",
-    "readme.md"
-  ],
-  "exports": {
-    "./": "./dist/"
-  },
   "scripts": {
     "prepare": "",
     "type-check": "tsc -p . --noEmit",
     "build:before": "rm -rf dist",
     "build:main": "tsc --project tsconfig.build.json",
-    "build": "npm run build:before && npm run build:main",
+    "build:after": "cp package.json dist/package.json",
+    "build": "npm run build:before && npm run build:main && npm run build:after",
     "lint": "eslint --cache ./src --ext .js,.jsx,.ts,.tsx",
     "test": "jest",
     "test:coverage": "jest --clearCache && jest --coverage"
@@ -26,8 +19,10 @@
     "@sima-land/linters": "^2.1.2",
     "@swc/jest": "^0.2.20",
     "@testing-library/react": "^12.1.3",
+    "@types/ejs": "^3.1.1",
     "@types/express": "^4.17.13",
     "@types/jest": "^27.4.1",
+    "@types/jsesc": "^3.0.1",
     "@types/lodash": "^4.14.182",
     "@types/react": "^17.0.40",
     "@types/react-dom": "^17.0.13",
@@ -38,7 +33,7 @@
   },
   "dependencies": {
     "@humanwhocodes/env": "^2.2.0",
-    "@opentelemetry/api": "^1.0.4",
+    "@opentelemetry/api": "^1.1.0",
     "@opentelemetry/exporter-jaeger": "^1.0.1",
     "@opentelemetry/instrumentation": "^0.27.0",
     "@opentelemetry/instrumentation-express": "^0.28.0",
@@ -50,7 +45,9 @@
     "@sentry/browser": "^6.19.3",
     "@sentry/node": "^6.19.3",
     "dotenv": "^16.0.0",
+    "ejs": "^3.1.8",
     "express": "^4.17.3",
+    "jsesc": "^3.0.2",
     "middleware-axios": "^2.1.2",
     "pino": "^7.9.1",
     "pino-pretty": "^7.5.4",

package/preset/browser/index.d.ts

@@ -0,0 +1,8 @@
+import { Resolve } from '../../di';
+import { Logger } from '../../logger';
+import { SagaExtendedMiddleware } from '../../utils/redux-saga';
+import type { BaseConfig } from '../../config/types';
+export declare function PresetBrowser(): import("../../di").Preset;
+export declare function provideBaseConfig(resolve: Resolve): BaseConfig;
+export declare function provideLogger(resolve: Resolve): Logger;
+export declare function provideSagaMiddleware(resolve: Resolve): SagaExtendedMiddleware;

package/preset/browser/index.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.provideSagaMiddleware = exports.provideLogger = exports.provideBaseConfig = exports.PresetBrowser = void 0;
+/* eslint-disable require-jsdoc, jsdoc/require-jsdoc  */
+const di_1 = require("../../di");
+const tokens_1 = require("../../tokens");
+const base_1 = require("../../config/base");
+const browser_1 = require("../../config/browser");
+const logger_1 = require("../../logger");
+const sentry_1 = require("../../logger/handler/sentry");
+const redux_saga_1 = require("../../utils/redux-saga");
+const browser_2 = require("@sentry/browser");
+const middleware_axios_1 = require("middleware-axios");
+function PresetBrowser() {
+    return (0, di_1.createPreset)([
+        [tokens_1.KnownToken.Config.source, browser_1.createConfigSource],
+        [tokens_1.KnownToken.Config.base, provideBaseConfig],
+        [tokens_1.KnownToken.logger, provideLogger],
+        [tokens_1.KnownToken.sagaMiddleware, provideSagaMiddleware],
+        [tokens_1.KnownToken.Http.Client.factory, () => middleware_axios_1.create],
+    ]);
+}
+exports.PresetBrowser = PresetBrowser;
+function provideBaseConfig(resolve) {
+    const source = resolve(tokens_1.KnownToken.Config.source);
+    return (0, base_1.createBaseConfig)(source);
+}
+exports.provideBaseConfig = provideBaseConfig;
+function provideLogger(resolve) {
+    const source = resolve(tokens_1.KnownToken.Config.source);
+    const client = new browser_2.BrowserClient({
+        dsn: source.require('SENTRY_CLIENT_DSN'),
+        release: source.require('SENTRY_RELEASE'),
+        environment: source.require('SENTRY_ENVIRONMENT'),
+        integrations: [...browser_2.defaultIntegrations],
+    });
+    const hub = new browser_2.Hub(client);
+    const logger = (0, logger_1.createLogger)();
+    logger.subscribe((0, sentry_1.createSentryHandler)(hub));
+    return logger;
+}
+exports.provideLogger = provideLogger;
+function provideSagaMiddleware(resolve) {
+    const logger = resolve(tokens_1.KnownToken.logger);
+    return (0, redux_saga_1.createSagaMiddleware)(logger);
+}
+exports.provideSagaMiddleware = provideSagaMiddleware;
+//# sourceMappingURL=index.js.map

package/preset/browser/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/preset/browser/index.ts"],"names":[],"mappings":";;;AAAA,wDAAwD;AACxD,iCAAiD;AACjD,yCAA0C;AAC1C,4CAAqD;AACrD,kDAA0D;AAC1D,yCAAoD;AACpD,wDAAkE;AAClE,uDAAsF;AACtF,6CAA0E;AAC1E,uDAA0C;AAG1C,SAAgB,aAAa;IAC3B,OAAO,IAAA,iBAAY,EAAC;QAClB,CAAC,mBAAU,CAAC,MAAM,CAAC,MAAM,EAAE,4BAAkB,CAAC;QAC9C,CAAC,mBAAU,CAAC,MAAM,CAAC,IAAI,EAAE,iBAAiB,CAAC;QAC3C,CAAC,mBAAU,CAAC,MAAM,EAAE,aAAa,CAAC;QAClC,CAAC,mBAAU,CAAC,cAAc,EAAE,qBAAqB,CAAC;QAClD,CAAC,mBAAU,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,yBAAM,CAAC;KAC/C,CAAC,CAAC;AACL,CAAC;AARD,sCAQC;AAED,SAAgB,iBAAiB,CAAC,OAAgB;IAChD,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEjD,OAAO,IAAA,uBAAgB,EAAC,MAAM,CAAC,CAAC;AAClC,CAAC;AAJD,8CAIC;AAED,SAAgB,aAAa,CAAC,OAAgB;IAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEjD,MAAM,MAAM,GAAG,IAAI,uBAAa,CAAC;QAC/B,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC;QACxC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC;QACzC,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC;QACjD,YAAY,EAAE,CAAC,GAAG,6BAAmB,CAAC;KACvC,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,MAAM,CAAC,CAAC;IAE5B,MAAM,MAAM,GAAG,IAAA,qBAAY,GAAE,CAAC;IAE9B,MAAM,CAAC,SAAS,CAAC,IAAA,4BAAmB,EAAC,GAAG,CAAC,CAAC,CAAC;IAE3C,OAAO,MAAM,CAAC;AAChB,CAAC;AAjBD,sCAiBC;AAED,SAAgB,qBAAqB,CAAC,OAAgB;IACpD,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAU,CAAC,MAAM,CAAC,CAAC;IAE1C,OAAO,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;AACtC,CAAC;AAJD,sDAIC"}