@tramvai/module-child-app 4.22.0 → 4.24.0

package/lib/browser/providers.browser.js

@@ -1,6 +1,6 @@
-import { Scope, DI_TOKEN } from '@tinkoff/dippy';
+import { Scope, DI_TOKEN, optional } from '@tinkoff/dippy';
 import { provide, commandLineListTokens } from '@tramvai/core';
-import { CHILD_APP_LOADER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_DI_MANAGER_TOKEN, CHILD_APP_COMMON_INITIAL_STATE_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN, CHILD_APP_CONTRACT_MANAGER, HOST_PROVIDED_CONTRACTS } from '@tramvai/tokens-child-app';
+import { CHILD_APP_LOADER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_DI_MANAGER_TOKEN, CHILD_APP_COMMON_INITIAL_STATE_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN, CHILD_APP_CONTRACT_MANAGER, HOST_PROVIDED_CONTRACTS, HOST_REQUIRED_CONTRACTS } from '@tramvai/tokens-child-app';
 import { LOGGER_TOKEN, STORE_TOKEN } from '@tramvai/tokens-common';
 import { ROUTER_TOKEN, PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
 import { ChildAppContractManager } from '../contracts/contractManager.browser.browser.js';
@@ -136,7 +136,9 @@ const browserProviders = [
         useFactory: (deps) => new ChildAppContractManager(deps),
         deps: {
             appDi: DI_TOKEN,
-            hostProvidedContracts: HOST_PROVIDED_CONTRACTS,
+            hostProvidedContracts: optional(HOST_PROVIDED_CONTRACTS),
+            hostRequiredContracts: optional(HOST_REQUIRED_CONTRACTS),
+            logger: LOGGER_TOKEN,
         },
     }),
     provide({

package/lib/browser.js

@@ -2,8 +2,9 @@ import { __decorate } from 'tslib';
 import { Module } from '@tramvai/core';
 import { sharedProviders } from './shared/providers.browser.js';
 import { browserProviders } from './browser/providers.browser.js';
-export * from '@tramvai/tokens-child-app';
+export { Assert } from './export.browser.js';
 export { ChildApp } from './shared/react/component.browser.js';
+export * from '@tramvai/tokens-child-app';
 
 let ChildAppModule = class ChildAppModule {
 };

package/lib/contracts/contractManager.base.browser.js

@@ -1,33 +1,140 @@
 import flatten from '@tinkoff/utils/array/flatten';
+import isNil from '@tinkoff/utils/is/nil';
 import { optional } from '@tinkoff/dippy';
-import { CHILD_APP_INTERNAL_CONFIG_TOKEN, IS_CHILD_APP_CONTRACTS_COMPATIBLE_TOKEN, CHILD_REQUIRED_CONTRACTS } from '@tramvai/tokens-child-app';
+import { CHILD_APP_INTERNAL_CONFIG_TOKEN, IS_CHILD_APP_CONTRACTS_COMPATIBLE_TOKEN, CHILD_REQUIRED_CONTRACTS, CHILD_CONTRACTS_FALLBACK, HOST_CONTRACTS_FALLBACK, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_PROVIDED_CONTRACTS } from '@tramvai/tokens-child-app';
 
+/* eslint-disable no-console */
 class BaseChildAppContractManager {
-    constructor({ hostProvidedContracts }) {
-        this.hostProvidedContracts = hostProvidedContracts;
+    constructor({ appDi, hostProvidedContracts, hostRequiredContracts, logger, }) {
+        this.appDi = appDi;
+        this.hostProvidedContracts = hostProvidedContracts !== null && hostProvidedContracts !== void 0 ? hostProvidedContracts : [];
+        this.hostRequiredContracts = hostRequiredContracts !== null && hostRequiredContracts !== void 0 ? hostRequiredContracts : [];
+        this.log = logger('child-app:contract-manager');
     }
     registerChildContracts(childDi) {
-        var _a;
+        var _a, _b;
         const childAppConfig = childDi.get(CHILD_APP_INTERNAL_CONFIG_TOKEN);
         const childHasContractsSupport = childDi.get(optional(IS_CHILD_APP_CONTRACTS_COMPATIBLE_TOKEN));
         const childRequiredContracts = flatten((_a = childDi.get(optional(CHILD_REQUIRED_CONTRACTS))) !== null && _a !== void 0 ? _a : []);
-        const childRequiredContractsKeys = childRequiredContracts.map((c) => c.toString());
         const hostProvidedContracts = this.getHostProvidedContracts(childAppConfig.name);
+        const hostProvidedContractsKeys = hostProvidedContracts.map((c) => c.toString());
         // if contracts unsupported, it is a legacy child app, and we need to register all possible contracts
-        // otherwise register only required for child app contracts
-        const hasContractsToRegistration = !childHasContractsSupport || childRequiredContracts.length > 0;
-        if (hasContractsToRegistration) {
-            for (const contract of hostProvidedContracts) {
+        if (!childHasContractsSupport) {
+            hostProvidedContracts.forEach((contract) => {
+                this.registerContract(childDi, contract);
+            });
+            // otherwise register only required for child app contracts
+        }
+        else if (childHasContractsSupport && childRequiredContracts.length > 0) {
+            const missedContracts = [];
+            childRequiredContracts.forEach((contract) => {
                 const contractKey = contract.toString();
-                // if contracts unsupported, it is a legacy child app, and we need to register all possible contracts
-                // otherwise match required and provided contracts by key
-                const isChildRequiredContract = !childHasContractsSupport || childRequiredContractsKeys.includes(contractKey);
-                if (isChildRequiredContract) {
-                    this.registerContract(childDi, contract);
+                if (hostProvidedContractsKeys.includes(contractKey)) {
+                    this.registerContract(childDi, 
+                    // we can't use `contract` here, because token from Child App chunk and from host bundle will not be equal by reference
+                    hostProvidedContracts.find((c) => c.toString() === contractKey));
+                }
+                else {
+                    this.log.warn(`Contract "${contract}" for "${childAppConfig.name}" Child App is not provided in the application`);
+                    missedContracts.push(contract);
                 }
+            });
+            if (missedContracts.length) {
+                this.log.warn({
+                    message: `Missed contracts for "${childAppConfig.name}" Child App`,
+                    missedContracts,
+                });
+                const fallbacks = (_b = childDi.get(optional(CHILD_CONTRACTS_FALLBACK))) !== null && _b !== void 0 ? _b : [];
+                fallbacks.forEach((fallback) => {
+                    fallback({
+                        childDi,
+                        missedContracts,
+                    });
+                });
+            }
+        }
+    }
+    validateChildProvidedContracts(childDi) {
+        var _a;
+        const childAppConfig = childDi.get(CHILD_APP_INTERNAL_CONFIG_TOKEN);
+        const hostDi = this.getRequestHostDi();
+        const childProvidedContracts = this.getChildProvidedContracts(childDi);
+        const childProvidedContractsKeys = childProvidedContracts.map((c) => c.toString());
+        const hostRequiredContracts = this.getHostRequiredContracts(childAppConfig.name);
+        const missedContracts = [];
+        hostRequiredContracts.forEach((required) => {
+            const requiredKey = required.toString();
+            if (!childProvidedContractsKeys.includes(requiredKey)) {
+                missedContracts.push(required);
             }
+        });
+        if (missedContracts.length) {
+            this.log.warn({
+                message: `Missed contracts for application, required from "${childAppConfig.name}" Child App`,
+                missedContracts,
+            });
+            const fallbacks = (_a = hostDi.get(optional(HOST_CONTRACTS_FALLBACK))) !== null && _a !== void 0 ? _a : [];
+            fallbacks.forEach((fallback) => {
+                fallback({
+                    hostDi,
+                    missedContracts,
+                });
+            });
         }
     }
+    async getChildProvidedContract(childAppName, contract) {
+        var _a, _b, _c, _d;
+        try {
+            // Resolve CHILD_APP_PRELOAD_MANAGER_TOKEN from DI to prevent circular dependency error
+            const childAppPreloadManager = this.appDi.get(CHILD_APP_PRELOAD_MANAGER_TOKEN);
+            // Wait for Child App loading before trying to resolve contract from Child App DI
+            await childAppPreloadManager.preload({ name: childAppName });
+        }
+        catch {
+            return null;
+        }
+        const childAppDi = this.getChildDi(childAppName);
+        const childProvidedContracts = this.getChildProvidedContracts(childAppName);
+        const childProvidedContractsKeys = childProvidedContracts.map((c) => c.toString());
+        const hostRequiredContracts = this.getHostRequiredContracts(childAppName);
+        const hostRequiredContractsKeys = hostRequiredContracts.map((c) => c.toString());
+        if (!hostRequiredContractsKeys.includes(contract.toString())) {
+            this.log.warn(`Contract "${contract}" is not required in the application`);
+            return null;
+        }
+        if (!childProvidedContractsKeys.includes(contract.toString())) {
+            this.log.warn(`Contract "${contract}" is not provided in the "${childAppName}" Child App`);
+        }
+        const result = ((_d = (_c = (_a = childAppDi === null || childAppDi === void 0 ? void 0 : childAppDi.get(optional(contract))) !== null && _a !== void 0 ? _a : 
+        // contract can be registered in host DI in fallback
+        (_b = this.getRequestHostDi()) === null || _b === void 0 ? void 0 : _b.get(optional(contract))) !== null && _c !== void 0 ? _c : this.appDi.get(optional(contract))) !== null && _d !== void 0 ? _d : null);
+        if (isNil(result)) {
+            this.log.warn(`Contract "${contract}" is declared but not provided in the "${childAppName}" Child App or application contracts fallback`);
+        }
+        return result;
+    }
+    getChildDi(childAppName) {
+        var _a;
+        // Resolve CHILD_APP_RESOLVE_CONFIG_TOKEN from DI to prevent scope conflict warning
+        const resolveChildAppConfig = ((_a = this.getRequestHostDi()) !== null && _a !== void 0 ? _a : this.appDi).get(CHILD_APP_RESOLVE_CONFIG_TOKEN);
+        const childAppConfig = resolveChildAppConfig({ name: childAppName });
+        // ContractManager has Singleton scope, and we need to get Request scope Child App DI container.
+        // At server-side it will be resolved from Async Local Storage, at client-side everything is Singleton
+        const childAppDiManager = this.getRequestChildDiManager();
+        const childAppDi = childAppDiManager === null || childAppDiManager === void 0 ? void 0 : childAppDiManager.getChildDi(childAppConfig);
+        return childAppDi;
+    }
+    /**
+     * Pass DI here when we can't resolve it from Child DI manager without cycle
+     * - `Container` is used in case when `validateChildProvidedContracts` call this method
+     * - `string` is used in case when `getChildProvidedContract` call this method
+     */
+    getChildProvidedContracts(childAppNameOrDi) {
+        var _a;
+        const childAppDi = typeof childAppNameOrDi === 'string' ? this.getChildDi(childAppNameOrDi) : childAppNameOrDi;
+        const childProvidedContracts = flatten((_a = childAppDi === null || childAppDi === void 0 ? void 0 : childAppDi.get(optional(CHILD_PROVIDED_CONTRACTS))) !== null && _a !== void 0 ? _a : []);
+        return childProvidedContracts;
+    }
     getHostProvidedContracts(childAppName) {
         const contracts = [];
         // look over all provided by host contracts
@@ -41,6 +148,19 @@ class BaseChildAppContractManager {
         }
         return contracts;
     }
+    getHostRequiredContracts(childAppName) {
+        const contracts = [];
+        // look over all required by host contracts
+        for (const contract of this.hostRequiredContracts) {
+            // host require contract from specific Child APp
+            const contractFromChild = contract.childAppName === childAppName;
+            if (contractFromChild) {
+                contracts.push(...contract.requiredContracts);
+            }
+        }
+        return contracts;
+    }
 }
+/* eslint-enable no-console */
 
 export { BaseChildAppContractManager };

package/lib/contracts/contractManager.base.d.ts

@@ -1,16 +1,36 @@
-import type { ExtractDependencyType } from '@tinkoff/dippy';
+import type { ExtractDependencyType, TokenInterface } from '@tinkoff/dippy';
 import { type Container } from '@tinkoff/dippy';
-import type { Contract, HOST_PROVIDED_CONTRACTS } from '@tramvai/tokens-child-app';
-import { type ChildAppContractManager as IChildAppContractManager } from '@tramvai/tokens-child-app';
-type HostProvidedContracts = ExtractDependencyType<typeof HOST_PROVIDED_CONTRACTS>;
+import type { CHILD_APP_DI_MANAGER_TOKEN, Contract, HOST_PROVIDED_CONTRACTS, HOST_REQUIRED_CONTRACTS, ChildAppContractManager as IChildAppContractManager } from '@tramvai/tokens-child-app';
+import type { LOGGER_TOKEN } from '@tramvai/tokens-common';
+export type HostProvidedContracts = ExtractDependencyType<typeof HOST_PROVIDED_CONTRACTS>;
+export type HostRequiredContracts = ExtractDependencyType<typeof HOST_REQUIRED_CONTRACTS>;
+export type ChildAppDiManager = ExtractDependencyType<typeof CHILD_APP_DI_MANAGER_TOKEN>;
+export type Logger = ExtractDependencyType<typeof LOGGER_TOKEN>;
 export declare abstract class BaseChildAppContractManager implements IChildAppContractManager {
-    private hostProvidedContracts;
-    constructor({ hostProvidedContracts }: {
-        hostProvidedContracts: HostProvidedContracts;
+    protected appDi: Container;
+    protected hostProvidedContracts: HostProvidedContracts;
+    protected hostRequiredContracts: HostRequiredContracts;
+    protected log: ReturnType<Logger>;
+    constructor({ appDi, hostProvidedContracts, hostRequiredContracts, logger, }: {
+        appDi: Container;
+        hostProvidedContracts: HostProvidedContracts | null;
+        hostRequiredContracts: HostRequiredContracts | null;
+        logger: Logger;
     });
+    protected abstract registerContract(childDi: Container, contract: Contract): void;
+    protected abstract getRequestHostDi(): Container | null;
+    protected abstract getRequestChildDiManager(): ChildAppDiManager | null;
     registerChildContracts(childDi: Container): void;
-    abstract registerContract(childDi: Container, contract: Contract): void;
+    validateChildProvidedContracts(childDi: Container): void;
+    getChildProvidedContract<T extends TokenInterface<any>>(childAppName: string, contract: T): Promise<ExtractDependencyType<T> | null>;
+    private getChildDi;
+    /**
+     * Pass DI here when we can't resolve it from Child DI manager without cycle
+     * - `Container` is used in case when `validateChildProvidedContracts` call this method
+     * - `string` is used in case when `getChildProvidedContract` call this method
+     */
+    private getChildProvidedContracts;
     private getHostProvidedContracts;
+    private getHostRequiredContracts;
 }
-export {};
 //# sourceMappingURL=contractManager.base.d.ts.map

package/lib/contracts/contractManager.base.es.js

@@ -1,33 +1,140 @@
 import flatten from '@tinkoff/utils/array/flatten';
+import isNil from '@tinkoff/utils/is/nil';
 import { optional } from '@tinkoff/dippy';
-import { CHILD_APP_INTERNAL_CONFIG_TOKEN, IS_CHILD_APP_CONTRACTS_COMPATIBLE_TOKEN, CHILD_REQUIRED_CONTRACTS } from '@tramvai/tokens-child-app';
+import { CHILD_APP_INTERNAL_CONFIG_TOKEN, IS_CHILD_APP_CONTRACTS_COMPATIBLE_TOKEN, CHILD_REQUIRED_CONTRACTS, CHILD_CONTRACTS_FALLBACK, HOST_CONTRACTS_FALLBACK, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_PROVIDED_CONTRACTS } from '@tramvai/tokens-child-app';
 
+/* eslint-disable no-console */
 class BaseChildAppContractManager {
-    constructor({ hostProvidedContracts }) {
-        this.hostProvidedContracts = hostProvidedContracts;
+    constructor({ appDi, hostProvidedContracts, hostRequiredContracts, logger, }) {
+        this.appDi = appDi;
+        this.hostProvidedContracts = hostProvidedContracts !== null && hostProvidedContracts !== void 0 ? hostProvidedContracts : [];
+        this.hostRequiredContracts = hostRequiredContracts !== null && hostRequiredContracts !== void 0 ? hostRequiredContracts : [];
+        this.log = logger('child-app:contract-manager');
     }
     registerChildContracts(childDi) {
-        var _a;
+        var _a, _b;
         const childAppConfig = childDi.get(CHILD_APP_INTERNAL_CONFIG_TOKEN);
         const childHasContractsSupport = childDi.get(optional(IS_CHILD_APP_CONTRACTS_COMPATIBLE_TOKEN));
         const childRequiredContracts = flatten((_a = childDi.get(optional(CHILD_REQUIRED_CONTRACTS))) !== null && _a !== void 0 ? _a : []);
-        const childRequiredContractsKeys = childRequiredContracts.map((c) => c.toString());
         const hostProvidedContracts = this.getHostProvidedContracts(childAppConfig.name);
+        const hostProvidedContractsKeys = hostProvidedContracts.map((c) => c.toString());
         // if contracts unsupported, it is a legacy child app, and we need to register all possible contracts
-        // otherwise register only required for child app contracts
-        const hasContractsToRegistration = !childHasContractsSupport || childRequiredContracts.length > 0;
-        if (hasContractsToRegistration) {
-            for (const contract of hostProvidedContracts) {
+        if (!childHasContractsSupport) {
+            hostProvidedContracts.forEach((contract) => {
+                this.registerContract(childDi, contract);
+            });
+            // otherwise register only required for child app contracts
+        }
+        else if (childHasContractsSupport && childRequiredContracts.length > 0) {
+            const missedContracts = [];
+            childRequiredContracts.forEach((contract) => {
                 const contractKey = contract.toString();
-                // if contracts unsupported, it is a legacy child app, and we need to register all possible contracts
-                // otherwise match required and provided contracts by key
-                const isChildRequiredContract = !childHasContractsSupport || childRequiredContractsKeys.includes(contractKey);
-                if (isChildRequiredContract) {
-                    this.registerContract(childDi, contract);
+                if (hostProvidedContractsKeys.includes(contractKey)) {
+                    this.registerContract(childDi, 
+                    // we can't use `contract` here, because token from Child App chunk and from host bundle will not be equal by reference
+                    hostProvidedContracts.find((c) => c.toString() === contractKey));
+                }
+                else {
+                    this.log.warn(`Contract "${contract}" for "${childAppConfig.name}" Child App is not provided in the application`);
+                    missedContracts.push(contract);
                 }
+            });
+            if (missedContracts.length) {
+                this.log.warn({
+                    message: `Missed contracts for "${childAppConfig.name}" Child App`,
+                    missedContracts,
+                });
+                const fallbacks = (_b = childDi.get(optional(CHILD_CONTRACTS_FALLBACK))) !== null && _b !== void 0 ? _b : [];
+                fallbacks.forEach((fallback) => {
+                    fallback({
+                        childDi,
+                        missedContracts,
+                    });
+                });
+            }
+        }
+    }
+    validateChildProvidedContracts(childDi) {
+        var _a;
+        const childAppConfig = childDi.get(CHILD_APP_INTERNAL_CONFIG_TOKEN);
+        const hostDi = this.getRequestHostDi();
+        const childProvidedContracts = this.getChildProvidedContracts(childDi);
+        const childProvidedContractsKeys = childProvidedContracts.map((c) => c.toString());
+        const hostRequiredContracts = this.getHostRequiredContracts(childAppConfig.name);
+        const missedContracts = [];
+        hostRequiredContracts.forEach((required) => {
+            const requiredKey = required.toString();
+            if (!childProvidedContractsKeys.includes(requiredKey)) {
+                missedContracts.push(required);
             }
+        });
+        if (missedContracts.length) {
+            this.log.warn({
+                message: `Missed contracts for application, required from "${childAppConfig.name}" Child App`,
+                missedContracts,
+            });
+            const fallbacks = (_a = hostDi.get(optional(HOST_CONTRACTS_FALLBACK))) !== null && _a !== void 0 ? _a : [];
+            fallbacks.forEach((fallback) => {
+                fallback({
+                    hostDi,
+                    missedContracts,
+                });
+            });
         }
     }
+    async getChildProvidedContract(childAppName, contract) {
+        var _a, _b, _c, _d;
+        try {
+            // Resolve CHILD_APP_PRELOAD_MANAGER_TOKEN from DI to prevent circular dependency error
+            const childAppPreloadManager = this.appDi.get(CHILD_APP_PRELOAD_MANAGER_TOKEN);
+            // Wait for Child App loading before trying to resolve contract from Child App DI
+            await childAppPreloadManager.preload({ name: childAppName });
+        }
+        catch {
+            return null;
+        }
+        const childAppDi = this.getChildDi(childAppName);
+        const childProvidedContracts = this.getChildProvidedContracts(childAppName);
+        const childProvidedContractsKeys = childProvidedContracts.map((c) => c.toString());
+        const hostRequiredContracts = this.getHostRequiredContracts(childAppName);
+        const hostRequiredContractsKeys = hostRequiredContracts.map((c) => c.toString());
+        if (!hostRequiredContractsKeys.includes(contract.toString())) {
+            this.log.warn(`Contract "${contract}" is not required in the application`);
+            return null;
+        }
+        if (!childProvidedContractsKeys.includes(contract.toString())) {
+            this.log.warn(`Contract "${contract}" is not provided in the "${childAppName}" Child App`);
+        }
+        const result = ((_d = (_c = (_a = childAppDi === null || childAppDi === void 0 ? void 0 : childAppDi.get(optional(contract))) !== null && _a !== void 0 ? _a : 
+        // contract can be registered in host DI in fallback
+        (_b = this.getRequestHostDi()) === null || _b === void 0 ? void 0 : _b.get(optional(contract))) !== null && _c !== void 0 ? _c : this.appDi.get(optional(contract))) !== null && _d !== void 0 ? _d : null);
+        if (isNil(result)) {
+            this.log.warn(`Contract "${contract}" is declared but not provided in the "${childAppName}" Child App or application contracts fallback`);
+        }
+        return result;
+    }
+    getChildDi(childAppName) {
+        var _a;
+        // Resolve CHILD_APP_RESOLVE_CONFIG_TOKEN from DI to prevent scope conflict warning
+        const resolveChildAppConfig = ((_a = this.getRequestHostDi()) !== null && _a !== void 0 ? _a : this.appDi).get(CHILD_APP_RESOLVE_CONFIG_TOKEN);
+        const childAppConfig = resolveChildAppConfig({ name: childAppName });
+        // ContractManager has Singleton scope, and we need to get Request scope Child App DI container.
+        // At server-side it will be resolved from Async Local Storage, at client-side everything is Singleton
+        const childAppDiManager = this.getRequestChildDiManager();
+        const childAppDi = childAppDiManager === null || childAppDiManager === void 0 ? void 0 : childAppDiManager.getChildDi(childAppConfig);
+        return childAppDi;
+    }
+    /**
+     * Pass DI here when we can't resolve it from Child DI manager without cycle
+     * - `Container` is used in case when `validateChildProvidedContracts` call this method
+     * - `string` is used in case when `getChildProvidedContract` call this method
+     */
+    getChildProvidedContracts(childAppNameOrDi) {
+        var _a;
+        const childAppDi = typeof childAppNameOrDi === 'string' ? this.getChildDi(childAppNameOrDi) : childAppNameOrDi;
+        const childProvidedContracts = flatten((_a = childAppDi === null || childAppDi === void 0 ? void 0 : childAppDi.get(optional(CHILD_PROVIDED_CONTRACTS))) !== null && _a !== void 0 ? _a : []);
+        return childProvidedContracts;
+    }
     getHostProvidedContracts(childAppName) {
         const contracts = [];
         // look over all provided by host contracts
@@ -41,6 +148,19 @@ class BaseChildAppContractManager {
         }
         return contracts;
     }
+    getHostRequiredContracts(childAppName) {
+        const contracts = [];
+        // look over all required by host contracts
+        for (const contract of this.hostRequiredContracts) {
+            // host require contract from specific Child APp
+            const contractFromChild = contract.childAppName === childAppName;
+            if (contractFromChild) {
+                contracts.push(...contract.requiredContracts);
+            }
+        }
+        return contracts;
+    }
 }
+/* eslint-enable no-console */
 
 export { BaseChildAppContractManager };

package/lib/contracts/contractManager.base.js

@@ -3,39 +3,147 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var flatten = require('@tinkoff/utils/array/flatten');
+var isNil = require('@tinkoff/utils/is/nil');
 var dippy = require('@tinkoff/dippy');
 var tokensChildApp = require('@tramvai/tokens-child-app');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
+var isNil__default = /*#__PURE__*/_interopDefaultLegacy(isNil);
 
+/* eslint-disable no-console */
 class BaseChildAppContractManager {
-    constructor({ hostProvidedContracts }) {
-        this.hostProvidedContracts = hostProvidedContracts;
+    constructor({ appDi, hostProvidedContracts, hostRequiredContracts, logger, }) {
+        this.appDi = appDi;
+        this.hostProvidedContracts = hostProvidedContracts !== null && hostProvidedContracts !== void 0 ? hostProvidedContracts : [];
+        this.hostRequiredContracts = hostRequiredContracts !== null && hostRequiredContracts !== void 0 ? hostRequiredContracts : [];
+        this.log = logger('child-app:contract-manager');
     }
     registerChildContracts(childDi) {
-        var _a;
+        var _a, _b;
         const childAppConfig = childDi.get(tokensChildApp.CHILD_APP_INTERNAL_CONFIG_TOKEN);
         const childHasContractsSupport = childDi.get(dippy.optional(tokensChildApp.IS_CHILD_APP_CONTRACTS_COMPATIBLE_TOKEN));
         const childRequiredContracts = flatten__default["default"]((_a = childDi.get(dippy.optional(tokensChildApp.CHILD_REQUIRED_CONTRACTS))) !== null && _a !== void 0 ? _a : []);
-        const childRequiredContractsKeys = childRequiredContracts.map((c) => c.toString());
         const hostProvidedContracts = this.getHostProvidedContracts(childAppConfig.name);
+        const hostProvidedContractsKeys = hostProvidedContracts.map((c) => c.toString());
         // if contracts unsupported, it is a legacy child app, and we need to register all possible contracts
-        // otherwise register only required for child app contracts
-        const hasContractsToRegistration = !childHasContractsSupport || childRequiredContracts.length > 0;
-        if (hasContractsToRegistration) {
-            for (const contract of hostProvidedContracts) {
+        if (!childHasContractsSupport) {
+            hostProvidedContracts.forEach((contract) => {
+                this.registerContract(childDi, contract);
+            });
+            // otherwise register only required for child app contracts
+        }
+        else if (childHasContractsSupport && childRequiredContracts.length > 0) {
+            const missedContracts = [];
+            childRequiredContracts.forEach((contract) => {
                 const contractKey = contract.toString();
-                // if contracts unsupported, it is a legacy child app, and we need to register all possible contracts
-                // otherwise match required and provided contracts by key
-                const isChildRequiredContract = !childHasContractsSupport || childRequiredContractsKeys.includes(contractKey);
-                if (isChildRequiredContract) {
-                    this.registerContract(childDi, contract);
+                if (hostProvidedContractsKeys.includes(contractKey)) {
+                    this.registerContract(childDi, 
+                    // we can't use `contract` here, because token from Child App chunk and from host bundle will not be equal by reference
+                    hostProvidedContracts.find((c) => c.toString() === contractKey));
+                }
+                else {
+                    this.log.warn(`Contract "${contract}" for "${childAppConfig.name}" Child App is not provided in the application`);
+                    missedContracts.push(contract);
                 }
+            });
+            if (missedContracts.length) {
+                this.log.warn({
+                    message: `Missed contracts for "${childAppConfig.name}" Child App`,
+                    missedContracts,
+                });
+                const fallbacks = (_b = childDi.get(dippy.optional(tokensChildApp.CHILD_CONTRACTS_FALLBACK))) !== null && _b !== void 0 ? _b : [];
+                fallbacks.forEach((fallback) => {
+                    fallback({
+                        childDi,
+                        missedContracts,
+                    });
+                });
+            }
+        }
+    }
+    validateChildProvidedContracts(childDi) {
+        var _a;
+        const childAppConfig = childDi.get(tokensChildApp.CHILD_APP_INTERNAL_CONFIG_TOKEN);
+        const hostDi = this.getRequestHostDi();
+        const childProvidedContracts = this.getChildProvidedContracts(childDi);
+        const childProvidedContractsKeys = childProvidedContracts.map((c) => c.toString());
+        const hostRequiredContracts = this.getHostRequiredContracts(childAppConfig.name);
+        const missedContracts = [];
+        hostRequiredContracts.forEach((required) => {
+            const requiredKey = required.toString();
+            if (!childProvidedContractsKeys.includes(requiredKey)) {
+                missedContracts.push(required);
             }
+        });
+        if (missedContracts.length) {
+            this.log.warn({
+                message: `Missed contracts for application, required from "${childAppConfig.name}" Child App`,
+                missedContracts,
+            });
+            const fallbacks = (_a = hostDi.get(dippy.optional(tokensChildApp.HOST_CONTRACTS_FALLBACK))) !== null && _a !== void 0 ? _a : [];
+            fallbacks.forEach((fallback) => {
+                fallback({
+                    hostDi,
+                    missedContracts,
+                });
+            });
         }
     }
+    async getChildProvidedContract(childAppName, contract) {
+        var _a, _b, _c, _d;
+        try {
+            // Resolve CHILD_APP_PRELOAD_MANAGER_TOKEN from DI to prevent circular dependency error
+            const childAppPreloadManager = this.appDi.get(tokensChildApp.CHILD_APP_PRELOAD_MANAGER_TOKEN);
+            // Wait for Child App loading before trying to resolve contract from Child App DI
+            await childAppPreloadManager.preload({ name: childAppName });
+        }
+        catch {
+            return null;
+        }
+        const childAppDi = this.getChildDi(childAppName);
+        const childProvidedContracts = this.getChildProvidedContracts(childAppName);
+        const childProvidedContractsKeys = childProvidedContracts.map((c) => c.toString());
+        const hostRequiredContracts = this.getHostRequiredContracts(childAppName);
+        const hostRequiredContractsKeys = hostRequiredContracts.map((c) => c.toString());
+        if (!hostRequiredContractsKeys.includes(contract.toString())) {
+            this.log.warn(`Contract "${contract}" is not required in the application`);
+            return null;
+        }
+        if (!childProvidedContractsKeys.includes(contract.toString())) {
+            this.log.warn(`Contract "${contract}" is not provided in the "${childAppName}" Child App`);
+        }
+        const result = ((_d = (_c = (_a = childAppDi === null || childAppDi === void 0 ? void 0 : childAppDi.get(dippy.optional(contract))) !== null && _a !== void 0 ? _a : 
+        // contract can be registered in host DI in fallback
+        (_b = this.getRequestHostDi()) === null || _b === void 0 ? void 0 : _b.get(dippy.optional(contract))) !== null && _c !== void 0 ? _c : this.appDi.get(dippy.optional(contract))) !== null && _d !== void 0 ? _d : null);
+        if (isNil__default["default"](result)) {
+            this.log.warn(`Contract "${contract}" is declared but not provided in the "${childAppName}" Child App or application contracts fallback`);
+        }
+        return result;
+    }
+    getChildDi(childAppName) {
+        var _a;
+        // Resolve CHILD_APP_RESOLVE_CONFIG_TOKEN from DI to prevent scope conflict warning
+        const resolveChildAppConfig = ((_a = this.getRequestHostDi()) !== null && _a !== void 0 ? _a : this.appDi).get(tokensChildApp.CHILD_APP_RESOLVE_CONFIG_TOKEN);
+        const childAppConfig = resolveChildAppConfig({ name: childAppName });
+        // ContractManager has Singleton scope, and we need to get Request scope Child App DI container.
+        // At server-side it will be resolved from Async Local Storage, at client-side everything is Singleton
+        const childAppDiManager = this.getRequestChildDiManager();
+        const childAppDi = childAppDiManager === null || childAppDiManager === void 0 ? void 0 : childAppDiManager.getChildDi(childAppConfig);
+        return childAppDi;
+    }
+    /**
+     * Pass DI here when we can't resolve it from Child DI manager without cycle
+     * - `Container` is used in case when `validateChildProvidedContracts` call this method
+     * - `string` is used in case when `getChildProvidedContract` call this method
+     */
+    getChildProvidedContracts(childAppNameOrDi) {
+        var _a;
+        const childAppDi = typeof childAppNameOrDi === 'string' ? this.getChildDi(childAppNameOrDi) : childAppNameOrDi;
+        const childProvidedContracts = flatten__default["default"]((_a = childAppDi === null || childAppDi === void 0 ? void 0 : childAppDi.get(dippy.optional(tokensChildApp.CHILD_PROVIDED_CONTRACTS))) !== null && _a !== void 0 ? _a : []);
+        return childProvidedContracts;
+    }
     getHostProvidedContracts(childAppName) {
         const contracts = [];
         // look over all provided by host contracts
@@ -49,6 +157,19 @@ class BaseChildAppContractManager {
         }
         return contracts;
     }
+    getHostRequiredContracts(childAppName) {
+        const contracts = [];
+        // look over all required by host contracts
+        for (const contract of this.hostRequiredContracts) {
+            // host require contract from specific Child APp
+            const contractFromChild = contract.childAppName === childAppName;
+            if (contractFromChild) {
+                contracts.push(...contract.requiredContracts);
+            }
+        }
+        return contracts;
+    }
 }
+/* eslint-enable no-console */
 
 exports.BaseChildAppContractManager = BaseChildAppContractManager;

package/lib/contracts/contractManager.browser.browser.js

@@ -1,22 +1,28 @@
 import isNil from '@tinkoff/utils/is/nil';
 import { provide, optional } from '@tinkoff/dippy';
+import { CHILD_APP_INTERNAL_CONFIG_TOKEN, CHILD_APP_DI_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
 import { BaseChildAppContractManager } from './contractManager.base.browser.js';
 
 class ChildAppContractManager extends BaseChildAppContractManager {
-    constructor({ appDi, hostProvidedContracts, }) {
-        super({ hostProvidedContracts });
-        this.appDi = appDi;
-    }
     registerContract(childDi, contract) {
         childDi.register(provide({
             provide: contract,
             useFactory: () => {
                 const value = this.appDi.get(optional(contract));
-                if (isNil(value)) ;
+                if (isNil(value)) {
+                    const { name } = childDi.get(CHILD_APP_INTERNAL_CONFIG_TOKEN);
+                    this.log.warn(`Contract "${contract}" for "${name}" Child App is declared but not provided in the application or contracts fallback`);
+                }
                 return value;
             },
         }));
     }
+    getRequestHostDi() {
+        return this.appDi;
+    }
+    getRequestChildDiManager() {
+        return this.appDi.get(optional(CHILD_APP_DI_MANAGER_TOKEN));
+    }
 }
 
 export { ChildAppContractManager };

package/lib/contracts/contractManager.browser.d.ts

@@ -1,15 +1,10 @@
-import type { ExtractDependencyType } from '@tinkoff/dippy';
 import { type Container } from '@tinkoff/dippy';
-import type { Contract, HOST_PROVIDED_CONTRACTS } from '@tramvai/tokens-child-app';
+import type { Contract } from '@tramvai/tokens-child-app';
+import type { ChildAppDiManager } from './contractManager.base';
 import { BaseChildAppContractManager } from './contractManager.base';
-type HostProvidedContracts = ExtractDependencyType<typeof HOST_PROVIDED_CONTRACTS>;
 export declare class ChildAppContractManager extends BaseChildAppContractManager {
-    private appDi;
-    constructor({ appDi, hostProvidedContracts, }: {
-        appDi: Container;
-        hostProvidedContracts: HostProvidedContracts;
-    });
     registerContract(childDi: Container, contract: Contract): void;
+    getRequestHostDi(): Container | null;
+    getRequestChildDiManager(): ChildAppDiManager | null;
 }
-export {};
 //# sourceMappingURL=contractManager.browser.d.ts.map

package/lib/contracts/contractManager.server.d.ts

@@ -1,24 +1,27 @@
 import type { DI_TOKEN, ExtractDependencyType } from '@tinkoff/dippy';
 import { type Container } from '@tinkoff/dippy';
-import type { Contract, HOST_PROVIDED_CONTRACTS } from '@tramvai/tokens-child-app';
+import type { Contract } from '@tramvai/tokens-child-app';
 import type { ASYNC_LOCAL_STORAGE_TOKEN } from '@tramvai/tokens-common';
+import type { ChildAppDiManager, HostProvidedContracts, HostRequiredContracts, Logger } from './contractManager.base';
 import { BaseChildAppContractManager } from './contractManager.base';
 declare module '@tramvai/tokens-common' {
     interface AsyncLocalStorageState {
         tramvaiRequestDi?: ExtractDependencyType<typeof DI_TOKEN>;
     }
 }
-type HostProvidedContracts = ExtractDependencyType<typeof HOST_PROVIDED_CONTRACTS>;
 type AsyncLocalStorageType = ExtractDependencyType<typeof ASYNC_LOCAL_STORAGE_TOKEN>;
 export declare class ChildAppContractManager extends BaseChildAppContractManager {
-    private appDi;
     private asyncLocalStorage;
-    constructor({ appDi, asyncLocalStorage, hostProvidedContracts, }: {
+    constructor({ appDi, asyncLocalStorage, hostProvidedContracts, hostRequiredContracts, logger, }: {
         appDi: Container;
         asyncLocalStorage: AsyncLocalStorageType;
-        hostProvidedContracts: HostProvidedContracts;
+        hostProvidedContracts: HostProvidedContracts | null;
+        hostRequiredContracts: HostRequiredContracts | null;
+        logger: Logger;
     });
     registerContract(childDi: Container, contract: Contract): void;
+    getRequestHostDi(): Container | null;
+    getRequestChildDiManager(): ChildAppDiManager | null;
 }
 export {};
 //# sourceMappingURL=contractManager.server.d.ts.map

package/lib/contracts/contractManager.server.es.js

@@ -1,11 +1,16 @@
 import isNil from '@tinkoff/utils/is/nil';
 import { provide, optional } from '@tinkoff/dippy';
+import { CHILD_APP_INTERNAL_CONFIG_TOKEN, CHILD_APP_DI_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
 import { BaseChildAppContractManager } from './contractManager.base.es.js';
 
 class ChildAppContractManager extends BaseChildAppContractManager {
-    constructor({ appDi, asyncLocalStorage, hostProvidedContracts, }) {
-        super({ hostProvidedContracts });
-        this.appDi = appDi;
+    constructor({ appDi, asyncLocalStorage, hostProvidedContracts, hostRequiredContracts, logger, }) {
+        super({
+            appDi,
+            hostProvidedContracts,
+            hostRequiredContracts,
+            logger,
+        });
         this.asyncLocalStorage = asyncLocalStorage;
     }
     registerContract(childDi, contract) {
@@ -14,12 +19,24 @@ class ChildAppContractManager extends BaseChildAppContractManager {
             useFactory: () => {
                 var _a, _b, _c;
                 const value = (_c = (_b = (_a = this.asyncLocalStorage.getStore()) === null || _a === void 0 ? void 0 : _a.tramvaiRequestDi) === null || _b === void 0 ? void 0 : _b.get(optional(contract))) !== null && _c !== void 0 ? _c : this.appDi.get(optional(contract));
-                if (isNil(value)) ;
+                if (isNil(value)) {
+                    const { name } = childDi.get(CHILD_APP_INTERNAL_CONFIG_TOKEN);
+                    this.log.warn(`Contract "${contract}" for "${name}" Child App is declared but not provided in the application or contracts fallback`);
+                }
                 // TODO: Request scoped contrace is resolved in Singleton scope - what should we do?
                 return value;
             },
         }));
     }
+    getRequestHostDi() {
+        var _a, _b;
+        return (_b = (_a = this.asyncLocalStorage.getStore()) === null || _a === void 0 ? void 0 : _a.tramvaiRequestDi) !== null && _b !== void 0 ? _b : null;
+    }
+    getRequestChildDiManager() {
+        var _a, _b, _c;
+        return ((_c = (_b = (_a = this.asyncLocalStorage
+            .getStore()) === null || _a === void 0 ? void 0 : _a.tramvaiRequestDi) === null || _b === void 0 ? void 0 : _b.get(optional(CHILD_APP_DI_MANAGER_TOKEN))) !== null && _c !== void 0 ? _c : null);
+    }
 }
 
 export { ChildAppContractManager };

package/lib/contracts/contractManager.server.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var isNil = require('@tinkoff/utils/is/nil');
 var dippy = require('@tinkoff/dippy');
+var tokensChildApp = require('@tramvai/tokens-child-app');
 var contractManager_base = require('./contractManager.base.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -11,9 +12,13 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var isNil__default = /*#__PURE__*/_interopDefaultLegacy(isNil);
 
 class ChildAppContractManager extends contractManager_base.BaseChildAppContractManager {
-    constructor({ appDi, asyncLocalStorage, hostProvidedContracts, }) {
-        super({ hostProvidedContracts });
-        this.appDi = appDi;
+    constructor({ appDi, asyncLocalStorage, hostProvidedContracts, hostRequiredContracts, logger, }) {
+        super({
+            appDi,
+            hostProvidedContracts,
+            hostRequiredContracts,
+            logger,
+        });
         this.asyncLocalStorage = asyncLocalStorage;
     }
     registerContract(childDi, contract) {
@@ -22,12 +27,24 @@ class ChildAppContractManager extends contractManager_base.BaseChildAppContractM
             useFactory: () => {
                 var _a, _b, _c;
                 const value = (_c = (_b = (_a = this.asyncLocalStorage.getStore()) === null || _a === void 0 ? void 0 : _a.tramvaiRequestDi) === null || _b === void 0 ? void 0 : _b.get(dippy.optional(contract))) !== null && _c !== void 0 ? _c : this.appDi.get(dippy.optional(contract));
-                if (isNil__default["default"](value)) ;
+                if (isNil__default["default"](value)) {
+                    const { name } = childDi.get(tokensChildApp.CHILD_APP_INTERNAL_CONFIG_TOKEN);
+                    this.log.warn(`Contract "${contract}" for "${name}" Child App is declared but not provided in the application or contracts fallback`);
+                }
                 // TODO: Request scoped contrace is resolved in Singleton scope - what should we do?
                 return value;
             },
         }));
     }
+    getRequestHostDi() {
+        var _a, _b;
+        return (_b = (_a = this.asyncLocalStorage.getStore()) === null || _a === void 0 ? void 0 : _a.tramvaiRequestDi) !== null && _b !== void 0 ? _b : null;
+    }
+    getRequestChildDiManager() {
+        var _a, _b, _c;
+        return ((_c = (_b = (_a = this.asyncLocalStorage
+            .getStore()) === null || _a === void 0 ? void 0 : _a.tramvaiRequestDi) === null || _b === void 0 ? void 0 : _b.get(dippy.optional(tokensChildApp.CHILD_APP_DI_MANAGER_TOKEN))) !== null && _c !== void 0 ? _c : null);
+    }
 }
 
 exports.ChildAppContractManager = ChildAppContractManager;

package/lib/export.browser.js

@@ -0,0 +1,11 @@
+export * from '@tramvai/tokens-child-app';
+export { ChildApp } from './shared/react/component.browser.js';
+
+/**
+ * only for type-checking, simple way to fail application build if contracts are not valid
+ *
+ * @example `Assert({} as ContractsValidation)`
+ */
+const Assert = (t) => { };
+
+export { Assert };

package/lib/export.d.ts

@@ -1,3 +1,54 @@
+import type { TokenInterface } from '@tinkoff/dippy';
 export * from '@tramvai/tokens-child-app';
 export { ChildApp } from './shared/react/component';
+export interface TypedContractsRequired {
+}
+export interface TypedContractsProvided {
+}
+export interface TypedContracts {
+    required: TypedContractsRequired;
+    provided: TypedContractsProvided;
+}
+/**
+ * opaque types for unknown symbols will not be expanded (in error message)
+ */
+declare const errorTag: unique symbol;
+export type TypesError<T> = {
+    [errorTag]: T;
+};
+/**
+ * expand generic types one level down (in error message)
+ */
+type Prettify<T> = T extends Record<string, any> ? {} & {
+    [P in keyof T]: T[P];
+} : {} & T;
+/**
+ * exclude keys with `never` value from records
+ */
+type OmitNever<T> = {
+    [K in keyof T as T[K] extends never ? never : K]: T[K];
+};
+/**
+ * validate required and provided contracts, `TypesError` returns on failure
+ */
+export type ContractsValidation = TypedContracts extends {
+    required: TypedContractsRequired;
+    provided: TypedContractsRequired;
+} ? TypedContracts : TypesError<Prettify<OmitNever<{
+    [key in keyof Omit<TypedContracts['required'], keyof TypedContracts['provided']>]: {
+        message: `Contract is not provided`;
+    };
+}> & OmitNever<{
+    [key in keyof TypedContracts['provided']]: TypedContracts['provided'][key] extends TypedContracts['required'][key] ? never : {
+        message: `Contract is incompatible`;
+        expected: TypedContracts['required'][key] extends TokenInterface<infer T> ? T : TypedContracts['required'][key];
+        actual: TypedContracts['provided'][key] extends TokenInterface<infer T> ? T : TypedContracts['provided'][key];
+    };
+}>>>;
+/**
+ * only for type-checking, simple way to fail application build if contracts are not valid
+ *
+ * @example `Assert({} as ContractsValidation)`
+ */
+export declare const Assert: <T>(t: T extends TypesError<any> ? never : T) => void;
 //# sourceMappingURL=export.d.ts.map

package/lib/export.es.js

@@ -0,0 +1,11 @@
+export * from '@tramvai/tokens-child-app';
+export { ChildApp } from './shared/react/component.es.js';
+
+/**
+ * only for type-checking, simple way to fail application build if contracts are not valid
+ *
+ * @example `Assert({} as ContractsValidation)`
+ */
+const Assert = (t) => { };
+
+export { Assert };

package/lib/export.js

@@ -0,0 +1,22 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tokensChildApp = require('@tramvai/tokens-child-app');
+var component = require('./shared/react/component.js');
+
+/**
+ * only for type-checking, simple way to fail application build if contracts are not valid
+ *
+ * @example `Assert({} as ContractsValidation)`
+ */
+const Assert = (t) => { };
+
+exports.ChildApp = component.ChildApp;
+exports.Assert = Assert;
+Object.keys(tokensChildApp).forEach(function (k) {
+	if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+		enumerable: true,
+		get: function () { return tokensChildApp[k]; }
+	});
+});

package/lib/server/providers.es.js

@@ -3,7 +3,7 @@ import { Scope, optional, DI_TOKEN } from '@tinkoff/dippy';
 import { provide, commandLineListTokens } from '@tramvai/core';
 import { ENV_USED_TOKEN, LOGGER_TOKEN, CREATE_CACHE_TOKEN, ENV_MANAGER_TOKEN, STORE_TOKEN, ASYNC_LOCAL_STORAGE_TOKEN } from '@tramvai/tokens-common';
 import { RESOURCES_REGISTRY, RENDER_SLOTS, ResourceType, ResourceSlot, RENDER_FLOW_AFTER_TOKEN, REACT_SERVER_RENDER_MODE, EXTEND_RENDER } from '@tramvai/tokens-render';
-import { CHILD_APP_LOADER_TOKEN, CHILD_APP_STATE_MANAGER_TOKEN, CHILD_APP_DI_MANAGER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN, CHILD_APP_CONTRACT_MANAGER, HOST_PROVIDED_CONTRACTS } from '@tramvai/tokens-child-app';
+import { CHILD_APP_LOADER_TOKEN, CHILD_APP_STATE_MANAGER_TOKEN, CHILD_APP_DI_MANAGER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN, CHILD_APP_CONTRACT_MANAGER, HOST_PROVIDED_CONTRACTS, HOST_REQUIRED_CONTRACTS } from '@tramvai/tokens-child-app';
 import { safeStringify } from '@tramvai/safe-strings';
 import { ServerLoader } from './loader.es.js';
 import { PreloadManager } from './preload.es.js';
@@ -146,7 +146,9 @@ const serverProviders = [
         deps: {
             appDi: DI_TOKEN,
             asyncLocalStorage: ASYNC_LOCAL_STORAGE_TOKEN,
-            hostProvidedContracts: HOST_PROVIDED_CONTRACTS,
+            hostProvidedContracts: optional(HOST_PROVIDED_CONTRACTS),
+            hostRequiredContracts: optional(HOST_REQUIRED_CONTRACTS),
+            logger: LOGGER_TOKEN,
         },
     }),
 ];

package/lib/server/providers.js

@@ -150,7 +150,9 @@ const serverProviders = [
         deps: {
             appDi: dippy.DI_TOKEN,
             asyncLocalStorage: tokensCommon.ASYNC_LOCAL_STORAGE_TOKEN,
-            hostProvidedContracts: tokensChildApp.HOST_PROVIDED_CONTRACTS,
+            hostProvidedContracts: dippy.optional(tokensChildApp.HOST_PROVIDED_CONTRACTS),
+            hostRequiredContracts: dippy.optional(tokensChildApp.HOST_REQUIRED_CONTRACTS),
+            logger: tokensCommon.LOGGER_TOKEN,
         },
     }),
 ];

package/lib/server.es.js

@@ -2,8 +2,9 @@ import { __decorate } from 'tslib';
 import { Module } from '@tramvai/core';
 import { sharedProviders } from './shared/providers.es.js';
 import { serverProviders } from './server/providers.es.js';
-export * from '@tramvai/tokens-child-app';
+export { Assert } from './export.es.js';
 export { ChildApp } from './shared/react/component.es.js';
+export * from '@tramvai/tokens-child-app';
 
 let ChildAppModule = class ChildAppModule {
 };

package/lib/server.js

@@ -6,8 +6,9 @@ var tslib = require('tslib');
 var core = require('@tramvai/core');
 var providers = require('./shared/providers.js');
 var providers$1 = require('./server/providers.js');
-var tokensChildApp = require('@tramvai/tokens-child-app');
+var _export = require('./export.js');
 var component = require('./shared/react/component.js');
+var tokensChildApp = require('@tramvai/tokens-child-app');
 
 exports.ChildAppModule = class ChildAppModule {
 };
@@ -18,6 +19,7 @@ exports.ChildAppModule = tslib.__decorate([
     })
 ], exports.ChildAppModule);
 
+exports.Assert = _export.Assert;
 exports.ChildApp = component.ChildApp;
 Object.keys(tokensChildApp).forEach(function (k) {
     if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {

package/lib/shared/singletonDi.browser.js

@@ -100,6 +100,7 @@ class SingletonDiManager {
         });
         if (isolateDi) {
             this.contractManager.registerChildContracts(di);
+            this.contractManager.validateChildProvidedContracts(di);
         }
         const borrowTokens = di.get({ token: CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN, optional: true });
         if (borrowTokens) {

package/lib/shared/singletonDi.es.js

@@ -100,6 +100,7 @@ class SingletonDiManager {
         });
         if (isolateDi) {
             this.contractManager.registerChildContracts(di);
+            this.contractManager.validateChildProvidedContracts(di);
         }
         const borrowTokens = di.get({ token: CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN, optional: true });
         if (borrowTokens) {

package/lib/shared/singletonDi.js

@@ -108,6 +108,7 @@ class SingletonDiManager {
         });
         if (isolateDi) {
             this.contractManager.registerChildContracts(di);
+            this.contractManager.validateChildProvidedContracts(di);
         }
         const borrowTokens = di.get({ token: tokensChildApp.CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN, optional: true });
         if (borrowTokens) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-child-app",
-  "version": "4.22.0",
+  "version": "4.24.0",
   "description": "Module for child apps",
   "browser": {
     "./lib/server.js": "./lib/browser.js",
@@ -33,23 +33,23 @@
     "@tinkoff/env-validators": "0.3.1",
     "@tinkoff/module-loader-client": "0.6.3",
     "@tinkoff/module-loader-server": "0.7.2",
-    "@tramvai/module-common": "4.22.0",
+    "@tramvai/module-common": "4.24.0",
     "@tinkoff/url": "0.10.1",
-    "@tramvai/child-app-core": "4.22.0",
+    "@tramvai/child-app-core": "4.24.0",
     "@tramvai/safe-strings": "0.7.2",
-    "@tramvai/tokens-child-app": "4.22.0"
+    "@tramvai/tokens-child-app": "4.24.0"
   },
   "devDependencies": {},
   "peerDependencies": {
-    "@tinkoff/dippy": "0.10.7",
-    "@tinkoff/router": "0.4.75",
+    "@tinkoff/dippy": "0.10.8",
+    "@tinkoff/router": "0.4.77",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "4.22.0",
-    "@tramvai/state": "4.22.0",
-    "@tramvai/react": "4.22.0",
-    "@tramvai/tokens-common": "4.22.0",
-    "@tramvai/tokens-render": "4.22.0",
-    "@tramvai/tokens-router": "4.22.0",
+    "@tramvai/core": "4.24.0",
+    "@tramvai/state": "4.24.0",
+    "@tramvai/react": "4.24.0",
+    "@tramvai/tokens-common": "4.24.0",
+    "@tramvai/tokens-render": "4.24.0",
+    "@tramvai/tokens-router": "4.24.0",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "object-assign": "^4.1.1",