vona-core 5.0.131 → 5.0.133

package/dist/index.js

@@ -46,10 +46,6 @@ class BeanSimple {
   }
 }
 
-const localeDefault = {
-  modules: {}
-};
-
 const EnumAppEvent = {
   AppStarted: 'eb:event:appStarted',
   AppStartError: 'eb:event:appStartError'
@@ -2182,7 +2178,7 @@ class AppLogger extends BeanSimple {
       name: childName
     });
   }
-  getLevel(clientName) {
+  getFilterLevel(clientName) {
     clientName = clientName || 'default';
     const envName = `LOGGER_CLIENT_${clientName.toUpperCase()}`;
     const level = this.app.meta.env[envName];
@@ -2190,11 +2186,28 @@ class AppLogger extends BeanSimple {
     if (level === 'true' || !level) return 'info';
     return level;
   }
-  setLevel(level, clientName) {
+  setFilterLevel(level, clientName) {
     clientName = clientName || 'default';
     const envName = `LOGGER_CLIENT_${clientName.toUpperCase()}`;
     this.app.meta.env[envName] = level.toString();
   }
+  getFilterChild(clientName) {
+    clientName = clientName || 'default';
+    const envName = `LOGGER_CHILD_${clientName.toUpperCase()}`;
+    let child = this.app.meta.env[envName];
+    if (!child) {
+      const envName = 'LOGGER_CHILD';
+      child = this.app.meta.env[envName];
+    }
+    if (!child) return;
+    return child.split(',');
+  }
+  setFilterChild(child, clientName) {
+    if (Array.isArray(child)) child = child.join(',');
+    clientName = clientName || 'default';
+    const envName = `LOGGER_CHILD_${clientName.toUpperCase()}`;
+    this.app.meta.env[envName] = child;
+  }
   _createClient(clientName) {
     const configClient = this.app.config.logger.clients[clientName];
     if (!configClient) throw new Error(`logger client not found: ${clientName}`);
@@ -2209,7 +2222,8 @@ class AppLogger extends BeanSimple {
     if (typeof configClient !== 'function') return configClient;
     return configClient.call(this.app, {
       clientName,
-      level: () => this.getLevel(clientName)
+      level: () => this.getFilterLevel(clientName),
+      child: () => this.getFilterChild(clientName)
     }, Winston);
   }
   createTransportFile(fileName, clientInfo, options) {
@@ -2653,6 +2667,13 @@ const formatLoggerDummy = Winston.format(info => {
   return info;
 });
 const formatLoggerFilter = Winston.format((info, opts) => {
+  // check client
+  const child = typeof opts.child === 'function' ? opts.child() : opts.child;
+  if (child && !child.includes(info.name)) {
+    if (opts.silly && info.level === 'silly') return __formatLoggerFilterCheckInfo(info);
+    return false;
+  }
+  // check level
   const level = typeof opts.level === 'function' ? opts.level() : opts.level;
   if (!level) return false;
   if (opts.strict) {
@@ -2795,10 +2816,14 @@ async function loadLocales (app, modules) {
   // load locales
   await loadLocales();
   async function loadLocales() {
-    const locales = (await app.options.locales()).locales;
-    // project locales
-    for (const locale in locales) {
-      _initLocales(locale, locales[locale]);
+    const localesAll = await app.options.locales();
+    // project locales default
+    for (const locale in localesAll.localesDefault) {
+      _initLocales(locale, localesAll.localesDefault[locale]);
+    }
+    // project locales modules
+    for (const locale in localesAll.localesModules) {
+      _initLocales(locale, localesAll.localesModules[locale]);
     }
     // app cache
     app.meta.hmrCacheLocaleModules = deepExtend({}, app.meta.localeModules);
@@ -3312,4 +3337,4 @@ function prepareNativeBinding(nativeBinding) {
 
 zodExtendOpenApi();
 
-export { $Class, $customKey, $localeScope, $makeLocaleMagic, AppHmr, AppHmrDeps, AppLocale, AppLogger, AppMeta, AppMetadata, AppResource, AppUtil, BeanAopBase, BeanAopMethodBase, BeanBase, BeanBaseSimple, BeanContainer, BeanInfo, BeanScopeBase, BeanScopeContainer, BeanScopeError, BeanScopeErrorImpl, BeanScopeLocale, BeanScopeScene, BeanScopeUtil, BeanSimple, EnumAppEvent, ErrorClass, Global, LocaleModuleNameSeparator, PickClassInner, ProxyDisable, SymbolBeanContainerInstances, SymbolBeanFullName, SymbolBeanInstanceKey, SymbolBeanInstancePropsLazy, SymbolCacheAopChains, SymbolCacheAopChainsKey, SymbolDecoratorBeanFullName, SymbolDecoratorBeanInfo, SymbolDecoratorGlobal, SymbolDecoratorProxyDisable, SymbolDecoratorUse, SymbolDecoratorVirtual, SymbolHmrStateLoad, SymbolHmrStateSave, SymbolMappedClassMetadataKeys, SymbolModuleBelong, SymbolModuleName, Use, Virtual, VonaApplication, __prepareInjectSelectorInfo, appHmrDeps, appMetadata, appResource, beanFullNameFromOnionName, bootstrap, cast, closeApp, combineConfigDefault, combineFilePathSafe, compose, copyMetadataOfClasses, copyProperties, copyPropertiesOfClasses, copySqlite3NativeBinding, createApp, createAppMaster, createBeanDecorator, createGeneralApp, createHash, deepExtend, disposeInstance, errorsInternal, filterHeaders, formatLoggerAxiosError, formatLoggerConsole, formatLoggerCtx, formatLoggerDummy, formatLoggerFilter, functionNoop, getLoggerPathPhysicalRoot, getMappedClassMetadataKeys, getPublicPathPhysicalRoot, getRuntimePathPhysicalRoot, getSqlite3DatabaseNameDefault, getSqlite3NativeBinding, instanceDesp, isLocaleMagic, loadJSONFile, localeDefault, onionNameFromBeanFullName, pathToHref, polyfillDispose, prepareEnv, registerMappedClassMetadataKey, requireDynamic, retry, saveJSONFile, setMappedClassMetadataKeys, text, useApp, usePrepareArg, usePrepareArgs, uuidv4 };
+export { $Class, $customKey, $localeScope, $makeLocaleMagic, AppHmr, AppHmrDeps, AppLocale, AppLogger, AppMeta, AppMetadata, AppResource, AppUtil, BeanAopBase, BeanAopMethodBase, BeanBase, BeanBaseSimple, BeanContainer, BeanInfo, BeanScopeBase, BeanScopeContainer, BeanScopeError, BeanScopeErrorImpl, BeanScopeLocale, BeanScopeScene, BeanScopeUtil, BeanSimple, EnumAppEvent, ErrorClass, Global, LocaleModuleNameSeparator, PickClassInner, ProxyDisable, SymbolBeanContainerInstances, SymbolBeanFullName, SymbolBeanInstanceKey, SymbolBeanInstancePropsLazy, SymbolCacheAopChains, SymbolCacheAopChainsKey, SymbolDecoratorBeanFullName, SymbolDecoratorBeanInfo, SymbolDecoratorGlobal, SymbolDecoratorProxyDisable, SymbolDecoratorUse, SymbolDecoratorVirtual, SymbolHmrStateLoad, SymbolHmrStateSave, SymbolMappedClassMetadataKeys, SymbolModuleBelong, SymbolModuleName, Use, Virtual, VonaApplication, __prepareInjectSelectorInfo, appHmrDeps, appMetadata, appResource, beanFullNameFromOnionName, bootstrap, cast, closeApp, combineConfigDefault, combineFilePathSafe, compose, copyMetadataOfClasses, copyProperties, copyPropertiesOfClasses, copySqlite3NativeBinding, createApp, createAppMaster, createBeanDecorator, createGeneralApp, createHash, deepExtend, disposeInstance, errorsInternal, filterHeaders, formatLoggerAxiosError, formatLoggerConsole, formatLoggerCtx, formatLoggerDummy, formatLoggerFilter, functionNoop, getLoggerPathPhysicalRoot, getMappedClassMetadataKeys, getPublicPathPhysicalRoot, getRuntimePathPhysicalRoot, getSqlite3DatabaseNameDefault, getSqlite3NativeBinding, instanceDesp, isLocaleMagic, loadJSONFile, onionNameFromBeanFullName, pathToHref, polyfillDispose, prepareEnv, registerMappedClassMetadataKey, requireDynamic, retry, saveJSONFile, setMappedClassMetadataKeys, text, useApp, usePrepareArg, usePrepareArgs, uuidv4 };

package/dist/lib/core/logger/appLogger.d.ts

@@ -8,8 +8,10 @@ export declare class AppLogger extends BeanSimple {
     dispose(): Promise<void>;
     get(clientName?: keyof ILoggerClientRecord): Winston.Logger;
     child(childName?: keyof ILoggerChildRecord, clientName?: keyof ILoggerClientRecord): Winston.Logger;
-    getLevel(clientName?: keyof ILoggerClientRecord): LoggerLevel | false;
-    setLevel(level: LoggerLevel | boolean, clientName?: keyof ILoggerClientRecord): void;
+    getFilterLevel(clientName?: keyof ILoggerClientRecord): LoggerLevel | false;
+    setFilterLevel(level: LoggerLevel | boolean, clientName?: keyof ILoggerClientRecord): void;
+    getFilterChild(clientName?: keyof ILoggerClientRecord): string[] | undefined;
+    setFilterChild(child: string | string[], clientName?: keyof ILoggerClientRecord): void;
     private _createClient;
     private _prepareConfigClient;
     createTransportFile(fileName: string, clientInfo: ILoggerOptionsClientInfo, options: Winston.transports.FileTransportOptions | DailyRotateFile.DailyRotateFileTransportOptions): DailyRotateFile | Winston.transports.FileTransportInstance;

package/dist/types/application/app.d.ts

@@ -8,15 +8,17 @@ export interface VonaModulesMeta {
     modules: Record<string, IModule>;
     moduleNames: string[];
 }
+export interface IBootstrapOptionsLocales {
+    localesDefault: {};
+    localesModules: VonaLocaleOptionalMap;
+}
 export type TypeBootstrapOptionsModulesMeta = () => Promise<{
     modulesMeta: VonaModulesMeta;
 }>;
 export type TypeBootstrapOptionsConfig = () => Promise<{
     default: TypeAppInfoConfig[];
 }>;
-export type TypeBootstrapOptionsLocales = () => Promise<{
-    locales: VonaLocaleOptionalMap;
-}>;
+export type TypeBootstrapOptionsLocales = () => Promise<IBootstrapOptionsLocales>;
 export interface KoaApplicationOptions {
     env?: string | undefined;
     keys?: string[] | undefined;

package/dist/types/config/locale.d.ts

@@ -1,11 +1,8 @@
 import type { ILocaleRecord } from '../../lib/bean/resource/locale/type.ts';
 import type { IBeanScopeLocale } from '../../lib/bean/type.ts';
 import type { PowerPartial } from '../utils/powerPartial.ts';
-export declare const localeDefault: {
-    modules: {};
-};
-export type VonaLocale = {
+export interface VonaLocale {
     modules: IBeanScopeLocale;
-} & typeof localeDefault;
+}
 export type VonaLocaleOptional = PowerPartial<VonaLocale>;
 export type VonaLocaleOptionalMap = Record<keyof ILocaleRecord, VonaLocaleOptional>;

package/dist/types/interface/logger.d.ts

@@ -3,6 +3,13 @@ import type DailyRotateFile from 'winston-daily-rotate-file';
 export interface ILoggerOptionsClientInfo {
     clientName: keyof ILoggerClientRecord;
     level: () => (LoggerLevel | false);
+    child: () => (string[] | undefined);
+}
+export interface ILoggerFormatFilterOpts {
+    level: (() => (LoggerLevel | false)) | (LoggerLevel | false);
+    child: (() => (string[] | undefined)) | (string[] | undefined);
+    strict?: boolean;
+    silly?: boolean;
 }
 export type TypeLoggerOptions = Winston.LoggerOptions | ((clientInfo: ILoggerOptionsClientInfo, winston: typeof Winston) => Winston.LoggerOptions);
 export type TypeLoggerRotateOptions = DailyRotateFile.DailyRotateFileTransportOptions & {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-core",
   "type": "module",
-  "version": "5.0.131",
+  "version": "5.0.133",
   "description": "vona",
   "publishConfig": {
     "access": "public"
@@ -32,7 +32,7 @@
     "@cabloy/module-info": "^1.3.41",
     "@cabloy/module-info-pro": "^1.0.45",
     "@cabloy/type-fest": "^5.3.1",
-    "@cabloy/utils": "^2.0.17",
+    "@cabloy/utils": "^2.0.22",
     "@cabloy/word-utils": "^2.0.2",
     "@cabloy/zod-errors-custom": "^2.0.6",
     "@cabloy/zod-openapi": "^1.0.8",