@sima-land/isomorph 11.0.0-alpha.33 → 11.0.0-alpha.34

package/cache/types.d.ts

@@ -1,5 +1,6 @@
 /**
  * Простейший интерфейс кэша.
+ * @todo Рассмотреть web-стандарт CacheStorage.
  */
 export interface Cache {
     /**

package/config/index.d.ts

@@ -0,0 +1,3 @@
+export { ConfigSource, BaseConfig } from './types';
+export { createConfigSource } from './source';
+export { createBaseConfig } from './base';

package/config/index.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createBaseConfig = exports.createConfigSource = void 0;
+var source_1 = require("./source");
+Object.defineProperty(exports, "createConfigSource", { enumerable: true, get: function () { return source_1.createConfigSource; } });
+var base_1 = require("./base");
+Object.defineProperty(exports, "createBaseConfig", { enumerable: true, get: function () { return base_1.createBaseConfig; } });
+//# sourceMappingURL=index.js.map

package/config/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";;;AACA,mCAA8C;AAArC,4GAAA,kBAAkB,OAAA;AAC3B,+BAA0C;AAAjC,wGAAA,gBAAgB,OAAA"}

package/config/source.d.ts

@@ -0,0 +1,11 @@
+import type { ConfigSource } from './types';
+interface Dictionary {
+    readonly [key: string]: string | undefined;
+}
+/**
+ * Возвращает новый источник конфигурации.
+ * @param dictionary Опции.
+ * @return Источник.
+ */
+export declare function createConfigSource(dictionary: Dictionary): ConfigSource;
+export {};

package/config/{browser.js → source.js}

@@ -3,15 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createConfigSource = void 0;
 const env_1 = require("@humanwhocodes/env");
 /**
- * Возвращает новый источник конфигурации для браузера.
+ * Возвращает новый источник конфигурации.
+ * @param dictionary Опции.
  * @return Источник.
  */
-function createConfigSource() {
+function createConfigSource(dictionary) {
     const source = {};
-    // докидываем process если он предоставлен сборкой
-    if (typeof process !== 'undefined') {
-        Object.assign(source, process.env);
-    }
+    // берем все переменные из предоставленной среды
+    Object.assign(source, dictionary);
     // докидываем зашиваемые переменные окружения
     if (typeof __ISOMORPH_ENV__ !== 'undefined') {
         Object.assign(source, __ISOMORPH_ENV__);
@@ -19,4 +18,4 @@ function createConfigSource() {
     return new env_1.Env(source);
 }
 exports.createConfigSource = createConfigSource;
-//# sourceMappingURL=browser.js.map
+//# sourceMappingURL=source.js.map

package/config/source.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"source.js","sourceRoot":"","sources":["../../src/config/source.ts"],"names":[],"mappings":";;;AACA,4CAAyC;AAQzC;;;;GAIG;AACH,SAAgB,kBAAkB,CAAC,UAAsB;IACvD,MAAM,MAAM,GAAe,EAAE,CAAC;IAE9B,gDAAgD;IAChD,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAElC,6CAA6C;IAC7C,IAAI,OAAO,gBAAgB,KAAK,WAAW,EAAE;QAC3C,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;KACzC;IAED,OAAO,IAAI,SAAG,CAAC,MAAM,CAAC,CAAC;AACzB,CAAC;AAZD,gDAYC"}

package/di/application.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createApplication = exports.CURRENT_APP = void 0;
 const errors_1 = require("./errors");
 const token_1 = require("./token");
-const container_1 = require("./container");
 /**
  * Токен, с помощью которого можно достать из приложения само приложение.
  */
@@ -14,55 +13,60 @@ exports.CURRENT_APP = (0, token_1.createToken)('application/self');
 class ApplicationImplementation {
     constructor() {
         this.providers = new Map();
+        this.components = new Map();
         this.presets = [];
+        this.initialized = false;
+    }
+    toString() {
+        return 'Application';
     }
     bind(token) {
-        if (this.providers.has(token)) {
-            throw new errors_1.AlreadyBoundError(token);
+        if (this.providers.has(token._key)) {
+            throw new errors_1.AlreadyBoundError(token, this.toString());
         }
         return {
             toValue: value => {
-                this.providers.set(token, () => value);
+                this.providers.set(token._key, () => value);
             },
             toProvider: provider => {
-                this.providers.set(token, provider);
+                this.providers.set(token._key, provider);
             },
         };
     }
     get(token) {
-        try {
-            return this.getContainer().get(token);
-        }
-        catch (error) {
-            if (error instanceof errors_1.NothingBoundError && error.token === token && this.parent) {
-                return this.parent.get(token);
-            }
-            else {
-                throw error;
+        if (!this.initialized) {
+            this.bind(exports.CURRENT_APP).toValue(this);
+            for (const preset of this.presets) {
+                preset.apply(this);
             }
+            this.initialized = true;
         }
+        return this.resolve(token, []);
     }
-    getContainer() {
-        if (!this.container) {
-            this.container = this.configureContainer();
+    resolve(token, chain) {
+        const nextChain = () => [...chain, token];
+        if (chain.includes(token)) {
+            throw new errors_1.CircularDependencyError(nextChain(), this.toString());
         }
-        return this.container;
-    }
-    configureContainer() {
-        const container = (0, container_1.createContainer)();
-        container.set(exports.CURRENT_APP, () => this);
-        for (const preset of this.presets) {
-            preset.apply(this);
+        if (this.components.has(token._key)) {
+            return this.components.get(token._key);
+        }
+        if (this.providers.has(token._key)) {
+            const provider = this.providers.get(token._key);
+            const component = provider(otherToken => this.resolve(otherToken, nextChain()));
+            // ВАЖНО: всегда как singleton
+            this.components.set(token._key, component);
+            return component;
         }
-        const resolve = token => this.get(token);
-        for (const [token, provider] of this.providers) {
-            container.set(token, () => provider(resolve));
+        if (this.parent) {
+            // ВАЖНО: передаём именно chain а не nextChain()
+            return this.parent.resolve(token, chain);
         }
-        return container;
+        throw new errors_1.NothingBoundError(token, this.toString());
     }
     attach(parent) {
         if (this.parent) {
-            throw Error('Cannot reattach application');
+            throw new Error('Cannot reattach application');
         }
         this.parent = parent;
     }

package/di/application.js.map

@@ -1 +1 @@
-{"version":3,"file":"application.js","sourceRoot":"","sources":["../../src/di/application.ts"],"names":[],"mappings":";;;AAWA,qCAAgE;AAChE,mCAAsC;AACtC,2CAA8C;AAE9C;;GAEG;AACU,QAAA,WAAW,GAAG,IAAA,mBAAW,EAAc,kBAAkB,CAAC,CAAC;AAExE;;GAEG;AACH,MAAM,yBAAyB;IAM7B;QACE,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACpB,CAAC;IAED,IAAI,CAAI,KAAe;QACrB,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YAC7B,MAAM,IAAI,0BAAiB,CAAC,KAAK,CAAC,CAAC;SACpC;QAED,OAAO;YACL,OAAO,EAAE,KAAK,CAAC,EAAE;gBACf,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;YACzC,CAAC;YACD,UAAU,EAAE,QAAQ,CAAC,EAAE;gBACrB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACtC,CAAC;SACF,CAAC;IACJ,CAAC;IAED,GAAG,CAAI,KAAe;QACpB,IAAI;YACF,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACvC;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,0BAAiB,IAAI,KAAK,CAAC,KAAK,KAAK,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE;gBAC9E,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;aAC/B;iBAAM;gBACL,MAAM,KAAK,CAAC;aACb;SACF;IACH,CAAC;IAEO,YAAY;QAClB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;SAC5C;QAED,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAEO,kBAAkB;QACxB,MAAM,SAAS,GAAG,IAAA,2BAAe,GAAE,CAAC;QAEpC,SAAS,CAAC,GAAG,CAAC,mBAAW,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QAEvC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE;YACjC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACpB;QAED,MAAM,OAAO,GAAY,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAElD,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE;YAC9C,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;SAC/C;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,CAAC,MAAmB;QACxB,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,MAAM,KAAK,CAAC,6BAA6B,CAAC,CAAC;SAC5C;QAED,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,MAAc;QACnB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED,MAAM,CACJ,MAAmB,EACnB,EAA0C;QAE1C,EAAE,CAAC,GAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAS,CAAC,CAAC;IACvD,CAAC;CACF;AAED;;;GAGG;AACH,SAAgB,iBAAiB;IAC/B,OAAO,IAAI,yBAAyB,EAAE,CAAC;AACzC,CAAC;AAFD,8CAEC"}
+{"version":3,"file":"application.js","sourceRoot":"","sources":["../../src/di/application.ts"],"names":[],"mappings":"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"}

package/di/errors.d.ts

@@ -3,12 +3,13 @@ import type { Token } from './types';
  * Ошибка, сообщающая, что в контейнере нет сервиса по заданному ключу.
  */
 export declare class NothingBoundError extends Error {
-    readonly token: Token<any>;
+    readonly token: Token<unknown>;
     /**
      * Конструктор.
      * @param token Токен.
+     * @param containerName Имя контейнера.
      */
-    constructor(token: Token<any>);
+    constructor(token: Token<unknown>, containerName?: string);
 }
 /**
  * Ошибка, сообщающая, что в контейнере уже зарегистрирован компонент под таким токеном.
@@ -17,8 +18,9 @@ export declare class AlreadyBoundError extends Error {
     /**
      * Конструктор.
      * @param token Токен.
+     * @param containerName Имя контейнера.
      */
-    constructor(token: Token<any>);
+    constructor(token: Token<unknown>, containerName?: string);
 }
 /**
  * Ошибка, сообщающая, что обнаружена циклическая зависимость.
@@ -27,6 +29,7 @@ export declare class CircularDependencyError extends Error {
     /**
      * Конструктор.
      * @param trace Список токенов, в котором обнаружен цикл.
+     * @param containerName Имя контейнера.
      */
-    constructor(trace: Token<any>[]);
+    constructor(trace: Token<unknown>[], containerName?: string);
 }

package/di/errors.js

@@ -8,9 +8,10 @@ class NothingBoundError extends Error {
     /**
      * Конструктор.
      * @param token Токен.
+     * @param containerName Имя контейнера.
      */
-    constructor(token) {
-        super(`Nothing bound to ${String(token)}`);
+    constructor(token, containerName) {
+        super(`Nothing bound to ${String(token)} in ${display(containerName)}`);
         this.name = 'NothingBoundError';
         this.token = token;
     }
@@ -23,9 +24,10 @@ class AlreadyBoundError extends Error {
     /**
      * Конструктор.
      * @param token Токен.
+     * @param containerName Имя контейнера.
      */
-    constructor(token) {
-        super(`Cannot rebind token, already bound: ${String(token)}`);
+    constructor(token, containerName) {
+        super(`Cannot rebind token in ${display(containerName)}, already bound: ${String(token)}`);
         this.name = 'AlreadyBoundError';
     }
 }
@@ -37,12 +39,21 @@ class CircularDependencyError extends Error {
     /**
      * Конструктор.
      * @param trace Список токенов, в котором обнаружен цикл.
+     * @param containerName Имя контейнера.
      */
-    constructor(trace) {
-        const names = trace.map(token => String(token._key)).join(' >> ');
-        super(`Circular dependency found, trace: ${names}`);
+    constructor(trace, containerName) {
+        const names = trace.map(String).join(' >> ');
+        super(`Circular dependency found in ${display(containerName)}, trace: ${names}`);
         this.name = 'CircularDependencyError';
     }
 }
 exports.CircularDependencyError = CircularDependencyError;
+/**
+ * Вернёт переданное имя контейнера или заглушку.
+ * @param containerName Имя.
+ * @return Имя или заглушка.
+ */
+function display(containerName) {
+    return containerName ?? '[unknown container]';
+}
 //# sourceMappingURL=errors.js.map

package/di/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/di/errors.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,MAAa,iBAAkB,SAAQ,KAAK;IAG1C;;;OAGG;IACH,YAAY,KAAiB;QAC3B,KAAK,CAAC,oBAAoB,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC3C,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;QAChC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AAZD,8CAYC;AAED;;GAEG;AACH,MAAa,iBAAkB,SAAQ,KAAK;IAC1C;;;OAGG;IACH,YAAY,KAAiB;QAC3B,KAAK,CAAC,uCAAuC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CACF;AATD,8CASC;AAED;;GAEG;AACH,MAAa,uBAAwB,SAAQ,KAAK;IAChD;;;OAGG;IACH,YAAY,KAAmB;QAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClE,KAAK,CAAC,qCAAqC,KAAK,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAC;IACxC,CAAC;CACF;AAVD,0DAUC"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/di/errors.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,MAAa,iBAAkB,SAAQ,KAAK;IAG1C;;;;OAIG;IACH,YAAY,KAAqB,EAAE,aAAsB;QACvD,KAAK,CAAC,oBAAoB,MAAM,CAAC,KAAK,CAAC,OAAO,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QACxE,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;QAChC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AAbD,8CAaC;AAED;;GAEG;AACH,MAAa,iBAAkB,SAAQ,KAAK;IAC1C;;;;OAIG;IACH,YAAY,KAAqB,EAAE,aAAsB;QACvD,KAAK,CAAC,0BAA0B,OAAO,CAAC,aAAa,CAAC,oBAAoB,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC3F,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CACF;AAVD,8CAUC;AAED;;GAEG;AACH,MAAa,uBAAwB,SAAQ,KAAK;IAChD;;;;OAIG;IACH,YAAY,KAAuB,EAAE,aAAsB;QACzD,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7C,KAAK,CAAC,gCAAgC,OAAO,CAAC,aAAa,CAAC,YAAY,KAAK,EAAE,CAAC,CAAC;QACjF,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAC;IACxC,CAAC;CACF;AAXD,0DAWC;AAED;;;;GAIG;AACH,SAAS,OAAO,CAAC,aAAsB;IACrC,OAAO,aAAa,IAAI,qBAAqB,CAAC;AAChD,CAAC"}

package/di/preset.d.ts

@@ -5,5 +5,5 @@ type PresetEntry<T = any> = [Token<T>, Provider<T>];
  * @param defaults Предустановленные зависимости.
  * @return Preset.
  */
-export declare function createPreset(defaults: PresetEntry[]): Preset;
+export declare function createPreset(defaults?: PresetEntry[]): Preset;
 export {};

package/di/preset.js

@@ -5,10 +5,6 @@ class PresetImplementation {
     constructor(defaults) {
         this.registry = new Map(defaults);
     }
-    override(token, provider) {
-        this.registry.set(token, provider);
-        return this;
-    }
     set(token, provider) {
         this.registry.set(token, provider);
         return this;

package/di/preset.js.map

@@ -1 +1 @@
-{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../src/di/preset.ts"],"names":[],"mappings":";;;AAKA,MAAM,oBAAoB;IAGxB,YAAY,QAA+B;QACzC,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,CAA4B,QAAQ,CAAC,CAAC;IAC/D,CAAC;IAED,QAAQ,CAAI,KAAe,EAAE,QAAqB;QAChD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,GAAG,CAAI,KAAe,EAAE,QAAqB;QAC3C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,GAAgB;QACpB,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC7C,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;SACtC;IACH,CAAC;CACF;AAED;;;;GAIG;AACH,SAAgB,YAAY,CAAC,QAAuB;IAClD,OAAO,IAAI,oBAAoB,CAAC,QAAQ,CAAC,CAAC;AAC5C,CAAC;AAFD,oCAEC"}
+{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../src/di/preset.ts"],"names":[],"mappings":";;;AAKA,MAAM,oBAAoB;IAGxB,YAAY,QAAgC;QAC1C,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,CAA4B,QAAQ,CAAC,CAAC;IAC/D,CAAC;IAED,GAAG,CAAI,KAAe,EAAE,QAAqB;QAC3C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,GAAgB;QACpB,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC7C,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;SACtC;IACH,CAAC;CACF;AAED;;;;GAIG;AACH,SAAgB,YAAY,CAAC,QAAwB;IACnD,OAAO,IAAI,oBAAoB,CAAC,QAAQ,CAAC,CAAC;AAC5C,CAAC;AAFD,oCAEC"}

package/di/token.js

@@ -24,7 +24,7 @@ class TokenImplementation {
      * @inheritdoc
      */
     toString() {
-        return `Token(${this._key.description})`;
+        return `Token(${this._key.description ?? 'unknown'})`;
     }
 }
 /**

package/di/token.js.map

@@ -1 +1 @@
-{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/di/token.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,MAAM,mBAAmB;IAGvB;;;OAGG;IACH,YAAY,IAAa;QACvB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAED;;;;OAIG;IACH,QAAQ,CAAC,QAA0B;QACjC,OAAO,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED;;OAEG;IACI,QAAQ;QACb,OAAO,SAAS,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC;IAC3C,CAAC;CACF;AAED;;;;GAIG;AACH,SAAgB,WAAW,CAAY,IAAa;IAClD,OAAO,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;AACvC,CAAC;AAFD,kCAEC"}
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/di/token.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,MAAM,mBAAmB;IAGvB;;;OAGG;IACH,YAAY,IAAa;QACvB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAED;;;;OAIG;IACH,QAAQ,CAAC,QAA0B;QACjC,OAAO,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,QAAQ;QACN,OAAO,SAAS,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,SAAS,GAAG,CAAC;IACxD,CAAC;CACF;AAED;;;;GAIG;AACH,SAAgB,WAAW,CAAY,IAAa;IAClD,OAAO,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;AACvC,CAAC;AAFD,kCAEC"}

package/di/types.d.ts

@@ -79,8 +79,6 @@ export interface Application {
  * Пресет - набор провайдеров (с возможностью их добавлять/переопределять) который можно применить к DI-приложению.
  */
 export interface Preset {
-    /** @deprecated */
-    override: <T>(token: Token<T>, provider: Provider<T>) => this;
     /** Добавляет провайдер в пресет. */
     set: <T>(token: Token<T>, provider: Provider<T>) => this;
     /** Применяет пресет к переданному приложению. */

package/http/errors.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Ошибка валидации статуса ответа.
+ */
+export declare class StatusError extends Error {
+    readonly response: Response;
+    /**
+     * @param response Ответ.
+     */
+    constructor(response: Response);
+    /**
+     * Определяет, является ли переданное значение ошибкой валидации статуса.
+     * @param value Значение.
+     * @return Результат.
+     */
+    static is(value: unknown): value is StatusError;
+}

package/http/errors.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StatusError = void 0;
+/**
+ * Ошибка валидации статуса ответа.
+ */
+class StatusError extends Error {
+    /**
+     * @param response Ответ.
+     */
+    constructor(response) {
+        super(`HTTP Request failed with status ${response.status}`);
+        this.name = 'StatusError';
+        this.response = response;
+    }
+    /**
+     * Определяет, является ли переданное значение ошибкой валидации статуса.
+     * @param value Значение.
+     * @return Результат.
+     */
+    static is(value) {
+        return value?.name === 'StatusError';
+    }
+}
+exports.StatusError = StatusError;
+//# sourceMappingURL=errors.js.map

package/http/errors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/http/errors.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,MAAa,WAAY,SAAQ,KAAK;IAGpC;;OAEG;IACH,YAAY,QAAkB;QAC5B,KAAK,CAAC,mCAAmC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QAC5D,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,EAAE,CAAC,KAAc;QACtB,OAAQ,KAAa,EAAE,IAAI,KAAK,aAAa,CAAC;IAChD,CAAC;CACF;AApBD,kCAoBC"}

package/http/index.d.ts

@@ -0,0 +1,4 @@
+export type { Handler, Enhancer, Middleware, LogData, DoneLogData, FailLogData, LogHandler, LogHandlerFactory, } from './types';
+export { configureFetch, applyMiddleware } from '@krutoo/fetch-tools';
+export { log, cookie, defaultHeaders, validateStatus } from '@krutoo/fetch-tools/middleware';
+export { StatusError } from './errors';

package/http/index.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StatusError = exports.validateStatus = exports.defaultHeaders = exports.cookie = exports.log = exports.applyMiddleware = exports.configureFetch = void 0;
+var fetch_tools_1 = require("@krutoo/fetch-tools");
+Object.defineProperty(exports, "configureFetch", { enumerable: true, get: function () { return fetch_tools_1.configureFetch; } });
+Object.defineProperty(exports, "applyMiddleware", { enumerable: true, get: function () { return fetch_tools_1.applyMiddleware; } });
+var middleware_1 = require("@krutoo/fetch-tools/middleware");
+Object.defineProperty(exports, "log", { enumerable: true, get: function () { return middleware_1.log; } });
+Object.defineProperty(exports, "cookie", { enumerable: true, get: function () { return middleware_1.cookie; } });
+Object.defineProperty(exports, "defaultHeaders", { enumerable: true, get: function () { return middleware_1.defaultHeaders; } });
+Object.defineProperty(exports, "validateStatus", { enumerable: true, get: function () { return middleware_1.validateStatus; } });
+var errors_1 = require("./errors");
+Object.defineProperty(exports, "StatusError", { enumerable: true, get: function () { return errors_1.StatusError; } });
+//# sourceMappingURL=index.js.map

package/http/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/http/index.ts"],"names":[],"mappings":";;;AAUA,mDAAsE;AAA7D,6GAAA,cAAc,OAAA;AAAE,8GAAA,eAAe,OAAA;AACxC,6DAA6F;AAApF,iGAAA,GAAG,OAAA;AAAE,oGAAA,MAAM,OAAA;AAAE,4GAAA,cAAc,OAAA;AAAE,4GAAA,cAAc,OAAA;AACpD,mCAAuC;AAA9B,qGAAA,WAAW,OAAA"}

package/http/types.d.ts

@@ -0,0 +1,2 @@
+export type { Handler, Enhancer, Middleware, CookieStore } from '@krutoo/fetch-tools';
+export type { LogData, DoneLogData, FailLogData, LogHandler, LogHandlerFactory, } from '@krutoo/fetch-tools/middleware';

package/{error-tracking → http}/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/error-tracking/types.ts"],"names":[],"mappings":""}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/http/types.ts"],"names":[],"mappings":""}

package/http-server/types.d.ts

@@ -1,5 +1,5 @@
-import type { Request, Response, NextFunction, Handler, ErrorRequestHandler } from 'express';
-export interface ResponseContext {
+import type { Request, Response, NextFunction } from 'express';
+export interface HandlerContext {
     req: Request;
     res: Response;
     next: NextFunction;
@@ -26,10 +26,3 @@ export interface ConventionalJson {
     critical_css?: string;
     meta?: any;
 }
-export interface DefaultMiddleware {
-    start: Handler[];
-    logging: Handler[];
-    tracing: Handler[];
-    metrics: Handler[];
-    finish: Array<Handler | ErrorRequestHandler>;
-}

package/http-server/utils.d.ts

@@ -1,6 +1,12 @@
-import type { Request, Response } from 'express';
+import type { Handler, Request, Response } from 'express';
 import type { PageAssets, PageTemplate, PageTemplateData } from './types';
 import type { BaseConfig } from '../config/types';
+/**
+ * Объединяет промежуточные слои в один.
+ * @param list Промежуточные слои.
+ * @return Промежуточный слой.
+ */
+export declare function composeMiddleware(list: Handler[]): Handler;
 /**
  * Определяет IP входящего запроса.
  * @param req Входящий запрос.

package/http-server/utils.js

@@ -1,7 +1,26 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PageResponse = exports.getRequestHeaders = exports.getServiceHeaders = exports.getXClientIp = void 0;
-const net_1 = require("net");
+exports.PageResponse = exports.getRequestHeaders = exports.getServiceHeaders = exports.getXClientIp = exports.composeMiddleware = void 0;
+const node_net_1 = __importDefault(require("node:net"));
+/**
+ * Объединяет промежуточные слои в один.
+ * @param list Промежуточные слои.
+ * @return Промежуточный слой.
+ */
+function composeMiddleware(list) {
+    return list.reduce((a, b) => (req, res, next) => {
+        a(req, res, err => {
+            if (err) {
+                return next(err);
+            }
+            b(req, res, next);
+        });
+    });
+}
+exports.composeMiddleware = composeMiddleware;
 /**
  * Определяет IP входящего запроса.
  * @param req Входящий запрос.
@@ -9,7 +28,7 @@ const net_1 = require("net");
  */
 function getXClientIp(req) {
     const headerValue = req.get('x-client-ip') || req.get('x-forwarded-for') || req.socket.remoteAddress || '';
-    return (0, net_1.isIP)(headerValue) ? headerValue : '';
+    return node_net_1.default.isIP(headerValue) ? headerValue : '';
 }
 exports.getXClientIp = getXClientIp;
 /**

package/http-server/utils.js.map

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

package/log/errors.d.ts

@@ -0,0 +1,23 @@
+import { ErrorDetails, BreadcrumbDetails } from './types';
+/**
+ * Ошибка с данными.
+ */
+export declare class DetailedError extends Error {
+    data: ErrorDetails;
+    /**
+     * @param message Сообщение.
+     * @param data Данные.
+     */
+    constructor(message?: string, data?: ErrorDetails);
+}
+/**
+ * Хлебная крошка.
+ */
+export declare class Breadcrumb {
+    type: string;
+    data: BreadcrumbDetails;
+    /**
+     * @param data Данные.
+     */
+    constructor(data: BreadcrumbDetails);
+}

package/log/errors.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Breadcrumb = exports.DetailedError = void 0;
+/**
+ * Ошибка с данными.
+ */
+class DetailedError extends Error {
+    /**
+     * @param message Сообщение.
+     * @param data Данные.
+     */
+    constructor(message, data = {}) {
+        super(message);
+        this.data = data;
+    }
+}
+exports.DetailedError = DetailedError;
+/**
+ * Хлебная крошка.
+ */
+class Breadcrumb {
+    /**
+     * @param data Данные.
+     */
+    constructor(data) {
+        this.type = 'breadcrumb';
+        this.data = data;
+    }
+}
+exports.Breadcrumb = Breadcrumb;
+//# sourceMappingURL=errors.js.map

package/log/errors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/log/errors.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,MAAa,aAAc,SAAQ,KAAK;IAGtC;;;OAGG;IACH,YAAY,OAAgB,EAAE,OAAqB,EAAE;QACnD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF;AAXD,sCAWC;AAED;;GAEG;AACH,MAAa,UAAU;IAIrB;;OAEG;IACH,YAAY,IAAuB;QACjC,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF;AAXD,gCAWC"}

package/log/handler/pino.d.ts

@@ -1,8 +1,8 @@
-import type { LoggerEventHandler } from '../types';
+import type { LogHandler } from '../types';
 import type pino from 'pino';
 /**
  * Возвращает новый handler для logger'а для вывода событий в терминал.
  * @param pinoInstance Конфиг.
  * @return Handler.
  */
-export declare function createPinoHandler(pinoInstance: pino.Logger): LoggerEventHandler;
+export declare function createPinoHandler(pinoInstance: pino.Logger): LogHandler;

package/log/handler/sentry.d.ts

@@ -1,8 +1,8 @@
-import type { LoggerEventHandler } from '../types';
+import type { LogHandler } from '../types';
 import type { Hub } from '@sentry/types';
 /**
  * Возвращает новый handler для logger'а для отправки событий в Sentry.
  * @param hubInit Sentry Hub или функция которая его вернёт.
  * @return Handler.
  */
-export declare function createSentryHandler(hubInit: Hub | (() => Hub)): LoggerEventHandler;
+export declare function createSentryHandler(hubInit: Hub | (() => Hub)): LogHandler;

package/log/handler/sentry.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSentryHandler = void 0;
-const error_tracking_1 = require("../../error-tracking");
+const log_1 = require("../../log");
 /**
  * Возвращает новый handler для logger'а для отправки событий в Sentry.
  * @param hubInit Sentry Hub или функция которая его вернёт.
@@ -17,7 +17,7 @@ function createSentryHandler(hubInit) {
         // error
         if (event.type === 'error') {
             const error = event.data;
-            if (error instanceof error_tracking_1.SentryError) {
+            if (error instanceof log_1.DetailedError) {
                 const { level, context, extra } = error.data;
                 hub.withScope(scope => {
                     if (level) {
@@ -40,7 +40,7 @@ function createSentryHandler(hubInit) {
             }
         }
         // breadcrumb
-        if (event.data instanceof error_tracking_1.SentryBreadcrumb) {
+        if (event.data instanceof log_1.Breadcrumb) {
             const breadcrumb = event.data.data;
             hub.addBreadcrumb(breadcrumb);
         }