@aristid/leav-types 1.4.1-396671ca → 1.4.1-95cadab0

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

@@ -90,12 +90,6 @@ export declare namespace lang {
     let _default: string;
     export { _default as default };
 }
-export declare namespace logs {
-    let level: string;
-    let transport: string;
-    let destinationFile: string;
-    let useJsonFormat: boolean;
-}
 export declare namespace permissions {
     let _default_1: boolean;
     export { _default_1 as default };
@@ -211,7 +205,7 @@ export declare namespace dbProfiler {
     let enable_3: boolean;
     export { enable_3 as enable };
 }
-export declare namespace elasticSearch {
+export declare namespace elasticsearch {
     export let indexPrefix: string;
     let url_2: string;
     export { url_2 as url };

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

@@ -1,10 +1,6 @@
 export namespace server {
     let allowIntrospection: boolean;
 }
-export namespace logs {
-    let level: string;
-    let transport: string;
-}
 export namespace auth {
     let refreshTokenExpiration: string;
     namespace cookie {

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

@@ -1,4 +1,3 @@
-import { type ILoggerConfig } from '@leav/logger';
 import { type Options } from 'amqplib';
 import { type IKeyValue } from './shared';
 export interface IConfig {
@@ -10,7 +9,6 @@ export interface IConfig {
     auth: IAuth;
     mailer: IMailer;
     lang: ILang;
-    logs: ILogs;
     permissions: IPermissions;
     amqp: IAmqp;
     redis: IRedis;
@@ -29,7 +27,7 @@ export interface IConfig {
     files: IFilesConfig;
     dbProfiler: IDbProfilerConfig;
     instanceId: string;
-    elasticSearch: IElasticSearchConfig;
+    elasticsearch: IElasticsearchConfig;
     logsCollector: ILogsCollector;
     pluginsPath: string[];
     bugsnag: IBugsnag;
@@ -109,7 +107,6 @@ export interface ILang {
     available: string[];
     default: string;
 }
-export type ILogs = ILoggerConfig;
 export interface IPermissions {
     default: boolean;
     enableCache: boolean;
@@ -225,7 +222,7 @@ export interface IFilesConfig {
 export interface IDbProfilerConfig {
     enable: boolean;
 }
-export interface IElasticSearchConfig {
+export interface IElasticsearchConfig {
     indexPrefix: string;
     url: string;
     ilmPolicyName: string;

package/apps/core/src/domain/logsCollector/logsCollectorDomain.d.ts

@@ -2,7 +2,7 @@ import { type IAmqpService } from '@leav/message-broker';
 import { type ILogger } from '@leav/logger';
 import type * as Config from '_types/config';
 import { type IIndexationService } from '../../infra/indexation/indexationService';
-import { type IElasticSearchService } from '../../infra/elasticSearch/elasticSearchService';
+import { type IElasticsearchService } from '../../infra/elasticsearch/elasticsearchService';
 export interface ILogsCollectorDomain {
     init(): Promise<void>;
 }
@@ -11,6 +11,6 @@ export interface ILogsCollectorDomainDeps {
     'core.infra.amqpService': IAmqpService;
     'core.infra.indexation.indexationService': IIndexationService;
     'core.utils.logger': ILogger;
-    'core.infra.elasticSearch.service': IElasticSearchService;
+    'core.infra.elasticsearch.service': IElasticsearchService;
 }
-export default function ({ config, 'core.infra.amqpService': amqpService, 'core.infra.indexation.indexationService': indexationService, 'core.utils.logger': logger, 'core.infra.elasticSearch.service': esService }: ILogsCollectorDomainDeps): ILogsCollectorDomain;
+export default function ({ config, 'core.infra.amqpService': amqpService, 'core.infra.indexation.indexationService': indexationService, 'core.utils.logger': logger, 'core.infra.elasticsearch.service': esService }: ILogsCollectorDomainDeps): ILogsCollectorDomain;

package/apps/core/src/infra/{elasticSearch/elasticSearchService.d.ts → elasticsearch/elasticsearchService.d.ts}

@@ -15,14 +15,14 @@ interface IElasticsearchServiceSearchParams {
     };
     query?: estypes.QueryDslQueryContainer;
 }
-export interface IElasticSearchService {
+export interface IElasticsearchService {
     client: Client;
     search: <T>(params: IElasticsearchServiceSearchParams) => Promise<IElasticsearchServiceSearchResponse<T>>;
     writeData: (indexName: string, data: Log) => Promise<void>;
 }
-export interface IElasticSearchServiceDeps {
-    'core.infra.elasticSearch.client'?: Client;
+export interface IElasticsearchServiceDeps {
+    'core.infra.elasticsearch.client'?: Client;
     config?: IConfig;
 }
-export default function ({ config }: IElasticSearchServiceDeps): IElasticSearchService;
+export default function ({ config }: IElasticsearchServiceDeps): IElasticsearchService;
 export {};

package/apps/core/src/infra/elasticsearch/index.d.ts

@@ -0,0 +1 @@
+export { default as service } from './elasticsearchService';

package/apps/core/src/infra/log/logRepo.d.ts

@@ -1,4 +1,4 @@
-import { type IElasticSearchService } from 'infra/elasticSearch/elasticSearchService';
+import { type IElasticsearchService } from 'infra/elasticsearch/elasticsearchService';
 import { type IConfig } from '_types/config';
 import { type ILogFilters, type ILogPagination, type ILogResponse, type ILogSort } from '_types/log';
 import { type IQueryInfos } from '_types/queryInfos';
@@ -10,8 +10,8 @@ export interface ILogRepo {
     }, ctx: IQueryInfos): Promise<ILogResponse>;
 }
 interface IDeps {
-    'core.infra.elasticSearch.service'?: IElasticSearchService;
+    'core.infra.elasticsearch.service'?: IElasticsearchService;
     config?: IConfig;
 }
-export default function ({ 'core.infra.elasticSearch.service': esService, config }: IDeps): ILogRepo;
+export default function ({ 'core.infra.elasticsearch.service': esService, config }: IDeps): ILogRepo;
 export {};

package/libs/logger/src/config.d.ts

@@ -3,7 +3,7 @@ export interface ILoggerConfig {
      * Log level (error, warn, info, log, verbose, debug, silly)
      * @default info
      */
-    level: string;
+    level?: string;
     /**
      * If true, disable all logging
      * Default: true if TS_JEST=1 (tests), false otherwise
@@ -18,7 +18,36 @@ export interface ILoggerConfig {
      * Default: false (plain text)
      */
     useJsonFormat?: boolean;
+    /**
+     * If true, add timestamp to each log line, ISO format
+     */
+    addTimestamp?: boolean;
+    /**
+     * If true, add file and line number of the code that called the logger function (error, warn, info, debug, etc.)
+     */
+    addLocationInfo?: boolean;
+    /**
+     * Add those metadata to all logs
+     */
+    additionalMeta?: {
+        /**
+         * any string to identify the application those logs came from
+         */
+        app?: string;
+        /**
+         * any string to identify each client those logs came from
+         */
+        client?: string;
+        /**
+         * environment, like production, development, test, integration
+         */
+        env?: string;
+        /**
+         * application version, maybe semver format
+         */
+        version?: string;
+    };
     onErrorLog?: (message: string, meta: any) => void;
 }
 export declare function envToBool(value: string, defaultValue?: boolean): boolean;
-export declare const defaultLoggerConfig: ILoggerConfig;
+export declare const defaultLoggerConfig: ILoggerConfig & Required<Omit<ILoggerConfig, 'onErrorLog'>>;

package/libs/logger/src/locationInfoFormatters.d.ts

@@ -6,5 +6,4 @@ interface ICallerInfo {
 }
 export declare function getLocationInfo(): ICallerInfo | null;
 export declare const addLocationInfoInLog: winston.Logform.FormatWrap;
-export declare const mergeLocationInfoInLog: winston.Logform.FormatWrap;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aristid/leav-types",
-  "version": "1.4.1-396671ca",
+  "version": "1.4.1-95cadab0",
   "description": "Shared Leav types",
   "scripts": {
     "tscheck": "",

package/apps/core/src/infra/elasticSearch/index.d.ts

@@ -1 +0,0 @@
-export { default as service } from './elasticSearchService';