@aristid/leav-types 0.0.7-cdb834a → 0.0.7-ceed596d

package/apps/core/config/default.d.ts

@@ -25,6 +25,14 @@ export declare namespace db {
 export declare namespace diskCache {
     let directory: string;
 }
+export declare namespace dataLoaders {
+    namespace valueRepo {
+        namespace getValues {
+            let enableCache: string | boolean;
+            let useBatch: string | boolean;
+        }
+    }
+}
 export declare namespace auth {
     let scheme: string;
     let key: string;
@@ -43,6 +51,7 @@ export declare namespace auth {
         let postLogoutRedirectUri: string;
         let skipLogoutConfirmationPage: string | boolean;
         let idTokenUserClaim: string;
+        let enableAutoProvisioning: string | boolean;
     }
     let testApiKey: string;
 }
@@ -69,10 +78,13 @@ export declare namespace logs {
     let level: string;
     let transport: string;
     let destinationFile: string;
+    let useJsonFormat: string | boolean;
 }
 export declare namespace permissions {
     let _default_1: boolean;
     export { _default_1 as default };
+    let enableCache_1: string | boolean;
+    export { enableCache_1 as enableCache };
 }
 export declare namespace amqp {
     namespace connOpt {

package/apps/core/src/__tests__/e2e/api/getConditionPart/getConditionPart.test.d.ts

@@ -0,0 +1 @@
+export {};

package/apps/core/src/__tests__/e2e/api/globalSetup.d.ts

@@ -1,3 +1,8 @@
+import { AwilixContainer } from 'awilix';
 import { IConfig } from '../../../_types/config';
-export declare const init: (conf: IConfig) => Promise<any>;
+import { IDbUtils } from 'infra/db/dbUtils';
+export declare const init: (conf: IConfig) => Promise<{
+    coreContainer: AwilixContainer;
+    dbUtils: IDbUtils;
+}>;
 export declare function setup(): Promise<void>;

package/apps/core/src/__tests__/e2e/api/joinLibraries/joinLibraries.test.d.ts

@@ -0,0 +1 @@
+export {};

package/apps/core/src/__tests__/integration/globalSetup.d.ts

@@ -0,0 +1 @@
+export declare function setup(): Promise<void>;

package/apps/core/src/__tests__/integration/globalSetupHook.d.ts

@@ -0,0 +1 @@
+export default function (): Promise<any>;

package/apps/core/src/__tests__/integration/infra/attributeAdvancedLinkRepo.test.d.ts

@@ -0,0 +1 @@
+export {};

package/apps/core/src/__tests__/integration/infra/attributeAdvancedRepo.test.d.ts

@@ -0,0 +1 @@
+export {};

package/apps/core/src/__tests__/integration/infra/attributeSimpleLinkRepo.test.d.ts

@@ -0,0 +1 @@
+export {};

package/apps/core/src/__tests__/integration/infra/attributeSimpleRepo.test.d.ts

@@ -0,0 +1 @@
+export {};

package/apps/core/src/__tests__/integration/infra/attributeTreeRepo.test.d.ts

@@ -0,0 +1 @@
+export {};

package/apps/core/src/__tests__/integration/infra/integrationTestRepoUtils.d.ts

@@ -0,0 +1,7 @@
+import { ILibraryRepo } from 'infra/library/libraryRepo';
+import { IRecordRepo } from 'infra/record/recordRepo';
+import { ITreeRepo } from 'infra/tree/treeRepo';
+export declare const getCoreDep: <T>(path: any) => T;
+export declare const getLibraryRepo: () => ILibraryRepo;
+export declare const getRecordRepo: () => IRecordRepo;
+export declare const getTreeRepo: () => ITreeRepo;

package/apps/core/src/__tests__/integration/infra/recordRepo.test.d.ts

@@ -0,0 +1 @@
+export {};

package/apps/core/src/__tests__/integration/teardown.d.ts

@@ -0,0 +1 @@
+export default function (): Promise<void>;

package/apps/core/src/__tests__/mockers/amqp.d.ts

@@ -1,7 +1,7 @@
 declare const _default: {
     consumer: {
         channel: {
-            ack: jest.Mock<any, any, any>;
+            ack: jest.Mock<any, any>;
         };
     };
 };

package/apps/core/src/__tests__/mockers/logger.d.ts

@@ -1,7 +1,7 @@
 declare const _default: {
-    info: jest.Mock<any, any, any>;
-    warn: jest.Mock<any, any, any>;
-    error: jest.Mock<any, any, any>;
-    debug: jest.Mock<any, any, any>;
+    info: jest.Mock<any, any>;
+    warn: jest.Mock<any, any>;
+    error: jest.Mock<any, any>;
+    debug: jest.Mock<any, any>;
 };
 export default _default;

package/apps/core/src/__tests__/mocks/attribute.d.ts

@@ -1,4 +1,4 @@
-import { AttributeFormats, AttributeTypes, IAttribute } from '../../_types/attribute';
+import { AttributeFormats, AttributeTypes, MultiLinkDisplayOption, IAttribute } from '../../_types/attribute';
 export declare const mockAttrSimple: IAttribute;
 export declare const mockUniqueAttrSimple: IAttribute;
 export declare const mockAttrId: IAttribute;
@@ -31,6 +31,7 @@ export declare const mockAttrTree: {
     unique?: boolean;
     description?: import("../../_types/systemTranslation").ISystemTranslation;
     settings?: import("../../_types/shared").IKeyValue<any>;
+    multi_link_display_option?: MultiLinkDisplayOption;
     label?: import("../../_types/systemTranslation").ISystemTranslation | string;
 };
 export declare const mockAttrTreeVersionable: IAttribute;

package/apps/core/src/_constants/attributes.d.ts

@@ -0,0 +1 @@
+export declare const baseAttributes: string[];

package/apps/core/src/_types/attribute.d.ts

@@ -25,6 +25,7 @@ export interface IAttribute extends ICoreEntity {
     unique?: boolean;
     description?: ISystemTranslation;
     settings?: IKeyValue<any>;
+    multi_link_display_option?: MultiLinkDisplayOption;
 }
 export declare enum ValueVersionMode {
     SIMPLE = "simple",
@@ -88,6 +89,11 @@ export declare enum AttributeFormats {
     COLOR = "color",
     RICH_TEXT = "rich_text"
 }
+export declare enum MultiLinkDisplayOption {
+    AVATAR = "avatar",
+    TAG = "tag",
+    BADGE_QTY = "badge_qty"
+}
 export declare enum IOTypes {
     STRING = "string",
     NUMBER = "number",

package/apps/core/src/_types/config.d.ts

@@ -5,6 +5,7 @@ export interface IConfig {
     server: IServer;
     db: IDb;
     diskCache: IDiskCache;
+    dataLoaders: IDataLoaders;
     auth: IAuth;
     mailer: IMailer;
     lang: ILang;
@@ -36,7 +37,8 @@ export declare enum CoreMode {
     FILES_MANAGER = "filesManager",
     INDEXATION_MANAGER = "indexationManager",
     TASKS_MANAGER_MASTER = "tasksManager:master",
-    TASKS_MANAGER_WORKER = "tasksManager:worker"
+    TASKS_MANAGER_WORKER = "tasksManager:worker",
+    CLI = "cli"
 }
 export interface IServer {
     host: string;
@@ -84,6 +86,7 @@ export interface IAuth {
         postLogoutRedirectUri: string;
         skipLogoutConfirmationPage?: boolean;
         idTokenUserClaim: string;
+        enableAutoProvisioning: boolean;
     };
     testApiKey?: string;
 }
@@ -107,6 +110,7 @@ export interface ILogs {
 }
 export interface IPermissions {
     default: boolean;
+    enableCache: boolean;
 }
 export interface IAmqp {
     connOpt: Options.Connect;
@@ -176,6 +180,30 @@ export interface IImport {
     groupData: number;
     maxStackedElements: number;
 }
+/**
+ * Data loaders configuration for performances
+ */
+export interface IDataLoaders {
+    valueRepo: {
+        getValues: {
+            /**
+             * @default false
+             *
+             * Enable cache inside data loaders in the query context
+             * Before enable, ensure that it has no side effects, for instance on saveValue/deleteValue mutations
+             */
+            enableCache: boolean;
+            /**
+             * @default true
+             *
+             * Enable: do batch arangodb query
+             * Disable: do one arangodb query per value, as before data loader use. For rollback if issue with batch query
+             * Temporary, to be removed in future
+             */
+            useBatch: boolean;
+        };
+    };
+}
 export interface IDiskCache {
     directory: string;
 }

package/apps/core/src/_types/dbProfiler.d.ts

@@ -2,7 +2,26 @@ import { AqlQuery } from 'arangojs/aql';
 export interface IDbProfilerQuery {
     count: number;
     query: string | AqlQuery;
-    callers: Set<string>;
+    callers: Record<string, {
+        /**
+         * Stacktrace of caller
+         */
+        stack: string;
+        count: number;
+        /**
+         * Stats for each call for that query
+         */
+        stats: Array<{
+            /**
+             * Arangodb query execution time in ms
+             */
+            executionTimeMs: number | null;
+            /**
+             * Time spent in nodejs to process the query in ms
+             */
+            nodejsTimeMs: number;
+        }>;
+    }>;
 }
 export interface IDbProfiler {
     totalCount: number;

package/apps/core/src/_types/forms.d.ts

@@ -1,3 +1,4 @@
+import { IAttribute } from './attribute';
 import { IKeyValue } from './shared';
 import { IValue } from './value';
 export interface IForm extends ICoreEntity {
@@ -5,6 +6,11 @@ export interface IForm extends ICoreEntity {
     system?: boolean;
     dependencyAttributes?: string[];
     elements?: IFormDependentElements[];
+    sidePanel: IFormSidePanel;
+}
+export interface IFormSidePanel {
+    enable: boolean;
+    isOpenByDefault: boolean;
 }
 export interface IRecordForm {
     id: string;
@@ -12,10 +18,12 @@ export interface IRecordForm {
     system: boolean;
     recordId: string;
     dependencyAttributes?: string[];
-    elements: IFormElementWithValues[];
+    elements: IFormElement[];
+    sidePanel: IFormSidePanel;
 }
 export declare enum FormElementTypes {
     field = "field",
+    tabs = "tabs",
     layout = "layout"
 }
 export type IFormStrict = Required<IForm>;
@@ -34,17 +42,19 @@ export interface IFormElement {
     uiElementType: string;
     containerId: string;
     settings?: IKeyValue<any>;
+    children?: IFormElement[];
 }
-export interface IFormElementWithValues extends IFormElement {
-    values?: IValue[];
+export interface IFormElementValues {
+    id: string;
+    values: IValue[];
     valueError?: string;
 }
-export type IFormElementWithValuesAndChildren = IFormElementWithValues & {
-    children: IFormElementWithValuesAndChildren[];
-};
 /**
- * Accepted fields to filter attributes list
+ * Accepted fields to filter an attribute list
  */
 export interface IFormFilterOptions extends ICoreEntityFilterOptions {
     library?: string;
 }
+export interface IFormElementJoinLibraryContext {
+    mandatoryAttribute: IAttribute;
+}

package/apps/core/src/_types/library.d.ts

@@ -7,6 +7,7 @@ import { IKeyValue } from './shared';
 export interface ILibrary extends ICoreEntity {
     system?: boolean;
     behavior?: LibraryBehavior;
+    mandatoryAttribute?: string;
     /**
      * List of attributes usable in this library
      */
@@ -45,8 +46,9 @@ export interface ILibraryPreviewsSettings {
 }
 export declare enum LibraryBehavior {
     STANDARD = "standard",
+    DIRECTORIES = "directories",
     FILES = "files",
-    DIRECTORIES = "directories"
+    JOIN = "join"
 }
 export declare const USERS_LIBRARY = "users";
 export declare const USERS_GROUPS_LIBRARY = "users_groups";

package/apps/core/src/_types/permissions.d.ts

@@ -76,7 +76,9 @@ export declare enum AdminPermissionsActions {
     CREATE_API_KEY = "admin_create_api_key",
     EDIT_API_KEY = "admin_edit_api_key",
     DELETE_API_KEY = "admin_delete_api_key",
-    EDIT_GLOBAL_SETTINGS = "admin_edit_global_settings"
+    EDIT_GLOBAL_SETTINGS = "admin_edit_global_settings",
+    ACCESS_LOGS = "admin_access_logs",
+    IMPORT_CONFIG_CLEAR_DATABASE = "admin_import_config_clear_database"
 }
 export type PermissionsActions = LibraryPermissionsActions | RecordPermissionsActions | RecordAttributePermissionsActions | AdminPermissionsActions | AttributePermissionsActions | TreePermissionsActions | TreeNodePermissionsActions | ApplicationPermissionsActions;
 export interface ILabeledPermissionsAction {

package/apps/core/src/_types/queryInfos.d.ts

@@ -1,3 +1,4 @@
+import DataLoader from 'dataloader';
 import type LeavError from 'errors/LeavError';
 import { IDbProfiler } from './dbProfiler';
 import { IValueVersion } from './value';
@@ -13,4 +14,8 @@ export interface IQueryInfos {
     dbProfiler?: IDbProfiler;
     trigger?: string;
     errors?: Array<LeavError<unknown>>;
+    /**
+     * For request duration store dataloader on demand with getOrCreateDataLoaderInCtx
+     */
+    dataLoaders?: Record<string, DataLoader<unknown, unknown>>;
 }

package/apps/core/src/_types/record.d.ts

@@ -75,10 +75,10 @@ export interface IQueryField {
 export interface IRecordIdentity {
     id: string;
     library: ILibrary;
-    label?: string;
-    subLabel?: string;
-    color?: string;
-    preview?: IPreview;
+    getLabel?: () => Promise<string | null>;
+    getSubLabel?: () => Promise<string | null>;
+    getColor?: () => Promise<string | null>;
+    getPreview?: () => Promise<IPreview | null>;
 }
 export interface IRecordIdentityConf {
     label?: string;

package/apps/core/src/_types/tree.d.ts

@@ -38,7 +38,7 @@ export type ITreeNodeLight = Pick<ITreeNode, 'id' | 'order'>;
 export interface ITreeNodeWithTreeId extends ITreeNode {
     treeId: string;
 }
-export type TreePaths = ITreeNode[];
+export type TreePath = ITreeNode[];
 export declare enum TreeBehavior {
     STANDARD = "standard",
     FILES = "files"

package/apps/core/src/_types/value.d.ts

@@ -1,8 +1,9 @@
 import { AnyPrimitive, Override } from '@leav/utils';
 import { IDbEdge } from 'infra/db/_types';
 import { IRecord } from './record';
-import { ITreeNode, TreePaths } from './tree';
+import { ITreeNode, TreePath } from './tree';
 import { EMPTY_VALUE } from 'infra/value/valueRepo';
+import { AttributeTypes } from './attribute';
 export type IValueFromGql = Override<Omit<IValue, 'version'>, {
     value: IValue['payload'];
     metadata: Array<{
@@ -30,8 +31,12 @@ export interface IValueMetadata {
     [fieldName: string]: IStandardValue | AnyPrimitive;
 }
 export type EmptyValue = typeof EMPTY_VALUE;
-export interface IGenericValue {
-    id_value?: string;
+interface ICommonGenericSaveValue {
+    /**
+     * The id of the edge for advanced, advanced link or tree values
+     * In case of advanced reverse link from simple link, this is the id of the linked record
+     */
+    id_value?: string | null;
     attribute?: string;
     created_at?: number;
     modified_at?: number;
@@ -39,21 +44,60 @@ export interface IGenericValue {
     modified_by?: string;
     version?: IValueVersion;
     metadata?: IValueMetadata;
+}
+export interface IGenericValue extends ICommonGenericSaveValue {
     isInherited?: boolean;
     isCalculated?: boolean;
 }
 export interface IStandardValue extends IGenericValue {
+    /**
+     * Computed value after get actions on attribute are done
+     * TODO remove that any when possible
+     * TODO remove optional when possible
+     */
     payload?: any | EmptyValue;
-    raw_payload?: any | EmptyValue;
+    /**
+     * Raw value from the database, before any computation
+     * TODO, remove that any when possible
+     */
+    raw_payload?: any;
 }
 export interface ILinkValue extends IGenericValue {
+    /**
+     * Linked record
+     * TODO remove optional when possible
+     */
     payload?: IRecord;
 }
 export interface ITreeValue extends IGenericValue {
+    /**
+     * Linked tree node
+     * TODO remove optional when possible
+     */
     payload?: ITreeNode;
     treeId: string;
 }
 export type IValue = IStandardValue | ILinkValue | ITreeValue;
+type IGenericSaveValue = ICommonGenericSaveValue;
+export interface ISaveStandardValue extends IGenericSaveValue {
+    /**
+     * Any base type value to save
+     */
+    payload: number | string | boolean | EmptyValue | null;
+}
+export interface ISaveLinkValue extends IGenericSaveValue {
+    /**
+     * Record id to link
+     */
+    payload: string | null;
+}
+export interface ISaveTreeValue extends IGenericSaveValue {
+    /**
+     * Tree node id to link
+     */
+    payload: string | null;
+}
+export type ISaveValue = ISaveStandardValue | ISaveLinkValue | ISaveTreeValue;
 export interface IDateRangeValue<T = string | number> {
     from: T;
     to: T;
@@ -67,7 +111,7 @@ export interface IValuesOptions {
 export interface IFindValueTree {
     name: string;
     currentIndex: number;
-    elements: TreePaths;
+    elements: TreePath;
 }
 export interface IValueEdge extends IDbEdge {
     attribute: string;
@@ -78,3 +122,18 @@ export interface IValueEdge extends IDbEdge {
     version?: IDbValueVersion;
     metadata?: IValueMetadata;
 }
+export interface IValueByAttributeType {
+    [AttributeTypes.SIMPLE]: IStandardValue;
+    [AttributeTypes.SIMPLE_LINK]: ILinkValue;
+    [AttributeTypes.ADVANCED]: IStandardValue;
+    [AttributeTypes.ADVANCED_LINK]: ILinkValue;
+    [AttributeTypes.TREE]: ITreeValue;
+}
+export interface ISaveValueByAttributeType {
+    [AttributeTypes.SIMPLE]: ISaveStandardValue;
+    [AttributeTypes.SIMPLE_LINK]: ISaveLinkValue;
+    [AttributeTypes.ADVANCED]: ISaveStandardValue;
+    [AttributeTypes.ADVANCED_LINK]: ISaveLinkValue;
+    [AttributeTypes.TREE]: ISaveTreeValue;
+}
+export {};

package/apps/core/src/app/application/applicationApp.d.ts

@@ -1,21 +1,17 @@
 import { ICoreSubscriptionsHelpersApp } from 'app/core/helpers/subscriptions';
-import { IGraphqlApp } from 'app/graphql/graphqlApp';
+import { IGraphqlAppModule, IGraphqlApp } from 'app/graphql/graphqlApp';
 import { InitQueryContextFunc } from 'app/helpers/initQueryContext';
 import { IEventsManagerDomain } from 'domain/eventsManager/eventsManagerDomain';
 import { IPermissionDomain } from 'domain/permission/permissionDomain';
 import { IRecordDomain } from 'domain/record/recordDomain';
-import { Express } from 'express';
 import { IUtils } from 'utils/utils';
 import winston from 'winston';
-import { IAppGraphQLSchema } from '_types/graphql';
 import { IApplicationDomain } from '../../domain/application/applicationDomain';
 import { ValidateRequestTokenFunc } from '../helpers/validateRequestToken';
 import { IAuthApp } from '../auth/authApp';
 import { IGlobalSettingsDomain } from '../../domain/globalSettings/globalSettingsDomain';
-export interface IApplicationApp {
-    registerRoute(app: Express): void;
-    getGraphQLSchema(): Promise<IAppGraphQLSchema>;
-}
+import { IServerRouteAppModule } from 'interface/server';
+export type IApplicationApp = IGraphqlAppModule & IServerRouteAppModule;
 export interface IApplicationAppDeps {
     'core.app.graphql': IGraphqlApp;
     'core.app.auth': IAuthApp;

package/apps/core/src/app/auth/authApp.d.ts

@@ -2,9 +2,8 @@ import { IApiKeyDomain } from 'domain/apiKey/apiKeyDomain';
 import { IRecordDomain } from 'domain/record/recordDomain';
 import { IUserDomain } from 'domain/user/userDomain';
 import { IValueDomain } from 'domain/value/valueDomain';
-import { Express, Response } from 'express';
+import { Response } from 'express';
 import { IConfig } from '_types/config';
-import { IAppGraphQLSchema } from '_types/graphql';
 import { ICachesService } from '../../infra/cache/cacheService';
 import { ITokenUserData } from '../../_types/auth';
 import { IRequestWithContext } from '../../_types/express';
@@ -13,19 +12,21 @@ import { IOIDCClientService } from '../../infra/oidc/oidcClientService';
 import { InitQueryContextFunc } from '../helpers/initQueryContext';
 import { IConvertOIDCIdentifier } from '../helpers/convertOIDCIdentifier';
 import { IncomingHttpHeaders } from 'http';
-export interface IAuthApp {
-    getGraphQLSchema(): IAppGraphQLSchema;
+import { IRecordRepo } from '../../infra/record/recordRepo';
+import { IGraphqlAppModule } from 'app/graphql/graphqlApp';
+import { IServerRouteAppModule } from 'interface/server';
+export interface IAuthApp extends IGraphqlAppModule, IServerRouteAppModule {
     validateRequestToken(params: {
         apiKey?: string;
         headers: IncomingHttpHeaders;
         cookies?: {};
     }, res: Response<unknown>): Promise<ITokenUserData>;
-    registerRoute(app: Express): void;
     authenticateWithOIDCService(req: IRequestWithContext, res: Response<unknown>): Promise<void | Response>;
 }
 export interface IAuthAppDeps {
     'core.domain.value': IValueDomain;
     'core.domain.record': IRecordDomain;
+    'core.infra.record': IRecordRepo;
     'core.domain.apiKey': IApiKeyDomain;
     'core.domain.user': IUserDomain;
     'core.infra.cache.cacheService': ICachesService;
@@ -35,4 +36,4 @@ export interface IAuthAppDeps {
     'core.app.helpers.convertOIDCIdentifier': IConvertOIDCIdentifier;
     config: IConfig;
 }
-export default function ({ 'core.domain.value': valueDomain, 'core.domain.record': recordDomain, 'core.domain.apiKey': apiKeyDomain, 'core.domain.user': userDomain, 'core.utils.logger': logger, 'core.infra.cache.cacheService': cacheService, 'core.infra.oidc.oidcClientService': oidcClientService, 'core.app.helpers.initQueryContext': initQueryContext, 'core.app.helpers.convertOIDCIdentifier': convertOIDCIdentifier, config }: IAuthAppDeps): IAuthApp;
+export default function ({ 'core.domain.value': valueDomain, 'core.domain.record': recordDomain, 'core.infra.record': recordRepo, 'core.domain.apiKey': apiKeyDomain, 'core.domain.user': userDomain, 'core.utils.logger': logger, 'core.infra.cache.cacheService': cacheService, 'core.infra.oidc.oidcClientService': oidcClientService, 'core.app.helpers.initQueryContext': initQueryContext, 'core.app.helpers.convertOIDCIdentifier': convertOIDCIdentifier, config }: IAuthAppDeps): IAuthApp;

package/apps/core/src/app/core/actionListApp.d.ts

@@ -1,10 +1,8 @@
 import { IActionsListDomain } from 'domain/actionsList/actionsListDomain';
 import { i18n } from 'i18next';
-import { IAppGraphQLSchema } from '_types/graphql';
 import { IAppModule } from '_types/shared';
-export interface ICoreActionListApp extends IAppModule {
-    getGraphQLSchema(): Promise<IAppGraphQLSchema>;
-}
+import { IGraphqlAppModule } from 'app/graphql/graphqlApp';
+export type ICoreActionListApp = IAppModule & IGraphqlAppModule;
 interface IDeps {
     'core.domain.actionsList': IActionsListDomain;
     translator: i18n;

package/apps/core/src/app/core/apiKeyApp/apiKeyApp.d.ts

@@ -1,9 +1,7 @@
 import { IApiKeyDomain } from 'domain/apiKey/apiKeyDomain';
 import { IRecordDomain } from 'domain/record/recordDomain';
-import { IAppGraphQLSchema } from '_types/graphql';
-export interface ICoreVersionProfileApp {
-    getGraphQLSchema(): Promise<IAppGraphQLSchema>;
-}
+import { IGraphqlAppModule } from 'app/graphql/graphqlApp';
+export type ICoreVersionProfileApp = IGraphqlAppModule;
 interface IDeps {
     'core.domain.apiKey': IApiKeyDomain;
     'core.domain.record': IRecordDomain;

package/apps/core/src/app/core/attributeApp/attributeApp.d.ts

@@ -6,12 +6,9 @@ import { IRecordDomain } from 'domain/record/recordDomain';
 import { ITreeDomain } from 'domain/tree/treeDomain';
 import { IVersionProfileDomain } from 'domain/versionProfile/versionProfileDomain';
 import { IUtils } from 'utils/utils';
-import { IAppGraphQLSchema } from '_types/graphql';
-import { IGraphqlApp } from '../../graphql/graphqlApp';
+import { IGraphqlAppModule, IGraphqlApp } from '../../graphql/graphqlApp';
 import { ICoreApp } from '../coreApp';
-export interface ICoreAttributeApp {
-    getGraphQLSchema(): Promise<IAppGraphQLSchema>;
-}
+export type ICoreAttributeApp = IGraphqlAppModule;
 interface IDeps {
     'core.domain.attribute': IAttributeDomain;
     'core.domain.library': ILibraryDomain;

package/apps/core/src/app/core/coreApp.d.ts

@@ -3,12 +3,10 @@ import { ICoreDomain } from 'domain/core/coreDomain';
 import { IEventsManagerDomain } from 'domain/eventsManager/eventsManagerDomain';
 import { GraphQLScalarType } from 'graphql';
 import { i18n } from 'i18next';
-import { IAppGraphQLSchema } from '_types/graphql';
 import { IAppModule } from '_types/shared';
 import { ISystemTranslation } from '_types/systemTranslation';
-import { IGraphqlApp } from '../graphql/graphqlApp';
-export interface ICoreApp extends IAppModule {
-    getGraphQLSchema(): Promise<IAppGraphQLSchema>;
+import { IGraphqlAppModule, IGraphqlApp } from '../graphql/graphqlApp';
+export interface ICoreApp extends IAppModule, IGraphqlAppModule {
     filterSysTranslationField(fieldData: ISystemTranslation, requestedLangs: string[]): ISystemTranslation | null;
     initPubSubEventsConsumer(): Promise<void>;
 }

package/apps/core/src/app/core/exportApp.d.ts

@@ -1,8 +1,6 @@
 import { IExportDomain } from 'domain/export/exportDomain';
-import { IAppGraphQLSchema } from '_types/graphql';
-export interface ICoreExportApp {
-    getGraphQLSchema(): Promise<IAppGraphQLSchema>;
-}
+import { IGraphqlAppModule } from 'app/graphql/graphqlApp';
+export type ICoreExportApp = IGraphqlAppModule;
 interface IDeps {
     'core.domain.export': IExportDomain;
 }

package/apps/core/src/app/core/filesManagerApp.d.ts

@@ -1,14 +1,12 @@
 import { InitQueryContextFunc } from 'app/helpers/initQueryContext';
 import { IEventsManagerDomain } from 'domain/eventsManager/eventsManagerDomain';
-import { Express } from 'express';
 import { IConfig } from '_types/config';
-import { IAppGraphQLSchema } from '_types/graphql';
 import { IFilesManagerDomain } from '../../domain/filesManager/filesManagerDomain';
 import { ValidateRequestTokenFunc } from '../helpers/validateRequestToken';
-export interface IFilesManagerApp {
+import { IGraphqlAppModule } from 'app/graphql/graphqlApp';
+import { IServerRouteAppModule } from 'interface/server';
+export interface IFilesManagerApp extends IGraphqlAppModule, IServerRouteAppModule {
     init(): Promise<void>;
-    getGraphQLSchema(): Promise<IAppGraphQLSchema>;
-    registerRoute(app: Express): void;
 }
 interface IDeps {
     'core.app.helpers.initQueryContext': InitQueryContextFunc;